Changeset 128 for trunk/trax/vendor/trax/action_view

Timestamp:

02/05/06 23:31:53 (6 years ago)

Author:

john

Message:

bug fixes for views

Location:

trunk/trax/vendor/trax/action_view

Files:

• helpers.php (modified) (1 diff)
• helpers/active_record_helper.php (modified) (1 diff)
• helpers/date_helper.php (modified) (2 diffs)
• helpers/form_helper.php (modified) (5 diffs)
• helpers/form_tag_helper.php (modified) (3 diffs)

trunk/trax/vendor/trax/action_view/helpers.php

@@ -70 +70 @@
         $url = array();
         if(is_string($options)) {
-            $url[] = $options;
+            //$url[] = $options;
+            return $options;
         } else {
             $url_base = $_SERVER['HTTP_HOST'];

trunk/trax/vendor/trax/action_view/helpers/active_record_helper.php

@@ -299 +299 @@
 
     function error_wrapping($html_tag, $has_error) {
-        return ($has_error ? '<div class="fieldWithErrors">' . $html_tag . '</div>' : $html_tag);
+        return ($has_error ? '<span class="fieldWithErrors">' . $html_tag . '</span>' : $html_tag);
     }
 

trunk/trax/vendor/trax/action_view/helpers/date_helper.php

@@ -225 +225 @@
         $options  = array_merge($defaults, $options);
         $options_with_prefix = array();
-        foreach($options as $option_key => $option_value) {
-            $options_with_prefix[$i++] = array_merge($options, array('prefix' => "{$this->object_name}[{$this->attribute_name}({$option_value}i)]"));
-        }
+        for($i=1; $i < 4 ; $i++) {
+            $options_with_prefix[$i] = array_merge($options, array('prefix' => "{$this->object_name}[{$this->attribute_name}({$i}i)]"));
+        }        
+        
         if($options['include_blank']) {
             $value = $this->value();
@@ -252 +253 @@
         foreach($options['order'] as $param) {
             if(!$discard[$param]) {
-                $args = array($date, );
-                $date_select[] = call_user_func(array($this, "select_$param"),  $date, $options_with_prefix[$position[$param]]);
+                $date_select .= call_user_func(array($this, "select_$param"),  $date, $options_with_prefix[$position[$param]]);
             }
         }

trunk/trax/vendor/trax/action_view/helpers/form_helper.php

@@ -93 +93 @@
         }
         $options = $this->add_default_name_and_id($options);
-        return $this->tag("input", $options);
+        return $this->error_wrapping($this->tag("input", $options),$this->object()->errors[$this->attribute_name]);
     }
 
@@ -108 +108 @@
             "{$this->object_name}_{$this->attribute_name}_{$pretty_tag_value}";
         $options = $this->add_default_name_and_id($options);
-        return $this->tag("input", $options);
+        return $this->error_wrapping($this->tag("input", $options),$this->object()->errors[$this->attribute_name]);
     }
 
@@ -114 +114 @@
         $options = array_merge($this->default_text_area_options, $options);
         $options = $this->add_default_name_and_id($options);
-        return $this->content_tag("textarea", htmlspecialchars($this->value()), $options);
+        return $this->error_wrapping($this->content_tag("textarea", htmlspecialchars($this->value()), $options),$this->object()->errors[$this->attribute_name]);
     }
 
@@ -144 +144 @@
 
         $options = $this->add_default_name_and_id($options);
-        return $this->tag("input", $options) . $this->tag("input", array("name" => $options["name"], "type" => "hidden", "value" => $unchecked_value));
+        return $this->error_wrapping($this->tag("input", $options) . $this->tag("input", array("name" => $options["name"], "type" => "hidden", "value" => $unchecked_value)),$this->object()->errors[$this->attribute_name]);
     }
 
     function to_boolean_select_tag($options = array()) {
         $options = $this->add_default_name_and_id($options);
-        $tag_text = "<select";
+        $tag_text = "<select ";
         $tag_text .= $this->tag_options($options);
         $tag_text .= ">\n";
         $tag_text .= "<option value=\"0\"";
-        if(!$this->value() == false) {
+        if($this->value() == false) {
             $tag_text .= " selected";
         }
@@ -163 +163 @@
         $tag_text .= ">True</option>\n";
         $tag_text .= "</select>\n";
-        return $tag_text;
-    }
+        return $this->error_wrapping($tag_text,$this->object()->errors[$this->attribute_name]);;
+    }
+    
+    function error_wrapping($html_tag, $has_error) {
+        return ($has_error ? '<span class="fieldWithErrors">' . $html_tag . '</span>' : $html_tag);
+    }    
 
 }

trunk/trax/vendor/trax/action_view/helpers/form_tag_helper.php

@@ -43 +43 @@
 
     function form_tag($url_for_options = array(), $options = array(), $parameters_for_url = array()) {
-        $html_options = array_merge($options, array("method" => "post"));
+        $html_options = array_merge(array("method" => "post"), $options);
 
-        if(isset($html_options['multipart'])) {
+        if($html_options['multipart']) {
             $html_options['enctype'] = "multipart/form-data";
             unset($html_options['multipart']);
@@ -91 +91 @@
     function check_box_tag($name, $value = "1", $checked = false, $options = array()) {
         $html_options = array_merge(array("type" => "checkbox", "name" => $name, "id" => $name, "value" => $value), $this->convert_options($options));
-        if (isset($checked)) $html_options["checked"] = "checked";
+        if ($checked) $html_options["checked"] = "checked";
         return $this->tag("input", $html_options);
     }
@@ -97 +97 @@
     function radio_button_tag($name, $value, $checked = false, $options = array()) {
         $html_options = array_merge(array("type" => "radio", "name" => $name, "id" => $name, "value" => $value), $this->convert_options($options));
-        if (isset($checked)) $html_options["checked"] = "checked";
+        if ($checked) $html_options["checked"] = "checked";
         return $this->tag("input", $html_options);
     }