4 files changed, 337 insertions, 40 deletions

diff --git a/public/javascripts/admin_interface.js b/public/javascripts/admin_interface.js
index 5fe91a2..f890afb 100644
--- a/public/javascripts/admin_interface.js
+++ b/public/javascripts/admin_interface.js
@@ -1,5 +1,10 @@
 $(document).ready(function () {
-  admin_search.initialize();
+  $("#search_widget").hide();
+  
+  $(document).bind("keydown", 'Alt+f', function(){
+    admin_search.display_toggle();
+    return false;
+  });
   
   $("#metadata").attr("style", "display: none;");
   
diff --git a/public/javascripts/admin_search.js b/public/javascripts/admin_search.js
index d645cca..ba52bb5 100644
--- a/public/javascripts/admin_search.js
+++ b/public/javascripts/admin_search.js
@@ -1,28 +1,40 @@
 admin_search = {
   
-  initialize : function() {
-    $("#search_term").bind("keyup", function() {
-      if ($(this).attr("value")) {
-        $.ajax({
-          type: "GET",
-          url: "/admin/search",
-          data: "search_term=" + $(this).attr("value"),
-          dataType: "json",
-          success : function(results) {
-            admin_search.show_results(results);
-          }
-        });
-      }
-      else {
-        $('#results').empty(); 
-      }
-    });
-  },
-  
-  show_results : function(results) {
-    $('#results').empty();
-    for (result in results) {
-      $('#results').append("<p>" + results[result].title + "</p>");
+  display_toggle : function() {
+    if ($('#search_widget').css("display") != "none") {
+      $('#search_widget').fadeOut();
     }
-  }
-}
\ No newline at end of file
+    else {
+      $('#search_widget').fadeIn();
+      $('#search_term').attr("value", "");
+      $('#search_term').focus();
+    }
+    
+    $("#search_term").bind("keyup", function() {
+        if ($(this).attr("value")) {
+          $.ajax({
+            type: "GET",
+            url: "/admin/search",
+            data: "search_term=" + $(this).attr("value"),
+            dataType: "json",
+            success : function(results) {
+              admin_search.show_results(results);
+            }
+          });
+        }
+        else {
+          $('#search_results').slideUp();
+          $('#search_results').empty(); 
+        }
+      });
+    },
+    
+    show_results : function(results) {
+       $('#search_results').empty();
+       for (result in results) {
+         $('#search_results').append("<p><a href='"+ results[result].edit_path + "'>" + results[result].title + "</a></p>");
+       }
+       $('#search_results').slideDown();
+     }
+     
+  }
\ No newline at end of file
diff --git a/public/javascripts/jquery.hotkeys.js b/public/javascripts/jquery.hotkeys.js
new file mode 100755
index 0000000..9a8f2de
--- /dev/null
+++ b/public/javascripts/jquery.hotkeys.js
@@ -0,0 +1,244 @@
+/*
+(c) Copyrights 2007 - 2008
+
+Original idea by by Binny V A, http://www.openjs.com/scripts/events/keyboard_shortcuts/
+ 
+jQuery Plugin by Tzury Bar Yochay 
+tzury.by@gmail.com
+http://evalinux.wordpress.com
+http://facebook.com/profile.php?id=513676303
+
+Project's sites: 
+http://code.google.com/p/js-hotkeys/
+http://github.com/tzuryby/hotkeys/tree/master
+
+License: same as jQuery license. 
+
+USAGE:
+    // simple usage
+    $(document).bind('keydown', 'Ctrl+c', function(){ alert('copy anyone?');});
+    
+    // special options such as disableInIput
+    $(document).bind('keydown', {combi:'Ctrl+x', disableInInput: true} , function() {});
+    
+Note:
+    This plugin wraps the following jQuery methods: $.fn.find, $.fn.bind and $.fn.unbind
+*/
+
+(function (jQuery){
+    // keep reference to the original $.fn.bind, $.fn.unbind and $.fn.find
+    jQuery.fn.__bind__ = jQuery.fn.bind;
+    jQuery.fn.__unbind__ = jQuery.fn.unbind;
+    jQuery.fn.__find__ = jQuery.fn.find;
+    
+    var hotkeys = {
+        version: '0.7.9',
+        override: /keypress|keydown|keyup/g,
+        triggersMap: {},
+        
+        specialKeys: { 27: 'esc', 9: 'tab', 32:'space', 13: 'return', 8:'backspace', 145: 'scroll', 
+            20: 'capslock', 144: 'numlock', 19:'pause', 45:'insert', 36:'home', 46:'del',
+            35:'end', 33: 'pageup', 34:'pagedown', 37:'left', 38:'up', 39:'right',40:'down', 
+            109: '-', 
+            112:'f1',113:'f2', 114:'f3', 115:'f4', 116:'f5', 117:'f6', 118:'f7', 119:'f8', 
+            120:'f9', 121:'f10', 122:'f11', 123:'f12', 191: '/'},
+        
+        shiftNums: { "`":"~", "1":"!", "2":"@", "3":"#", "4":"$", "5":"%", "6":"^", "7":"&", 
+            "8":"*", "9":"(", "0":")", "-":"_", "=":"+", ";":":", "'":"\"", ",":"<", 
+            ".":">",  "/":"?",  "\\":"|" },
+        
+        newTrigger: function (type, combi, callback) { 
+            // i.e. {'keyup': {'ctrl': {cb: callback, disableInInput: false}}}
+            var result = {};
+            result[type] = {};
+            result[type][combi] = {cb: callback, disableInInput: false};
+            return result;
+        }
+    };
+    // add firefox num pad char codes
+    //if (jQuery.browser.mozilla){
+    // add num pad char codes
+    hotkeys.specialKeys = jQuery.extend(hotkeys.specialKeys, { 96: '0', 97:'1', 98: '2', 99: 
+        '3', 100: '4', 101: '5', 102: '6', 103: '7', 104: '8', 105: '9', 106: '*', 
+        107: '+', 109: '-', 110: '.', 111 : '/'
+        });
+    //}
+    
+    // a wrapper around of $.fn.find 
+    // see more at: http://groups.google.com/group/jquery-en/browse_thread/thread/18f9825e8d22f18d
+    jQuery.fn.find = function( selector ) {
+        this.query = selector;
+        return jQuery.fn.__find__.apply(this, arguments);
+        };
+    
+    jQuery.fn.unbind = function (type, combi, fn){
+        if (jQuery.isFunction(combi)){
+            fn = combi;
+            combi = null;
+        }
+        if (combi && typeof combi === 'string'){
+            var selectorId = ((this.prevObject && this.prevObject.query) || (this[0].id && this[0].id) || this[0]).toString();
+            var hkTypes = type.split(' ');
+            for (var x=0; x<hkTypes.length; x++){
+                delete hotkeys.triggersMap[selectorId][hkTypes[x]][combi];
+            }
+        }
+        // call jQuery original unbind
+        return  this.__unbind__(type, fn);
+    };
+    
+    jQuery.fn.bind = function(type, data, fn){
+        // grab keyup,keydown,keypress
+        var handle = type.match(hotkeys.override);
+        
+        if (jQuery.isFunction(data) || !handle){
+            // call jQuery.bind only
+            return this.__bind__(type, data, fn);
+        }
+        else{
+            // split the job
+            var result = null,            
+            // pass the rest to the original $.fn.bind
+            pass2jq = jQuery.trim(type.replace(hotkeys.override, ''));
+            
+            // see if there are other types, pass them to the original $.fn.bind
+            if (pass2jq){
+                result = this.__bind__(pass2jq, data, fn);
+            }            
+            
+            if (typeof data === "string"){
+                data = {'combi': data};
+            }
+            if(data.combi){
+                for (var x=0; x < handle.length; x++){
+                    var eventType = handle[x];
+                    var combi = data.combi.toLowerCase(),
+                        trigger = hotkeys.newTrigger(eventType, combi, fn),
+                        selectorId = ((this.prevObject && this.prevObject.query) || (this[0].id && this[0].id) || this[0]).toString();
+                        
+                    //trigger[eventType][combi].propagate = data.propagate;
+                    trigger[eventType][combi].disableInInput = data.disableInInput;
+                    
+                    // first time selector is bounded
+                    if (!hotkeys.triggersMap[selectorId]) {
+                        hotkeys.triggersMap[selectorId] = trigger;
+                    }
+                    // first time selector is bounded with this type
+                    else if (!hotkeys.triggersMap[selectorId][eventType]) {
+                        hotkeys.triggersMap[selectorId][eventType] = trigger[eventType];
+                    }
+                    // make trigger point as array so more than one handler can be bound
+                    var mapPoint = hotkeys.triggersMap[selectorId][eventType][combi];
+                    if (!mapPoint){
+                        hotkeys.triggersMap[selectorId][eventType][combi] = [trigger[eventType][combi]];
+                    }
+                    else if (mapPoint.constructor !== Array){
+                        hotkeys.triggersMap[selectorId][eventType][combi] = [mapPoint];
+                    }
+                    else {
+                        hotkeys.triggersMap[selectorId][eventType][combi][mapPoint.length] = trigger[eventType][combi];
+                    }
+                    
+                    // add attribute and call $.event.add per matched element
+                    this.each(function(){
+                        // jQuery wrapper for the current element
+                        var jqElem = jQuery(this);
+                        
+                        // element already associated with another collection
+                        if (jqElem.attr('hkId') && jqElem.attr('hkId') !== selectorId){
+                            selectorId = jqElem.attr('hkId') + ";" + selectorId;
+                        }
+                        jqElem.attr('hkId', selectorId);
+                    });
+                    result = this.__bind__(handle.join(' '), data, hotkeys.handler)
+                }
+            }
+            return result;
+        }
+    };
+    // work-around for opera and safari where (sometimes) the target is the element which was last 
+    // clicked with the mouse and not the document event it would make sense to get the document
+    hotkeys.findElement = function (elem){
+        if (!jQuery(elem).attr('hkId')){
+            if (jQuery.browser.opera || jQuery.browser.safari){
+                while (!jQuery(elem).attr('hkId') && elem.parentNode){
+                    elem = elem.parentNode;
+                }
+            }
+        }
+        return elem;
+    };
+    // the event handler
+    hotkeys.handler = function(event) {
+        var target = hotkeys.findElement(event.currentTarget), 
+            jTarget = jQuery(target),
+            ids = jTarget.attr('hkId');
+        
+        if(ids){
+            ids = ids.split(';');
+            var code = event.which,
+                type = event.type,
+                special = hotkeys.specialKeys[code],
+                // prevent f5 overlapping with 't' (or f4 with 's', etc.)
+                character = !special && String.fromCharCode(code).toLowerCase(),
+                shift = event.shiftKey,
+                ctrl = event.ctrlKey,            
+                // patch for jquery 1.2.5 && 1.2.6 see more at:  
+                // http://groups.google.com/group/jquery-en/browse_thread/thread/83e10b3bb1f1c32b
+                alt = event.altKey || event.originalEvent.altKey,
+                mapPoint = null;
+
+            for (var x=0; x < ids.length; x++){
+                if (hotkeys.triggersMap[ids[x]][type]){
+                    mapPoint = hotkeys.triggersMap[ids[x]][type];
+                    break;
+                }
+            }
+            
+            //find by: id.type.combi.options            
+            if (mapPoint){ 
+                var trigger;
+                // event type is associated with the hkId
+                if(!shift && !ctrl && !alt) { // No Modifiers
+                    trigger = mapPoint[special] ||  (character && mapPoint[character]);
+                }
+                else{
+                    // check combinations (alt|ctrl|shift+anything)
+                    var modif = '';
+                    if(alt) modif +='alt+';
+                    if(ctrl) modif+= 'ctrl+';
+                    if(shift) modif += 'shift+';
+                    // modifiers + special keys or modifiers + character or modifiers + shift character or just shift character
+                    trigger = mapPoint[modif+special];
+                    if (!trigger){
+                        if (character){
+                            trigger = mapPoint[modif+character] 
+                                || mapPoint[modif+hotkeys.shiftNums[character]]
+                                // '$' can be triggered as 'Shift+4' or 'Shift+$' or just '$'
+                                || (modif === 'shift+' && mapPoint[hotkeys.shiftNums[character]]);
+                        }
+                    }
+                }
+                if (trigger){
+                    var result = false;
+                    for (var x=0; x < trigger.length; x++){
+                        if(trigger[x].disableInInput){
+                            // double check event.currentTarget and event.target
+                            var elem = jQuery(event.target);
+                            if (jTarget.is("input") || jTarget.is("textarea") || jTarget.is("select") 
+                                || elem.is("input") || elem.is("textarea") || elem.is("select")) {
+                                return true;
+                            }
+                        }                       
+                        // call the registered callback function
+                        result = result || trigger[x].cb.apply(this, [event]);
+                    }
+                    return result;
+                }
+            }
+        }
+    };
+    // place it under window so it can be extended and overridden by others
+    window.hotkeys = hotkeys;
+    return jQuery;
+})(jQuery);
diff --git a/public/stylesheets/admin.css b/public/stylesheets/admin.css
index e077918..faebbea 100644
--- a/public/stylesheets/admin.css
+++ b/public/stylesheets/admin.css
@@ -3,6 +3,7 @@
 body {
   font-family: Helvetica, Arial, sans-serif;
   font-size: 12px;
+  margin: 0px;
 }
 
 a {
@@ -64,33 +65,38 @@ div.pagination span.current, div.pagination a:hover {
   text-align: right;
 }
 
-#navigation, #subnavigation {
-  margin-left: 0px;
+#navigation {
+  position: relative;
+  margin-top: 10px;
+}
+
+#navigation div {
   float: left;
 }
 
+
 #navigation a:hover {
   color: #ffffff;
   background-color: #000000;
 }
 
