Changeset 1745

Timestamp:

05/18/08 20:44:40 (8 months ago)

Author:

dmondark

Message:

Committing patch supplied to #262. Thanks bjohnson.

Location:

trunk/htdocs/system

Files:

• admin/comments.php (modified) (3 diffs)
• admin/entries.php (modified) (3 diffs)
• admin/js/admin.js (modified) (5 diffs)
• admin/timeline_items.php (added)
• classes/adminhandler.php (modified) (5 diffs)
• classes/comments.php (modified) (3 diffs)
• classes/posts.php (modified) (3 diffs)

trunk/htdocs/system/admin/comments.php

@@ -11 +11 @@
         <div class="years">
             <div class="months">
-                <?php foreach($monthcomments as $cdata): ?>
-                <div><span style="width: <?php echo $cdata->ct; ?>px"><?php echo date('M', mktime(0, 0, 0, $cdata->month)) ?></span></div>
-                <?php endforeach; ?>
+                <?php $theme->display( 'timeline_items' )?>
             </div>
         </div>
@@ -83 +81 @@
     $.post(
         '<?php echo URL::get('admin_ajax', array('context' => 'comments')) ?>',
-        'do_search=1&search=' + liveSearch.input.val() +
-        <?php
-                $vars= Controller::get_handler_vars();
-                $out= '';
-                $keys= array_keys($vars);
-                foreach($keys as $key) {
-                    $out .= "&$key=$vars[$key]";
-                }
-                echo '"' . $out . '"';
-            ?>,
+        '&search=' + liveSearch.input.val() + '&limit=20',
         function(json) {
             $('#comments').html(json.items);
+            $('.years .months').html(json.timeline);
             spinner.stop();
             itemManage.initItems();
+            timeline.reset();
             $('.modulecore .item:first-child, ul li:first-child').addClass('first-child').show();
             $('.modulecore .item:last-child, ul li:last-child').addClass('last-child');
@@ -107 +98 @@
     spinner.start();
 
+    var search_args= $('.search input').val();
+
     $.ajax({
-        type: "POST",
+        type: 'POST',
         url: "<?php echo URL::get('admin_ajax', array('context' => 'comments')); ?>",
-        data: "offset=" + (parseInt(c) - parseInt(b)) + "&limit=" + (1 + parseInt(b) - parseInt(a)) +
-            <?php
-                $vars= Controller::get_handler_vars();
-                $out= '';
-                $keys= array_keys($vars);
-                foreach($keys as $key) {
-                    $out .= "&$key=$vars[$key]";
-                }
-                echo '"' . $out . '"';
-            ?>,
+        data: 'offset=' + (parseInt(c) - parseInt(b)) + '&limit=' + (1 + parseInt(b) - parseInt(a)) + '&search=' + search_args,
         dataType: 'json',
         success: function(json){

trunk/htdocs/system/admin/entries.php

@@ -12 +12 @@
         <div class="years">
             <div class="months">
-                <?php foreach($monthposts as $pdata): ?>
-                <div><span style="width: <?php echo $pdata->ct; ?>px"><?php echo date('M', mktime(0, 0, 0, $pdata->month)) ?></span></div>
-                <?php endforeach; ?>
+                <?php $theme->display( 'timeline_items' )?>
             </div>
         </div>
@@ -61 +59 @@
     $.post(
         '<?php echo URL::get('admin_ajax', array('context' => 'entries')) ?>',
-        'do_search=1&search=' + liveSearch.input.val() +
-        <?php
-                $vars= Controller::get_handler_vars();
-                $out= '';
-                $keys= array_keys($vars);
-                foreach($keys as $key) {
-                    $out .= "&$key=$vars[$key]";
-                }
-                echo '"' . $out . '"';
-            ?>,
+        '&search=' + liveSearch.input.val() + '&limit=20',
         function(json) {
             $('.entries').html(json.items);
+            $('.years .months').html(json.timeline);
             spinner.stop();
             itemManage.initItems();
+            timeline.reset();
             $('.modulecore .item:first-child, ul li:first-child').addClass('first-child').show();
             $('.modulecore .item:last-child, ul li:last-child').addClass('last-child');
@@ -84 +75 @@
 timelineHandle.loupeUpdate = function(a,b,c) {
     spinner.start();
+    
+    var search_args= $('.search input').val();
 
     $.ajax({
-        type: "POST",
+        type: 'POST',
         url: "<?php echo URL::get('admin_ajax', array('context' => 'entries')); ?>",
-        data: "offset=" + (parseInt(c) - parseInt(b)) + "&limit=" + (1 + parseInt(b) - parseInt(a)) +
-            <?php
-                $vars= Controller::get_handler_vars();
-                $out= '';
-                $keys= array_keys($vars);
-                foreach($keys as $key) {
-                    $out .= "&$key=$vars[$key]";
-                }
-                echo '"' . $out . '"';
-            ?>,
+        data: 'offset=' + (parseInt(c) - parseInt(b)) + '&limit=' + (1 + parseInt(b) - parseInt(a)) + '&search=' + search_args,
         dataType: 'json',
         success: function(json){

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

@@ -191 +191 @@
         });
 
-        // if there are fewer than 20 things, set the handle width to the timelineWidth
-        var minWidth= ( timelineWidth < 20 ) ? timelineWidth : 20;
+        // find the width which makes the loupe select 20 items
+        var minWidth= timelineWidth - timeline.positionFromIndex( timeline.totalCount - 20 );
+
+        /* Initialize the timeline handle. We need to do this before we create the slider because
+         * at the end of the slider initializer, it calls slider('moveTo', startValue) which will
+         * trigger the 'stop' event. We also don't need to do a search on initial page load, so
+         * set do_search to false until after slider initialization */
+        timelineHandle.init( minWidth );
+        timeline.do_search= false;
 
         $('.track')
@@ -198 +205 @@
         .slider({
             handle: '.handle',
-            maxValue: timelineWidth - minWidth,
+            maxValue: Math.max( 1, timelineWidth - minWidth ),
             startValue: timelineWidth - minWidth,
             axis: 'horizontal',
@@ -224 +231 @@
             else
                 timeline.t1 = setTimeout('timeline.skipLoupeRight()', 300);
-        });
-        
-        // update current position text
-        loupeStartPosition = timeline.indexFromPosition( parseInt($('.handle').css('left')) );
-        $('.currentposition').text( loupeStartPosition +'-'+ timeline.totalCount +' of '+ timeline.totalCount );
-        
-        // Spool the timeline handle
-        timelineHandle.init( ( timelineWidth < 20 ) ? timelineWidth : 20 );
+        })
+        .slider( 'moveTo', timelineWidth - minWidth ); // a bug in the jQuery code requires us to explicitly do this in the case that startValue == 0
+
+        // update the do_search state variable
+        timeline.do_search= true;
     },
     skipLoupeLeft: function(e) {
@@ -274 +278 @@
         padding= padding ? padding : 0;
         return monthIndex + Math.min(
-                                    Math.max( pos - ( monthBoundary + padding ), 0 ),
-                                    timeline.monthData[month] - 1 );
+                        Math.max( pos - ( monthBoundary + padding ), 0 ),
+                        timeline.monthData[month] - 1 );
+    },
+    /* the reverse of the above function */
+    positionFromIndex: function(index) {
+        var month= 0;
+        var position= 0;
+        var positionIndex= 1;
+
+        if ( index < 1 ) return 0;
+
+        for ( i = 0; i < timeline.monthWidths.length && positionIndex + timeline.monthData[i] < index; i++ ) {
+            position+= timeline.monthWidths[i];
+            positionIndex+= timeline.monthData[i];
+            month= i + 1;
+        }
+
+        var padding= parseInt( $('.years .months span').css('margin-left') );
+        padding= padding ? padding : 0;
+        return position + padding + ( index - positionIndex );
+    },
+    reset: function () {
+        var timelineWidth = $('.years').width();
+
+        // update the arrays of posts per month
+        timeline.monthData= [0];
+        timeline.monthWidths= [0];
+        timeline.totalCount= 0;
+        $('.years span').each(function(i) {
+            timeline.monthData[i] = $(this).width();
+            timeline.monthWidths[i] = $(this).parent().width() + 1; // 1px border
+            timeline.totalCount += timeline.monthData[i];
+        });
+
+        // find the width which makes the loupe select 20 items
+        var minWidth= timelineWidth - timeline.positionFromIndex( timeline.totalCount - 20 );
+
+        // reset the widths
+        $('.track').width( $('.years').width() );
+        $('.handle').width( minWidth + 'px' );
+
+        // reset the slider maxValue
+        $('.track').data('ui-slider').size= timelineWidth;
+        $('.track').data('ui-slider').options['realMaxValue']= Math.max( 1, timelineWidth - minWidth );
+
+        // move the handle without triggering a search
+        timeline.do_search= false;
+        $('.track').slider( 'moveTo', timelineWidth - minWidth );
+        timeline.do_search= true;
     }
 }
@@ -335 +386 @@
 
         /* AJAX call to fetch needed info goes here. */
-        if(jQuery.isFunction(this.loupeUpdate)) {
+        if( timeline.do_search && jQuery.isFunction(this.loupeUpdate) ) {
             return this.loupeUpdate(loupeStartPosition, loupeEndPosition, timeline.totalCount);
         }

trunk/htdocs/system/classes/adminhandler.php

@@ -752 +752 @@
 
         $this->theme->comments= Comments::get( $arguments );
-
-        $this->theme->monthcomments= DB::get_results( 'SELECT MONTH(date) AS month, YEAR(date) AS year, COUNT(id) AS ct FROM {comments} GROUP BY year, month ORDER BY year, month', array() );
+        $this->theme->monthcts= Comments::get( array_merge( $arguments, array( 'month_cts' => 1 ) ) );
     }
 
@@ -913 +912 @@
         }
 
-        $this->theme->monthposts= DB::get_results( 'SELECT MONTH(pubdate) AS month, YEAR(pubdate) AS year, COUNT(id) AS ct FROM {posts} WHERE content_type = ? GROUP BY year, month ORDER BY year, month', array( $type ) );
+        $this->theme->monthcts= Posts::get( array_merge( $arguments, array( 'month_cts' => 1 ) ) );
     }
 
@@ -948 +947 @@
         $this->fetch_entries( $params );
         $items= $this->theme->fetch( 'entries_items' );
+        $timeline= $this->theme->fetch( 'timeline_items' );
 
         $output= array(
             'items' => $items,
+            'timeline' => $timeline,
         );
         echo json_encode($output);
@@ -956 +957 @@
 
     /**
-     * Handles ajax requests from the manage commens page
+     * Handles ajax requests from the manage comments page
      */
     public function ajax_comments()
@@ -967 +968 @@
         $this->fetch_comments( $params );
         $items= $this->theme->fetch( 'comments_items' );
+        $timeline= $this->theme->fetch( 'timeline_items' );
 
         $output= array(
             'items' => $items,
+            'timeline' => $timeline,
         );
         echo json_encode($output);

trunk/htdocs/system/classes/comments.php

@@ -174 +174 @@
             $orderby= '';
         }
+        // is a count of comments by month being requested?
+        $groupby= '';
+        if ( isset ( $month_cts ) ) {
+            $select= 'MONTH(date) AS month, YEAR(date) AS year, COUNT(id) AS ct';
+            $groupby= 'year, month';
+            $orderby= 'year, month';
+        }
         if ( isset( $limit ) ) {
             $limit= " LIMIT $limit";
@@ -180 +187 @@
             }
         }
