departr 0.4 → 0.6

data/lib/departr/settings.rb

@@ -3,17 +3,19 @@ module Departr
     extend self
 
     KEYS = [
-      :default_search, :open_in_new_page,
-      :github, :calendar,
-      :clock1, :clock2, :clock3
+      :default_search, :open_in_new_page
     ]
 
     def filename(provider, user)
       File.join(Config.data_path, provider, user, 'settings')
     end
 
-    def etag(provider, user)
-      Digest::MD5.hexdigest(get(provider, user).to_s)
+    def time(provider, user)
+      if File.exists? filename(provider, user)
+        File.mtime(filename(provider, user))
+      else
+        Time.at(0)
+      end
     end
 
     def get(provider, user)

data/public/javascripts/2_autocomplete.js

@@ -118,8 +118,12 @@ var AutoComplete = new Class({
             case 'tab':
                 if (!this.isHidden()) {
                     e.stop();
-                    this.fireEvent('complete', [this.hover.retrieve('value')]);
-                    this.hide();
+                    if (this.hover != false) {
+                        this.fireEvent('complete', [this.hover.retrieve('value')]);
+                        this.hide();
+                    } else {
+                        this.showHover(this.box.getFirst('.match'))
+                    }
                 }
                 break;
         }

data/public/javascripts/{5_appliction.js → 4_appliction.js}

@@ -113,30 +113,6 @@ var Application = {
                         Settings.open_in_new_page = !Settings.open_in_new_page;
                     })
                     $('setting_open_in_new_page').checked = (Settings.open_in_new_page === true);
-
-                    $('setting_github').addEvent('click', function() {
-                        Settings.github = !Settings.github;
-                        $(window.parent.document).getElement('#github').setStyle('display', Settings.github === true ? 'block': 'none');
-                    })
-                    $('setting_github').checked = (Settings.github === true);
-
-                    $('setting_calendar').addEvent('click', function() {
-                        Settings.calendar = !Settings.calendar;
-                        $(window.parent.document).getElement('#date').setStyle('display', Settings.calendar === true ? 'block': 'none');
-                    })
-                    $('setting_calendar').checked = (Settings.calendar === true);
-
-                    $('setting_clock1').addEvent('change', function() {
-                        Settings.clock1 = this.value;
-                    });
-
-                    $('setting_clock2').addEvent('change', function() {
-                        Settings.clock2 = this.value;
-                    });
-
-                    $('setting_clock3').addEvent('change', function() {
-                        Settings.clock3 = this.value;
-                    });
                 }
             }
         });

data/public/javascripts/{6_command.js → 5_command.js}

