clean-up code
* Remove trailing whitespace * Converts hard-tabs into two-space soft-tabs * Remove consecutive blank lines
This commit is contained in:
parent
f6a67fbad5
commit
d62200cad4
112 changed files with 1408 additions and 1437 deletions
|
@ -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);
|
||||
;
|
||||
;
|
||||
|
|
1655
app/assets/javascripts/jquery.ui.selectmenu.js
vendored
1655
app/assets/javascripts/jquery.ui.selectmenu.js
vendored
File diff suppressed because it is too large
Load diff
|
@ -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){
|
||||
|
|
|
@ -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 .
|
||||
*/
|
||||
|
|
|
@ -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 */
|
||||
|
|
|
@ -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; }
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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])
|
||||
|
|
|
@ -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
|
||||
|
||||
|
|
|
@ -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])
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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|
|
||||
|
|
|
@ -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])
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -12,7 +12,7 @@ module ProjectsHelper
|
|||
else
|
||||
true
|
||||
end
|
||||
rescue
|
||||
rescue
|
||||
nil
|
||||
end
|
||||
end
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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)
|
||||
|
||||
|
|
|
@ -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
|
||||
|
||||
|
|
|
@ -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"
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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(); });
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -7,8 +7,8 @@
|
|||
%th Read
|
||||
%th Git
|
||||
%th Manage
|
||||
%th Added
|
||||
%th
|
||||
%th Added
|
||||
%th
|
||||
%th
|
||||
%th
|
||||
- members.each do |tm|
|
||||
|
|
|
@ -11,7 +11,6 @@
|
|||
%b Since:
|
||||
= @admin_team_member.updated_at
|
||||
|
||||
|
||||
.span-10
|
||||
.span-6
|
||||
%b Access:
|
||||
|
|
|
@ -44,7 +44,7 @@
|
|||
.field
|
||||
= f.label :twitter
|
||||
%br
|
||||
= f.text_field :twitter
|
||||
= f.text_field :twitter
|
||||
.clear
|
||||
%br
|
||||
.actions
|
||||
|
|
|
@ -2,5 +2,4 @@
|
|||
|
||||
= render 'form'
|
||||
|
||||
|
||||
= link_to 'Back', admin_users_path, :class => "right lbutton"
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -6,4 +6,4 @@
|
|||
%h1 Listing commits
|
||||
%div{:id => dom_id(@project)}
|
||||
= render "commits"
|
||||
%br/
|
||||
%br/
|
||||
|
|
|
@ -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
|
||||
|
||||
|
|
|
@ -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'))}");
|
||||
|
|
|
@ -9,4 +9,4 @@
|
|||
<div><%= f.submit "Resend confirmation instructions" %></div>
|
||||
<% end %>
|
||||
|
||||
<%= render :partial => "devise/shared/links" %>
|
||||
<%= render :partial => "devise/shared/links" %>
|
||||
|
|
|
@ -13,4 +13,4 @@
|
|||
<div><%= f.submit "Change my password" %></div>
|
||||
<% end %>
|
||||
|
||||
<%= render :partial => "devise/shared/links" %>
|
||||
<%= render :partial => "devise/shared/links" %>
|
||||
|
|
|
@ -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 -%>
|
||||
<% end -%>
|
||||
|
|
|
@ -9,4 +9,4 @@
|
|||
<div><%= f.submit "Resend unlock instructions" %></div>
|
||||
<% end %>
|
||||
|
||||
<%= render :partial => "devise/shared/links" %>
|
||||
<%= render :partial => "devise/shared/links" %>
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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',
|
||||
|
|
|
@ -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
|
||||
|
||||
|
|
|
@ -1,2 +1,2 @@
|
|||
:plain
|
||||
:plain
|
||||
$("#notes-list").html("#{escape_javascript(render(:partial => 'notes/notes_list'))}");
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
- if @issue.valid?
|
||||
:plain
|
||||
$("##{dom_id(@issue)}").fadeOut();
|
||||
- else
|
||||
- else
|
||||
- if @issue.valid?
|
||||
:plain
|
||||
$("#edit_issue_dialog").dialog("close");
|
||||
|
|
|
@ -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(); });
|
||||
|
||||
|
|
|
@ -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);
|
||||
});
|
||||
|
|
|
@ -22,7 +22,6 @@
|
|||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
<% if current_user %>
|
||||
<%= javascript_tag do %>
|
||||
$(function() {
|
||||
|
|
|
@ -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"
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -7,5 +7,5 @@
|
|||
:plain
|
||||
$("#new_note").replaceWith("#{escape_javascript(render('form'))}");
|
||||
|
||||
:plain
|
||||
:plain
|
||||
$("#submit_note").removeAttr("disabled");
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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"}
|
||||
|
|
|
@ -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"}
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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();
|
||||
});
|
||||
});
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -11,7 +11,7 @@
|
|||
$(".list").toggle();
|
||||
if($(".tile").is(":visible")){
|
||||
$.cookie('project_view', 'tile', { expires: 14 });
|
||||
} else {
|
||||
} else {
|
||||
$.cookie('project_view', 'list', { expires: 14 });
|
||||
}
|
||||
}
|
||||
|
|
|
@ -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")
|
||||
|
|
|
@ -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(); });
|
||||
|
|
|
@ -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>
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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);
|
||||
});
|
||||
|
|
|
@ -20,7 +20,7 @@
|
|||
%hr
|
||||
= render "notes/notes"
|
||||
|
||||
:javascript
|
||||
:javascript
|
||||
$(function(){
|
||||
$("#note_note").live("click", function(){
|
||||
$(this).css("height", "100px");
|
||||
|
|
|
@ -1,2 +1,2 @@
|
|||
:plain
|
||||
:plain
|
||||
$("#notes-list").html("#{escape_javascript(render(:partial => 'notes/notes_list'))}");
|
||||
|
|
|
@ -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"
|
||||
|
|
|
@ -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(); });
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -25,4 +25,3 @@
|
|||
%b Twitter:
|
||||
= user.twitter
|
||||
|
||||
|
||||
|
|
|
@ -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 = {
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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 => /.*/
|
||||
|
|
|
@ -11,7 +11,6 @@ class DeviseCreateUsers < ActiveRecord::Migration
|
|||
# t.lockable :lock_strategy => :failed_attempts, :unlock_strategy => :both
|
||||
# t.token_authenticatable
|
||||
|
||||
|
||||
t.timestamps
|
||||
end
|
||||
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
||||
|
|
|
@ -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 }
|
||||
|
|
|
@ -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 }
|
||||
|
|
|
@ -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
|
||||
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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'
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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 }
|
||||
|
|
|
@ -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"
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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"
|
||||
|
|
|
@ -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}")
|
||||
|
|
|
@ -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")
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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 }
|
||||
|
|
Some files were not shown because too many files have changed in this diff Show more
Loading…
Reference in a new issue