Changeset 1957:18e928446e18 for admin

Timestamp:

09/19/13 22:33:38 (12 years ago)

Author:

Anne Kozlika <kozlika@…>

Branch:

default

Message:

Categories, work in progress. Quelques CSS. Gestion petits écrans + bloc réordonnancement à revoir.

Location:

admin

Files:

• categories.php (modified) (4 diffs)
• style/default.css (modified) (2 diffs)

admin/categories.php

@@ -144 +144 @@
      while ($rs->fetch())
      {
-          $attr = 'id="cat_'.$rs->cat_id.'"';
+          $attr = 'id="cat_'.$rs->cat_id.'" class="cat-line clearfix"';
 
           if ($rs->level > $level) {
@@ -156 +156 @@
           }
 
+          echo   
+          '<p><label class="classic" for="cat-'.$rs->cat_id.'"><a href="category.php?id='.$rs->cat_id.'">'.html::escapeHTML($rs->cat_title).'</a></label> </p>'.
+          '<p>(<a href="posts.php?cat_id='.$rs->cat_id.'">'.
+          sprintf(($rs->nb_post > 1 ? __('%d entries') : __('%d entry') ),$rs->nb_post).'</a>'.
+          ', '.__('total:').' '.$rs->nb_total.')</p>'.
+          '<p><span class="cat-url">'.__('URL:').' <code>'.html::escapeHTML($rs->cat_url).'</code></span></p>';
+
           echo
-          '<p>'.       
-          '<label class="classic" for="cat-'.$rs->cat_id.'"><a href="category.php?id='.$rs->cat_id.'">'.html::escapeHTML($rs->cat_title).'</a></label>'.
-          ' (<a href="posts.php?cat_id='.$rs->cat_id.'">'.
-          sprintf(($rs->nb_post > 1 ? __('%d entries') : __('%d entry') ),$rs->nb_post).'</a>'.
-          ', '.__('total:').' '.$rs->nb_total.') '.
-               '<span class="cat-url">'.__('URL:').' <code>'.html::escapeHTML($rs->cat_url).'</code></span>';
-
+          '<p class="cat-buttons">';
           if ($rs->nb_total>0) {
                // remove current category
-               echo              
+               echo
+               '<label>'.__('Move entries to').'</label> '.              
                form::combo('mov_cat['.$rs->cat_id.']',array_filter($categories_combo, create_function('$cat', 'return $cat->value!=$GLOBALS[\'rs\']->cat_id;')),'','').
-               '<input type="submit" class="" name="mov['.$rs->cat_id.']" value="'.__('Ok').'"/>';
+               ' <input type="submit" class="reset" name="mov['.$rs->cat_id.']" value="'.__('OK').'"/>';
              
                $attr_disabled = ' disabled="disabled"';
@@ -189 +191 @@
      '</div>';
 
-     echo '<div class="fieldset"><h3 class="clear hidden-if-no-js">'.__('Categories order').'</h3>';
+     echo '<div class="border-top"><h3 class="clear hidden-if-no-js">'.__('Categories order').'</h3>';
 
      if ($core->auth->check('categories',$core->blog->id) && $rs->count()>1) {
@@ -203 +205 @@
 
      echo
-     '<p class="hidden-if-js right"><input type="submit" name="reset" value="'.__('Reorder all categories on the top level and delete selected categories').'" />'.
+     '<p class="hidden-if-js right"><input type="submit" name="reset" value="'.__('Reorder all categories on the top level').'" />'.
      $core->formNonce().'</p>'.
      '<p class="hidden-if-no-js"><input type="submit" name="reset" value="'.__('Reorder all categories on the top level').'" />'.

admin/style/default.css

@@ -1619 +1619 @@
      padding: 0;
      }
-     #categories li {
-          margin: .5em 0;
-          padding: .5em 1.2em;
-          border: 1px solid #ccc;
-          border-left: 8px solid #E5E3DA;
+     .cat-line {
+          position: relative;
+          margin: .66em 0;
+          padding: .66em 1em;
+          border: 1px solid #bbb;
+          border-left: 6px solid #bbb;
           border-radius: 3px;
           }
-          #categories label a {
+          .cat-line label a {
                font-weight: bold;
                }
-          #categories li p {
+          .cat-line p, .cat-line label {
                margin: 0;
                display: inline-block;
-               }
-          #categories input[type="checkbox"] {
-               margin-right: .8em;
                }
           .cat-url {
@@ -1643 +1641 @@
                min-height: 2.5em;
                }
-          #categories input.cat-rank {
+/*        #categories input.cat-rank {
                float: right;
                margin-left: 30px;
                }
+*/
+.cat-buttons { 
+     float: right; 
+     margin-top: -.2em;
+     }
+.cat-buttons select {
+     padding: 1px 2px 3px 2px;
+     margin-right: .25em;
+     }
+.cat-line label {
+     margin-right: .25em;
+     }
+.cat-buttons .reset {
+     padding-left: 4px;
+     padding-right: 4px;
+     }
+#categories ul ul {
+     margin-right: 2em;
+     margin-top: 1em;
+     }
+.cat-line .cat-line {
+     border: 1px solid #ccc;
+     border-left-width: 3px;
+     }
 #categories h4 {
      margin: 0;