@@ -165,7 +165,7 @@ var Command = {
         var matches = $('input').value.match(Command.pattern);
         if (matches) {
             var answer = $('answer');
-            var label = matches[0].replace(Command.patternsCleaner, '').replace(/(.)$/, "<span>$1</span>");
+            var label = matches[0].replace(Command.patternsCleaner, '');
             $('label').set('html', label + ' &raquo; ');
             answer.value = '';
             $('question').setStyle('display', 'block');
@@ -183,6 +183,29 @@ var Command = {
             return;
         }
 
+        // If it starts with ! find the corresponding command and go for it
+        if (this.input.value.charAt(0) == '!') {
+          // In reverse to find the biggest command matching
+          for (var i = Command.data.length - 1; i >= 0; i--) {
+            var patterns = new RegExp(Command.pattern.source, 'g');
+            var re = new RegExp(Command.data[i].name.replace(patterns, '(.*)'));
+            var values = this.input.value.substr(1).match(re);
+            if (values) {
+              var found = Command.data[i];
+              var keywords = found.name.match(patterns);
+              var url = found.url;
+              if (keywords) {
+                // Replace all {keyword} in the right order by the corresponding value
+                for (var j = 0; j < keywords.length; j++) {
+                  url = url.replace(keywords[j], values[j+1]);
+                }
+              }
+              Command.go(url);
+              return;
+            }
+          }
+        }
+
         // Default command
         if (!this.input.value.match(/^\s*$/)) {
             if (this.input.value.match(/^\s*(ftp|http|https):\/\//i)) {
@@ -226,7 +249,8 @@ var Command = {
                 return command.name;
             },
             filters: [function(o,v) {
-                return o.match(new RegExp(v.escapeRegExp().replace(/\s+/, '.*'), 'i'))
+                var re = new RegExp(v.escapeRegExp().replace(/\s+/, '.*'));
+                return o.match(re, 'i');
             }]
         }).addEvent('complete', function(value) {
             Command.selected = value.url;
@@ -276,13 +300,6 @@ var Command = {
             window.focus();
             $('input').focus();
         });
-
-        if ($('date')) {
-            var today = new Date;
-            var weekdays = ["Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday"];
-            $('date').getElement('.day').set('text', today.getDate());
-            $('date').getElement('.wday').set('text', weekdays[today.getDay()]);
-        }
     }
 };
 

data/public/javascripts/9_run.js

@@ -0,0 +1,11 @@
+window.addEvent('domready', function() {
+  Application.init();
+  Command.init();
+  if (Cookie.read('bg_id') && Cookie.read('bg_user')) {
+    var credits = $('credits');
+    var a = new Element('a', {
+      'href': 'http://500px.com/photo/' + Cookie.read('bg_id'),
+      'text': '© ' + Cookie.read('bg_user').replace(/\+/g," ")
+    }).inject(credits)
+  }
+});

data/views/help.haml

@@ -12,24 +12,27 @@
     for example "netvibes", and instead hit RETURN, hit CONTROL+ENTER,
     it will do a "I'm feelink lucky".
 
-  %p But there is more !
+  %p But there is more!
 
   %p
-    For example, start typing "map" and hit the RETURN key.
-    Then type "Paris, France" and RETURN again, nice !
+    For example, start typing "map" and hit the TAB then then RETURN key.
+    Then type "Paris, France" and RETURN again, nice!
+
+  %p
+    You can also type "!maps to paris" then RETURN, it will be even quicker!
 
   %p
     Another example, start typing "twit", two results are
     listed below, "twitter" and "twitter search for ?".
     Hit the DOWN key and then the RETURN key. Type 
     "obama" in the input filed has just appeared, and
-    hit RETURN again. Voila !
+    hit RETURN again. Voila!
 
   %p
     If your are too lazy or would like to be even faster
     you can only specify partial command name. For example,
     you have that command "images search for {words}", start
-    typing "go se" and it will be selected. Awesome isn't it !
+    typing "go se" and it will be selected. Awesome isn't it!
 
   %p
     Many other commands are available by default, but if
@@ -38,7 +41,7 @@
     add your own custom commands.
   %p
     So do not hesitate to set #{host} as you homepage
-    in your favorite browser :
+    in your favorite browser:
     %ul
       %li
         %a{:href => "http://support.mozilla.com/en-US/kb/How+to+set+the+home+page", :target => :_blank} Firefox 

data/views/index.haml

@@ -1,6 +1,7 @@
 -# coding: utf-8
-%a#github{:href => "http://github.com/florentsolt/departr", :style => "display: #{@settings["github"] ? "block" : "none"}"}
-  %img{:src => "https://a248.e.akamai.net/assets.github.com/img/71eeaab9d563c2b3c590319b398dd35683265e85/687474703a2f2f73332e616d617a6f6e6177732e636f6d2f6769746875622f726962626f6e732f666f726b6d655f72696768745f677261795f3664366436642e706e67", :alt => "Fork me on GitHub"}
+#background
+
+#credits
 
 #header
   - if @config.get(:rpx)
@@ -12,60 +13,8 @@
   %a{:id => :signout, :href => '#'} Sign Out
 
 %form{:id => :commandline}
-  #logo= "depart<span>r</span>"
-  %img{:src => 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABwAAAAcCAYAAAByDd+UAAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAAGFwAABhcBlmjpmQAAABl0RVh0U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAAAIcSURBVEiJtZaxaxRREIe/d0aMQUUCz+ZZaidYCKJgI4rohYgQRUTRP0BQsA9iQK0EwVJsRfRMIJjLaZVGEKwsLGzEZrAYsDlziTl1LHYP9ta7vd3lduAV++O3+zHvzcxbJ2pUGcG7Y8AD4BCw4qoEBu8uAi+AbbHUrVUIqwPPEzCAz5VkGLw7CTSByYT8F5gde4bBu+PAcgr2B7ghas2J2HQUmBoDbxp4BuxKaFvAFVFb7AnzgFW0OsBZUaO3asAR4NcYskvHT6Auaq2kWBO1C8A+4CqwCGyMCXhT1NbS4n9VGrybAurAHDAD7C4JnBG1ZlqcSAui1gEaQCN4NwmcieHngb0l4cOBKfgmUYkvB++2A6di+GVKZp4JTMG7QAtoBe8CcK4MsHDjB+8elYUVBgbv5oE7CekNsF4JMHh3C1hISI+JCmmpCLDvDIN3O4DZtA4cBO4lnu+K2kL8TgO4VhgYw5bIPh8Dbovak4T2FmiTs2qTWzoN7AG6Gf77KVivdVbywPqAovZd1E4QNfdpYG2A/9uQ77wqDEyAO8An4MAA/7DsV8lZrcOq9DqwH/hKf6Zbg8yitkF0w5cGPiUaX4eBh6OAceTa1oGjTdTawEuA4N174HfszQI2ia62nVnAkY0vauvAR6Kp8m6Eb3XU9/JOmkvAnKhlZQg5tjXXbSFqksdH1I+bRH9sP0oD84aotYN3r4EvovZhkOcfNY7IMKY9rjcAAAAASUVORK5CYII='}
   %input{:type => :text, :id => :input, :name => :input}
   #question
     %label#label Question
     %input{:type => :text, :id => :answer, :name => :answer}
-#special
-  #date.clock{:style => "display: #{@settings["calendar"] ? "block" : "none"}"}
-    .wday
-    .day
-  %canvas#clock1.clock{:style => "display: #{(@settings["clock1"] && @settings["clock1"] != "-none-") ? "block" : "none"}"}
-  %canvas#clock2.clock{:style => "display: #{(@settings["clock2"] && @settings["clock2"] != "-none-") ? "block" : "none"}"}
-  %canvas#clock3.clock{:style => "display: #{(@settings["clock3"] && @settings["clock3"] != "-none-") ? "block" : "none"}"}
-
-:javascript
-
-  // Globals
-  Command.data = #{@commands.to_json};
-  Settings = #{@settings.to_json};
-
-  window.addEvent('domready', function() {
-    Application.init();
-    Command.init();
-
-    // Clock 1
-    if ($('clock1').getStyle('display') == 'block') {
-      new CoolClock({
-        canvasId: 'clock1',
-        displayRadius: 40,
-        gmtOffset: #{clock_offset(@settings["clock1"])},
-        label: #{clock_label(@settings["clock1"])},
-        fontSize: '30px'
-      });
-    }
-
-    // Clock 2
-    if ($('clock2').getStyle('display') == 'block') {
-      new CoolClock({
-        canvasId: 'clock2',
-        displayRadius: 40,
-        gmtOffset: #{clock_offset(@settings["clock2"])},
-        label: #{clock_label(@settings["clock2"])},
-        fontSize: '30px'
-      });
-    }
 
-    // Clock 3
-    if ($('clock3')) {
-      new CoolClock({
-        canvasId: 'clock3',
-        displayRadius: 40,
-        gmtOffset: #{clock_offset(@settings["clock3"])},
-        label: #{clock_label(@settings["clock3"])},
-        fontSize: '30px'
-      });
-    }
-  });

data/views/layout.haml

@@ -6,6 +6,7 @@
     %meta{'http-equiv' => 'content-type', :content => 'text/html; charset=utf-8'}
     %link{:rel => :stylesheet, :href => "/stylesheets/all.css", :type => "text/css"}
     %script{:type => 'text/javascript', :src => '/javascripts/all.js'}
+    %script{:type => 'text/javascript', :src => '/javascripts/context.js'}
   %body
     = yield
 

data/views/settings.haml

@@ -10,36 +10,4 @@
 
   %label{:for => "setting_open_in_new_page"} Open in a new page ?
   %input{:id => "setting_open_in_new_page", :type => :checkbox}
-  %hr 
-
-  %label{:for => "setting_github"} Show github ribbon ?
-  %input{:id => "setting_github", :type => :checkbox}
-  %hr 
-
-  %label{:for => "setting_clalendar"} Show calendar ?
-  %input{:id => "setting_calendar", :type => :checkbox}
-  %hr 
-
-  %label{:for => "setting_clock1"} First clock
-  %select{:id => "setting_clock1"}
-  %hr 
-
-  %label{:for => "setting_clock2"} Second clock
-  %select{:id => "setting_clock2"}
-  %hr 
-
-  %label{:for => "setting_clock3"} Third clock
-  %select{:id => "setting_clock3"}
-
-:javascript
 
-  // Reduce page size by inlining only 1 time the zone list
-  var zones = #{TZInfo::Timezone.all.collect(&:identifier).to_json};
-  ["clock1", "clock2", "clock3"].each(function(clock) {
-    new Element('option', {value: '-none', text: "Nothing"}).inject($('setting_' + clock));
-    zones.each(function(zone) {
-      var option = new Element('option', {value: zone, text: zone.replace(/_/g, ' ')})
-      if (Settings[clock] == zone) option.set('selected', 'selected');
-      option.inject($('setting_' + clock));
-    });
-  });

data/views/style.sass

@@ -1,11 +1,6 @@
 
-$color1: #eee
-$color2: #fff
-$webkit_gradient: -webkit-gradient(linear, left top, left bottom, from($color1), to($color2))
-$moz_gradient: -moz-linear-gradient(top,$color1,$color2)
-
-$webkit_gradient_inverted: -webkit-gradient(linear, left top, left bottom, from($color2 / 1.4), to($color1 / 1.1))
-$moz_gradient_inverted: -moz-linear-gradient(top,$color2 / 1.4,$color1 / 1.1)
+$color1: rgba(238,238,238,0.8)
+$color2: rgba(255,255,255,0.8)
 
 *
   font-family: "trebuchet MS", verdana, sans-serif
@@ -16,8 +11,6 @@ body
   height: 100%
   overflow: hidden
   background-color: $color1
-  background: $webkit_gradient
-  background: $moz_gradient
 
 html
   height: 100%
@@ -26,69 +19,66 @@ html
 a, a:hover, a:link, a:visited
   color: inherit
 
-#logo
-  margin-top: -49px
-  margin-bottom: 20px
-  font-size: 30px
-  text-align: right
-  text-shadow: white 1px 1px 0px
-
-  span
-    color: #54acff
-
-.baseline
-  opacity: 0.3
-  filter: alpha(opacity=30)
-  font-size: 15pt
-  display: block
+#background
+  width: 100%
+  height: 100%
   position: absolute
-  top: 400px
-  width: 600px
-  left: 150px
-  text-align: right
-
-  em
-    margin-bottom: 1em
-    font-weight: bold
-    font-size: 20pt
-    display: block
-    font-weight: normal
-    text-align: center
+  top: 0px
+  left: 0px
+  color: transparent
+  background-size: cover
+  background-position: 50% 50%
+  background-repeat: none
+  background-image: url(/background.jpg)
+  z-index: -1
+
+#background:after
+  width: 100%
+  position: absolute
+  font-size: 14px
+  top: 2em
+  bottom: 2em
+  left: 0px
+  content: ''
+  background-image: url('data:image/jpeg;base64,iVBORw0KGgoAAAANSUhEUgAAAAIAAAACCAYAAABytg0kAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAABhJREFUeNpiYGBgePz//38GRhABAgABBgBFTAbfCBNE2AAAAABJRU5ErkJggg==')
+  
+
+#credits, #header
+  background-color: rgba(255,255,255,0.4)
+  color: black
+  opacity: 0.8
+  filter: alpha(opacity=80)
+  font-size: 14px
+  height: 2em
+  line-height: 2em
 
-#github
+#credits
   position: absolute
-  top: 0px
-  right: 0px
+  left: 0px
+  bottom: 0px
+  z-index: 0
+  width: 100%
+  text-align: right
 
-  img
-    border: none
+  a
+    text-decoration: none
+    padding-right: 1em
 
 #header
-  height: 2em
-  line-height: 2em
   text-align: center
   z-index: 100
-  text-shadow: white 1px 1px 0px
 
   a
     padding: 0px 1em
     margin: 0px
     padding-left: 16px
-    color: black
     text-decoration: none
     background-position: center left
     background-repeat: no-repeat
-    font-size: 14px
-    opacity: 0.3
-    filter: alpha(opacity=30)
 
   #signin, #signout, #edit, #settings
     display: none
 
-#header a:hover
-  opacity: 1
-  filter: alpha(opacity=100)
-
 #profile
   background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAkAAAAMCAYAAACwXJejAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAFBJREFUGNNjYEAAfSB+D8T/obQ+AxawH6oAhveTragfTVE/Aw6QD8T1UJo8IA/E69GsWw8Vhyt4j6YAht/DFK7HoQDZRLwKYJg4RecJKDgPAMVHQDY4+DlXAAAAAElFTkSuQmCC)
 
@@ -124,11 +114,10 @@ div#settings
 
 .autocomplete
   margin-top: 4px
-  border: 1px solid #ccc
-  background-color: #fff
+  border: 1px solid white
+  background-color: rgba(0,0,0,0.4)
   z-index: 50
-  -moz-border-radius: 6px
-  -webkit-border-radius: 6px
+  color: white
 
   div
     margin:	1px
@@ -136,17 +125,15 @@ div#settings
     cursor: pointer
     font-weight: normal
     white-space: nowrap
-    font-size: 15px
+    font-size: 25px
     font-style: italic
     line-height: 1.5em
     display: none
 
   div.hovered
-    background: $webkit_gradient_inverted
-    background: $moz_gradient_inverted
-    color: #fff
-    -moz-border-radius: 6px
-    -webkit-border-radius: 6px
+    background: white
+    background: rgba(255,255,255,0.6)
+    color: black
 
 
   div.match
@@ -156,19 +143,10 @@ div#settings
 
 #commandline
   margin: 200px auto auto auto
-  width: 600px
+  width: 800px
   height: auto
-  padding: 20px
   text-align: center
-  border: 1px solid #ccc
-  -webkit-border-radius: 10px
-  -moz-border-radius: 10px 10px
-  background-color: $color1
-  background: $webkit_gradient
-  background: $moz_gradient
-
-#commandline img
-  margin-right: 10px
+  background: transparent
 
 #input
   -webkit-appearance: textfield
@@ -176,12 +154,14 @@ div#settings
   margin: 0px
   top: 205px
   left: 215px
-  width: 550px
-  border: 0px solid red
+  width: 780px
+  border: 0px
+  border-bottom: 1px dotted white
   outline: none
-  font-size: 25px
-  height: 30px
-  color: black
+  font-size: 45px
+  font-weight: bold
+  height: 50px
+  color: white
   vertical-align: bottom
   background-color: transparent
 
@@ -190,69 +170,31 @@ div#settings
   width: 600px
   text-align: center
   margin: 10px auto auto auto
-  border: 0px solid red
+  border: 0px
 
   #label
-    color: black
+    color: white
     z-index: 2
-
-    span
-      color: #54acff
+    width: 240px
+    height: 1.2em
+    overflow: hidden
+    display: inline-block
 
   #answer
     -webkit-appearance: textfield
     -webkit-user-select: text
-    border: 0px solid red
+    border: 0px
     outline: none
     padding: 0px
     width: 350px
-    color: black
+    color: white
     z-index: 1
     background-color: transparent
+    border-bottom: 1px dotted white
 
   #label,#answer
-    font-size: 20px
-
-#special
-  display: block
-  width: 600px
-  margin: auto
-  text-align: center
-  position: relative
-  padding-top: 55px
-
-  .clock
-    margin-left: 50px
-    float: left
-    width: 100px
-    height: 140px
-    border: none
-
-  #date
-    height: 80px
-    text-align: center
-    border: 1px solid #ccc
-    -webkit-border-radius: 10px
-    -moz-border-radius: 10px 10px
-    background-color: $color1
-    background: $webkit_gradient
-    background: $moz_gradient
-
-    .wday
-      margin: 1px
-      padding: 2px
-      -webkit-border-top-left-radius: 10px
-      -webkit-border-top-right-radius: 10px
-      -moz-border-radius-topleft: 10px
-      -moz-border-radius-topright: 10px
-      background-color: $color2
-      background: $webkit_gradient_inverted
-      background: $moz_gradient_inverted
-      
-
-    .day
-      font-size: 35pt
-      font-weight: bold
+    font-size: 45px
+    font-weight: bold
       
 // --------------------- Edit Popup --------------------------
 
@@ -261,6 +203,7 @@ div#settings
   padding: 3px 10px
   -webkit-border-radius: 2px 2px
   -moz-border-radius: 2px 2px
+  border-radius: 2px 2px
   border: solid 1px rgb(153, 153, 153)
   background: -webkit-gradient(linear, 0% 0%, 0% 100%, from(rgb(255, 255, 255)), to(rgb(221, 221, 221)))
   background: -moz-linear-gradient(top, rgb(255, 255, 255), rgb(221, 221, 221))
@@ -361,13 +304,9 @@ div#settings
   background-color: #FFFFFF
   border: 1px solid #EAEEFA
   border: 1px solid rgba(234, 238, 250, 0.6)
-  -webkit-box-shadow: 0 0 3px rgba(0, 0, 0, 0.6)
-  -moz-box-shadow: 0 0 3px rgba(0, 0, 0, 0.6)
   box-shadow: 0 0 3px rgba(0, 0, 0, 0.6)
   z-index: 99999
-  border-radius: 6px
-  -webkit-border-radius: 6px
-  -moz-border-radius: 6px
+  border-radius: 4px
 
 .simple-modal .simple-modal-header
   padding: 5px 15px
@@ -415,11 +354,7 @@ div#settings
   background-color: #F5F5F5
   padding: 14px 15px 15px
   border-top: 1px solid #EEEEEE
-  -webkit-border-radius: 0 0 6px 6px
-  -moz-border-radius: 0 0 6px 6px
-  border-radius: 0 0 6px 6px
-  -webkit-box-shadow: inset 0 1px 0 #FFF
-  -moz-box-shadow: inset 0 1px 0 #FFF
+  border-radius: 0 0 4px 4px
   box-shadow: inset 0 1px 0 #FFF
   zoom: 1
   margin-bottom: 0
@@ -435,12 +370,8 @@ div#settings
   font-size: 13px
   line-height: normal
   border: 1px solid transparent
-  -webkit-transition: 0.2s linear all
-  -moz-transition: 0.2s linear all
   transition: 0.2s linear all
   border-radius: 3px
-  -webkit-border-radius: 3px
-  -moz-border-radius: 3px
 
 .simple-modal .simple-modal-footer a.btn.primary
   color: #FFF
@@ -463,12 +394,8 @@ div#settings
 .simple-modal.draggable .simple-modal-header:hover
   cursor: move
   background-color: #f8f8f8
-  -webkit-border-top-left-radius: 6px
-  -webkit-border-top-right-radius: 6px
-  -moz-border-radius-topleft: 6px
-  -moz-border-radius-topright: 6px
-  border-top-left-radius: 6px
-  border-top-right-radius: 6px
+  border-top-left-radius: 4px
+  border-top-right-radius: 4px
 
 /* Loading style */
 .simple-modal.loading .simple-modal-body