-#navigation a, #subnavigation a {
+#main_navigation a, #sub_navigation a {
   letter-spacing: 1px;
   padding-left: 5px;
   padding-right: 5px;
   text-transform: lowercase;
 }
 
-#subnavigation a {
+#sub_navigation a {
   color: #969696;
 }
 
-#subnavigation a:hover {
+#sub_navigation a:hover {
   color: #ffffff;
   background-color: #ff9600;
 }
 
-#subnavigation a.selected {
+#sub_navigation a.selected {
   color: #ffffff;
   background-color: #ff9600;
 }
@@ -100,9 +106,6 @@ div.pagination span.current, div.pagination a:hover {
   background-color: #000000;
 }
 
-#admin_search {
-}
-
 /* Nodes */
 
 table#node_table {
@@ -211,12 +214,10 @@ input[type=text]#page_title {
 }
 
 input[type=text]#tag_list {
-  width: 690px;
   padding: 5px;
 }
 
 input[type=text]#node_slug {
-  width: 690px;
   padding: 5px;
 }
 
@@ -235,14 +236,14 @@ input[type=radio] {
 }
 
 textarea#page_abstract {
-  height: 150px;
   width: 690px;
+  height: 150px;
   padding: 5px;
 }
 
 #page_editor textarea#page_body {
-  height: 600px;
   width: 700px;
+  height: 600px;
 }
 
 #page_editor #metadata, #page_editor #content {
@@ -303,4 +304,39 @@ div#draft_list table tr:hover {
 table tr.header {
   height: 20px;
   text-align: left;
-}
\ No newline at end of file
+}
+
+#search_widget {
+  position: absolute;
+  top: 20px;
+  left: 400px;
+  width: 300px;
+  border: 1px solid #000000;
+  -webkit-box-shadow: 3px 3px 5px #b1b1b1;
+  -moz-box-shadow: 10px 10px 5px #888, 10px 10px 30px rgba(0,0,0,0.4);
+  background-color: #ffffff;
+  padding: 3px;
+  text-align: center;
+}
+
+#search_widget span {
+  font-size: 18px;
+}
+
+#search_widget input {
+  width: 210px;
+  font-size: 18px;
+}
+
+#search_widget #search_results {
+  padding: 4px;
+  text-align: left;
+}
+
+table#content th.description {
+  width: 100px;
+}
+
+table#content th.content {
+  width: 690px;
+}