short 0.5.2 → 0.5.3

data/lib/shortener/server/public/js/jquery.tablesorter.min.js

@@ -0,0 +1,4 @@
+
+(function($){$.extend({tablesorter:new
+function(){var parsers=[],widgets=[];this.defaults={cssHeader:"header",cssAsc:"headerSortUp",cssDesc:"headerSortDown",cssChildRow:"expand-child",sortInitialOrder:"asc",sortMultiSortKey:"shiftKey",sortForce:null,sortAppend:null,sortLocaleCompare:true,textExtraction:"simple",parsers:{},widgets:[],widgetZebra:{css:["even","odd"]},headers:{},widthFixed:false,cancelSelection:true,sortList:[],headerList:[],dateFormat:"us",decimal:'/\.|\,/g',onRenderHeader:null,selectorHeaders:'thead th',debug:false};function benchmark(s,d){log(s+","+(new Date().getTime()-d.getTime())+"ms");}this.benchmark=benchmark;function log(s){if(typeof console!="undefined"&&typeof console.debug!="undefined"){console.log(s);}else{alert(s);}}function buildParserCache(table,$headers){if(table.config.debug){var parsersDebug="";}if(table.tBodies.length==0)return;var rows=table.tBodies[0].rows;if(rows[0]){var list=[],cells=rows[0].cells,l=cells.length;for(var i=0;i<l;i++){var p=false;if($.metadata&&($($headers[i]).metadata()&&$($headers[i]).metadata().sorter)){p=getParserById($($headers[i]).metadata().sorter);}else if((table.config.headers[i]&&table.config.headers[i].sorter)){p=getParserById(table.config.headers[i].sorter);}if(!p){p=detectParserForColumn(table,rows,-1,i);}if(table.config.debug){parsersDebug+="column:"+i+" parser:"+p.id+"\n";}list.push(p);}}if(table.config.debug){log(parsersDebug);}return list;};function detectParserForColumn(table,rows,rowIndex,cellIndex){var l=parsers.length,node=false,nodeValue=false,keepLooking=true;while(nodeValue==''&&keepLooking){rowIndex++;if(rows[rowIndex]){node=getNodeFromRowAndCellIndex(rows,rowIndex,cellIndex);nodeValue=trimAndGetNodeText(table.config,node);if(table.config.debug){log('Checking if value was empty on row:'+rowIndex);}}else{keepLooking=false;}}for(var i=1;i<l;i++){if(parsers[i].is(nodeValue,table,node)){return parsers[i];}}return parsers[0];}function getNodeFromRowAndCellIndex(rows,rowIndex,cellIndex){return rows[rowIndex].cells[cellIndex];}function trimAndGetNodeText(config,node){return $.trim(getElementText(config,node));}function getParserById(name){var l=parsers.length;for(var i=0;i<l;i++){if(parsers[i].id.toLowerCase()==name.toLowerCase()){return parsers[i];}}return false;}function buildCache(table){if(table.config.debug){var cacheTime=new Date();}var totalRows=(table.tBodies[0]&&table.tBodies[0].rows.length)||0,totalCells=(table.tBodies[0].rows[0]&&table.tBodies[0].rows[0].cells.length)||0,parsers=table.config.parsers,cache={row:[],normalized:[]};for(var i=0;i<totalRows;++i){var c=$(table.tBodies[0].rows[i]),cols=[];if(c.hasClass(table.config.cssChildRow)){cache.row[cache.row.length-1]=cache.row[cache.row.length-1].add(c);continue;}cache.row.push(c);for(var j=0;j<totalCells;++j){cols.push(parsers[j].format(getElementText(table.config,c[0].cells[j]),table,c[0].cells[j]));}cols.push(cache.normalized.length);cache.normalized.push(cols);cols=null;};if(table.config.debug){benchmark("Building cache for "+totalRows+" rows:",cacheTime);}return cache;};function getElementText(config,node){var text="";if(!node)return"";if(!config.supportsTextContent)config.supportsTextContent=node.textContent||false;if(config.textExtraction=="simple"){if(config.supportsTextContent){text=node.textContent;}else{if(node.childNodes[0]&&node.childNodes[0].hasChildNodes()){text=node.childNodes[0].innerHTML;}else{text=node.innerHTML;}}}else{if(typeof(config.textExtraction)=="function"){text=config.textExtraction(node);}else{text=$(node).text();}}return text;}function appendToTable(table,cache){if(table.config.debug){var appendTime=new Date()}var c=cache,r=c.row,n=c.normalized,totalRows=n.length,checkCell=(n[0].length-1),tableBody=$(table.tBodies[0]),rows=[];for(var i=0;i<totalRows;i++){var pos=n[i][checkCell];rows.push(r[pos]);if(!table.config.appender){var l=r[pos].length;for(var j=0;j<l;j++){tableBody[0].appendChild(r[pos][j]);}}}if(table.config.appender){table.config.appender(table,rows);}rows=null;if(table.config.debug){benchmark("Rebuilt table:",appendTime);}applyWidget(table);setTimeout(function(){$(table).trigger("sortEnd");},0);};function buildHeaders(table){if(table.config.debug){var time=new Date();}var meta=($.metadata)?true:false;var header_index=computeTableHeaderCellIndexes(table);$tableHeaders=$(table.config.selectorHeaders,table).each(function(index){this.column=header_index[this.parentNode.rowIndex+"-"+this.cellIndex];this.order=formatSortingOrder(table.config.sortInitialOrder);this.count=this.order;if(checkHeaderMetadata(this)||checkHeaderOptions(table,index))this.sortDisabled=true;if(checkHeaderOptionsSortingLocked(table,index))this.order=this.lockedOrder=checkHeaderOptionsSortingLocked(table,index);if(!this.sortDisabled){var $th=$(this).addClass(table.config.cssHeader);if(table.config.onRenderHeader)table.config.onRenderHeader.apply($th);}table.config.headerList[index]=this;});if(table.config.debug){benchmark("Built headers:",time);log($tableHeaders);}return $tableHeaders;};function computeTableHeaderCellIndexes(t){var matrix=[];var lookup={};var thead=t.getElementsByTagName('THEAD')[0];var trs=thead.getElementsByTagName('TR');for(var i=0;i<trs.length;i++){var cells=trs[i].cells;for(var j=0;j<cells.length;j++){var c=cells[j];var rowIndex=c.parentNode.rowIndex;var cellId=rowIndex+"-"+c.cellIndex;var rowSpan=c.rowSpan||1;var colSpan=c.colSpan||1
+var firstAvailCol;if(typeof(matrix[rowIndex])=="undefined"){matrix[rowIndex]=[];}for(var k=0;k<matrix[rowIndex].length+1;k++){if(typeof(matrix[rowIndex][k])=="undefined"){firstAvailCol=k;break;}}lookup[cellId]=firstAvailCol;for(var k=rowIndex;k<rowIndex+rowSpan;k++){if(typeof(matrix[k])=="undefined"){matrix[k]=[];}var matrixrow=matrix[k];for(var l=firstAvailCol;l<firstAvailCol+colSpan;l++){matrixrow[l]="x";}}}}return lookup;}function checkCellColSpan(table,rows,row){var arr=[],r=table.tHead.rows,c=r[row].cells;for(var i=0;i<c.length;i++){var cell=c[i];if(cell.colSpan>1){arr=arr.concat(checkCellColSpan(table,headerArr,row++));}else{if(table.tHead.length==1||(cell.rowSpan>1||!r[row+1])){arr.push(cell);}}}return arr;};function checkHeaderMetadata(cell){if(($.metadata)&&($(cell).metadata().sorter===false)){return true;};return false;}function checkHeaderOptions(table,i){if((table.config.headers[i])&&(table.config.headers[i].sorter===false)){return true;};return false;}function checkHeaderOptionsSortingLocked(table,i){if((table.config.headers[i])&&(table.config.headers[i].lockedOrder))return table.config.headers[i].lockedOrder;return false;}function applyWidget(table){var c=table.config.widgets;var l=c.length;for(var i=0;i<l;i++){getWidgetById(c[i]).format(table);}}function getWidgetById(name){var l=widgets.length;for(var i=0;i<l;i++){if(widgets[i].id.toLowerCase()==name.toLowerCase()){return widgets[i];}}};function formatSortingOrder(v){if(typeof(v)!="Number"){return(v.toLowerCase()=="desc")?1:0;}else{return(v==1)?1:0;}}function isValueInArray(v,a){var l=a.length;for(var i=0;i<l;i++){if(a[i][0]==v){return true;}}return false;}function setHeadersCss(table,$headers,list,css){$headers.removeClass(css[0]).removeClass(css[1]);var h=[];$headers.each(function(offset){if(!this.sortDisabled){h[this.column]=$(this);}});var l=list.length;for(var i=0;i<l;i++){h[list[i][0]].addClass(css[list[i][1]]);}}function fixColumnWidth(table,$headers){var c=table.config;if(c.widthFixed){var colgroup=$('<colgroup>');$("tr:first td",table.tBodies[0]).each(function(){colgroup.append($('<col>').css('width',$(this).width()));});$(table).prepend(colgroup);};}function updateHeaderSortCount(table,sortList){var c=table.config,l=sortList.length;for(var i=0;i<l;i++){var s=sortList[i],o=c.headerList[s[0]];o.count=s[1];o.count++;}}function multisort(table,sortList,cache){if(table.config.debug){var sortTime=new Date();}var dynamicExp="var sortWrapper = function(a,b) {",l=sortList.length;for(var i=0;i<l;i++){var c=sortList[i][0];var order=sortList[i][1];var s=(table.config.parsers[c].type=="text")?((order==0)?makeSortFunction("text","asc",c):makeSortFunction("text","desc",c)):((order==0)?makeSortFunction("numeric","asc",c):makeSortFunction("numeric","desc",c));var e="e"+i;dynamicExp+="var "+e+" = "+s;dynamicExp+="if("+e+") { return "+e+"; } ";dynamicExp+="else { ";}var orgOrderCol=cache.normalized[0].length-1;dynamicExp+="return a["+orgOrderCol+"]-b["+orgOrderCol+"];";for(var i=0;i<l;i++){dynamicExp+="}; ";}dynamicExp+="return 0; ";dynamicExp+="}; ";if(table.config.debug){benchmark("Evaling expression:"+dynamicExp,new Date());}eval(dynamicExp);cache.normalized.sort(sortWrapper);if(table.config.debug){benchmark("Sorting on "+sortList.toString()+" and dir "+order+" time:",sortTime);}return cache;};function makeSortFunction(type,direction,index){var a="a["+index+"]",b="b["+index+"]";if(type=='text'&&direction=='asc'){return"("+a+" == "+b+" ? 0 : ("+a+" === null ? Number.POSITIVE_INFINITY : ("+b+" === null ? Number.NEGATIVE_INFINITY : ("+a+" < "+b+") ? -1 : 1 )));";}else if(type=='text'&&direction=='desc'){return"("+a+" == "+b+" ? 0 : ("+a+" === null ? Number.POSITIVE_INFINITY : ("+b+" === null ? Number.NEGATIVE_INFINITY : ("+b+" < "+a+") ? -1 : 1 )));";}else if(type=='numeric'&&direction=='asc'){return"("+a+" === null && "+b+" === null) ? 0 :("+a+" === null ? Number.POSITIVE_INFINITY : ("+b+" === null ? Number.NEGATIVE_INFINITY : "+a+" - "+b+"));";}else if(type=='numeric'&&direction=='desc'){return"("+a+" === null && "+b+" === null) ? 0 :("+a+" === null ? Number.POSITIVE_INFINITY : ("+b+" === null ? Number.NEGATIVE_INFINITY : "+b+" - "+a+"));";}};function makeSortText(i){return"((a["+i+"] < b["+i+"]) ? -1 : ((a["+i+"] > b["+i+"]) ? 1 : 0));";};function makeSortTextDesc(i){return"((b["+i+"] < a["+i+"]) ? -1 : ((b["+i+"] > a["+i+"]) ? 1 : 0));";};function makeSortNumeric(i){return"a["+i+"]-b["+i+"];";};function makeSortNumericDesc(i){return"b["+i+"]-a["+i+"];";};function sortText(a,b){if(table.config.sortLocaleCompare)return a.localeCompare(b);return((a<b)?-1:((a>b)?1:0));};function sortTextDesc(a,b){if(table.config.sortLocaleCompare)return b.localeCompare(a);return((b<a)?-1:((b>a)?1:0));};function sortNumeric(a,b){return a-b;};function sortNumericDesc(a,b){return b-a;};function getCachedSortType(parsers,i){return parsers[i].type;};this.construct=function(settings){return this.each(function(){if(!this.tHead||!this.tBodies)return;var $this,$document,$headers,cache,config,shiftDown=0,sortOrder;this.config={};config=$.extend(this.config,$.tablesorter.defaults,settings);$this=$(this);$.data(this,"tablesorter",config);$headers=buildHeaders(this);this.config.parsers=buildParserCache(this,$headers);cache=buildCache(this);var sortCSS=[config.cssDesc,config.cssAsc];fixColumnWidth(this);$headers.click(function(e){var totalRows=($this[0].tBodies[0]&&$this[0].tBodies[0].rows.length)||0;if(!this.sortDisabled&&totalRows>0){$this.trigger("sortStart");var $cell=$(this);var i=this.column;this.order=this.count++%2;if(this.lockedOrder)this.order=this.lockedOrder;if(!e[config.sortMultiSortKey]){config.sortList=[];if(config.sortForce!=null){var a=config.sortForce;for(var j=0;j<a.length;j++){if(a[j][0]!=i){config.sortList.push(a[j]);}}}config.sortList.push([i,this.order]);}else{if(isValueInArray(i,config.sortList)){for(var j=0;j<config.sortList.length;j++){var s=config.sortList[j],o=config.headerList[s[0]];if(s[0]==i){o.count=s[1];o.count++;s[1]=o.count%2;}}}else{config.sortList.push([i,this.order]);}};setTimeout(function(){setHeadersCss($this[0],$headers,config.sortList,sortCSS);appendToTable($this[0],multisort($this[0],config.sortList,cache));},1);return false;}}).mousedown(function(){if(config.cancelSelection){this.onselectstart=function(){return false};return false;}});$this.bind("update",function(){var me=this;setTimeout(function(){me.config.parsers=buildParserCache(me,$headers);cache=buildCache(me);},1);}).bind("updateCell",function(e,cell){var config=this.config;var pos=[(cell.parentNode.rowIndex-1),cell.cellIndex];cache.normalized[pos[0]][pos[1]]=config.parsers[pos[1]].format(getElementText(config,cell),cell);}).bind("sorton",function(e,list){$(this).trigger("sortStart");config.sortList=list;var sortList=config.sortList;updateHeaderSortCount(this,sortList);setHeadersCss(this,$headers,sortList,sortCSS);appendToTable(this,multisort(this,sortList,cache));}).bind("appendCache",function(){appendToTable(this,cache);}).bind("applyWidgetId",function(e,id){getWidgetById(id).format(this);}).bind("applyWidgets",function(){applyWidget(this);});if($.metadata&&($(this).metadata()&&$(this).metadata().sortlist)){config.sortList=$(this).metadata().sortlist;}if(config.sortList.length>0){$this.trigger("sorton",[config.sortList]);}applyWidget(this);});};this.addParser=function(parser){var l=parsers.length,a=true;for(var i=0;i<l;i++){if(parsers[i].id.toLowerCase()==parser.id.toLowerCase()){a=false;}}if(a){parsers.push(parser);};};this.addWidget=function(widget){widgets.push(widget);};this.formatFloat=function(s){var i=parseFloat(s);return(isNaN(i))?0:i;};this.formatInt=function(s){var i=parseInt(s);return(isNaN(i))?0:i;};this.isDigit=function(s,config){return/^[-+]?\d*$/.test($.trim(s.replace(/[,.']/g,'')));};this.clearTableBody=function(table){if($.browser.msie){function empty(){while(this.firstChild)this.removeChild(this.firstChild);}empty.apply(table.tBodies[0]);}else{table.tBodies[0].innerHTML="";}};}});$.fn.extend({tablesorter:$.tablesorter.construct});var ts=$.tablesorter;ts.addParser({id:"text",is:function(s){return true;},format:function(s){return $.trim(s.toLocaleLowerCase());},type:"text"});ts.addParser({id:"digit",is:function(s,table){var c=table.config;return $.tablesorter.isDigit(s,c);},format:function(s){return $.tablesorter.formatFloat(s);},type:"numeric"});ts.addParser({id:"currency",is:function(s){return/^[£$€?.]/.test(s);},format:function(s){return $.tablesorter.formatFloat(s.replace(new RegExp(/[£$€]/g),""));},type:"numeric"});ts.addParser({id:"ipAddress",is:function(s){return/^\d{2,3}[\.]\d{2,3}[\.]\d{2,3}[\.]\d{2,3}$/.test(s);},format:function(s){var a=s.split("."),r="",l=a.length;for(var i=0;i<l;i++){var item=a[i];if(item.length==2){r+="0"+item;}else{r+=item;}}return $.tablesorter.formatFloat(r);},type:"numeric"});ts.addParser({id:"url",is:function(s){return/^(https?|ftp|file):\/\/$/.test(s);},format:function(s){return jQuery.trim(s.replace(new RegExp(/(https?|ftp|file):\/\//),''));},type:"text"});ts.addParser({id:"isoDate",is:function(s){return/^\d{4}[\/-]\d{1,2}[\/-]\d{1,2}$/.test(s);},format:function(s){return $.tablesorter.formatFloat((s!="")?new Date(s.replace(new RegExp(/-/g),"/")).getTime():"0");},type:"numeric"});ts.addParser({id:"percent",is:function(s){return/\%$/.test($.trim(s));},format:function(s){return $.tablesorter.formatFloat(s.replace(new RegExp(/%/g),""));},type:"numeric"});ts.addParser({id:"usLongDate",is:function(s){return s.match(new RegExp(/^[A-Za-z]{3,10}\.? [0-9]{1,2}, ([0-9]{4}|'?[0-9]{2}) (([0-2]?[0-9]:[0-5][0-9])|([0-1]?[0-9]:[0-5][0-9]\s(AM|PM)))$/));},format:function(s){return $.tablesorter.formatFloat(new Date(s).getTime());},type:"numeric"});ts.addParser({id:"shortDate",is:function(s){return/\d{1,2}[\/\-]\d{1,2}[\/\-]\d{2,4}/.test(s);},format:function(s,table){var c=table.config;s=s.replace(/\-/g,"/");if(c.dateFormat=="us"){s=s.replace(/(\d{1,2})[\/\-](\d{1,2})[\/\-](\d{4})/,"$3/$1/$2");}else if(c.dateFormat=="uk"){s=s.replace(/(\d{1,2})[\/\-](\d{1,2})[\/\-](\d{4})/,"$3/$2/$1");}else if(c.dateFormat=="dd/mm/yy"||c.dateFormat=="dd-mm-yy"){s=s.replace(/(\d{1,2})[\/\-](\d{1,2})[\/\-](\d{2})/,"$1/$2/$3");}return $.tablesorter.formatFloat(new Date(s).getTime());},type:"numeric"});ts.addParser({id:"time",is:function(s){return/^(([0-2]?[0-9]:[0-5][0-9])|([0-1]?[0-9]:[0-5][0-9]\s(am|pm)))$/.test(s);},format:function(s){return $.tablesorter.formatFloat(new Date("2000/01/01 "+s).getTime());},type:"numeric"});ts.addParser({id:"metadata",is:function(s){return false;},format:function(s,table,cell){var c=table.config,p=(!c.parserMetadataName)?'sortValue':c.parserMetadataName;return $(cell).metadata()[p];},type:"numeric"});ts.addWidget({id:"zebra",format:function(table){if(table.config.debug){var time=new Date();}var $tr,row=-1,odd;$("tr:visible",table.tBodies[0]).each(function(i){$tr=$(this);if(!$tr.hasClass(table.config.cssChildRow))row++;odd=(row%2==0);$tr.removeClass(table.config.widgetZebra.css[odd?0:1]).addClass(table.config.widgetZebra.css[odd?1:0])});if(table.config.debug){$.tablesorter.benchmark("Applying Zebra widget",time);}}});})(jQuery);

data/lib/shortener/server/public/{site.js → js/site.js}

@@ -1,7 +1,7 @@
 $(function(){
 
   /* pretty much yoinked exactly from jQuery site */
-  $("#add-form").submit(function(event) {
+  $("#nav-add-form").submit(function(event) {
 
     /* stop form from submitting normally */
     event.preventDefault();
@@ -14,10 +14,12 @@ $(function(){
 
     /* Send the data using post and put the results in a div */
     $.post( this.action + '.json', formData, function( data ) {
-        $( "#main" ).append( data.html );
+        $( "#display-new-shorts" ).append( data.html );
       }
     );
 
+    $('#nav-add-form > input[name="shortener[url]"]').val("");
+
   });
 
   $('.delete-button').click(function(event){
@@ -33,4 +35,25 @@ $(function(){
       }
     });
   });
+
+  $('.colorbox').each(function(index){
+     $(this).colorbox({href: $(this).attr('href') + '?boxify=true' });
+  });
+
+  $(".tablesorter:has(tbody tr)").tablesorter();
+
 });
+window.advancedShown = false;
+window.showHideAdvanced = function() {
+  if(window.advancedShown === false) {
+    $('#advanced-toggle').text('Hide Advanced Options')
+    $('.advanced').removeClass('hide');
+    $('.colorbox').colorbox.resize();
+  } else {
+    $('#advanced-toggle').text('Show Advanced Options')
+    $('.advanced').addClass('hide');
+    $('.colorbox').colorbox.resize();
+  }
+  window.advancedShown = !window.advancedShown;
+}
+

data/lib/shortener/server/views/add.haml

@@ -1,22 +1,50 @@
-#shortener.row(style="margin-top: 40px;")
-  %form{:id => 'add-form',:name => "shortener", :action => "/add", :method => "post", :class => 'offset3 form'}
-    %label{:for => "shortener[url]"} Url to Shorten:
-    %input{:type => "text", :name => "shortener[url]", :class => "text"}
-    %input{:type => "submit", :value => "Shorten", :class => "btn primary"}
-    %a{:onClick => '$(".advanced").fadeIn();'} Show Advanced Options
-    %br
-    %label{:for => 'shortener[expire]', :class => 'advanced'} Time till Expired:
-    %input{:type => 'text', :name => 'shortener[expire]', :class => 'text advanced'}
-    %br
-    %label{:for => 'shortener[max-clicks]', :class => 'advanced'} Max Clicks:
-    %input{:type => 'text', :name => 'shortener[max-clicks]', :class => 'text advanced'}
-    %br
-    %label{:for => 'shortener[desired-short]', :class => 'advanced'} Desired Short:
-    %input{:type => 'text', :name => 'shortener[desired-short]', :class => 'text advanced'}
-    %br
-    %label{:for => 'shortener[allow-override]', :class => 'advanced'} Allow Random Override:
-    %input{:type => 'checkbox', :name => 'shortener[allow-override]', :class => 'text advanced', :value => 'true'}
+#shortener.row(style="margin-top: 40px;margin-bottom:75px;")
+  %form{:id => 'add-form',:name => "shortener", :action => "/add", :method => "post", :class => boxify_class(2, nil, nil, 'form-horizontal')}
+    .control-group
+      %label.control-label{:for => "shortener[url]"} Url to Shorten:
+      .controls
+        %input{:type => "text", :name => "shortener[url]", :class => "text"}
+        %input{:type => "submit", :value => "Shorten", :class => "btn primary"}
+        %a#advanced-toggle{:onClick => 'window.showHideAdvanced();', href: '#'} Show Advanced Options
+    .control-group.advanced
+      %label{:for => 'shortener[expire]', :class => 'control-label advanced'} Time till Expired:
+      .controls
+        %input{:type => 'text', :name => 'shortener[expire]', :class => 'text advanced'}
+    .control-group.advanced
+      %label{:for => 'shortener[max-clicks]', :class => 'control-label advanced'} Max Clicks:
+      .controls
+        %input{:type => 'text', :name => 'shortener[max-clicks]', :class => 'text advanced'}
+    .control-group.advanced
+      %label{:for => 'shortener[desired-short]', :class => 'control-label advanced'} Desired Short:
+      .controls
+        %input{:type => 'text', :name => 'shortener[desired-short]', :class => 'text advanced'}
+    .control-group.advanced
+      %label{:for => 'shortener[allow-override]', :class => 'control-label'} Allow Random Override:
+      .controls
+        %input{:type => 'checkbox', :name => 'shortener[allow-override]', :class => 'text advanced', :value => 'true'}
     :javascript
       $(function(){
-        $('.advanced').hide();
+        $('.advanced').addClass('hide');
+        $("#add-form").submit(function(event) {
+
+          /* stop form from submitting normally */
+          event.preventDefault();
+
+          // my best take so far at scraping form data
+          var formData = {};
+          $.each($(this).serializeArray(), function(i, field) {
+            formData[field.name] = field.value;
+          });
+
+          /* Send the data using post and put the results in a div */
+          $.post( this.action + '.json', formData, function( data ) {
+            $( "#display-add-new-shorts" ).append( data.html );
+            }
+          );
+
+        });
       })
+  #display-add-new-shorts{class: boxify_class(3)}
+
+:css
+  .hide { display: none;}

data/lib/shortener/server/views/display.haml

@@ -1,6 +1,7 @@
-#link_display.row
-  - classs = @data['s3'].nil? ? 'offset5' : ''
-  %div.span4{class: classs}
-    %h4= @url
-  %div.span2
-    = clippy(@url)
+#link_display
+  .alert.alert-success{style: 'padding-bottom:25px;'}
+    %div.span2{class: 'offset1'}
+      %h4= @url
+    %div.span2
+      = clippy(@url, '#dff0d8')
+    %a.close{'data-dismiss' => 'alert', href: '#'}×

data/lib/shortener/server/views/index.haml

@@ -1,5 +1,6 @@
+#display-new-shorts.container
 #shorterner-index
-  %table
+  %table.table.table-striped.tablesorter
     %thead
       %tr
         %th Shortened
@@ -20,6 +21,6 @@
           %td= short['max-clicks'] || "∞"
           %td
             %a{href: "/delete/#{short['shortened']}", class: 'delete-button'}
-              %img{src: 'delete-icon.png', alt: 'delete!', width: '16px', height: '16px'}
+              %img{src: 'images/delete-icon.png', alt: 'delete!', width: '16px', height: '16px'}
           %td= clippy("#{base_url}/#{short['shortened']}")
 

data/lib/shortener/server/views/layout.haml

@@ -2,23 +2,32 @@
 %html
   %head
     %title Shortener
-    %link{rel: 'stylesheet', type: 'text/css', href: '/patched.bootstrap.min.css'}
-    %script{src: '/jquery.min.js', type: 'text/javascript'}
-    %script{src: 'site.js', type: 'text/javascript'}
+    %script{src: '//ajax.googleapis.com/ajax/libs/jquery/1.7.1/jquery.min.js', type: 'text/javascript'}
+    %link{rel: 'stylesheet', type: 'text/css', href: '/css/bootstrap.min.css'}
+    %link{rel: 'stylesheet', type: 'text/css', href: '/css/bootstrap-responsive.min.css'}
+    %link{rel: 'stylesheet', type: 'text/css', href: '/css/shortener.css'}
+    %link{rel: 'stylesheet', type: 'text/css', href: '/css/colorbox.css'}
+    %script{src: '/js/site.js', type: 'text/javascript'}
+    %script{src: '/js/jquery.colorbox.js', type: 'text/javascript'}
+    %script{src: '/js/bootstrap.min.js', type: 'text/javascript'}
+    %script{src: '/js/jquery.tablesorter.min.js', type: 'text/javascript'}
   %body{:'padding-top' => '60px'}
 
-    %div.topbar
-      %div.topbar-inner
+    %div.navbar
+      %div.navbar-inner
         %div.container
           %a{class: 'brand', href: "/"} Shortener
           %ul.nav
+            %li
+              %form{:id => 'nav-add-form',:name => "shortener", :action => "/add", :method => "post", :class => 'navbar-search pull-left'}
+                %input{:type => "text", :name => "shortener[url]", :class => "search-query span2", placeholder: 'Shorten'}
             %li
               %a{href: '/index'} Index
             %li
-              %a{href: '/add'} Add
+              %a.colorbox{href: '/add'} Advanced Add
             - if $conf.s3_available
               %li
-                %a{href: '/upload'} Upload
+                %a.colorbox{href: '/upload'} Upload
 
     #main.container(style="margin-top: 40px;")
       = yield

data/lib/shortener/server/views/upload.haml

@@ -1,130 +1,103 @@
-%script{src: "swfupload.js"}
-%script{src: "jquery-swfupload-min.js"}
-:erb
-  <script>
-  $(function(){
-      $('#swfupload-control').swfupload({
-          // Backend Settings
-          upload_url: "<%= @upload_url %>",    // Relative to the SWF file (or you can use absolute paths)
-          http_success : [ 200, 201, 204 ],     // FOR AWS
-
-          // File Upload Settings
-          file_size_limit : "102400", // 100MB
-          file_types : "*.*",
-          file_types_description : "All Files",
-          file_upload_limit : "10",
-          file_queue_limit : "0",
-          file_post_name : "file",        // FOR AWS
-
-          // Button settings
-          button_image_url : "/images/XPButtonUploadText_61x22.png",
-          button_placeholder_id : "span-button-placeholder",
-          button_width: 61,
-          button_height: 22,
-
-          // Flash Settings
-          flash_url : "/flash/swfupload.swf",
-          //debug: true,
-          post_params: <%= @post.to_json %>   // FOR AWS
-
-      })
-          .bind('fileQueued', function(event, file){
-            // start the upload since it's queued
-            //$(this).swfupload('startUpload');
-            $(this).swfupload('setButtonDisabled', true);
-            $('#file-name-placeholder').text(file.name);
-          })
-          .bind('fileQueueError', function(event, file, errorCode, message){
-            //$('#log').append('<li>File queue error - '+message+'</li>');
-            //$(this).show();
-          })
-          .bind('uploadStart', function(event, file){
-            $('#progressbar').show();
-          })
-          .bind('uploadProgress', function(event, file, bytesLoaded){
-            var avg = bytesLoaded / file.size * 100;
-            //$('#log').append('<li>Upload progress - '+bytesLoaded+ ' ' + avg + '</li>');
-            $('#progressbar .bar').css('width', avg + '%' );
-          })
-          .bind('uploadSuccess', function(event, file, serverData){
-            //$('#log').append('<li>Upload success - '+file.name+'</li>');
-          })
-          .bind('uploadComplete', function(event, file){
-            //$('#log').append('<li>Upload complete - '+file.name+'</li>');
-            $('#progressbar .active').removeClass('active');
-
-            var values = $('#upload-form').serialize();
-            values += '&shortener%5bfile_name%5d=' + file.name;
-            // Change this callback function to suite your needs
-            // $.ajax({
-            //   type: "POST",
-            //   url: '/upload',
-            //   data: "name=" + file.name,
-            //   async: false,
-            // });
-            $.post('/upload.json', values, function(data){
-              $('#shortener-display').html(data.html)
-                .removeClass('hide');
-            });
+%script{src: "js/swfupload.js"}
+%script{src: "js/jquery-swfupload-min.js"}
+.row
+  %form.form-horizontal.span6{id: 'upload-form', action: '/upload', method: 'post'}
+    .control-group
+      %label.control-label Select File:
+      .controls
+        %div{:id=> "swfupload-control"}
+          %ol{:id=> "log"}
+          %span{:id=> "span-button-placeholder"}
+          %span{id: 'file-name-placeholder'}
+    .control-group.hideable
+      %label.control-label Display Type:
+      .controls
+        %label.radio.inline
+          %input{name: 'shortener[type]', type: 'radio', value: 'video'} 
+            Video
+        %label.radio.inline
+          %input{name: 'shortener[type]', type: 'radio', value: 'audio'} 
+          Audio
+        %label.radio.inline
+          %input{name: 'shortener[type]', type: 'radio', value: 'image'} 
+          Image
+        %label.radio.inline
+          %input{name: 'shortener[type]', type: 'radio', value: 'download'} 
+          Download
+    .control-group.hideable
+      %label.control-label{for: 'shorterner[name]'} Name
+      .controls
+        %input{type: 'text', name: 'shortener[name]'}
+    .control-group.hideable
+      %label.control-label{for: 'shorterner[description]'} Description
+      .controls
+        %input{type: 'text', name: 'shortener[description]'}
+    .form-actions.hideable
+      %input.btn-primary{type: 'submit', value: 'Shorten'}
+    .row
+      #progressbar.span4.offset1{style: 'display:none;'}
+        .progress.progress-danger.active.progress-striped
+          .bar{style: "width: 0%"}
 
-            // upload has completed, lets try the next one in the queue
-            $(this).swfupload('startUpload');
-          })
-          .bind('uploadError', function(event, file, errorCode, message){
-            //$('#log').append('<li>Upload error - '+message+'</li>');
-          });
+#display-up-new-shorts{class: boxify_class(nil, nil, 'container')}
 
-  });
-  </script>
+:javascript
+  $(function(){
+    $('#swfupload-control').swfupload({
+      // Backend Settings
+      upload_url: "#{@upload_url}",    
+      http_success : [ 200, 201, 204 ],     // FOR AWS
 
-.row
-  #progressbar.span8{style: 'display:none;'}
-    .progress.danger.active.striped
-      .bar{style: "width: 0%"}
+      // File Upload Settings
+      file_size_limit : "102400", // 100MB
+      file_types : "*.*",
+      file_types_description : "All Files",
+      file_upload_limit : "10",
+      file_queue_limit : "0",
+      file_post_name : "file",        // FOR AWS
 
-.row
-  %div.offset1{:id=> "swfupload-control"}
-    %ol{:id=> "log"}
-    %span{:id=> "span-button-placeholder"}
-    %span{id: 'file-name-placeholder'}
-%br
+      // Button settings
+      button_image_url : "/images/XPButtonUploadText_61x22.png",
+      button_placeholder_id : "span-button-placeholder",
+      button_width: 61,
+      button_height: 22,
 
-.row
-  %form.form{id: 'upload-form', action: '/upload', method: 'post'}
-    .row
-      %ul.offset2
-        %li.radio
-          %input{name: 'shortener[type]', type: 'radio', value: 'video'} Video
-        %li.radio
-          %input{name: 'shortener[type]', type: 'radio', value: 'audio'} Audio
-        %li.radio
-          %input{name: 'shortener[type]', type: 'radio', value: 'image'} Image
-        %li.radio
-          %input{name: 'shortener[type]', type: 'radio', value: 'download'} Download
-      .row
-        #shortener-display.offset8.hide
-      .field
-        %label{for: 'shorterner[name]'} Name
-        %input{type: 'text', name: 'shortener[name]'}
-      .field
-        %label{for: 'shorterner[description]'} Description
-        %input{type: 'text', name: 'shortener[description]'}
-    .row
-      .actions
-        %input.btn.primary{type: 'submit', value: 'Shorten'}
+      // Flash Settings
+      flash_url : "/flash/swfupload.swf",
+      //debug: true,
+      post_params: #{@post.to_json}   // FOR AWS
 
-.row
+    })
+    .bind('fileQueued', function(event, file){
+      $(this).swfupload('setButtonDisabled', true);
+      $('#file-name-placeholder').text(file.name);
+    })
+    .bind('uploadStart', function(event, file){
+      $('#progressbar').show();
+      $('.hideable').hide();
+      $('.form-actions').hide();
+    })
+    .bind('uploadProgress', function(event, file, bytesLoaded){
+      var avg = bytesLoaded / file.size * 100;
+      $('#progressbar .bar').css('width', avg + '%' );
+    })
+    .bind('uploadSuccess', function(event, file, serverData){
+      var values = $('#upload-form').serialize();
+      values += '&shortener%5bfile_name%5d=' + file.name;
+      $.post('/upload.json', values, function(data){
+        $('#display-up-new-shorts').append(data.html)
+      });
 
-:css
-  .radio {
-    display: inline;
-    margin-right: 20px;
-  }
+    })
+    .bind('uploadComplete', function(event, file){
+      $('#progressbar .bar').css('width', '100%')
+      $('#progressbar .active').removeClass('active');
+      $('.control-group').hide();
+    })
 
-:javascript
-  $('#upload-form').submit(function(e){
-    e.preventDefault();
-    $('#swfupload-control').swfupload('startUpload');
+    $('#upload-form').submit(function(e){
+      e.preventDefault();
+      $('#swfupload-control').swfupload('startUpload');
+    });
   });
 
-

data/lib/shortener/server.rb

@@ -205,6 +205,16 @@ class Shortener
         hsh.keys.map {|k| [k, hsh[k]] }.flatten
       end
 
+      def boxify_class(int, boxify_classes = '', nonbox_classes = '', other_classes = '')
+        str = if @boxify 
+                "#{other_classes} #{boxify_classes}" 
+              else
+                "#{other_classes} #{nonbox_classes}"
+              end
+        str = str + " offset#{int}" unless !int.nil? && @boxify
+        str
+      end
+
     end
 
     before do
@@ -216,7 +226,8 @@ class Shortener
     end
 
     get '/add' do
-      haml :add
+      @boxify = !params['boxify'].nil?
+      haml :add, layout: !@boxify
     end
 
     get '/index.?:format?' do
@@ -259,7 +270,8 @@ class Shortener
       }
 
       @upload_url = "http://#{$conf.s3_bucket}.s3.amazonaws.com/"
-      haml :upload
+      @boxify = !params['boxify'].nil?
+      haml :upload, layout: !@boxify
     end
 
     #get '/:id.?:format?' do

data/lib/shortener/tasks/heroku.rb

@@ -64,8 +64,8 @@ namespace :short do
     desc "Build a Heroku Ready Git repo"
     task :build do
       FileUtils.mkdir(File.join(Dir.pwd, 'shortener-heroku')) unless $existing_repo
-      [:'server', :'server/public', :'server/views',
-       :'server/views/s3', :'server/public/flash',
+      [:'server', :'server/public', :'server/views', :'server/views/s3', 
+        :'server/public/flash', :'server/public/js', :'server/public/css',
        :'server/public/skin', :'server/public/images',
        :'server/public/skin/blue.monday'].each do |f|
         unless File.exist?(_file(f))
@@ -76,7 +76,8 @@ namespace :short do
 
       ['server', 'server/public', 'server/views', :'server/views/s3',
        :'server/public/flash', :'server/public/images', :'server/public/skin',
-       :'server/public/skin/blue.monday'].each do |end_point|
+       :'server/public/skin/blue.monday', :'server/public/js', 
+       :'server/public/css'].each do |end_point|
         Dir["#{$gem_dir}/#{end_point}/**"].each do |f|
           next if File.directory?(f)
           end_point = _file(:"#{_ep(f)}")

data/lib/shortener/version.rb

@@ -1,6 +1,6 @@
 
 class Shortener
 
-  VERSION = '0.5.2'
+  VERSION = '0.5.3'
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: short
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.5.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-23 00:00:00.000000000 Z
+date: 2012-03-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &70206107096800 !ruby/object:Gem::Requirement
+  requirement: &70315090913060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70206107096800
+  version_requirements: *70315090913060
 - !ruby/object:Gem::Dependency
   name: redis-namespace
-  requirement: &70206107095920 !ruby/object:Gem::Requirement
+  requirement: &70315090911220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70206107095920
+  version_requirements: *70315090911220
 - !ruby/object:Gem::Dependency
   name: haml
-  requirement: &70206107095340 !ruby/object:Gem::Requirement
+  requirement: &70315090909160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70206107095340
+  version_requirements: *70315090909160
 - !ruby/object:Gem::Dependency
   name: turn
-  requirement: &70206107094660 !ruby/object:Gem::Requirement
+  requirement: &70315090904700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +54,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70206107094660
+  version_requirements: *70315090904700
 description: A (hopefully) easy and handy deployable APIable way to shorten links.
 email:
 - jake@jakewilkins.com
@@ -75,22 +75,29 @@ files:
 - lib/shortener/server/Gemfile
 - lib/shortener/server/Gemfile.lock
 - lib/shortener/server/config.ru.template
-- lib/shortener/server/public/delete-icon.png
+- lib/shortener/server/public/css/bootstrap-responsive.min.css
+- lib/shortener/server/public/css/bootstrap.min.css
+- lib/shortener/server/public/css/colorbox.css
+- lib/shortener/server/public/css/shortener.css
 - lib/shortener/server/public/flash/Jplayer.swf
 - lib/shortener/server/public/flash/clippy.swf
 - lib/shortener/server/public/flash/swfupload.swf
 - lib/shortener/server/public/images/XPButtonUploadText_61x22.png
-- lib/shortener/server/public/jquery-swfupload-min.js
-- lib/shortener/server/public/jquery-swfupload.js
-- lib/shortener/server/public/jquery.jplayer.min.js
-- lib/shortener/server/public/jquery.min.js
-- lib/shortener/server/public/patched.bootstrap.min.css
-- lib/shortener/server/public/site.js
+- lib/shortener/server/public/images/delete-icon.png
+- lib/shortener/server/public/images/sort_asc.png
+- lib/shortener/server/public/images/sort_both.png
+- lib/shortener/server/public/images/sort_desc.png
+- lib/shortener/server/public/js/bootstrap.min.js
+- lib/shortener/server/public/js/jquery-swfupload-min.js
+- lib/shortener/server/public/js/jquery.colorbox.js
+- lib/shortener/server/public/js/jquery.jplayer.min.js
+- lib/shortener/server/public/js/jquery.tablesorter.min.js
+- lib/shortener/server/public/js/site.js
+- lib/shortener/server/public/js/swfupload.js
 - lib/shortener/server/public/skin/blue.monday/jplayer.blue.monday.css
 - lib/shortener/server/public/skin/blue.monday/jplayer.blue.monday.jpg
 - lib/shortener/server/public/skin/blue.monday/jplayer.blue.monday.seeking.gif
 - lib/shortener/server/public/skin/blue.monday/jplayer.blue.monday.video.play.png
-- lib/shortener/server/public/swfupload.js
 - lib/shortener/server/views/add.haml
 - lib/shortener/server/views/display.haml
 - lib/shortener/server/views/index.haml