Changeset 1563:f219d9220033

Timestamp:

08/24/13 14:31:03 (12 years ago)

Author:

Nicolas <nikrou77@…>

Branch:

default

Message:

Issue #1541: no combo box because only one action
deletion works without javascript (category that can received entries is not hidden)

Location:

admin

Files:

• categories.php (modified) (1 diff)
• js/_categories.js (modified) (1 diff)
• js/common.js (modified) (1 diff)

admin/categories.php

@@ -183 +183 @@
      if (count($combo_action)>0) {
            echo
-           '<div class="two-cols">'.
+           '<div class="three-cols">'.
            '<p class="col checkboxes-helpers"></p>'.
-           '<div class="col right">'.
-           '<p class="cat-actions"><label for="action" class="classic">'.__('Selected categories action:').'</label> '.
-           form::combo('action',$combo_action).' '.
-           '<span id="mov-cat"><label for="mov_cat">'.__('Choose the category which will receive its entries:').'</label> '.
-           form::combo('mov_cat',array_merge(array(__('(No cat)') => ''),$categories_combo),'','').' </span>'.
+           '<div class="col" id="mov-cat">'.
+           '<label for="mov_cat">'.__('Choose the category which will receive its entries:').'</label> '.
+           form::combo('mov_cat',array_merge(array(__('(No cat)') => ''),$categories_combo),'','').
+           '</div>'.
+           '<div class="col">'.
            $core->formNonce().
-           '<input type="submit" value="'.__('OK').'" /></p>'.
+           '<input type="submit" value="'.__('Delete').'"/>'.
            '</div>'.
            '</div>'.

admin/js/_categories.js

@@ -18 +18 @@
      });
 
-     $('#mov_cat').parent().hide();
-     $('input[name="categories[]"]').click(function() {
-          if ($('input[name="categories[]"].notempty:checked').length>0) {
-               $('#mov_cat').parent().show().parent().removeClass('two-cols').addClass('three-cols');
-          } else {
-               $('#mov_cat').parent().hide().parent().removeClass('three-cols').addClass('two-cols');
-          }
-     });
-
      dotclear.categoriesActionsHelper();
 

admin/js/common.js

@@ -304 +304 @@
      categoriesActionsHelper: function() {
           $('#form-categories').submit(function() {
-               var action = $(this).find('select[name="action"]').val();
-               var checked = false;
-
-               $(this).find('input[name="categories[]"]').each(function() {
-                    if (this.checked) {
-                         checked = true;
-                    }
-               });
-
-               if (!checked) { return false; }
-
-               if (action == 'delete') {
-                    return window.confirm(dotclear.msg.confirm_delete_categories.replace('%s',$('input[name="categories[]"]:checked').size()));
-               }
-
-               return true;
+              var nb_ckecked = $('input[name="categories[]"]:checked').length;
+              if (nb_ckecked==0) {
+               return false;
+              }
+
+              return window.confirm(dotclear.msg.confirm_delete_categories.replace('%s',nb_ckecked));
           });
      },