-        if ( isset( $nolimit ) ) {
+        if ( isset( $nolimit ) || isset( $month_cts )) {
             $limit= '';
         }
@@ -192 +199 @@
             $query.= ' WHERE ' . implode( " \nOR\n ", $wheres );
         }
+        $query.= ( $groupby == '' ) ? '' : ' GROUP BY ' . $groupby;
         $query.= ( ( $orderby == '' ) ? '' : ' ORDER BY ' . $orderby ) . $limit;
         //Utils::debug( $paramarray, $fetch_fn, $query, $params );

trunk/htdocs/system/classes/posts.php

@@ -374 +374 @@
             $orderby= '';
         }
+        
+        // If the month counts are requested, replaced the select clause
+        $groupby= '';
+        if( isset( $paramset['month_cts'] ) ) {
+            $select= 'MONTH(pubdate) AS month, YEAR(pubdate) AS year, COUNT(id) AS ct';
+            $groupby= 'year, month';
+            $orderby= 'year, month';
+        }
+        
 
         // Define the LIMIT and add the OFFSET if it exists
@@ -383 +392 @@
         }
 
-        // Remove the LIMIT if 'nolimit' is set
-        if ( isset( $nolimit ) ) {
+        // Remove the LIMIT if 'nolimit' or 'month_cts' is set
+        if ( isset( $nolimit ) || isset( $paramset['month_cts'] ) ) {
             $limit= '';
         }
@@ -400 +409 @@
             $query.= ' WHERE ' . implode( " \nOR\n ", $wheres );
         }
+        $query.= ( $groupby == '' ) ? '' : ' GROUP BY ' . $groupby;
         $query.= ( ( $orderby == '' ) ? '' : ' ORDER BY ' . $orderby ) . $limit;