JQuery in, Prototype/Scriptaculous out (#11445).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10068 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
1 parent
387836f8aa
commit
6a2ca5e034
122 files changed
+1431
-10962
No files matched your search
@@ -25,7 +25,7 @@
|
||||
<fieldset class="box tabular">
|
||||
<legend><%=l(:label_authentication)%></legend>
|
||||
<% unless @auth_sources.empty? %>
|
||||
<p><%= f.select :auth_source_id, ([[l(:label_internal), ""]] + @auth_sources.collect { |a| [a.name, a.id] }), {}, :onchange => "if (this.value=='') {Element.show('password_fields');} else {Element.hide('password_fields');}" %></p>
|
||||
<p><%= f.select :auth_source_id, ([[l(:label_internal), ""]] + @auth_sources.collect { |a| [a.name, a.id] }), {}, :onchange => "if (this.value=='') {$('#password_fields').show();} else {$('#password_fields').hide();}" %></p>
|
||||
<% end %>
|
||||
<div id="password_fields" style="<%= 'display:none;' if @user.auth_source %>">
|
||||
<p><%= f.password_field :password, :required => true, :size => 25 %>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
'user[mail_notification]',
|
||||
options_for_select(
|
||||
user_mail_notification_options(@user), @user.mail_notification),
|
||||
:onchange => 'if (this.value == "selected") {Element.show("notified-projects")} else {Element.hide("notified-projects")}'
|
||||
:onchange => 'if (this.value == "selected") {$("#notified-projects").show();} else {$("#notified-projects").hide();}'
|
||||
) %>
|
||||
</p>
|
||||
<%= content_tag 'div', :id => 'notified-projects', :style => (@user.mail_notification == 'selected' ? '' : 'display:none;') do %>
|
||||
|
||||
@@ -30,13 +30,13 @@
|
||||
<%= hidden_field_tag 'membership[role_ids][]', '' %>
|
||||
<p><%= submit_tag l(:button_change) %>
|
||||
<%= link_to_function l(:button_cancel),
|
||||
"$('member-#{membership.id}-roles').show(); $('member-#{membership.id}-roles-form').hide(); return false;"
|
||||
"$('#member-#{membership.id}-roles').show(); $('#member-#{membership.id}-roles-form').hide(); return false;"
|
||||
%></p>
|
||||
<% end %>
|
||||
</td>
|
||||
<td class="buttons">
|
||||
<%= link_to_function l(:button_edit),
|
||||
"$('member-#{membership.id}-roles').hide(); $('member-#{membership.id}-roles-form').show(); return false;",
|
||||
"$('#member-#{membership.id}-roles').hide(); $('#member-#{membership.id}-roles-form').show(); return false;",
|
||||
:class => 'icon icon-edit'
|
||||
%>
|
||||
<%= delete_link user_membership_path(@user, membership), :remote => true if membership.deletable? %>
|
||||
|
||||
@@ -1 +1 @@
|
||||
Element.update('tab-content-memberships', '<%= escape_javascript(render :partial => 'users/memberships') %>');
|
||||
$('#tab-content-memberships').html('<%= escape_javascript(render :partial => 'users/memberships') %>');
|
||||
@@ -1,6 +1,6 @@
|
||||
<% if @membership.valid? %>
|
||||
Element.update("tab-content-memberships", '<%= escape_javascript(render :partial => 'users/memberships') %>');
|
||||
new Effect.Highlight("member-<%= @membership.id %>")
|
||||
$('#tab-content-memberships').html('<%= escape_javascript(render :partial => 'users/memberships') %>');
|
||||
$("#member-<%= @membership.id %>").effect("highlight");
|
||||
<% else %>
|
||||
alert('<%= escape_javascript l(:notice_failed_to_save_members, :errors => @membership.errors.full_messages.join(', ')) %>');
|
||||
<% end %>
|
||||
Reference in new issue
Block a user