kolan
/
Redmine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Restyles user search fields and ajax indicator. 

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8874 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Philippe Lang 2012-02-14 15:34:27 +00:00
parent 0729ee143b
commit bd2581e7c9
5 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/views/groups/_users.html.erb
View File

@ -38,6 +38,8 @@
:update => :users, :update => :users,
:url => autocomplete_for_user_group_path(@group), :url => autocomplete_for_user_group_path(@group),
:method => :get, :method => :get,
:before => '$("user_search").addClassName("ajax-loading")',
:complete => '$("user_search").removeClassName("ajax-loading")',
:with => 'q') :with => 'q')
%> %>

2
app/views/projects/settings/_members.html.erb
View File

@ -70,6 +70,8 @@
:update => :principals, :update => :principals,
:url => autocomplete_project_memberships_path(@project), :url => autocomplete_project_memberships_path(@project),
:method => :get, :method => :get,
:before => '$("principal_search").addClassName("ajax-loading")',
:complete => '$("principal_search").removeClassName("ajax-loading")',
:with => 'q') :with => 'q')
%> %>

2
app/views/watchers/_new.html.erb
View File

@ -12,6 +12,8 @@
:frequency => 0.5, :frequency => 0.5,
:update => :users_for_watcher, :update => :users_for_watcher,
:method => :get, :method => :get,
:before => '$("user_search").addClassName("ajax-loading")',
:complete => '$("user_search").removeClassName("ajax-loading")',
:url => { :url => {
:controller => 'watchers', :controller => 'watchers',
:action => 'autocomplete_for_user', :action => 'autocomplete_for_user',

2
public/javascripts/application.js
View File

@ -503,7 +503,7 @@ Ajax.Responders.register({
request.options.requestHeaders[header] = token; request.options.requestHeaders[header] = token;
} }
if ($('ajax-indicator') && Ajax.activeRequestCount > 0) { if ($('ajax-indicator') && Ajax.activeRequestCount > 0 && $$('input.ajax-loading').size() == 0) {
Element.show('ajax-indicator'); Element.show('ajax-indicator');
} }
}, },

7
public/stylesheets/application.css
View File

@ -517,6 +517,13 @@ div#tab-content-members fieldset div, div#tab-content-users fieldset div { max-h
table.members td.group { padding-left: 20px; background: url(../images/group.png) no-repeat 0% 50%; } table.members td.group { padding-left: 20px; background: url(../images/group.png) no-repeat 0% 50%; }
input#principal_search, input#user_search {width:100%} input#principal_search, input#user_search {width:100%}
input#principal_search, input#user_search {
background: url(../images/magnifier.png) no-repeat 2px 50%; padding-left:20px;
border:1px solid #9EB1C2; border-radius:3px; height:1.5em; width:95%;
}
input#principal_search.ajax-loading, input#user_search.ajax-loading {
background-image: url(../images/loading.gif);
}
* html div#tab-content-members fieldset div { height: 450px; } * html div#tab-content-members fieldset div { height: 450px; }