Changeset 2138:73902254112c for inc/admin/lib.pager.php

Timestamp:

09/28/13 17:21:54 (12 years ago)

Author:

Lepeltier kévin <kevin@…>

Branch:

Ticket #1548

Children:

2139:abcd1153037c, 2140:28741fc22072

Parents:

2137:bb5fa2846e7d (diff), 2127:0bdb7068c050 (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) (6 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
@@ -168 +172 @@
                $html_block =
                '<div class="table-outer">'.
-               '<table><caption class="hidden">'.__('Entries list').'</caption><tr>'.
+               '<table>';
+               
+               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>'.
@@ -362 +374 @@
 class adminCommentList 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 comment').'</strong></p>';
+               if( $filter ) {
+                    echo '<p><strong>'.__('No comments or trackbacks matches the filter').'</strong></p>';
+               } else {
+                    echo '<p><strong>'.__('No comment').'</strong></p>';
+               }
           }
           else
@@ -380 +396 @@
                $html_block =
                '<div class="table-outer">'.
-               '<table><caption class="hidden">'.__('Comments and trackbacks list').'</caption><tr>'.
+               '<table>';
+               
+               if( $filter ) {
+                    $html_block .= '<caption>'.sprintf(__('List of %s Comments or trackbacks match the filter.'), $this->rs_count).'</caption>';
+               } else {
+                    $html_block .= '<caption class="hidden">'.__('Comments and trackbacks list').'</caption>';
+               }
+                         
+               $html_block .= '<tr>'.
                '<th colspan="2" scope="col" abbr="comm" class="first">'.__('Type').'</th>'.
                '<th scope="col">'.__('Author').'</th>'.
@@ -477 +501 @@
 class adminUserList 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 user').'</strong></p>';
+               if( $filter ) {
+                    echo '<p><strong>'.__('No user matches the filter').'</strong></p>';
+               } else {
+                    echo '<p><strong>'.__('No user').'</strong></p>';
+               }
           }
           else
@@ -489 +517 @@
                $html_block =
                '<div class="table-outer clear">'.
-               '<table><caption class="hidden">'.__('Users list').'</caption><tr>'.
+               '<table>';
+               
+               if( $filter ) {
+                    $html_block .= '<caption>'.sprintf(__('List of %s users match the filter.'), $this->rs_count).'</caption>';
+               } else {
+                    $html_block .= '<caption class="hidden">'.__('Users list').'</caption>';
+               }
+                         
+               $html_block .= '<tr>'.
                '<th colspan="2" scope="col" class="first">'.__('Username').'</th>'.
                '<th scope="col">'.__('First Name').'</th>'.

inc/admin/lib.pager.php

@@ -185 +185 @@
                '<th scope="col">'.__('Category').'</th>'.
                '<th scope="col">'.__('Author').'</th>'.
-               '<th scope="col">'.__('Comments').'</th>'.
-               '<th scope="col">'.__('Trackbacks').'</th>'.
+               '<th scope="col"><img src="images/comments.png" alt="" title="'.__('Comments').'" /><span class="hidden">'.__('Comments').'</span></th>'.
+               '<th scope="col"><img src="images/trackbacks.png" alt="" title="'.__('Trackbacks').'" /><span class="hidden">'.__('Trackbacks').'</span></th>'.
                '<th scope="col">'.__('Status').'</th>'.
                '</tr>%s</table></div>';