Changeset 2130:9571f9d492ef for inc/admin/lib.pager.php

Timestamp:

09/22/13 18:04:14 (12 years ago)

Author:

Lepeltier kévin <kevin@…>

Branch:

Ticket #1548

Parents:

2129:8bc6a4f0ac8f (diff), 2013:da9c70e5fd18 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Fusion avec default

File:

• inc/admin/lib.pager.php (modified) (11 diffs)

inc/admin/lib.pager.php

@@ -50 +50 @@
           $this->form_hidden = '';
           foreach ($args as $k=>$v) {
-               if (is_array($v)) {
-                    foreach ($v as $k2=>$v2) {
-                         $this->form_hidden .= form::hidden(array($k.'[]'),$v2);
-                    }
-               } else {
-                    $this->form_hidden .= form::hidden(array($k),$v);
-               }
+               $this->form_hidden .= form::hidden(array($k),$v);
           }
           $this->form_action = $url['path'];
@@ -151 +145 @@
 class adminPostList extends adminGenericList
 {
-     public function display($page,$nb_per_page,$enclose_block='')
+     public function display($page,$nb_per_page,$enclose_block='',$filter=false)
      {
           if ($this->rs->isEmpty())
           {
-               echo '<p><strong>'.__('No entry').'</strong></p>';
+               if( $filter ) {
+                    echo '<p><strong>'.__('No entry matches the filter').'</strong></p>';
+               } else {
+                    echo '<p><strong>'.__('No entry').'</strong></p>';
+               }
           }
           else
@@ -166 +164 @@
                     }
                }
-               $html_block =
-               '<div class="table-outer">'.
-               '<table><caption class="hidden">'.__('Entries list').'</caption><tr>'.
+               $html_block  = '<table class="clear">';
+               
+               if( $filter ) {
+                    $html_block .= '<caption>'.sprintf(__('List of %s entries match the filter.'), $this->rs_count).'</caption>';
+               } else {
+                    $html_block .= '<caption class="hidden">'.__('Entries list').'</caption>';
+               }
+                         
+               $html_block .= '<tr>'.
                '<th colspan="2" class="first">'.__('Title').'</th>'.
                '<th scope="col">'.__('Date').'</th>'.
@@ -176 +180 @@
                '<th scope="col">'.__('Trackbacks').'</th>'.
                '<th scope="col">'.__('Status').'</th>'.
-               '</tr>%s</table></div>';
+               '</tr>%s</table>';
                
                if ($enclose_block) {
@@ -280 +284 @@
                
                $html_block =
-               '<div class="table-outer clear">'.
-               '<table><caption class="hidden">'.__('Entries list').'</caption><tr>'.
+               '<table class="clear"><caption class="hidden">'.__('Entries list').'</caption><tr>'.
                '<th scope="col">'.__('Title').'</th>'.
                '<th scope="col">'.__('Date').'</th>'.
                '<th scope="col">'.__('Author').'</th>'.
                '<th scope="col">'.__('Status').'</th>'.
-               '</tr>%s</table></div>';
+               '</tr>%s</table>';
                
                if ($enclose_block) {
@@ -372 +375 @@
                $pager = new dcPager($page,$this->rs_count,$nb_per_page,10);
                
-               $comments = array();
-               if (isset($_REQUEST['comments'])) {
-                    foreach ($_REQUEST['comments'] as $v) {
-                         $comments[(integer)$v]=true;
-                    }
-               }              
                $html_block =
-               '<div class="table-outer">'.
                '<table><caption class="hidden">'.__('Comments and trackbacks list').'</caption><tr>'.
                '<th colspan="2" scope="col" abbr="comm" class="first">'.__('Type').'</th>'.
@@ -386 +382 @@
                '<th scope="col" class="txt-center">'.__('Status').'</th>'.
                '<th scope="col" abbr="entry">'.__('Entry title').'</th>'.
-               '</tr>%s</table></div>';
+               '</tr>%s</table>';
 
                if ($enclose_block) {
@@ -400 +396 @@
                while ($this->rs->fetch())
                {
-                    echo $this->commentLine(isset($comments[$this->rs->comment_id]));
+                    echo $this->commentLine();
                }
                
@@ -409 +405 @@
      }
      
-     private function commentLine($checked=false)
+     private function commentLine()
      {
           global $author, $status, $sortby, $order, $nb_per_page;
@@ -488 +484 @@
                
                $html_block =
-               '<div class="table-outer clear">'.
-               '<table><caption class="hidden">'.__('Users list').'</caption><tr>'.
+               '<table class="clear"><caption class="hidden">'.__('Users list').'</caption><tr>'.
                '<th colspan="2" scope="col" class="first">'.__('Username').'</th>'.
                '<th scope="col">'.__('First Name').'</th>'.
@@ -495 +490 @@
                '<th scope="col">'.__('Display name').'</th>'.
                '<th scope="col" class="nowrap">'.__('Entries (all types)').'</th>'.
-               '</tr>%s</table></div>';
+               '</tr>%s</table>';
                
                if ($enclose_block) {