Changeset 2138:73902254112c

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:

• admin/style/default.css (modified) (1 diff)
• admin/style/default.css (modified) (10 diffs)
• inc/admin/lib.pager.php (modified) (6 diffs)
• inc/admin/lib.pager.php (modified) (1 diff)

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;

admin/style/default.css

@@ -1218 +1218 @@
      }
 th.first img {
-     padding-right: 24px;
+     padding-right: 34px;
      }
 tr.line img.expand, th img.expand {
@@ -1370 +1370 @@
      box-sizing: border-box; 
      }
-     #login-screen input.login {
+     #login-screen input.login, #login-screen input.login:focus {
           padding-top: 6px;
           padding-bottom: 6px;
@@ -1495 +1495 @@
           .db-items li, .db-contents li {
                margin: 0.25em 0 0 0;
-               color: #676e78;
                }
      #news dt {
@@ -1677 +1676 @@
           padding: .66em 1em;
           border: 1px solid #bbb;
-          border-left: 6px solid #bbb;
           border-radius: 3px;
           }
+          .cat-line label {
+               margin-right: .25em;
+               }
           .cat-line label a {
                font-weight: bold;
@@ -1686 +1687 @@
                margin: 0;
                display: inline-block;
+               }
+          p.cat-title {
+               margin-right: 1em;
+               }
+          .cat-nb-posts a {
+               color: #333;
                }
           .cat-url {
@@ -1703 +1710 @@
      margin-right: .25em;
      }
-.cat-line label {
-     margin-right: .25em;
-     }
 .cat-buttons .reset {
      padding-left: 4px;
@@ -1716 +1720 @@
 .cat-line .cat-line {
      border: 1px solid #dfdfdf;
-     border-left-width: 3px;
-     }
-#categories h4 {
-     margin: 0;
-     }
-     #categories h4 span {
-          font-weight: normal;
-          }
+     }
 .cat-actions {
      line-height: 2;
@@ -1981 +1978 @@
      float: left;
      width: 100%;
-     margin-right: -18em;
+     margin-right: -16em;
      }
 #entry-content {
-     margin-right: 20em;
+     margin-right: 18em;
      margin-left: 0;
      }
@@ -1997 +1994 @@
           }
 #entry-sidebar {
-     width: 18em;
+     width: 16em;
      float: right;
      }
+     #entry-sidebar h4 {
+          font-size: 13px;
+          font-size: 1.3rem;
+          margin-top: .3em;
+          }
      #entry-sidebar select {
           width: 100%;
@@ -2567 +2569 @@
  .colorEndValidatorMsg {
      color: #ffcc00;
-     }    
+     }

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