Changeset 1525:c30081595436 for admin/js

Timestamp:

08/22/13 20:14:09 (12 years ago)

Author:

Nicolas <nikrou77@…>

Branch:

default

Message:

Fix issue #1541 : improve and simplify categories page.

Location:

admin/js

Files:

• _categories.js (modified) (1 diff)
• _post.js (modified) (16 diffs)
• common.js (modified) (2 diffs)

admin/js/_categories.js

@@ -1 +1 @@
 /* TODO: Some nice drag and drop on categories */
 $(function() {
-     $('form#delete-category').submit(function() {
-          var c_id = $('#del_cat').val();
-          var c_name = $('#del_cat option[value='+c_id+']').text();
-          return window.confirm(dotclear.msg.confirm_delete_category.replace('%s',c_name));
+     $('.checkboxes-helpers').each(function() {
+          dotclear.checkboxesHelpers(this);
      });
-});
 
-$(function() {
+     dotclear.categoriesActionsHelper();
+
+
      $('form#reset-order').submit(function() {
           return window.confirm(dotclear.msg.confirm_reorder_categories);

admin/js/_post.js

@@ -1 +1 @@
 dotclear.commentExpander = function(line) {
      var td = line.firstChild;
-     
+
      var img = document.createElement('img');
      img.src = dotclear.img_plus_src;
@@ -9 +9 @@
      img.line = line;
      img.onclick = function() { dotclear.viewCommentContent(this,this.line); };
-     
+
      td.insertBefore(img,td.firstChild);
 };
@@ -15 +15 @@
 dotclear.viewCommentContent = function(img,line) {
      var commentId = line.id.substr(1);
-     
+
      var tr = document.getElementById('ce'+commentId);
-     
+
      if (!tr) {
           tr = document.createElement('tr');
@@ -25 +25 @@
           td.className = 'expand';
           tr.appendChild(td);
-          
+
           img.src = dotclear.img_minus_src;
           img.alt = dotclear.img_minus_alt;
-          
+
           // Get comment content
           $.get('services.php',{f:'getCommentById',id: commentId},function(data) {
                var rsp = $(data).children('rsp')[0];
-               
+
                if (rsp.attributes[0].value == 'ok') {
                     var comment = $(rsp).find('comment_display_content').text();
-                    
+
                     if (comment) {
                          $(td).append(comment);
@@ -42 +42 @@
                          var comment_ip = $(rsp).find('comment_ip').text();
                          var comment_spam_disp = $(rsp).find('comment_spam_disp').text();
-                         
+
                          $(td).append('<p><strong>' + dotclear.msg.website +
                          '</strong> ' + comment_site + '<br />' +
@@ -52 +52 @@
                }
           });
-          
+
           $(line).toggleClass('expand');
           line.parentNode.insertBefore(tr,line.nextSibling);
@@ -74 +74 @@
 $(function() {
      if (!document.getElementById) { return; }
-     
+
      if (document.getElementById('edit-entry'))
      {
@@ -83 +83 @@
                contentTb.switchMode(this.value);
           });
-          
+
           var excerptTb = new jsToolBar(document.getElementById('post_excerpt'));
           var contentTb = new jsToolBar(document.getElementById('post_content'));
           excerptTb.context = contentTb.context = 'post';
      }
-     
+
      if (document.getElementById('comment_content')) {
           var commentTb = new jsToolBar(document.getElementById('comment_content'));
      }
-     
+
      // Post preview
      $('#post-preview').modalWeb($(window).width()-40,$(window).height()-40);
-     
+
      // Tabs events
      $('#edit-entry').onetabload(function() {
           dotclear.hideLockable();
-          
+
           // Add date picker
           var post_dtPick = new datePicker($('#post_dt').get(0));
           post_dtPick.img_top = '1.5em';
           post_dtPick.draw();
-          
+
           // Confirm post deletion
           $('input[name="delete"]').click(function() {
-                    return window.confirm(dotclear.msg.confirm_delete_post);
-          });
-          
+               return window.confirm(dotclear.msg.confirm_delete_post);
+          });
+
           // Hide some fields
           $('#notes-area label').toggleWithLegend($('#notes-area').children().not('label'),{
                cookie: 'dcx_post_notes',
-               hide: $('#post_notes').val() == ''
+                  hide: $('#post_notes').val() == '',
+                  legend_click: true
           });
           $('#new_cat').toggleWithLegend(
                $('#new_cat').parent().children().not('#new_cat'),
-               {} // no cookie on new category as we don't use this every day
+               {legend_click: true} // no cookie on new category as we don't use this every day
           );
           $('#post_lang').parent().toggleWithLegend($('#post_lang'),{
-               cookie: 'dcx_post_lang'
+              cookie: 'dcx_post_lang',
+              legend_click: true
           });
           $('#post_password').parent().toggleWithLegend($('#post_password'),{
                cookie: 'dcx_post_password',
-               hide: $('#post_password').val() == ''
+              hide: $('#post_password').val() == '',
+              legend_click: true
           });
           $('#post_status').parent().toggleWithLegend($('#post_status'),{
-               cookie: 'dcx_post_status'
+                  cookie: 'dcx_post_status',
+              legend_click: true
           });
           $('#post_dt').parent().toggleWithLegend($('#post_dt').parent().children().not('label'),{
-               cookie: 'dcx_post_dt'
+              cookie: 'dcx_post_dt',
+              legend_click: true
           });
           $('#post_format').parent().toggleWithLegend($('#post_format').parent().children().not('label').add($('#post_format').parents('p').next()),{
-               cookie: 'dcx_post_format'
+              cookie: 'dcx_post_format',
+              legend_click: true
           });
           $('#cat_id').parent().toggleWithLegend($('#cat_id'),{
-               cookie: 'cat_id'
+              cookie: 'cat_id',
+              legend_click: true
           });
           $('#post_url').parent().toggleWithLegend($('#post_url').parent().children().not('label'),{
-               cookie: 'post_url'
+              cookie: 'post_url',
+              legend_click: true
           });
           // We load toolbar on excerpt only when it's ready
@@ -147 +155 @@
                hide: $('#post_excerpt').val() == ''
           });
-          
+
           // Load toolbars
           contentTb.switchMode(formatField.value);
-          
+
           // Replace attachment remove links by a POST form submit
           $('a.attachment-remove').click(function() {
@@ -162 +170 @@
                return false;
           });
-          
+
           // Markup validator
           var h = document.createElement('h4');
@@ -177 +185 @@
                     lang: $('#post_lang').get(0).value
                };
-               
+
                $.post('services.php',params,function(data) {
                     if ($(data).find('rsp').attr('status') != 'ok') {
@@ -183 +191 @@
                          return false;
                     }
-                    
+
                     if ($(data).find('valid').text() == 1) {
                          var p = document.createElement('p');
                          p.id = 'markup-validator';
-                         
+
                          if ($('#markup-validator').length > 0) {
                               $('#markup-validator').remove();
                          }
-                         
+
                          $(p).addClass('message');
                          $(p).text(dotclear.msg.xhtml_valid);
@@ -201 +209 @@
                          var div = document.createElement('div');
                          div.id = 'markup-validator';
-                         
+
                          if ($('#markup-validator').length > 0) {
                               $('#markup-validator').remove();
                          }
-                         
+
                          $(div).addClass('error');
                          $(div).html('<p><strong>' + dotclear.msg.xhtml_not_valid + '</strong></p>' + $(data).find('errors').text());
@@ -213 +221 @@
                          });
                     }
-                    
+
                     return false;
                });
-               
+
                return false;
           });
-          
+
           a.appendChild(document.createTextNode(dotclear.msg.xhtml_validator));
           h.appendChild(a);
           $(h).appendTo('#entry-content');
-          
+
           // Check unsaved changes before XHTML conversion
           var excerpt = $('#post_excerpt').val();
@@ -230 +238 @@
                if (excerpt != $('#post_excerpt').val() || content != $('#post_content').val()) {
                     return window.confirm(dotclear.msg.confirm_change_post_format);
-               }    
+               }
           });
      });
-     
+
      $('#comments').onetabload(function() {
           $('.comments-list tr.line').each(function() {
@@ -241 +249 @@
                dotclear.checkboxesHelpers(this);
           });
-          
+
           dotclear.commentsActionsHelper();
      });
-     
+
      $('#add-comment').onetabload(function() {
           commentTb.draw('xhtml');

admin/js/common.js

@@ -121 +121 @@
 
           $(ctarget).css('cursor','pointer');
+          if (p.legend_click) {
+               $(ctarget).find('label').css('cursor','pointer');
+          }
           $(ctarget).click(function() {
                toggle(i,p.speed);
@@ -290 +293 @@
                if (action == 'delete') {
                     return window.confirm(dotclear.msg.confirm_delete_posts.replace('%s',$('input[name="entries[]"]:checked').size()));
+               }
+
+               return true;
+          });
+     },
+
+     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()));
                }