diff --git a/app/assets/javascripts/jquery-ui-1.8.16.custom.min.js b/app/assets/javascripts/jquery-ui-1.8.16.custom.min.js
index 14c9064f7f2c8b48fa98ed2c761dd38cb7595149..d92b7a34b06798f25e889d305625048c4eb5a303 100644
--- a/app/assets/javascripts/jquery-ui-1.8.16.custom.min.js
+++ b/app/assets/javascripts/jquery-ui-1.8.16.custom.min.js
@@ -41,7 +41,7 @@ c);return this},enable:function(){return this._setOption("disabled",false)},disa
* http://docs.jquery.com/UI/Mouse
*
* Depends:
- * jquery.ui.widget.js
+ * jquery.ui.widget.js
*/
(function(b){var d=false;b(document).mouseup(function(){d=false});b.widget("ui.mouse",{options:{cancel:":input,option",distance:1,delay:0},_mouseInit:function(){var a=this;this.element.bind("mousedown."+this.widgetName,function(c){return a._mouseDown(c)}).bind("click."+this.widgetName,function(c){if(true===b.data(c.target,a.widgetName+".preventClickEvent")){b.removeData(c.target,a.widgetName+".preventClickEvent");c.stopImmediatePropagation();return false}});this.started=false},_mouseDestroy:function(){this.element.unbind("."+
this.widgetName)},_mouseDown:function(a){if(!d){this._mouseStarted&&this._mouseUp(a);this._mouseDownEvent=a;var c=this,f=a.which==1,g=typeof this.options.cancel=="string"&&a.target.nodeName?b(a.target).closest(this.options.cancel).length:false;if(!f||g||!this._mouseCapture(a))return true;this.mouseDelayMet=!this.options.delay;if(!this.mouseDelayMet)this._mouseDelayTimer=setTimeout(function(){c.mouseDelayMet=true},this.options.delay);if(this._mouseDistanceMet(a)&&this._mouseDelayMet(a)){this._mouseStarted=
@@ -74,9 +74,9 @@ g=d.offset(),e=parseInt(c.curCSS(b,"top",true),10)||0,h=parseInt(c.curCSS(b,"lef
* http://docs.jquery.com/UI/Draggables
*
* Depends:
- * jquery.ui.core.js
- * jquery.ui.mouse.js
- * jquery.ui.widget.js
+ * jquery.ui.core.js
+ * jquery.ui.mouse.js
+ * jquery.ui.widget.js
*/
(function(d){d.widget("ui.draggable",d.ui.mouse,{widgetEventPrefix:"drag",options:{addClasses:true,appendTo:"parent",axis:false,connectToSortable:false,containment:false,cursor:"auto",cursorAt:false,grid:false,handle:false,helper:"original",iframeFix:false,opacity:false,refreshPositions:false,revert:false,revertDuration:500,scope:"default",scroll:true,scrollSensitivity:20,scrollSpeed:20,snap:false,snapMode:"both",snapTolerance:20,stack:false,zIndex:false},_create:function(){if(this.options.helper==
"original"&&!/^(?:r|a|f)/.test(this.element.css("position")))this.element[0].style.position="relative";this.options.addClasses&&this.element.addClass("ui-draggable");this.options.disabled&&this.element.addClass("ui-draggable-disabled");this._mouseInit()},destroy:function(){if(this.element.data("draggable")){this.element.removeData("draggable").unbind(".draggable").removeClass("ui-draggable ui-draggable-dragging ui-draggable-disabled");this._mouseDestroy();return this}},_mouseCapture:function(a){var b=
@@ -124,10 +124,10 @@ p||q||r||s;if(f.snapMode!="outer"){p=Math.abs(k-n)<=e;q=Math.abs(m-o)<=e;r=Math.
* http://docs.jquery.com/UI/Droppables
*
* Depends:
- * jquery.ui.core.js
- * jquery.ui.widget.js
- * jquery.ui.mouse.js
- * jquery.ui.draggable.js
+ * jquery.ui.core.js
+ * jquery.ui.widget.js
+ * jquery.ui.mouse.js
+ * jquery.ui.draggable.js
*/
(function(d){d.widget("ui.droppable",{widgetEventPrefix:"drop",options:{accept:"*",activeClass:false,addClasses:true,greedy:false,hoverClass:false,scope:"default",tolerance:"intersect"},_create:function(){var a=this.options,b=a.accept;this.isover=0;this.isout=1;this.accept=d.isFunction(b)?b:function(c){return c.is(b)};this.proportions={width:this.element[0].offsetWidth,height:this.element[0].offsetHeight};d.ui.ddmanager.droppables[a.scope]=d.ui.ddmanager.droppables[a.scope]||[];d.ui.ddmanager.droppables[a.scope].push(this);
a.addClasses&&this.element.addClass("ui-droppable")},destroy:function(){for(var a=d.ui.ddmanager.droppables[this.options.scope],b=0;b<a.length;b++)a[b]==this&&a.splice(b,1);this.element.removeClass("ui-droppable ui-droppable-disabled").removeData("droppable").unbind(".droppable");return this},_setOption:function(a,b){if(a=="accept")this.accept=d.isFunction(b)?b:function(c){return c.is(b)};d.Widget.prototype._setOption.apply(this,arguments)},_activate:function(a){var b=d.ui.ddmanager.current;this.options.activeClass&&
@@ -151,9 +151,9 @@ a.options.refreshPositions||d.ui.ddmanager.prepareOffsets(a,b)}}})(jQuery);
* http://docs.jquery.com/UI/Resizables
*
* Depends:
- * jquery.ui.core.js
- * jquery.ui.mouse.js
- * jquery.ui.widget.js
+ * jquery.ui.core.js
+ * jquery.ui.mouse.js
+ * jquery.ui.widget.js
*/
(function(e){e.widget("ui.resizable",e.ui.mouse,{widgetEventPrefix:"resize",options:{alsoResize:false,animate:false,animateDuration:"slow",animateEasing:"swing",aspectRatio:false,autoHide:false,containment:false,ghost:false,grid:false,handles:"e,s,se",helper:false,maxHeight:null,maxWidth:null,minHeight:10,minWidth:10,zIndex:1E3},_create:function(){var b=this,a=this.options;this.element.addClass("ui-resizable");e.extend(this,{_aspectRatio:!!a.aspectRatio,aspectRatio:a.aspectRatio,originalElement:this.element,
_proportionallyResizeElements:[],_helper:a.helper||a.ghost||a.animate?a.helper||"ui-resizable-helper":null});if(this.element[0].nodeName.match(/canvas|textarea|input|select|button|img/i)){/relative/.test(this.element.css("position"))&&e.browser.opera&&this.element.css({position:"relative",top:"auto",left:"auto"});this.element.wrap(e('<div class="ui-wrapper" style="overflow: hidden;"></div>').css({position:this.element.css("position"),width:this.element.outerWidth(),height:this.element.outerHeight(),
@@ -200,9 +200,9 @@ d.height+a}else{b.size.width=d.width+h;b.size.height=d.height+a;b.position.top=f
* http://docs.jquery.com/UI/Selectables
*
* Depends:
- * jquery.ui.core.js
- * jquery.ui.mouse.js
- * jquery.ui.widget.js
+ * jquery.ui.core.js
+ * jquery.ui.mouse.js
+ * jquery.ui.widget.js
*/
(function(e){e.widget("ui.selectable",e.ui.mouse,{options:{appendTo:"body",autoRefresh:true,distance:0,filter:"*",tolerance:"touch"},_create:function(){var c=this;this.element.addClass("ui-selectable");this.dragged=false;var f;this.refresh=function(){f=e(c.options.filter,c.element[0]);f.each(function(){var d=e(this),b=d.offset();e.data(this,"selectable-item",{element:this,$element:d,left:b.left,top:b.top,right:b.left+d.outerWidth(),bottom:b.top+d.outerHeight(),startselected:false,selected:d.hasClass("ui-selected"),
selecting:d.hasClass("ui-selecting"),unselecting:d.hasClass("ui-unselecting")})})};this.refresh();this.selectees=f.addClass("ui-selectee");this._mouseInit();this.helper=e("<div class='ui-selectable-helper'></div>")},destroy:function(){this.selectees.removeClass("ui-selectee").removeData("selectable-item");this.element.removeClass("ui-selectable ui-selectable-disabled").removeData("selectable").unbind(".selectable");this._mouseDestroy();return this},_mouseStart:function(c){var f=this;this.opos=[c.pageX,
@@ -222,9 +222,9 @@ e.data(this,"selectable-item");d.$element.removeClass("ui-selecting").addClass("
* http://docs.jquery.com/UI/Sortables
*
* Depends:
- * jquery.ui.core.js
- * jquery.ui.mouse.js
- * jquery.ui.widget.js
+ * jquery.ui.core.js
+ * jquery.ui.mouse.js
+ * jquery.ui.widget.js
*/
(function(d){d.widget("ui.sortable",d.ui.mouse,{widgetEventPrefix:"sort",options:{appendTo:"parent",axis:false,connectWith:false,containment:false,cursor:"auto",cursorAt:false,dropOnEmpty:true,forcePlaceholderSize:false,forceHelperSize:false,grid:false,handle:false,helper:"original",items:"> *",opacity:false,placeholder:false,revert:false,scroll:true,scrollSensitivity:20,scrollSpeed:20,scope:"default",tolerance:"intersect",zIndex:1E3},_create:function(){var a=this.options;this.containerCache={};this.element.addClass("ui-sortable");
this.refresh();this.floating=this.items.length?a.axis==="x"||/left|right/.test(this.items[0].item.css("float"))||/inline|table-cell/.test(this.items[0].item.css("display")):false;this.offset=this.element.offset();this._mouseInit()},destroy:function(){this.element.removeClass("ui-sortable ui-sortable-disabled").removeData("sortable").unbind(".sortable");this._mouseDestroy();for(var a=this.items.length-1;a>=0;a--)this.items[a].item.removeData("sortable-item");return this},_setOption:function(a,b){if(a===
@@ -282,8 +282,8 @@ _uiHash:function(a){var b=a||this;return{helper:b.helper,placeholder:b.placehold
* http://docs.jquery.com/UI/Accordion
*
* Depends:
- * jquery.ui.core.js
- * jquery.ui.widget.js
+ * jquery.ui.core.js
+ * jquery.ui.widget.js
*/
(function(c){c.widget("ui.accordion",{options:{active:0,animated:"slide",autoHeight:true,clearStyle:false,collapsible:false,event:"click",fillSpace:false,header:"> li > :first-child,> :not(li):even",icons:{header:"ui-icon-triangle-1-e",headerSelected:"ui-icon-triangle-1-s"},navigation:false,navigationFilter:function(){return this.href.toLowerCase()===location.href.toLowerCase()}},_create:function(){var a=this,b=a.options;a.running=0;a.element.addClass("ui-accordion ui-widget ui-helper-reset").children("li").addClass("ui-accordion-li-fix");
a.headers=a.element.find(b.header).addClass("ui-accordion-header ui-helper-reset ui-state-default ui-corner-all").bind("mouseenter.accordion",function(){b.disabled||c(this).addClass("ui-state-hover")}).bind("mouseleave.accordion",function(){b.disabled||c(this).removeClass("ui-state-hover")}).bind("focus.accordion",function(){b.disabled||c(this).addClass("ui-state-focus")}).bind("blur.accordion",function(){b.disabled||c(this).removeClass("ui-state-focus")});a.headers.next().addClass("ui-accordion-content ui-helper-reset ui-widget-content ui-corner-bottom");
@@ -312,9 +312,9 @@ paddingTop:"hide",paddingBottom:"hide"},a);else a.toShow.animate({height:"show",
* http://docs.jquery.com/UI/Autocomplete
*
* Depends:
- * jquery.ui.core.js
- * jquery.ui.widget.js
- * jquery.ui.position.js
+ * jquery.ui.core.js
+ * jquery.ui.widget.js
+ * jquery.ui.position.js
*/
(function(d){var e=0;d.widget("ui.autocomplete",{options:{appendTo:"body",autoFocus:false,delay:300,minLength:1,position:{my:"left top",at:"left bottom",collision:"none"},source:null},pending:0,_create:function(){var a=this,b=this.element[0].ownerDocument,g;this.element.addClass("ui-autocomplete-input").attr("autocomplete","off").attr({role:"textbox","aria-autocomplete":"list","aria-haspopup":"true"}).bind("keydown.autocomplete",function(c){if(!(a.options.disabled||a.element.propAttr("readOnly"))){g=
false;var f=d.ui.keyCode;switch(c.keyCode){case f.PAGE_UP:a._move("previousPage",c);break;case f.PAGE_DOWN:a._move("nextPage",c);break;case f.UP:a._move("previous",c);c.preventDefault();break;case f.DOWN:a._move("next",c);c.preventDefault();break;case f.ENTER:case f.NUMPAD_ENTER:if(a.menu.active){g=true;c.preventDefault()}case f.TAB:if(!a.menu.active)return;a.menu.select(c);break;case f.ESCAPE:a.element.val(a.term);a.close(c);break;default:clearTimeout(a.searching);a.searching=setTimeout(function(){if(a.term!=
@@ -344,8 +344,8 @@ this.first()?":last":":first"))},hasScroll:function(){return this.element.height
* http://docs.jquery.com/UI/Button
*
* Depends:
- * jquery.ui.core.js
- * jquery.ui.widget.js
+ * jquery.ui.core.js
+ * jquery.ui.widget.js
*/
(function(b){var h,i,j,g,l=function(){var a=b(this).find(":ui-button");setTimeout(function(){a.button("refresh")},1)},k=function(a){var c=a.name,e=a.form,f=b([]);if(c)f=e?b(e).find("[name='"+c+"']"):b("[name='"+c+"']",a.ownerDocument).filter(function(){return!this.form});return f};b.widget("ui.button",{options:{disabled:null,text:true,label:null,icons:{primary:null,secondary:null}},_create:function(){this.element.closest("form").unbind("reset.button").bind("reset.button",l);if(typeof this.options.disabled!==
"boolean")this.options.disabled=this.element.propAttr("disabled");this._determineButtonType();this.hasTitle=!!this.buttonElement.attr("title");var a=this,c=this.options,e=this.type==="checkbox"||this.type==="radio",f="ui-state-hover"+(!e?" ui-state-active":"");if(c.label===null)c.label=this.buttonElement.html();if(this.element.is(":disabled"))c.disabled=true;this.buttonElement.addClass("ui-button ui-widget ui-state-default ui-corner-all").attr("role","button").bind("mouseenter.button",function(){if(!c.disabled){b(this).addClass("ui-state-hover");
@@ -371,13 +371,13 @@ b.Widget.prototype.destroy.call(this)}})})(jQuery);
* http://docs.jquery.com/UI/Dialog
*
* Depends:
- * jquery.ui.core.js
- * jquery.ui.widget.js
+ * jquery.ui.core.js
+ * jquery.ui.widget.js
* jquery.ui.button.js
- * jquery.ui.draggable.js
- * jquery.ui.mouse.js
- * jquery.ui.position.js
- * jquery.ui.resizable.js
+ * jquery.ui.draggable.js
+ * jquery.ui.mouse.js
+ * jquery.ui.position.js
+ * jquery.ui.resizable.js
*/
(function(c,l){var m={buttons:true,height:true,maxHeight:true,maxWidth:true,minHeight:true,minWidth:true,width:true},n={maxHeight:true,maxWidth:true,minHeight:true,minWidth:true},o=c.attrFn||{val:true,css:true,html:true,text:true,data:true,width:true,height:true,offset:true,click:true};c.widget("ui.dialog",{options:{autoOpen:true,buttons:{},closeOnEscape:true,closeText:"close",dialogClass:"",draggable:true,hide:null,height:"auto",maxHeight:false,maxWidth:false,minHeight:150,minWidth:150,modal:false,
position:{my:"center",at:"center",collision:"fit",using:function(a){var b=c(this).css(a).offset().top;b<0&&c(this).css("top",a.top-b)}},resizable:true,show:null,stack:true,title:"",width:300,zIndex:1E3},_create:function(){this.originalTitle=this.element.attr("title");if(typeof this.originalTitle!=="string")this.originalTitle="";this.options.title=this.options.title||this.originalTitle;var a=this,b=a.options,d=b.title||" ",e=c.ui.dialog.getTitleId(a.element),g=(a.uiDialog=c("<div></div>")).appendTo(document.body).hide().addClass("ui-dialog ui-widget ui-widget-content ui-corner-all "+
@@ -411,9 +411,9 @@ c.browser.version<7){a=Math.max(document.documentElement.scrollHeight,document.b
* http://docs.jquery.com/UI/Slider
*
* Depends:
- * jquery.ui.core.js
- * jquery.ui.mouse.js
- * jquery.ui.widget.js
+ * jquery.ui.core.js
+ * jquery.ui.mouse.js
+ * jquery.ui.widget.js
*/
(function(d){d.widget("ui.slider",d.ui.mouse,{widgetEventPrefix:"slide",options:{animate:false,distance:0,max:100,min:0,orientation:"horizontal",range:false,step:1,value:0,values:null},_create:function(){var a=this,b=this.options,c=this.element.find(".ui-slider-handle").addClass("ui-state-default ui-corner-all"),f=b.values&&b.values.length||1,e=[];this._mouseSliding=this._keySliding=false;this._animateOff=true;this._handleIndex=null;this._detectOrientation();this._mouseInit();this.element.addClass("ui-slider ui-slider-"+
this.orientation+" ui-widget ui-widget-content ui-corner-all"+(b.disabled?" ui-slider-disabled ui-disabled":""));this.range=d([]);if(b.range){if(b.range===true){if(!b.values)b.values=[this._valueMin(),this._valueMin()];if(b.values.length&&b.values.length!==2)b.values=[b.values[0],b.values[0]]}this.range=d("<div></div>").appendTo(this.element).addClass("ui-slider-range ui-widget-header"+(b.range==="min"||b.range==="max"?" ui-slider-range-"+b.range:""))}for(var j=c.length;j<f;j+=1)e.push("<a class='ui-slider-handle ui-state-default ui-corner-all' href='#'></a>");
@@ -444,8 +444,8 @@ b.animate);if(a==="max"&&this.orientation==="horizontal")this.range[f?"animate":
* http://docs.jquery.com/UI/Tabs
*
* Depends:
- * jquery.ui.core.js
- * jquery.ui.widget.js
+ * jquery.ui.core.js
+ * jquery.ui.widget.js
*/
(function(d,p){function u(){return++v}function w(){return++x}var v=0,x=0;d.widget("ui.tabs",{options:{add:null,ajaxOptions:null,cache:false,cookie:null,collapsible:false,disable:null,disabled:[],enable:null,event:"click",fx:null,idPrefix:"ui-tabs-",load:null,panelTemplate:"<div></div>",remove:null,select:null,show:null,spinner:"<em>Loading…</em>",tabTemplate:"<li><a href='#{href}'><span>#{label}</span></a></li>"},_create:function(){this._tabify(true)},_setOption:function(b,e){if(b=="selected")this.options.collapsible&&
e==this.options.selected||this.select(e);else{this.options[b]=e;this._tabify()}},_tabId:function(b){return b.title&&b.title.replace(/\s/g,"_").replace(/[^\w\u00c0-\uFFFF-]/g,"")||this.options.idPrefix+u()},_sanitizeSelector:function(b){return b.replace(/:/g,"\\:")},_cookie:function(){var b=this.cookie||(this.cookie=this.options.cookie.name||"ui-tabs-"+w());return d.cookie.apply(null,[b].concat(d.makeArray(arguments)))},_ui:function(b,e){return{tab:b,panel:e,index:this.anchors.index(b)}},_cleanup:function(){this.lis.filter(".ui-state-processing").removeClass("ui-state-processing").find("span:data(label.tabs)").each(function(){var b=
@@ -479,7 +479,7 @@ a.rotate(null)}:function(){t=c.selected;h()});if(b){this.element.bind("tabsshow"
* http://docs.jquery.com/UI/Datepicker
*
* Depends:
- * jquery.ui.core.js
+ * jquery.ui.core.js
*/
(function(d,C){function M(){this.debug=false;this._curInst=null;this._keyEvent=false;this._disabledInputs=[];this._inDialog=this._datepickerShowing=false;this._mainDivId="ui-datepicker-div";this._inlineClass="ui-datepicker-inline";this._appendClass="ui-datepicker-append";this._triggerClass="ui-datepicker-trigger";this._dialogClass="ui-datepicker-dialog";this._disableClass="ui-datepicker-disabled";this._unselectableClass="ui-datepicker-unselectable";this._currentClass="ui-datepicker-current-day";this._dayOverClass=
"ui-datepicker-days-cell-over";this.regional=[];this.regional[""]={closeText:"Done",prevText:"Prev",nextText:"Next",currentText:"Today",monthNames:["January","February","March","April","May","June","July","August","September","October","November","December"],monthNamesShort:["Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct","Nov","Dec"],dayNames:["Sunday","Monday","Tuesday","Wednesday","Thursday","Friday","Saturday"],dayNamesShort:["Sun","Mon","Tue","Wed","Thu","Fri","Sat"],dayNamesMin:["Su",
@@ -609,7 +609,7 @@ a*2-e,0,d,e)*0.5+d*0.5+b}})}(jQuery);
* http://docs.jquery.com/UI/Effects/Blind
*
* Depends:
- * jquery.effects.core.js
+ * jquery.effects.core.js
*/
(function(b){b.effects.blind=function(c){return this.queue(function(){var a=b(this),g=["position","top","bottom","left","right"],f=b.effects.setMode(a,c.options.mode||"hide"),d=c.options.direction||"vertical";b.effects.save(a,g);a.show();var e=b.effects.createWrapper(a).css({overflow:"hidden"}),h=d=="vertical"?"height":"width";d=d=="vertical"?e.height():e.width();f=="show"&&e.css(h,0);var i={};i[h]=f=="show"?d:0;e.animate(i,c.duration,c.options.easing,function(){f=="hide"&&a.hide();b.effects.restore(a,
g);b.effects.removeWrapper(a);c.callback&&c.callback.apply(a[0],arguments);a.dequeue()})})}})(jQuery);
@@ -623,7 +623,7 @@ g);b.effects.removeWrapper(a);c.callback&&c.callback.apply(a[0],arguments);a.deq
* http://docs.jquery.com/UI/Effects/Bounce
*
* Depends:
- * jquery.effects.core.js
+ * jquery.effects.core.js
*/
(function(e){e.effects.bounce=function(b){return this.queue(function(){var a=e(this),l=["position","top","bottom","left","right"],h=e.effects.setMode(a,b.options.mode||"effect"),d=b.options.direction||"up",c=b.options.distance||20,m=b.options.times||5,i=b.duration||250;/show|hide/.test(h)&&l.push("opacity");e.effects.save(a,l);a.show();e.effects.createWrapper(a);var f=d=="up"||d=="down"?"top":"left";d=d=="up"||d=="left"?"pos":"neg";c=b.options.distance||(f=="top"?a.outerHeight({margin:true})/3:a.outerWidth({margin:true})/
3);if(h=="show")a.css("opacity",0).css(f,d=="pos"?-c:c);if(h=="hide")c/=m*2;h!="hide"&&m--;if(h=="show"){var g={opacity:1};g[f]=(d=="pos"?"+=":"-=")+c;a.animate(g,i/2,b.options.easing);c/=2;m--}for(g=0;g<m;g++){var j={},k={};j[f]=(d=="pos"?"-=":"+=")+c;k[f]=(d=="pos"?"+=":"-=")+c;a.animate(j,i/2,b.options.easing).animate(k,i/2,b.options.easing);c=h=="hide"?c*2:c/2}if(h=="hide"){g={opacity:0};g[f]=(d=="pos"?"-=":"+=")+c;a.animate(g,i/2,b.options.easing,function(){a.hide();e.effects.restore(a,l);e.effects.removeWrapper(a);
@@ -638,7 +638,7 @@ b.callback&&b.callback.apply(this,arguments)})}else{j={};k={};j[f]=(d=="pos"?"-=
* http://docs.jquery.com/UI/Effects/Clip
*
* Depends:
- * jquery.effects.core.js
+ * jquery.effects.core.js
*/
(function(b){b.effects.clip=function(e){return this.queue(function(){var a=b(this),i=["position","top","bottom","left","right","height","width"],f=b.effects.setMode(a,e.options.mode||"hide"),c=e.options.direction||"vertical";b.effects.save(a,i);a.show();var d=b.effects.createWrapper(a).css({overflow:"hidden"});d=a[0].tagName=="IMG"?d:a;var g={size:c=="vertical"?"height":"width",position:c=="vertical"?"top":"left"};c=c=="vertical"?d.height():d.width();if(f=="show"){d.css(g.size,0);d.css(g.position,
c/2)}var h={};h[g.size]=f=="show"?c:0;h[g.position]=f=="show"?0:c/2;d.animate(h,{queue:false,duration:e.duration,easing:e.options.easing,complete:function(){f=="hide"&&a.hide();b.effects.restore(a,i);b.effects.removeWrapper(a);e.callback&&e.callback.apply(a[0],arguments);a.dequeue()}})})}})(jQuery);
@@ -652,7 +652,7 @@ c/2)}var h={};h[g.size]=f=="show"?c:0;h[g.position]=f=="show"?0:c/2;d.animate(h,
* http://docs.jquery.com/UI/Effects/Drop
*
* Depends:
- * jquery.effects.core.js
+ * jquery.effects.core.js
*/
(function(c){c.effects.drop=function(d){return this.queue(function(){var a=c(this),h=["position","top","bottom","left","right","opacity"],e=c.effects.setMode(a,d.options.mode||"hide"),b=d.options.direction||"left";c.effects.save(a,h);a.show();c.effects.createWrapper(a);var f=b=="up"||b=="down"?"top":"left";b=b=="up"||b=="left"?"pos":"neg";var g=d.options.distance||(f=="top"?a.outerHeight({margin:true})/2:a.outerWidth({margin:true})/2);if(e=="show")a.css("opacity",0).css(f,b=="pos"?-g:g);var i={opacity:e==
"show"?1:0};i[f]=(e=="show"?b=="pos"?"+=":"-=":b=="pos"?"-=":"+=")+g;a.animate(i,{queue:false,duration:d.duration,easing:d.options.easing,complete:function(){e=="hide"&&a.hide();c.effects.restore(a,h);c.effects.removeWrapper(a);d.callback&&d.callback.apply(this,arguments);a.dequeue()}})})}})(jQuery);
@@ -666,7 +666,7 @@ c/2)}var h={};h[g.size]=f=="show"?c:0;h[g.position]=f=="show"?0:c/2;d.animate(h,
* http://docs.jquery.com/UI/Effects/Explode
*
* Depends:
- * jquery.effects.core.js
+ * jquery.effects.core.js
*/
(function(j){j.effects.explode=function(a){return this.queue(function(){var c=a.options.pieces?Math.round(Math.sqrt(a.options.pieces)):3,d=a.options.pieces?Math.round(Math.sqrt(a.options.pieces)):3;a.options.mode=a.options.mode=="toggle"?j(this).is(":visible")?"hide":"show":a.options.mode;var b=j(this).show().css("visibility","hidden"),g=b.offset();g.top-=parseInt(b.css("marginTop"),10)||0;g.left-=parseInt(b.css("marginLeft"),10)||0;for(var h=b.outerWidth(true),i=b.outerHeight(true),e=0;e<c;e++)for(var f=
0;f<d;f++)b.clone().appendTo("body").wrap("<div></div>").css({position:"absolute",visibility:"visible",left:-f*(h/d),top:-e*(i/c)}).parent().addClass("ui-effects-explode").css({position:"absolute",overflow:"hidden",width:h/d,height:i/c,left:g.left+f*(h/d)+(a.options.mode=="show"?(f-Math.floor(d/2))*(h/d):0),top:g.top+e*(i/c)+(a.options.mode=="show"?(e-Math.floor(c/2))*(i/c):0),opacity:a.options.mode=="show"?0:1}).animate({left:g.left+f*(h/d)+(a.options.mode=="show"?0:(f-Math.floor(d/2))*(h/d)),top:g.top+
@@ -681,7 +681,7 @@ e*(i/c)+(a.options.mode=="show"?0:(e-Math.floor(c/2))*(i/c)),opacity:a.options.m
* http://docs.jquery.com/UI/Effects/Fade
*
* Depends:
- * jquery.effects.core.js
+ * jquery.effects.core.js
*/
(function(b){b.effects.fade=function(a){return this.queue(function(){var c=b(this),d=b.effects.setMode(c,a.options.mode||"hide");c.animate({opacity:d},{queue:false,duration:a.duration,easing:a.options.easing,complete:function(){a.callback&&a.callback.apply(this,arguments);c.dequeue()}})})}})(jQuery);
;/*
@@ -694,7 +694,7 @@ e*(i/c)+(a.options.mode=="show"?0:(e-Math.floor(c/2))*(i/c)),opacity:a.options.m
* http://docs.jquery.com/UI/Effects/Fold
*
* Depends:
- * jquery.effects.core.js
+ * jquery.effects.core.js
*/
(function(c){c.effects.fold=function(a){return this.queue(function(){var b=c(this),j=["position","top","bottom","left","right"],d=c.effects.setMode(b,a.options.mode||"hide"),g=a.options.size||15,h=!!a.options.horizFirst,k=a.duration?a.duration/2:c.fx.speeds._default/2;c.effects.save(b,j);b.show();var e=c.effects.createWrapper(b).css({overflow:"hidden"}),f=d=="show"!=h,l=f?["width","height"]:["height","width"];f=f?[e.width(),e.height()]:[e.height(),e.width()];var i=/([0-9]+)%/.exec(g);if(i)g=parseInt(i[1],
10)/100*f[d=="hide"?0:1];if(d=="show")e.css(h?{height:0,width:g}:{height:g,width:0});h={};i={};h[l[0]]=d=="show"?f[0]:g;i[l[1]]=d=="show"?f[1]:0;e.animate(h,k,a.options.easing).animate(i,k,a.options.easing,function(){d=="hide"&&b.hide();c.effects.restore(b,j);c.effects.removeWrapper(b);a.callback&&a.callback.apply(b[0],arguments);b.dequeue()})})}})(jQuery);
@@ -708,7 +708,7 @@ e*(i/c)+(a.options.mode=="show"?0:(e-Math.floor(c/2))*(i/c)),opacity:a.options.m
* http://docs.jquery.com/UI/Effects/Highlight
*
* Depends:
- * jquery.effects.core.js
+ * jquery.effects.core.js
*/
(function(b){b.effects.highlight=function(c){return this.queue(function(){var a=b(this),e=["backgroundImage","backgroundColor","opacity"],d=b.effects.setMode(a,c.options.mode||"show"),f={backgroundColor:a.css("backgroundColor")};if(d=="hide")f.opacity=0;b.effects.save(a,e);a.show().css({backgroundImage:"none",backgroundColor:c.options.color||"#ffff99"}).animate(f,{queue:false,duration:c.duration,easing:c.options.easing,complete:function(){d=="hide"&&a.hide();b.effects.restore(a,e);d=="show"&&!b.support.opacity&&
this.style.removeAttribute("filter");c.callback&&c.callback.apply(this,arguments);a.dequeue()}})})}})(jQuery);
@@ -722,7 +722,7 @@ this.style.removeAttribute("filter");c.callback&&c.callback.apply(this,arguments
* http://docs.jquery.com/UI/Effects/Pulsate
*
* Depends:
- * jquery.effects.core.js
+ * jquery.effects.core.js
*/
(function(d){d.effects.pulsate=function(a){return this.queue(function(){var b=d(this),c=d.effects.setMode(b,a.options.mode||"show");times=(a.options.times||5)*2-1;duration=a.duration?a.duration/2:d.fx.speeds._default/2;isVisible=b.is(":visible");animateTo=0;if(!isVisible){b.css("opacity",0).show();animateTo=1}if(c=="hide"&&isVisible||c=="show"&&!isVisible)times--;for(c=0;c<times;c++){b.animate({opacity:animateTo},duration,a.options.easing);animateTo=(animateTo+1)%2}b.animate({opacity:animateTo},duration,
a.options.easing,function(){animateTo==0&&b.hide();a.callback&&a.callback.apply(this,arguments)});b.queue("fx",function(){b.dequeue()}).dequeue()})}})(jQuery);
@@ -736,7 +736,7 @@ a.options.easing,function(){animateTo==0&&b.hide();a.callback&&a.callback.apply(
* http://docs.jquery.com/UI/Effects/Scale
*
* Depends:
- * jquery.effects.core.js
+ * jquery.effects.core.js
*/
(function(c){c.effects.puff=function(b){return this.queue(function(){var a=c(this),e=c.effects.setMode(a,b.options.mode||"hide"),g=parseInt(b.options.percent,10)||150,h=g/100,i={height:a.height(),width:a.width()};c.extend(b.options,{fade:true,mode:e,percent:e=="hide"?g:100,from:e=="hide"?i:{height:i.height*h,width:i.width*h}});a.effect("scale",b.options,b.duration,b.callback);a.dequeue()})};c.effects.scale=function(b){return this.queue(function(){var a=c(this),e=c.extend(true,{},b.options),g=c.effects.setMode(a,
b.options.mode||"effect"),h=parseInt(b.options.percent,10)||(parseInt(b.options.percent,10)==0?0:g=="hide"?0:100),i=b.options.direction||"both",f=b.options.origin;if(g!="effect"){e.origin=f||["middle","center"];e.restore=true}f={height:a.height(),width:a.width()};a.from=b.options.from||(g=="show"?{height:0,width:0}:f);h={y:i!="horizontal"?h/100:1,x:i!="vertical"?h/100:1};a.to={height:f.height*h.y,width:f.width*h.x};if(b.options.fade){if(g=="show"){a.from.opacity=0;a.to.opacity=1}if(g=="hide"){a.from.opacity=
@@ -756,7 +756,7 @@ n?e:g);c.effects.removeWrapper(a);b.callback&&b.callback.apply(this,arguments);a
* http://docs.jquery.com/UI/Effects/Shake
*
* Depends:
- * jquery.effects.core.js
+ * jquery.effects.core.js
*/
(function(d){d.effects.shake=function(a){return this.queue(function(){var b=d(this),j=["position","top","bottom","left","right"];d.effects.setMode(b,a.options.mode||"effect");var c=a.options.direction||"left",e=a.options.distance||20,l=a.options.times||3,f=a.duration||a.options.duration||140;d.effects.save(b,j);b.show();d.effects.createWrapper(b);var g=c=="up"||c=="down"?"top":"left",h=c=="up"||c=="left"?"pos":"neg";c={};var i={},k={};c[g]=(h=="pos"?"-=":"+=")+e;i[g]=(h=="pos"?"+=":"-=")+e*2;k[g]=
(h=="pos"?"-=":"+=")+e*2;b.animate(c,f,a.options.easing);for(e=1;e<l;e++)b.animate(i,f,a.options.easing).animate(k,f,a.options.easing);b.animate(i,f,a.options.easing).animate(c,f/2,a.options.easing,function(){d.effects.restore(b,j);d.effects.removeWrapper(b);a.callback&&a.callback.apply(this,arguments)});b.queue("fx",function(){b.dequeue()});b.dequeue()})}})(jQuery);
@@ -770,7 +770,7 @@ n?e:g);c.effects.removeWrapper(a);b.callback&&b.callback.apply(this,arguments);a
* http://docs.jquery.com/UI/Effects/Slide
*
* Depends:
- * jquery.effects.core.js
+ * jquery.effects.core.js
*/
(function(c){c.effects.slide=function(d){return this.queue(function(){var a=c(this),h=["position","top","bottom","left","right"],f=c.effects.setMode(a,d.options.mode||"show"),b=d.options.direction||"left";c.effects.save(a,h);a.show();c.effects.createWrapper(a).css({overflow:"hidden"});var g=b=="up"||b=="down"?"top":"left";b=b=="up"||b=="left"?"pos":"neg";var e=d.options.distance||(g=="top"?a.outerHeight({margin:true}):a.outerWidth({margin:true}));if(f=="show")a.css(g,b=="pos"?isNaN(e)?"-"+e:-e:e);
var i={};i[g]=(f=="show"?b=="pos"?"+=":"-=":b=="pos"?"-=":"+=")+e;a.animate(i,{queue:false,duration:d.duration,easing:d.options.easing,complete:function(){f=="hide"&&a.hide();c.effects.restore(a,h);c.effects.removeWrapper(a);d.callback&&d.callback.apply(this,arguments);a.dequeue()}})})}})(jQuery);
@@ -784,8 +784,8 @@ var i={};i[g]=(f=="show"?b=="pos"?"+=":"-=":b=="pos"?"-=":"+=")+e;a.animate(i,{q
* http://docs.jquery.com/UI/Effects/Transfer
*
* Depends:
- * jquery.effects.core.js
+ * jquery.effects.core.js
*/
(function(e){e.effects.transfer=function(a){return this.queue(function(){var b=e(this),c=e(a.options.to),d=c.offset();c={top:d.top,left:d.left,height:c.innerHeight(),width:c.innerWidth()};d=b.offset();var f=e('<div class="ui-effects-transfer"></div>').appendTo(document.body).addClass(a.options.className).css({top:d.top,left:d.left,height:b.innerHeight(),width:b.innerWidth(),position:"absolute"}).animate(c,a.duration,a.options.easing,function(){f.remove();a.callback&&a.callback.apply(b[0],arguments);
b.dequeue()})})}})(jQuery);
-;
\ No newline at end of file
+;
diff --git a/app/assets/javascripts/jquery.ui.selectmenu.js b/app/assets/javascripts/jquery.ui.selectmenu.js
index d61d75f96ab06a0f18ae1db935ce72a82fd1a733..957fe4d888730ba1d0953275c5324065ed246519 100644
--- a/app/assets/javascripts/jquery.ui.selectmenu.js
+++ b/app/assets/javascripts/jquery.ui.selectmenu.js
@@ -12,834 +12,833 @@
(function($) {
$.widget("ui.selectmenu", {
- getter: "value",
- version: "1.8",
- eventPrefix: "selectmenu",
- options: {
- transferClasses: true,
- typeAhead: "sequential",
- style: 'dropdown',
- positionOptions: {
- my: "left top",
- at: "left bottom",
- offset: null
- },
- width: null,
- menuWidth: null,
- handleWidth: 26,
- maxHeight: null,
- icons: null,
- format: null,
- bgImage: function() {},
- wrapperElement: "<div />"
- },
-
- _create: function() {
- var self = this, o = this.options;
-
- // set a default id value, generate a new random one if not set by developer
- var selectmenuId = this.element.attr( 'id' ) || 'ui-selectmenu-' + Math.random().toString( 16 ).slice( 2, 10 );
-
- // quick array of button and menu id's
- this.ids = [ selectmenuId + '-button', selectmenuId + '-menu' ];
-
- // define safe mouseup for future toggling
- this._safemouseup = true;
-
- // create menu button wrapper
- this.newelement = $( '<a />', {
- 'class': this.widgetBaseClass + ' ui-widget ui-state-default ui-corner-all',
- 'id' : this.ids[ 0 ],
- 'role': 'button',
- 'href': '#nogo',
- 'tabindex': this.element.attr( 'disabled' ) ? 1 : 0,
- 'aria-haspopup': true,
- 'aria-owns': this.ids[ 1 ]
- });
- this.newelementWrap = $( o.wrapperElement )
- .append( this.newelement )
- .insertAfter( this.element );
-
- // transfer tabindex
- var tabindex = this.element.attr( 'tabindex' );
- if ( tabindex ) {
- this.newelement.attr( 'tabindex', tabindex );
- }
-
- // save reference to select in data for ease in calling methods
- this.newelement.data( 'selectelement', this.element );
-
- // menu icon
- this.selectmenuIcon = $( '<span class="' + this.widgetBaseClass + '-icon ui-icon"></span>' )
- .prependTo( this.newelement );
-
- // append status span to button
- this.newelement.prepend( '<span class="' + self.widgetBaseClass + '-status" />' );
-
- // make associated form label trigger focus
- $( 'label[for="' + selectmenuId + '"]' )
- .attr( 'for', this.ids[0] )
- .bind( 'click.selectmenu', function() {
- self.newelement[0].focus();
- return false;
- });
-
- // click toggle for menu visibility
- this.newelement
- .bind('mousedown.selectmenu', function(event) {
- self._toggle(event, true);
- // make sure a click won't open/close instantly
- if (o.style == "popup") {
- self._safemouseup = false;
- setTimeout(function() { self._safemouseup = true; }, 300);
- }
- return false;
- })
- .bind('click.selectmenu', function() {
- return false;
- })
- .bind("keydown.selectmenu", function(event) {
- var ret = false;
- switch (event.keyCode) {
- case $.ui.keyCode.ENTER:
- ret = true;
- break;
- case $.ui.keyCode.SPACE:
- self._toggle(event);
- break;
- case $.ui.keyCode.UP:
- if (event.altKey) {
- self.open(event);
- } else {
- self._moveSelection(-1);
- }
- break;
- case $.ui.keyCode.DOWN:
- if (event.altKey) {
- self.open(event);
- } else {
- self._moveSelection(1);
- }
- break;
- case $.ui.keyCode.LEFT:
- self._moveSelection(-1);
- break;
- case $.ui.keyCode.RIGHT:
- self._moveSelection(1);
- break;
- case $.ui.keyCode.TAB:
- ret = true;
- break;
- default:
- ret = true;
- }
- return ret;
- })
- .bind('keypress.selectmenu', function(event) {
- self._typeAhead(event.which, 'mouseup');
- return true;
- })
- .bind('mouseover.selectmenu focus.selectmenu', function() {
- if (!o.disabled) {
- $(this).addClass(self.widgetBaseClass + '-focus ui-state-hover');
- }
- })
- .bind('mouseout.selectmenu blur.selectmenu', function() {
- if (!o.disabled) {
- $(this).removeClass(self.widgetBaseClass + '-focus ui-state-hover');
- }
- });
-
- // document click closes menu
- $(document).bind("mousedown.selectmenu", function(event) {
- self.close(event);
- });
-
- // change event on original selectmenu
- this.element
- .bind("click.selectmenu", function() {
- self._refreshValue();
- })
- // FIXME: newelement can be null under unclear circumstances in IE8
- // TODO not sure if this is still a problem (fnagel 20.03.11)
- .bind("focus.selectmenu", function() {
- if (self.newelement) {
- self.newelement[0].focus();
- }
- });
-
- // set width when not set via options
- if (!o.width) {
- o.width = this.element.outerWidth();
- }
- // set menu button width
- this.newelement.width(o.width);
-
- // hide original selectmenu element
- this.element.hide();
-
- // create menu portion, append to body
- this.list = $( '<ul />', {
- 'class': 'ui-widget ui-widget-content',
- 'aria-hidden': true,
- 'role': 'listbox',
- 'aria-labelledby': this.ids[0],
- 'id': this.ids[1]
- });
- this.listWrap = $( o.wrapperElement )
- .addClass( self.widgetBaseClass + '-menu' )
- .append( this.list )
- .appendTo( 'body' );
-
- // transfer menu click to menu button
- this.list
- .bind("keydown.selectmenu", function(event) {
- var ret = false;
- switch (event.keyCode) {
- case $.ui.keyCode.UP:
- if (event.altKey) {
- self.close(event, true);
- } else {
- self._moveFocus(-1);
- }
- break;
- case $.ui.keyCode.DOWN:
- if (event.altKey) {
- self.close(event, true);
- } else {
- self._moveFocus(1);
- }
- break;
- case $.ui.keyCode.LEFT:
- self._moveFocus(-1);
- break;
- case $.ui.keyCode.RIGHT:
- self._moveFocus(1);
- break;
- case $.ui.keyCode.HOME:
- self._moveFocus(':first');
- break;
- case $.ui.keyCode.PAGE_UP:
- self._scrollPage('up');
- break;
- case $.ui.keyCode.PAGE_DOWN:
- self._scrollPage('down');
- break;
- case $.ui.keyCode.END:
- self._moveFocus(':last');
- break;
- case $.ui.keyCode.ENTER:
- case $.ui.keyCode.SPACE:
- self.close(event, true);
- $(event.target).parents('li:eq(0)').trigger('mouseup');
- break;
- case $.ui.keyCode.TAB:
- ret = true;
- self.close(event, true);
- $(event.target).parents('li:eq(0)').trigger('mouseup');
- break;
- case $.ui.keyCode.ESCAPE:
- self.close(event, true);
- break;
- default:
- ret = true;
- }
- return ret;
- })
- .bind('keypress.selectmenu', function(event) {
- self._typeAhead(event.which, 'focus');
- return true;
- })
- // this allows for using the scrollbar in an overflowed list
- .bind( 'mousedown.selectmenu mouseup.selectmenu', function() { return false; });
-
- // needed when window is resized
- // TODO seems to be useless, but causes errors (fnagel 01.08.11)
- // see: https://github.com/fnagel/jquery-ui/issues/147
- // $(window).bind( "resize.selectmenu", $.proxy( self._refreshPosition, this ) );
- },
-
- _init: function() {
- var self = this, o = this.options;
-
- // serialize selectmenu element options
- var selectOptionData = [];
- this.element
- .find('option')
- .each(function() {
- var opt = $(this);
- selectOptionData.push({
- value: opt.attr('value'),
- text: self._formatText(opt.text()),
- selected: opt.attr('selected'),
- disabled: opt.attr('disabled'),
- classes: opt.attr('class'),
- typeahead: opt.attr('typeahead'),
- parentOptGroup: opt.parent('optgroup'),
- bgImage: o.bgImage.call(opt)
- });
- });
-
- // active state class is only used in popup style
- var activeClass = (self.options.style == "popup") ? " ui-state-active" : "";
-
- // empty list so we can refresh the selectmenu via selectmenu()
- this.list.html("");
-
- // write li's
- if (selectOptionData.length) {
- for (var i = 0; i < selectOptionData.length; i++) {
- var thisLiAttr = { role : 'presentation' };
- if ( selectOptionData[ i ].disabled ) {
- thisLiAttr[ 'class' ] = this.namespace + '-state-disabled';
- }
- var thisAAttr = {
- html: selectOptionData[i].text,
- href : '#nogo',
- tabindex : -1,
- role : 'option',
- 'aria-selected' : false
- };
- if ( selectOptionData[ i ].disabled ) {
- thisAAttr[ 'aria-disabled' ] = selectOptionData[ i ].disabled;
- }
- if ( selectOptionData[ i ].typeahead ) {
- thisAAttr[ 'typeahead' ] = selectOptionData[ i ].typeahead;
- }
- var thisA = $('<a/>', thisAAttr);
- var thisLi = $('<li/>', thisLiAttr)
- .append(thisA)
- .data('index', i)
- .addClass(selectOptionData[i].classes)
- .data('optionClasses', selectOptionData[i].classes || '')
- .bind("mouseup.selectmenu", function(event) {
- if (self._safemouseup && !self._disabled(event.currentTarget) && !self._disabled($( event.currentTarget ).parents( "ul>li." + self.widgetBaseClass + "-group " )) ) {
- var changed = $(this).data('index') != self._selectedIndex();
- self.index($(this).data('index'));
- self.select(event);
- if (changed) {
- self.change(event);
- }
- self.close(event, true);
- }
- return false;
- })
- .bind("click.selectmenu", function() {
- return false;
- })
- .bind('mouseover.selectmenu focus.selectmenu', function(e) {
- // no hover if diabled
- if (!$(e.currentTarget).hasClass(self.namespace + '-state-disabled') && !$(e.currentTarget).parent("ul").parent("li").hasClass(self.namespace + '-state-disabled')) {
- self._selectedOptionLi().addClass(activeClass);
- self._focusedOptionLi().removeClass(self.widgetBaseClass + '-item-focus ui-state-hover');
- $(this).removeClass('ui-state-active').addClass(self.widgetBaseClass + '-item-focus ui-state-hover');
- }
- })
- .bind('mouseout.selectmenu blur.selectmenu', function() {
- if ($(this).is(self._selectedOptionLi().selector)) {
- $(this).addClass(activeClass);
- }
- $(this).removeClass(self.widgetBaseClass + '-item-focus ui-state-hover');
- });
-
- // optgroup or not...
- if ( selectOptionData[i].parentOptGroup.length ) {
- var optGroupName = self.widgetBaseClass + '-group-' + this.element.find( 'optgroup' ).index( selectOptionData[i].parentOptGroup );
- if (this.list.find( 'li.' + optGroupName ).length ) {
- this.list.find( 'li.' + optGroupName + ':last ul' ).append( thisLi );
- } else {
- $(' <li role="presentation" class="' + self.widgetBaseClass + '-group ' + optGroupName + (selectOptionData[i].parentOptGroup.attr("disabled") ? ' ' + this.namespace + '-state-disabled" aria-disabled="true"' : '"' ) + '><span class="' + self.widgetBaseClass + '-group-label">' + selectOptionData[i].parentOptGroup.attr('label') + '</span><ul></ul></li> ')
- .appendTo( this.list )
- .find( 'ul' )
- .append( thisLi );
- }
- } else {
- thisLi.appendTo(this.list);
- }
-
- // append icon if option is specified
- if (o.icons) {
- for (var j in o.icons) {
- if (thisLi.is(o.icons[j].find)) {
- thisLi
- .data('optionClasses', selectOptionData[i].classes + ' ' + self.widgetBaseClass + '-hasIcon')
- .addClass(self.widgetBaseClass + '-hasIcon');
- var iconClass = o.icons[j].icon || "";
- thisLi
- .find('a:eq(0)')
- .prepend('<span class="' + self.widgetBaseClass + '-item-icon ui-icon ' + iconClass + '"></span>');
- if (selectOptionData[i].bgImage) {
- thisLi.find('span').css('background-image', selectOptionData[i].bgImage);
- }
- }
- }
- }
- }
- } else {
- $('<li role="presentation"><a href="#nogo" tabindex="-1" role="option"></a></li>').appendTo(this.list);
- }
- // we need to set and unset the CSS classes for dropdown and popup style
- var isDropDown = ( o.style == 'dropdown' );
- this.newelement
- .toggleClass( self.widgetBaseClass + '-dropdown', isDropDown )
- .toggleClass( self.widgetBaseClass + '-popup', !isDropDown );
- this.list
- .toggleClass( self.widgetBaseClass + '-menu-dropdown ui-corner-bottom', isDropDown )
- .toggleClass( self.widgetBaseClass + '-menu-popup ui-corner-all', !isDropDown )
- // add corners to top and bottom menu items
- .find( 'li:first' )
- .toggleClass( 'ui-corner-top', !isDropDown )
- .end().find( 'li:last' )
- .addClass( 'ui-corner-bottom' );
- this.selectmenuIcon
- .toggleClass( 'ui-icon-triangle-1-s', isDropDown )
- .toggleClass( 'ui-icon-triangle-2-n-s', !isDropDown );
-
- // transfer classes to selectmenu and list
- if ( o.transferClasses ) {
- var transferClasses = this.element.attr( 'class' ) || '';
- this.newelement.add( this.list ).addClass( transferClasses );
- }
-
- // set menu width to either menuWidth option value, width option value, or select width
- if ( o.style == 'dropdown' ) {
- this.list.width( o.menuWidth ? o.menuWidth : o.width );
- } else {
- this.list.width( o.menuWidth ? o.menuWidth : o.width - o.handleWidth );
- }
-
- // reset height to auto
- this.list.css( 'height', 'auto' );
- var listH = this.listWrap.height();
- // calculate default max height
- if ( o.maxHeight && o.maxHeight < listH ) {
- this.list.height( o.maxHeight );
- } else {
- var winH = $( window ).height() / 3;
- if ( winH < listH ) this.list.height( winH );
- }
-
- // save reference to actionable li's (not group label li's)
- this._optionLis = this.list.find( 'li:not(.' + self.widgetBaseClass + '-group)' );
-
- // transfer disabled state
- if ( this.element.attr( 'disabled' ) ) {
- this.disable();
- } else {
- this.enable()
- }
-
- // update value
- this.index( this._selectedIndex() );
-
- // needed when selectmenu is placed at the very bottom / top of the page
- window.setTimeout( function() {
- self._refreshPosition();
- }, 200 );
- },
-
- destroy: function() {
- this.element.removeData( this.widgetName )
- .removeClass( this.widgetBaseClass + '-disabled' + ' ' + this.namespace + '-state-disabled' )
- .removeAttr( 'aria-disabled' )
- .unbind( ".selectmenu" );
-
- // TODO unneded as event binding has been disabled
- // $( window ).unbind( ".selectmenu" );
- $( document ).unbind( ".selectmenu" );
-
- // unbind click on label, reset its for attr
- $( 'label[for=' + this.newelement.attr('id') + ']' )
- .attr( 'for', this.element.attr( 'id' ) )
- .unbind( '.selectmenu' );
-
- this.newelementWrap.remove();
- this.listWrap.remove();
-
- this.element.show();
-
- // call widget destroy function
- $.Widget.prototype.destroy.apply(this, arguments);
- },
-
- _typeAhead: function( code, eventType ){
- var self = this, focusFound = false, C = String.fromCharCode(code).toUpperCase();
- c = C.toLowerCase();
-
- if ( self.options.typeAhead == 'sequential' ) {
- // clear the timeout so we can use _prevChar
- window.clearTimeout('ui.selectmenu-' + self.selectmenuId);
-
- // define our find var
- var find = typeof( self._prevChar ) == 'undefined' ? '' : self._prevChar.join( '' );
-
- function focusOptSeq( elem, ind, c ){
- focusFound = true;
- $( elem ).trigger( eventType );
- typeof( self._prevChar ) == 'undefined' ? self._prevChar = [ c ] : self._prevChar[ self._prevChar.length ] = c;
- }
- this.list.find( 'li a' ).each( function( i ) {
- if ( !focusFound ) {
- // allow the typeahead attribute on the option tag for a more specific lookup
- var thisText = $( this ).attr( 'typeahead' ) || $(this).text();
- if ( thisText.indexOf( find + C ) === 0 ) {
- focusOptSeq( this, i, C );
- } else if (thisText.indexOf(find+c) === 0 ) {
- focusOptSeq( this, i, c );
- }
- }
- });
- // set a 1 second timeout for sequenctial typeahead
- // keep this set even if we have no matches so it doesnt typeahead somewhere else
- window.setTimeout( function( el ) {
- self._prevChar = undefined;
- }, 1000, self );
-
- } else {
- // define self._prevChar if needed
- if ( !self._prevChar ) { self._prevChar = [ '' , 0 ]; }
-
- focusFound = false;
- function focusOpt( elem, ind ){
- focusFound = true;
- $( elem ).trigger( eventType );
- self._prevChar[ 1 ] = ind;
- }
- this.list.find( 'li a' ).each(function( i ){
- if (!focusFound){
- var thisText = $(this).text();
- if ( thisText.indexOf( C ) === 0 || thisText.indexOf( c ) === 0 ) {
- if (self._prevChar[0] == C){
- if ( self._prevChar[ 1 ] < i ){ focusOpt( this, i ); }
- } else{
- focusOpt( this, i );
- }
- }
- }
- });
- this._prevChar[ 0 ] = C;
- }
- },
-
- // returns some usefull information, called by callbacks only
- _uiHash: function() {
- var index = this.index();
- return {
- index: index,
- option: $("option", this.element).get(index),
- value: this.element[0].value
- };
- },
-
- open: function(event) {
- var self = this, o = this.options;
- if ( self.newelement.attr("aria-disabled") != 'true' ) {
- self._closeOthers(event);
- self.newelement.addClass('ui-state-active');
-
- self.listWrap.appendTo( o.appendTo );
- self.list.attr('aria-hidden', false);
-
- if ( o.style == "dropdown" ) {
- self.newelement.removeClass('ui-corner-all').addClass('ui-corner-top');
- }
-
- self.listWrap.addClass( self.widgetBaseClass + '-open' );
- // positioning needed for IE7 (tested 01.08.11 on MS VPC Image)
- // see https://github.com/fnagel/jquery-ui/issues/147
- if ( $.browser.msie && $.browser.version.substr( 0,1 ) == 7 ) {
- self._refreshPosition();
- }
- var selected = self.list.attr('aria-hidden', false).find('li:not(.' + self.widgetBaseClass + '-group):eq(' + self._selectedIndex() + '):visible a');
- if (selected.length) selected[0].focus();
- // positioning needed for FF, Chrome, IE8, IE7, IE6 (tested 01.08.11 on MS VPC Image)
- self._refreshPosition();
-
- self._trigger("open", event, self._uiHash());
- }
- },
-
- close: function(event, retainFocus) {
- if ( this.newelement.is('.ui-state-active') ) {
- this.newelement
- .removeClass('ui-state-active');
- this.listWrap.removeClass(this.widgetBaseClass + '-open');
- this.list.attr('aria-hidden', true);
- if ( this.options.style == "dropdown" ) {
- this.newelement.removeClass('ui-corner-top').addClass('ui-corner-all');
- }
- if ( retainFocus ) {
- this.newelement.focus();
- }
- this._trigger("close", event, this._uiHash());
- }
- },
-
- change: function(event) {
- this.element.trigger("change");
- this._trigger("change", event, this._uiHash());
- },
-
- select: function(event) {
- if (this._disabled(event.currentTarget)) { return false; }
- this._trigger("select", event, this._uiHash());
- },
-
- _closeOthers: function(event) {
- $('.' + this.widgetBaseClass + '.ui-state-active').not(this.newelement).each(function() {
- $(this).data('selectelement').selectmenu('close', event);
- });
- $('.' + this.widgetBaseClass + '.ui-state-hover').trigger('mouseout');
- },
-
- _toggle: function(event, retainFocus) {
- if ( this.list.parent().is('.' + this.widgetBaseClass + '-open') ) {
- this.close(event, retainFocus);
- } else {
- this.open(event);
- }
- },
-
- _formatText: function(text) {
- return (this.options.format ? this.options.format(text) : text);
- },
-
- _selectedIndex: function() {
- return this.element[0].selectedIndex;
- },
-
- _selectedOptionLi: function() {
- return this._optionLis.eq(this._selectedIndex());
- },
-
- _focusedOptionLi: function() {
- return this.list.find('.' + this.widgetBaseClass + '-item-focus');
- },
-
- _moveSelection: function(amt, recIndex) {
- // do nothing if disabled
- if (!this.options.disabled) {
- var currIndex = parseInt(this._selectedOptionLi().data('index') || 0, 10);
- var newIndex = currIndex + amt;
- // do not loop when using up key
-
- if (newIndex < 0) {
- newIndex = 0;
- }
- if (newIndex > this._optionLis.size() - 1) {
- newIndex = this._optionLis.size() - 1;
- }
- // Occurs when a full loop has been made
- if (newIndex === recIndex) { return false; }
-
- if (this._optionLis.eq(newIndex).hasClass( this.namespace + '-state-disabled' )) {
- // if option at newIndex is disabled, call _moveFocus, incrementing amt by one
- (amt > 0) ? ++amt : --amt;
- this._moveSelection(amt, newIndex);
- } else {
- return this._optionLis.eq(newIndex).trigger('mouseup');
- }
- }
- },
-
- _moveFocus: function(amt, recIndex) {
- if (!isNaN(amt)) {
- var currIndex = parseInt(this._focusedOptionLi().data('index') || 0, 10);
- var newIndex = currIndex + amt;
- } else {
- var newIndex = parseInt(this._optionLis.filter(amt).data('index'), 10);
- }
-
- if (newIndex < 0) {
- newIndex = 0;
- }
- if (newIndex > this._optionLis.size() - 1) {
- newIndex = this._optionLis.size() - 1;
- }
-
- //Occurs when a full loop has been made
- if (newIndex === recIndex) { return false; }
-
- var activeID = this.widgetBaseClass + '-item-' + Math.round(Math.random() * 1000);
-
- this._focusedOptionLi().find('a:eq(0)').attr('id', '');
-
- if (this._optionLis.eq(newIndex).hasClass( this.namespace + '-state-disabled' )) {
- // if option at newIndex is disabled, call _moveFocus, incrementing amt by one
- (amt > 0) ? ++amt : --amt;
- this._moveFocus(amt, newIndex);
- } else {
- this._optionLis.eq(newIndex).find('a:eq(0)').attr('id',activeID).focus();
- }
-
- this.list.attr('aria-activedescendant', activeID);
- },
-
- _scrollPage: function(direction) {
- var numPerPage = Math.floor(this.list.outerHeight() / this.list.find('li:first').outerHeight());
- numPerPage = (direction == 'up' ? -numPerPage : numPerPage);
- this._moveFocus(numPerPage);
- },
-
- _setOption: function(key, value) {
- this.options[key] = value;
- // set
- if (key == 'disabled') {
- this.close();
- this.element
- .add(this.newelement)
- .add(this.list)[value ? 'addClass' : 'removeClass'](
- this.widgetBaseClass + '-disabled' + ' ' +
- this.namespace + '-state-disabled')
- .attr("aria-disabled", value);
- }
- },
-
- disable: function(index, type){
- // if options is not provided, call the parents disable function
- if ( typeof( index ) == 'undefined' ) {
- this._setOption( 'disabled', true );
- } else {
- if ( type == "optgroup" ) {
- this._disableOptgroup(index);
- } else {
- this._disableOption(index);
- }
- }
- },
-
- enable: function(index, type) {
- // if options is not provided, call the parents enable function
- if ( typeof( index ) == 'undefined' ) {
- this._setOption('disabled', false);
- } else {
- if ( type == "optgroup" ) {
- this._enableOptgroup(index);
- } else {
- this._enableOption(index);
- }
- }
- },
-
- _disabled: function(elem) {
- return $(elem).hasClass( this.namespace + '-state-disabled' );
- },
-
-
- _disableOption: function(index) {
- var optionElem = this._optionLis.eq(index);
- if (optionElem) {
- optionElem.addClass(this.namespace + '-state-disabled')
- .find("a").attr("aria-disabled", true);
- this.element.find("option").eq(index).attr("disabled", "disabled");
- }
- },
-
- _enableOption: function(index) {
- var optionElem = this._optionLis.eq(index);
- if (optionElem) {
- optionElem.removeClass( this.namespace + '-state-disabled' )
- .find("a").attr("aria-disabled", false);
- this.element.find("option").eq(index).removeAttr("disabled");
- }
- },
-
- _disableOptgroup: function(index) {
- var optGroupElem = this.list.find( 'li.' + this.widgetBaseClass + '-group-' + index );
- if (optGroupElem) {
- optGroupElem.addClass(this.namespace + '-state-disabled')
- .attr("aria-disabled", true);
- this.element.find("optgroup").eq(index).attr("disabled", "disabled");
- }
- },
-
- _enableOptgroup: function(index) {
- var optGroupElem = this.list.find( 'li.' + this.widgetBaseClass + '-group-' + index );
- if (optGroupElem) {
- optGroupElem.removeClass(this.namespace + '-state-disabled')
- .attr("aria-disabled", false);
- this.element.find("optgroup").eq(index).removeAttr("disabled");
- }
- },
-
- index: function(newValue) {
- if (arguments.length) {
- if (!this._disabled($(this._optionLis[newValue]))) {
- this.element[0].selectedIndex = newValue;
- this._refreshValue();
- } else {
- return false;
- }
- } else {
- return this._selectedIndex();
- }
- },
-
- value: function(newValue) {
- if (arguments.length) {
- this.element[0].value = newValue;
- this._refreshValue();
- } else {
- return this.element[0].value;
- }
- },
-
- _refreshValue: function() {
- var activeClass = (this.options.style == "popup") ? " ui-state-active" : "";
- var activeID = this.widgetBaseClass + '-item-' + Math.round(Math.random() * 1000);
- // deselect previous
- this.list
- .find('.' + this.widgetBaseClass + '-item-selected')
- .removeClass(this.widgetBaseClass + "-item-selected" + activeClass)
- .find('a')
- .attr('aria-selected', 'false')
- .attr('id', '');
- // select new
- this._selectedOptionLi()
- .addClass(this.widgetBaseClass + "-item-selected" + activeClass)
- .find('a')
- .attr('aria-selected', 'true')
- .attr('id', activeID);
-
- // toggle any class brought in from option
- var currentOptionClasses = (this.newelement.data('optionClasses') ? this.newelement.data('optionClasses') : "");
- var newOptionClasses = (this._selectedOptionLi().data('optionClasses') ? this._selectedOptionLi().data('optionClasses') : "");
- this.newelement
- .removeClass(currentOptionClasses)
- .data('optionClasses', newOptionClasses)
- .addClass( newOptionClasses )
- .find('.' + this.widgetBaseClass + '-status')
- .html(
- this._selectedOptionLi()
- .find('a:eq(0)')
- .html()
- );
-
- this.list.attr('aria-activedescendant', activeID);
- },
-
- _refreshPosition: function() {
- var o = this.options;
-
- // if its a native pop-up we need to calculate the position of the selected li
- if ( o.style == "popup" && !o.positionOptions.offset ) {
- var selected = this._selectedOptionLi();
- var _offset = "0 -" + ( selected.outerHeight() + selected.offset().top - this.list.offset().top );
- }
- // update zIndex if jQuery UI is able to process
- var zIndexElement = this.element.zIndex();
- if ( zIndexElement ) {
- this.listWrap.css( 'zIndex', zIndexElement );
- }
- this.listWrap.position({
- // set options for position plugin
- of: o.positionOptions.of || this.newelement,
- my: o.positionOptions.my,
- at: o.positionOptions.at,
- offset: o.positionOptions.offset || _offset,
- collision: o.positionOptions.collision || 'flip'
- });
- }
+ getter: "value",
+ version: "1.8",
+ eventPrefix: "selectmenu",
+ options: {
+ transferClasses: true,
+ typeAhead: "sequential",
+ style: 'dropdown',
+ positionOptions: {
+ my: "left top",
+ at: "left bottom",
+ offset: null
+ },
+ width: null,
+ menuWidth: null,
+ handleWidth: 26,
+ maxHeight: null,
+ icons: null,
+ format: null,
+ bgImage: function() {},
+ wrapperElement: "<div />"
+ },
+
+ _create: function() {
+ var self = this, o = this.options;
+
+ // set a default id value, generate a new random one if not set by developer
+ var selectmenuId = this.element.attr( 'id' ) || 'ui-selectmenu-' + Math.random().toString( 16 ).slice( 2, 10 );
+
+ // quick array of button and menu id's
+ this.ids = [ selectmenuId + '-button', selectmenuId + '-menu' ];
+
+ // define safe mouseup for future toggling
+ this._safemouseup = true;
+
+ // create menu button wrapper
+ this.newelement = $( '<a />', {
+ 'class': this.widgetBaseClass + ' ui-widget ui-state-default ui-corner-all',
+ 'id' : this.ids[ 0 ],
+ 'role': 'button',
+ 'href': '#nogo',
+ 'tabindex': this.element.attr( 'disabled' ) ? 1 : 0,
+ 'aria-haspopup': true,
+ 'aria-owns': this.ids[ 1 ]
+ });
+ this.newelementWrap = $( o.wrapperElement )
+ .append( this.newelement )
+ .insertAfter( this.element );
+
+ // transfer tabindex
+ var tabindex = this.element.attr( 'tabindex' );
+ if ( tabindex ) {
+ this.newelement.attr( 'tabindex', tabindex );
+ }
+
+ // save reference to select in data for ease in calling methods
+ this.newelement.data( 'selectelement', this.element );
+
+ // menu icon
+ this.selectmenuIcon = $( '<span class="' + this.widgetBaseClass + '-icon ui-icon"></span>' )
+ .prependTo( this.newelement );
+
+ // append status span to button
+ this.newelement.prepend( '<span class="' + self.widgetBaseClass + '-status" />' );
+
+ // make associated form label trigger focus
+ $( 'label[for="' + selectmenuId + '"]' )
+ .attr( 'for', this.ids[0] )
+ .bind( 'click.selectmenu', function() {
+ self.newelement[0].focus();
+ return false;
+ });
+
+ // click toggle for menu visibility
+ this.newelement
+ .bind('mousedown.selectmenu', function(event) {
+ self._toggle(event, true);
+ // make sure a click won't open/close instantly
+ if (o.style == "popup") {
+ self._safemouseup = false;
+ setTimeout(function() { self._safemouseup = true; }, 300);
+ }
+ return false;
+ })
+ .bind('click.selectmenu', function() {
+ return false;
+ })
+ .bind("keydown.selectmenu", function(event) {
+ var ret = false;
+ switch (event.keyCode) {
+ case $.ui.keyCode.ENTER:
+ ret = true;
+ break;
+ case $.ui.keyCode.SPACE:
+ self._toggle(event);
+ break;
+ case $.ui.keyCode.UP:
+ if (event.altKey) {
+ self.open(event);
+ } else {
+ self._moveSelection(-1);
+ }
+ break;
+ case $.ui.keyCode.DOWN:
+ if (event.altKey) {
+ self.open(event);
+ } else {
+ self._moveSelection(1);
+ }
+ break;
+ case $.ui.keyCode.LEFT:
+ self._moveSelection(-1);
+ break;
+ case $.ui.keyCode.RIGHT:
+ self._moveSelection(1);
+ break;
+ case $.ui.keyCode.TAB:
+ ret = true;
+ break;
+ default:
+ ret = true;
+ }
+ return ret;
+ })
+ .bind('keypress.selectmenu', function(event) {
+ self._typeAhead(event.which, 'mouseup');
+ return true;
+ })
+ .bind('mouseover.selectmenu focus.selectmenu', function() {
+ if (!o.disabled) {
+ $(this).addClass(self.widgetBaseClass + '-focus ui-state-hover');
+ }
+ })
+ .bind('mouseout.selectmenu blur.selectmenu', function() {
+ if (!o.disabled) {
+ $(this).removeClass(self.widgetBaseClass + '-focus ui-state-hover');
+ }
+ });
+
+ // document click closes menu
+ $(document).bind("mousedown.selectmenu", function(event) {
+ self.close(event);
+ });
+
+ // change event on original selectmenu
+ this.element
+ .bind("click.selectmenu", function() {
+ self._refreshValue();
+ })
+ // FIXME: newelement can be null under unclear circumstances in IE8
+ // TODO not sure if this is still a problem (fnagel 20.03.11)
+ .bind("focus.selectmenu", function() {
+ if (self.newelement) {
+ self.newelement[0].focus();
+ }
+ });
+
+ // set width when not set via options
+ if (!o.width) {
+ o.width = this.element.outerWidth();
+ }
+ // set menu button width
+ this.newelement.width(o.width);
+
+ // hide original selectmenu element
+ this.element.hide();
+
+ // create menu portion, append to body
+ this.list = $( '<ul />', {
+ 'class': 'ui-widget ui-widget-content',
+ 'aria-hidden': true,
+ 'role': 'listbox',
+ 'aria-labelledby': this.ids[0],
+ 'id': this.ids[1]
+ });
+ this.listWrap = $( o.wrapperElement )
+ .addClass( self.widgetBaseClass + '-menu' )
+ .append( this.list )
+ .appendTo( 'body' );
+
+ // transfer menu click to menu button
+ this.list
+ .bind("keydown.selectmenu", function(event) {
+ var ret = false;
+ switch (event.keyCode) {
+ case $.ui.keyCode.UP:
+ if (event.altKey) {
+ self.close(event, true);
+ } else {
+ self._moveFocus(-1);
+ }
+ break;
+ case $.ui.keyCode.DOWN:
+ if (event.altKey) {
+ self.close(event, true);
+ } else {
+ self._moveFocus(1);
+ }
+ break;
+ case $.ui.keyCode.LEFT:
+ self._moveFocus(-1);
+ break;
+ case $.ui.keyCode.RIGHT:
+ self._moveFocus(1);
+ break;
+ case $.ui.keyCode.HOME:
+ self._moveFocus(':first');
+ break;
+ case $.ui.keyCode.PAGE_UP:
+ self._scrollPage('up');
+ break;
+ case $.ui.keyCode.PAGE_DOWN:
+ self._scrollPage('down');
+ break;
+ case $.ui.keyCode.END:
+ self._moveFocus(':last');
+ break;
+ case $.ui.keyCode.ENTER:
+ case $.ui.keyCode.SPACE:
+ self.close(event, true);
+ $(event.target).parents('li:eq(0)').trigger('mouseup');
+ break;
+ case $.ui.keyCode.TAB:
+ ret = true;
+ self.close(event, true);
+ $(event.target).parents('li:eq(0)').trigger('mouseup');
+ break;
+ case $.ui.keyCode.ESCAPE:
+ self.close(event, true);
+ break;
+ default:
+ ret = true;
+ }
+ return ret;
+ })
+ .bind('keypress.selectmenu', function(event) {
+ self._typeAhead(event.which, 'focus');
+ return true;
+ })
+ // this allows for using the scrollbar in an overflowed list
+ .bind( 'mousedown.selectmenu mouseup.selectmenu', function() { return false; });
+
+ // needed when window is resized
+ // TODO seems to be useless, but causes errors (fnagel 01.08.11)
+ // see: https://github.com/fnagel/jquery-ui/issues/147
+ // $(window).bind( "resize.selectmenu", $.proxy( self._refreshPosition, this ) );
+ },
+
+ _init: function() {
+ var self = this, o = this.options;
+
+ // serialize selectmenu element options
+ var selectOptionData = [];
+ this.element
+ .find('option')
+ .each(function() {
+ var opt = $(this);
+ selectOptionData.push({
+ value: opt.attr('value'),
+ text: self._formatText(opt.text()),
+ selected: opt.attr('selected'),
+ disabled: opt.attr('disabled'),
+ classes: opt.attr('class'),
+ typeahead: opt.attr('typeahead'),
+ parentOptGroup: opt.parent('optgroup'),
+ bgImage: o.bgImage.call(opt)
+ });
+ });
+
+ // active state class is only used in popup style
+ var activeClass = (self.options.style == "popup") ? " ui-state-active" : "";
+
+ // empty list so we can refresh the selectmenu via selectmenu()
+ this.list.html("");
+
+ // write li's
+ if (selectOptionData.length) {
+ for (var i = 0; i < selectOptionData.length; i++) {
+ var thisLiAttr = { role : 'presentation' };
+ if ( selectOptionData[ i ].disabled ) {
+ thisLiAttr[ 'class' ] = this.namespace + '-state-disabled';
+ }
+ var thisAAttr = {
+ html: selectOptionData[i].text,
+ href : '#nogo',
+ tabindex : -1,
+ role : 'option',
+ 'aria-selected' : false
+ };
+ if ( selectOptionData[ i ].disabled ) {
+ thisAAttr[ 'aria-disabled' ] = selectOptionData[ i ].disabled;
+ }
+ if ( selectOptionData[ i ].typeahead ) {
+ thisAAttr[ 'typeahead' ] = selectOptionData[ i ].typeahead;
+ }
+ var thisA = $('<a/>', thisAAttr);
+ var thisLi = $('<li/>', thisLiAttr)
+ .append(thisA)
+ .data('index', i)
+ .addClass(selectOptionData[i].classes)
+ .data('optionClasses', selectOptionData[i].classes || '')
+ .bind("mouseup.selectmenu", function(event) {
+ if (self._safemouseup && !self._disabled(event.currentTarget) && !self._disabled($( event.currentTarget ).parents( "ul>li." + self.widgetBaseClass + "-group " )) ) {
+ var changed = $(this).data('index') != self._selectedIndex();
+ self.index($(this).data('index'));
+ self.select(event);
+ if (changed) {
+ self.change(event);
+ }
+ self.close(event, true);
+ }
+ return false;
+ })
+ .bind("click.selectmenu", function() {
+ return false;
+ })
+ .bind('mouseover.selectmenu focus.selectmenu', function(e) {
+ // no hover if diabled
+ if (!$(e.currentTarget).hasClass(self.namespace + '-state-disabled') && !$(e.currentTarget).parent("ul").parent("li").hasClass(self.namespace + '-state-disabled')) {
+ self._selectedOptionLi().addClass(activeClass);
+ self._focusedOptionLi().removeClass(self.widgetBaseClass + '-item-focus ui-state-hover');
+ $(this).removeClass('ui-state-active').addClass(self.widgetBaseClass + '-item-focus ui-state-hover');
+ }
+ })
+ .bind('mouseout.selectmenu blur.selectmenu', function() {
+ if ($(this).is(self._selectedOptionLi().selector)) {
+ $(this).addClass(activeClass);
+ }
+ $(this).removeClass(self.widgetBaseClass + '-item-focus ui-state-hover');
+ });
+
+ // optgroup or not...
+ if ( selectOptionData[i].parentOptGroup.length ) {
+ var optGroupName = self.widgetBaseClass + '-group-' + this.element.find( 'optgroup' ).index( selectOptionData[i].parentOptGroup );
+ if (this.list.find( 'li.' + optGroupName ).length ) {
+ this.list.find( 'li.' + optGroupName + ':last ul' ).append( thisLi );
+ } else {
+ $(' <li role="presentation" class="' + self.widgetBaseClass + '-group ' + optGroupName + (selectOptionData[i].parentOptGroup.attr("disabled") ? ' ' + this.namespace + '-state-disabled" aria-disabled="true"' : '"' ) + '><span class="' + self.widgetBaseClass + '-group-label">' + selectOptionData[i].parentOptGroup.attr('label') + '</span><ul></ul></li> ')
+ .appendTo( this.list )
+ .find( 'ul' )
+ .append( thisLi );
+ }
+ } else {
+ thisLi.appendTo(this.list);
+ }
+
+ // append icon if option is specified
+ if (o.icons) {
+ for (var j in o.icons) {
+ if (thisLi.is(o.icons[j].find)) {
+ thisLi
+ .data('optionClasses', selectOptionData[i].classes + ' ' + self.widgetBaseClass + '-hasIcon')
+ .addClass(self.widgetBaseClass + '-hasIcon');
+ var iconClass = o.icons[j].icon || "";
+ thisLi
+ .find('a:eq(0)')
+ .prepend('<span class="' + self.widgetBaseClass + '-item-icon ui-icon ' + iconClass + '"></span>');
+ if (selectOptionData[i].bgImage) {
+ thisLi.find('span').css('background-image', selectOptionData[i].bgImage);
+ }
+ }
+ }
+ }
+ }
+ } else {
+ $('<li role="presentation"><a href="#nogo" tabindex="-1" role="option"></a></li>').appendTo(this.list);
+ }
+ // we need to set and unset the CSS classes for dropdown and popup style
+ var isDropDown = ( o.style == 'dropdown' );
+ this.newelement
+ .toggleClass( self.widgetBaseClass + '-dropdown', isDropDown )
+ .toggleClass( self.widgetBaseClass + '-popup', !isDropDown );
+ this.list
+ .toggleClass( self.widgetBaseClass + '-menu-dropdown ui-corner-bottom', isDropDown )
+ .toggleClass( self.widgetBaseClass + '-menu-popup ui-corner-all', !isDropDown )
+ // add corners to top and bottom menu items
+ .find( 'li:first' )
+ .toggleClass( 'ui-corner-top', !isDropDown )
+ .end().find( 'li:last' )
+ .addClass( 'ui-corner-bottom' );
+ this.selectmenuIcon
+ .toggleClass( 'ui-icon-triangle-1-s', isDropDown )
+ .toggleClass( 'ui-icon-triangle-2-n-s', !isDropDown );
+
+ // transfer classes to selectmenu and list
+ if ( o.transferClasses ) {
+ var transferClasses = this.element.attr( 'class' ) || '';
+ this.newelement.add( this.list ).addClass( transferClasses );
+ }
+
+ // set menu width to either menuWidth option value, width option value, or select width
+ if ( o.style == 'dropdown' ) {
+ this.list.width( o.menuWidth ? o.menuWidth : o.width );
+ } else {
+ this.list.width( o.menuWidth ? o.menuWidth : o.width - o.handleWidth );
+ }
+
+ // reset height to auto
+ this.list.css( 'height', 'auto' );
+ var listH = this.listWrap.height();
+ // calculate default max height
+ if ( o.maxHeight && o.maxHeight < listH ) {
+ this.list.height( o.maxHeight );
+ } else {
+ var winH = $( window ).height() / 3;
+ if ( winH < listH ) this.list.height( winH );
+ }
+
+ // save reference to actionable li's (not group label li's)
+ this._optionLis = this.list.find( 'li:not(.' + self.widgetBaseClass + '-group)' );
+
+ // transfer disabled state
+ if ( this.element.attr( 'disabled' ) ) {
+ this.disable();
+ } else {
+ this.enable()
+ }
+
+ // update value
+ this.index( this._selectedIndex() );
+
+ // needed when selectmenu is placed at the very bottom / top of the page
+ window.setTimeout( function() {
+ self._refreshPosition();
+ }, 200 );
+ },
+
+ destroy: function() {
+ this.element.removeData( this.widgetName )
+ .removeClass( this.widgetBaseClass + '-disabled' + ' ' + this.namespace + '-state-disabled' )
+ .removeAttr( 'aria-disabled' )
+ .unbind( ".selectmenu" );
+
+ // TODO unneded as event binding has been disabled
+ // $( window ).unbind( ".selectmenu" );
+ $( document ).unbind( ".selectmenu" );
+
+ // unbind click on label, reset its for attr
+ $( 'label[for=' + this.newelement.attr('id') + ']' )
+ .attr( 'for', this.element.attr( 'id' ) )
+ .unbind( '.selectmenu' );
+
+ this.newelementWrap.remove();
+ this.listWrap.remove();
+
+ this.element.show();
+
+ // call widget destroy function
+ $.Widget.prototype.destroy.apply(this, arguments);
+ },
+
+ _typeAhead: function( code, eventType ){
+ var self = this, focusFound = false, C = String.fromCharCode(code).toUpperCase();
+ c = C.toLowerCase();
+
+ if ( self.options.typeAhead == 'sequential' ) {
+ // clear the timeout so we can use _prevChar
+ window.clearTimeout('ui.selectmenu-' + self.selectmenuId);
+
+ // define our find var
+ var find = typeof( self._prevChar ) == 'undefined' ? '' : self._prevChar.join( '' );
+
+ function focusOptSeq( elem, ind, c ){
+ focusFound = true;
+ $( elem ).trigger( eventType );
+ typeof( self._prevChar ) == 'undefined' ? self._prevChar = [ c ] : self._prevChar[ self._prevChar.length ] = c;
+ }
+ this.list.find( 'li a' ).each( function( i ) {
+ if ( !focusFound ) {
+ // allow the typeahead attribute on the option tag for a more specific lookup
+ var thisText = $( this ).attr( 'typeahead' ) || $(this).text();
+ if ( thisText.indexOf( find + C ) === 0 ) {
+ focusOptSeq( this, i, C );
+ } else if (thisText.indexOf(find+c) === 0 ) {
+ focusOptSeq( this, i, c );
+ }
+ }
+ });
+ // set a 1 second timeout for sequenctial typeahead
+ // keep this set even if we have no matches so it doesnt typeahead somewhere else
+ window.setTimeout( function( el ) {
+ self._prevChar = undefined;
+ }, 1000, self );
+
+ } else {
+ // define self._prevChar if needed
+ if ( !self._prevChar ) { self._prevChar = [ '' , 0 ]; }
+
+ focusFound = false;
+ function focusOpt( elem, ind ){
+ focusFound = true;
+ $( elem ).trigger( eventType );
+ self._prevChar[ 1 ] = ind;
+ }
+ this.list.find( 'li a' ).each(function( i ){
+ if (!focusFound){
+ var thisText = $(this).text();
+ if ( thisText.indexOf( C ) === 0 || thisText.indexOf( c ) === 0 ) {
+ if (self._prevChar[0] == C){
+ if ( self._prevChar[ 1 ] < i ){ focusOpt( this, i ); }
+ } else{
+ focusOpt( this, i );
+ }
+ }
+ }
+ });
+ this._prevChar[ 0 ] = C;
+ }
+ },
+
+ // returns some usefull information, called by callbacks only
+ _uiHash: function() {
+ var index = this.index();
+ return {
+ index: index,
+ option: $("option", this.element).get(index),
+ value: this.element[0].value
+ };
+ },
+
+ open: function(event) {
+ var self = this, o = this.options;
+ if ( self.newelement.attr("aria-disabled") != 'true' ) {
+ self._closeOthers(event);
+ self.newelement.addClass('ui-state-active');
+
+ self.listWrap.appendTo( o.appendTo );
+ self.list.attr('aria-hidden', false);
+
+ if ( o.style == "dropdown" ) {
+ self.newelement.removeClass('ui-corner-all').addClass('ui-corner-top');
+ }
+
+ self.listWrap.addClass( self.widgetBaseClass + '-open' );
+ // positioning needed for IE7 (tested 01.08.11 on MS VPC Image)
+ // see https://github.com/fnagel/jquery-ui/issues/147
+ if ( $.browser.msie && $.browser.version.substr( 0,1 ) == 7 ) {
+ self._refreshPosition();
+ }
+ var selected = self.list.attr('aria-hidden', false).find('li:not(.' + self.widgetBaseClass + '-group):eq(' + self._selectedIndex() + '):visible a');
+ if (selected.length) selected[0].focus();
+ // positioning needed for FF, Chrome, IE8, IE7, IE6 (tested 01.08.11 on MS VPC Image)
+ self._refreshPosition();
+
+ self._trigger("open", event, self._uiHash());
+ }
+ },
+
+ close: function(event, retainFocus) {
+ if ( this.newelement.is('.ui-state-active') ) {
+ this.newelement
+ .removeClass('ui-state-active');
+ this.listWrap.removeClass(this.widgetBaseClass + '-open');
+ this.list.attr('aria-hidden', true);
+ if ( this.options.style == "dropdown" ) {
+ this.newelement.removeClass('ui-corner-top').addClass('ui-corner-all');
+ }
+ if ( retainFocus ) {
+ this.newelement.focus();
+ }
+ this._trigger("close", event, this._uiHash());
+ }
+ },
+
+ change: function(event) {
+ this.element.trigger("change");
+ this._trigger("change", event, this._uiHash());
+ },
+
+ select: function(event) {
+ if (this._disabled(event.currentTarget)) { return false; }
+ this._trigger("select", event, this._uiHash());
+ },
+
+ _closeOthers: function(event) {
+ $('.' + this.widgetBaseClass + '.ui-state-active').not(this.newelement).each(function() {
+ $(this).data('selectelement').selectmenu('close', event);
+ });
+ $('.' + this.widgetBaseClass + '.ui-state-hover').trigger('mouseout');
+ },
+
+ _toggle: function(event, retainFocus) {
+ if ( this.list.parent().is('.' + this.widgetBaseClass + '-open') ) {
+ this.close(event, retainFocus);
+ } else {
+ this.open(event);
+ }
+ },
+
+ _formatText: function(text) {
+ return (this.options.format ? this.options.format(text) : text);
+ },
+
+ _selectedIndex: function() {
+ return this.element[0].selectedIndex;
+ },
+
+ _selectedOptionLi: function() {
+ return this._optionLis.eq(this._selectedIndex());
+ },
+
+ _focusedOptionLi: function() {
+ return this.list.find('.' + this.widgetBaseClass + '-item-focus');
+ },
+
+ _moveSelection: function(amt, recIndex) {
+ // do nothing if disabled
+ if (!this.options.disabled) {
+ var currIndex = parseInt(this._selectedOptionLi().data('index') || 0, 10);
+ var newIndex = currIndex + amt;
+ // do not loop when using up key
+
+ if (newIndex < 0) {
+ newIndex = 0;
+ }
+ if (newIndex > this._optionLis.size() - 1) {
+ newIndex = this._optionLis.size() - 1;
+ }
+ // Occurs when a full loop has been made
+ if (newIndex === recIndex) { return false; }
+
+ if (this._optionLis.eq(newIndex).hasClass( this.namespace + '-state-disabled' )) {
+ // if option at newIndex is disabled, call _moveFocus, incrementing amt by one
+ (amt > 0) ? ++amt : --amt;
+ this._moveSelection(amt, newIndex);
+ } else {
+ return this._optionLis.eq(newIndex).trigger('mouseup');
+ }
+ }
+ },
+
+ _moveFocus: function(amt, recIndex) {
+ if (!isNaN(amt)) {
+ var currIndex = parseInt(this._focusedOptionLi().data('index') || 0, 10);
+ var newIndex = currIndex + amt;
+ } else {
+ var newIndex = parseInt(this._optionLis.filter(amt).data('index'), 10);
+ }
+
+ if (newIndex < 0) {
+ newIndex = 0;
+ }
+ if (newIndex > this._optionLis.size() - 1) {
+ newIndex = this._optionLis.size() - 1;
+ }
+
+ //Occurs when a full loop has been made
+ if (newIndex === recIndex) { return false; }
+
+ var activeID = this.widgetBaseClass + '-item-' + Math.round(Math.random() * 1000);
+
+ this._focusedOptionLi().find('a:eq(0)').attr('id', '');
+
+ if (this._optionLis.eq(newIndex).hasClass( this.namespace + '-state-disabled' )) {
+ // if option at newIndex is disabled, call _moveFocus, incrementing amt by one
+ (amt > 0) ? ++amt : --amt;
+ this._moveFocus(amt, newIndex);
+ } else {
+ this._optionLis.eq(newIndex).find('a:eq(0)').attr('id',activeID).focus();
+ }
+
+ this.list.attr('aria-activedescendant', activeID);
+ },
+
+ _scrollPage: function(direction) {
+ var numPerPage = Math.floor(this.list.outerHeight() / this.list.find('li:first').outerHeight());
+ numPerPage = (direction == 'up' ? -numPerPage : numPerPage);
+ this._moveFocus(numPerPage);
+ },
+
+ _setOption: function(key, value) {
+ this.options[key] = value;
+ // set
+ if (key == 'disabled') {
+ this.close();
+ this.element
+ .add(this.newelement)
+ .add(this.list)[value ? 'addClass' : 'removeClass'](
+ this.widgetBaseClass + '-disabled' + ' ' +
+ this.namespace + '-state-disabled')
+ .attr("aria-disabled", value);
+ }
+ },
+
+ disable: function(index, type){
+ // if options is not provided, call the parents disable function
+ if ( typeof( index ) == 'undefined' ) {
+ this._setOption( 'disabled', true );
+ } else {
+ if ( type == "optgroup" ) {
+ this._disableOptgroup(index);
+ } else {
+ this._disableOption(index);
+ }
+ }
+ },
+
+ enable: function(index, type) {
+ // if options is not provided, call the parents enable function
+ if ( typeof( index ) == 'undefined' ) {
+ this._setOption('disabled', false);
+ } else {
+ if ( type == "optgroup" ) {
+ this._enableOptgroup(index);
+ } else {
+ this._enableOption(index);
+ }
+ }
+ },
+
+ _disabled: function(elem) {
+ return $(elem).hasClass( this.namespace + '-state-disabled' );
+ },
+
+ _disableOption: function(index) {
+ var optionElem = this._optionLis.eq(index);
+ if (optionElem) {
+ optionElem.addClass(this.namespace + '-state-disabled')
+ .find("a").attr("aria-disabled", true);
+ this.element.find("option").eq(index).attr("disabled", "disabled");
+ }
+ },
+
+ _enableOption: function(index) {
+ var optionElem = this._optionLis.eq(index);
+ if (optionElem) {
+ optionElem.removeClass( this.namespace + '-state-disabled' )
+ .find("a").attr("aria-disabled", false);
+ this.element.find("option").eq(index).removeAttr("disabled");
+ }
+ },
+
+ _disableOptgroup: function(index) {
+ var optGroupElem = this.list.find( 'li.' + this.widgetBaseClass + '-group-' + index );
+ if (optGroupElem) {
+ optGroupElem.addClass(this.namespace + '-state-disabled')
+ .attr("aria-disabled", true);
+ this.element.find("optgroup").eq(index).attr("disabled", "disabled");
+ }
+ },
+
+ _enableOptgroup: function(index) {
+ var optGroupElem = this.list.find( 'li.' + this.widgetBaseClass + '-group-' + index );
+ if (optGroupElem) {
+ optGroupElem.removeClass(this.namespace + '-state-disabled')
+ .attr("aria-disabled", false);
+ this.element.find("optgroup").eq(index).removeAttr("disabled");
+ }
+ },
+
+ index: function(newValue) {
+ if (arguments.length) {
+ if (!this._disabled($(this._optionLis[newValue]))) {
+ this.element[0].selectedIndex = newValue;
+ this._refreshValue();
+ } else {
+ return false;
+ }
+ } else {
+ return this._selectedIndex();
+ }
+ },
+
+ value: function(newValue) {
+ if (arguments.length) {
+ this.element[0].value = newValue;
+ this._refreshValue();
+ } else {
+ return this.element[0].value;
+ }
+ },
+
+ _refreshValue: function() {
+ var activeClass = (this.options.style == "popup") ? " ui-state-active" : "";
+ var activeID = this.widgetBaseClass + '-item-' + Math.round(Math.random() * 1000);
+ // deselect previous
+ this.list
+ .find('.' + this.widgetBaseClass + '-item-selected')
+ .removeClass(this.widgetBaseClass + "-item-selected" + activeClass)
+ .find('a')
+ .attr('aria-selected', 'false')
+ .attr('id', '');
+ // select new
+ this._selectedOptionLi()
+ .addClass(this.widgetBaseClass + "-item-selected" + activeClass)
+ .find('a')
+ .attr('aria-selected', 'true')
+ .attr('id', activeID);
+
+ // toggle any class brought in from option
+ var currentOptionClasses = (this.newelement.data('optionClasses') ? this.newelement.data('optionClasses') : "");
+ var newOptionClasses = (this._selectedOptionLi().data('optionClasses') ? this._selectedOptionLi().data('optionClasses') : "");
+ this.newelement
+ .removeClass(currentOptionClasses)
+ .data('optionClasses', newOptionClasses)
+ .addClass( newOptionClasses )
+ .find('.' + this.widgetBaseClass + '-status')
+ .html(
+ this._selectedOptionLi()
+ .find('a:eq(0)')
+ .html()
+ );
+
+ this.list.attr('aria-activedescendant', activeID);
+ },
+
+ _refreshPosition: function() {
+ var o = this.options;
+
+ // if its a native pop-up we need to calculate the position of the selected li
+ if ( o.style == "popup" && !o.positionOptions.offset ) {
+ var selected = this._selectedOptionLi();
+ var _offset = "0 -" + ( selected.outerHeight() + selected.offset().top - this.list.offset().top );
+ }
+ // update zIndex if jQuery UI is able to process
+ var zIndexElement = this.element.zIndex();
+ if ( zIndexElement ) {
+ this.listWrap.css( 'zIndex', zIndexElement );
+ }
+ this.listWrap.position({
+ // set options for position plugin
+ of: o.positionOptions.of || this.newelement,
+ my: o.positionOptions.my,
+ at: o.positionOptions.at,
+ offset: o.positionOptions.offset || _offset,
+ collision: o.positionOptions.collision || 'flip'
+ });
+ }
});
})(jQuery);
diff --git a/app/assets/javascripts/projects.js b/app/assets/javascripts/projects.js
index 74f0e643c216ffd1df14003315eb99eb3ca4347c..87be2f0730344b036ed9e1428d91655e6de277bf 100644
--- a/app/assets/javascripts/projects.js
+++ b/app/assets/javascripts/projects.js
@@ -8,7 +8,7 @@ $(document).ready(function(){
e.stopPropagation();
$(this).find("td.tree-item-file-name a").click();
return false;
- }
+ }
});
$("#projects-list .project").live('click', function(e){
diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css
index 42fe63db2b35309f4b7863823ae2b0f3641ddf38..db803ee40a4ba65be2a9af0284c870db3352ea10 100644
--- a/app/assets/stylesheets/application.css
+++ b/app/assets/stylesheets/application.css
@@ -3,5 +3,5 @@
* and any sub-directories. You're free to add application-wide styles to this file and they'll appear at
* the top of the compiled file, but it's generally better to create a new file per style scope.
*= require_self
- *= require_tree .
+ *= require_tree .
*/
diff --git a/app/assets/stylesheets/highlight.css.scss b/app/assets/stylesheets/highlight.css.scss
index 31f9369a45f50879a5244e60ed0fb627f90507ad..fc14949a19dd5482b744a5da3b3578ba8c0bd3d8 100644
--- a/app/assets/stylesheets/highlight.css.scss
+++ b/app/assets/stylesheets/highlight.css.scss
@@ -1,4 +1,4 @@
-@mixin round-borders-all($radius) {
+@mixin round-borders-all($radius) {
border: 1px solid #eaeaea;
-moz-border-radius: $radius;
-webkit-border-radius: $radius;
@@ -28,11 +28,11 @@ td.linenos{
.highlight pre{
}
-.linenodiv pre {
+.linenodiv pre {
white-space:pre-line;
}
-td.linenos {
+td.linenos {
background:#ECECEC;
color:#777;
padding:10px 0px 0px 10px;
@@ -42,7 +42,7 @@ td.linenos {
}
-td.code .highlight {
+td.code .highlight {
overflow: auto;
}
table.highlighttable pre{
@@ -53,9 +53,8 @@ table.highlighttable pre{
text-align:left;
}
-
.git-empty .highlight {
- @include round-borders-all(4px);
+ @include round-borders-all(4px);
background:#eee;
padding:5px;
//overflow-x:scroll;
@@ -71,10 +70,9 @@ table.highlighttable pre{
.shadow{
-webkit-box-shadow:0 5px 15px #000;
-moz-box-shadow:0 5px 15px #000;
- box-shadow:0 5px 15px #000;
+ box-shadow:0 5px 15px #000;
}
-
.hll { background-color: #ffffff }
.c { color: #888888; font-style: italic } /* Comment */
.err { color: #a61717; background-color: #e3d2d2 } /* Error */
@@ -105,7 +103,7 @@ table.highlighttable pre{
.highlight .nb{color:#0086B3;} /* Name.Builtin */
.highlight .nc{color:#458;font-weight:bold;} /* Name.Class */
.highlight .no{color:#008080;} /* Name.Constant */
-.highlight .ni{color:#800080;}
+.highlight .ni{color:#800080;}
.highlight .ne{color:#900;font-weight:bold;} /* Name.Exception */
.highlight .nf{color:#900;font-weight:bold;} /* Name.Function */
.highlight .nn{color:#005;font-weight:bold;} /* Name.Namespace */
diff --git a/app/assets/stylesheets/jquery.ui.selectmenu.css b/app/assets/stylesheets/jquery.ui.selectmenu.css
index 37cfbd0557a5765ee8f03557c0690dc819c7f7e8..481adf5a2a8d1207f4a1ea5b67d68f13135b69e7 100644
--- a/app/assets/stylesheets/jquery.ui.selectmenu.css
+++ b/app/assets/stylesheets/jquery.ui.selectmenu.css
@@ -3,7 +3,7 @@
.ui-selectmenu { background:none; font-size:12px;display: block; display: inline-block; position: relative; height: 2.2em; vertical-align: middle; text-decoration: none; overflow: hidden; zoom: 1; }
.ui-selectmenu-icon { position:absolute; right:6px; margin-top:-8px; top: 50%; }
.ui-selectmenu-menu { padding:0; margin:0; position:absolute; top: 0; display: none; z-index: 1005;} /* z-index: 1005 to make selectmenu work with dialog */
-.ui-selectmenu-menu ul { padding:0; margin:0; list-style:none; position: relative; overflow: auto; overflow-y: auto ; overflow-x: hidden; }
+.ui-selectmenu-menu ul { padding:0; margin:0; list-style:none; position: relative; overflow: auto; overflow-y: auto ; overflow-x: hidden; }
.ui-selectmenu-open { display: block; }
.ui-selectmenu.ui-widget { background:none; }
.ui-selectmenu-menu-popup { margin-top: -1px; }
diff --git a/app/assets/stylesheets/projects.css.scss b/app/assets/stylesheets/projects.css.scss
index 3e7633a6ae2a68f1b4aa0db1d56ee2bccf7a1524..6fd5150e337f0b80613248a03882bfcef1e812a0 100644
--- a/app/assets/stylesheets/projects.css.scss
+++ b/app/assets/stylesheets/projects.css.scss
@@ -2,7 +2,7 @@
// They will automatically be included in application.css.
// You can use Sass (SCSS) here: http://sass-lang.com/
-@mixin round-borders-bottom($radius) {
+@mixin round-borders-bottom($radius) {
border-top: 1px solid #eaeaea;
-moz-border-radius-bottomright: $radius;
@@ -15,7 +15,7 @@
-webkit-border-bottom-right-radius: $radius;
}
-@mixin round-borders-top($radius) {
+@mixin round-borders-top($radius) {
border-top: 1px solid #eaeaea;
-moz-border-radius-topright: $radius;
@@ -28,14 +28,14 @@
-webkit-border-top-right-radius: $radius;
}
-@mixin round-borders-all($radius) {
+@mixin round-borders-all($radius) {
border: 1px solid #eaeaea;
-moz-border-radius: $radius;
-webkit-border-radius: $radius;
border-radius: $radius;
}
-@mixin hover-color {
+@mixin hover-color {
background: #fff !important;
background: -webkit-gradient(linear,left top,left bottom,from(#fff),to(#FFF6BF)) !important;
background: -moz-linear-gradient(top,#fff,#FFF6BF) !important;
@@ -46,47 +46,47 @@
border:1px solid #CCC;
margin-bottom:1em;
- .diff_file_header {
+ .diff_file_header {
padding:5px 5px;
border-bottom:1px solid #CCC;
background: #eee;
}
- .diff_file_content {
+ .diff_file_content {
overflow-x: scroll;
background:#fff;
color:#333;
font-size: 12px;
font-family: 'Courier New', 'andale mono','lucida console',monospace;
}
- .diff_file_content_image {
+ .diff_file_content_image {
background:#eee;
text-align:center;
- img {
+ img {
padding:100px;
max-width:300px;
}
}
}
-#logo {
- &:hover {
+#logo {
+ &:hover {
background:none;
}
}
-.file_stats {
+.file_stats {
margin-bottom:10px;
@include round-borders-all(4px);
- span {
+ span {
border-top: 1px solid #eaeaea;
padding:5px 5px;
display:block;
- &:first-child {
+ &:first-child {
border-top:none;
}
- img {
+ img {
width:18px;
float:left;
margin-right: 6px;
@@ -94,15 +94,15 @@
}
}
-.round-borders {
+.round-borders {
@include round-borders-all(4px);
padding: 4px 0px;
}
-table.round-borders {
+table.round-borders {
float:left;
}
-.day-commits-table {
+.day-commits-table {
@include round-borders-all(4px);
padding: 4px 0px;
margin-bottom:10px;
@@ -110,55 +110,54 @@ table.round-borders {
width:100%;
background: #E6F1F6;
- .day-header {
+ .day-header {
padding:10px;
h3 {
margin:0px;
}
}
- ul {
+ ul {
display:block;
list-style:none;
margin:0px;
padding:0px;
- li.commit {
+ li.commit {
display:list-item;
padding:8px;
margin:0px;
background: #F7FBFC;
border-top: 1px solid #E2EAEE;
- &:first-child {
+ &:first-child {
border-top: 1px solid #E2EAEE;
}
&:nth-child(2n+1) {
background: white;
}
- a.button {
+ a.button {
width:85px;
padding:10px;
margin:0px;
float:right;
}
- p {
+ p {
margin-bottom: 3px;
font-size: 13px;
}
}
}
}
-@mixin panel-color {
+@mixin panel-color {
background: #111 !important;
background: -webkit-gradient(linear,left top,left bottom,from(#333),to(#111)) !important;
background: -moz-linear-gradient(top,#333,#111) !important;
background: transparent 9 !important;
}
-
-#header-panel {
+#header-panel {
@include panel-color;
height:40px;
position:fixed;
@@ -178,23 +177,23 @@ table.round-borders {
color:white;
}
- &.current {
+ &.current {
border-bottom: 3px solid #EAEAEA !important;
padding: 10px 20px 0;
color: #eaeaea;
}
}
- .search-holder {
+ .search-holder {
float:left;
- width:290px;
+ width:290px;
input {
@include round-borders-all(4px);
- width:290px;
+ width:290px;
border-color:#888;
padding:5px;
background:#666;
color:#222;
- &:focus {
+ &:focus {
background:#fff;
color:#000;
}
@@ -211,7 +210,7 @@ table.round-borders {
padding:20px;
}
-body {
+body {
background: #eaeaea;
}
@@ -220,7 +219,7 @@ a {
}
.diff_file_content{
- .old_line, .new_line {
+ .old_line, .new_line {
background:#ECECEC;
color:#777;
width:15px;
@@ -230,9 +229,8 @@ a {
}
}
-
.view_file_content{
- .old_line, .new_line {
+ .old_line, .new_line {
background:#ECECEC;
color:#777;
width:15px;
@@ -249,20 +247,20 @@ a {
border:1px solid #CCC;
margin-bottom:1em;
- .view_file_header {
+ .view_file_header {
padding:5px 5px;
border-bottom:1px solid #CCC;
background: #eee;
}
- .view_file_content {
+ .view_file_content {
background:#fff;
color:#514721;
font-size: 11px;
}
- .view_file_content_image {
+ .view_file_content_image {
background:#eee;
text-align:center;
- img {
+ img {
padding:100px;
max-width:300px;
}
@@ -273,7 +271,7 @@ a {
}
-input.ssh_project_url {
+input.ssh_project_url {
padding:5px;
margin:0px;
float:right;
@@ -281,12 +279,10 @@ input.ssh_project_url {
text-align:center;
}
-
-
-.day-commits-table li.commit {
+.day-commits-table li.commit {
cursor:pointer;
- &:hover {
+ &:hover {
@include hover-color;
}
}
@@ -295,39 +291,39 @@ input.ssh_project_url {
#FFF6BF
#FFD324
*/
-#tree-slider tr.tree-item {
+#tree-slider tr.tree-item {
cursor:pointer;
- &:hover {
+ &:hover {
@include hover-color;
- td {
+ td {
@include hover-color;
}
}
}
-#projects-list .project {
+#projects-list .project {
height:50px;
}
#projects-list .project,
#snippets-table .snippet,
-#issues-table .issue{
+#issues-table .issue{
cursor:pointer;
- &:hover {
+ &:hover {
@include hover-color;
- td {
+ td {
@include hover-color;
}
}
}
-.clear {
+.clear {
clear: both;
}
-.top_project_menu {
- a {
+.top_project_menu {
+ a {
border-right: 1px solid #FFFFFF;
box-shadow: -1px 0 #DDDDDD inset;
color: #666;
@@ -339,7 +335,7 @@ input.ssh_project_url {
text-shadow: 0 1px 0 #FFFFFF;
float:left;
- &.current {
+ &.current {
background-color: #FFFFFF;
color: #222222;
}
@@ -363,11 +359,11 @@ input.ssh_project_url {
.new_project,
.new_snippet,
.edit_snippet,
-.edit_project {
+.edit_project {
input[type='text'],
input[type='email'],
input[type='password'],
- textarea {
+ textarea {
width:400px;
padding:8px;
font-size:14px;
@@ -375,7 +371,7 @@ input.ssh_project_url {
}
}
-.input_button {
+.input_button {
//@include round-borders-all(4px);
padding:8px;
font-size:14px;
@@ -393,7 +389,7 @@ tbody tr:nth-child(2n) td, tbody tr.even td {
border-bottom: 1px solid #E2EAEE;
}
-.top_menu_count {
+.top_menu_count {
background: none repeat scroll 0 0 #FFF6BF;
border-color: #FFD324;
color: #514721;
@@ -417,7 +413,7 @@ tbody tr:nth-child(2n) td, tbody tr.even td {
/** FALSH **/
-#flash_container {
+#flash_container {
height:40px;
position:fixed;
z-index:1009;
@@ -429,7 +425,7 @@ tbody tr:nth-child(2n) td, tbody tr.even td {
cursor:pointer;
border-bottom:1px solid #777;
- h4 {
+ h4 {
color:#444;
font-size:22px;
padding-top:5px;
@@ -460,50 +456,50 @@ tbody tr:nth-child(2n) td, tbody tr.even td {
color: #0099FF;
}
- &.hm {
+ &.hm {
margin: 0px 0px;
}
- &.vm {
+ &.vm {
margin: 5px 0px;
}
}
/** Notes **/
-#notes-list {
+#notes-list {
display:block;
list-style:none;
margin:0px;
padding:0px;
- li {
+ li {
display:list-item;
padding:8px;
margin:0px;
background: #F7FBFC;
border-top: 1px solid #E2EAEE;
- &:first-child {
+ &:first-child {
border-top: none;
}
&:nth-child(2n+1) {
background: white;
}
- p {
+ p {
margin-bottom: 4px;
font-size: 13px;
color:#111;
}
}
- cite {
- &.ago {
+ cite {
+ &.ago {
color:#666;
}
}
}
-.notes_count {
+.notes_count {
background: none repeat scroll 0 0 #FFF6BF;
border-color: #FFD324;
color: #514721;
@@ -515,36 +511,36 @@ tbody tr:nth-child(2n) td, tbody tr.even td {
right: 6px;
top: 6px;
}
-.note_author {
+.note_author {
float:left;
width:60px;
}
-.note_content {
+.note_content {
float:left;
width:650px;
}
-.issue_notes {
- .note_content {
+.issue_notes {
+ .note_content {
float:left;
width:400px;
}
}
#user_projects_limit{
- width: 60px;
+ width: 60px;
}
-.project_thumb {
+.project_thumb {
margin:20px 0;
width: 250px;
float:left;
padding:20px;
text-align:center;
- p, h4 {
+ p, h4 {
text-align:left;
}
- .lbutton {
+ .lbutton {
float:left;
}
}
@@ -559,8 +555,8 @@ tbody tr:nth-child(2n) td, tbody tr.even td {
padding: 10px;
}
-.recent_message_parent {
- img {
+.recent_message_parent {
+ img {
padding-right:10px;
}
@@ -571,7 +567,7 @@ tbody tr:nth-child(2n) td, tbody tr.even td {
&.dash_wall{
border-bottom: 2px solid orange;
- span {
+ span {
background: orange;
color:black;
}
@@ -579,14 +575,14 @@ tbody tr:nth-child(2n) td, tbody tr.even td {
&.dash_issue{
border-bottom: 2px solid #ffbbbb;
- span {
+ span {
background: #ffbbbb;
}
}
&.dash_commit{
border-bottom: 2px solid #bbbbff;
- span{
+ span{
background: #bbbbff;
}
}
@@ -594,27 +590,26 @@ tbody tr:nth-child(2n) td, tbody tr.even td {
&.dash_snippet{
border-bottom: 2px solid #bbffbb;
- span{
+ span{
background: #bbffbb;
}
}
-
- span{
+ span{
border: 1px solid #aaa;
color:black;
padding:1px 4px;
}
- h4 {
+ h4 {
margin-bottom:3px;
}
}
.commit,
-.message,
+.message,
#notes-list{
- .author {
+ .author {
background: #eaeaea;
color: #333;
border: 1px solid #aaa;
@@ -624,17 +619,17 @@ tbody tr:nth-child(2n) td, tbody tr.even td {
}
/* Note textare */
-#note_note {
+#note_note {
height:100px;
width:97%;
font-size:14px;
}
-.wall_page {
- #note_note {
+.wall_page {
+ #note_note {
height:25px;
}
- .attach_holder {
+ .attach_holder {
display:none;
}
}
@@ -653,17 +648,17 @@ tbody tr:nth-child(2n) td, tbody tr.even td {
padding:2px 4px;
border:none;
- &.high {
+ &.high {
background: #D12F19;
color:white;
}
- &.today {
+ &.today {
background: #44aa22;
color:white;
}
- &.yours {
+ &.yours {
background: #4466cc;
color:white;
}
@@ -673,8 +668,8 @@ tbody tr:nth-child(2n) td, tbody tr.even td {
}
}
-#issues-table .issue {
- &.critical {
+#issues-table .issue {
+ &.critical {
td {
//background: #D12F19;
//color:#fff;
diff --git a/app/controllers/admin/mailer_controller.rb b/app/controllers/admin/mailer_controller.rb
index 05ad267fad50aca9c7eebd3773eb80d6094e698d..d2fbbcd49689b6415111d11cb59370224850ffa1 100644
--- a/app/controllers/admin/mailer_controller.rb
+++ b/app/controllers/admin/mailer_controller.rb
@@ -20,7 +20,7 @@ class Admin::MailerController < ApplicationController
else
render :file => 'notify/note_wall_email.html.haml', :layout => 'notify'
end
- rescue
+ rescue
render :text => "Preview not avaialble"
end
@@ -29,7 +29,7 @@ class Admin::MailerController < ApplicationController
@password = "DHasJKDHAS!"
render :file => 'notify/new_user_email.html.haml', :layout => 'notify'
- rescue
+ rescue
render :text => "Preview not avaialble"
end
@@ -38,7 +38,7 @@ class Admin::MailerController < ApplicationController
@user = @issue.assignee
@project = @issue.project
render :file => 'notify/new_issue_email.html.haml', :layout => 'notify'
- rescue
+ rescue
render :text => "Preview not avaialble"
end
end
diff --git a/app/controllers/admin/users_controller.rb b/app/controllers/admin/users_controller.rb
index e9ad1e559838eb3bc857c532965f707e091f9e12..f60330f73ca17c4037fd1e95f66b15625846087a 100644
--- a/app/controllers/admin/users_controller.rb
+++ b/app/controllers/admin/users_controller.rb
@@ -36,7 +36,7 @@ class Admin::UsersController < ApplicationController
def create
admin = params[:user].delete("admin")
- @admin_user = User.new(params[:user])
+ @admin_user = User.new(params[:user])
@admin_user.admin = (admin && admin.to_i > 0)
respond_to do |format|
@@ -54,8 +54,8 @@ class Admin::UsersController < ApplicationController
def update
admin = params[:user].delete("admin")
if params[:user][:password].empty?
- params[:user].delete(:password)
- params[:user].delete(:password_confirmation)
+ params[:user].delete(:password)
+ params[:user].delete(:password_confirmation)
end
@admin_user = User.find(params[:id])
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 047c6cb7d952ca1632a67234e1d6e15ab82c8ed9..816c4c55b8bf9be44853d6012780d03272276a23 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -8,7 +8,7 @@ class ApplicationController < ActionController::Base
render :file => File.join(Rails.root, "public", "gitosis_error"), :layout => false
end
- protected
+ protected
def abilities
@abilities ||= Six.new
@@ -18,7 +18,7 @@ class ApplicationController < ActionController::Base
abilities.allowed?(object, action, subject)
end
- def project
+ def project
@project ||= Project.find_by_code(params[:project_id])
end
@@ -55,7 +55,7 @@ class ApplicationController < ActionController::Base
@tag = unless params[:tag].blank?
params[:tag]
- else
+ else
nil
end
diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb
index 757ada947679e885df52ce12eb3aebfc7499c009..56d711dbca12c46425eb13615c8a9ebdceb6aa6f 100644
--- a/app/controllers/issues_controller.rb
+++ b/app/controllers/issues_controller.rb
@@ -1,12 +1,12 @@
class IssuesController < ApplicationController
before_filter :authenticate_user!
- before_filter :project
+ before_filter :project
before_filter :issue, :only => [:edit, :update, :destroy, :show]
# Authorize
before_filter :add_project_abilities
before_filter :authorize_read_issue!
- before_filter :authorize_write_issue!, :only => [:new, :create, :close, :edit, :update, :sort]
+ before_filter :authorize_write_issue!, :only => [:new, :create, :close, :edit, :update, :sort]
respond_to :js
@@ -57,14 +57,13 @@ class IssuesController < ApplicationController
end
end
-
def destroy
return access_denied! unless can?(current_user, :admin_issue, @issue)
@issue.destroy
respond_to do |format|
- format.js { render :nothing => true }
+ format.js { render :nothing => true }
end
end
@@ -78,7 +77,7 @@ class IssuesController < ApplicationController
render :nothing => true
end
- protected
+ protected
def issue
@issue ||= @project.issues.find(params[:id])
diff --git a/app/controllers/keys_controller.rb b/app/controllers/keys_controller.rb
index b0249375b85e824d64348d63e3f1ae90b429ab77..d3c93b5fff68ee8e832c6cf404f127409e7b8792 100644
--- a/app/controllers/keys_controller.rb
+++ b/app/controllers/keys_controller.rb
@@ -24,7 +24,7 @@ class KeysController < ApplicationController
respond_to do |format|
format.html { redirect_to keys_url }
- format.js { render :nothing => true }
+ format.js { render :nothing => true }
end
end
end
diff --git a/app/controllers/notes_controller.rb b/app/controllers/notes_controller.rb
index 46425664d6e8537e5d0dbcfce18f6b75041398f4..ad9531e077c710489412ed83a520ccba9296a640 100644
--- a/app/controllers/notes_controller.rb
+++ b/app/controllers/notes_controller.rb
@@ -1,9 +1,9 @@
class NotesController < ApplicationController
- before_filter :project
+ before_filter :project
# Authorize
before_filter :add_project_abilities
- before_filter :authorize_write_note!, :only => [:create]
+ before_filter :authorize_write_note!, :only => [:create]
respond_to :js
@@ -15,10 +15,9 @@ class NotesController < ApplicationController
notify if params[:notify] == '1'
end
-
respond_to do |format|
format.html {redirect_to :back}
- format.js
+ format.js
end
end
@@ -30,11 +29,11 @@ class NotesController < ApplicationController
@note.destroy
respond_to do |format|
- format.js { render :nothing => true }
+ format.js { render :nothing => true }
end
end
- protected
+ protected
def notify
@project.users.reject { |u| u.id == current_user.id } .each do |u|
diff --git a/app/controllers/profile_controller.rb b/app/controllers/profile_controller.rb
index c8477729a9200fdfb1f46764964028e10e49eb64..a0078f0e0a3cf87c7ce254d046e139f71e34b3ed 100644
--- a/app/controllers/profile_controller.rb
+++ b/app/controllers/profile_controller.rb
@@ -14,7 +14,7 @@ class ProfileController < ApplicationController
end
def password_update
- params[:user].reject!{ |k, v| k != "password" && k != "password_confirmation"}
+ params[:user].reject!{ |k, v| k != "password" && k != "password_confirmation"}
@user = current_user
if @user.update_attributes(params[:user])
diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index 54d19af75119d4541f8b27ab66cc543bbcaf3056..481e02fd2314743d06eeb920ed14df5b99ab5d11 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -1,10 +1,10 @@
class ProjectsController < ApplicationController
- before_filter :project, :except => [:index, :new, :create]
+ before_filter :project, :except => [:index, :new, :create]
# Authorize
before_filter :add_project_abilities
- before_filter :authorize_read_project!, :except => [:index, :new, :create]
- before_filter :authorize_admin_project!, :only => [:edit, :update, :destroy]
+ before_filter :authorize_read_project!, :except => [:index, :new, :create]
+ before_filter :authorize_admin_project!, :only => [:edit, :update, :destroy]
before_filter :require_non_empty_project, :only => [:blob, :tree]
@@ -23,7 +23,7 @@ class ProjectsController < ApplicationController
@project = Project.new(params[:project])
@project.owner = current_user
- Project.transaction do
+ Project.transaction do
@project.save!
@project.users_projects.create!(:admin => true, :read => true, :write => true, :user => current_user)
end
@@ -31,7 +31,7 @@ class ProjectsController < ApplicationController
respond_to do |format|
if @project.valid?
format.html { redirect_to @project, notice: 'Project was successfully created.' }
- format.js
+ format.js
else
format.html { render action: "new" }
format.js
@@ -51,10 +51,10 @@ class ProjectsController < ApplicationController
respond_to do |format|
if project.update_attributes(params[:project])
format.html { redirect_to project, :notice => 'Project was successfully updated.' }
- format.js
+ format.js
else
format.html { render action: "edit" }
- format.js
+ format.js
end
end
end
@@ -105,7 +105,7 @@ class ProjectsController < ApplicationController
if params[:commit_id]
@commit = @repo.commits(params[:commit_id]).first
- else
+ else
@commit = @repo.commits(@ref || "master").first
end
@@ -114,7 +114,7 @@ class ProjectsController < ApplicationController
respond_to do |format|
format.html # show.html.erb
- format.js do
+ format.js do
# diasbale cache to allow back button works
response.headers["Cache-Control"] = "no-cache, no-store, max-age=0, must-revalidate"
response.headers["Pragma"] = "no-cache"
@@ -132,7 +132,7 @@ class ProjectsController < ApplicationController
if @tree.is_a?(Grit::Blob)
send_data(@tree.data, :type => @tree.mime_type, :disposition => 'inline', :filename => @tree.name)
- else
+ else
head(404)
end
rescue
@@ -147,9 +147,9 @@ class ProjectsController < ApplicationController
end
end
- protected
+ protected
- def project
+ def project
@project ||= Project.find_by_code(params[:id])
end
end
diff --git a/app/controllers/snippets_controller.rb b/app/controllers/snippets_controller.rb
index b31fe6836a2c9b42bcd1cb26ad72f71f8777c635..d9a6ab2a1b39c0a2ed5795b75bfd60fdf059e1a5 100644
--- a/app/controllers/snippets_controller.rb
+++ b/app/controllers/snippets_controller.rb
@@ -1,11 +1,11 @@
class SnippetsController < ApplicationController
before_filter :authenticate_user!
- before_filter :project
+ before_filter :project
# Authorize
before_filter :add_project_abilities
before_filter :authorize_read_snippet!
- before_filter :authorize_write_snippet!, :only => [:new, :create, :close, :edit, :update, :sort]
+ before_filter :authorize_write_snippet!, :only => [:new, :create, :close, :edit, :update, :sort]
respond_to :html
@@ -13,7 +13,7 @@ class SnippetsController < ApplicationController
@snippets = @project.snippets
end
- def new
+ def new
@snippet = @project.snippets.new
end
diff --git a/app/controllers/team_members_controller.rb b/app/controllers/team_members_controller.rb
index 84addf8d7bb0749499385059a81a4d8577ec42b6..48e7e9b9c4ae427a62e6abc4fa1c4d441d395769 100644
--- a/app/controllers/team_members_controller.rb
+++ b/app/controllers/team_members_controller.rb
@@ -1,10 +1,10 @@
class TeamMembersController < ApplicationController
- before_filter :project
+ before_filter :project
# Authorize
before_filter :add_project_abilities
before_filter :authorize_read_project!
- before_filter :authorize_admin_project!, :only => [:new, :create, :destroy, :update]
+ before_filter :authorize_admin_project!, :only => [:new, :create, :destroy, :update]
def show
@team_member = project.users_projects.find(params[:id])
@@ -26,7 +26,7 @@ class TeamMembersController < ApplicationController
respond_to do |format|
format.js
- format.html do
+ format.html do
unless @team_member.valid?
flash[:alert] = "User should have at least one role"
end
@@ -41,7 +41,7 @@ class TeamMembersController < ApplicationController
respond_to do |format|
format.html { redirect_to root_path }
- format.js { render :nothing => true }
+ format.js { render :nothing => true }
end
end
end
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 0895eb0d1ba5fa84065d8258b9b5a1049aac8f2d..599d1e5c5c9fc53779071227b2c31b49089e4aad 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -23,9 +23,9 @@ module ApplicationHelper
end
def last_commit(project)
- if project.repo_exists?
+ if project.repo_exists?
time_ago_in_words(project.commit.committed_date) + " ago"
- else
+ else
"Never"
end
end
@@ -33,8 +33,8 @@ module ApplicationHelper
def search_autocomplete_source
projects = current_user.projects.map{ |p| { :label => p.name, :url => project_path(p) } }
default_nav = [
- { :label => "Keys", :url => keys_path },
- { :label => "Projects", :url => projects_path },
+ { :label => "Keys", :url => keys_path },
+ { :label => "Projects", :url => projects_path },
{ :label => "Admin", :url => admin_root_path }
]
@@ -42,10 +42,10 @@ module ApplicationHelper
if @project && !@project.new_record?
project_nav = [
- { :label => "#{@project.code} / Issues", :url => project_issues_path(@project) },
- { :label => "#{@project.code} / Wall", :url => wall_project_path(@project) },
- { :label => "#{@project.code} / Tree", :url => tree_project_path(@project) },
- { :label => "#{@project.code} / Commits", :url => project_commits_path(@project) },
+ { :label => "#{@project.code} / Issues", :url => project_issues_path(@project) },
+ { :label => "#{@project.code} / Wall", :url => wall_project_path(@project) },
+ { :label => "#{@project.code} / Tree", :url => tree_project_path(@project) },
+ { :label => "#{@project.code} / Commits", :url => project_commits_path(@project) },
{ :label => "#{@project.code} / Team", :url => team_project_path(@project) }
]
end
diff --git a/app/helpers/commits_helper.rb b/app/helpers/commits_helper.rb
index f1b546684f07bb532bbb8355e9c6c1f3348f24a4..bc95f916d157347276382449ee4c06af872d4517 100644
--- a/app/helpers/commits_helper.rb
+++ b/app/helpers/commits_helper.rb
@@ -1,13 +1,13 @@
module CommitsHelper
def diff_line(line, line_new = 0, line_old = 0)
full_line = html_escape(line.gsub(/\n/, ''))
- color = if line[0] == "+"
+ color = if line[0] == "+"
full_line = "<span class=\"old_line\"> </span><span class=\"new_line\">#{line_new}</span> " + full_line
"#DFD"
- elsif line[0] == "-"
+ elsif line[0] == "-"
full_line = "<span class=\"old_line\">#{line_old}</span><span class=\"new_line\"> </span> " + full_line
"#FDD"
- else
+ else
full_line = "<span class=\"old_line\">#{line_old}</span><span class=\"new_line\">#{line_new}</span> " + full_line
"none"
end
diff --git a/app/helpers/projects_helper.rb b/app/helpers/projects_helper.rb
index 4a6923afd09631386c739fc5a69d18e74444fa8a..75ab737cda6679dfb04d57ddb5545d95b8cbe1d1 100644
--- a/app/helpers/projects_helper.rb
+++ b/app/helpers/projects_helper.rb
@@ -12,7 +12,7 @@ module ProjectsHelper
else
true
end
- rescue
+ rescue
nil
end
end
diff --git a/app/models/ability.rb b/app/models/ability.rb
index b822f6300ca947171482dfceb13abe85347147ee..5ab70650d818a5cea9e27a30840e52b863e5e99b 100644
--- a/app/models/ability.rb
+++ b/app/models/ability.rb
@@ -17,14 +17,14 @@ class Ability
:read_issue,
:read_snippet,
:read_team_member,
- :read_note
+ :read_note
] if project.readers.include?(user)
rules << [
:write_project,
:write_issue,
:write_snippet,
- :write_note
+ :write_note
] if project.writers.include?(user)
rules << [
@@ -32,13 +32,13 @@ class Ability
:admin_issue,
:admin_snippet,
:admin_team_member,
- :admin_note
+ :admin_note
] if project.admins.include?(user)
rules.flatten
end
- class << self
+ class << self
[:issue, :note, :snippet].each do |name|
define_method "#{name}_abilities" do |user, subject|
if subject.author == user
@@ -48,7 +48,7 @@ class Ability
:"admin_#{name}"
]
else
- subject.respond_to?(:project) ?
+ subject.respond_to?(:project) ?
project_abilities(user, subject.project) : []
end
end
diff --git a/app/models/issue.rb b/app/models/issue.rb
index 904965ac7e50455611b85de87fb5052f3600e240..ca1c5eaf52db03ba59fd8c9c1e76e372af4e5db0 100644
--- a/app/models/issue.rb
+++ b/app/models/issue.rb
@@ -13,7 +13,7 @@ class Issue < ActiveRecord::Base
validates :title,
:presence => true,
:length => { :within => 0..255 }
-
+
validates :content,
:presence => true,
:length => { :within => 0..2000 }
@@ -30,7 +30,7 @@ class Issue < ActiveRecord::Base
def today?
Date.today == created_at.to_date
end
-
+
def new?
today? && created_at == updated_at
end
diff --git a/app/models/key.rb b/app/models/key.rb
index 29dcbbce0acf357aeb3efa37ec2d1887442a77f0..1559b5bdf5ed740f173693313ea26374f524da8c 100644
--- a/app/models/key.rb
+++ b/app/models/key.rb
@@ -17,11 +17,11 @@ class Key < ActiveRecord::Base
def set_identifier
self.identifier = "#{user.identifier}_#{Time.now.to_i}"
end
-
+
def update_gitosis
Gitosis.new.configure do |c|
c.update_keys(identifier, key)
-
+
projects.each do |project|
c.update_project(project.path, project.gitosis_writers)
end
diff --git a/app/models/note.rb b/app/models/note.rb
index e3dabce479104b1153d90c1f4eca35cf58a5860e..9dcdbb551143b880c507801860bfffb37cf266f4 100644
--- a/app/models/note.rb
+++ b/app/models/note.rb
@@ -7,7 +7,7 @@ class Note < ActiveRecord::Base
belongs_to :author,
:class_name => "User"
- attr_protected :author, :author_id
+ attr_protected :author, :author_id
validates_presence_of :project
@@ -15,10 +15,10 @@ class Note < ActiveRecord::Base
:presence => true,
:length => { :within => 0..255 }
- validates :attachment,
- :file_size => {
- :maximum => 10.megabytes.to_i
- }
+ validates :attachment,
+ :file_size => {
+ :maximum => 10.megabytes.to_i
+ }
scope :common, where(:noteable_id => nil)
diff --git a/app/models/project.rb b/app/models/project.rb
index 5262e55245d5632dab222381c82480988e0febdb..ef7f4e4654e977fa074bdf88ee67622d63f438b7 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -20,7 +20,7 @@ class Project < ActiveRecord::Base
:format => { :with => /^[a-zA-Z0-9_\-]*$/,
:message => "only letters, digits & '_' '-' allowed" },
:length => { :within => 0..255 }
-
+
validates :description,
:length => { :within => 0..2000 }
@@ -57,13 +57,13 @@ class Project < ActiveRecord::Base
c.update_project(path, gitosis_writers)
end
end
-
+
def destroy_gitosis_project
Gitosis.new.configure do |c|
c.destroy_project(self)
end
end
-
+
def add_access(user, *access)
opts = { :user => user }
access.each { |name| opts.merge!(name => true) }
@@ -102,12 +102,12 @@ class Project < ActiveRecord::Base
def url_to_repo
"#{GITOSIS["git_user"]}@#{GITOSIS["host"]}:#{path}.git"
end
-
+
def path_to_repo
GITOSIS["base_path"] + path + ".git"
end
- def repo
+ def repo
@repo ||= Grit::Repo.new(path_to_repo)
end
@@ -122,17 +122,17 @@ class Project < ActiveRecord::Base
def commit(commit_id = nil)
if commit_id
repo.commits(commit_id).first
- else
+ else
repo.commits.first
end
end
- def heads
+ def heads
@heads ||= repo.heads
end
def fresh_commits
- commits = heads.map do |h|
+ commits = heads.map do |h|
repo.commits(h.name, 10)
end.flatten.uniq { |c| c.id }
@@ -144,7 +144,7 @@ class Project < ActiveRecord::Base
end
def commits_since(date)
- commits = heads.map do |h|
+ commits = heads.map do |h|
repo.log(h.name, nil, :since => date)
end.flatten.uniq { |c| c.id }
@@ -165,7 +165,7 @@ class Project < ActiveRecord::Base
unless owner.can_create_project?
errors[:base] << ("Your own projects limit is #{owner.projects_limit}! Please contact administrator to increase it")
end
- rescue
+ rescue
errors[:base] << ("Cant check your ability to create project")
end
diff --git a/app/models/snippet.rb b/app/models/snippet.rb
index 95d6a07d545e5071e19c6241ca21239d16fe453d..0f488a8c94af5638728abf4225abfa2018db3884 100644
--- a/app/models/snippet.rb
+++ b/app/models/snippet.rb
@@ -13,7 +13,7 @@ class Snippet < ActiveRecord::Base
validates :title,
:presence => true,
:length => { :within => 0..255 }
-
+
validates :file_name,
:presence => true,
:length => { :within => 0..255 }
@@ -22,9 +22,8 @@ class Snippet < ActiveRecord::Base
:presence => true,
:length => { :within => 0..10000 }
-
def self.content_types
- [
+ [
".rb", ".py", ".pl", ".scala", ".c", ".cpp", ".java",
".haml", ".html", ".sass", ".scss", ".xml", ".php", ".erb",
".js", ".sh", ".coffee", ".yml", ".md"
diff --git a/app/models/user.rb b/app/models/user.rb
index 7736599e7ebbb8b281cf208ece565e983b2d3841..c90cf49f63603a822ae5495e8aab10aa711d4688 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -5,7 +5,7 @@ class User < ActiveRecord::Base
:recoverable, :rememberable, :trackable, :validatable
# Setup accessible (or protected) attributes for your model
- attr_accessible :email, :password, :password_confirmation, :remember_me,
+ attr_accessible :email, :password, :password_confirmation, :remember_me,
:name, :projects_limit, :skype, :linkedin, :twitter
has_many :users_projects, :dependent => :destroy
diff --git a/app/views/admin/mailer/preview.html.haml b/app/views/admin/mailer/preview.html.haml
index 7b723cb8021effe5eb6481177cb6219abf828467..60e245884879790cccef16e50819ad6a62c1aef7 100644
--- a/app/views/admin/mailer/preview.html.haml
+++ b/app/views/admin/mailer/preview.html.haml
@@ -1,29 +1,28 @@
%p This is page with preview for all system emails that are sent to user
-%p Email previews built based on existing Project/Commit/Issue base - so some preview maybe unavailable unless object appear in system
+%p Email previews built based on existing Project/Commit/Issue base - so some preview maybe unavailable unless object appear in system
#accordion
%h3
%a New user
- %div
+ %div
%iframe{ :src=> admin_mailer_preview_user_new_path, :width=>"100%", :height=>"350"}
%h3
%a New issue
- %div
+ %div
%iframe{ :src=> admin_mailer_preview_issue_new_path, :width=>"100%", :height=>"350"}
- %h3
+ %h3
%a Commit note
%div
%iframe{ :src=> admin_mailer_preview_note_path(:type => "Commit"), :width=>"100%", :height=>"350"}
%h3
%a Issue note
- %div
+ %div
%iframe{ :src=> admin_mailer_preview_note_path(:type => "Issue"), :width=>"100%", :height=>"350"}
%h3
%a Wall note
- %div
+ %div
%iframe{ :src=> admin_mailer_preview_note_path(:type => "Wall"), :width=>"100%", :height=>"350"}
-
-:javascript
+:javascript
$(function() {
$( "#accordion" ).accordion(); });
diff --git a/app/views/admin/projects/show.html.haml b/app/views/admin/projects/show.html.haml
index 6891894122cfae5e41470a1833a977df324042c5..fc2e63241ae5d19466dc457465f1274751b2f1ec 100644
--- a/app/views/admin/projects/show.html.haml
+++ b/app/views/admin/projects/show.html.haml
@@ -1,7 +1,7 @@
%p#notice= notice
.span-8.colborder
- %h2= @admin_project.name
+ %h2= @admin_project.name
%p
%b Name:
@@ -22,16 +22,16 @@
.span-14
- %h2 Team
+ %h2 Team
%table.round-borders
%tr
%th Name
- %th Added
+ %th Added
%th Web
%th Git
%th Admin
- %th
+ %th
- @admin_project.users_projects.each do |tm|
%tr
diff --git a/app/views/admin/team_members/index.html.haml b/app/views/admin/team_members/index.html.haml
index bbd7a6c0af8453b3e39b18f0ce56cbaaf8314619..5aa4b5978785facc707885397b62a75d0086da6b 100644
--- a/app/views/admin/team_members/index.html.haml
+++ b/app/views/admin/team_members/index.html.haml
@@ -7,8 +7,8 @@
%th Read
%th Git
%th Manage
- %th Added
- %th
+ %th Added
+ %th
%th
%th
- members.each do |tm|
diff --git a/app/views/admin/team_members/show.html.haml b/app/views/admin/team_members/show.html.haml
index bd30c7b0e6cc537783599ff99f6ec18f9e2706f9..29d1160ce5f082b7a23e3ba2e8ba0da3e1d7049b 100644
--- a/app/views/admin/team_members/show.html.haml
+++ b/app/views/admin/team_members/show.html.haml
@@ -11,7 +11,6 @@
%b Since:
= @admin_team_member.updated_at
-
.span-10
.span-6
%b Access:
diff --git a/app/views/admin/users/_form.html.haml b/app/views/admin/users/_form.html.haml
index aa9df298e119885a9978a2bda4157898b29a489e..51b5d5c76ebe3c933f1bbc688b79c479127f1831 100644
--- a/app/views/admin/users/_form.html.haml
+++ b/app/views/admin/users/_form.html.haml
@@ -44,7 +44,7 @@
.field
= f.label :twitter
%br
- = f.text_field :twitter
+ = f.text_field :twitter
.clear
%br
.actions
diff --git a/app/views/admin/users/new.html.haml b/app/views/admin/users/new.html.haml
index cec6e3e188c3e44112c201cfdbf535299b86c1ef..b188d2ab320ec1edcbf06fa5fe9dee7b4a106c9b 100644
--- a/app/views/admin/users/new.html.haml
+++ b/app/views/admin/users/new.html.haml
@@ -2,5 +2,4 @@
= render 'form'
-
= link_to 'Back', admin_users_path, :class => "right lbutton"
diff --git a/app/views/admin/users/show.html.haml b/app/views/admin/users/show.html.haml
index aee73c38ee7dd66330b0b8860c00bf8151131b04..5bc5bf9ab83f82dd01ffd3be13be4027d29114d5 100644
--- a/app/views/admin/users/show.html.haml
+++ b/app/views/admin/users/show.html.haml
@@ -19,28 +19,27 @@
= @admin_user.skype
%p
%b LinkedIn:
- = @admin_user.linkedin
+ = @admin_user.linkedin
%p
%b Twitter:
= @admin_user.twitter
-
.clear
= link_to 'Edit', edit_admin_user_path(@admin_user)
\|
= link_to 'Back', admin_users_path
.span-14
- %h2 Projects
+ %h2 Projects
%table.round-borders
%tr
%th Name
- %th Added
+ %th Added
%th Web
%th Git
%th Admin
- %th
+ %th
- @admin_user.users_projects.each do |tm|
- project = tm.project
diff --git a/app/views/commits/_diff.html.haml b/app/views/commits/_diff.html.haml
index 2807e0903da96c1db296052109b5933cb9dbeec1..e385d9ddf3c4e8bf2286b18ae3fcb8861841ab1f 100644
--- a/app/views/commits/_diff.html.haml
+++ b/app/views/commits/_diff.html.haml
@@ -8,7 +8,7 @@
.diff_file_header
- if diff.deleted_file
%strong{:id => "#{diff.b_path}"}= diff.a_path
- - else
+ - else
= link_to tree_file_project_path(@project, @commit.id, diff.b_path) do
%strong{:id => "#{diff.b_path}"}= diff.b_path
%br/
@@ -19,5 +19,5 @@
.diff_file_content_image
%img{:src => "data:#{file.mime_type};base64,#{Base64.encode64(file.data)}"}
- else
- %p
+ %p
%center No preview for this file type
diff --git a/app/views/commits/_index.html.haml b/app/views/commits/_index.html.haml
index e4c9cc6e83c959926922b5c7e60d5b2021e44437..f1e4c7eb3f1f97cd6fff396b0b3165479edb6353 100644
--- a/app/views/commits/_index.html.haml
+++ b/app/views/commits/_index.html.haml
@@ -6,4 +6,4 @@
%h1 Listing commits
%div{:id => dom_id(@project)}
= render "commits"
-%br/
\ No newline at end of file
+%br/
diff --git a/app/views/commits/_text_file.html.haml b/app/views/commits/_text_file.html.haml
index 67033adea7e5e8f861206ff351e9e24a4b0ae189..db71c387ecdf5bff42ed6ad8fc0230070c8bf6f0 100644
--- a/app/views/commits/_text_file.html.haml
+++ b/app/views/commits/_text_file.html.haml
@@ -12,10 +12,10 @@
= diff_line(line, line_new, line_old)
- if line[0] == "+"
- line_new += 1
- - elsif
+ - elsif
- line[0] == "-"
- line_old += 1
- - else
+ - else
- line_new += 1
- line_old += 1
diff --git a/app/views/commits/show.js.haml b/app/views/commits/show.js.haml
index cec1fe28348dd094fea2c9ca17a9f8562e2ac9f8..9831bb29576d20e3d664ee3b9ce4c24e581cb417 100644
--- a/app/views/commits/show.js.haml
+++ b/app/views/commits/show.js.haml
@@ -4,5 +4,5 @@
side.html("#{escape_javascript(render "commits/show")}");
$("##{dom_id(@project)}").parent().append(side);
$("##{dom_id(@project)}").addClass("span-14");
-:plain
+:plain
$("#notes-list").html("#{escape_javascript(render(:partial => 'notes/notes_list'))}");
diff --git a/app/views/devise/confirmations/new.html.erb b/app/views/devise/confirmations/new.html.erb
index b7ae403caa5cf888b2a12b6644d8a78a0464b868..5399a9615707a71e3d96c2c6a9d0452c579a935f 100644
--- a/app/views/devise/confirmations/new.html.erb
+++ b/app/views/devise/confirmations/new.html.erb
@@ -9,4 +9,4 @@
<div><%= f.submit "Resend confirmation instructions" %></div>
<% end %>
-<%= render :partial => "devise/shared/links" %>
\ No newline at end of file
+<%= render :partial => "devise/shared/links" %>
diff --git a/app/views/devise/passwords/edit.html.erb b/app/views/devise/passwords/edit.html.erb
index e75c937101a36354d3b69be901bbba69fe077ad8..ff76588c144a3535028c1c06d75fb08388d047bc 100644
--- a/app/views/devise/passwords/edit.html.erb
+++ b/app/views/devise/passwords/edit.html.erb
@@ -13,4 +13,4 @@
<div><%= f.submit "Change my password" %></div>
<% end %>
-<%= render :partial => "devise/shared/links" %>
\ No newline at end of file
+<%= render :partial => "devise/shared/links" %>
diff --git a/app/views/devise/shared/_links.erb b/app/views/devise/shared/_links.erb
index eab783a4c92139721eea5eb82549a6c4594b4d0e..33b1120f992a25382ee825cd484f915cf7fae220 100644
--- a/app/views/devise/shared/_links.erb
+++ b/app/views/devise/shared/_links.erb
@@ -22,4 +22,4 @@
<%- resource_class.omniauth_providers.each do |provider| %>
<%= link_to "Sign in with #{provider.to_s.titleize}", omniauth_authorize_path(resource_name, provider) %><br />
<% end -%>
-<% end -%>
\ No newline at end of file
+<% end -%>
diff --git a/app/views/devise/unlocks/new.html.erb b/app/views/devise/unlocks/new.html.erb
index c6cdcfe51ce0f09982d55412f886322561a9107d..b787e648ca2ea82b13a99c9c91f9cb9d9bb3b64c 100644
--- a/app/views/devise/unlocks/new.html.erb
+++ b/app/views/devise/unlocks/new.html.erb
@@ -9,4 +9,4 @@
<div><%= f.submit "Resend unlock instructions" %></div>
<% end %>
-<%= render :partial => "devise/shared/links" %>
\ No newline at end of file
+<%= render :partial => "devise/shared/links" %>
diff --git a/app/views/issues/_issues.html.haml b/app/views/issues/_issues.html.haml
index 42e8371a0ba5621cd292d12abf255572b80b9814..11e4c38e088f2084c8eb26e5bf103d16a9ea3384 100644
--- a/app/views/issues/_issues.html.haml
+++ b/app/views/issues/_issues.html.haml
@@ -1,7 +1,7 @@
%table.round-borders#issues-table
%tr
- if can?(current_user, :admin_issue, @project) && !params[:f] || params[:f] == "0"
- %th
+ %th
%th Assignee
%th ID
%th Title
diff --git a/app/views/issues/_show.html.haml b/app/views/issues/_show.html.haml
index fcac006e81c4829399a82c8fa982c9cab47c0c9c..afcd2b6e7c569cc8fff1aeb2d6248c3496bf40d5 100644
--- a/app/views/issues/_show.html.haml
+++ b/app/views/issues/_show.html.haml
@@ -21,10 +21,10 @@
-#notes
%td
- if can? current_user, :write_issue, @project
- = form_for([@project, issue], :remote => true) do |f|
+ = form_for([@project, issue], :remote => true) do |f|
= f.check_box :closed, :onclick => "$(this).parent().submit();"
= hidden_field_tag :status_only, true
- - else
+ - else
= check_box_tag "closed", 1, issue.closed, :disabled => true
%td
- if can?(current_user, :admin_issue, @project) || issue.author == current_user
diff --git a/app/views/issues/index.html.haml b/app/views/issues/index.html.haml
index 6f4548a806644bc7c602a3eceacd6f1315cd3412..46a15ef169d44c4b4811beb82b3ea8d0c0f903d2 100644
--- a/app/views/issues/index.html.haml
+++ b/app/views/issues/index.html.haml
@@ -12,7 +12,7 @@
.span-2
= radio_button_tag :f, 3, params[:f] == "3", :onclick => "this.form.submit()", :id => "my_issues"
= label_tag "my_issues","To Me"
-
+
.span-2
= radio_button_tag :f, 1, params[:f] == "1", :onclick => "this.form.submit()", :id => "all_issues"
= label_tag "all_issues","All"
@@ -20,9 +20,9 @@
#issues-table-holder= render "issues"
%br
:javascript
- $('.delete-issue').live('ajax:success', function() {
- $(this).closest('tr').fadeOut(); });
-
+ $('.delete-issue').live('ajax:success', function() {
+ $(this).closest('tr').fadeOut(); });
+
function setSortable(){
$('#issues-table>tbody').sortable({
axis: 'y',
diff --git a/app/views/issues/show.html.haml b/app/views/issues/show.html.haml
index 199c80c86173ab5736276540d1ff8a348aaa9fc2..29b6f3f7b84f5baf6e5639e8305f910c99e766ea 100644
--- a/app/views/issues/show.html.haml
+++ b/app/views/issues/show.html.haml
@@ -8,24 +8,24 @@
.span-8
- if @issue.closed
%center.success Closed
- - else
+ - else
%center.error Open
%table.round-borders
%tr
- %td Title:
+ %td Title:
%td
= truncate html_escape(@issue.title)
%tr
- %td Project
+ %td Project
%td
%strong= @issue.project.name
%tr
- %td Author:
+ %td Author:
%td
= image_tag gravatar_icon(@issue.author.email), :class => "left", :width => 40, :style => "padding:0 5px;"
= @issue.author.name
%tr
- %td Assignee:
+ %td Assignee:
%td
= image_tag gravatar_icon(@issue.assignee.email), :class => "left", :width => 40, :style => "padding:0 5px;"
= @issue.assignee.name
@@ -33,12 +33,11 @@
%td Closed?
%td
- if can? current_user, :write_issue, @project
- = form_for([@project, @issue]) do |f|
+ = form_for([@project, @issue]) do |f|
= f.check_box :closed, :onclick => "$(this).parent().submit();"
= hidden_field_tag :status_only, true
- - else
+ - else
= check_box_tag "closed", 1, @issue.closed, :disabled => true
-
.clear
diff --git a/app/views/issues/show.js.haml b/app/views/issues/show.js.haml
index 5b9a34c0a9c94a1a5e44a13cef676ad11eb3073a..ae2ff32cc6c819f682ace0fa81406b74bd5738dc 100644
--- a/app/views/issues/show.js.haml
+++ b/app/views/issues/show.js.haml
@@ -1,2 +1,2 @@
-:plain
+:plain
$("#notes-list").html("#{escape_javascript(render(:partial => 'notes/notes_list'))}");
diff --git a/app/views/issues/update.js.haml b/app/views/issues/update.js.haml
index c365c3f5d55d9dc43711465433aa5a6bf8e0ae3d..30fca38c38eea2ebbd01305371d4bbc7e17e9e27 100644
--- a/app/views/issues/update.js.haml
+++ b/app/views/issues/update.js.haml
@@ -2,7 +2,7 @@
- if @issue.valid?
:plain
$("##{dom_id(@issue)}").fadeOut();
-- else
+- else
- if @issue.valid?
:plain
$("#edit_issue_dialog").dialog("close");
diff --git a/app/views/keys/index.html.haml b/app/views/keys/index.html.haml
index 416ae8f8f95c523a78a3a6164a43550fc9f2511b..279b125f53c68e7680500f38f543dedfec85017d 100644
--- a/app/views/keys/index.html.haml
+++ b/app/views/keys/index.html.haml
@@ -10,6 +10,6 @@
= render(:partial => 'show', :locals => {:key => key})
:javascript
- $('.delete-key').live('ajax:success', function() {
- $(this).closest('tr').fadeOut(); });
+ $('.delete-key').live('ajax:success', function() {
+ $(this).closest('tr').fadeOut(); });
diff --git a/app/views/layouts/_flash.html.haml b/app/views/layouts/_flash.html.haml
index 4b6eb2b500edc309de233950f4e5e3082493d373..4011485c55dd0c1d4ff4c6cf06e45bc52dcda791 100644
--- a/app/views/layouts/_flash.html.haml
+++ b/app/views/layouts/_flash.html.haml
@@ -6,9 +6,9 @@
%h4= text
:javascript
$(function(){
- $("#flash_container").slideDown("slow");
- $("#flash_container").click(function(){
- $(this).slideUp("slow");
+ $("#flash_container").slideDown("slow");
+ $("#flash_container").click(function(){
+ $(this).slideUp("slow");
});
setTimeout("hideFlash()",2000);
});
diff --git a/app/views/layouts/_head_panel.html.erb b/app/views/layouts/_head_panel.html.erb
index 047f708b6df64ab77613cfb027752f2340d0b3f7..07de8de4c2abb0e57e1711e4a9f4cdd6b8df4329 100644
--- a/app/views/layouts/_head_panel.html.erb
+++ b/app/views/layouts/_head_panel.html.erb
@@ -22,7 +22,6 @@
</div>
</div>
-
<% if current_user %>
<%= javascript_tag do %>
$(function() {
diff --git a/app/views/notes/_form.html.haml b/app/views/notes/_form.html.haml
index ca56a2450a0a4a5625bcd95fa09c261dd4f8aa5b..14e74fa694f20f65e25bb6cafa8069ce65d56b5a 100644
--- a/app/views/notes/_form.html.haml
+++ b/app/views/notes/_form.html.haml
@@ -22,7 +22,7 @@
= check_box_tag :notify, 1, true
= label_tag :notify, "Notify project team about your note"
-
+
.clear
%br
= f.submit 'Add note', :class => "lbutton vm", :id => "submit_note"
diff --git a/app/views/notes/_notes.html.haml b/app/views/notes/_notes.html.haml
index 2d110162eca199c60e04f9c063b0c24e0c59f5a4..e7cc23607585ffe4c0076d0fc672a2e9a15a8cb4 100644
--- a/app/views/notes/_notes.html.haml
+++ b/app/views/notes/_notes.html.haml
@@ -1,7 +1,7 @@
- if controller.action_name == "wall"
%ul#notes-list= render "notes/notes_list"
-- else
+- else
%ul#notes-list= render "notes/notes_list"
%br
%br
@@ -9,17 +9,16 @@
= render "notes/form"
:javascript
- $('.delete-note').live('ajax:success', function() {
- $(this).closest('li').fadeOut(); });
+ $('.delete-note').live('ajax:success', function() {
+ $(this).closest('li').fadeOut(); });
$("#new_note").live("ajax:before", function(){
- $("#submit_note").attr("disabled", "disabled");
+ $("#submit_note").attr("disabled", "disabled");
})
$("#new_note").live("ajax:complete", function(){
- $("#submit_note").removeAttr("disabled");
+ $("#submit_note").removeAttr("disabled");
})
-
- if ["issues", "projects"].include?(controller.controller_name)
:javascript
diff --git a/app/views/notes/create.js.haml b/app/views/notes/create.js.haml
index 15371dbce2b0dc3a9a0bd6733206b107c7de6db1..a04130e8a750d72e157599839809d76d76d86c23 100644
--- a/app/views/notes/create.js.haml
+++ b/app/views/notes/create.js.haml
@@ -7,5 +7,5 @@
:plain
$("#new_note").replaceWith("#{escape_javascript(render('form'))}");
-:plain
+:plain
$("#submit_note").removeAttr("disabled");
diff --git a/app/views/notify/new_issue_email.html.haml b/app/views/notify/new_issue_email.html.haml
index 213a73796cfb6d4de69e87defbc830f1cb22c9c7..1a5a603a590a0c4afd1692946f7913a2e5b43cd8 100644
--- a/app/views/notify/new_issue_email.html.haml
+++ b/app/views/notify/new_issue_email.html.haml
@@ -10,9 +10,9 @@
%td{:style => "font-size: 1px; line-height: 1px;", :width => "21"}
%td{:align => "left", :style => "padding: 20px 0 0;"}
%h2{:style => "color:#646464 !important; font-weight: bold; margin: 0; padding: 0; line-height: 26px; font-size: 18px; font-family: Helvetica, Arial, sans-serif; "}
- = link_to project_issue_url(@project, @issue) do
+ = link_to project_issue_url(@project, @issue) do
= "Issue ##{@issue.id.to_s}"
- = truncate(@issue.title, :length => 45)
+ = truncate(@issue.title, :length => 45)
%br
%cite{:style => "color:#767676; font-weight: normal; margin: 0; padding: 0; line-height: 20px; font-size: 12px;font-family: Helvetica, Arial, sans-serif; "}
= @issue.content
diff --git a/app/views/notify/new_user_email.html.haml b/app/views/notify/new_user_email.html.haml
index 969ea7e5298df618a3399b0323e10e82dca6de4f..2d3abf2e55dc525cc541cb78b5782a4d3e6edeec 100644
--- a/app/views/notify/new_user_email.html.haml
+++ b/app/views/notify/new_user_email.html.haml
@@ -4,7 +4,7 @@
%td{:style => "font-size: 1px; line-height: 1px;", :width => "21"}
%td{:align => "left", :style => "padding: 20px 0 0;"}
%h2{:style => "color:#646464; font-weight: bold; margin: 0; padding: 0; line-height: 26px; font-size: 18px; font-family: Helvetica, Arial, sans-serif; "}
- Hi #{@user.name}!
+ Hi #{@user.name}!
%p{:style => "color:#767676; font-weight: normal; margin: 0; padding: 0; line-height: 20px; font-size: 12px;font-family: Helvetica, Arial, sans-serif; "}
Administrator created account for you. Now you are a member of company gitlab application.
%td{:style => "font-size: 1px; line-height: 1px;", :width => "21"}
diff --git a/app/views/notify/note_issue_email.html.haml b/app/views/notify/note_issue_email.html.haml
index 242c97bf25f3f9968a93cd789b55c8575f878f51..7d8e215609eba327e792a9745513e925f4702d2a 100644
--- a/app/views/notify/note_issue_email.html.haml
+++ b/app/views/notify/note_issue_email.html.haml
@@ -4,10 +4,10 @@
%td{:style => "font-size: 1px; line-height: 1px;", :width => "21"}
%td{:align => "left", :style => "padding: 20px 0 0;"}
%h2{:style => "color:#646464 !important; font-weight: bold; margin: 0; padding: 0; line-height: 26px; font-size: 18px; font-family: Helvetica, Arial, sans-serif; "}
- New comment -
- = link_to project_issue_url(@project, @issue, :anchor => "note_#{@note.id}") do
+ New comment -
+ = link_to project_issue_url(@project, @issue, :anchor => "note_#{@note.id}") do
= "Issue ##{@issue.id.to_s}"
- = truncate(@issue.title, :length => 35)
+ = truncate(@issue.title, :length => 35)
%td{:style => "font-size: 1px; line-height: 1px;", :width => "21"}
%tr
%td{:style => "font-size: 1px; line-height: 1px;", :width => "21"}
diff --git a/app/views/notify/note_wall_email.html.haml b/app/views/notify/note_wall_email.html.haml
index c9fdae126777663571884761c8467c5b79c67bfc..a2bd5a7660165f137790a638b25c8cf342a22f26 100644
--- a/app/views/notify/note_wall_email.html.haml
+++ b/app/views/notify/note_wall_email.html.haml
@@ -4,7 +4,7 @@
%td{:style => "font-size: 1px; line-height: 1px;", :width => "21"}
%td{:align => "left", :style => "padding: 20px 0 0;"}
%h2{:style => "color:#646464; font-weight: bold; margin: 0; padding: 0; line-height: 26px; font-size: 18px; font-family: Helvetica, Arial, sans-serif; "}
- New message on
+ New message on
= link_to "Project Wall", wall_project_url(@project, :anchor => "note_#{@note.id}")
%td{:style => "font-size: 1px; line-height: 1px;", :width => "21"}
%tr
diff --git a/app/views/projects/_form.html.haml b/app/views/projects/_form.html.haml
index 00ca98efa08482be9f0f74655bde61a27ea3ad07..164f1d45f3253e3fe2418b481f317dafc3af9110 100644
--- a/app/views/projects/_form.html.haml
+++ b/app/views/projects/_form.html.haml
@@ -21,7 +21,7 @@
%td
= f.text_field :path, :placeholder => "example_project", :disabled => !@project.new_record?
%tr
- %td
+ %td
.left= f.label :code
%cite.right http://yourserver/
%td= f.text_field :code, :placeholder => "example"
@@ -39,10 +39,10 @@
= image_tag "ajax-loader.gif", :class => "append-bottom"
- if @project.new_record?
%h3.prepend-top Creating project & repository. Please wait for few minutes
- - else
+ - else
%h3.prepend-top Updating project & repository. Please wait for few minutes
:javascript
- $('.new_project, .edit_project').bind('ajax:before', function() {
- $(this).find(".form_content").hide();
+ $('.new_project, .edit_project').bind('ajax:before', function() {
+ $(this).find(".form_content").hide();
$('.ajax_loader').show();
- });
+ });
diff --git a/app/views/projects/_list.html.haml b/app/views/projects/_list.html.haml
index aec61ffbbe1c88b8a9ca94b8efbdfce4116b1c16..65f0b7fd5b5d4edcaf0cbfb96295c4c1da015c15 100644
--- a/app/views/projects/_list.html.haml
+++ b/app/views/projects/_list.html.haml
@@ -16,7 +16,7 @@
%td= check_box_tag "read", 1, project.readers.include?(current_user), :disabled => :disabled
%td= check_box_tag "commit", 1, project.writers.include?(current_user), :disabled => :disabled
%td= check_box_tag "admin", 1, project.admins.include?(current_user), :disabled => :disabled
- %td
+ %td
-if can? current_user, :admin_project, project
= link_to 'Edit', edit_project_path(project), :class => "lbutton positive"
%br
diff --git a/app/views/projects/_projects_top_menu.html.haml b/app/views/projects/_projects_top_menu.html.haml
index f80f28a8bbbb693432f88a181fe70ab545a26ea8..9e199183b15ac3539ed7e4d2e8e63c7cc9aa8b17 100644
--- a/app/views/projects/_projects_top_menu.html.haml
+++ b/app/views/projects/_projects_top_menu.html.haml
@@ -11,7 +11,7 @@
$(".list").toggle();
if($(".tile").is(":visible")){
$.cookie('project_view', 'tile', { expires: 14 });
- } else {
+ } else {
$.cookie('project_view', 'list', { expires: 14 });
}
}
diff --git a/app/views/projects/_recent_commits.html.haml b/app/views/projects/_recent_commits.html.haml
index 3157c3568625ff19659f73a46daae36a790d860b..b34470d674152fba5004ca7d72716060b5bbedd1 100644
--- a/app/views/projects/_recent_commits.html.haml
+++ b/app/views/projects/_recent_commits.html.haml
@@ -6,8 +6,8 @@
= image_tag "no_avatar.png", :class => "left", :width => 40, :style => "padding-right:5px;"
%p{:style => "margin-bottom: 3px;"}
%strong
- = link_to truncate(commit.safe_message, :length => 60), project_commit_path(@project, :id => commit.id)
-
+ = link_to truncate(commit.safe_message, :length => 60), project_commit_path(@project, :id => commit.id)
+
%span
%span.author
= commit.author.name.force_encoding("UTF-8")
diff --git a/app/views/projects/_team.html.haml b/app/views/projects/_team.html.haml
index bb9063369c3b2b905c211dc5361ac5d50e4d598e..4001c7a255c7fbb87f64782a147dfb1192a00828 100644
--- a/app/views/projects/_team.html.haml
+++ b/app/views/projects/_team.html.haml
@@ -14,5 +14,5 @@
= render(:partial => 'team_members/show', :locals => {:member => up})
:javascript
- $('.delete-team-member').live('ajax:success', function() {
- $(this).closest('tr').fadeOut(); });
+ $('.delete-team-member').live('ajax:success', function() {
+ $(this).closest('tr').fadeOut(); });
diff --git a/app/views/projects/empty.html.erb b/app/views/projects/empty.html.erb
index 4c60facde8ceed8ed0df97fc7da92693c662b353..ffc1ebfa2811ff15c59eafb5ceb0b0d28a17725b 100644
--- a/app/views/projects/empty.html.erb
+++ b/app/views/projects/empty.html.erb
@@ -40,7 +40,7 @@ eos
<p>
Be careful! <br/>
Project cant be recovered after destroy.</p>
- <%= link_to 'Destroy', @project,
+ <%= link_to 'Destroy', @project,
:confirm => 'Are you sure?', :method => :delete,
:class => "left button negative span-6", :style => "text-align:center" %>
<div class="clear"></div>
diff --git a/app/views/projects/index.html.haml b/app/views/projects/index.html.haml
index 888a72b6811c75f90b564841500ada11111f0753..4b9457c161c79f9b98a5e12e06a2d209e2ecd76f 100644
--- a/app/views/projects/index.html.haml
+++ b/app/views/projects/index.html.haml
@@ -3,7 +3,7 @@
= render "tile"
%div{:class => "list", :style => view_mode_style("list")}
= render "list"
-- else
+- else
%center.prepend-top
%h2
%cite Nothing here
diff --git a/app/views/projects/tree.js.haml b/app/views/projects/tree.js.haml
index 60cbd1991658fb4dc6f066f832036943b9e2e887..eb08adb1ddd444bede6eb1238865fc310d1172b6 100644
--- a/app/views/projects/tree.js.haml
+++ b/app/views/projects/tree.js.haml
@@ -1,5 +1,5 @@
:plain
- $("#tree-holder table").hide("slide", { direction: "left" }, 150, function(){
+ $("#tree-holder table").hide("slide", { direction: "left" }, 150, function(){
$("#tree-holder").html("#{escape_javascript(render(:partial => "tree", :locals => {:repo => @repo, :commit => @commit, :tree => @tree}))}");
$("#tree-holder table").show("slide", { direction: "right" }, 150);
});
diff --git a/app/views/projects/wall.html.haml b/app/views/projects/wall.html.haml
index ed22478c9243c0e2c9a62ad29dd05ad690466764..63c9613a852c8973162152034523f1f49f9311de 100644
--- a/app/views/projects/wall.html.haml
+++ b/app/views/projects/wall.html.haml
@@ -20,7 +20,7 @@
%hr
= render "notes/notes"
-:javascript
+:javascript
$(function(){
$("#note_note").live("click", function(){
$(this).css("height", "100px");
diff --git a/app/views/projects/wall.js.haml b/app/views/projects/wall.js.haml
index 5b9a34c0a9c94a1a5e44a13cef676ad11eb3073a..ae2ff32cc6c819f682ace0fa81406b74bd5738dc 100644
--- a/app/views/projects/wall.js.haml
+++ b/app/views/projects/wall.js.haml
@@ -1,2 +1,2 @@
-:plain
+:plain
$("#notes-list").html("#{escape_javascript(render(:partial => 'notes/notes_list'))}");
diff --git a/app/views/snippets/_form.html.haml b/app/views/snippets/_form.html.haml
index 571e2b063c121a142a0e12fe8d6f1035c4175cb8..7a34ae8e03f26d3d7f9fa8eeffdf383935475ee8 100644
--- a/app/views/snippets/_form.html.haml
+++ b/app/views/snippets/_form.html.haml
@@ -17,6 +17,6 @@
= f.label :content, "Code"
%br
= f.text_area :content, :style => "height:240px;width:932px;"
-
+
.actions.prepend-top
= f.submit 'Save', :class => "lbutton vm"
diff --git a/app/views/snippets/index.html.haml b/app/views/snippets/index.html.haml
index 6e5dbde5bb1b7e4b57bb34c016757f667d58a44d..fe5e617044b0a4aaf315a4ace22852134f7f5af3 100644
--- a/app/views/snippets/index.html.haml
+++ b/app/views/snippets/index.html.haml
@@ -10,5 +10,5 @@
%th
= render @snippets
:javascript
- $('.delete-snippet').live('ajax:success', function() {
- $(this).closest('tr').fadeOut(); });
+ $('.delete-snippet').live('ajax:success', function() {
+ $(this).closest('tr').fadeOut(); });
diff --git a/app/views/team_members/_show.html.haml b/app/views/team_members/_show.html.haml
index b9a68e6cfb0b1cee8c979148809c369c25b009f8..88260cca5378f0d1aaf29c2339ade6170c21fae3 100644
--- a/app/views/team_members/_show.html.haml
+++ b/app/views/team_members/_show.html.haml
@@ -7,11 +7,11 @@
%td= truncate user.email, :lenght => 16
- if can? current_user, :admin_project, @project
- = form_for(member, :as => :team_member, :url => project_team_member_path(@project, member)) do |f|
+ = form_for(member, :as => :team_member, :url => project_team_member_path(@project, member)) do |f|
%td= f.check_box :read, :onclick => "$(this.form).submit();"
%td= f.check_box :write, :onclick => "$(this.form).submit();"
%td= f.check_box :admin, :onclick => "$(this.form).submit();"
- - else
+ - else
%td= check_box_tag "read", 1, member.read, :disabled => :disabled
%td= check_box_tag "commit", 1, member.write, :disabled => :disabled
%td= check_box_tag "admin", 1, member.admin, :disabled => :disabled
diff --git a/app/views/team_members/show.html.haml b/app/views/team_members/show.html.haml
index d07c54f8b6881792f16496853a84e2579a0a8f6d..4a093ee1d5b1b27a7fe08e1f2da31db0694c6a34 100644
--- a/app/views/team_members/show.html.haml
+++ b/app/views/team_members/show.html.haml
@@ -25,4 +25,3 @@
%b Twitter:
= user.twitter
-
diff --git a/config/environments/production.rb b/config/environments/production.rb
index 7ebe45239678dfc5700540ea4c50bfda98c4cbda..d8094817c04c1945a43975632e894da08b83d4d7 100644
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -58,7 +58,6 @@ Gitlab::Application.configure do
# Send deprecation notices to registered listeners
config.active_support.deprecation = :notify
-
config.action_mailer.delivery_method = :sendmail
# Defaults to:
# # config.action_mailer.sendmail_settings = {
diff --git a/config/initializers/grit_ext.rb b/config/initializers/grit_ext.rb
index 9231da6ff9b68f9ab5733fe1ed16e6ada46a8378..1a7e6361c01787ffa6f093a72e8668ddfb87799a 100644
--- a/config/initializers/grit_ext.rb
+++ b/config/initializers/grit_ext.rb
@@ -7,6 +7,6 @@ Grit::Blob.class_eval do
include Utils::Colorize
end
-Grit::Commit.class_eval do
+Grit::Commit.class_eval do
include CommitExt
end
diff --git a/config/routes.rb b/config/routes.rb
index 8a40a8fef898c9a3a1b0abd5c83cde59a2ad6a34..21a0729c33d0caf53a229be246ddf7f0c9e24248 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -1,5 +1,5 @@
Gitlab::Application.routes.draw do
- namespace :admin do
+ namespace :admin do
resources :users
resources :projects
resources :team_members
@@ -10,7 +10,7 @@ Gitlab::Application.routes.draw do
root :to => "users#index"
end
- get "errors/gitosis"
+ get "errors/gitosis"
get "profile/password", :to => "profile#password"
put "profile/password", :to => "profile#password_update"
put "profile/edit", :to => "profile#social_update"
@@ -21,8 +21,8 @@ Gitlab::Application.routes.draw do
resources :keys
devise_for :users
- resources :projects, :except => [:new, :create, :index], :path => "/" do
- member do
+ resources :projects, :except => [:new, :create, :index], :path => "/" do
+ member do
get "tree"
get "blob"
get "team"
@@ -32,7 +32,7 @@ Gitlab::Application.routes.draw do
get "tree/:commit_id" => "projects#tree"
get "tree/:commit_id/:path" => "projects#tree",
:as => :tree_file,
- :constraints => {
+ :constraints => {
:id => /[a-zA-Z0-9_\-]+/,
:commit_id => /[a-zA-Z0-9]+/,
:path => /.*/
diff --git a/db/migrate/20110913200833_devise_create_users.rb b/db/migrate/20110913200833_devise_create_users.rb
index 3083e742459bc2525c0c5dafadf42b83684e1654..01869a9e21cca32dbfc518e367ce8798548b576f 100644
--- a/db/migrate/20110913200833_devise_create_users.rb
+++ b/db/migrate/20110913200833_devise_create_users.rb
@@ -11,7 +11,6 @@ class DeviseCreateUsers < ActiveRecord::Migration
# t.lockable :lock_strategy => :failed_attempts, :unlock_strategy => :both
# t.token_authenticatable
-
t.timestamps
end
diff --git a/lib/color.rb b/lib/color.rb
index 23feecf4071857046f3a37129c325ba98888e55a..4eabe249c180bf879661976cf3e2bd4373432713 100644
--- a/lib/color.rb
+++ b/lib/color.rb
@@ -17,7 +17,7 @@ module Color
def command(string)
`#{string}`
- if $?.to_i > 0
+ if $?.to_i > 0
puts red " == #{string} - FAIL"
puts red " == Error during configure"
exit
diff --git a/lib/commit_ext.rb b/lib/commit_ext.rb
index e09dbdaf8ef042595a99ba72cd2b78d1b40057c4..411809f05edcea0b694076c9a66a21b236754018 100644
--- a/lib/commit_ext.rb
+++ b/lib/commit_ext.rb
@@ -1,11 +1,11 @@
module CommitExt
def safe_message
- message.encode("UTF-8",
- :invalid => :replace,
- :undef => :replace,
+ message.encode("UTF-8",
+ :invalid => :replace,
+ :undef => :replace,
:universal_newline => true,
:replace => "")
- rescue
+ rescue
"-- invalid encoding for commit message"
end
end
diff --git a/lib/file_size_validator.rb b/lib/file_size_validator.rb
index 151e0ce53c00c0c91c499c294a3f2ca94f95529f..611e584f14f58e998019ee6e832139df79ac9e7d 100644
--- a/lib/file_size_validator.rb
+++ b/lib/file_size_validator.rb
@@ -33,7 +33,7 @@ class FileSizeValidator < ActiveModel::EachValidator
def validate_each(record, attribute, value)
raise(ArgumentError, "A CarrierWave::Uploader::Base object was expected") unless value.kind_of? CarrierWave::Uploader::Base
-
+
value = (options[:tokenizer] || DEFAULT_TOKENIZER).call(value) if value.kind_of?(String)
CHECKS.each do |key, validity_check|
@@ -53,7 +53,7 @@ class FileSizeValidator < ActiveModel::EachValidator
record.errors.add(attribute, MESSAGES[key], errors_options)
end
end
-
+
def help
Helper.instance
end
diff --git a/lib/utils.rb b/lib/utils.rb
index e57121a3e2a8004c9d16bbc0da62fb22fb5d01c9..f43e2edd2077e27f038daeec8aa0fff3820e0220 100644
--- a/lib/utils.rb
+++ b/lib/utils.rb
@@ -1,8 +1,8 @@
module Utils
module FileHelper
- def binary?(string)
+ def binary?(string)
string.each_byte do |x|
- x.nonzero? or return true
+ x.nonzero? or return true
end
false
end
diff --git a/public/index.html.example b/public/index.html.example
index 9d9811a5bf44a9cce3c5d0f3a8b43675e2f9ee18..16248edab52dd5d4577ca09ce8919f1cc81a8cce 100644
--- a/public/index.html.example
+++ b/public/index.html.example
@@ -25,7 +25,6 @@
text-decoration: none;
}
-
#page {
background-color: #f0f0f0;
width: 750px;
@@ -57,7 +56,6 @@
padding-right: 30px;
}
-
#header {
background-image: url("/assets/rails.png");
background-repeat: no-repeat;
@@ -71,7 +69,6 @@
font-size: 16px;
}
-
#about h3 {
margin: 0;
margin-bottom: 10px;
@@ -112,7 +109,6 @@
padding: 10px;
}
-
#getting-started {
border-top: 1px solid #ccc;
margin-top: 25px;
@@ -149,7 +145,6 @@
font-size: 13px;
}
-
#sidebar ul {
margin-left: 0;
padding-left: 0;
diff --git a/spec/factory.rb b/spec/factory.rb
index 29e552b1474803e72cee701319e7c04dad990f57..5edef358abcce60d178fa240dd48a270a093e08a 100644
--- a/spec/factory.rb
+++ b/spec/factory.rb
@@ -1,7 +1,7 @@
class Factory
@factories = {}
- class << self
+ class << self
def add(name, klass, &block)
@factories[name] = [klass, block]
end
@@ -13,10 +13,10 @@ class Factory
def new(name, opts)
factory = @factories[name]
factory[0].new.tap do |obj|
- factory[1].call(obj)
+ factory[1].call(obj)
end.tap do |obj|
opts.each do |k, opt|
- obj.send("#{k}=", opt)
+ obj.send("#{k}=", opt)
end
end
end
diff --git a/spec/models/issue_spec.rb b/spec/models/issue_spec.rb
index b2d594c904df81b41ce17bde969e972b090e67a4..e0559ab66638b46e4b276923fd06fb10e3aa8d0f 100644
--- a/spec/models/issue_spec.rb
+++ b/spec/models/issue_spec.rb
@@ -14,7 +14,7 @@ describe Issue do
it { should validate_presence_of(:assignee_id) }
end
- describe "Scope" do
+ describe "Scope" do
it { Issue.should respond_to :closed }
it { Issue.should respond_to :opened }
end
diff --git a/spec/models/key_spec.rb b/spec/models/key_spec.rb
index 8515f19b2f29c671799aa83cd37e7075d4309ebc..6522b825e146a82993b425b79c822273983daea0 100644
--- a/spec/models/key_spec.rb
+++ b/spec/models/key_spec.rb
@@ -10,7 +10,7 @@ describe Key do
it { should validate_presence_of(:key) }
end
- describe "Methods" do
+ describe "Methods" do
it { should respond_to :projects }
end
diff --git a/spec/models/note_spec.rb b/spec/models/note_spec.rb
index 20bd41adc29606a15d47452f1bdcb487f5a53338..5b16ad3682c5b7b04e39e86c1dbf07b7c96b11c5 100644
--- a/spec/models/note_spec.rb
+++ b/spec/models/note_spec.rb
@@ -13,8 +13,8 @@ describe Note do
it { Factory.create(:note,
:project => Factory.create(:project)).should be_valid }
- describe :authorization do
- before do
+ describe :authorization do
+ before do
@p1 = Factory :project
@p2 = Factory :project, :code => "alien", :path => "legit_1"
@u1 = Factory :user
@@ -24,10 +24,10 @@ describe Note do
@abilities << Ability
end
- describe :read do
- before do
- @p1.users_projects.create(:user => @u1, :read => false)
- @p1.users_projects.create(:user => @u2, :read => true)
+ describe :read do
+ before do
+ @p1.users_projects.create(:user => @u1, :read => false)
+ @p1.users_projects.create(:user => @u2, :read => true)
@p2.users_projects.create(:user => @u3, :read => true)
end
@@ -36,11 +36,11 @@ describe Note do
it { @abilities.allowed?(@u3, :read_note, @p1).should be_false }
end
- describe :write do
- before do
- @p1.users_projects.create(:user => @u1, :write => false)
- @p1.users_projects.create(:user => @u2, :write => true)
- @p2.users_projects.create(:user => @u3, :write => true)
+ describe :write do
+ before do
+ @p1.users_projects.create(:user => @u1, :write => false)
+ @p1.users_projects.create(:user => @u2, :write => true)
+ @p2.users_projects.create(:user => @u3, :write => true)
end
it { @abilities.allowed?(@u1, :write_note, @p1).should be_false }
@@ -48,11 +48,11 @@ describe Note do
it { @abilities.allowed?(@u3, :write_note, @p1).should be_false }
end
- describe :admin do
- before do
- @p1.users_projects.create(:user => @u1, :admin => false)
- @p1.users_projects.create(:user => @u2, :admin => true)
- @p2.users_projects.create(:user => @u3, :admin => true)
+ describe :admin do
+ before do
+ @p1.users_projects.create(:user => @u1, :admin => false)
+ @p1.users_projects.create(:user => @u2, :admin => true)
+ @p2.users_projects.create(:user => @u3, :admin => true)
end
it { @abilities.allowed?(@u1, :admin_note, @p1).should be_false }
diff --git a/spec/models/project_security_spec.rb b/spec/models/project_security_spec.rb
index 8eb8ee80f6c4d7125dacbf892306e3213979af8f..f80294639f9acc0ae21bdb75960b5c38e19c56f6 100644
--- a/spec/models/project_security_spec.rb
+++ b/spec/models/project_security_spec.rb
@@ -1,8 +1,8 @@
require 'spec_helper'
describe Project do
- describe :authorization do
- before do
+ describe :authorization do
+ before do
@p1 = Factory :project
@u1 = Factory :user
@u2 = Factory :user
@@ -10,30 +10,30 @@ describe Project do
@abilities << Ability
end
- describe :read do
- before do
- @p1.users_projects.create(:project => @p1, :user => @u1, :read => false)
- @p1.users_projects.create(:project => @p1, :user => @u2, :read => true)
+ describe :read do
+ before do
+ @p1.users_projects.create(:project => @p1, :user => @u1, :read => false)
+ @p1.users_projects.create(:project => @p1, :user => @u2, :read => true)
end
it { @abilities.allowed?(@u1, :read_project, @p1).should be_false }
it { @abilities.allowed?(@u2, :read_project, @p1).should be_true }
end
- describe :write do
- before do
- @p1.users_projects.create(:project => @p1, :user => @u1, :write => false)
- @p1.users_projects.create(:project => @p1, :user => @u2, :write => true)
+ describe :write do
+ before do
+ @p1.users_projects.create(:project => @p1, :user => @u1, :write => false)
+ @p1.users_projects.create(:project => @p1, :user => @u2, :write => true)
end
it { @abilities.allowed?(@u1, :write_project, @p1).should be_false }
it { @abilities.allowed?(@u2, :write_project, @p1).should be_true }
end
- describe :admin do
- before do
- @p1.users_projects.create(:project => @p1, :user => @u1, :admin => false)
- @p1.users_projects.create(:project => @p1, :user => @u2, :admin => true)
+ describe :admin do
+ before do
+ @p1.users_projects.create(:project => @p1, :user => @u1, :admin => false)
+ @p1.users_projects.create(:project => @p1, :user => @u2, :admin => true)
end
it { @abilities.allowed?(@u1, :admin_project, @p1).should be_false }
diff --git a/spec/models/project_spec.rb b/spec/models/project_spec.rb
index 0c62743d8e8c23d7ddc5aad68d125433c27227c4..7bce57e8bb11cff27031d160e6bb15454cd6461e 100644
--- a/spec/models/project_spec.rb
+++ b/spec/models/project_spec.rb
@@ -40,20 +40,20 @@ describe Project do
should_not allow_value("gitosis-admin").for(:path)
end
- it "should return valid url to repo" do
+ it "should return valid url to repo" do
project = Project.new(:path => "somewhere")
project.url_to_repo.should == "git@localhost:somewhere.git"
end
- it "should return path to repo" do
+ it "should return path to repo" do
project = Project.new(:path => "somewhere")
project.path_to_repo.should == File.join(Rails.root, "tmp", "tests", "somewhere")
end
- describe :valid_repo? do
- it "should be valid repo" do
+ describe :valid_repo? do
+ it "should be valid repo" do
project = Factory :project
- project.valid_repo?.should be_true
+ project.valid_repo?.should be_true
end
it "should be invalid repo" do
@@ -62,43 +62,43 @@ describe Project do
end
end
- describe "Git methods" do
+ describe "Git methods" do
let(:project) { Factory :project }
- describe :repo do
- it "should return valid repo" do
+ describe :repo do
+ it "should return valid repo" do
project.repo.should be_kind_of(Grit::Repo)
end
- it "should return nil" do
+ it "should return nil" do
lambda { Project.new(:path => "invalid").repo }.should raise_error(Grit::NoSuchPathError)
end
- it "should return nil" do
+ it "should return nil" do
lambda { Project.new.repo }.should raise_error(TypeError)
end
end
- describe :commit do
- it "should return first head commit if without params" do
+ describe :commit do
+ it "should return first head commit if without params" do
project.commit.id.should == project.repo.commits.first.id
end
- it "should return valid commit" do
+ it "should return valid commit" do
project.commit(ValidCommit::ID).should be_valid_commit
end
- it "should return nil" do
+ it "should return nil" do
project.commit("+123_4532530XYZ").should be_nil
end
end
- describe :tree do
- before do
+ describe :tree do
+ before do
@commit = project.commit(ValidCommit::ID)
end
- it "should raise error w/o arguments" do
+ it "should raise error w/o arguments" do
lambda { project.tree }.should raise_error
end
diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb
index 32fb90a317c257ac662dd3b437402a661a00f1b8..d66b1c251f0282641a69e0153bb7a7008a837059 100644
--- a/spec/models/user_spec.rb
+++ b/spec/models/user_spec.rb
@@ -14,7 +14,7 @@ describe User do
it { should respond_to(:name) }
end
- it "should return valid identifier" do
+ it "should return valid identifier" do
user = User.new(:email => "test@mail.com")
user.identifier.should == "test_mail.com"
end
diff --git a/spec/models/users_project_spec.rb b/spec/models/users_project_spec.rb
index d6a4d02b6e2ffeaeb6c6f1c20c6a353930288361..c15391619c64ff77af96e8b14ddc50953585c8af 100644
--- a/spec/models/users_project_spec.rb
+++ b/spec/models/users_project_spec.rb
@@ -11,7 +11,7 @@ describe UsersProject do
it { should validate_presence_of(:project_id) }
end
- describe "Delegate methods" do
+ describe "Delegate methods" do
it { should respond_to(:user_name) }
it { should respond_to(:user_email) }
end
diff --git a/spec/monkeypatch.rb b/spec/monkeypatch.rb
index ea42337f9319be5cb317473c34377004a01951ae..2e491496a799f110c4050f93bf697e92cf32b9ab 100644
--- a/spec/monkeypatch.rb
+++ b/spec/monkeypatch.rb
@@ -1,6 +1,6 @@
# Stubbing Project <-> gitosis path
# create project using Factory only
-class Project
+class Project
def update_gitosis_project
true
end
@@ -9,12 +9,12 @@ class Project
true
end
- def path_to_repo
+ def path_to_repo
File.join(Rails.root, "tmp", "tests", path)
end
end
-class Key
+class Key
def update_gitosis
true
end
diff --git a/spec/requests/admin/admin_projects_spec.rb b/spec/requests/admin/admin_projects_spec.rb
index e36ee4411ff96871c326752da92164e730de2a5d..fd8703ec06a92c0fadc0430a01c9aa5eff6eccdc 100644
--- a/spec/requests/admin/admin_projects_spec.rb
+++ b/spec/requests/admin/admin_projects_spec.rb
@@ -1,7 +1,7 @@
require 'spec_helper'
describe "Admin::Projects" do
- before do
+ before do
@project = Factory :project,
:name => "LeGiT",
:code => "LGT"
@@ -9,7 +9,7 @@ describe "Admin::Projects" do
end
describe "GET /admin/projects" do
- before do
+ before do
visit admin_projects_path
end
@@ -17,49 +17,49 @@ describe "Admin::Projects" do
current_path.should == admin_projects_path
end
- it "should have projects list" do
+ it "should have projects list" do
page.should have_content(@project.code)
page.should have_content(@project.name)
end
end
- describe "GET /admin/projects/:id" do
- before do
+ describe "GET /admin/projects/:id" do
+ before do
visit admin_projects_path
click_link "Show"
end
- it "should have project info" do
+ it "should have project info" do
page.should have_content(@project.code)
page.should have_content(@project.name)
end
end
- describe "GET /admin/projects/:id/edit" do
- before do
+ describe "GET /admin/projects/:id/edit" do
+ before do
visit admin_projects_path
click_link "edit_project_#{@project.id}"
end
- it "should have project edit page" do
+ it "should have project edit page" do
page.should have_content("Name")
page.should have_content("Code")
end
describe "Update project" do
- before do
+ before do
fill_in "project_name", :with => "Big Bang"
fill_in "project_code", :with => "BB1"
click_button "Save"
@project.reload
end
- it "should show page with new data" do
+ it "should show page with new data" do
page.should have_content("BB1")
page.should have_content("Big Bang")
end
- it "should change project entry" do
+ it "should change project entry" do
@project.name.should == "Big Bang"
@project.code.should == "BB1"
end
@@ -67,24 +67,24 @@ describe "Admin::Projects" do
end
describe "GET /admin/projects/new" do
- before do
+ before do
visit admin_projects_path
click_link "New Project"
end
it "should be correct path" do
- current_path.should == new_admin_project_path
+ current_path.should == new_admin_project_path
end
it "should have labels for new project" do
- page.should have_content("Name")
- page.should have_content("Path")
- page.should have_content("Description")
+ page.should have_content("Name")
+ page.should have_content("Path")
+ page.should have_content("Description")
end
end
describe "POST /admin/projects" do
- before do
+ before do
visit new_admin_project_path
fill_in 'Name', :with => 'NewProject'
fill_in 'Code', :with => 'NPR'
diff --git a/spec/requests/admin/admin_users_spec.rb b/spec/requests/admin/admin_users_spec.rb
index 8d9cbcae2ac2b922d77594b2299021c8328620da..67cfde5faf469141c8afa9c9b8cc1b31e8c15148 100644
--- a/spec/requests/admin/admin_users_spec.rb
+++ b/spec/requests/admin/admin_users_spec.rb
@@ -4,7 +4,7 @@ describe "Admin::Users" do
before { login_as :admin }
describe "GET /admin/users" do
- before do
+ before do
visit admin_users_path
end
@@ -12,14 +12,14 @@ describe "Admin::Users" do
current_path.should == admin_users_path
end
- it "should have users list" do
+ it "should have users list" do
page.should have_content(@user.email)
page.should have_content(@user.name)
end
end
- describe "GET /admin/users/new" do
- before do
+ describe "GET /admin/users/new" do
+ before do
@password = "123ABC"
visit new_admin_user_path
fill_in "user_name", :with => "Big Bang"
@@ -28,23 +28,23 @@ describe "Admin::Users" do
fill_in "user_password_confirmation", :with => @password
end
- it "should create new user" do
+ it "should create new user" do
expect { click_button "Save" }.to change {User.count}.by(1)
end
- it "should create user with valid data" do
+ it "should create user with valid data" do
click_button "Save"
user = User.last
user.name.should == "Big Bang"
user.email.should == "bigbang@mail.com"
end
- it "should call send mail" do
+ it "should call send mail" do
Notify.should_receive(:new_user_email).and_return(stub(:deliver => true))
click_button "Save"
end
- it "should send valid email to user with email & password" do
+ it "should send valid email to user with email & password" do
click_button "Save"
user = User.last
email = ActionMailer::Base.deliveries.last
@@ -54,45 +54,45 @@ describe "Admin::Users" do
end
end
- describe "GET /admin/users/:id" do
- before do
+ describe "GET /admin/users/:id" do
+ before do
visit admin_users_path
click_link "Show"
end
- it "should have user info" do
+ it "should have user info" do
page.should have_content(@user.email)
page.should have_content(@user.name)
page.should have_content(@user.is_admin?)
end
end
- describe "GET /admin/users/:id/edit" do
- before do
+ describe "GET /admin/users/:id/edit" do
+ before do
@simple_user = Factory :user
visit admin_users_path
click_link "edit_user_#{@simple_user.id}"
end
- it "should have user edit page" do
+ it "should have user edit page" do
page.should have_content("Name")
page.should have_content("Password")
end
describe "Update user" do
- before do
+ before do
fill_in "user_name", :with => "Big Bang"
fill_in "user_email", :with => "bigbang@mail.com"
check "user_admin"
click_button "Save"
end
- it "should show page with new data" do
+ it "should show page with new data" do
page.should have_content("bigbang@mail.com")
page.should have_content("Big Bang")
end
- it "should change user entry" do
+ it "should change user entry" do
@simple_user.reload
@simple_user.name.should == "Big Bang"
@simple_user.is_admin?.should be_true
diff --git a/spec/requests/admin/security_spec.rb b/spec/requests/admin/security_spec.rb
index 743f9f08cef675ffd4fed8c8721da9e92b82b7ff..27b601967691bbd9a88b1f6757fbd2ab9be8f281 100644
--- a/spec/requests/admin/security_spec.rb
+++ b/spec/requests/admin/security_spec.rb
@@ -1,25 +1,25 @@
require 'spec_helper'
describe "Admin::Projects" do
- describe "GET /admin/projects" do
+ describe "GET /admin/projects" do
it { admin_projects_path.should be_allowed_for :admin }
it { admin_projects_path.should be_denied_for :user }
it { admin_projects_path.should be_denied_for :visitor }
end
- describe "GET /admin/users" do
+ describe "GET /admin/users" do
it { admin_users_path.should be_allowed_for :admin }
it { admin_users_path.should be_denied_for :user }
it { admin_users_path.should be_denied_for :visitor }
end
- describe "GET /admin/team_members" do
+ describe "GET /admin/team_members" do
it { admin_team_members_path.should be_allowed_for :admin }
it { admin_team_members_path.should be_denied_for :user }
it { admin_team_members_path.should be_denied_for :visitor }
end
- describe "GET /admin/emails" do
+ describe "GET /admin/emails" do
it { admin_emails_path.should be_allowed_for :admin }
it { admin_emails_path.should be_denied_for :user }
it { admin_emails_path.should be_denied_for :visitor }
diff --git a/spec/requests/commits_notes_spec.rb b/spec/requests/commits_notes_spec.rb
index 522fe51824b0b9543199d353cbafc01cff6f49de..c424f4fc3cad17f4d2820f181bbbb1ba94a2af04 100644
--- a/spec/requests/commits_notes_spec.rb
+++ b/spec/requests/commits_notes_spec.rb
@@ -4,13 +4,13 @@ describe "Issues" do
let(:project) { Factory :project }
let!(:commit) { project.repo.commits.first }
- before do
+ before do
login_as :user
project.add_access(@user, :read, :write)
end
- describe "add new note", :js => true do
- before do
+ describe "add new note", :js => true do
+ before do
visit project_commit_path(project, commit)
click_link "Comments" # notes tab
fill_in "note_note", :with => "I commented this commit"
diff --git a/spec/requests/commits_spec.rb b/spec/requests/commits_spec.rb
index cd7314f9812fdfdc83846cee3158a98b4e39e378..79bb03f53b6ceeb44ca2f40b7263e057c6c3e292 100644
--- a/spec/requests/commits_spec.rb
+++ b/spec/requests/commits_spec.rb
@@ -3,13 +3,13 @@ require 'spec_helper'
describe "Commits" do
let(:project) { Factory :project }
let!(:commit) { project.repo.commits.first }
- before do
+ before do
login_as :user
project.add_access(@user, :read)
end
describe "GET /commits" do
- before do
+ before do
visit project_commits_path(project)
end
@@ -17,22 +17,22 @@ describe "Commits" do
current_path.should == project_commits_path(project)
end
- it "should have project name" do
+ it "should have project name" do
page.should have_content(project.name)
end
- it "should list commits" do
+ it "should list commits" do
page.should have_content(commit.author)
page.should have_content(commit.message)
end
end
- describe "GET /commits/:id" do
- before do
+ describe "GET /commits/:id" do
+ before do
visit project_commit_path(project, commit)
end
- it "should have valid path" do
+ it "should have valid path" do
current_path.should == project_commit_path(project, commit)
end
end
diff --git a/spec/requests/issues_notes_spec.rb b/spec/requests/issues_notes_spec.rb
index 95eb2f35d79f39423adfcf78112340d398bb00c5..9ebad39473a9f1d7c98bf64436c1a3808efb8ab7 100644
--- a/spec/requests/issues_notes_spec.rb
+++ b/spec/requests/issues_notes_spec.rb
@@ -3,7 +3,7 @@ require 'spec_helper'
describe "Issues" do
let(:project) { Factory :project }
- before do
+ before do
login_as :user
project.add_access(@user, :read, :write)
@@ -13,8 +13,8 @@ describe "Issues" do
:project => project
end
- describe "add new note", :js => true do
- before do
+ describe "add new note", :js => true do
+ before do
visit project_issue_path(project, @issue)
fill_in "note_note", :with => "I commented this issue"
click_button "Add note"
diff --git a/spec/requests/issues_spec.rb b/spec/requests/issues_spec.rb
index 79fdf5efbb588a813211d015200a5b9740418e9f..8c090d7fb3f2ebfdeda6977b809a78cf39f43737 100644
--- a/spec/requests/issues_spec.rb
+++ b/spec/requests/issues_spec.rb
@@ -3,13 +3,13 @@ require 'spec_helper'
describe "Issues" do
let(:project) { Factory :project }
- before do
+ before do
login_as :user
project.add_access(@user, :read, :write)
end
describe "GET /issues" do
- before do
+ before do
@issue = Factory :issue,
:author => @user,
:assignee => @user,
@@ -24,23 +24,23 @@ describe "Issues" do
it { should have_content(@issue.project.name) }
it { should have_content(@issue.assignee.name) }
- describe "Destroy" do
- before do
+ describe "Destroy" do
+ before do
# admin access to remove issue
@user.users_projects.destroy_all
project.add_access(@user, :read, :write, :admin)
visit project_issues_path(project)
end
- it "should remove entry" do
+ it "should remove entry" do
expect {
click_link "destroy_issue_#{@issue.id}"
}.to change { Issue.count }.by(-1)
end
end
- describe "statuses", :js => true do
- before do
+ describe "statuses", :js => true do
+ before do
@closed_issue = Factory :issue,
:author => @user,
:assignee => @user,
@@ -48,18 +48,18 @@ describe "Issues" do
:closed => true
end
- it "should show only open" do
+ it "should show only open" do
should have_content(@issue.title)
should have_no_content(@closed_issue.title)
end
- it "should show only closed" do
+ it "should show only closed" do
choose "closed_issues"
should have_no_content(@issue.title)
should have_content(@closed_issue.title)
end
- it "should show all" do
+ it "should show all" do
choose "all_issues"
should have_content(@issue.title)
should have_content(@closed_issue.title)
@@ -67,17 +67,17 @@ describe "Issues" do
end
end
- describe "New issue", :js => true do
- before do
+ describe "New issue", :js => true do
+ before do
visit project_issues_path(project)
click_link "New Issue"
end
- it "should open new issue popup" do
+ it "should open new issue popup" do
page.should have_content("Add new issue")
end
- describe "fill in" do
+ describe "fill in" do
before do
fill_in "issue_title", :with => "bug 345"
fill_in "issue_content", :with => "app bug 345"
@@ -87,7 +87,7 @@ describe "Issues" do
it { expect { click_button "Save" }.to change {Issue.count}.by(1) }
- it "should add new issue to table" do
+ it "should add new issue to table" do
click_button "Save"
page.should_not have_content("Add new issue")
@@ -96,12 +96,12 @@ describe "Issues" do
page.should have_content project.name
end
- it "should call send mail" do
+ it "should call send mail" do
Notify.should_receive(:new_issue_email).and_return(stub(:deliver => true))
click_button "Save"
end
- it "should send valid email to user with email & password" do
+ it "should send valid email to user with email & password" do
click_button "Save"
issue = Issue.last
email = ActionMailer::Base.deliveries.last
@@ -112,8 +112,8 @@ describe "Issues" do
end
end
- describe "Edit issue", :js => true do
- before do
+ describe "Edit issue", :js => true do
+ before do
@issue = Factory :issue,
:author => @user,
:assignee => @user,
@@ -122,11 +122,11 @@ describe "Issues" do
click_link "Edit"
end
- it "should open new issue popup" do
+ it "should open new issue popup" do
page.should have_content("Issue ##{@issue.id}")
end
- describe "fill in" do
+ describe "fill in" do
before do
fill_in "issue_title", :with => "bug 345"
fill_in "issue_content", :with => "app bug 345"
@@ -134,7 +134,7 @@ describe "Issues" do
it { expect { click_button "Save" }.to_not change {Issue.count} }
- it "should update issue fields" do
+ it "should update issue fields" do
click_button "Save"
page.should_not have_content("Issue ##{@issue.id}")
diff --git a/spec/requests/keys_spec.rb b/spec/requests/keys_spec.rb
index 316115f923452a30cd472fc261d4895e5a3ad0ad..6ce22b30883cc8dd7b8b4d0bd0ed779383b649cf 100644
--- a/spec/requests/keys_spec.rb
+++ b/spec/requests/keys_spec.rb
@@ -1,12 +1,12 @@
require 'spec_helper'
describe "Issues" do
- before do
+ before do
login_as :user
end
describe "GET /keys" do
- before do
+ before do
@key = Factory :key, :user => @user
visit keys_path
end
@@ -15,8 +15,8 @@ describe "Issues" do
it { should have_content(@key.title) }
- describe "Destroy" do
- it "should remove entry" do
+ describe "Destroy" do
+ it "should remove entry" do
expect {
click_link "destroy_key_#{@key.id}"
}.to change { @user.keys.count }.by(-1)
@@ -24,17 +24,17 @@ describe "Issues" do
end
end
- describe "New key", :js => true do
- before do
+ describe "New key", :js => true do
+ before do
visit keys_path
click_link "Add new"
end
- it "should open new key popup" do
+ it "should open new key popup" do
page.should have_content("Add new public key")
end
- describe "fill in" do
+ describe "fill in" do
before do
fill_in "key_title", :with => "laptop"
fill_in "key_key", :with => "publickey234="
@@ -42,7 +42,7 @@ describe "Issues" do
it { expect { click_button "Save" }.to change {Key.count}.by(1) }
- it "should add new key to table" do
+ it "should add new key to table" do
click_button "Save"
page.should_not have_content("Add new public key")
diff --git a/spec/requests/profile_spec.rb b/spec/requests/profile_spec.rb
index 5838f63b40b71ef64fbd21dbeb35a8d201fe61a0..eca1c12e8006db97271f59578bf8ab3ff376132a 100644
--- a/spec/requests/profile_spec.rb
+++ b/spec/requests/profile_spec.rb
@@ -1,12 +1,12 @@
require 'spec_helper'
describe "Profile" do
- before do
+ before do
login_as :user
end
describe "Show profile" do
- before do
+ before do
visit profile_path
end
@@ -15,13 +15,13 @@ describe "Profile" do
end
describe "Profile update" do
- before do
+ before do
visit profile_path
fill_in "user_skype", :with => "testskype"
- fill_in "user_linkedin", :with => "testlinkedin"
+ fill_in "user_linkedin", :with => "testlinkedin"
fill_in "user_twitter", :with => "testtwitter"
click_button "Save"
- @user.reload
+ @user.reload
end
it { @user.skype.should == 'testskype' }
@@ -29,18 +29,17 @@ describe "Profile" do
it { @user.twitter.should == 'testtwitter' }
end
-
describe "Password update" do
- before do
+ before do
visit profile_password_path
end
it { page.should have_content("Password") }
it { page.should have_content("Password confirmation") }
- describe "change password" do
- before do
- @old_pwd = @user.encrypted_password
+ describe "change password" do
+ before do
+ @old_pwd = @user.encrypted_password
fill_in "user_password", :with => "777777"
fill_in "user_password_confirmation", :with => "777777"
click_button "Save"
@@ -51,18 +50,18 @@ describe "Profile" do
current_path.should == new_user_session_path
end
- it "should change password" do
+ it "should change password" do
@user.encrypted_password.should_not == @old_pwd
end
- describe "login with new password" do
+ describe "login with new password" do
before do
fill_in "user_email", :with => @user.email
fill_in "user_password", :with => "777777"
click_button "Sign in"
end
-
- it "should login user" do
+
+ it "should login user" do
current_path.should == root_path
end
end
diff --git a/spec/requests/projects_security_spec.rb b/spec/requests/projects_security_spec.rb
index 90f88d8808553aa1b135e0a41a0c860003c32069..1d42c5e7c530e3ce6412d3451ef69486ef44ec95 100644
--- a/spec/requests/projects_security_spec.rb
+++ b/spec/requests/projects_security_spec.rb
@@ -1,33 +1,33 @@
require 'spec_helper'
describe "Projects" do
- describe "GET /projects" do
+ describe "GET /projects" do
it { projects_path.should be_allowed_for :admin }
it { projects_path.should be_allowed_for :user }
it { projects_path.should be_denied_for :visitor }
end
- describe "GET /projects/new" do
+ describe "GET /projects/new" do
it { projects_path.should be_allowed_for :admin }
it { projects_path.should be_allowed_for :user }
it { projects_path.should be_denied_for :visitor }
end
describe "Project" do
- before do
+ before do
@project = Factory :project
@u1 = Factory :user
@u2 = Factory :user
@u3 = Factory :user
# full access
- @project.users_projects.create(:user => @u1, :read => true, :write => true, :admin => true)
+ @project.users_projects.create(:user => @u1, :read => true, :write => true, :admin => true)
# no access
- @project.users_projects.create(:user => @u2, :read => false, :write => false, :admin => false)
+ @project.users_projects.create(:user => @u2, :read => false, :write => false, :admin => false)
# readonly
- @project.users_projects.create(:user => @u3, :read => true, :write => false, :admin => false)
+ @project.users_projects.create(:user => @u3, :read => true, :write => false, :admin => false)
end
- describe "GET /project_code" do
+ describe "GET /project_code" do
it { project_path(@project).should be_allowed_for @u1 }
it { project_path(@project).should be_allowed_for @u3 }
it { project_path(@project).should be_denied_for :admin }
@@ -36,7 +36,7 @@ describe "Projects" do
it { project_path(@project).should be_denied_for :visitor }
end
- describe "GET /project_code/tree" do
+ describe "GET /project_code/tree" do
it { tree_project_path(@project).should be_allowed_for @u1 }
it { tree_project_path(@project).should be_allowed_for @u3 }
it { tree_project_path(@project).should be_denied_for :admin }
@@ -45,7 +45,7 @@ describe "Projects" do
it { tree_project_path(@project).should be_denied_for :visitor }
end
- describe "GET /project_code/commits" do
+ describe "GET /project_code/commits" do
it { project_commits_path(@project).should be_allowed_for @u1 }
it { project_commits_path(@project).should be_allowed_for @u3 }
it { project_commits_path(@project).should be_denied_for :admin }
@@ -54,7 +54,7 @@ describe "Projects" do
it { project_commits_path(@project).should be_denied_for :visitor }
end
- describe "GET /project_code/commit" do
+ describe "GET /project_code/commit" do
it { project_commit_path(@project, @project.commit).should be_allowed_for @u1 }
it { project_commit_path(@project, @project.commit).should be_allowed_for @u3 }
it { project_commit_path(@project, @project.commit).should be_denied_for :admin }
@@ -63,7 +63,7 @@ describe "Projects" do
it { project_commit_path(@project, @project.commit).should be_denied_for :visitor }
end
- describe "GET /project_code/team" do
+ describe "GET /project_code/team" do
it { team_project_path(@project).should be_allowed_for @u1 }
it { team_project_path(@project).should be_allowed_for @u3 }
it { team_project_path(@project).should be_denied_for :admin }
@@ -72,7 +72,7 @@ describe "Projects" do
it { team_project_path(@project).should be_denied_for :visitor }
end
- describe "GET /project_code/wall" do
+ describe "GET /project_code/wall" do
it { wall_project_path(@project).should be_allowed_for @u1 }
it { wall_project_path(@project).should be_allowed_for @u3 }
it { wall_project_path(@project).should be_denied_for :admin }
@@ -81,8 +81,8 @@ describe "Projects" do
it { wall_project_path(@project).should be_denied_for :visitor }
end
- describe "GET /project_code/blob" do
- before do
+ describe "GET /project_code/blob" do
+ before do
@commit = @project.commit
@path = @commit.tree.contents.select { |i| i.is_a?(Grit::Blob)}.first.name
@blob_path = blob_project_path(@project, :commit_id => @commit.id, :path => @path)
@@ -96,7 +96,7 @@ describe "Projects" do
it { @blob_path.should be_denied_for :visitor }
end
- describe "GET /project_code/edit" do
+ describe "GET /project_code/edit" do
it { edit_project_path(@project).should be_allowed_for @u1 }
it { edit_project_path(@project).should be_denied_for @u3 }
it { edit_project_path(@project).should be_denied_for :admin }
@@ -105,7 +105,7 @@ describe "Projects" do
it { edit_project_path(@project).should be_denied_for :visitor }
end
- describe "GET /project_code/issues" do
+ describe "GET /project_code/issues" do
it { project_issues_path(@project).should be_allowed_for @u1 }
it { project_issues_path(@project).should be_allowed_for @u3 }
it { project_issues_path(@project).should be_denied_for :admin }
@@ -114,7 +114,7 @@ describe "Projects" do
it { project_issues_path(@project).should be_denied_for :visitor }
end
- describe "GET /project_code/snippets" do
+ describe "GET /project_code/snippets" do
it { project_snippets_path(@project).should be_allowed_for @u1 }
it { project_snippets_path(@project).should be_allowed_for @u3 }
it { project_snippets_path(@project).should be_denied_for :admin }
diff --git a/spec/requests/projects_spec.rb b/spec/requests/projects_spec.rb
index 945c1ea26f59238cdc5aac8d1558868dd40e2837..e1e9773c850ca12b081377e10ad376b828a44967 100644
--- a/spec/requests/projects_spec.rb
+++ b/spec/requests/projects_spec.rb
@@ -4,38 +4,38 @@ describe "Projects" do
before { login_as :user }
describe "GET /projects" do
- before do
+ before do
visit projects_path
end
it "should be on projects page" do
- current_path.should == projects_path
+ current_path.should == projects_path
end
it "should have link to new project" do
- page.should have_content("New Project")
+ page.should have_content("New Project")
end
end
describe "GET /projects/new" do
- before do
+ before do
visit projects_path
click_link "New Project"
end
it "should be correct path" do
- current_path.should == new_project_path
+ current_path.should == new_project_path
end
it "should have labels for new project" do
- page.should have_content("Name")
- page.should have_content("Path")
- page.should have_content("Description")
+ page.should have_content("Name")
+ page.should have_content("Path")
+ page.should have_content("Description")
end
end
describe "POST /projects" do
- before do
+ before do
visit new_project_path
fill_in 'Name', :with => 'NewProject'
fill_in 'Code', :with => 'NPR'
@@ -61,7 +61,7 @@ describe "Projects" do
end
describe "GET /projects/show" do
- before do
+ before do
@project = Factory :project
@project.add_access(@user, :read)
@@ -72,14 +72,14 @@ describe "Projects" do
current_path.should == project_path(@project)
end
- it "should beahave like dashboard" do
+ it "should beahave like dashboard" do
page.should have_content("History")
end
end
describe "GET /projects/team" do
- before do
+ before do
@project = Factory :project
@project.add_access(@user, :read)
@@ -92,13 +92,13 @@ describe "Projects" do
current_path.should == team_project_path(@project)
end
- it "should have as as team member" do
+ it "should have as as team member" do
page.should have_content(@user.name)
end
end
describe "GET /projects/:id/edit" do
- before do
+ before do
@project = Factory :project
@project.add_access(@user, :admin, :read)
@@ -110,14 +110,14 @@ describe "Projects" do
end
it "should have labels for new project" do
- page.should have_content("Name")
- page.should have_content("Path")
- page.should have_content("Description")
+ page.should have_content("Name")
+ page.should have_content("Path")
+ page.should have_content("Description")
end
end
describe "PUT /projects/:id" do
- before do
+ before do
@project = Factory :project
@project.add_access(@user, :admin, :read)
@@ -140,14 +140,14 @@ describe "Projects" do
end
#describe "DELETE /projects/:id", :js => true do
- #before do
+ #before do
#@project = Factory :project
#@project.add_access(@user, :read, :admin)
#visit projects_path
#end
#it "should be correct path" do
- #expect { click_link "Destroy" }.to change {Project.count}.by(1)
+ #expect { click_link "Destroy" }.to change {Project.count}.by(1)
#end
#end
end
diff --git a/spec/requests/projects_tree_perfomance_spec.rb b/spec/requests/projects_tree_perfomance_spec.rb
index 5b4facb17d63a1fb9fac4fa04b88ba217df4fba2..bf3ca167d318d081bc5ef065773029fb8398d62a 100644
--- a/spec/requests/projects_tree_perfomance_spec.rb
+++ b/spec/requests/projects_tree_perfomance_spec.rb
@@ -6,13 +6,13 @@ describe "Projects" do
describe "GET /projects/tree" do
describe "head" do
- before do
+ before do
@project = Factory :project
@project.add_access(@user, :read)
end
- it "should be fast" do
+ it "should be fast" do
time = Benchmark.realtime do
visit tree_project_path(@project)
end
@@ -21,12 +21,12 @@ describe "Projects" do
end
describe ValidCommit::ID do
- before do
+ before do
@project = Factory :project
@project.add_access(@user, :read)
end
- it "should be fast" do
+ it "should be fast" do
time = Benchmark.realtime do
visit tree_project_path(@project, :commit_id => ValidCommit::ID)
end
diff --git a/spec/requests/projects_tree_spec.rb b/spec/requests/projects_tree_spec.rb
index 4e3176bbdc3ca60dd9708a856d1b9c7065281de0..fd49ffaab5c376f0f10c85a65bbb3d0b6548739e 100644
--- a/spec/requests/projects_tree_spec.rb
+++ b/spec/requests/projects_tree_spec.rb
@@ -5,7 +5,7 @@ describe "Projects" do
describe "GET /projects/tree" do
describe "head" do
- before do
+ before do
@project = Factory :project
@project.add_access(@user, :read)
@@ -20,7 +20,7 @@ describe "Projects" do
end
describe ValidCommit::ID do
- before do
+ before do
@project = Factory :project
@project.add_access(@user, :read)
@@ -36,7 +36,7 @@ describe "Projects" do
end
describe "branch passed" do
- before do
+ before do
@project = Factory :project
@project.add_access(@user, :read)
@@ -53,7 +53,7 @@ describe "Projects" do
# TREE FILE PREVIEW
describe "file preview" do
- before do
+ before do
@project = Factory :project
@project.add_access(@user, :read)
@@ -70,9 +70,9 @@ describe "Projects" do
end
end
- # RAW FILE
+ # RAW FILE
describe "GET /projects/blob" do
- before do
+ before do
@project = Factory :project
@project.add_access(@user, :read)
@@ -85,7 +85,7 @@ describe "Projects" do
current_path.should == blob_project_path(@project)
end
- it "raw file response" do
+ it "raw file response" do
page.source.should == ValidCommit::BLOB_FILE
end
end
diff --git a/spec/requests/projects_wall_spec.rb b/spec/requests/projects_wall_spec.rb
index a7387f9326dd759bf1d0152166d2362cbf58cc34..bb734bdab231ea3ace20e0778596448933a5fd18 100644
--- a/spec/requests/projects_wall_spec.rb
+++ b/spec/requests/projects_wall_spec.rb
@@ -3,13 +3,13 @@ require 'spec_helper'
describe "Projects", "Wall" do
let(:project) { Factory :project }
- before do
+ before do
login_as :user
project.add_access(@user, :read, :write)
end
describe "View notes on wall" do
- before do
+ before do
Factory :note, :project => project, :note => "Project specs", :author => @user
visit wall_project_path(project)
end
@@ -19,8 +19,8 @@ describe "Projects", "Wall" do
it { page.should have_content("less than a minute ago") }
end
- describe "add new note", :js => true do
- before do
+ describe "add new note", :js => true do
+ before do
visit wall_project_path(project)
fill_in "note_note", :with => "my post on wall"
click_button "Add note"
diff --git a/spec/requests/snippets_spec.rb b/spec/requests/snippets_spec.rb
index 00ae58dad87099cf1b435d234ecef345c2e2bad1..d4811958db396697b88af5ea185440d3176fa66d 100644
--- a/spec/requests/snippets_spec.rb
+++ b/spec/requests/snippets_spec.rb
@@ -3,13 +3,13 @@ require 'spec_helper'
describe "Snippets" do
let(:project) { Factory :project }
- before do
+ before do
login_as :user
project.add_access(@user, :read, :write)
end
describe "GET /snippets" do
- before do
+ before do
@snippet = Factory :snippet,
:author => @user,
:project => project
@@ -23,15 +23,15 @@ describe "Snippets" do
it { should have_content(@snippet.project.name) }
it { should have_content(@snippet.author.name) }
- describe "Destroy" do
- before do
+ describe "Destroy" do
+ before do
# admin access to remove snippet
@user.users_projects.destroy_all
project.add_access(@user, :read, :write, :admin)
visit project_snippets_path(project)
end
- it "should remove entry" do
+ it "should remove entry" do
expect {
click_link "destroy_snippet_#{@snippet.id}"
}.to change { Snippet.count }.by(-1)
@@ -39,17 +39,17 @@ describe "Snippets" do
end
end
- describe "New snippet" do
- before do
+ describe "New snippet" do
+ before do
visit project_snippets_path(project)
click_link "New Snippet"
end
- it "should open new snippet popup" do
+ it "should open new snippet popup" do
page.current_path.should == new_project_snippet_path(project)
end
- describe "fill in" do
+ describe "fill in" do
before do
fill_in "snippet_title", :with => "login function"
fill_in "snippet_file_name", :with => "test.rb"
@@ -58,7 +58,7 @@ describe "Snippets" do
it { expect { click_button "Save" }.to change {Snippet.count}.by(1) }
- it "should add new snippet to table" do
+ it "should add new snippet to table" do
click_button "Save"
page.current_path.should == project_snippet_path(project, Snippet.last)
page.should have_content "login function"
@@ -67,8 +67,8 @@ describe "Snippets" do
end
end
- describe "Edit snippet" do
- before do
+ describe "Edit snippet" do
+ before do
@snippet = Factory :snippet,
:author => @user,
:project => project
@@ -76,11 +76,11 @@ describe "Snippets" do
click_link "Edit"
end
- it "should open edit page" do
+ it "should open edit page" do
page.current_path.should == edit_project_snippet_path(project, @snippet)
end
- describe "fill in" do
+ describe "fill in" do
before do
fill_in "snippet_title", :with => "login function"
fill_in "snippet_file_name", :with => "test.rb"
@@ -89,7 +89,7 @@ describe "Snippets" do
it { expect { click_button "Save" }.to_not change {Snippet.count} }
- it "should update snippet fields" do
+ it "should update snippet fields" do
click_button "Save"
page.current_path.should == project_snippet_path(project, @snippet)
diff --git a/spec/requests/team_members_spec.rb b/spec/requests/team_members_spec.rb
index 650ed4497f243c568c8edf33dbfd3b10861b6d4a..d6555518149752f562af28b8d5572cd2cb098baf 100644
--- a/spec/requests/team_members_spec.rb
+++ b/spec/requests/team_members_spec.rb
@@ -1,7 +1,7 @@
require 'spec_helper'
describe "TeamMembers" do
- before do
+ before do
login_as :user
@project = Factory :project
@project.add_access(@user, :read, :admin)
@@ -10,7 +10,7 @@ describe "TeamMembers" do
describe "View profile" do
it "should be available" do
visit(team_project_path(@project))
- within "#team-table" do
+ within "#team-table" do
click_link(@user.name)
end
page.should have_content @user.skype
@@ -18,23 +18,23 @@ describe "TeamMembers" do
end
end
- describe "New Team member", :js => true do
- before do
+ describe "New Team member", :js => true do
+ before do
@user_1 = Factory :user
visit team_project_path(@project)
click_link "Add new"
end
- it "should open new team member popup" do
+ it "should open new team member popup" do
page.should have_content("Add new member to project")
end
- describe "fill in" do
+ describe "fill in" do
before do
click_link "Select user"
click_link @user_1.name
- within "#team_member_new" do
+ within "#team_member_new" do
check "team_member_read"
check "team_member_write"
end
@@ -42,7 +42,7 @@ describe "TeamMembers" do
it { expect { click_button "Save";sleep(1) }.to change {UsersProject.count}.by(1) }
- it "should add new member to table" do
+ it "should add new member to table" do
click_button "Save"
@member = UsersProject.last
@@ -53,8 +53,8 @@ describe "TeamMembers" do
@member.admin.should be_false
end
- it "should not allow creation without access selected" do
- within "#team_member_new" do
+ it "should not allow creation without access selected" do
+ within "#team_member_new" do
uncheck "team_member_read"
uncheck "team_member_write"
uncheck "team_member_admin"
@@ -66,8 +66,8 @@ describe "TeamMembers" do
end
end
- describe "Cancel membership" do
- it "should cancel membership" do
+ describe "Cancel membership" do
+ it "should cancel membership" do
visit team_project_path(@project)
expect { click_link "Cancel" }.to change { UsersProject.count }.by(-1)
end
diff --git a/spec/requests/top_panel_spec.rb b/spec/requests/top_panel_spec.rb
index bd4d204779646f0610415f5d3c73cb811e66a9f9..d1cea6d86d2e6ccc86e6689dd9f468cf377a1731 100644
--- a/spec/requests/top_panel_spec.rb
+++ b/spec/requests/top_panel_spec.rb
@@ -4,7 +4,7 @@ describe "Top Panel", :js => true do
before { login_as :user }
describe "Search autocomplete" do
- before do
+ before do
visit projects_path
fill_in "search", :with => "Ke"
sleep(2)
@@ -12,12 +12,12 @@ describe "Top Panel", :js => true do
end
it "should be on projects page" do
- current_path.should == keys_path
+ current_path.should == keys_path
end
end
describe "with project" do
- before do
+ before do
@project = Factory :project
@project.add_access(@user, :read)
visit project_path(@project)
@@ -28,7 +28,7 @@ describe "Top Panel", :js => true do
end
it "should be on projects page" do
- current_path.should == project_commits_path(@project)
+ current_path.should == project_commits_path(@project)
end
end
end
diff --git a/spec/requests/user_security_spec.rb b/spec/requests/user_security_spec.rb
index a27eb1ca33bd207bb0453e8ac412d1ebdff39a3c..b75a1779a8a4fd3b3068fb4b15a8bb06b0e8d22e 100644
--- a/spec/requests/user_security_spec.rb
+++ b/spec/requests/user_security_spec.rb
@@ -2,32 +2,32 @@ require 'spec_helper'
describe "Users Security" do
describe "Project" do
- before do
+ before do
@u1 = Factory :user
end
- describe "GET /login" do
+ describe "GET /login" do
#it { new_user_session_path.should be_denied_for @u1 }
#it { new_user_session_path.should be_denied_for :admin }
#it { new_user_session_path.should be_denied_for :user }
it { new_user_session_path.should_not be_404_for :visitor }
end
- describe "GET /keys" do
+ describe "GET /keys" do
it { keys_path.should be_allowed_for @u1 }
it { keys_path.should be_allowed_for :admin }
it { keys_path.should be_allowed_for :user }
it { keys_path.should be_denied_for :visitor }
end
- describe "GET /profile" do
+ describe "GET /profile" do
it { profile_path.should be_allowed_for @u1 }
it { profile_path.should be_allowed_for :admin }
it { profile_path.should be_allowed_for :user }
it { profile_path.should be_denied_for :visitor }
end
- describe "GET /profile/password" do
+ describe "GET /profile/password" do
it { profile_password_path.should be_allowed_for @u1 }
it { profile_password_path.should be_allowed_for :admin }
it { profile_password_path.should be_allowed_for :user }
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 0c2545e3380681bed5033bf0035bc63977150ce9..aa7f23d80cee651d4d54fa22d236c3cd9ffbfcb9 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -11,7 +11,6 @@ require 'capybara/dsl'
require 'factories'
require 'monkeypatch'
-
# Requires supporting ruby files with custom matchers and macros, etc,
# in spec/support/ and its subdirectories.
Dir[Rails.root.join("spec/support/**/*.rb")].each {|f| require f}
diff --git a/spec/support/login.rb b/spec/support/login.rb
index 462647ab8563cf1e8a233d3e9125a2a4b9162b1a..a700c8b94dd75ffeeff878c727562efc04a00207 100644
--- a/spec/support/login.rb
+++ b/spec/support/login.rb
@@ -1,12 +1,12 @@
module LoginMacros
def login_as role
- @user = User.create(:email => "user#{User.count}@mail.com",
+ @user = User.create(:email => "user#{User.count}@mail.com",
:name => "John Smith",
:password => "123456",
:password_confirmation => "123456",
:skype => 'user_skype')
-
- if role == :admin
+
+ if role == :admin
@user.admin = true
@user.save!
end
@@ -23,7 +23,7 @@ module LoginMacros
fill_in "Password", :with => "123456"
click_button "Sign in"
end
-
+
def logout
click_link "Logout" rescue nil
end
diff --git a/spec/support/matchers.rb b/spec/support/matchers.rb
index dcdfa6d50ff905338a1e663499c20ae6905894c5..e0672166e923afbec165b9d5ec00de0aadd72e71 100644
--- a/spec/support/matchers.rb
+++ b/spec/support/matchers.rb
@@ -18,17 +18,17 @@ RSpec::Matchers.define :be_denied_for do |user|
match do |url|
include UrlAccess
url_denied?(user, url)
- end
+ end
end
RSpec::Matchers.define :be_404_for do |user|
match do |url|
include UrlAccess
url_404?(user, url)
- end
+ end
end
-module UrlAccess
+module UrlAccess
def url_allowed?(user, url)
emulate_user(user)
visit url
diff --git a/spec/support/shared_examples.rb b/spec/support/shared_examples.rb
index a2e94ac109bd198d429b45682163db4dbde3c482..118b9b2a0ba2021263c807c5a19c8cea2d490262 100644
--- a/spec/support/shared_examples.rb
+++ b/spec/support/shared_examples.rb
@@ -6,13 +6,12 @@ shared_examples_for :project_side_pane do
it { should have_content("Tree") }
end
-
shared_examples_for :tree_view do
subject { page }
it "should have Tree View of project" do
- should have_content("app")
- should have_content("history")
- should have_content("Gemfile")
+ should have_content("app")
+ should have_content("history")
+ should have_content("Gemfile")
end
end