Changeset 2455

Timestamp:

09/07/08 04:14:55 (3 months ago)

Author:

chrismeller

Message:

Adding mass delete capability to the comments screen. Thanks to arthus for the patch! Closes #351.

Location:

trunk/htdocs/system

Files:

• admin/comments.php (modified) (2 diffs)
• admin/css/admin.css (modified) (1 diff)
• admin/js/admin.js (modified) (6 diffs)
• admin/logs.php (modified) (1 diff)
• admin/posts.php (modified) (2 diffs)
• classes/adminhandler.php (modified) (4 diffs)

trunk/htdocs/system/admin/comments.php

@@ -41 +41 @@
 
 <div class="container transparent item comments controls">
-    <span class="checkboxandselected pct25">
+    <span class="checkboxandselected pct30">
         <input type="checkbox" id="master_checkbox" name="master_checkbox">
         <label class="selectedtext minor none" for="master_checkbox"><?php _e('None selected'); ?></label>
@@ -61 +61 @@
 
 <div class="container transparent item comments controls">
-    <span class="checkboxandselected pct25">
+    <span class="checkboxandselected pct30">
         <input type="checkbox" id="master_checkbox_2" name="master_checkbox_2">
         <label class="selectedtext minor none" for="master_checkbox_2"><?php _e('None selected'); ?></label>

trunk/htdocs/system/admin/css/admin.css

@@ -1459 +1459 @@
 .navigator span {
     float: left;
+}
+
+.navigator span span {
+    float:none;
 }
 

trunk/htdocs/system/admin/js/admin.js

@@ -326 +326 @@
         visible = $('.item:not(.hidden):not(.ignore) .checkbox input[type=checkbox]:checked').length;
         
+        total= $('.currentposition .total').text();
+        
         count = 0;
         for (var id in itemManage.selected) {
@@ -342 +344 @@
                 this.checked = 1;
             });
-            $('.item.controls label.selectedtext').removeClass('none').addClass('all').text('All ' + count + ' selected');
+            $('.item.controls label.selectedtext').removeClass('none').addClass('all').html('All ' + count + ' visible selected (<a href="#all" class="everything">Select all ' + total + '</a>)');
+            
+            $('.item.controls label.selectedtext .everything').click(function() {
+                itemManage.checkEverything();
+                return false;
+            });
+            
             if(visible != count) {
                 $('.item.controls label.selectedtext').text('All visible selected (' + count + ' total)');
+            }
+            
+            if((total == count) || $('.currentposition .total').length == 0) {
+                $('.item.controls label.selectedtext').removeClass('none').addClass('all').addClass('total').html('All ' + total + ' selected');
             }
         } else {
@@ -351 +363 @@
             });
             $('.item.controls label.selectedtext').removeClass('none').removeClass('all').text(count + ' selected');
+            
             if(visible != count) {
                 $('.item.controls label.selectedtext').text(count + ' selected (' + visible + ' visible)');
             }
         }
+    },
+    checkEverything: function() {
+        itemManage.fetch(0, $('.currentposition .total').text(), false, true);
     },
     uncheckAll: function() {
@@ -414 +430 @@
         itemManage.update( 'delete', id );
     },
