Changeset 782:01efbf050a8a for admin/posts_actions.php

Timestamp:

12/06/11 11:43:14 (14 years ago)

Author:

Dsls <dsls@…>

Branch:

formfilters

Parents:

781:b509ac00bf4a (diff), 779:58c45f1b96e5 (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:

Merged last default changes with formfilter branch

Files:

• admin/posts_actions.php (modified) (1 diff)
• admin/posts_actions.php (modified) (4 diffs)

admin/posts_actions.php

@@ -31 +31 @@
      {
           $redir =
-          'posts.php?user_id='.$_POST['user_id'].
-          '&cat_id='.$_POST['cat_id'].
-          '&status='.$_POST['status'].
-          '&selected='.$_POST['selected'].
-          '&month='.$_POST['month'].
-          '&lang='.$_POST['lang'].
-          '&sortby='.$_POST['sortby'].
-          '&order='.$_POST['order'].
-          '&page='.$_POST['page'].
-          '&nb='.$_POST['nb'];
+          'posts.php?'.urldecode($_POST['f_query']);
      }
      

admin/posts_actions.php

@@ -4 +4 @@
 # This file is part of Dotclear 2.
 #
-# Copyright (c) 2003-2010 Olivier Meunier & Association Dotclear
+# Copyright (c) 2003-2011 Olivier Meunier & Association Dotclear
 # Licensed under the GPL version 2.0 license.
 # See LICENSE file or
@@ -198 +198 @@
 if ($action == 'category')
 {
-     echo '<h2>'.__('Change category for entries').'</h2>';
+     echo '<h2 class="page-title">'.__('Change category for entries').'</h2>';
      
      # categories list
@@ -207 +207 @@
           while ($categories->fetch()) {
                $categories_combo[] = new formSelectOption(
-                    str_repeat('&nbsp;&nbsp;',$categories->level-1).'&bull; '.html::escapeHTML($categories->cat_title),
+                    str_repeat('&nbsp;&nbsp;',$categories->level-1).
+                    ($categories->level-1 == 0 ? '' : '&bull; ').html::escapeHTML($categories->cat_title),
                     $categories->cat_id
                );
@@ -228 +229 @@
 elseif ($action == 'author' && $core->auth->check('admin',$core->blog->id))
 {
-     echo '<h2>'.__('Change author for entries').'</h2>';
+     echo '<h2 class="page-title">'.__('Change author for entries').'</h2>';
      
      echo