Changeset 276:2735b6d59082

Timestamp:

05/16/11 10:07:02 (14 years ago)

Author:

Tomtom33 <tbouron@…>

Branch:

formfilters

Message:

Clean code for custom columns

Files:

• admin/posts.php (modified) (1 diff)
• inc/admin/lib.pager.php (modified) (6 diffs)

admin/posts.php

@@ -193 +193 @@
 $starting_script = dcPage::jsLoad('js/_posts_list.js');
 
-$starting_script = $filterSet->header();
+$starting_script .= $filterSet->header();
 
 dcPage::open(__('Entries'),$starting_script);

inc/admin/lib.pager.php

@@ -20 +20 @@
      protected $callback;
      protected $html;
-     protected $order;
      protected $visibility;
      
-     public function __construct($id,$title,$callback,$html = null,$order = null)
+     public function __construct($id,$title,$callback,$html = null)
      {
           if (!is_string($id) || $id === '') {
@@ -38 +37 @@
           if (!empty($html)) {
                $html = ' '.$html;
-          }
-          
-          if (!is_int($order)) {
-               $order = null;
           }
           
@@ -63 +58 @@
           $this->callback = $callback;
           $this->html = $html;
-          $this->order = $order;
           $this->visibility = true;
      }
@@ -135 +129 @@
           $this->addColumn('adminUserList','entries',__('Entries'),array('adminUserList','getEntries'));
           
+          $core->callBehavior('adminGenericListConstruct',$this);
+          
           $this->setColumnsVisibility();
-          
-          $core->callBehavior('adminGenericListConstruct',$this);
-     }
-     
-     public function addColumn($context,$id,$title,$callback,$html = null,$order = null)
+     }
+     
+     public function addColumn($context,$id,$title,$callback,$html = null)
      {
           try {
@@ -147 +141 @@
                }
                
-               $c = new adminGenericColumn($id,$title,$callback,$html,$order);
+               $c = new adminGenericColumn($id,$title,$callback,$html);
                $this->columns[$context][$c->getInfo('id')] = $c;
           }
@@ -210 +204 @@
                $pager->var_page = 'page';
                
-               $html_block = '<table class="clear"><tr>';
+               $html_block = '<table class="maximal clear"><tr>';
                
                foreach ($this->columns[$this->context] as $k => $v) {