From: Toshi MARUYAMA Date: Thu, 1 Sep 2011 11:52:04 +0000 (+0000) Subject: rename .rhtml to .html.erb of app/views/projects/settings/_members.rhtml. X-Git-Tag: 1.3.0~975 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=32f0f201317e7dd4d3a789b2c7b198d156ee7879;p=redmine.git rename .rhtml to .html.erb of app/views/projects/settings/_members.rhtml. :rhtml and :rxml were finally removed as template handlers at Rails 3.1 RC4. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@6988 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- diff --git a/app/views/projects/settings/_members.html.erb b/app/views/projects/settings/_members.html.erb new file mode 100644 index 000000000..4230e037b --- /dev/null +++ b/app/views/projects/settings/_members.html.erb @@ -0,0 +1,84 @@ +<%= error_messages_for 'member' %> +<% roles = Role.find_all_givable + members = @project.member_principals.find(:all, :include => [:roles, :principal]).sort %> + +
+<% if members.any? %> + + + + + + <%= call_hook(:view_projects_settings_members_table_header, :project => @project) %> + + + <% members.each do |member| %> + <% next if member.new_record? %> + + + + + <%= call_hook(:view_projects_settings_members_table_row, { :project => @project, :member => member}) %> + +<% end; reset_cycle %> + +
<%= l(:label_user) %> / <%= l(:label_group) %><%= l(:label_role_plural) %>
<%= link_to_user member.principal %> + <%=h member.roles.sort.collect(&:to_s).join(', ') %> + <% if authorize_for('members', 'edit') %> + <% remote_form_for(:member, member, :url => {:controller => 'members', :action => 'edit', :id => member}, + :method => :post, + :html => { :id => "member-#{member.id}-roles-form", :class => 'hol' }) do |f| %> +

<% roles.each do |role| %> +
+ <% end %>

+ <%= hidden_field_tag 'member[role_ids][]', '' %> +

<%= submit_tag l(:button_change), :class => "small" %> + <%= link_to_function l(:button_cancel), "$('member-#{member.id}-roles').show(); $('member-#{member.id}-roles-form').hide(); return false;" %>

+ <% end %> + <% end %> + 		+ <%= link_to_function l(:button_edit), "$('member-#{member.id}-roles').hide(); $('member-#{member.id}-roles-form').show(); return false;", :class => 'icon icon-edit' %> + <%= link_to_remote(l(:button_delete), { :url => {:controller => 'members', :action => 'destroy', :id => member}, + :method => :post, + :confirm => (!User.current.admin? && member.include?(User.current) ? l(:text_own_membership_delete_confirmation) : nil) + }, :title => l(:button_delete), + :class => 'icon icon-del') if member.deletable? %> +
+<% else %> +

<%= l(:label_no_data) %>

+<% end %> +
+ + +<% principals = Principal.active.find(:all, :limit => 100, :order => 'type, login, lastname ASC') - @project.principals %> + +
+<% if roles.any? && principals.any? %> + <% remote_form_for(:member, @member, :url => {:controller => 'members', :action => 'new', :id => @project}, :method => :post, + :loading => '$(\'member-add-submit\').disable();', + :complete => 'if($(\'member-add-submit\')) $(\'member-add-submit\').enable();') do |f| %> +
<%=l(:label_member_new)%> + +

<%= label_tag "principal_search", l(:label_principal_search) %><%= text_field_tag 'principal_search', nil %>

+ <%= observe_field(:principal_search, + :frequency => 0.5, + :update => :principals, + :url => { :controller => 'members', :action => 'autocomplete_for_member', :id => @project }, + :with => 'q') + %> + +
+ <%= principals_check_box_tags 'member[user_ids][]', principals %> +
+ +

<%= l(:label_role_plural) %>: + <% roles.each do |role| %> + + <% end %>

+ +

<%= submit_tag l(:button_add), :id => 'member-add-submit' %>

+
+ <% end %> +<% end %> +
diff --git a/app/views/projects/settings/_members.rhtml b/app/views/projects/settings/_members.rhtml deleted file mode 100644 index 4230e037b..000000000 --- a/app/views/projects/settings/_members.rhtml +++ /dev/null @@ -1,84 +0,0 @@ -<%= error_messages_for 'member' %> -<% roles = Role.find_all_givable - members = @project.member_principals.find(:all, :include => [:roles, :principal]).sort %> - -
-<% if members.any? %> - - - - - - <%= call_hook(:view_projects_settings_members_table_header, :project => @project) %> - - - <% members.each do |member| %> - <% next if member.new_record? %> - - - - - <%= call_hook(:view_projects_settings_members_table_row, { :project => @project, :member => member}) %> - -<% end; reset_cycle %> - -
<%= l(:label_user) %> / <%= l(:label_group) %><%= l(:label_role_plural) %>
<%= link_to_user member.principal %> - <%=h member.roles.sort.collect(&:to_s).join(', ') %> - <% if authorize_for('members', 'edit') %> - <% remote_form_for(:member, member, :url => {:controller => 'members', :action => 'edit', :id => member}, - :method => :post, - :html => { :id => "member-#{member.id}-roles-form", :class => 'hol' }) do |f| %> -

<% roles.each do |role| %> -
- <% end %>

- <%= hidden_field_tag 'member[role_ids][]', '' %> -

<%= submit_tag l(:button_change), :class => "small" %> - <%= link_to_function l(:button_cancel), "$('member-#{member.id}-roles').show(); $('member-#{member.id}-roles-form').hide(); return false;" %>

- <% end %> - <% end %> - 		- <%= link_to_function l(:button_edit), "$('member-#{member.id}-roles').hide(); $('member-#{member.id}-roles-form').show(); return false;", :class => 'icon icon-edit' %> - <%= link_to_remote(l(:button_delete), { :url => {:controller => 'members', :action => 'destroy', :id => member}, - :method => :post, - :confirm => (!User.current.admin? && member.include?(User.current) ? l(:text_own_membership_delete_confirmation) : nil) - }, :title => l(:button_delete), - :class => 'icon icon-del') if member.deletable? %> -
-<% else %> -

<%= l(:label_no_data) %>

-<% end %> -
- - -<% principals = Principal.active.find(:all, :limit => 100, :order => 'type, login, lastname ASC') - @project.principals %> - -
-<% if roles.any? && principals.any? %> - <% remote_form_for(:member, @member, :url => {:controller => 'members', :action => 'new', :id => @project}, :method => :post, - :loading => '$(\'member-add-submit\').disable();', - :complete => 'if($(\'member-add-submit\')) $(\'member-add-submit\').enable();') do |f| %> -
<%=l(:label_member_new)%> - -

<%= label_tag "principal_search", l(:label_principal_search) %><%= text_field_tag 'principal_search', nil %>

- <%= observe_field(:principal_search, - :frequency => 0.5, - :update => :principals, - :url => { :controller => 'members', :action => 'autocomplete_for_member', :id => @project }, - :with => 'q') - %> - -
- <%= principals_check_box_tags 'member[user_ids][]', principals %> -
- -

<%= l(:label_role_plural) %>: - <% roles.each do |role| %> - - <% end %>

- -

<%= submit_tag l(:button_add), :id => 'member-add-submit' %>

-
- <% end %> -<% end %> -