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 'sqlite3'
|
||||||
gem 'devise', "1.4.7"
|
gem 'devise', "1.4.7"
|
||||||
gem 'stamp'
|
gem 'stamp'
|
||||||
gem 'will_paginate', '~> 3.0'
|
gem 'kaminari'
|
||||||
gem 'haml-rails'
|
gem 'haml-rails'
|
||||||
gem 'jquery-rails'
|
gem 'jquery-rails'
|
||||||
gem 'grit', :git => 'git://github.com/gitlabhq/grit.git'
|
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 'seed-fu', :git => 'git://github.com/mbleigh/seed-fu.git'
|
||||||
gem "inifile"
|
gem "inifile"
|
||||||
gem "pygments.rb", "0.2.3"
|
gem "pygments.rb", "0.2.3"
|
||||||
gem "kaminari"
|
|
||||||
gem "thin"
|
gem "thin"
|
||||||
gem "git"
|
gem "git"
|
||||||
gem "acts_as_list"
|
gem "acts_as_list"
|
||||||
|
|
@ -34,7 +33,7 @@ end
|
||||||
|
|
||||||
group :development, :test do
|
group :development, :test do
|
||||||
gem 'rspec-rails'
|
gem 'rspec-rails'
|
||||||
gem 'shoulda'
|
gem "shoulda", "~> 3.0.0.beta2"
|
||||||
gem 'capybara'
|
gem 'capybara'
|
||||||
gem 'autotest'
|
gem 'autotest'
|
||||||
gem 'autotest-rails'
|
gem 'autotest-rails'
|
||||||
|
|
|
||||||
10
Gemfile.lock
10
Gemfile.lock
|
|
@ -200,7 +200,11 @@ GEM
|
||||||
ffi (>= 1.0.7)
|
ffi (>= 1.0.7)
|
||||||
json_pure
|
json_pure
|
||||||
rubyzip
|
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)
|
simplecov (0.5.3)
|
||||||
multi_json (~> 1.0.3)
|
multi_json (~> 1.0.3)
|
||||||
simplecov-html (~> 0.5.3)
|
simplecov-html (~> 0.5.3)
|
||||||
|
|
@ -232,7 +236,6 @@ GEM
|
||||||
multi_json (>= 1.0.2)
|
multi_json (>= 1.0.2)
|
||||||
warden (1.0.5)
|
warden (1.0.5)
|
||||||
rack (>= 1.0)
|
rack (>= 1.0)
|
||||||
will_paginate (3.0.0)
|
|
||||||
xpath (0.1.4)
|
xpath (0.1.4)
|
||||||
nokogiri (~> 1.3)
|
nokogiri (~> 1.3)
|
||||||
|
|
||||||
|
|
@ -265,7 +268,7 @@ DEPENDENCIES
|
||||||
ruby-debug19
|
ruby-debug19
|
||||||
sass-rails (~> 3.1.0)
|
sass-rails (~> 3.1.0)
|
||||||
seed-fu!
|
seed-fu!
|
||||||
shoulda
|
shoulda (~> 3.0.0.beta2)
|
||||||
simplecov
|
simplecov
|
||||||
six
|
six
|
||||||
sqlite3
|
sqlite3
|
||||||
|
|
@ -274,4 +277,3 @@ DEPENDENCIES
|
||||||
thin
|
thin
|
||||||
turn
|
turn
|
||||||
uglifier
|
uglifier
|
||||||
will_paginate (~> 3.0)
|
|
||||||
|
|
|
||||||
|
|
@ -5,11 +5,14 @@
|
||||||
// the compiled file.
|
// the compiled file.
|
||||||
//
|
//
|
||||||
//= require jquery
|
//= require jquery
|
||||||
|
//= require jquery-ui
|
||||||
//= require jquery_ujs
|
//= require jquery_ujs
|
||||||
|
//= require jquery.ui.selectmenu
|
||||||
|
//= require jquery.cookie
|
||||||
//= require_tree .
|
//= require_tree .
|
||||||
|
|
||||||
$(function(){
|
$(function(){
|
||||||
$(".one_click_select").click(function(){
|
$(".one_click_select").live("click", function(){
|
||||||
$(this).select();
|
$(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);
|
|
||||||
|
|
@ -2,6 +2,8 @@
|
||||||
* This is a manifest file that'll automatically include all the stylesheets available in this directory
|
* 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
|
* 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.
|
* 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_self
|
||||||
*= require_tree .
|
*= require_tree .
|
||||||
*/
|
*/
|
||||||
|
|
|
||||||
|
|
@ -53,7 +53,6 @@ table.highlighttable pre{
|
||||||
text-align:left;
|
text-align:left;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
.git-empty .highlight {
|
.git-empty .highlight {
|
||||||
@include round-borders-all(4px);
|
@include round-borders-all(4px);
|
||||||
background:#eee;
|
background:#eee;
|
||||||
|
|
@ -74,7 +73,6 @@ table.highlighttable pre{
|
||||||
box-shadow:0 5px 15px #000;
|
box-shadow:0 5px 15px #000;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
.hll { background-color: #ffffff }
|
.hll { background-color: #ffffff }
|
||||||
.c { color: #888888; font-style: italic } /* Comment */
|
.c { color: #888888; font-style: italic } /* Comment */
|
||||||
.err { color: #a61717; background-color: #e3d2d2 } /* Error */
|
.err { color: #a61717; background-color: #e3d2d2 } /* Error */
|
||||||
|
|
|
||||||
|
|
@ -157,7 +157,6 @@ table.round-borders {
|
||||||
background: transparent 9 !important;
|
background: transparent 9 !important;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
#header-panel {
|
#header-panel {
|
||||||
@include panel-color;
|
@include panel-color;
|
||||||
height:40px;
|
height:40px;
|
||||||
|
|
@ -230,7 +229,6 @@ a {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
.view_file_content{
|
.view_file_content{
|
||||||
.old_line, .new_line {
|
.old_line, .new_line {
|
||||||
background:#ECECEC;
|
background:#ECECEC;
|
||||||
|
|
@ -281,8 +279,6 @@ input.ssh_project_url {
|
||||||
text-align:center;
|
text-align:center;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
.day-commits-table li.commit {
|
.day-commits-table li.commit {
|
||||||
cursor:pointer;
|
cursor:pointer;
|
||||||
|
|
||||||
|
|
@ -599,7 +595,6 @@ tbody tr:nth-child(2n) td, tbody tr.even td {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
span{
|
span{
|
||||||
border: 1px solid #aaa;
|
border: 1px solid #aaa;
|
||||||
color:black;
|
color:black;
|
||||||
|
|
@ -667,6 +662,10 @@ tbody tr:nth-child(2n) td, tbody tr.even td {
|
||||||
background: #4466cc;
|
background: #4466cc;
|
||||||
color:white;
|
color:white;
|
||||||
}
|
}
|
||||||
|
&.normal {
|
||||||
|
background: #2c5ca6;
|
||||||
|
color:white;
|
||||||
|
}
|
||||||
&.notes {
|
&.notes {
|
||||||
background: #2c5c66;
|
background: #2c5c66;
|
||||||
color:white;
|
color:white;
|
||||||
|
|
@ -681,3 +680,23 @@ tbody tr:nth-child(2n) td, tbody tr.even td {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.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;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -4,29 +4,14 @@ class Admin::ProjectsController < ApplicationController
|
||||||
|
|
||||||
def index
|
def index
|
||||||
@admin_projects = Project.page(params[:page])
|
@admin_projects = Project.page(params[:page])
|
||||||
|
|
||||||
respond_to do |format|
|
|
||||||
format.html # index.html.erb
|
|
||||||
format.json { render json: @admin_projects }
|
|
||||||
end
|
|
||||||
end
|
end
|
||||||
|
|
||||||
def show
|
def show
|
||||||
@admin_project = Project.find_by_code(params[:id])
|
@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
|
end
|
||||||
|
|
||||||
def new
|
def new
|
||||||
@admin_project = Project.new
|
@admin_project = Project.new
|
||||||
|
|
||||||
respond_to do |format|
|
|
||||||
format.html # new.html.erb
|
|
||||||
format.json { render json: @admin_project }
|
|
||||||
end
|
|
||||||
end
|
end
|
||||||
|
|
||||||
def edit
|
def edit
|
||||||
|
|
@ -37,28 +22,20 @@ class Admin::ProjectsController < ApplicationController
|
||||||
@admin_project = Project.new(params[:project])
|
@admin_project = Project.new(params[:project])
|
||||||
@admin_project.owner = current_user
|
@admin_project.owner = current_user
|
||||||
|
|
||||||
respond_to do |format|
|
|
||||||
if @admin_project.save
|
if @admin_project.save
|
||||||
format.html { redirect_to [:admin, @admin_project], notice: 'Project was successfully created.' }
|
redirect_to [:admin, @admin_project], notice: 'Project was successfully created.'
|
||||||
format.json { render json: @admin_project, status: :created, location: @admin_project }
|
|
||||||
else
|
else
|
||||||
format.html { render action: "new" }
|
render :action => "new"
|
||||||
format.json { render json: @admin_project.errors, status: :unprocessable_entity }
|
|
||||||
end
|
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
def update
|
def update
|
||||||
@admin_project = Project.find_by_code(params[:id])
|
@admin_project = Project.find_by_code(params[:id])
|
||||||
|
|
||||||
respond_to do |format|
|
|
||||||
if @admin_project.update_attributes(params[:project])
|
if @admin_project.update_attributes(params[:project])
|
||||||
format.html { redirect_to [:admin, @admin_project], notice: 'Project was successfully updated.' }
|
redirect_to [:admin, @admin_project], notice: 'Project was successfully updated.'
|
||||||
format.json { head :ok }
|
|
||||||
else
|
else
|
||||||
format.html { render action: "edit" }
|
render :action => "edit"
|
||||||
format.json { render json: @admin_project.errors, status: :unprocessable_entity }
|
|
||||||
end
|
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
@ -66,9 +43,6 @@ class Admin::ProjectsController < ApplicationController
|
||||||
@admin_project = Project.find_by_code(params[:id])
|
@admin_project = Project.find_by_code(params[:id])
|
||||||
@admin_project.destroy
|
@admin_project.destroy
|
||||||
|
|
||||||
respond_to do |format|
|
redirect_to admin_projects_url
|
||||||
format.html { redirect_to admin_projects_url }
|
|
||||||
format.json { head :ok }
|
|
||||||
end
|
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
|
||||||
|
|
@ -4,29 +4,14 @@ class Admin::TeamMembersController < ApplicationController
|
||||||
|
|
||||||
def index
|
def index
|
||||||
@admin_team_members = UsersProject.page(params[:page]).per(100).order("project_id DESC")
|
@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
|
end
|
||||||
|
|
||||||
def show
|
def show
|
||||||
@admin_team_member = UsersProject.find(params[:id])
|
@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
|
end
|
||||||
|
|
||||||
def new
|
def new
|
||||||
@admin_team_member = UsersProject.new(params[:team_member])
|
@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
|
end
|
||||||
|
|
||||||
def edit
|
def edit
|
||||||
|
|
@ -37,14 +22,10 @@ class Admin::TeamMembersController < ApplicationController
|
||||||
@admin_team_member = UsersProject.new(params[:team_member])
|
@admin_team_member = UsersProject.new(params[:team_member])
|
||||||
@admin_team_member.project_id = params[:team_member][:project_id]
|
@admin_team_member.project_id = params[:team_member][:project_id]
|
||||||
|
|
||||||
respond_to do |format|
|
|
||||||
if @admin_team_member.save
|
if @admin_team_member.save
|
||||||
format.html { redirect_to admin_team_member_path(@admin_team_member), notice: 'UsersProject was successfully created.' }
|
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
|
else
|
||||||
format.html { render action: "new" }
|
render action: "new"
|
||||||
format.json { render json: @admin_team_member.errors, status: :unprocessable_entity }
|
|
||||||
end
|
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
@ -52,14 +33,10 @@ class Admin::TeamMembersController < ApplicationController
|
||||||
@admin_team_member = UsersProject.find(params[:id])
|
@admin_team_member = UsersProject.find(params[:id])
|
||||||
@admin_team_member.project_id = params[:team_member][:project_id]
|
@admin_team_member.project_id = params[:team_member][:project_id]
|
||||||
|
|
||||||
respond_to do |format|
|
|
||||||
if @admin_team_member.update_attributes(params[:team_member])
|
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.' }
|
redirect_to admin_team_member_path(@admin_team_member), notice: 'UsersProject was successfully updated.'
|
||||||
format.json { head :ok }
|
|
||||||
else
|
else
|
||||||
format.html { render action: "edit" }
|
render action: "edit"
|
||||||
format.json { render json: @admin_team_member.errors, status: :unprocessable_entity }
|
|
||||||
end
|
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
@ -67,9 +44,6 @@ class Admin::TeamMembersController < ApplicationController
|
||||||
@admin_team_member = UsersProject.find(params[:id])
|
@admin_team_member = UsersProject.find(params[:id])
|
||||||
@admin_team_member.destroy
|
@admin_team_member.destroy
|
||||||
|
|
||||||
respond_to do |format|
|
redirect_to admin_team_members_url
|
||||||
format.html { redirect_to admin_team_members_url }
|
|
||||||
format.json { head :ok }
|
|
||||||
end
|
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
|
||||||
|
|
@ -4,29 +4,14 @@ class Admin::UsersController < ApplicationController
|
||||||
|
|
||||||
def index
|
def index
|
||||||
@admin_users = User.page(params[:page])
|
@admin_users = User.page(params[:page])
|
||||||
|
|
||||||
respond_to do |format|
|
|
||||||
format.html # index.html.erb
|
|
||||||
format.json { render json: @admin_users }
|
|
||||||
end
|
|
||||||
end
|
end
|
||||||
|
|
||||||
def show
|
def show
|
||||||
@admin_user = User.find(params[:id])
|
@admin_user = User.find(params[:id])
|
||||||
|
|
||||||
respond_to do |format|
|
|
||||||
format.html # show.html.erb
|
|
||||||
format.json { render json: @admin_user }
|
|
||||||
end
|
|
||||||
end
|
end
|
||||||
|
|
||||||
def new
|
def new
|
||||||
@admin_user = User.new(:projects_limit => 10)
|
@admin_user = User.new(:projects_limit => 10)
|
||||||
|
|
||||||
respond_to do |format|
|
|
||||||
format.html # new.html.erb
|
|
||||||
format.json { render json: @admin_user }
|
|
||||||
end
|
|
||||||
end
|
end
|
||||||
|
|
||||||
def edit
|
def edit
|
||||||
|
|
|
||||||
|
|
@ -34,7 +34,7 @@ class IssuesController < ApplicationController
|
||||||
end
|
end
|
||||||
|
|
||||||
def show
|
def show
|
||||||
@notes = @issue.notes
|
@notes = @issue.notes.order("created_at ASC")
|
||||||
@note = @project.notes.new(:noteable => @issue)
|
@note = @project.notes.new(:noteable => @issue)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
@ -57,7 +57,6 @@ class IssuesController < ApplicationController
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
||||||
def destroy
|
def destroy
|
||||||
return access_denied! unless can?(current_user, :admin_issue, @issue)
|
return access_denied! unless can?(current_user, :admin_issue, @issue)
|
||||||
|
|
||||||
|
|
@ -78,6 +77,22 @@ class IssuesController < ApplicationController
|
||||||
render :nothing => true
|
render :nothing => true
|
||||||
end
|
end
|
||||||
|
|
||||||
|
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
|
protected
|
||||||
|
|
||||||
def issue
|
def issue
|
||||||
|
|
|
||||||
|
|
@ -15,7 +15,6 @@ class NotesController < ApplicationController
|
||||||
notify if params[:notify] == '1'
|
notify if params[:notify] == '1'
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
||||||
respond_to do |format|
|
respond_to do |format|
|
||||||
format.html {redirect_to :back}
|
format.html {redirect_to :back}
|
||||||
format.js
|
format.js
|
||||||
|
|
|
||||||
|
|
@ -115,7 +115,7 @@ class ProjectsController < ApplicationController
|
||||||
respond_to do |format|
|
respond_to do |format|
|
||||||
format.html # show.html.erb
|
format.html # show.html.erb
|
||||||
format.js do
|
format.js do
|
||||||
# disable cache to allow back button works
|
# diasbale cache to allow back button works
|
||||||
response.headers["Cache-Control"] = "no-cache, no-store, max-age=0, must-revalidate"
|
response.headers["Cache-Control"] = "no-cache, no-store, max-age=0, must-revalidate"
|
||||||
response.headers["Pragma"] = "no-cache"
|
response.headers["Pragma"] = "no-cache"
|
||||||
response.headers["Expires"] = "Fri, 01 Jan 1990 00:00:00 GMT"
|
response.headers["Expires"] = "Fri, 01 Jan 1990 00:00:00 GMT"
|
||||||
|
|
|
||||||
|
|
@ -1,2 +1,11 @@
|
||||||
module SnippetsHelper
|
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
|
end
|
||||||
|
|
|
||||||
|
|
@ -14,9 +14,9 @@ class Issue < ActiveRecord::Base
|
||||||
:presence => true,
|
:presence => true,
|
||||||
:length => { :within => 0..255 }
|
:length => { :within => 0..255 }
|
||||||
|
|
||||||
validates :content,
|
#validates :content,
|
||||||
:presence => true,
|
#:presence => true,
|
||||||
:length => { :within => 0..2000 }
|
#:length => { :within => 0..2000 }
|
||||||
|
|
||||||
scope :critical, where(:critical => true)
|
scope :critical, where(:critical => true)
|
||||||
scope :non_critical, where(:critical => false)
|
scope :non_critical, where(:critical => false)
|
||||||
|
|
|
||||||
|
|
@ -13,7 +13,7 @@ class Note < ActiveRecord::Base
|
||||||
|
|
||||||
validates :note,
|
validates :note,
|
||||||
:presence => true,
|
:presence => true,
|
||||||
:length => { :within => 0..255 }
|
:length => { :within => 0..5000 }
|
||||||
|
|
||||||
validates :attachment,
|
validates :attachment,
|
||||||
:file_size => {
|
:file_size => {
|
||||||
|
|
|
||||||
|
|
@ -22,6 +22,8 @@ class Snippet < ActiveRecord::Base
|
||||||
:presence => true,
|
:presence => true,
|
||||||
:length => { :within => 0..10000 }
|
: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
|
def self.content_types
|
||||||
[
|
[
|
||||||
|
|
@ -34,6 +36,10 @@ class Snippet < ActiveRecord::Base
|
||||||
def colorize
|
def colorize
|
||||||
system_colorize(content, file_name)
|
system_colorize(content, file_name)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
def expired?
|
||||||
|
expires_at && expires_at < Time.current
|
||||||
|
end
|
||||||
end
|
end
|
||||||
# == Schema Information
|
# == Schema Information
|
||||||
#
|
#
|
||||||
|
|
@ -47,5 +53,6 @@ end
|
||||||
# created_at :datetime
|
# created_at :datetime
|
||||||
# updated_at :datetime
|
# updated_at :datetime
|
||||||
# file_name :string(255)
|
# file_name :string(255)
|
||||||
|
# expires_at :datetime
|
||||||
#
|
#
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -23,7 +23,6 @@
|
||||||
%div
|
%div
|
||||||
%iframe{ :src=> admin_mailer_preview_note_path(:type => "Wall"), :width=>"100%", :height=>"350"}
|
%iframe{ :src=> admin_mailer_preview_note_path(:type => "Wall"), :width=>"100%", :height=>"350"}
|
||||||
|
|
||||||
|
|
||||||
:javascript
|
:javascript
|
||||||
$(function() {
|
$(function() {
|
||||||
$( "#accordion" ).accordion(); });
|
$( "#accordion" ).accordion(); });
|
||||||
|
|
|
||||||
|
|
@ -11,7 +11,6 @@
|
||||||
%b Since:
|
%b Since:
|
||||||
= @admin_team_member.updated_at
|
= @admin_team_member.updated_at
|
||||||
|
|
||||||
|
|
||||||
.span-10
|
.span-10
|
||||||
.span-6
|
.span-6
|
||||||
%b Access:
|
%b Access:
|
||||||
|
|
|
||||||
|
|
@ -2,5 +2,4 @@
|
||||||
|
|
||||||
= render 'form'
|
= render 'form'
|
||||||
|
|
||||||
|
|
||||||
= link_to 'Back', admin_users_path, :class => "right lbutton"
|
= link_to 'Back', admin_users_path, :class => "right lbutton"
|
||||||
|
|
|
||||||
|
|
@ -24,7 +24,6 @@
|
||||||
%b Twitter:
|
%b Twitter:
|
||||||
= @admin_user.twitter
|
= @admin_user.twitter
|
||||||
|
|
||||||
|
|
||||||
.clear
|
.clear
|
||||||
= link_to 'Edit', edit_admin_user_path(@admin_user)
|
= link_to 'Edit', edit_admin_user_path(@admin_user)
|
||||||
\|
|
\|
|
||||||
|
|
|
||||||
|
|
@ -2,6 +2,7 @@
|
||||||
- line_new = 0
|
- line_new = 0
|
||||||
- lines_arr = diff.diff.lines.to_a
|
- lines_arr = diff.diff.lines.to_a
|
||||||
- lines_arr.each do |line|
|
- lines_arr.each do |line|
|
||||||
|
- next if line.match(/^--- \/dev\/null/)
|
||||||
- next if line.match(/^--- a/)
|
- next if line.match(/^--- a/)
|
||||||
- next if line.match(/^\+\+\+ b/)
|
- next if line.match(/^\+\+\+ b/)
|
||||||
- if line.match(/^@@ -/)
|
- if line.match(/^@@ -/)
|
||||||
|
|
|
||||||
|
|
@ -7,10 +7,10 @@
|
||||||
|
|
||||||
.span-8
|
.span-8
|
||||||
= f.label :title
|
= f.label :title
|
||||||
= f.text_field :title, :style => "width:450px"
|
= f.text_area :title, :style => "width:450px; height:100px", :maxlength => 255
|
||||||
.span-8
|
-#.span-8
|
||||||
= f.label :content
|
-#= f.label :content
|
||||||
= f.text_area :content, :style => "width:450px; height:130px"
|
-#= f.text_area :content, :style => "width:450px; height:130px"
|
||||||
.span-8.append-bottom
|
.span-8.append-bottom
|
||||||
= f.label :assignee_id
|
= f.label :assignee_id
|
||||||
= f.select(:assignee_id, @project.users.all.collect {|p| [ p.name, p.id ] }, { :include_blank => "Select user" })
|
= f.select(:assignee_id, @project.users.all.collect {|p| [ p.name, p.id ] }, { :include_blank => "Select user" })
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
%tr{ :id => dom_id(issue), :class => "issue #{issue.critical ? "critical" : ""}", :url => project_issue_path(@project, issue) }
|
%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
|
%td
|
||||||
= image_tag "move.png" , :class => [:handle, :left]
|
= image_tag "move.png" , :class => [:handle, :left]
|
||||||
%td
|
%td
|
||||||
|
|
@ -7,7 +7,7 @@
|
||||||
= truncate issue.assignee.name, :lenght => 20
|
= truncate issue.assignee.name, :lenght => 20
|
||||||
%td ##{issue.id}
|
%td ##{issue.id}
|
||||||
%td
|
%td
|
||||||
= html_escape issue.title
|
= truncate(html_escape(issue.title), :length => 60)
|
||||||
%br
|
%br
|
||||||
- if issue.critical
|
- if issue.critical
|
||||||
%span.tag.high critical
|
%span.tag.high critical
|
||||||
|
|
|
||||||
|
|
@ -1,27 +1,51 @@
|
||||||
%div
|
%div
|
||||||
|
.top_panel_issues
|
||||||
- if can? current_user, :write_issue, @project
|
- if can? current_user, :write_issue, @project
|
||||||
.left= link_to 'New Issue', new_project_issue_path(@project), :remote => true, :class => "lbutton vm"
|
%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
|
.right
|
||||||
= form_tag project_issues_path(@project), :method => :get do
|
= form_tag project_issues_path(@project), :method => :get do
|
||||||
.span-2
|
.span-2
|
||||||
= radio_button_tag :f, 0, (params[:f] || "0") == "0", :onclick => "this.form.submit()", :id => "open_issues"
|
= radio_button_tag :f, 0, (params[:f] || "0") == "0", :onclick => "this.form.submit()", :id => "open_issues", :class => "status"
|
||||||
= label_tag "open_issues","Open"
|
= label_tag "open_issues","Open"
|
||||||
.span-2
|
.span-2
|
||||||
= radio_button_tag :f, 2, params[:f] == "2", :onclick => "this.form.submit()", :id => "closed_issues"
|
= radio_button_tag :f, 2, params[:f] == "2", :onclick => "this.form.submit()", :id => "closed_issues", :class => "status"
|
||||||
= label_tag "closed_issues","Closed"
|
= label_tag "closed_issues","Closed"
|
||||||
.span-2
|
.span-2
|
||||||
= radio_button_tag :f, 3, params[:f] == "3", :onclick => "this.form.submit()", :id => "my_issues"
|
= radio_button_tag :f, 3, params[:f] == "3", :onclick => "this.form.submit()", :id => "my_issues", :class => "status"
|
||||||
= label_tag "my_issues","To Me"
|
= label_tag "my_issues","To Me"
|
||||||
|
|
||||||
.span-2
|
.span-2
|
||||||
= radio_button_tag :f, 1, params[:f] == "1", :onclick => "this.form.submit()", :id => "all_issues"
|
= radio_button_tag :f, 1, params[:f] == "1", :onclick => "this.form.submit()", :id => "all_issues", :class => "status"
|
||||||
= label_tag "all_issues","All"
|
= label_tag "all_issues","All"
|
||||||
|
|
||||||
#issues-table-holder= render "issues"
|
#issues-table-holder= render "issues"
|
||||||
%br
|
%br
|
||||||
:javascript
|
:javascript
|
||||||
|
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() {
|
$('.delete-issue').live('ajax:success', function() {
|
||||||
$(this).closest('tr').fadeOut(); });
|
$(this).closest('tr').fadeOut(); updatePage();});
|
||||||
|
|
||||||
function setSortable(){
|
function setSortable(){
|
||||||
$('#issues-table>tbody').sortable({
|
$('#issues-table>tbody').sortable({
|
||||||
|
|
|
||||||
|
|
@ -1,8 +1,7 @@
|
||||||
%h2
|
%h2
|
||||||
= "Issue ##{@issue.id} - #{@issue.title}"
|
= "Issue ##{@issue.id} - #{html_escape(@issue.title)}"
|
||||||
|
|
||||||
.span-15
|
.span-15
|
||||||
= simple_format html_escape(@issue.content)
|
-#= simple_format html_escape(@issue.content)
|
||||||
.issue_notes= render "notes/notes"
|
.issue_notes= render "notes/notes"
|
||||||
.span-8.right
|
.span-8.right
|
||||||
.span-8
|
.span-8
|
||||||
|
|
@ -29,6 +28,16 @@
|
||||||
%td
|
%td
|
||||||
= image_tag gravatar_icon(@issue.assignee.email), :class => "left", :width => 40, :style => "padding:0 5px;"
|
= image_tag gravatar_icon(@issue.assignee.email), :class => "left", :width => 40, :style => "padding:0 5px;"
|
||||||
= @issue.assignee.name
|
= @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
|
%tr
|
||||||
%td Closed?
|
%td Closed?
|
||||||
%td
|
%td
|
||||||
|
|
@ -40,5 +49,9 @@
|
||||||
= check_box_tag "closed", 1, @issue.closed, :disabled => true
|
= 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
|
.clear
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -6,7 +6,7 @@
|
||||||
- if @issue.valid?
|
- if @issue.valid?
|
||||||
:plain
|
:plain
|
||||||
$("#edit_issue_dialog").dialog("close");
|
$("#edit_issue_dialog").dialog("close");
|
||||||
$.ajax({type: "GET", url: location.href, dataType: "script"});
|
updatePage();
|
||||||
- else
|
- else
|
||||||
:plain
|
:plain
|
||||||
$("#edit_issue_dialog").empty();
|
$("#edit_issue_dialog").empty();
|
||||||
|
|
|
||||||
|
|
@ -22,7 +22,6 @@
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|
||||||
<% if current_user %>
|
<% if current_user %>
|
||||||
<%= javascript_tag do %>
|
<%= javascript_tag do %>
|
||||||
$(function() {
|
$(function() {
|
||||||
|
|
|
||||||
|
|
@ -7,7 +7,6 @@
|
||||||
= stylesheet_link_tag 'blueprint/print', :media => "print"
|
= stylesheet_link_tag 'blueprint/print', :media => "print"
|
||||||
= stylesheet_link_tag 'blueprint/plugins/buttons/screen', :media => "screen, projection"
|
= stylesheet_link_tag 'blueprint/plugins/buttons/screen', :media => "screen, projection"
|
||||||
= stylesheet_link_tag 'blueprint/plugins/link-icons/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"
|
= stylesheet_link_tag "application"
|
||||||
= javascript_include_tag "application"
|
= javascript_include_tag "application"
|
||||||
= csrf_meta_tags
|
= csrf_meta_tags
|
||||||
|
|
|
||||||
|
|
@ -10,7 +10,7 @@
|
||||||
|
|
||||||
%div
|
%div
|
||||||
= f.label :note
|
= f.label :note
|
||||||
%cite (255 symbols only)
|
%cite
|
||||||
%br
|
%br
|
||||||
= f.text_area :note, :size => 255
|
= f.text_area :note, :size => 255
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -20,7 +20,6 @@
|
||||||
$("#submit_note").removeAttr("disabled");
|
$("#submit_note").removeAttr("disabled");
|
||||||
})
|
})
|
||||||
|
|
||||||
|
|
||||||
- if ["issues", "projects"].include?(controller.controller_name)
|
- if ["issues", "projects"].include?(controller.controller_name)
|
||||||
:javascript
|
:javascript
|
||||||
$(function(){
|
$(function(){
|
||||||
|
|
|
||||||
|
|
@ -23,7 +23,7 @@
|
||||||
= link_to project_snippets_path(@project), :class => (controller.controller_name == "snippets") ? "current" : nil do
|
= link_to project_snippets_path(@project), :class => (controller.controller_name == "snippets") ? "current" : nil do
|
||||||
Snippets
|
Snippets
|
||||||
- if @project.snippets.count > 0
|
- 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
|
- 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
|
%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
|
||||||
|
|
|
||||||
|
|
@ -21,3 +21,8 @@
|
||||||
%h3 Talk
|
%h3 Talk
|
||||||
=render "projects/recent_messages"
|
=render "projects/recent_messages"
|
||||||
|
|
||||||
|
:javascript
|
||||||
|
function updateDashboard(){
|
||||||
|
$('#content-container').load("#{escape_javascript(project_path(@project))} #content-container>*");
|
||||||
|
}
|
||||||
|
setInterval("updateDashboard()", 300000);
|
||||||
|
|
|
||||||
|
|
@ -12,6 +12,9 @@
|
||||||
%tr
|
%tr
|
||||||
%td= f.label :file_name
|
%td= f.label :file_name
|
||||||
%td= f.text_field :file_name, :placeholder => "example.rb"
|
%td= f.text_field :file_name, :placeholder => "example.rb"
|
||||||
|
%tr
|
||||||
|
%td= f.label "Lifetime"
|
||||||
|
%td= f.select :expires_at, lifetime_select_options
|
||||||
%tr
|
%tr
|
||||||
%td{:colspan => 2}
|
%td{:colspan => 2}
|
||||||
= f.label :content, "Code"
|
= f.label :content, "Code"
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,5 @@
|
||||||
%tr{ :id => dom_id(snippet), :class => "snippet", :url => project_snippet_path(@project, snippet) }
|
- unless snippet.expired?
|
||||||
|
%tr{ :id => dom_id(snippet), :class => "snippet", :url => project_snippet_path(@project, snippet) }
|
||||||
%td
|
%td
|
||||||
= image_tag gravatar_icon(snippet.author.email), :class => "left", :width => 40, :style => "padding:0 5px;"
|
= image_tag gravatar_icon(snippet.author.email), :class => "left", :width => 40, :style => "padding:0 5px;"
|
||||||
= truncate snippet.author.name, :lenght => 20
|
= truncate snippet.author.name, :lenght => 20
|
||||||
|
|
|
||||||
|
|
@ -8,7 +8,7 @@
|
||||||
%th Title
|
%th Title
|
||||||
%th File name
|
%th File name
|
||||||
%th
|
%th
|
||||||
= render @snippets
|
= render @snippets.fresh
|
||||||
:javascript
|
:javascript
|
||||||
$('.delete-snippet').live('ajax:success', function() {
|
$('.delete-snippet').live('ajax:success', function() {
|
||||||
$(this).closest('tr').fadeOut(); });
|
$(this).closest('tr').fadeOut(); });
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,8 @@
|
||||||
%h2
|
- if !@snippet.expired?
|
||||||
|
%h2
|
||||||
= "Snippet ##{@snippet.id} - #{@snippet.title}"
|
= "Snippet ##{@snippet.id} - #{@snippet.title}"
|
||||||
|
|
||||||
.view_file
|
.view_file
|
||||||
.view_file_header
|
.view_file_header
|
||||||
%strong
|
%strong
|
||||||
= @snippet.file_name
|
= @snippet.file_name
|
||||||
|
|
@ -10,13 +11,16 @@
|
||||||
:erb
|
:erb
|
||||||
<%= raw @snippet.colorize %>
|
<%= raw @snippet.colorize %>
|
||||||
|
|
||||||
- if can?(current_user, :admin_snippet, @project) || @snippet.author == current_user
|
- if can?(current_user, :admin_snippet, @project) || @snippet.author == current_user
|
||||||
= link_to 'Edit', edit_project_snippet_path(@project, @snippet), :class => "lbutton positive"
|
= link_to 'Edit', edit_project_snippet_path(@project, @snippet), :class => "lbutton positive"
|
||||||
- if can?(current_user, :admin_snippet, @project) || @snippet.author == current_user
|
- 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}"
|
= link_to 'Destroy', [@project, @snippet], :confirm => 'Are you sure?', :method => :delete, :class => "lbutton delete-snippet negative", :id => "destroy_snippet_#{@snippet.id}"
|
||||||
.clear
|
.clear
|
||||||
%br
|
%br
|
||||||
.snippet_notes= render "notes/notes"
|
.snippet_notes= render "notes/notes"
|
||||||
|
|
||||||
.clear
|
.clear
|
||||||
|
|
||||||
|
- else
|
||||||
|
%h2
|
||||||
|
Sorry, this snippet is no longer exists
|
||||||
|
|
|
||||||
|
|
@ -25,4 +25,3 @@
|
||||||
%b Twitter:
|
%b Twitter:
|
||||||
= user.twitter
|
= user.twitter
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -44,5 +44,8 @@ module Gitlab
|
||||||
|
|
||||||
# Version of your assets, change this if you want to expire all your assets
|
# Version of your assets, change this if you want to expire all your assets
|
||||||
config.assets.version = '1.0'
|
config.assets.version = '1.0'
|
||||||
|
|
||||||
|
# Extend assets path
|
||||||
|
config.assets.paths << Rails.root.join('vendor', 'assets', 'images', 'jquery-ui')
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
|
||||||
|
|
@ -58,7 +58,6 @@ Gitlab::Application.configure do
|
||||||
# Send deprecation notices to registered listeners
|
# Send deprecation notices to registered listeners
|
||||||
config.active_support.deprecation = :notify
|
config.active_support.deprecation = :notify
|
||||||
|
|
||||||
|
|
||||||
config.action_mailer.delivery_method = :sendmail
|
config.action_mailer.delivery_method = :sendmail
|
||||||
# Defaults to:
|
# Defaults to:
|
||||||
# # config.action_mailer.sendmail_settings = {
|
# # config.action_mailer.sendmail_settings = {
|
||||||
|
|
|
||||||
|
|
@ -47,6 +47,9 @@ Gitlab::Application.routes.draw do
|
||||||
collection do
|
collection do
|
||||||
post :sort
|
post :sort
|
||||||
end
|
end
|
||||||
|
collection do
|
||||||
|
get :search
|
||||||
|
end
|
||||||
end
|
end
|
||||||
resources :notes, :only => [:create, :destroy]
|
resources :notes, :only => [:create, :destroy]
|
||||||
end
|
end
|
||||||
|
|
|
||||||
|
|
@ -11,7 +11,6 @@ class DeviseCreateUsers < ActiveRecord::Migration
|
||||||
# t.lockable :lock_strategy => :failed_attempts, :unlock_strategy => :both
|
# t.lockable :lock_strategy => :failed_attempts, :unlock_strategy => :both
|
||||||
# t.token_authenticatable
|
# t.token_authenticatable
|
||||||
|
|
||||||
|
|
||||||
t.timestamps
|
t.timestamps
|
||||||
end
|
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.
|
# 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|
|
create_table "issues", :force => true do |t|
|
||||||
t.string "title"
|
t.string "title"
|
||||||
|
|
@ -36,7 +36,7 @@ ActiveRecord::Schema.define(:version => 20111025134235) do
|
||||||
end
|
end
|
||||||
|
|
||||||
create_table "notes", :force => true do |t|
|
create_table "notes", :force => true do |t|
|
||||||
t.string "note"
|
t.text "note"
|
||||||
t.string "noteable_id"
|
t.string "noteable_id"
|
||||||
t.string "noteable_type"
|
t.string "noteable_type"
|
||||||
t.integer "author_id"
|
t.integer "author_id"
|
||||||
|
|
@ -65,6 +65,7 @@ ActiveRecord::Schema.define(:version => 20111025134235) do
|
||||||
t.datetime "created_at"
|
t.datetime "created_at"
|
||||||
t.datetime "updated_at"
|
t.datetime "updated_at"
|
||||||
t.string "file_name"
|
t.string "file_name"
|
||||||
|
t.datetime "expires_at"
|
||||||
end
|
end
|
||||||
|
|
||||||
create_table "users", :force => true do |t|
|
create_table "users", :force => true do |t|
|
||||||
|
|
|
||||||
|
|
@ -25,7 +25,6 @@
|
||||||
text-decoration: none;
|
text-decoration: none;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
#page {
|
#page {
|
||||||
background-color: #f0f0f0;
|
background-color: #f0f0f0;
|
||||||
width: 750px;
|
width: 750px;
|
||||||
|
|
@ -57,7 +56,6 @@
|
||||||
padding-right: 30px;
|
padding-right: 30px;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
#header {
|
#header {
|
||||||
background-image: url("/assets/rails.png");
|
background-image: url("/assets/rails.png");
|
||||||
background-repeat: no-repeat;
|
background-repeat: no-repeat;
|
||||||
|
|
@ -71,7 +69,6 @@
|
||||||
font-size: 16px;
|
font-size: 16px;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
#about h3 {
|
#about h3 {
|
||||||
margin: 0;
|
margin: 0;
|
||||||
margin-bottom: 10px;
|
margin-bottom: 10px;
|
||||||
|
|
@ -112,7 +109,6 @@
|
||||||
padding: 10px;
|
padding: 10px;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
#getting-started {
|
#getting-started {
|
||||||
border-top: 1px solid #ccc;
|
border-top: 1px solid #ccc;
|
||||||
margin-top: 25px;
|
margin-top: 25px;
|
||||||
|
|
@ -149,7 +145,6 @@
|
||||||
font-size: 13px;
|
font-size: 13px;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
#sidebar ul {
|
#sidebar ul {
|
||||||
margin-left: 0;
|
margin-left: 0;
|
||||||
padding-left: 0;
|
padding-left: 0;
|
||||||
|
|
|
||||||
|
|
@ -32,7 +32,6 @@ end
|
||||||
|
|
||||||
Factory.add(:issue, Issue) do |obj|
|
Factory.add(:issue, Issue) do |obj|
|
||||||
obj.title = Faker::Lorem.sentence
|
obj.title = Faker::Lorem.sentence
|
||||||
obj.content = Faker::Lorem.sentences
|
|
||||||
end
|
end
|
||||||
|
|
||||||
Factory.add(:snippet, Snippet) do |obj|
|
Factory.add(:snippet, Snippet) do |obj|
|
||||||
|
|
|
||||||
|
|
@ -26,5 +26,6 @@ end
|
||||||
# created_at :datetime
|
# created_at :datetime
|
||||||
# updated_at :datetime
|
# updated_at :datetime
|
||||||
# file_name :string(255)
|
# file_name :string(255)
|
||||||
|
# expires_at :datetime
|
||||||
#
|
#
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -80,7 +80,6 @@ describe "Issues" do
|
||||||
describe "fill in" do
|
describe "fill in" do
|
||||||
before do
|
before do
|
||||||
fill_in "issue_title", :with => "bug 345"
|
fill_in "issue_title", :with => "bug 345"
|
||||||
fill_in "issue_content", :with => "app bug 345"
|
|
||||||
click_link "Select user"
|
click_link "Select user"
|
||||||
click_link @user.name
|
click_link @user.name
|
||||||
end
|
end
|
||||||
|
|
@ -112,6 +111,23 @@ describe "Issues" do
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
describe "Show issue" do
|
||||||
|
before do
|
||||||
|
@issue = Factory :issue,
|
||||||
|
:author => @user,
|
||||||
|
:assignee => @user,
|
||||||
|
:project => project
|
||||||
|
|
||||||
|
visit project_issue_path(project, @issue)
|
||||||
|
end
|
||||||
|
|
||||||
|
it "should have valid show page for issue" do
|
||||||
|
page.should have_content @issue.title
|
||||||
|
page.should have_content @user.name
|
||||||
|
page.should have_content "today"
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
describe "Edit issue", :js => true do
|
describe "Edit issue", :js => true do
|
||||||
before do
|
before do
|
||||||
@issue = Factory :issue,
|
@issue = Factory :issue,
|
||||||
|
|
@ -129,7 +145,6 @@ describe "Issues" do
|
||||||
describe "fill in" do
|
describe "fill in" do
|
||||||
before do
|
before do
|
||||||
fill_in "issue_title", :with => "bug 345"
|
fill_in "issue_title", :with => "bug 345"
|
||||||
fill_in "issue_content", :with => "app bug 345"
|
|
||||||
end
|
end
|
||||||
|
|
||||||
it { expect { click_button "Save" }.to_not change {Issue.count} }
|
it { expect { click_button "Save" }.to_not change {Issue.count} }
|
||||||
|
|
@ -144,4 +159,51 @@ describe "Issues" do
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
describe "Search issue", :js => true do
|
||||||
|
before do
|
||||||
|
['foobar', 'foobar2', 'gitlab'].each do |title|
|
||||||
|
@issue = Factory :issue,
|
||||||
|
:author => @user,
|
||||||
|
:assignee => @user,
|
||||||
|
:project => project,
|
||||||
|
:title => title
|
||||||
|
@issue.save
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
it "should be able to search on different statuses" do
|
||||||
|
@issue = Issue.first
|
||||||
|
@issue.closed = true
|
||||||
|
@issue.save
|
||||||
|
|
||||||
|
visit project_issues_path(project)
|
||||||
|
choose 'closed_issues'
|
||||||
|
fill_in 'issue_search', :with => 'foobar'
|
||||||
|
|
||||||
|
page.should have_content 'foobar'
|
||||||
|
page.should_not have_content 'foobar2'
|
||||||
|
page.should_not have_content 'gitlab'
|
||||||
|
end
|
||||||
|
|
||||||
|
it "should search for term and return the correct results" do
|
||||||
|
visit project_issues_path(project)
|
||||||
|
fill_in 'issue_search', :with => 'foobar'
|
||||||
|
|
||||||
|
page.should have_content 'foobar'
|
||||||
|
page.should have_content 'foobar2'
|
||||||
|
page.should_not have_content 'gitlab'
|
||||||
|
end
|
||||||
|
|
||||||
|
it "should return all results if term has been cleared" do
|
||||||
|
visit project_issues_path(project)
|
||||||
|
fill_in "issue_search", :with => "foobar"
|
||||||
|
# Because fill_in, :with => "" triggers nothing we need to trigger a keyup event
|
||||||
|
page.execute_script("$('.issue_search').val('').keyup();");
|
||||||
|
|
||||||
|
page.should have_content 'foobar'
|
||||||
|
page.should have_content 'foobar2'
|
||||||
|
page.should have_content 'gitlab'
|
||||||
|
end
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|
|
||||||
|
|
@ -29,7 +29,6 @@ describe "Profile" do
|
||||||
it { @user.twitter.should == 'testtwitter' }
|
it { @user.twitter.should == 'testtwitter' }
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
||||||
describe "Password update" do
|
describe "Password update" do
|
||||||
before do
|
before do
|
||||||
visit profile_password_path
|
visit profile_password_path
|
||||||
|
|
|
||||||
|
|
@ -23,6 +23,14 @@ describe "Snippets" do
|
||||||
it { should have_content(@snippet.project.name) }
|
it { should have_content(@snippet.project.name) }
|
||||||
it { should have_content(@snippet.author.name) }
|
it { should have_content(@snippet.author.name) }
|
||||||
|
|
||||||
|
it "doesn't show expired snippets" do
|
||||||
|
@snippet.update_attribute(:expires_at, 1.day.ago.to_time)
|
||||||
|
visit project_snippet_path(project, @snippet)
|
||||||
|
page.should have_content("Sorry, this snippet is no longer exists")
|
||||||
|
page.should_not have_content(@snippet.title)
|
||||||
|
page.should_not have_content(@snippet.content)
|
||||||
|
end
|
||||||
|
|
||||||
describe "Destroy" do
|
describe "Destroy" do
|
||||||
before do
|
before do
|
||||||
# admin access to remove snippet
|
# admin access to remove snippet
|
||||||
|
|
|
||||||
|
|
@ -11,7 +11,6 @@ require 'capybara/dsl'
|
||||||
require 'factories'
|
require 'factories'
|
||||||
require 'monkeypatch'
|
require 'monkeypatch'
|
||||||
|
|
||||||
|
|
||||||
# Requires supporting ruby files with custom matchers and macros, etc,
|
# Requires supporting ruby files with custom matchers and macros, etc,
|
||||||
# in spec/support/ and its subdirectories.
|
# in spec/support/ and its subdirectories.
|
||||||
Dir[Rails.root.join("spec/support/**/*.rb")].each {|f| require f}
|
Dir[Rails.root.join("spec/support/**/*.rb")].each {|f| require f}
|
||||||
|
|
|
||||||
|
|
@ -6,7 +6,6 @@ shared_examples_for :project_side_pane do
|
||||||
it { should have_content("Tree") }
|
it { should have_content("Tree") }
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
||||||
shared_examples_for :tree_view do
|
shared_examples_for :tree_view do
|
||||||
subject { page }
|
subject { page }
|
||||||
|
|
||||||
|
|
|
||||||
|
Before Width: | Height: | Size: 180 B After Width: | Height: | Size: 180 B |
|
Before Width: | Height: | Size: 178 B After Width: | Height: | Size: 178 B |
|
Before Width: | Height: | Size: 120 B After Width: | Height: | Size: 120 B |
|
Before Width: | Height: | Size: 105 B After Width: | Height: | Size: 105 B |
|
Before Width: | Height: | Size: 111 B After Width: | Height: | Size: 111 B |
|
Before Width: | Height: | Size: 110 B After Width: | Height: | Size: 110 B |
|
Before Width: | Height: | Size: 119 B After Width: | Height: | Size: 119 B |
|
Before Width: | Height: | Size: 101 B After Width: | Height: | Size: 101 B |
|
Before Width: | Height: | Size: 4.3 KiB After Width: | Height: | Size: 4.3 KiB |
|
Before Width: | Height: | Size: 5.2 KiB After Width: | Height: | Size: 5.2 KiB |
|
Before Width: | Height: | Size: 4.3 KiB After Width: | Height: | Size: 4.3 KiB |
|
Before Width: | Height: | Size: 4.3 KiB After Width: | Height: | Size: 4.3 KiB |
|
Before Width: | Height: | Size: 4.3 KiB After Width: | Height: | Size: 4.3 KiB |
844
vendor/assets/javascripts/jquery.ui.selectmenu.js
vendored
Normal file
844
vendor/assets/javascripts/jquery.ui.selectmenu.js
vendored
Normal file
|
|
@ -0,0 +1,844 @@
|
||||||
|
/*
|
||||||
|
* 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);
|
||||||
|
|
@ -59,26 +59,26 @@
|
||||||
.ui-widget { font-family: "Helvetica Neue",Arial,Helvetica,sans-serif; font-size: 1.1em; }
|
.ui-widget { font-family: "Helvetica Neue",Arial,Helvetica,sans-serif; font-size: 1.1em; }
|
||||||
.ui-widget .ui-widget { font-size: 1em; }
|
.ui-widget .ui-widget { font-size: 1em; }
|
||||||
.ui-widget input, .ui-widget select, .ui-widget textarea, .ui-widget button { font-family: Verdana,Arial,sans-serif; font-size: 1em; }
|
.ui-widget input, .ui-widget select, .ui-widget textarea, .ui-widget button { font-family: Verdana,Arial,sans-serif; font-size: 1em; }
|
||||||
.ui-widget-content { border: 1px solid #dddddd; background: #ffffff url(images/ui-bg_flat_75_ffffff_40x100.png) 50% 50% repeat-x; color: #222222; }
|
.ui-widget-content { border: 1px solid #dddddd; background: #ffffff url(ui-bg_flat_75_ffffff_40x100.png) 50% 50% repeat-x; color: #222222; }
|
||||||
.ui-widget-content a { color: #222222; }
|
.ui-widget-content a { color: #222222; }
|
||||||
.ui-widget-header { color: #222222; font-weight: bold; }
|
.ui-widget-header { color: #222222; font-weight: bold; }
|
||||||
.ui-widget-header a { color: #222222; }
|
.ui-widget-header a { color: #222222; }
|
||||||
|
|
||||||
/* Interaction states
|
/* Interaction states
|
||||||
----------------------------------*/
|
----------------------------------*/
|
||||||
.ui-state-default, .ui-widget-content .ui-state-default, .ui-widget-header .ui-state-default { border: 1px solid #d3d3d3; background: #e6e6e6 url(images/ui-bg_glass_75_e6e6e6_1x400.png) 50% 50% repeat-x; font-weight: normal; color: #555555; }
|
.ui-state-default, .ui-widget-content .ui-state-default, .ui-widget-header .ui-state-default { border: 1px solid #d3d3d3; background: #e6e6e6 url(ui-bg_glass_75_e6e6e6_1x400.png) 50% 50% repeat-x; font-weight: normal; color: #555555; }
|
||||||
.ui-state-default a, .ui-state-default a:link, .ui-state-default a:visited { color: #555555; text-decoration: none; }
|
.ui-state-default a, .ui-state-default a:link, .ui-state-default a:visited { color: #555555; text-decoration: none; }
|
||||||
.ui-state-hover, .ui-widget-content .ui-state-hover, .ui-widget-header .ui-state-hover, .ui-state-focus, .ui-widget-content .ui-state-focus, .ui-widget-header .ui-state-focus { border: 1px solid #999999; background: #dadada url(images/ui-bg_glass_75_dadada_1x400.png) 50% 50% repeat-x; font-weight: normal; color: #212121; }
|
.ui-state-hover, .ui-widget-content .ui-state-hover, .ui-widget-header .ui-state-hover, .ui-state-focus, .ui-widget-content .ui-state-focus, .ui-widget-header .ui-state-focus { border: 1px solid #999999; background: #dadada url(ui-bg_glass_75_dadada_1x400.png) 50% 50% repeat-x; font-weight: normal; color: #212121; }
|
||||||
.ui-state-hover a, .ui-state-hover a:hover { color: #212121; text-decoration: none; }
|
.ui-state-hover a, .ui-state-hover a:hover { color: #212121; text-decoration: none; }
|
||||||
.ui-state-active, .ui-widget-content .ui-state-active, .ui-widget-header .ui-state-active { border: 1px solid #aaaaaa; background: #ffffff url(images/ui-bg_glass_65_ffffff_1x400.png) 50% 50% repeat-x; font-weight: normal; color: #212121; }
|
.ui-state-active, .ui-widget-content .ui-state-active, .ui-widget-header .ui-state-active { border: 1px solid #aaaaaa; background: #ffffff url(ui-bg_glass_65_ffffff_1x400.png) 50% 50% repeat-x; font-weight: normal; color: #212121; }
|
||||||
.ui-state-active a, .ui-state-active a:link, .ui-state-active a:visited { color: #212121; text-decoration: none; }
|
.ui-state-active a, .ui-state-active a:link, .ui-state-active a:visited { color: #212121; text-decoration: none; }
|
||||||
.ui-widget :active { outline: none; }
|
.ui-widget :active { outline: none; }
|
||||||
|
|
||||||
/* Interaction Cues
|
/* Interaction Cues
|
||||||
----------------------------------*/
|
----------------------------------*/
|
||||||
.ui-state-highlight, .ui-widget-content .ui-state-highlight, .ui-widget-header .ui-state-highlight {border: 1px solid #fcefa1; background: #fbf9ee url(images/ui-bg_glass_55_fbf9ee_1x400.png) 50% 50% repeat-x; color: #363636; }
|
.ui-state-highlight, .ui-widget-content .ui-state-highlight, .ui-widget-header .ui-state-highlight {border: 1px solid #fcefa1; background: #fbf9ee url(ui-bg_glass_55_fbf9ee_1x400.png) 50% 50% repeat-x; color: #363636; }
|
||||||
.ui-state-highlight a, .ui-widget-content .ui-state-highlight a,.ui-widget-header .ui-state-highlight a { color: #363636; }
|
.ui-state-highlight a, .ui-widget-content .ui-state-highlight a,.ui-widget-header .ui-state-highlight a { color: #363636; }
|
||||||
.ui-state-error, .ui-widget-content .ui-state-error, .ui-widget-header .ui-state-error {border: 1px solid #cd0a0a; background: #fef1ec url(images/ui-bg_glass_95_fef1ec_1x400.png) 50% 50% repeat-x; color: #cd0a0a; }
|
.ui-state-error, .ui-widget-content .ui-state-error, .ui-widget-header .ui-state-error {border: 1px solid #cd0a0a; background: #fef1ec url(ui-bg_glass_95_fef1ec_1x400.png) 50% 50% repeat-x; color: #cd0a0a; }
|
||||||
.ui-state-error a, .ui-widget-content .ui-state-error a, .ui-widget-header .ui-state-error a { color: #cd0a0a; }
|
.ui-state-error a, .ui-widget-content .ui-state-error a, .ui-widget-header .ui-state-error a { color: #cd0a0a; }
|
||||||
.ui-state-error-text, .ui-widget-content .ui-state-error-text, .ui-widget-header .ui-state-error-text { color: #cd0a0a; }
|
.ui-state-error-text, .ui-widget-content .ui-state-error-text, .ui-widget-header .ui-state-error-text { color: #cd0a0a; }
|
||||||
.ui-priority-primary, .ui-widget-content .ui-priority-primary, .ui-widget-header .ui-priority-primary { font-weight: bold; }
|
.ui-priority-primary, .ui-widget-content .ui-priority-primary, .ui-widget-header .ui-priority-primary { font-weight: bold; }
|
||||||
|
|
@ -89,14 +89,14 @@
|
||||||
----------------------------------*/
|
----------------------------------*/
|
||||||
|
|
||||||
/* states and images */
|
/* states and images */
|
||||||
.ui-icon { width: 16px; height: 16px; background-image: url(images/ui-icons_222222_256x240.png); }
|
.ui-icon { width: 16px; height: 16px; background-image: url(ui-icons_222222_256x240.png); }
|
||||||
.ui-widget-content .ui-icon {background-image: url(images/ui-icons_222222_256x240.png); }
|
.ui-widget-content .ui-icon {background-image: url(ui-icons_222222_256x240.png); }
|
||||||
.ui-widget-header .ui-icon {background-image: url(images/ui-icons_222222_256x240.png); }
|
.ui-widget-header .ui-icon {background-image: url(ui-icons_222222_256x240.png); }
|
||||||
.ui-state-default .ui-icon { background-image: url(images/ui-icons_888888_256x240.png); }
|
.ui-state-default .ui-icon { background-image: url(ui-icons_888888_256x240.png); }
|
||||||
.ui-state-hover .ui-icon, .ui-state-focus .ui-icon {background-image: url(images/ui-icons_454545_256x240.png); }
|
.ui-state-hover .ui-icon, .ui-state-focus .ui-icon {background-image: url(ui-icons_454545_256x240.png); }
|
||||||
.ui-state-active .ui-icon {background-image: url(images/ui-icons_454545_256x240.png); }
|
.ui-state-active .ui-icon {background-image: url(ui-icons_454545_256x240.png); }
|
||||||
.ui-state-highlight .ui-icon {background-image: url(images/ui-icons_2e83ff_256x240.png); }
|
.ui-state-highlight .ui-icon {background-image: url(ui-icons_2e83ff_256x240.png); }
|
||||||
.ui-state-error .ui-icon, .ui-state-error-text .ui-icon {background-image: url(images/ui-icons_cd0a0a_256x240.png); }
|
.ui-state-error .ui-icon, .ui-state-error-text .ui-icon {background-image: url(ui-icons_cd0a0a_256x240.png); }
|
||||||
|
|
||||||
/* positioning */
|
/* positioning */
|
||||||
.ui-icon-carat-1-n { background-position: 0 0; }
|
.ui-icon-carat-1-n { background-position: 0 0; }
|
||||||
|
|
@ -286,8 +286,8 @@
|
||||||
/*.ui-corner-all, .ui-corner-bottom, .ui-corner-right, .ui-corner-br { -moz-border-radius-bottomright: 4px; -webkit-border-bottom-right-radius: 4px; -khtml-border-bottom-right-radius: 4px; border-bottom-right-radius: 4px; }*/
|
/*.ui-corner-all, .ui-corner-bottom, .ui-corner-right, .ui-corner-br { -moz-border-radius-bottomright: 4px; -webkit-border-bottom-right-radius: 4px; -khtml-border-bottom-right-radius: 4px; border-bottom-right-radius: 4px; }*/
|
||||||
|
|
||||||
/* Overlays */
|
/* Overlays */
|
||||||
.ui-widget-overlay { background: #aaaaaa url(images/ui-bg_flat_0_aaaaaa_40x100.png) 50% 50% repeat-x; opacity: .30;filter:Alpha(Opacity=30); }
|
.ui-widget-overlay { background: #aaaaaa url(ui-bg_flat_0_aaaaaa_40x100.png) 50% 50% repeat-x; opacity: .30;filter:Alpha(Opacity=30); }
|
||||||
.ui-widget-shadow { margin: -8px 0 0 -8px; padding: 8px; background: #aaaaaa url(images/ui-bg_flat_0_aaaaaa_40x100.png) 50% 50% repeat-x; opacity: .30;filter:Alpha(Opacity=30); -moz-border-radius: 8px; -khtml-border-radius: 8px; -webkit-border-radius: 8px; border-radius: 8px; }/*
|
.ui-widget-shadow { margin: -8px 0 0 -8px; padding: 8px; background: #aaaaaa url(ui-bg_flat_0_aaaaaa_40x100.png) 50% 50% repeat-x; opacity: .30;filter:Alpha(Opacity=30); -moz-border-radius: 8px; -khtml-border-radius: 8px; -webkit-border-radius: 8px; border-radius: 8px; }/*
|
||||||
* jQuery UI Resizable 1.8.16
|
* jQuery UI Resizable 1.8.16
|
||||||
*
|
*
|
||||||
* Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
|
* Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
|
||||||
Loading…
Reference in a new issue