Changeset 308 for trunk/trax/vendor/trax/action_view

Timestamp:

03/19/09 10:40:34 (3 years ago)

Author:

john

Message:

features and bug fixes from gocoffeego project

Location:

trunk/trax/vendor/trax/action_view

Files:

• helpers.php (modified) (1 diff)
• helpers/active_record_helper.php (modified) (8 diffs)
• helpers/form_helper.php (modified) (9 diffs)
• helpers/form_options_helper.php (modified) (1 diff)
• helpers/javascript_helper.php (modified) (1 diff)

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

@@ -134 +134 @@
      */
     protected function value() {
-        if (array_key_exists($this->object_name, $_REQUEST)
+        if (array_key_exists($this->object_name, (array)$_REQUEST)
             && array_key_exists($this->attribute_name,
-                                 $_REQUEST[$this->object_name])) {
+                                 (array)$_REQUEST[$this->object_name])) {
             $value = $_REQUEST[$this->object_name][$this->attribute_name];
         } else {
-
             //  Attribute value not found in $_REQUEST.  Find the
             //  ActiveRecord subclass instance and query it.

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

@@ -138 +138 @@
         $this->object_name = $object_name;
         $this->attribute_name = $attribute_name;
-        $object = $this->controller_object->$object_name;
-        if($errors = $object->errors[$attribute_name]) {
+        $object = $this->object($object_name);
+        if(is_object($object) && $errors = $object->errors_on($attribute_name)) {
             return $this->content_tag("div", $prepend_text . (is_array($errors) ? current($errors) : $errors) . $append_text, array('class' => $css_class));
         }
@@ -164 +164 @@
         }
         $this->object_name = $object_name;
-        $object = $this->controller_object->$object_name;
-        if(!empty($object->errors)) {
+        $object = $this->object($object_name);
+        if(is_object($object) && $errors = $object->errors_full_messages()) {
             $id = isset($options['id']) ? $options['id'] : "ErrorExplanation";
             $class = isset($options['class']) ? $options['class'] : "ErrorExplanation";
@@ -173 +173 @@
             $header_sub_message = isset($options['header_sub_message']) ?
                 $options['header_sub_message'] : "There were problems with the following fields:";
-               
+                
             return $this->content_tag("div",
                 $this->content_tag(
                     $header_tag,
-                    sprintf($header_message, Inflector::pluralize("error", count($object->errors)), Inflector::humanize($object_name))
+                    sprintf($header_message, Inflector::pluralize("error", count($errors)), Inflector::humanize($object_name))
                 ) .
                 $this->content_tag("p", $header_sub_message) .
-                $this->content_tag("ul", array_reduce($object->errors, create_function('$v,$w', 'return ($v ? $v : "") . content_tag("li", $w);'), '')),
+                $this->content_tag("ul", array_reduce($errors, create_function('$v,$w', 'return ($v ? $v : "") . content_tag("li", $w);'), '')),
                 array("id" => $id, "class" => $class)
             );
@@ -482 +482 @@
      *  @todo Document this API
      */
-    function pagination_limit_select($object_name_or_object, $default_text = "per page:") {
+    function pagination_limit_select($object_name_or_object, $options = array()) {
 
         if(is_object($object_name_or_object)) {
@@ -495 +495 @@
 
         if($object->pages > 0) {
+            $base_url = isset($options['base_url']) ? $options['base_url'] : '';
+            $update = isset($options['update']) ? $options['update'] : '';
+            $extra_params = isset($options['extra_params']) ? "&".$options['extra_params'] : 
+                ($object->paging_extra_params ? "&".$object->paging_extra_params : '');
+            $default_text = isset($options['default_text']) ? $options['default_text'] : "per page:";
+            if($update && $base_url) {
+                $on_change = remote_function(array(
+                    "update" => $update, 
+                    "url" => "{$base_url}?per_page=' + this.options[this.selectedIndex].value + '".escape_javascript($extra_params)."'"
+                ));
+            } else {
+                $on_change = "document.location = '{$base_url}?per_page=' + this.options[this.selectedIndex].value + '".escape_javascript($extra_params)."'";                
+            }           
             $html .= "
-                <select name=\"per_page\" onChange=\"document.location = '?".escape_javascript($object->paging_extra_params)."&per_page=' + this.options[this.selectedIndex].value;\">
+                <select name=\"per_page\" onChange=\"{$on_change}\">
                     <option value=\"$object->rows_per_page\" selected>$default_text</option>
                     <option value=10>10</option>
@@ -519 +532 @@
      *  @uses rows_per_page
      */
-    function pagination_links($object_name_or_object) {
+    function pagination_links($object_name_or_object, $options = array()) {
         
         if(is_object($object_name_or_object)) {
@@ -530 +543 @@
             return null;    
         }
+
+        $first_text = isset($options['first_text']) ? $options['first_text'] : "<<";
+        $last_text = isset($options['last_text']) ? $options['last_text'] : ">>";
+        $prev_text = isset($options['prev_text']) ? $options['prev_text'] : "<";
+        $next_text = isset($options['next_text']) ? $options['next_text'] : ">";
+        $link_class = isset($options['link_class']) ? $options['link_class'] : "pagingLink";
+        $selected_class = isset($options['selected_class']) ? $options['selected_class'] : "pagingSelected";
+        $base_url = isset($options['base_url']) ? $options['base_url'] : '';
+        $update = isset($options['update']) ? $options['update'] : '';
+        $extra_params = isset($options['extra_params']) ? "&".$options['extra_params'] : 
+            ($object->paging_extra_params ? "&".$object->paging_extra_params : ''); 
+        
+        $first_width = "width:".(isset($options['first_width']) ? $options['first_width'] : '20')."px;"; # size in pixels
+        $first_width = ( 
+            (  isset($options['first_text']) &&  isset($options['first_width']) ) || 
+            ( !isset($options['first_text']) && !isset($options['first_width']) )  
+        ) ? $first_width : '';
+        $last_width = "width:".(isset($options['last_width']) ? $options['last_width'] : '20')."px;"; # size in pixels
+        $last_width = ( 
+            (  isset($options['last_text']) &&  isset($options['last_width']) ) || 
+            ( !isset($options['last_text']) && !isset($options['last_width']) )  
+        ) ? $last_width : '';
+        $prev_width = "width:".(isset($options['prev_width']) ? $options['prev_width'] : '10')."px;"; # size in pixels
+        $prev_width = ( 
+            (  isset($options['prev_text']) &&  isset($options['prev_width']) ) || 
+            ( !isset($options['prev_text']) && !isset($options['prev_width']) )  
+        ) ? $prev_width : '';
+        $next_width = "width:".(isset($options['next_width']) ? $options['next_width'] : '10')."px;"; # size in pixels
+        $next_width = ( 
+            (  isset($options['next_text']) &&  isset($options['next_width']) ) || 
+            ( !isset($options['next_text']) && !isset($options['next_width']) )  
+        ) ? $next_width : '';
+        $pages_width = isset($options['fixed_pages']) ? "width:".$options['fixed_pages']."px;" : ''; # size in pixels
            
-        //$html  = "<pre>".print_r($object,1);
+
+        $html .= "<div class=\"pagingContaniner\" style=\"display:inline\">";
+        $html .= "<div class=\"pagingFirst\" style=\"{$first_width}text-align:left;display:inline;float:left\">";
         /* Print the first and previous page links if necessary */
-        if(($object->page != 1) && ($object->page)) {
-            $html .= link_to("<<", 
-                                  "?$object->paging_extra_params&page=1&per_page=$object->rows_per_page",
-                                  array(
-                                    "class" => "pageList",
-                                    "title" => "First page"
-                                  ))." ";
-        }
-        if(($object->page-1) > 0) {
-            $html .= link_to("<", 
-                                  "?$object->paging_extra_params&page=".($object->page-1)."&per_page=$object->rows_per_page",
-                                  array(
-                                    "class" => "pageList",
-                                    "title" => "Previous Page"                                    
-                                  ));
-        }
-        
+        if(($object->page != 1) && ($object->page) && $first_text) {
+            if($update && $base_url) {
+                $html .= link_to_remote($first_text, array(
+                    "update" => $update, 
+                    "url" => "{$base_url}?page=1&per_page={$object->rows_per_page}{$extra_params}"
+                ), array(
+                    "class" => $link_class,
+                    "title" => "First page"                
+                ))." ";
+            } else {
+                $html .= link_to($first_text, "{$base_url}?page=1&per_page={$object->rows_per_page}{$extra_params}", array(
+                    "class" => $link_class,
+                    "title" => "First page"
+                ))." ";                
+            }
+        } else {
+            $html .= "&nbsp;";
+        }
+        $html .= "</div>";
+        $html .= "<div class=\"pagingPrev\" style=\"{$prev_width}text-align:left;display:inline;float:left\">";
+        if(($object->page-1) > 0 && $prev_text) {
+            if($update && $base_url) {
+                $html .= link_to_remote($prev_text, array(
+                    "update" => $update, 
+                    "url" => "{$base_url}?page=".($object->page-1)."&per_page={$object->rows_per_page}{$extra_params}"
+                ), array(
+                    "class" => $link_class,
+                    "title" => "Previous page"                    
+                ));
+            } else {
+                $html .= link_to($prev_text, "{$base_url}?page=".($object->page-1)."&per_page={$object->rows_per_page}{$extra_params}", array(
+                    "class" => $link_class,
+                    "title" => "Previous page"
+                ));                
+            }            
+        } else {
+            $html .= "&nbsp;";
+        }
+        $html .= "</div>";
         if($object->pages < $object->display) {
             $object->display = $object->pages;
@@ -574 +644 @@
             $end = $object->pages;
         }
-                
-        /* Print the numeric page list; make the current page unlinked and bold */
+        
+        $html .= "<div class=\"pagingPages\" style=\"{$pages_width}text-align:center;display:inline;float:left;padding:0px 5px\">";
+        # Print the numeric page list; make the current page unlinked and bold
         if($end != 1) {
+            $selected_class = $selected_class ? $link_class." ".$selected_class : $selected_class;
             for($i=$start; $i<=$end; $i++) {
                 if($i == $object->page) {
-                    $html .= "<span class=\"pageList\"><b>".$i."</b></span>";
+                    $html .= "<span class=\"{$selected_class}\">".$i."</span>";
                 } else {
-                    $html .= link_to($i,
-                                          "?$object->paging_extra_params&page=$i&per_page=$object->rows_per_page",
-                                          array(
-                                            "class" => "pageList",
-                                            "title" => "Page $i"                                           
-                                          ));
+                    if($update && $base_url) {
+                        $html .= link_to_remote($i, array(
+                            "update" => $update, 
+                            "url" => "{$base_url}?page={$i}&per_page={$object->rows_per_page}{$extra_params}"
+                        ), array(
+                            "class" => $link_class,
+                            "title" => "Page $i"                    
+                        ));
+                    } else {
+                        $html .= link_to($i, "{$base_url}?page={$i}&per_page={$object->rows_per_page}{$extra_params}", array(
+                            "class" => $link_class,
+                            "title" => "Page $i"
+                        ));                
+                    }                    
                 }
                 $html .= " ";
             }
         }
-
-        /* Print the Next and Last page links if necessary */
-        if(($object->page+1) <= $object->pages) {
-            $html .= link_to(">",
-                                  "?$object->paging_extra_params&page=".($object->page+1)."&per_page=$object->rows_per_page",
-                                  array(
-                                    "class" => "pageList",
-                                    "title" => "Next Page"                                    
-                                  ));
-        }
-        if(($object->page != $object->pages) && ($object->pages != 0)) {
-            $html .= link_to(">>",
-                                  "?$object->paging_extra_params&page=".$object->pages."&per_page=$object->rows_per_page",
-                                  array(
-                                    "class" => "pageList",
-                                    "title" => "Last Page"                                    
-                                  ));
-        }
-        $html .= "\n";
+        $html .= "</div>";
+        $html .= "<div class=\"pagingNext\" style=\"{$next_width}text-align:right;display:inline;float:left\">";
+        # Print the Next and Last page links if necessary
+        if(($object->page+1) <= $object->pages && $next_text) {
+            if($update && $base_url) {
+                $html .= link_to_remote($next_text, array(
+                    "update" => $update, 
+                    "url" => "{$base_url}?page=".($object->page+1)."&per_page={$object->rows_per_page}{$extra_params}"
+                ), array(
+                    "class" => $link_class,
+                    "title" => "Next Page"                    
+                ));
+            } else {
+                $html .= link_to($next_text, "{$base_url}?page=".($object->page+1)."&per_page={$object->rows_per_page}{$extra_params}", array(
+                    "class" => $link_class,
+                    "title" => "Next Page"                                    
+                ));          
+            }                   
+        } else {
+            $html .= "&nbsp;";
+        }
+        $html .= "</div>";
+        $html .= "<div class=\"pagingLast\" style=\"{$last_width}text-align:right;display:inline;float:left\">";
+        if(($object->page != $object->pages) && ($object->pages != 0) && $last_text) {
+            if($update && $base_url) {
+                $html .= link_to_remote($last_text, array(
+                    "update" => $update, 
+                    "url" => "{$base_url}?page=".$object->pages."&per_page={$object->rows_per_page}{$extra_params}"
+                ), array(
+                    "class" => $link_class,
+                    "title" => "Last Page"                    
+                ));
+            } else {
+                $html .= link_to($last_text, "{$base_url}?page=".$object->pages."&per_page={$object->rows_per_page}{$extra_params}", array(
+                    "class" => $link_class,
+                    "title" => "Last Page"                                    
+                ));    
+            }            
+        } else {
+            $html .= "&nbsp;";
+        }
+        $html .= "</div>";
+        $html .= "</div>\n";
 
         return $html;

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

@@ -131 +131 @@
      */
     function add_default_name_and_id($options) {  
-        $name_option_exists = array_key_exists('name', $options);   
-        if(array_key_exists("index", $options)) {
+        $name_option_exists = array_key_exists('name', (array)$options);    
+        if(array_key_exists("index", (array)$options)) {
             $options['name'] = $name_option_exists
                 ? $options['name']
                 : $this->tag_name_with_index($options['index']);
-            $options['id'] = array_key_exists('id', $options)
+            $options['id'] = array_key_exists('id', (array)$options)
                 ? $options['id']
                 : $this->tag_id_with_index($options['index']);
@@ -144 +144 @@
                 ? $options['name']
                 : $this->tag_name_with_index($this->auto_index);
-            $options['id'] = array_key_exists('id', $options)
+            $options['id'] = array_key_exists('id', (array)$options)
                 ? $options['id']
                 : $this->tag_id_with_index($this->auto_index);
@@ -151 +151 @@
                 ? $options['name']
                 : $this->tag_name();
-            $options['id'] = array_key_exists('id', $options)
+            $options['id'] = array_key_exists('id', (array)$options)
                 ? $options['id']
                 : $this->tag_id();
         }
-        if(array_key_exists('multiple', $options) && !$name_option_exists) {
+        if(array_key_exists('multiple', (array)$options) && !$name_option_exists) {
             $options['name'] .= "[]";           
         }
@@ -181 +181 @@
      */
     function to_input_field_tag($field_type, $options = array()) {
-        $default_size = array_key_exists("maxlength", $options)
+        $default_size = array_key_exists("maxlength", (array)$options)
             ? $options["maxlength"] : $this->default_field_options['size'];
-        $options["size"] = array_key_exists("size", $options)
+        $options["size"] = array_key_exists("size", (array)$options)
             ? $options["size"]: $default_size;
-        $options = array_merge($this->default_field_options, $options);
+        $options = array_merge($this->default_field_options, (array)$options);
         if($field_type == "hidden") {
             unset($options["size"]);
@@ -191 +191 @@
         $options["type"] = $field_type;
         if($field_type != "file") {
-            $options["value"] = array_key_exists("value", $options)
+            $options["value"] = array_key_exists("value", (array)$options)
                 ? $options["value"] : $this->value();
         }
@@ -198 +198 @@
                      $this->tag("input", $options),
                      @array_key_exists($this->attribute_name,
-                                      $this->object()->errors)
+                                      (array)$this->object()->errors)
                      ? true : false);
     }
@@ -226 +226 @@
      */
     function to_text_area_tag($options = array()) {
-        if (array_key_exists("size", $options)) {
+        if (array_key_exists("size", (array)$options)) {
             $size = explode('x', $options["size"]);
             $options["cols"] = reset($size);
@@ -232 +232 @@
             unset($options["size"]);
         }
-        $options = array_merge($this->default_text_area_options, $options);
+        $options = array_merge($this->default_text_area_options, (array)$options);
         $options = $this->add_default_name_and_id($options);
         return $this->error_wrapping(
@@ -238 +238 @@
                               htmlspecialchars($this->value(), ENT_COMPAT),
                               $options),
-           array_key_exists($this->attribute_name,$this->object()->errors)
+           array_key_exists($this->attribute_name, (array)$this->object()->errors)
            ? $this->object()->errors[$this->attribute_name] : false);
     }

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

@@ -226 +226 @@
                                       $html_options) {
         $html_options = $this->add_default_name_and_id($html_options);
-        $value = $this->value();
+        $value = isset($options['selected']) ? $options['selected'] : $this->value();
         return $this->error_wrapping(
             $this->content_tag(

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

@@ -516 +516 @@
             $options['with'] = "Sortable.serialize('{$element_id}')";
         }
-        if(!$options['onUpdate']) {
-            $options['onUpdate'] = "function(){" . $this->remote_function($options) . "}";
+        if(!$options['onDrop']) {
+            $options['onDrop'] = "function(){" . $this->remote_function($options) . "}";
         }
         $options = $this->remove_ajax_options($options);