Changeset 3403:c37bc032a343

Timestamp:

11/11/16 08:08:04 (9 years ago)

Author:

franck <carnet.franck.paul@…>

Branch:

default

Message:

Some tiny adjutsments, addresses #1551 , addresses #2217 , addresses #1566 , addresses #776

Files:

• admin/blogs.php (modified) (2 diffs)
• admin/comments_actions.php (modified) (2 diffs)
• admin/js/_blogs.js (modified) (1 diff)
• admin/js/_blogs_actions.js (modified) (1 diff)
• inc/admin/actions/class.dcactionblogs.php (modified) (2 diffs)
• inc/admin/lib.dc.page.php (modified) (1 diff)
• inc/admin/lib.pager.php (modified) (4 diffs)
• inc/prepend.php (modified) (2 diffs)
• locales/fr/main.po (modified) (1 diff)

admin/blogs.php

@@ -90 +90 @@
      $nb_blog = $counter->f(0);
      $rsStatic = $rs->toStatic();
-     if ($sortby != 'blog_upddt') {
+     if (($sortby != 'blog_upddt') && ($sortby != 'blog_status')) {
           // Sort blog list using lexical order if necessary
           $rsStatic->extend('rsExtUser');
@@ -168 +168 @@
 
      '<div>'.
-     '<p>'.__('Please give your password to confirm the blog deletion.').'</p>'.
-     '<p><label for="pwd">'.__('Your password:').'</label> '.
+     '<p><label for="pwd">'.__('Please give your password to confirm blog(s) deletion:').'</label> '.
      form::password('pwd',20,255).'</p>'.
      '</div>'.

admin/comments_actions.php

@@ -16 +16 @@
 require dirname(__FILE__).'/../inc/admin/prepend.php';
 
+dcPage::check('usage,contentadmin');
+
 if (isset($_REQUEST['redir'])) {
      $u = explode('?',$_REQUEST['redir']);
@@ -28 +30 @@
 }
 
-dcPage::check('usage,contentadmin');
-
 $comments_actions_page = new dcCommentsActionsPage($core,$uri,$args);
 $comments_actions_page->setEnableRedirSelection(false);
-
 $comments_actions_page->process();

admin/js/_blogs.js

@@ -5 +5 @@
      $('#form-blogs td input[type=checkbox]').enableShiftClick();
      dotclear.condSubmit('#form-blogs td input[type=checkbox]','#form-blogs #do-action');
+     $('#form-blogs').submit(function() {
+          var action = $(this).find('select[name="action"]').val();
+          if (action == 'delete') {
+               return window.confirm(dotclear.msg.confirm_delete_blog.replace('%s',$('input[name="blogs[]"]:checked').size()));
+          }
+     });
 });

admin/js/_blogs_actions.js

@@ -1 +1 @@
 $(function() {
-     dotclear.condSubmit('table.posts-list td input[type=checkbox]','input[type=submit]');
+     dotclear.condSubmit('table.blogs-list td input[type=checkbox]','input[type=submit]');
 });

inc/admin/actions/class.dcactionblogs.php

@@ -74 +74 @@
           }
 
-          return 
-          '<table class="posts-list"><tr>'.
+          return
+          '<table class="blogs-list"><tr>'.
           '<th colspan="2">'.__('Blog id').'</th><th>'.__('Blog name').'</th>'.
           '</tr>'.$ret.'</table>';
@@ -108 +108 @@
                     __('Set online') => 'online',
                     __('Set offline') => 'offline',
-                    __('Remove') => 'remove'
+                    __('Set as removed') => 'remove'
                )),
                array('dcDefaultBlogActions','doChangeBlogStatus')

inc/admin/lib.dc.page.php

@@ -762 +762 @@
           self::jsVar('dotclear.msg.confirm_delete_user',
                __('Are you sure you want to delete selected users (%s)?')).
+          self::jsVar('dotclear.msg.confirm_delete_blog',
+               __('Are you sure you want to delete selected blogs (%s)?')).
           self::jsVar('dotclear.msg.confirm_delete_category',
                __('Are you sure you want to delete category "%s"?')).

