Changeset 1468:3132a0aca046 for admin/categories.php

Timestamp:

08/19/13 09:55:29 (12 years ago)

Author:

franck <carnet.franck.paul@…>

Branch:

default

Parents:

1466:e67efe636ce1 (diff), 1467:917fc08f3a59 (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:

Merge 2.5 commits into default branch (should be verified)

Files:

• admin/categories.php (modified) (3 diffs)
• admin/categories.php (modified) (4 diffs)

admin/categories.php

@@ -31 +31 @@
           $mov_cat = $mov_cat ? $mov_cat : null;
           if ($mov_cat !== null) {
-               $c = $core->blog->getCategory((integer) $_POST['del_cat']);
+               $c = $core->blog->getCategory((integer) $_POST['mov_cat']);
                if ($c->isEmpty()) {
                     throw new Exception(__('This category does not exist.'));
@@ -144 +144 @@
 echo '</div>';
 
+$categories_combo = array();
+if (!$rs->isEmpty())
+{
+     while ($rs->fetch()) {
+          $catparents_combo[] = $categories_combo[] = new formSelectOption(
+               str_repeat('&nbsp;&nbsp;',$rs->level-1).($rs->level-1 == 0 ? '' : '&bull; ').html::escapeHTML($rs->cat_title),
+               $rs->cat_id
+          );
+     }
+}
+
 echo '<div class="col">'.
 
@@ -149 +160 @@
 '<h3>'.__('Add a new category').'</h3>'.
 '<p><label class="required" for="cat_title"><abbr title="'.__('Required field').'">*</abbr> '.__('Title:').'</label> '.
-form::field('cat_title',30,255).'</p>'.
+form::field('cat_title',30,255,'','maximal').'</p>'.
 '<p><label for="new_cat_parent">'.__('Parent:').'</label> '.
-'<select id="new_cat_parent" name="new_cat_parent">'.
-'<option value="0">'.__('Top level').'</option>';
-while ($rs->fetch()) {
-     echo '<option value="'.$rs->cat_id.'">'.
-          str_repeat('&nbsp;&nbsp;',$rs->level-1).($rs->level-1 == 0 ? '' : '&bull; ').
-          html::escapeHTML($rs->cat_title).'</option>';
-}
-echo
-'</select></p>'.
+form::combo('new_cat_parent',array_merge(array(__('(No cat)') => 0),$categories_combo),'','maximal').
+'</p>'.
 '<p><input type="submit" value="'.__('Create').'" />'.
 $core->formNonce().'</p>'.
+
 '</form>';
 
 if (!$rs->isEmpty())
 {
-     $cats = array();
-     $dest = array('&nbsp;' => '');
-     $l = $rs->level;
-     $full_name = array($rs->cat_title);
-     while ($rs->fetch())
-     {
-          if ($rs->level < $l) {
-               $full_name = array();
-          } elseif ($rs->level == $l) {
-               array_pop($full_name);
-          }
-          $full_name[] = html::escapeHTML($rs->cat_title);
-          
-          $cats[implode(' / ',$full_name)] = $rs->cat_id;
-          $dest[implode(' / ',$full_name)] = $rs->cat_id;
-          
-          $l = $rs->level;
-     }
-     
      echo
-     '<form action="categories.php" method="post" id="delete-category" class="border-top">'.
+     '<form action="categories.php" method="post" id="delete-category">'.
      '<h3>'.__('Remove a category').'</h3>'.
      '<p><label for="del_cat">'.__('Choose a category to remove:').'</label> '.
-     form::combo('del_cat',$cats).'</p> '.
+     form::combo('del_cat',$categories_combo,'','maximal').'</p> '.
      '<p><label for="mov_cat">'.__('And choose the category which will receive its entries:').'</label> '.
-     form::combo('mov_cat',$dest).'</p> '.
+     form::combo('mov_cat',array_merge(array(__('(No cat)') => ''),$categories_combo),'','maximal').'</p> '.
      '<p><input type="submit" value="'.__('Delete').'" class="delete" />'.
      $core->formNonce().'</p>'.
+
      '</form>';
      

admin/categories.php

@@ -73 +73 @@
 dcPage::open(__('Categories'),
      dcPage::jsToolMan()."\n".
-     dcPage::jsLoad('js/_categories.js')
+     dcPage::jsLoad('js/_categories.js'),
+     dcPage::breadcrumb(
+          array(
+               html::escapeHTML($core->blog->name) => '',
+               '<span class="page-title">'.__('Categories').'</span>' => ''
+          ))
 );
 
@@ -88 +93 @@
      dcPage::message(__('The category has been successfully moved.'));
 }
-
-echo '<h2>'.html::escapeHTML($core->blog->name).' &rsaquo; <span class="page-title">'.__('Categories').'</span></h2>';
 
 $rs = $core->blog->getCategories(array('post_type'=>'post'));
@@ -155 +158 @@
 
 '<form action="category.php" method="post">'.
-'<fieldset><legend>'.__('Add a new category').'</legend>'.
-'<p><label class="required" for="cat_title"><abbr title="'.__('Required field').'">*</abbr> '.__('Title:').' '.
-form::field('cat_title',30,255,'','maximal').'</label></p>'.
-'<p><label for="new_cat_parent">'.__('Parent:').' '.
+'<h3>'.__('Add a new category').'</h3>'.
+'<p><label class="required" for="cat_title"><abbr title="'.__('Required field').'">*</abbr> '.__('Title:').'</label> '.
+form::field('cat_title',30,255,'','maximal').'</p>'.
+'<p><label for="new_cat_parent">'.__('Parent:').'</label> '.
 form::combo('new_cat_parent',array_merge(array(__('(No cat)') => 0),$categories_combo),'','maximal').
-'</label></p>'.
-'<p><input type="submit" value="'.__('Create').'" /></p>'.
-$core->formNonce().
-'</fieldset>'.
+'</p>'.
+'<p><input type="submit" value="'.__('Create').'" />'.
+$core->formNonce().'</p>'.
+
 '</form>';
 
@@ -170 +173 @@
      echo
      '<form action="categories.php" method="post" id="delete-category">'.
-     '<fieldset><legend>'.__('Remove a category').'</legend>'.
-     '<p><label for="del_cat">'.__('Choose a category to remove:').' '.
-     form::combo('del_cat',$categories_combo,'','maximal').'</label></p> '.
-     '<p><label for="mov_cat">'.__('And choose the category which will receive its entries:').' '.
-     form::combo('mov_cat',array_merge(array(__('(No cat)') => ''),$categories_combo),'','maximal').'</label></p> '.
-     '<p><input type="submit" value="'.__('Delete').'" class="delete" /></p>'.
-     $core->formNonce().
-     '</fieldset>'.
+     '<h3>'.__('Remove a category').'</h3>'.
+     '<p><label for="del_cat">'.__('Choose a category to remove:').'</label> '.
+     form::combo('del_cat',$categories_combo,'','maximal').'</p> '.
+     '<p><label for="mov_cat">'.__('And choose the category which will receive its entries:').'</label> '.
+     form::combo('mov_cat',array_merge(array(__('(No cat)') => ''),$categories_combo),'','maximal').'</p> '.
+     '<p><input type="submit" value="'.__('Delete').'" class="delete" />'.
+     $core->formNonce().'</p>'.
+
      '</form>';
      
      echo
-     '<form action="categories.php" method="post" id="reset-order">'.
-     '<fieldset><legend>'.__('Reorder categories').'</legend>'.
+     '<form action="categories.php" method="post" id="reset-order" class="border-top">'.
+     '<h3>'.__('Reorder categories').'</h3>'.
      '<p>'.__('This will relocate all categories on the top level').'</p> '.
-     '<p><input type="submit" value="'.__('Reorder').'" /></p>'.
+     '<p><input type="submit" value="'.__('Reorder').'" />'.
      form::hidden(array('reset'),1).
-     $core->formNonce().
-     '</fieldset>'.
+     $core->formNonce().'</p>'.
      '</form>';
 }