Changeset 1514:fe93bb38a591

Timestamp:

08/21/13 10:45:32 (12 years ago)

Author:

Anne Kozlika <kozlika@…>

Branch:

default

Message:

Filters box. Add h4 and replace "Apply filters" by "Apply filters and display options".

Files:

• admin/blogs.php (modified) (3 diffs)
• admin/comments.php (modified) (4 diffs)
• admin/posts.php (modified) (4 diffs)
• admin/style/default.css (modified) (4 diffs)
• admin/users.php (modified) (3 diffs)
• locales/fr/main.po (modified) (1 diff)

admin/blogs.php

@@ -97 +97 @@
      echo
      '<form action="blogs.php" method="get" id="filters-form">'.
-     '<h3>'.__('Filter blogs list').'</h3>'.
+     '<h3 class="hidden">'.__('Filter blogs list').'</h3>'.
      
      '<div class="table">'.
      '<div class="cell">'.
+     '<h4>'.__('Filters').'</h4>'.
      '<p><label for="q" class="ib">'.__('Search:').'</label> '.
      form::field('q',20,255,html::escapeHTML($q)).'</p>'.
@@ -106 +107 @@
      
      '<div class="cell filters-options">'.
+     '<h4>'.__('Display options').'</h4>'.
      '<p><label for="sortby" class="ib">'.__('Order by:').'</label> '.
      form::combo('sortby',$sortby_combo,html::escapeHTML($sortby)).'</p>'.
@@ -115 +117 @@
      '</div>'.
 
-     '<p><input type="submit" value="'.__('Apply filters').'" />'.
+     '<p><input type="submit" value="'.__('Apply filters and display options').'" />'.
      '<br class="clear" /></p>'. //Opera sucks
      '</form>';

admin/comments.php

@@ -219 +219 @@
      echo
      '<form action="comments.php" method="get" id="filters-form">'.
-     '<h3>'.__('Filter comments and trackbacks list').'</h3>'.
+     '<h3 class="hidden">'.__('Filter comments and trackbacks list').'</h3>'.
      '<div class="table">'.
 
      '<div class="cell">'.
+     '<h4>'.__('Filters').'</h4>'.
      '<p><label for="type" class="ib">'.__('Type:').'</label> '.
      form::combo('type',$type_combo,$type).'</p> '.
@@ -229 +230 @@
      '</div>'.
      
-     '<div class="cell">'.
+     '<div class="cell filters-sibling-cell">'.
      '<p><label for="author" class="ib">'.__('Author:').'</label> '.
      form::field('author',20,255,html::escapeHTML($author)).'</p>'.
@@ -237 +238 @@
      
      '<div class="cell filters-options">'.
+     '<h4>'.__('Display options').'</h4>'.
      '<p><label for="sortby" class="ib">'.__('Order by:').'</label> '.
      form::combo('sortby',$sortby_combo,$sortby).'</p>'.
@@ -247 +249 @@
      
      '</div>'.
-     '<p><input type="submit" value="'.__('Apply filters').'" />'.
+     '<p><input type="submit" value="'.__('Apply filters and display options').'" />'.
      '<br class="clear" /></p>'. //Opera sucks
      '</form>';

admin/posts.php

@@ -269 +269 @@
      echo
      '<form action="posts.php" method="get" id="filters-form">'.
-     '<h3>'.__('Filter posts list').'</h3>'.
+     '<h3 class="hidden">'.__('Filter posts list').'</h3>'.
 
      '<div class="table">'.
      '<div class="cell">'.
+     '<h4>'.__('Filters').'</h4>'.
      '<p><label for="user_id" class="ib">'.__('Author:').'</label> '.
      form::combo('user_id',$users_combo,$user_id).'</p>'.
@@ -281 +282 @@
      '</div>'.
      
-     '<div class="cell">'.
+     '<div class="cell filters-sibling-cell">'.
      '<p><label for="selected" class="ib">'.__('Selected:').'</label> '.
      form::combo('selected',$selected_combo,$selected).'</p>'.
@@ -291 +292 @@
      
      '<div class="cell filters-options">'.
+     '<h4>'.__('Display options').'</h4>'.
      '<p><label for="sortby" class="ib">'.__('Order by:').'</label> '.
      form::combo('sortby',$sortby_combo,$sortby).'</p>'.
@@ -301 +303 @@
      '</div>'.
 
-     '<p><input type="submit" value="'.__('Apply filters').'" />'.
+     '<p><input type="submit" value="'.__('Apply filters and display options').'" />'.
      '<br class="clear" /></p>'. //Opera sucks
      '</form>';

admin/style/default.css

@@ -883 +883 @@
 option.avail10n {
      background: transparent url(../images/check-on.png) no-repeat 0 50%;
+}
+/* ----------------------------------------------------------  Antispam extensions */
+.antispam {
+     height: 200px;
+     overflow: auto;
+     margin-bottom: 1em;
+}
+.antispam p {
+     margin: 1px 0 0 0;
+     padding: 0.2em 0.5em;
+}
+.antispam p.global {
+     background: #ccff99;
 }
 /* ------------------------------------------------------------------ contextual help */
@@ -1586 +1599 @@
      padding: 0;
      margin-bottom: 1em;
-     margin-top: 1.5em;
+     margin-top: .5em;
 }
 #filters-form .cell {
@@ -1593 +1606 @@
      vertical-align: top;
 }
+#filters-form .filters-sibling-cell {
+     padding-top: 3.8em;
+}
 #filters-form .filters-options {
      padding-left: 2em;
@@ -1607 +1623 @@
 #filters-form select {
      width: 14em;
+}
+#filters-form h4 {
+     margin-top: 0;
+     margin-bottom: 2em;
 }
 

admin/users.php

@@ -120 +120 @@
      echo
      '<form action="users.php" method="get" id="filters-form">'.
-     '<h3>'.__('Filter users list').'</h3>'.
+     '<h3 class="hidden">'.__('Filter users list').'</h3>'.
      
      '<div class="table">'.
      '<div class="cell">'.
+     '<h4>'.__('Filters').'</h4>'.
      '<p><label for="q" class="ib">'.__('Search:').'</label> '.
      form::field('q',20,255,html::escapeHTML($q)).'</p>'.
@@ -129 +130 @@
 
      '<div class="cell filters-options">'.
+     '<h4>'.__('Display options').'</h4>'.
      '<p><label for="sortby" class="ib">'.__('Order by:').'</label> '.
      form::combo('sortby',$sortby_combo,$sortby).'</p> '.
@@ -138 +140 @@
      '</div>'.
 
-     '<p><input type="submit" value="'.__('Apply filters').'" />'.    
+     '<p><input type="submit" value="'.__('Apply filters and display options').'" />'.    
      '<br class="clear" /></p>'. //Opera sucks
      '</form>';

locales/fr/main.po

@@ -3141 +3141 @@
 msgid "Edit"
 msgstr "Modifier"
+
+msgid "Display options"
+msgstr "Options d\'affichage"
+
+msgid "Apply filters and display options"
+msgstr "Appliquer les filtres et options d\'affichage"