Changeset 2134:b3b9847a5d45 for inc/admin

Timestamp:

09/27/13 19:03:25 (12 years ago)

Author:

Lepeltier kévin <kevin@…>

Branch:

Ticket #1548

Parents:

2133:5ba259352620 (diff), 2113:a134102bfd9a (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

Files:

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

inc/admin/lib.pager.php

@@ -151 +151 @@
 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 +170 @@
                     }
                }
-               $html_block =
+               $html_block  = 
                '<div class="table-outer">'.
-               '<table><caption class="hidden">'.__('Entries list').'</caption><tr>'.
+               '<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>'.

inc/admin/lib.pager.php

@@ -469 +469 @@
           $res .=
           '<td class="nowrap">'.
-          form::checkbox(array('comments[]'),$this->rs->comment_id,'','','',0).'</td>'.
+          form::checkbox(array('comments[]'),$this->rs->comment_id,$checked,'','',0).'</td>'.
           '<td class="nowrap" abbr="'.__('Type and author').'" scope="row">'.
                '<a href="'.$comment_url.'" title="'.$comment_title.'">'.