Merge branch 'dev'
This commit is contained in:
gitlabhq
commit
ae47d69281
147 changed files with 1773 additions and 1631 deletions
5
Gemfile
5
Gemfile
|
|
@ -5,7 +5,7 @@ gem 'rails', '3.1.0'
|
|||
gem 'sqlite3'
|
||||
gem 'devise', "1.4.7"
|
||||
gem 'stamp'
|
||||
gem 'will_paginate', '~> 3.0'
|
||||
gem 'kaminari'
|
||||
gem 'haml-rails'
|
||||
gem 'jquery-rails'
|
||||
gem 'grit', :git => 'git://github.com/gitlabhq/grit.git'
|
||||
|
|
@ -16,7 +16,6 @@ gem 'faker'
|
|||
gem 'seed-fu', :git => 'git://github.com/mbleigh/seed-fu.git'
|
||||
gem "inifile"
|
||||
gem "pygments.rb", "0.2.3"
|
||||
gem "kaminari"
|
||||
gem "thin"
|
||||
gem "git"
|
||||
gem "acts_as_list"
|
||||
|
|
@ -34,7 +33,7 @@ end
|
|||
|
||||
group :development, :test do
|
||||
gem 'rspec-rails'
|
||||
gem 'shoulda'
|
||||
gem "shoulda", "~> 3.0.0.beta2"
|
||||
gem 'capybara'
|
||||
gem 'autotest'
|
||||
gem 'autotest-rails'
|
||||
|
|
|
|||
10
Gemfile.lock
10
Gemfile.lock
|
|
@ -200,7 +200,11 @@ GEM
|
|||
ffi (>= 1.0.7)
|
||||
json_pure
|
||||
rubyzip
|
||||
shoulda (2.11.3)
|
||||
shoulda (3.0.0.beta2)
|
||||
shoulda-context (~> 1.0.0.beta1)
|
||||
shoulda-matchers (~> 1.0.0.beta1)
|
||||
shoulda-context (1.0.0.beta1)
|
||||
shoulda-matchers (1.0.0.beta3)
|
||||
simplecov (0.5.3)
|
||||
multi_json (~> 1.0.3)
|
||||
simplecov-html (~> 0.5.3)
|
||||
|
|
@ -232,7 +236,6 @@ GEM
|
|||
multi_json (>= 1.0.2)
|
||||
warden (1.0.5)
|
||||
rack (>= 1.0)
|
||||
will_paginate (3.0.0)
|
||||
xpath (0.1.4)
|
||||
nokogiri (~> 1.3)
|
||||
|
||||
|
|
@ -265,7 +268,7 @@ DEPENDENCIES
|
|||
ruby-debug19
|
||||
sass-rails (~> 3.1.0)
|
||||
seed-fu!
|
||||
shoulda
|
||||
shoulda (~> 3.0.0.beta2)
|
||||
simplecov
|
||||
six
|
||||
sqlite3
|
||||
|
|
@ -274,4 +277,3 @@ DEPENDENCIES
|
|||
thin
|
||||
turn
|
||||
uglifier
|
||||
will_paginate (~> 3.0)
|
||||
|
|
|
|||
|
|
@ -5,11 +5,14 @@
|
|||
// the compiled file.
|
||||
//
|
||||
//= require jquery
|
||||
//= require jquery-ui
|
||||
//= require jquery_ujs
|
||||
//= require jquery.ui.selectmenu
|
||||
//= require jquery.cookie
|
||||
//= require_tree .
|
||||
|
||||
$(function(){
|
||||
$(".one_click_select").click(function(){
|
||||
$(".one_click_select").live("click", function(){
|
||||
$(this).select();
|
||||
});
|
||||
|
||||
|
|
|
|||
845
app/assets/javascripts/jquery.ui.selectmenu.js
vendored
845
app/assets/javascripts/jquery.ui.selectmenu.js
vendored
|
|
@ -1,845 +0,0 @@
|
|||
/*
|
||||
* jQuery UI selectmenu dev version
|
||||
*
|
||||
* Copyright (c) 2009 AUTHORS.txt (http://jqueryui.com/about)
|
||||
* Dual licensed under the MIT (MIT-LICENSE.txt)
|
||||
* and GPL (GPL-LICENSE.txt) licenses.
|
||||
*
|
||||
* http://docs.jquery.com/UI
|
||||
* https://github.com/fnagel/jquery-ui/wiki/Selectmenu
|
||||
*/
|
||||
|
||||
(function($) {
|
||||
|
||||
$.widget("ui.selectmenu", {
|
||||
getter: "value",
|
||||
version: "1.8",
|
||||
eventPrefix: "selectmenu",
|
||||
options: {
|
||||
transferClasses: true,
|
||||
typeAhead: "sequential",
|
||||
style: 'dropdown',
|
||||
positionOptions: {
|
||||
my: "left top",
|
||||
at: "left bottom",
|
||||
offset: null
|
||||
},
|
||||
width: null,
|
||||
menuWidth: null,
|
||||
handleWidth: 26,
|
||||
maxHeight: null,
|
||||
icons: null,
|
||||
format: null,
|
||||
bgImage: function() {},
|
||||
wrapperElement: "<div />"
|
||||
},
|
||||
|
||||
_create: function() {
|
||||
var self = this, o = this.options;
|
||||
|
||||
// set a default id value, generate a new random one if not set by developer
|
||||
var selectmenuId = this.element.attr( 'id' ) || 'ui-selectmenu-' + Math.random().toString( 16 ).slice( 2, 10 );
|
||||
|
||||
// quick array of button and menu id's
|
||||
this.ids = [ selectmenuId + '-button', selectmenuId + '-menu' ];
|
||||
|
||||
// define safe mouseup for future toggling
|
||||
this._safemouseup = true;
|
||||
|
||||
// create menu button wrapper
|
||||
this.newelement = $( '<a />', {
|
||||
'class': this.widgetBaseClass + ' ui-widget ui-state-default ui-corner-all',
|
||||
'id' : this.ids[ 0 ],
|
||||
'role': 'button',
|
||||
'href': '#nogo',
|
||||
'tabindex': this.element.attr( 'disabled' ) ? 1 : 0,
|
||||
'aria-haspopup': true,
|
||||
'aria-owns': this.ids[ 1 ]
|
||||
});
|
||||
this.newelementWrap = $( o.wrapperElement )
|
||||
.append( this.newelement )
|
||||
.insertAfter( this.element );
|
||||
|
||||
// transfer tabindex
|
||||
var tabindex = this.element.attr( 'tabindex' );
|
||||
if ( tabindex ) {
|
||||
this.newelement.attr( 'tabindex', tabindex );
|
||||
}
|
||||
|
||||
// save reference to select in data for ease in calling methods
|
||||
this.newelement.data( 'selectelement', this.element );
|
||||
|
||||
// menu icon
|
||||
this.selectmenuIcon = $( '<span class="' + this.widgetBaseClass + '-icon ui-icon"></span>' )
|
||||
.prependTo( this.newelement );
|
||||
|
||||
// append status span to button
|
||||
this.newelement.prepend( '<span class="' + self.widgetBaseClass + '-status" />' );
|
||||
|
||||
// make associated form label trigger focus
|
||||
$( 'label[for="' + selectmenuId + '"]' )
|
||||
.attr( 'for', this.ids[0] )
|
||||
.bind( 'click.selectmenu', function() {
|
||||
self.newelement[0].focus();
|
||||
return false;
|
||||
});
|
||||
|
||||
// click toggle for menu visibility
|
||||
this.newelement
|
||||
.bind('mousedown.selectmenu', function(event) {
|
||||
self._toggle(event, true);
|
||||
// make sure a click won't open/close instantly
|
||||
if (o.style == "popup") {
|
||||
self._safemouseup = false;
|
||||
setTimeout(function() { self._safemouseup = true; }, 300);
|
||||
}
|
||||
return false;
|
||||
})
|
||||
.bind('click.selectmenu', function() {
|
||||
return false;
|
||||
})
|
||||
.bind("keydown.selectmenu", function(event) {
|
||||
var ret = false;
|
||||
switch (event.keyCode) {
|
||||
case $.ui.keyCode.ENTER:
|
||||
ret = true;
|
||||
break;
|
||||
case $.ui.keyCode.SPACE:
|
||||
self._toggle(event);
|
||||
break;
|
||||
case $.ui.keyCode.UP:
|
||||
if (event.altKey) {
|
||||
self.open(event);
|
||||
} else {
|
||||
self._moveSelection(-1);
|
||||
}
|
||||
break;
|
||||
case $.ui.keyCode.DOWN:
|
||||
if (event.altKey) {
|
||||
self.open(event);
|
||||
} else {
|
||||
self._moveSelection(1);
|
||||
}
|
||||
break;
|
||||
case $.ui.keyCode.LEFT:
|
||||
self._moveSelection(-1);
|
||||
break;
|
||||
case $.ui.keyCode.RIGHT:
|
||||
self._moveSelection(1);
|
||||
break;
|
||||
case $.ui.keyCode.TAB:
|
||||
ret = true;
|
||||
break;
|
||||
default:
|
||||
ret = true;
|
||||
}
|
||||
return ret;
|
||||
})
|
||||
.bind('keypress.selectmenu', function(event) {
|
||||
self._typeAhead(event.which, 'mouseup');
|
||||
return true;
|
||||
})
|
||||
.bind('mouseover.selectmenu focus.selectmenu', function() {
|
||||
if (!o.disabled) {
|
||||
$(this).addClass(self.widgetBaseClass + '-focus ui-state-hover');
|
||||
}
|
||||
})
|
||||
.bind('mouseout.selectmenu blur.selectmenu', function() {
|
||||
if (!o.disabled) {
|
||||
$(this).removeClass(self.widgetBaseClass + '-focus ui-state-hover');
|
||||
}
|
||||
});
|
||||
|
||||
// document click closes menu
|
||||
$(document).bind("mousedown.selectmenu", function(event) {
|
||||
self.close(event);
|
||||
});
|
||||
|
||||
// change event on original selectmenu
|
||||
this.element
|
||||
.bind("click.selectmenu", function() {
|
||||
self._refreshValue();
|
||||
})
|
||||
// FIXME: newelement can be null under unclear circumstances in IE8
|
||||
// TODO not sure if this is still a problem (fnagel 20.03.11)
|
||||
.bind("focus.selectmenu", function() {
|
||||
if (self.newelement) {
|
||||
self.newelement[0].focus();
|
||||
}
|
||||
});
|
||||
|
||||
// set width when not set via options
|
||||
if (!o.width) {
|
||||
o.width = this.element.outerWidth();
|
||||
}
|
||||
// set menu button width
|
||||
this.newelement.width(o.width);
|
||||
|
||||
// hide original selectmenu element
|
||||
this.element.hide();
|
||||
|
||||
// create menu portion, append to body
|
||||
this.list = $( '<ul />', {
|
||||
'class': 'ui-widget ui-widget-content',
|
||||
'aria-hidden': true,
|
||||
'role': 'listbox',
|
||||
'aria-labelledby': this.ids[0],
|
||||
'id': this.ids[1]
|
||||
});
|
||||
this.listWrap = $( o.wrapperElement )
|
||||
.addClass( self.widgetBaseClass + '-menu' )
|
||||
.append( this.list )
|
||||
.appendTo( 'body' );
|
||||
|
||||
// transfer menu click to menu button
|
||||
this.list
|
||||
.bind("keydown.selectmenu", function(event) {
|
||||
var ret = false;
|
||||
switch (event.keyCode) {
|
||||
case $.ui.keyCode.UP:
|
||||
if (event.altKey) {
|
||||
self.close(event, true);
|
||||
} else {
|
||||
self._moveFocus(-1);
|
||||
}
|
||||
break;
|
||||
case $.ui.keyCode.DOWN:
|
||||
if (event.altKey) {
|
||||
self.close(event, true);
|
||||
} else {
|
||||
self._moveFocus(1);
|
||||
}
|
||||
break;
|
||||
case $.ui.keyCode.LEFT:
|
||||
self._moveFocus(-1);
|
||||
break;
|
||||
case $.ui.keyCode.RIGHT:
|
||||
self._moveFocus(1);
|
||||
break;
|
||||
case $.ui.keyCode.HOME:
|
||||
self._moveFocus(':first');
|
||||
break;
|
||||
case $.ui.keyCode.PAGE_UP:
|
||||
self._scrollPage('up');
|
||||
break;
|
||||
case $.ui.keyCode.PAGE_DOWN:
|
||||
self._scrollPage('down');
|
||||
break;
|
||||
case $.ui.keyCode.END:
|
||||
self._moveFocus(':last');
|
||||
break;
|
||||
case $.ui.keyCode.ENTER:
|
||||
case $.ui.keyCode.SPACE:
|
||||
self.close(event, true);
|
||||
$(event.target).parents('li:eq(0)').trigger('mouseup');
|
||||
break;
|
||||
case $.ui.keyCode.TAB:
|
||||
ret = true;
|
||||
self.close(event, true);
|
||||
$(event.target).parents('li:eq(0)').trigger('mouseup');
|
||||
break;
|
||||
case $.ui.keyCode.ESCAPE:
|
||||
self.close(event, true);
|
||||
break;
|
||||
default:
|
||||
ret = true;
|
||||
}
|
||||
return ret;
|
||||
})
|
||||
.bind('keypress.selectmenu', function(event) {
|
||||
self._typeAhead(event.which, 'focus');
|
||||
return true;
|
||||
})
|
||||
// this allows for using the scrollbar in an overflowed list
|
||||
.bind( 'mousedown.selectmenu mouseup.selectmenu', function() { return false; });
|
||||
|
||||
// needed when window is resized
|
||||
// TODO seems to be useless, but causes errors (fnagel 01.08.11)
|
||||
// see: https://github.com/fnagel/jquery-ui/issues/147
|
||||
// $(window).bind( "resize.selectmenu", $.proxy( self._refreshPosition, this ) );
|
||||
},
|
||||
|
||||
_init: function() {
|
||||
var self = this, o = this.options;
|
||||
|
||||
// serialize selectmenu element options
|
||||
var selectOptionData = [];
|
||||
this.element
|
||||
.find('option')
|
||||
.each(function() {
|
||||
var opt = $(this);
|
||||
selectOptionData.push({
|
||||
value: opt.attr('value'),
|
||||
text: self._formatText(opt.text()),
|
||||
selected: opt.attr('selected'),
|
||||
disabled: opt.attr('disabled'),
|
||||
classes: opt.attr('class'),
|
||||
typeahead: opt.attr('typeahead'),
|
||||
parentOptGroup: opt.parent('optgroup'),
|
||||
bgImage: o.bgImage.call(opt)
|
||||
});
|
||||
});
|
||||
|
||||
// active state class is only used in popup style
|
||||
var activeClass = (self.options.style == "popup") ? " ui-state-active" : "";
|
||||
|
||||
// empty list so we can refresh the selectmenu via selectmenu()
|
||||
this.list.html("");
|
||||
|
||||
// write li's
|
||||
if (selectOptionData.length) {
|
||||
for (var i = 0; i < selectOptionData.length; i++) {
|
||||
var thisLiAttr = { role : 'presentation' };
|
||||
if ( selectOptionData[ i ].disabled ) {
|
||||
thisLiAttr[ 'class' ] = this.namespace + '-state-disabled';
|
||||
}
|
||||
var thisAAttr = {
|
||||
html: selectOptionData[i].text,
|
||||
href : '#nogo',
|
||||
tabindex : -1,
|
||||
role : 'option',
|
||||
'aria-selected' : false
|
||||
};
|
||||
if ( selectOptionData[ i ].disabled ) {
|
||||
thisAAttr[ 'aria-disabled' ] = selectOptionData[ i ].disabled;
|
||||
}
|
||||
if ( selectOptionData[ i ].typeahead ) {
|
||||
thisAAttr[ 'typeahead' ] = selectOptionData[ i ].typeahead;
|
||||
}
|
||||
var thisA = $('<a/>', thisAAttr);
|
||||
var thisLi = $('<li/>', thisLiAttr)
|
||||
.append(thisA)
|
||||
.data('index', i)
|
||||
.addClass(selectOptionData[i].classes)
|
||||
.data('optionClasses', selectOptionData[i].classes || '')
|
||||
.bind("mouseup.selectmenu", function(event) {
|
||||
if (self._safemouseup && !self._disabled(event.currentTarget) && !self._disabled($( event.currentTarget ).parents( "ul>li." + self.widgetBaseClass + "-group " )) ) {
|
||||
var changed = $(this).data('index') != self._selectedIndex();
|
||||
self.index($(this).data('index'));
|
||||
self.select(event);
|
||||
if (changed) {
|
||||
self.change(event);
|
||||
}
|
||||
self.close(event, true);
|
||||
}
|
||||
return false;
|
||||
})
|
||||
.bind("click.selectmenu", function() {
|
||||
return false;
|
||||
})
|
||||
.bind('mouseover.selectmenu focus.selectmenu', function(e) {
|
||||
// no hover if diabled
|
||||
if (!$(e.currentTarget).hasClass(self.namespace + '-state-disabled') && !$(e.currentTarget).parent("ul").parent("li").hasClass(self.namespace + '-state-disabled')) {
|
||||
self._selectedOptionLi().addClass(activeClass);
|
||||
self._focusedOptionLi().removeClass(self.widgetBaseClass + '-item-focus ui-state-hover');
|
||||
$(this).removeClass('ui-state-active').addClass(self.widgetBaseClass + '-item-focus ui-state-hover');
|
||||
}
|
||||
})
|
||||
.bind('mouseout.selectmenu blur.selectmenu', function() {
|
||||
if ($(this).is(self._selectedOptionLi().selector)) {
|
||||
$(this).addClass(activeClass);
|
||||
}
|
||||
$(this).removeClass(self.widgetBaseClass + '-item-focus ui-state-hover');
|
||||
});
|
||||
|
||||
// optgroup or not...
|
||||
if ( selectOptionData[i].parentOptGroup.length ) {
|
||||
var optGroupName = self.widgetBaseClass + '-group-' + this.element.find( 'optgroup' ).index( selectOptionData[i].parentOptGroup );
|
||||
if (this.list.find( 'li.' + optGroupName ).length ) {
|
||||
this.list.find( 'li.' + optGroupName + ':last ul' ).append( thisLi );
|
||||
} else {
|
||||
$(' <li role="presentation" class="' + self.widgetBaseClass + '-group ' + optGroupName + (selectOptionData[i].parentOptGroup.attr("disabled") ? ' ' + this.namespace + '-state-disabled" aria-disabled="true"' : '"' ) + '><span class="' + self.widgetBaseClass + '-group-label">' + selectOptionData[i].parentOptGroup.attr('label') + '</span><ul></ul></li> ')
|
||||
.appendTo( this.list )
|
||||
.find( 'ul' )
|
||||
.append( thisLi );
|
||||
}
|
||||
} else {
|
||||
thisLi.appendTo(this.list);
|
||||
}
|
||||
|
||||
// append icon if option is specified
|
||||
if (o.icons) {
|
||||
for (var j in o.icons) {
|
||||
if (thisLi.is(o.icons[j].find)) {
|
||||
thisLi
|
||||
.data('optionClasses', selectOptionData[i].classes + ' ' + self.widgetBaseClass + '-hasIcon')
|
||||
.addClass(self.widgetBaseClass + '-hasIcon');
|
||||
var iconClass = o.icons[j].icon || "";
|
||||
thisLi
|
||||
.find('a:eq(0)')
|
||||
.prepend('<span class="' + self.widgetBaseClass + '-item-icon ui-icon ' + iconClass + '"></span>');
|
||||
if (selectOptionData[i].bgImage) {
|
||||
thisLi.find('span').css('background-image', selectOptionData[i].bgImage);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
} else {
|
||||
$('<li role="presentation"><a href="#nogo" tabindex="-1" role="option"></a></li>').appendTo(this.list);
|
||||
}
|
||||
// we need to set and unset the CSS classes for dropdown and popup style
|
||||
var isDropDown = ( o.style == 'dropdown' );
|
||||
this.newelement
|
||||
.toggleClass( self.widgetBaseClass + '-dropdown', isDropDown )
|
||||
.toggleClass( self.widgetBaseClass + '-popup', !isDropDown );
|
||||
this.list
|
||||
.toggleClass( self.widgetBaseClass + '-menu-dropdown ui-corner-bottom', isDropDown )
|
||||
.toggleClass( self.widgetBaseClass + '-menu-popup ui-corner-all', !isDropDown )
|
||||
// add corners to top and bottom menu items
|
||||
.find( 'li:first' )
|
||||
.toggleClass( 'ui-corner-top', !isDropDown )
|
||||
.end().find( 'li:last' )
|
||||
.addClass( 'ui-corner-bottom' );
|
||||
this.selectmenuIcon
|
||||
.toggleClass( 'ui-icon-triangle-1-s', isDropDown )
|
||||
.toggleClass( 'ui-icon-triangle-2-n-s', !isDropDown );
|
||||
|
||||
// transfer classes to selectmenu and list
|
||||
if ( o.transferClasses ) {
|
||||
var transferClasses = this.element.attr( 'class' ) || '';
|
||||
this.newelement.add( this.list ).addClass( transferClasses );
|
||||
}
|
||||
|
||||
// set menu width to either menuWidth option value, width option value, or select width
|
||||
if ( o.style == 'dropdown' ) {
|
||||
this.list.width( o.menuWidth ? o.menuWidth : o.width );
|
||||
} else {
|
||||
this.list.width( o.menuWidth ? o.menuWidth : o.width - o.handleWidth );
|
||||
}
|
||||
|
||||
// reset height to auto
|
||||
this.list.css( 'height', 'auto' );
|
||||
var listH = this.listWrap.height();
|
||||
// calculate default max height
|
||||
if ( o.maxHeight && o.maxHeight < listH ) {
|
||||
this.list.height( o.maxHeight );
|
||||
} else {
|
||||
var winH = $( window ).height() / 3;
|
||||
if ( winH < listH ) this.list.height( winH );
|
||||
}
|
||||
|
||||
// save reference to actionable li's (not group label li's)
|
||||
this._optionLis = this.list.find( 'li:not(.' + self.widgetBaseClass + '-group)' );
|
||||
|
||||
// transfer disabled state
|
||||
if ( this.element.attr( 'disabled' ) ) {
|
||||
this.disable();
|
||||
} else {
|
||||
this.enable()
|
||||
}
|
||||
|
||||
// update value
|
||||
this.index( this._selectedIndex() );
|
||||
|
||||
// needed when selectmenu is placed at the very bottom / top of the page
|
||||
window.setTimeout( function() {
|
||||
self._refreshPosition();
|
||||
}, 200 );
|
||||
},
|
||||
|
||||
destroy: function() {
|
||||
this.element.removeData( this.widgetName )
|
||||
.removeClass( this.widgetBaseClass + '-disabled' + ' ' + this.namespace + '-state-disabled' )
|
||||
.removeAttr( 'aria-disabled' )
|
||||
.unbind( ".selectmenu" );
|
||||
|
||||
// TODO unneded as event binding has been disabled
|
||||
// $( window ).unbind( ".selectmenu" );
|
||||
$( document ).unbind( ".selectmenu" );
|
||||
|
||||
// unbind click on label, reset its for attr
|
||||
$( 'label[for=' + this.newelement.attr('id') + ']' )
|
||||
.attr( 'for', this.element.attr( 'id' ) )
|
||||
.unbind( '.selectmenu' );
|
||||
|
||||
this.newelementWrap.remove();
|
||||
this.listWrap.remove();
|
||||
|
||||
this.element.show();
|
||||
|
||||
// call widget destroy function
|
||||
$.Widget.prototype.destroy.apply(this, arguments);
|
||||
},
|
||||
|
||||
_typeAhead: function( code, eventType ){
|
||||
var self = this, focusFound = false, C = String.fromCharCode(code).toUpperCase();
|
||||
c = C.toLowerCase();
|
||||
|
||||
if ( self.options.typeAhead == 'sequential' ) {
|
||||
// clear the timeout so we can use _prevChar
|
||||
window.clearTimeout('ui.selectmenu-' + self.selectmenuId);
|
||||
|
||||
// define our find var
|
||||
var find = typeof( self._prevChar ) == 'undefined' ? '' : self._prevChar.join( '' );
|
||||
|
||||
function focusOptSeq( elem, ind, c ){
|
||||
focusFound = true;
|
||||
$( elem ).trigger( eventType );
|
||||
typeof( self._prevChar ) == 'undefined' ? self._prevChar = [ c ] : self._prevChar[ self._prevChar.length ] = c;
|
||||
}
|
||||
this.list.find( 'li a' ).each( function( i ) {
|
||||
if ( !focusFound ) {
|
||||
// allow the typeahead attribute on the option tag for a more specific lookup
|
||||
var thisText = $( this ).attr( 'typeahead' ) || $(this).text();
|
||||
if ( thisText.indexOf( find + C ) === 0 ) {
|
||||
focusOptSeq( this, i, C );
|
||||
} else if (thisText.indexOf(find+c) === 0 ) {
|
||||
focusOptSeq( this, i, c );
|
||||
}
|
||||
}
|
||||
});
|
||||
// set a 1 second timeout for sequenctial typeahead
|
||||
// keep this set even if we have no matches so it doesnt typeahead somewhere else
|
||||
window.setTimeout( function( el ) {
|
||||
self._prevChar = undefined;
|
||||
}, 1000, self );
|
||||
|
||||
} else {
|
||||
// define self._prevChar if needed
|
||||
if ( !self._prevChar ) { self._prevChar = [ '' , 0 ]; }
|
||||
|
||||
focusFound = false;
|
||||
function focusOpt( elem, ind ){
|
||||
focusFound = true;
|
||||
$( elem ).trigger( eventType );
|
||||
self._prevChar[ 1 ] = ind;
|
||||
}
|
||||
this.list.find( 'li a' ).each(function( i ){
|
||||
if (!focusFound){
|
||||
var thisText = $(this).text();
|
||||
if ( thisText.indexOf( C ) === 0 || thisText.indexOf( c ) === 0 ) {
|
||||
if (self._prevChar[0] == C){
|
||||
if ( self._prevChar[ 1 ] < i ){ focusOpt( this, i ); }
|
||||
} else{
|
||||
focusOpt( this, i );
|
||||
}
|
||||
}
|
||||
}
|
||||
});
|
||||
this._prevChar[ 0 ] = C;
|
||||
}
|
||||
},
|
||||
|
||||
// returns some usefull information, called by callbacks only
|
||||
_uiHash: function() {
|
||||
var index = this.index();
|
||||
return {
|
||||
index: index,
|
||||
option: $("option", this.element).get(index),
|
||||
value: this.element[0].value
|
||||
};
|
||||
},
|
||||
|
||||
open: function(event) {
|
||||
var self = this, o = this.options;
|
||||
if ( self.newelement.attr("aria-disabled") != 'true' ) {
|
||||
self._closeOthers(event);
|
||||
self.newelement.addClass('ui-state-active');
|
||||
|
||||
self.listWrap.appendTo( o.appendTo );
|
||||
self.list.attr('aria-hidden', false);
|
||||
|
||||
if ( o.style == "dropdown" ) {
|
||||
self.newelement.removeClass('ui-corner-all').addClass('ui-corner-top');
|
||||
}
|
||||
|
||||
self.listWrap.addClass( self.widgetBaseClass + '-open' );
|
||||
// positioning needed for IE7 (tested 01.08.11 on MS VPC Image)
|
||||
// see https://github.com/fnagel/jquery-ui/issues/147
|
||||
if ( $.browser.msie && $.browser.version.substr( 0,1 ) == 7 ) {
|
||||
self._refreshPosition();
|
||||
}
|
||||
var selected = self.list.attr('aria-hidden', false).find('li:not(.' + self.widgetBaseClass + '-group):eq(' + self._selectedIndex() + '):visible a');
|
||||
if (selected.length) selected[0].focus();
|
||||
// positioning needed for FF, Chrome, IE8, IE7, IE6 (tested 01.08.11 on MS VPC Image)
|
||||
self._refreshPosition();
|
||||
|
||||
self._trigger("open", event, self._uiHash());
|
||||
}
|
||||
},
|
||||
|
||||
close: function(event, retainFocus) {
|
||||
if ( this.newelement.is('.ui-state-active') ) {
|
||||
this.newelement
|
||||
.removeClass('ui-state-active');
|
||||
this.listWrap.removeClass(this.widgetBaseClass + '-open');
|
||||
this.list.attr('aria-hidden', true);
|
||||
if ( this.options.style == "dropdown" ) {
|
||||
this.newelement.removeClass('ui-corner-top').addClass('ui-corner-all');
|
||||
}
|
||||
if ( retainFocus ) {
|
||||
this.newelement.focus();
|
||||
}
|
||||
this._trigger("close", event, this._uiHash());
|
||||
}
|
||||
},
|
||||
|
||||
change: function(event) {
|
||||
this.element.trigger("change");
|
||||
this._trigger("change", event, this._uiHash());
|
||||
},
|
||||
|
||||
select: function(event) {
|
||||
if (this._disabled(event.currentTarget)) { return false; }
|
||||
this._trigger("select", event, this._uiHash());
|
||||
},
|
||||
|
||||
_closeOthers: function(event) {
|
||||
$('.' + this.widgetBaseClass + '.ui-state-active').not(this.newelement).each(function() {
|
||||
$(this).data('selectelement').selectmenu('close', event);
|
||||
});
|
||||
$('.' + this.widgetBaseClass + '.ui-state-hover').trigger('mouseout');
|
||||
},
|
||||
|
||||
_toggle: function(event, retainFocus) {
|
||||
if ( this.list.parent().is('.' + this.widgetBaseClass + '-open') ) {
|
||||
this.close(event, retainFocus);
|
||||
} else {
|
||||
this.open(event);
|
||||
}
|
||||
},
|
||||
|
||||
_formatText: function(text) {
|
||||
return (this.options.format ? this.options.format(text) : text);
|
||||
},
|
||||
|
||||
_selectedIndex: function() {
|
||||
return this.element[0].selectedIndex;
|
||||
},
|
||||
|
||||
_selectedOptionLi: function() {
|
||||
return this._optionLis.eq(this._selectedIndex());
|
||||
},
|
||||
|
||||
_focusedOptionLi: function() {
|
||||
return this.list.find('.' + this.widgetBaseClass + '-item-focus');
|
||||
},
|
||||
|
||||
_moveSelection: function(amt, recIndex) {
|
||||
// do nothing if disabled
|
||||
if (!this.options.disabled) {
|
||||
var currIndex = parseInt(this._selectedOptionLi().data('index') || 0, 10);
|
||||
var newIndex = currIndex + amt;
|
||||
// do not loop when using up key
|
||||
|
||||
if (newIndex < 0) {
|
||||
newIndex = 0;
|
||||
}
|
||||
if (newIndex > this._optionLis.size() - 1) {
|
||||
newIndex = this._optionLis.size() - 1;
|
||||
}
|
||||
// Occurs when a full loop has been made
|
||||
if (newIndex === recIndex) { return false; }
|
||||
|
||||
if (this._optionLis.eq(newIndex).hasClass( this.namespace + '-state-disabled' )) {
|
||||
// if option at newIndex is disabled, call _moveFocus, incrementing amt by one
|
||||
(amt > 0) ? ++amt : --amt;
|
||||
this._moveSelection(amt, newIndex);
|
||||
} else {
|
||||
return this._optionLis.eq(newIndex).trigger('mouseup');
|
||||
}
|
||||
}
|
||||
},
|
||||
|
||||
_moveFocus: function(amt, recIndex) {
|
||||
if (!isNaN(amt)) {
|
||||
var currIndex = parseInt(this._focusedOptionLi().data('index') || 0, 10);
|
||||
var newIndex = currIndex + amt;
|
||||
} else {
|
||||
var newIndex = parseInt(this._optionLis.filter(amt).data('index'), 10);
|
||||
}
|
||||
|
||||
if (newIndex < 0) {
|
||||
newIndex = 0;
|
||||
}
|
||||
if (newIndex > this._optionLis.size() - 1) {
|
||||
newIndex = this._optionLis.size() - 1;
|
||||
}
|
||||
|
||||
//Occurs when a full loop has been made
|
||||
if (newIndex === recIndex) { return false; }
|
||||
|
||||
var activeID = this.widgetBaseClass + '-item-' + Math.round(Math.random() * 1000);
|
||||
|
||||
this._focusedOptionLi().find('a:eq(0)').attr('id', '');
|
||||
|
||||
if (this._optionLis.eq(newIndex).hasClass( this.namespace + '-state-disabled' )) {
|
||||
// if option at newIndex is disabled, call _moveFocus, incrementing amt by one
|
||||
(amt > 0) ? ++amt : --amt;
|
||||
this._moveFocus(amt, newIndex);
|
||||
} else {
|
||||
this._optionLis.eq(newIndex).find('a:eq(0)').attr('id',activeID).focus();
|
||||
}
|
||||
|
||||
this.list.attr('aria-activedescendant', activeID);
|
||||
},
|
||||
|
||||
_scrollPage: function(direction) {
|
||||
var numPerPage = Math.floor(this.list.outerHeight() / this.list.find('li:first').outerHeight());
|
||||
numPerPage = (direction == 'up' ? -numPerPage : numPerPage);
|
||||
this._moveFocus(numPerPage);
|
||||
},
|
||||
|
||||
_setOption: function(key, value) {
|
||||
this.options[key] = value;
|
||||
// set
|
||||
if (key == 'disabled') {
|
||||
this.close();
|
||||
this.element
|
||||
.add(this.newelement)
|
||||
.add(this.list)[value ? 'addClass' : 'removeClass'](
|
||||
this.widgetBaseClass + '-disabled' + ' ' +
|
||||
this.namespace + '-state-disabled')
|
||||
.attr("aria-disabled", value);
|
||||
}
|
||||
},
|
||||
|
||||
disable: function(index, type){
|
||||
// if options is not provided, call the parents disable function
|
||||
if ( typeof( index ) == 'undefined' ) {
|
||||
this._setOption( 'disabled', true );
|
||||
} else {
|
||||
if ( type == "optgroup" ) {
|
||||
this._disableOptgroup(index);
|
||||
} else {
|
||||
this._disableOption(index);
|
||||
}
|
||||
}
|
||||
},
|
||||
|
||||
enable: function(index, type) {
|
||||
// if options is not provided, call the parents enable function
|
||||
if ( typeof( index ) == 'undefined' ) {
|
||||
this._setOption('disabled', false);
|
||||
} else {
|
||||
if ( type == "optgroup" ) {
|
||||
this._enableOptgroup(index);
|
||||
} else {
|
||||
this._enableOption(index);
|
||||
}
|
||||
}
|
||||
},
|
||||
|
||||
_disabled: function(elem) {
|
||||
return $(elem).hasClass( this.namespace + '-state-disabled' );
|
||||
},
|
||||
|
||||
|
||||
_disableOption: function(index) {
|
||||
var optionElem = this._optionLis.eq(index);
|
||||
if (optionElem) {
|
||||
optionElem.addClass(this.namespace + '-state-disabled')
|
||||
.find("a").attr("aria-disabled", true);
|
||||
this.element.find("option").eq(index).attr("disabled", "disabled");
|
||||
}
|
||||
},
|
||||
|
||||
_enableOption: function(index) {
|
||||
var optionElem = this._optionLis.eq(index);
|
||||
if (optionElem) {
|
||||
optionElem.removeClass( this.namespace + '-state-disabled' )
|
||||
.find("a").attr("aria-disabled", false);
|
||||
this.element.find("option").eq(index).removeAttr("disabled");
|
||||
}
|
||||
},
|
||||
|
||||
_disableOptgroup: function(index) {
|
||||
var optGroupElem = this.list.find( 'li.' + this.widgetBaseClass + '-group-' + index );
|
||||
if (optGroupElem) {
|
||||
optGroupElem.addClass(this.namespace + '-state-disabled')
|
||||
.attr("aria-disabled", true);
|
||||
this.element.find("optgroup").eq(index).attr("disabled", "disabled");
|
||||
}
|
||||
},
|
||||
|
||||
_enableOptgroup: function(index) {
|
||||
var optGroupElem = this.list.find( 'li.' + this.widgetBaseClass + '-group-' + index );
|
||||
if (optGroupElem) {
|
||||
optGroupElem.removeClass(this.namespace + '-state-disabled')
|
||||
.attr("aria-disabled", false);
|
||||
this.element.find("optgroup").eq(index).removeAttr("disabled");
|
||||
}
|
||||
},
|
||||
|
||||
index: function(newValue) {
|
||||
if (arguments.length) {
|
||||
if (!this._disabled($(this._optionLis[newValue]))) {
|
||||
this.element[0].selectedIndex = newValue;
|
||||
this._refreshValue();
|
||||
} else {
|
||||
return false;
|
||||
}
|
||||
} else {
|
||||
return this._selectedIndex();
|
||||
}
|
||||
},
|
||||
|
||||
value: function(newValue) {
|
||||
if (arguments.length) {
|
||||
this.element[0].value = newValue;
|
||||
this._refreshValue();
|
||||
} else {
|
||||
return this.element[0].value;
|
||||
}
|
||||
},
|
||||
|
||||
_refreshValue: function() {
|
||||
var activeClass = (this.options.style == "popup") ? " ui-state-active" : "";
|
||||
var activeID = this.widgetBaseClass + '-item-' + Math.round(Math.random() * 1000);
|
||||
// deselect previous
|
||||
this.list
|
||||
.find('.' + this.widgetBaseClass + '-item-selected')
|
||||
.removeClass(this.widgetBaseClass + "-item-selected" + activeClass)
|
||||
.find('a')
|
||||
.attr('aria-selected', 'false')
|
||||
.attr('id', '');
|
||||
// select new
|
||||
this._selectedOptionLi()
|
||||
.addClass(this.widgetBaseClass + "-item-selected" + activeClass)
|
||||
.find('a')
|
||||
.attr('aria-selected', 'true')
|
||||
.attr('id', activeID);
|
||||
|
||||
// toggle any class brought in from option
|
||||
var currentOptionClasses = (this.newelement.data('optionClasses') ? this.newelement.data('optionClasses') : "");
|
||||
var newOptionClasses = (this._selectedOptionLi().data('optionClasses') ? this._selectedOptionLi().data('optionClasses') : "");
|
||||
this.newelement
|
||||
.removeClass(currentOptionClasses)
|
||||
.data('optionClasses', newOptionClasses)
|
||||
.addClass( newOptionClasses )
|
||||
.find('.' + this.widgetBaseClass + '-status')
|
||||
.html(
|
||||
this._selectedOptionLi()
|
||||
.find('a:eq(0)')
|
||||
.html()
|
||||
);
|
||||
|
||||
this.list.attr('aria-activedescendant', activeID);
|
||||
},
|
||||
|
||||
_refreshPosition: function() {
|
||||
var o = this.options;
|
||||
|
||||
// if its a native pop-up we need to calculate the position of the selected li
|
||||
if ( o.style == "popup" && !o.positionOptions.offset ) {
|
||||
var selected = this._selectedOptionLi();
|
||||
var _offset = "0 -" + ( selected.outerHeight() + selected.offset().top - this.list.offset().top );
|
||||
}
|
||||
// update zIndex if jQuery UI is able to process
|
||||
var zIndexElement = this.element.zIndex();
|
||||
if ( zIndexElement ) {
|
||||
this.listWrap.css( 'zIndex', zIndexElement );
|
||||
}
|
||||
this.listWrap.position({
|
||||
// set options for position plugin
|
||||
of: o.positionOptions.of || this.newelement,
|
||||
my: o.positionOptions.my,
|
||||
at: o.positionOptions.at,
|
||||
offset: o.positionOptions.offset || _offset,
|
||||
collision: o.positionOptions.collision || 'flip'
|
||||
});
|
||||
}
|
||||
});
|
||||
|
||||
})(jQuery);
|
||||
|
|
@ -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){
|
||||
|
|
|
|||
|
|
@ -2,6 +2,8 @@
|
|||
* This is a manifest file that'll automatically include all the stylesheets available in this directory
|
||||
* 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 jquery-ui/jquery-ui
|
||||
*= require jquery-ui/jquery.ui.selectmenu
|
||||
*= 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 */
|
||||
|
|
|
|||
|
|
@ -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,31 +648,55 @@ 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;
|
||||
}
|
||||
&.normal {
|
||||
background: #2c5ca6;
|
||||
color:white;
|
||||
}
|
||||
&.notes {
|
||||
background: #2c5c66;
|
||||
color:white;
|
||||
}
|
||||
}
|
||||
|
||||
#issues-table .issue {
|
||||
&.critical {
|
||||
#issues-table .issue {
|
||||
&.critical {
|
||||
td {
|
||||
//background: #D12F19;
|
||||
//color:#fff;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.top_panel_issues{
|
||||
#issue_search_form {
|
||||
margin:5px 0;
|
||||
input {
|
||||
border:1px solid #D3D3D3;
|
||||
padding: 3px;
|
||||
height: 28px;
|
||||
width: 300px;
|
||||
-webkit-appearance:none;
|
||||
box-sizing: border-box;
|
||||
-moz-box-sizing: border-box;
|
||||
|
||||
&:focus {
|
||||
border-color:#c2e1ef;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -4,29 +4,14 @@ class Admin::ProjectsController < ApplicationController
|
|||
|
||||
def index
|
||||
@admin_projects = Project.page(params[:page])
|
||||
|
||||
respond_to do |format|
|
||||
format.html # index.html.erb
|
||||
format.json { render json: @admin_projects }
|
||||
end
|
||||
end
|
||||
|
||||
def show
|
||||
@admin_project = Project.find_by_code(params[:id])
|
||||
|
||||
respond_to do |format|
|
||||
format.html # show.html.erb
|
||||
format.json { render json: @admin_project }
|
||||
end
|
||||
end
|
||||
|
||||
def new
|
||||
@admin_project = Project.new
|
||||
|
||||
respond_to do |format|
|
||||
format.html # new.html.erb
|
||||
format.json { render json: @admin_project }
|
||||
end
|
||||
end
|
||||
|
||||
def edit
|
||||
|
|
@ -37,28 +22,20 @@ class Admin::ProjectsController < ApplicationController
|
|||
@admin_project = Project.new(params[:project])
|
||||
@admin_project.owner = current_user
|
||||
|
||||
respond_to do |format|
|
||||
if @admin_project.save
|
||||
format.html { redirect_to [:admin, @admin_project], notice: 'Project was successfully created.' }
|
||||
format.json { render json: @admin_project, status: :created, location: @admin_project }
|
||||
else
|
||||
format.html { render action: "new" }
|
||||
format.json { render json: @admin_project.errors, status: :unprocessable_entity }
|
||||
end
|
||||
if @admin_project.save
|
||||
redirect_to [:admin, @admin_project], notice: 'Project was successfully created.'
|
||||
else
|
||||
render :action => "new"
|
||||
end
|
||||
end
|
||||
|
||||
def update
|
||||
@admin_project = Project.find_by_code(params[:id])
|
||||
|
||||
respond_to do |format|
|
||||
if @admin_project.update_attributes(params[:project])
|
||||
format.html { redirect_to [:admin, @admin_project], notice: 'Project was successfully updated.' }
|
||||
format.json { head :ok }
|
||||
else
|
||||
format.html { render action: "edit" }
|
||||
format.json { render json: @admin_project.errors, status: :unprocessable_entity }
|
||||
end
|
||||
if @admin_project.update_attributes(params[:project])
|
||||
redirect_to [:admin, @admin_project], notice: 'Project was successfully updated.'
|
||||
else
|
||||
render :action => "edit"
|
||||
end
|
||||
end
|
||||
|
||||
|
|
@ -66,9 +43,6 @@ class Admin::ProjectsController < ApplicationController
|
|||
@admin_project = Project.find_by_code(params[:id])
|
||||
@admin_project.destroy
|
||||
|
||||
respond_to do |format|
|
||||
format.html { redirect_to admin_projects_url }
|
||||
format.json { head :ok }
|
||||
end
|
||||
redirect_to admin_projects_url
|
||||
end
|
||||
end
|
||||
|
|
|
|||
|
|
@ -4,29 +4,14 @@ class Admin::TeamMembersController < ApplicationController
|
|||
|
||||
def index
|
||||
@admin_team_members = UsersProject.page(params[:page]).per(100).order("project_id DESC")
|
||||
|
||||
respond_to do |format|
|
||||
format.html # index.html.erb
|
||||
format.json { render json: @admin_team_members }
|
||||
end
|
||||
end
|
||||
|
||||
def show
|
||||
@admin_team_member = UsersProject.find(params[:id])
|
||||
|
||||
respond_to do |format|
|
||||
format.html # show.html.erb
|
||||
format.json { render json: @admin_team_member }
|
||||
end
|
||||
end
|
||||
|
||||
def new
|
||||
@admin_team_member = UsersProject.new(params[:team_member])
|
||||
|
||||
respond_to do |format|
|
||||
format.html # new.html.erb
|
||||
format.json { render json: @admin_team_member }
|
||||
end
|
||||
end
|
||||
|
||||
def edit
|
||||
|
|
@ -37,14 +22,10 @@ class Admin::TeamMembersController < ApplicationController
|
|||
@admin_team_member = UsersProject.new(params[:team_member])
|
||||
@admin_team_member.project_id = params[:team_member][:project_id]
|
||||
|
||||
respond_to do |format|
|
||||
if @admin_team_member.save
|
||||
format.html { redirect_to admin_team_member_path(@admin_team_member), notice: 'UsersProject was successfully created.' }
|
||||
format.json { render json: @admin_team_member, status: :created, location: @team_member }
|
||||
else
|
||||
format.html { render action: "new" }
|
||||
format.json { render json: @admin_team_member.errors, status: :unprocessable_entity }
|
||||
end
|
||||
if @admin_team_member.save
|
||||
redirect_to admin_team_member_path(@admin_team_member), notice: 'UsersProject was successfully created.'
|
||||
else
|
||||
render action: "new"
|
||||
end
|
||||
end
|
||||
|
||||
|
|
@ -52,14 +33,10 @@ class Admin::TeamMembersController < ApplicationController
|
|||
@admin_team_member = UsersProject.find(params[:id])
|
||||
@admin_team_member.project_id = params[:team_member][:project_id]
|
||||
|
||||
respond_to do |format|
|
||||
if @admin_team_member.update_attributes(params[:team_member])
|
||||
format.html { redirect_to admin_team_member_path(@admin_team_member), notice: 'UsersProject was successfully updated.' }
|
||||
format.json { head :ok }
|
||||
else
|
||||
format.html { render action: "edit" }
|
||||
format.json { render json: @admin_team_member.errors, status: :unprocessable_entity }
|
||||
end
|
||||
if @admin_team_member.update_attributes(params[:team_member])
|
||||
redirect_to admin_team_member_path(@admin_team_member), notice: 'UsersProject was successfully updated.'
|
||||
else
|
||||
render action: "edit"
|
||||
end
|
||||
end
|
||||
|
||||
|
|
@ -67,9 +44,6 @@ class Admin::TeamMembersController < ApplicationController
|
|||
@admin_team_member = UsersProject.find(params[:id])
|
||||
@admin_team_member.destroy
|
||||
|
||||
respond_to do |format|
|
||||
format.html { redirect_to admin_team_members_url }
|
||||
format.json { head :ok }
|
||||
end
|
||||
redirect_to admin_team_members_url
|
||||
end
|
||||
end
|
||||
|
|
|
|||
|
|
@ -4,29 +4,14 @@ class Admin::UsersController < ApplicationController
|
|||
|
||||
def index
|
||||
@admin_users = User.page(params[:page])
|
||||
|
||||
respond_to do |format|
|
||||
format.html # index.html.erb
|
||||
format.json { render json: @admin_users }
|
||||
end
|
||||
end
|
||||
|
||||
def show
|
||||
@admin_user = User.find(params[:id])
|
||||
|
||||
respond_to do |format|
|
||||
format.html # show.html.erb
|
||||
format.json { render json: @admin_user }
|
||||
end
|
||||
end
|
||||
|
||||
def new
|
||||
@admin_user = User.new(:projects_limit => 10)
|
||||
|
||||
respond_to do |format|
|
||||
format.html # new.html.erb
|
||||
format.json { render json: @admin_user }
|
||||
end
|
||||
end
|
||||
|
||||
def edit
|
||||
|
|
@ -36,7 +21,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 +39,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
|
||||
|
||||
|
|
@ -34,7 +34,7 @@ class IssuesController < ApplicationController
|
|||
end
|
||||
|
||||
def show
|
||||
@notes = @issue.notes
|
||||
@notes = @issue.notes.order("created_at ASC")
|
||||
@note = @project.notes.new(:noteable => @issue)
|
||||
end
|
||||
|
||||
|
|
@ -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,23 @@ class IssuesController < ApplicationController
|
|||
render :nothing => true
|
||||
end
|
||||
|
||||
protected
|
||||
def search
|
||||
terms = params['terms']
|
||||
|
||||
@project = Project.find(params['project'])
|
||||
@issues = case params[:status].to_i
|
||||
when 1 then @project.issues
|
||||
when 2 then @project.issues.closed
|
||||
when 3 then @project.issues.opened.assigned(current_user)
|
||||
else @project.issues.opened
|
||||
end
|
||||
|
||||
@issues = @issues.where("title LIKE ? OR content LIKE ?", "%#{terms}%", "%#{terms}%") unless terms.blank?
|
||||
|
||||
render :partial => 'issues'
|
||||
end
|
||||
|
||||
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,8 +114,8 @@ class ProjectsController < ApplicationController
|
|||
|
||||
respond_to do |format|
|
||||
format.html # show.html.erb
|
||||
format.js do
|
||||
# disable cache to allow back button works
|
||||
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"
|
||||
response.headers["Expires"] = "Fri, 01 Jan 1990 00:00:00 GMT"
|
||||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -1,2 +1,11 @@
|
|||
module SnippetsHelper
|
||||
def lifetime_select_options
|
||||
options = [
|
||||
['forever', nil],
|
||||
['1 day', "#{Date.current + 1.day}"],
|
||||
['1 week', "#{Date.current + 1.week}"],
|
||||
['1 month', "#{Date.current + 1.month}"]
|
||||
]
|
||||
options_for_select(options)
|
||||
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,10 +13,10 @@ class Issue < ActiveRecord::Base
|
|||
validates :title,
|
||||
:presence => true,
|
||||
:length => { :within => 0..255 }
|
||||
|
||||
validates :content,
|
||||
:presence => true,
|
||||
:length => { :within => 0..2000 }
|
||||
|
||||
#validates :content,
|
||||
#:presence => true,
|
||||
#:length => { :within => 0..2000 }
|
||||
|
||||
scope :critical, where(:critical => true)
|
||||
scope :non_critical, where(:critical => false)
|
||||
|
|
@ -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,18 +7,18 @@ class Note < ActiveRecord::Base
|
|||
belongs_to :author,
|
||||
:class_name => "User"
|
||||
|
||||
attr_protected :author, :author_id
|
||||
attr_protected :author, :author_id
|
||||
|
||||
validates_presence_of :project
|
||||
|
||||
validates :note,
|
||||
:presence => true,
|
||||
:length => { :within => 0..255 }
|
||||
:length => { :within => 0..5000 }
|
||||
|
||||
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,11 @@ class Snippet < ActiveRecord::Base
|
|||
:presence => true,
|
||||
:length => { :within => 0..10000 }
|
||||
|
||||
scope :fresh, order("created_at DESC")
|
||||
scope :non_expired, where(["expires_at IS NULL OR expires_at > ?", Time.current])
|
||||
|
||||
def self.content_types
|
||||
[
|
||||
[
|
||||
".rb", ".py", ".pl", ".scala", ".c", ".cpp", ".java",
|
||||
".haml", ".html", ".sass", ".scss", ".xml", ".php", ".erb",
|
||||
".js", ".sh", ".coffee", ".yml", ".md"
|
||||
|
|
@ -34,6 +36,10 @@ class Snippet < ActiveRecord::Base
|
|||
def colorize
|
||||
system_colorize(content, file_name)
|
||||
end
|
||||
|
||||
def expired?
|
||||
expires_at && expires_at < Time.current
|
||||
end
|
||||
end
|
||||
# == Schema Information
|
||||
#
|
||||
|
|
@ -47,5 +53,6 @@ end
|
|||
# created_at :datetime
|
||||
# updated_at :datetime
|
||||
# file_name :string(255)
|
||||
# expires_at :datetime
|
||||
#
|
||||
|
||||
|
|
|
|||
|
|
@ -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/
|
||||
|
|
|
|||
|
|
@ -2,6 +2,7 @@
|
|||
- line_new = 0
|
||||
- lines_arr = diff.diff.lines.to_a
|
||||
- lines_arr.each do |line|
|
||||
- next if line.match(/^--- \/dev\/null/)
|
||||
- next if line.match(/^--- a/)
|
||||
- next if line.match(/^\+\+\+ b/)
|
||||
- if line.match(/^@@ -/)
|
||||
|
|
@ -12,10 +13,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" %>
|
||||
|
|
|
|||
|
|
@ -7,10 +7,10 @@
|
|||
|
||||
.span-8
|
||||
= f.label :title
|
||||
= f.text_field :title, :style => "width:450px"
|
||||
.span-8
|
||||
= f.label :content
|
||||
= f.text_area :content, :style => "width:450px; height:130px"
|
||||
= f.text_area :title, :style => "width:450px; height:100px", :maxlength => 255
|
||||
-#.span-8
|
||||
-#= f.label :content
|
||||
-#= f.text_area :content, :style => "width:450px; height:130px"
|
||||
.span-8.append-bottom
|
||||
= f.label :assignee_id
|
||||
= f.select(:assignee_id, @project.users.all.collect {|p| [ p.name, p.id ] }, { :include_blank => "Select user" })
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
%tr{ :id => dom_id(issue), :class => "issue #{issue.critical ? "critical" : ""}", :url => project_issue_path(@project, issue) }
|
||||
- if can?(current_user, :admin_issue, @project) && !params[:f] || params[:f] == "0"
|
||||
- if can?(current_user, :admin_issue, @project) && (!params[:f] || params[:f] == "0")
|
||||
%td
|
||||
= image_tag "move.png" , :class => [:handle, :left]
|
||||
%td
|
||||
|
|
@ -7,7 +7,7 @@
|
|||
= truncate issue.assignee.name, :lenght => 20
|
||||
%td ##{issue.id}
|
||||
%td
|
||||
= html_escape issue.title
|
||||
= truncate(html_escape(issue.title), :length => 60)
|
||||
%br
|
||||
- if issue.critical
|
||||
%span.tag.high critical
|
||||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -1,28 +1,52 @@
|
|||
%div
|
||||
- if can? current_user, :write_issue, @project
|
||||
.left= link_to 'New Issue', new_project_issue_path(@project), :remote => true, :class => "lbutton vm"
|
||||
.right
|
||||
= form_tag project_issues_path(@project), :method => :get do
|
||||
.span-2
|
||||
= radio_button_tag :f, 0, (params[:f] || "0") == "0", :onclick => "this.form.submit()", :id => "open_issues"
|
||||
= label_tag "open_issues","Open"
|
||||
.span-2
|
||||
= radio_button_tag :f, 2, params[:f] == "2", :onclick => "this.form.submit()", :id => "closed_issues"
|
||||
= label_tag "closed_issues","Closed"
|
||||
.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"
|
||||
.top_panel_issues
|
||||
- if can? current_user, :write_issue, @project
|
||||
%div{:class => "left", :style => "margin-right: 10px;" }
|
||||
= link_to 'New Issue', new_project_issue_path(@project), :remote => true, :class => "lbutton vm"
|
||||
= form_tag search_project_issues_path(@project), :method => :get, :remote => true, :class => :left, :id => "issue_search_form" do
|
||||
= hidden_field_tag :project_id, @project.id, { :id => 'project_id' }
|
||||
= search_field_tag :issue_search, nil, { :placeholder => 'Search', :class => 'issue_search' }
|
||||
|
||||
.right
|
||||
= form_tag project_issues_path(@project), :method => :get do
|
||||
.span-2
|
||||
= radio_button_tag :f, 0, (params[:f] || "0") == "0", :onclick => "this.form.submit()", :id => "open_issues", :class => "status"
|
||||
= label_tag "open_issues","Open"
|
||||
.span-2
|
||||
= radio_button_tag :f, 2, params[:f] == "2", :onclick => "this.form.submit()", :id => "closed_issues", :class => "status"
|
||||
= label_tag "closed_issues","Closed"
|
||||
.span-2
|
||||
= radio_button_tag :f, 3, params[:f] == "3", :onclick => "this.form.submit()", :id => "my_issues", :class => "status"
|
||||
= label_tag "my_issues","To Me"
|
||||
.span-2
|
||||
= radio_button_tag :f, 1, params[:f] == "1", :onclick => "this.form.submit()", :id => "all_issues", :class => "status"
|
||||
= label_tag "all_issues","All"
|
||||
|
||||
#issues-table-holder= render "issues"
|
||||
%br
|
||||
:javascript
|
||||
$('.delete-issue').live('ajax:success', function() {
|
||||
$(this).closest('tr').fadeOut(); });
|
||||
|
||||
var href = $('.issue_search').parent().attr('action');
|
||||
var last_terms = '';
|
||||
|
||||
$('.issue_search').keyup(function() {
|
||||
var terms = $(this).val();
|
||||
var project_id = $('#project_id').val();
|
||||
var status = $('.status:checked').val();
|
||||
if (terms != last_terms) {
|
||||
last_terms = terms;
|
||||
|
||||
if (terms.length >= 2 || terms.length == 0) {
|
||||
$.get(href, { 'status': status, 'terms': terms, project: project_id }, function(response) {
|
||||
$('#issues-table').html(response);
|
||||
setSortable();
|
||||
});
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
$('.delete-issue').live('ajax:success', function() {
|
||||
$(this).closest('tr').fadeOut(); updatePage();});
|
||||
|
||||
function setSortable(){
|
||||
$('#issues-table>tbody').sortable({
|
||||
axis: 'y',
|
||||
|
|
|
|||
|
|
@ -1,44 +1,57 @@
|
|||
%h2
|
||||
= "Issue ##{@issue.id} - #{@issue.title}"
|
||||
|
||||
= "Issue ##{@issue.id} - #{html_escape(@issue.title)}"
|
||||
.span-15
|
||||
= simple_format html_escape(@issue.content)
|
||||
-#= simple_format html_escape(@issue.content)
|
||||
.issue_notes= render "notes/notes"
|
||||
.span-8.right
|
||||
.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
|
||||
%tr
|
||||
%td Tags
|
||||
%td
|
||||
- if @issue.critical
|
||||
%span.tag.high critical
|
||||
- else
|
||||
%span.tag.normal normal
|
||||
|
||||
- if @issue.today?
|
||||
%span.tag.today today
|
||||
%tr
|
||||
%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
|
||||
|
||||
|
||||
- if can?(current_user, :admin_issue, @issue)
|
||||
.clear
|
||||
= link_to 'Edit', edit_project_issue_path(@project, @issue), :class => "lbutton positive", :remote => true
|
||||
.right= link_to 'Destroy', [@project, @issue], :confirm => 'Are you sure?', :method => :delete, :class => "lbutton delete-issue negative", :id => "destroy_issue_#{@issue.id}"
|
||||
.clear
|
||||
|
||||
|
|
|
|||
|
|
@ -1,2 +1,2 @@
|
|||
:plain
|
||||
:plain
|
||||
$("#notes-list").html("#{escape_javascript(render(:partial => 'notes/notes_list'))}");
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
- if @issue.valid?
|
||||
:plain
|
||||
$("##{dom_id(@issue)}").fadeOut();
|
||||
- else
|
||||
- else
|
||||
- if @issue.valid?
|
||||
:plain
|
||||
$("#edit_issue_dialog").dialog("close");
|
||||
$.ajax({type: "GET", url: location.href, dataType: "script"});
|
||||
updatePage();
|
||||
- else
|
||||
:plain
|
||||
$("#edit_issue_dialog").empty();
|
||||
|
|
|
|||
|
|
@ -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() {
|
||||
|
|
|
|||
|
|
@ -7,7 +7,6 @@
|
|||
= stylesheet_link_tag 'blueprint/print', :media => "print"
|
||||
= stylesheet_link_tag 'blueprint/plugins/buttons/screen', :media => "screen, projection"
|
||||
= stylesheet_link_tag 'blueprint/plugins/link-icons/screen', :media => "screen, projection"
|
||||
= stylesheet_link_tag 'jquery_ui/jquery-ui-1.8.16.custom', :media => "screen, projection"
|
||||
= stylesheet_link_tag "application"
|
||||
= javascript_include_tag "application"
|
||||
= csrf_meta_tags
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@
|
|||
|
||||
%div
|
||||
= f.label :note
|
||||
%cite (255 symbols only)
|
||||
%cite
|
||||
%br
|
||||
= f.text_area :note, :size => 255
|
||||
|
||||
|
|
@ -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(); });
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@
|
|||
= link_to project_snippets_path(@project), :class => (controller.controller_name == "snippets") ? "current" : nil do
|
||||
Snippets
|
||||
- if @project.snippets.count > 0
|
||||
%span{ :class => "top_menu_count" }= @project.snippets.count
|
||||
%span{ :class => "top_menu_count" }= @project.snippets.non_expired.count
|
||||
|
||||
- if @commit
|
||||
%span= link_to truncate(commit_name(@project,@commit), :length => 15), project_commit_path(@project, :id => @commit.id), :class => current_page?(:controller => "commits", :action => "show", :project_id => @project, :id => @commit.id) ? "current" : nil
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -21,3 +21,8 @@
|
|||
%h3 Talk
|
||||
=render "projects/recent_messages"
|
||||
|
||||
:javascript
|
||||
function updateDashboard(){
|
||||
$('#content-container').load("#{escape_javascript(project_path(@project))} #content-container>*");
|
||||
}
|
||||
setInterval("updateDashboard()", 300000);
|
||||
|
|
|
|||
|
|
@ -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'))}");
|
||||
|
|
|
|||
|
|
@ -12,11 +12,14 @@
|
|||
%tr
|
||||
%td= f.label :file_name
|
||||
%td= f.text_field :file_name, :placeholder => "example.rb"
|
||||
%tr
|
||||
%td= f.label "Lifetime"
|
||||
%td= f.select :expires_at, lifetime_select_options
|
||||
%tr
|
||||
%td{:colspan => 2}
|
||||
= f.label :content, "Code"
|
||||
%br
|
||||
= f.text_area :content, :style => "height:240px;width:932px;"
|
||||
|
||||
|
||||
.actions.prepend-top
|
||||
= f.submit 'Save', :class => "lbutton vm"
|
||||
|
|
|
|||
|
|
@ -1,11 +1,12 @@
|
|||
%tr{ :id => dom_id(snippet), :class => "snippet", :url => project_snippet_path(@project, snippet) }
|
||||
%td
|
||||
= image_tag gravatar_icon(snippet.author.email), :class => "left", :width => 40, :style => "padding:0 5px;"
|
||||
= truncate snippet.author.name, :lenght => 20
|
||||
%td= html_escape snippet.title
|
||||
%td= html_escape snippet.file_name
|
||||
%td
|
||||
- if can?(current_user, :admin_snippet, @project) || snippet.author == current_user
|
||||
= link_to 'Edit', edit_project_snippet_path(@project, snippet), :class => "lbutton positive"
|
||||
- if can?(current_user, :admin_snippet, @project) || snippet.author == current_user
|
||||
= link_to 'Destroy', [@project, snippet], :confirm => 'Are you sure?', :method => :delete, :remote => true, :class => "lbutton delete-snippet negative", :id => "destroy_snippet_#{snippet.id}"
|
||||
- unless snippet.expired?
|
||||
%tr{ :id => dom_id(snippet), :class => "snippet", :url => project_snippet_path(@project, snippet) }
|
||||
%td
|
||||
= image_tag gravatar_icon(snippet.author.email), :class => "left", :width => 40, :style => "padding:0 5px;"
|
||||
= truncate snippet.author.name, :lenght => 20
|
||||
%td= html_escape snippet.title
|
||||
%td= html_escape snippet.file_name
|
||||
%td
|
||||
- if can?(current_user, :admin_snippet, @project) || snippet.author == current_user
|
||||
= link_to 'Edit', edit_project_snippet_path(@project, snippet), :class => "lbutton positive"
|
||||
- if can?(current_user, :admin_snippet, @project) || snippet.author == current_user
|
||||
= link_to 'Destroy', [@project, snippet], :confirm => 'Are you sure?', :method => :delete, :remote => true, :class => "lbutton delete-snippet negative", :id => "destroy_snippet_#{snippet.id}"
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@
|
|||
%th Title
|
||||
%th File name
|
||||
%th
|
||||
= render @snippets
|
||||
= render @snippets.fresh
|
||||
:javascript
|
||||
$('.delete-snippet').live('ajax:success', function() {
|
||||
$(this).closest('tr').fadeOut(); });
|
||||
$('.delete-snippet').live('ajax:success', function() {
|
||||
$(this).closest('tr').fadeOut(); });
|
||||
|
|
|
|||
|
|
@ -1,22 +1,26 @@
|
|||
%h2
|
||||
= "Snippet ##{@snippet.id} - #{@snippet.title}"
|
||||
- if !@snippet.expired?
|
||||
%h2
|
||||
= "Snippet ##{@snippet.id} - #{@snippet.title}"
|
||||
|
||||
.view_file
|
||||
.view_file_header
|
||||
%strong
|
||||
= @snippet.file_name
|
||||
%br/
|
||||
.view_file_content
|
||||
:erb
|
||||
<%= raw @snippet.colorize %>
|
||||
.view_file
|
||||
.view_file_header
|
||||
%strong
|
||||
= @snippet.file_name
|
||||
%br/
|
||||
.view_file_content
|
||||
:erb
|
||||
<%= raw @snippet.colorize %>
|
||||
|
||||
- if can?(current_user, :admin_snippet, @project) || @snippet.author == current_user
|
||||
= link_to 'Edit', edit_project_snippet_path(@project, @snippet), :class => "lbutton positive"
|
||||
- if can?(current_user, :admin_snippet, @project) || @snippet.author == current_user
|
||||
= link_to 'Destroy', [@project, @snippet], :confirm => 'Are you sure?', :method => :delete, :class => "lbutton delete-snippet negative", :id => "destroy_snippet_#{@snippet.id}"
|
||||
.clear
|
||||
%br
|
||||
.snippet_notes= render "notes/notes"
|
||||
- if can?(current_user, :admin_snippet, @project) || @snippet.author == current_user
|
||||
= link_to 'Edit', edit_project_snippet_path(@project, @snippet), :class => "lbutton positive"
|
||||
- if can?(current_user, :admin_snippet, @project) || @snippet.author == current_user
|
||||
= link_to 'Destroy', [@project, @snippet], :confirm => 'Are you sure?', :method => :delete, :class => "lbutton delete-snippet negative", :id => "destroy_snippet_#{@snippet.id}"
|
||||
.clear
|
||||
%br
|
||||
.snippet_notes= render "notes/notes"
|
||||
|
||||
.clear
|
||||
.clear
|
||||
|
||||
- else
|
||||
%h2
|
||||
Sorry, this snippet is no longer exists
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -44,5 +44,8 @@ module Gitlab
|
|||
|
||||
# Version of your assets, change this if you want to expire all your assets
|
||||
config.assets.version = '1.0'
|
||||
|
||||
# Extend assets path
|
||||
config.assets.paths << Rails.root.join('vendor', 'assets', 'images', 'jquery-ui')
|
||||
end
|
||||
end
|
||||
|
|
|
|||
|
|
@ -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 => /.*/
|
||||
|
|
@ -47,6 +47,9 @@ Gitlab::Application.routes.draw do
|
|||
collection do
|
||||
post :sort
|
||||
end
|
||||
collection do
|
||||
get :search
|
||||
end
|
||||
end
|
||||
resources :notes, :only => [:create, :destroy]
|
||||
end
|
||||
|
|
|
|||
|
|
@ -11,7 +11,6 @@ class DeviseCreateUsers < ActiveRecord::Migration
|
|||
# t.lockable :lock_strategy => :failed_attempts, :unlock_strategy => :both
|
||||
# t.token_authenticatable
|
||||
|
||||
|
||||
t.timestamps
|
||||
end
|
||||
|
||||
|
|
|
|||
5
db/migrate/20111027051828_add_expires_at_to_snippets.rb
Normal file
5
db/migrate/20111027051828_add_expires_at_to_snippets.rb
Normal file
|
|
@ -0,0 +1,5 @@
|
|||
class AddExpiresAtToSnippets < ActiveRecord::Migration
|
||||
def change
|
||||
add_column :snippets, :expires_at, :datetime
|
||||
end
|
||||
end
|
||||
8
db/migrate/20111027142641_change_note_note_to_text.rb
Normal file
8
db/migrate/20111027142641_change_note_note_to_text.rb
Normal file
|
|
@ -0,0 +1,8 @@
|
|||
class ChangeNoteNoteToText < ActiveRecord::Migration
|
||||
def up
|
||||
change_column :notes, :note, :text, :limit => false
|
||||
end
|
||||
|
||||
def down
|
||||
end
|
||||
end
|
||||
34
db/migrate/20111027152724_issue_conten_to_note.rb
Normal file
34
db/migrate/20111027152724_issue_conten_to_note.rb
Normal file
|
|
@ -0,0 +1,34 @@
|
|||
class IssueContenToNote < ActiveRecord::Migration
|
||||
def up
|
||||
puts "Issue content is deprecated -> move to notes"
|
||||
Issue.find_each(:batch_size => 100) do |issue|
|
||||
next if issue.content.blank?
|
||||
note = Note.new(
|
||||
:note => issue.content,
|
||||
:project_id => issue.project_id,
|
||||
:noteable => issue,
|
||||
:created_at => issue.created_at,
|
||||
:updated_at => issue.created_at
|
||||
)
|
||||
note.author_id = issue.author_id
|
||||
|
||||
if note.save
|
||||
issue.update_attributes(:content => nil)
|
||||
print "."
|
||||
else
|
||||
print "F"
|
||||
end
|
||||
end
|
||||
|
||||
total = Issue.where("content is not null").count
|
||||
|
||||
if total > 0
|
||||
puts "content of #{total} issues were not migrated"
|
||||
else
|
||||
puts "Done"
|
||||
end
|
||||
end
|
||||
|
||||
def down
|
||||
end
|
||||
end
|
||||
|
|
@ -11,7 +11,7 @@
|
|||
#
|
||||
# It's strongly recommended to check this file into your version control system.
|
||||
|
||||
ActiveRecord::Schema.define(:version => 20111025134235) do
|
||||
ActiveRecord::Schema.define(:version => 20111027152724) do
|
||||
|
||||
create_table "issues", :force => true do |t|
|
||||
t.string "title"
|
||||
|
|
@ -36,7 +36,7 @@ ActiveRecord::Schema.define(:version => 20111025134235) do
|
|||
end
|
||||
|
||||
create_table "notes", :force => true do |t|
|
||||
t.string "note"
|
||||
t.text "note"
|
||||
t.string "noteable_id"
|
||||
t.string "noteable_type"
|
||||
t.integer "author_id"
|
||||
|
|
@ -65,6 +65,7 @@ ActiveRecord::Schema.define(:version => 20111025134235) do
|
|||
t.datetime "created_at"
|
||||
t.datetime "updated_at"
|
||||
t.string "file_name"
|
||||
t.datetime "expires_at"
|
||||
end
|
||||
|
||||
create_table "users", :force => true do |t|
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -32,7 +32,6 @@ end
|
|||
|
||||
Factory.add(:issue, Issue) do |obj|
|
||||
obj.title = Faker::Lorem.sentence
|
||||
obj.content = Faker::Lorem.sentences
|
||||
end
|
||||
|
||||
Factory.add(:snippet, Snippet) do |obj|
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
||||
|
|
|
|||
Some files were not shown because too many files have changed in this diff Show more
Loading…
Reference in a new issue