-    fetch: function( offset, limit, resetTimeline ) {
+    fetch: function( offset, limit, resetTimeline, silent ) {
         offset = ( offset == null ) ? 0 : offset;
         limit = ( limit == null ) ? 20: limit;
+        silent = ( silent == null ) ? false: silent;
         spinner.start();
 
@@ -425 +442 @@
             dataType: 'json',
             success: function(json) {
-                itemManage.fetchReplace.html(json.items);
-                // if we have a timeline, replace its content
-                if ( resetTimeline && $('.timeline').length !=0 ) {
-                    // we hide and show the timeline to fix a firefox display bug
-                    $('.years').html(json.timeline).hide();
-                    spinner.stop();
+                if(silent) {
+                    itemManage.selected= json.item_ids;
                     itemManage.initItems();
-                    $('.years').show();
-                    timeline.reset();
-                    $('input.checkbox').rangeSelect();
+                } else {
+                    itemManage.fetchReplace.html(json.items);
+                    // if we have a timeline, replace its content
+                    if ( resetTimeline && $('.timeline').length !=0 ) {
+                        // we hide and show the timeline to fix a firefox display bug
+                        $('.years').html(json.timeline).hide();
+                        spinner.stop();
+                        itemManage.initItems();
+                        $('.years').show();
+                        timeline.reset();
+                        $('input.checkbox').rangeSelect();
+                    }
+                    else {
+                        spinner.stop();
+                        itemManage.initItems();
+                        $('input.checkbox').rangeSelect();
+                    }
+                    if ( itemManage.inEdit == true ) {
+                        inEdit.init();
+                        inEdit.deactivate();
+                    }
+                    findChildren();
                 }
-                else {
-                    spinner.stop();
-                    itemManage.initItems();
-                    $('input.checkbox').rangeSelect();
-                }
-                if ( itemManage.inEdit == true ) {
-                    inEdit.init();
-                    inEdit.deactivate();
-                }
-                findChildren();
+                
                 spinner.stop();
+                
             }
         });
@@ -824 +848 @@
         var loupeInfo = timelineHandle.getLoupeInfo();
 
-        $('.currentposition').text( loupeInfo.start +'-'+ loupeInfo.end +' of '+ timeline.totalCount );
+        $('.currentposition').html( loupeInfo.start +'-'+ loupeInfo.end +' of <span class="total inline">'+ timeline.totalCount + '</span>');
         if ($('.currentposition').css('opacity')) $('.currentposition').animate({opacity: 1}, 500)
         

trunk/htdocs/system/admin/logs.php

@@ -76 +76 @@
 
     <div class="item controls">
-        <span class="checkboxandselected pct25">
+        <span class="checkboxandselected pct40">
             <input type="checkbox" id="master_checkbox" name="master_checkbox">
             <label class="selectedtext minor none" for="master_checkbox"><?php _e('None selected'); ?></label>

trunk/htdocs/system/admin/posts.php

@@ -38 +38 @@
     <input type="hidden" name="timestamp" id="timestamp" value="<?php echo $wsse['timestamp']; ?>">
     <input type="hidden" name="PasswordDigest" id="PasswordDigest" value="<?php echo $wsse['digest']; ?>">
-    <span class="checkboxandselected pct25">
+    <span class="checkboxandselected pct30">
         <input type="checkbox" id="master_checkbox" name="master_checkbox">
         <label class="selectedtext minor none" for="master_checkbox"><?php _e('None selected'); ?></label>
@@ -59 +59 @@
     <input type="hidden" name="timestamp" id="timestamp" value="<?php echo $wsse['timestamp']; ?>">
     <input type="hidden" name="PasswordDigest" id="PasswordDigest" value="<?php echo $wsse['digest']; ?>">
-    <span class="checkboxandselected pct25">
+    <span class="checkboxandselected pct30">
         <input type="checkbox" id="master_checkbox_2" name="master_checkbox_2">
         <label class="selectedtext minor none" for="master_checkbox_2"><?php _e('None selected'); ?></label>

trunk/htdocs/system/classes/adminhandler.php

@@ -1348 +1348 @@
             $this->theme->years= $years;
         }
+        
     }
 
@@ -1452 +1453 @@
         $items= $this->theme->fetch( 'posts_items' );
         $timeline= $this->theme->fetch( 'timeline_items' );
-
+        
+        $item_ids= array();
+        
+        foreach($this->theme->posts as $post) {
+            $item_ids['p' . $post->id]= 1;
+        }
+        
         $output= array(
             'items' => $items,
+            'item_ids' => $item_ids,
             'timeline' => $timeline,
         );
@@ -1475 +1483 @@
         $timeline= $this->theme->fetch( 'timeline_items' );
 
+        $item_ids= array();
+        
+        foreach($this->theme->comments as $comment) {
+            $item_ids['p' . $comment->id]= 1;
+        }
+        
         $output= array(
             'items' => $items,
+            'item_ids' => $item_ids,
             'timeline' => $timeline,
         );
@@ -1853 +1868 @@
         $timeline= $this->theme->fetch( 'timeline_items' );
 
+        $item_ids= array();
+        
+        foreach($this->theme->logs as $log) {
+            $item_ids['p' . $log->id]= 1;
+        }
+        
         $output= array(
             'items' => $items,
+            'item_ids' => $item_ids,
             'timeline' => $timeline,
         );