inc/admin/lib.pager.php

@@ -733 +733 @@
 
           $cols = array(
-               'check' => 
+               'check' =>
                     '<td class="nowrap">'.
                     form::checkbox(array('blogs[]'),$this->rs->blog_id,$checked,'','',0).
                     '</td>',
-               'blog' => 
+               'blog' =>
                     '<td class="nowrap">'.
                     '<a href="'.$this->core->adminurl->get("admin.blog",array('id' => $blog_id)).'"  '.
@@ -743 +743 @@
                     '<img src="images/edit-mini.png" alt="'.__('Edit blog settings').'" /> '.$blog_id.'</a> '.
                     '</td>',
-               'name' => 
+               'name' =>
                     '<td class="maximal">'.
                     '<a href="'.$this->core->adminurl->get("admin.home",array('switchblog' => $this->rs->blog_id)).'" '.
@@ -754 +754 @@
                     html::escapeHTML($this->rs->blog_url).'">'.html::escapeHTML($this->rs->blog_url).
                     ' <img src="images/outgoing-blue.png" alt="" /></a></td>',
-               'posts' => 
+               'posts' =>
                     '<td class="nowrap count">'.
                     $this->core->countBlogPosts($this->rs->blog_id).
                     '</td>',
-               'upddt' => 
+               'upddt' =>
                     '<td class="nowrap count">'.
                     dt::str(__('%Y-%m-%d %H:%M'),strtotime($this->rs->blog_upddt) + dt::getTimeOffset($this->core->auth->getInfo('user_tz'))).
                     '</td>',
-               'status' => 
+               'status' =>
                     '<td class="nowrap status txt-center">'.
                     sprintf(
@@ -775 +775 @@
           $this->core->callBehavior('adminBlogListValue',$this->core,$this->rs,$cols);
 
-          return 
+          return
           '<tr class="line" id="b'.$blog_id.'">'.
           implode(iterator_to_array($cols)).

inc/prepend.php

@@ -68 +68 @@
 $__autoload['adminPostMiniList']    = dirname(__FILE__).'/admin/lib.pager.php';
 $__autoload['adminCommentList']     = dirname(__FILE__).'/admin/lib.pager.php';
-$__autoload['adminBlogList']        = dirname(__FILE__).'/admin/lib.pager.php';
+$__autoload['adminBlogList']        = dirname(__FILE__).'/admin/lib.pager.php';
 $__autoload['adminUserList']        = dirname(__FILE__).'/admin/lib.pager.php';
 $__autoload['dcPager']              = dirname(__FILE__).'/admin/lib.pager.php';
@@ -78 +78 @@
 $__autoload['dcPostsActionsPage']    = dirname(__FILE__).'/admin/actions/class.dcactionposts.php';
 $__autoload['dcCommentsActionsPage'] = dirname(__FILE__).'/admin/actions/class.dcactioncomments.php';
-$__autoload['dcBlogsActionsPage'] = dirname(__FILE__).'/admin/actions/class.dcactionblogs.php';
+$__autoload['dcBlogsActionsPage']   = dirname(__FILE__).'/admin/actions/class.dcactionblogs.php';
 $__autoload['dcActionsPage']         = dirname(__FILE__).'/admin/actions/class.dcaction.php';
 

locales/fr/main.po

@@ -640 +640 @@
 msgstr "Filtrer la liste des blogs"
 
+msgid "Selected blogs action:"
+msgstr "Action sur les blogs sélectionnés :"
+
+msgid "Please give your password to confirm blog(s) deletion:"
+msgstr "Veuillez indiquer votre mot de passe pour confirmer la suppression du ou des blogs :"
+
+msgid "Are you sure you want to delete selected blogs (%s)?"
+msgstr "Êtes-vous sûr de vouloir supprimer les blogs sélectionnés (%s) ?"
+
+msgid "Set online"
+msgstr "Mettre en ligne"
+
+msgid "Set offline"
+msgstr "Mettre hors-ligne"
+
+msgid "Set as removed"
+msgstr "Mettre à l'état retiré"
+
 msgid "Filters"
 msgstr "Filtres"