Changes in [2061:77a99aa76c10:2133:5ba259352620]

Files:

• admin/js/filter-controls.js (modified) (1 diff)
• admin/posts.php (modified) (3 diffs)
• admin/style/default.css (modified) (1 diff)
• inc/admin/lib.pager.php (modified) (2 diffs)

admin/js/filter-controls.js

@@ -1 +1 @@
 $(function() {
-     var c = $('#filter-control');
-     c.css('display','inline');
-     $('#filters-form').hide();
-     c.click(function() {
-          $('#filters-form').show();
-          $(this).hide();
+     
+     $filtersform = $('#filters-form');
+     $filtersform.before('<p><a id="filter-control" class="form-control" href="?" style="display:inline">'+dotclear.msg.filter_posts_list+'</a></p>')
+     
+     if( dotclear.msg.show_filters == 'false' ) {
+          $filtersform.hide();
+     } else {
+          $('#filter-control')
+               .addClass('open')
+               .text(dotclear.msg.cancel_the_filter);
+     }
+     
+     $('#filter-control').click(function() {
+          if( $(this).hasClass('open') ) {
+               if( dotclear.msg.show_filters == 'true' ) {
+                    return true;
+               } else {
+                    $filtersform.hide();
+                    $(this).removeClass('open')
+                            .text(dotclear.msg.filter_posts_list);
+               }
+          } else {
+               $filtersform.show();
+               $(this).addClass('open')
+                       .text(dotclear.msg.cancel_the_filter);
+          }
           return false;
      });

admin/posts.php

@@ -210 +210 @@
      /* DISPLAY
      -------------------------------------------------------- */
-     $starting_script = dcPage::jsLoad('js/_posts_list.js');
-     if (!$show_filters) {
-          $starting_script .= dcPage::jsLoad('js/filter-controls.js');
-     }
-
-     dcPage::open(__('Entries'),$starting_script,
+
+     dcPage::open(__('Entries'),
+          dcPage::jsLoad('js/_posts_list.js').
+          dcPage::jsLoad('js/filter-controls.js').
+          '<script type="text/javascript">'."\n".
+          "//<![CDATA["."\n".
+          dcPage::jsVar('dotclear.msg.show_filters', $show_filters ? 'true':'false')."\n".
+          dcPage::jsVar('dotclear.msg.filter_posts_list',__('Filter posts list'))."\n".
+          dcPage::jsVar('dotclear.msg.cancel_the_filter',__('Cancel the filter'))."\n".
+          "//]]>".
+          "</script>",
           dcPage::breadcrumb(
                array(
@@ -230 +235 @@
      {
           echo
-          '<p class="top-add"><a class="button add" href="post.php">'.__('New entry').'</a></p>';
-          
-          if (!$show_filters) {
-               echo '<p><a id="filter-control" class="form-control" href="#">'.
-               __('Filter posts list').'</a></p>';
-          }
-          
-          echo
+          '<p class="top-add"><a class="button add" href="post.php">'.__('New entry').'</a></p>'.
           '<form action="posts.php" method="get" id="filters-form">'.
-          '<h3 class="hidden">'.__('Filter posts list').'</h3>'.
-
+          '<h3 class="out-of-screen-if-js">'.__('Filters and display options').'</h3>'.
+     
           '<div class="table">'.
           '<div class="cell">'.
@@ -301 +299 @@
           $core->formNonce().
           '</div>'.
-          '</form>'
+          '</form>',
+          $show_filters
           );
      }

admin/style/default.css

@@ -1299 +1299 @@
      color: #000;
      }
+a.form-control.open {
+     background: url(../images/hide.png) no-repeat 4px center;
+     }
 #filters-form {
      border: 1px dashed #999;

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>'.