Changeset 2135:35a0194cdafa for inc/admin/lib.pager.php

Timestamp:

09/27/13 20:16:29 (12 years ago)

Author:

Lepeltier kévin <kevin@…>

Branch:

Ticket #1548

Message:

Ticket #1548

File:

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

inc/admin/lib.pager.php

@@ -170 +170 @@
                     }
                }
-               $html_block  = 
+               $html_block =
                '<div class="table-outer">'.
-               '<table class="clear">';
+               '<table>';
                
                if( $filter ) {
@@ -374 +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
@@ -392 +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>'.
@@ -489 +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
@@ -501 +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>'.