Changeset 1840

Timestamp:

05/26/08 01:57:38 (6 months ago)

Author:

ringmaster

Message:

Add links under the manage entries search field to let users search for types and statuses without having to type.
Change css class on import page to make page look normal.

Location:

trunk/htdocs/system

Files:

• admin/css/admin.css (modified) (2 diffs)
• admin/entries.php (modified) (2 diffs)
• admin/import.php (modified) (1 diff)
• admin/js/admin.js (modified) (6 diffs)
• classes/adminhandler.php (modified) (3 diffs)

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

@@ -1157 +1157 @@
     }
 
-.navigator span input {
+.navigator input {
     width: 90%;
     margin: 0 5%;
@@ -1164 +1164 @@
 .navigator .newer {
     text-align: right;
+    }
+
+.navigator .special_search {
+    text-align: center;
+    }
+
+.navigator .special_search a {
+    outline: none;
+    padding: 0px 2px;
+    margin: 2px 5px;
+    }
+
+.navigator .special_search a.active {
+    background-color: #a9a9a9;
     }
 

trunk/htdocs/system/admin/entries.php

@@ -5 +5 @@
     <span class="older pct10"><a href="#" onclick="timeline.skipLoupeLeft();return false">&laquo; <?php _e('Older'); ?></a></span>
     <span class="currentposition pct15 minor"><?php _e('0-0 of 0'); ?></span>
-    <span class="search pct50"><input type="search" placeholder="<?php _e('Type and wait to search for any entry component'); ?>" autosave="habaricontent" results="10" value="<?php echo $search_args ?>"></span>
+    <span class="search pct50">
+        <input id="search" type="search" placeholder="<?php _e('Type and wait to search for any entry component'); ?>" autosave="habaricontent" results="10" value="<?php echo $search_args ?>">
+        <div class="special_search pct100">
+            <?php foreach($special_searches as $text => $term): ?>
+            <a href="#<?php echo $term; ?>"><?php echo $text; ?></a>
+            <?php endforeach; ?>
+        </div>
+    </span>
     <span class="nothing pct15">&nbsp;</span>
     <span class="newer pct10"><a href="#" onclick="timeline.skipLoupeRight();return false"><?php _e('Newer'); ?> &raquo;</a></span>
@@ -74 +81 @@
 timelineHandle.loupeUpdate = function(a,b,c) {
     spinner.start();
-    
+
     var search_args= $('.search input').val();
 

trunk/htdocs/system/admin/import.php

@@ -2 +2 @@
 <div class="container">
 <hr>
-    <div class="column prepend-1 span-22 append-1">
+    <div class="">
         <h1><?php _e('Import'); ?></h1>
         <form method="post" action="">

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

@@ -179 +179 @@
         if (!$('.timeline').length) return;
 
-        var timelineWidth= $('.years').width();
+        var timelineWidth = $('.years').width();
         var viewWidth= $('.timeline').width();
         timeline.overhang= ( timelineWidth > viewWidth ) ? timelineWidth - viewWidth : 0;
@@ -199 +199 @@
         // find the width which makes the loupe select 20 items
         var handleWidth= timelineWidth - timeline.positionFromIndex( timeline.totalCount - 20 );
-        
+
         // make the slider bounded by the view
         var maxSliderValue= Math.min( viewWidth, timelineWidth ) - handleWidth;
@@ -333 +333 @@
     },
     reset: function () {
-        var timelineWidth= $('.years').width();
+        var timelineWidth = $('.years').width();
         var viewWidth= $('.timeline').width();
         timeline.overhang= ( timelineWidth > viewWidth ) ? timelineWidth - viewWidth : 0;
@@ -604 +604 @@
             }
         });
-        
+
         // If menu is open and mouse is clicked outside menu, close menu.
         $('html').click(function() {
@@ -660 +660 @@
             return liveSearch.search();
         }
-        
+
     },
     search: null, // specific search functions are defined on the individual pages
 }
 
+// SEARCH CRITERIA TOGGLE
+function toggleSearch() {
+    var re = new RegExp('\\s*' + $(this).attr('href').substr(1), 'gi');
+    if($('#search').val().match(re)) {
+        $('#search').val($('#search').val().replace(re, ''));
+        $(this).removeClass('active');
+    }
+    else {
+        $('#search').val($('#search').val() + ' ' + $(this).attr('href').substr(1));
+        $(this).addClass('active');
+    }
+    liveSearch.doSearch();
+    return false;
+}
 
 // RESIZABLE TEXTAREAS
@@ -853 +867 @@
 
     // LOGIN: Focus cursor on 'Name'.
-    $('body.login #habari_username').focus()
-
+    $('body.login #habari_username').focus();
+
+    // SEARCH: Set default special search terms and assign click handler
+    $('.special_search a')
+        .click(toggleSearch)
+        .each(function(){
+            var re = new RegExp($(this).attr('href').substr(1));
+            if($('#search').val().match(re)) {
+                $(this).addClass('active');
+            }
+        });
 
 });

trunk/htdocs/system/classes/adminhandler.php

@@ -680 +680 @@
                                 // not a dup, add to string
                                 $modstatus['Approved comments on these posts: %s']= (isset($modstatus['Approved comments on these posts: %s'])? $modstatus['Approved comments on these posts: %s'] . ' &middot; ' : '') . '<a href="' . $comment->post->permalink . '">' . $comment->post->title . '</a> ';
-                            }                           
-                            
+                            }
+
                             $comment->status= Comment::STATUS_APPROVED;
                             $comment->update();
@@ -928 +928 @@
     public function get_entries()
     {
+        // Get the default page contents
         $this->fetch_entries();
+
+        // Get special search statuses
+        $statuses = array_keys(Post::list_post_statuses());
+        array_shift($statuses);
+        $statuses = array_combine(
+            $statuses,
+            array_map(
+                create_function('$a', 'return "status:{$a}";'),
+                $statuses
+            )
+        );
+
+        // Get special search types
+        $types = array_keys(Post::list_active_post_types());
+        array_shift($types);
+        $types = array_combine(
+            $types,
+            array_map(
+                create_function('$a', 'return "type:{$a}";'),
+                $types
+            )
+        );
+
+        $this->theme->special_searches = array_merge($statuses, $types);
         $this->display( 'entries' );
     }
@@ -1365 +1390 @@
 
     /**
-     * Handle GET requests for /admin/tags to display the tags 
+     * Handle GET requests for /admin/tags to display the tags
      */
     public function get_tags()