cleanup

diff --git a/ipf/admin/static/admin/css/forms.css b/ipf/admin/static/admin/css/forms.css
index 7d46adda8c0eb57d25a18a67994c4c976a0fa68f..934da57393f9df68ca3f4e180142fb23514cc39d 100644 (file)
--- a/ipf/admin/static/admin/css/forms.css
+++ b/ipf/admin/static/admin/css/forms.css
@@ -111,7 +111,7 @@ ul.orderer li.deleted:hover, ul.orderer li.deleted a.selector:hover { cursor:def
 /* FORM ROWS */
 .form-row { overflow:hidden; padding:8px 12px; font-size:11px; border-bottom:1px solid #eee; }
 .form-row img { vertical-align:middle; }
-.form-row input { vertical-align:middle; width: 300px; }
+.form-row input[type=text] { vertical-align:middle; width: 300px; }
 .form-row textarea { width: 300px; height: 180px; }
 .form-row select[multiple] { width: 300px; height: 180px; }
 form .form-row p { padding-left:0; font-size:11px; }

diff --git a/ipf/admin/templates/admin/items.html b/ipf/admin/templates/admin/items.html
index 322794326c245968b57a31027741c869ab5664f1..2cd88b3e98dba833164f7043a98062e3d43b3427 100644 (file)
--- a/ipf/admin/templates/admin/items.html
+++ b/ipf/admin/templates/admin/items.html
@@ -7,7 +7,7 @@
 
 {block bodyclass}change-list{/block}
 
-{block breadcrumbs}<div class="breadcrumbs"><a href="{url 'IPF_Admin_Views_Index'}">{trans 'Home'}</a> &raquo; {$classname}</div>{/block}
+{block breadcrumbs}<div class="breadcrumbs"><a href="{url 'IPF_Admin_Views_Index'}">{trans 'Home'}</a> &raquo; {$page_title}</div>{/block}
 
 {block content}
 <div id="content" class="flex">

diff --git a/ipf/form/widget/selectinput.php b/ipf/form/widget/selectinput.php
index b39a12f57084e80f74dae27e18dcc8416e52e246..10ccebeeb8a7c22f7b3e6eb19fea390e898c83de 100644 (file)
--- a/ipf/form/widget/selectinput.php
+++ b/ipf/form/widget/selectinput.php
@@ -15,17 +15,15 @@ class IPF_Form_Widget_SelectInput extends IPF_Form_Widget
         parent::__construct($attrs);
     }
 
-    public function render($name, $value, $extra_attrs=array(), $choices=array())
+    public function render($name, $value, $extra_attrs=array())
     {
-        $output = array();
-        if ($value === null) {
+        if ($value === null)
             $value = '';
-        }
+
         $select = Tag::select($this->attrs)
             ->attrs($extra_attrs)
             ->attr('name', $name);
-        $choices = $this->choices + $choices;
-        foreach ($choices as $option_label => $option_value) {
+        foreach ($this->choices as $option_label => $option_value) {
             $select->append(Tag::option()
                 ->attr('value', $option_value)
                 ->toggleAttr('selected', 'selected', $option_value == $value)