rename .rhtml to .html.erb of app/views/users/_memberships.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@7049 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/app/views/users/_memberships.html.erb b/app/views/users/_memberships.html.erb
new file mode 100644 (file)
index 0000000..7d97c5f
--- /dev/null
+++ b/app/views/users/_memberships.html.erb
@@ -0,0 +1,62 @@
+<% roles = Role.find_all_givable %>
+<% projects = Project.active.find(:all, :order => 'lft') %>
+
+<div class="splitcontentleft">
+<% if @user.memberships.any? %>
+<table class="list memberships">
+       <thead><tr>
+         <th><%= l(:label_project) %></th>
+         <th><%= l(:label_role_plural) %></th>
+         <th style="width:15%"></th>
+      <%= call_hook(:view_users_memberships_table_header, :user => @user )%>
+       </tr></thead>
+       <tbody>
+       <% @user.memberships.each do |membership| %>
+       <% next if membership.new_record? %>
+       <tr id="member-<%= membership.id %>" class="<%= cycle 'odd', 'even' %> class">
+  <td class="project">
+    <%= link_to_project membership.project %>
+  </td>
+  <td class="roles">
+    <span id="member-<%= membership.id %>-roles"><%=h membership.roles.sort.collect(&:to_s).join(', ') %></span>
+    <% remote_form_for(:membership, :url => { :action => 'edit_membership', :id => @user, :membership_id => membership },
+                                                                                                                 :html => { :id => "member-#{membership.id}-roles-form", :style => 'display:none;'}) do %>
+       <p><% roles.each do |role| %>
+        <label><%= check_box_tag 'membership[role_ids][]', role.id, membership.roles.include?(role),
+                                                                                                                                                                                                                :disabled => membership.member_roles.detect {|mr| mr.role_id == role.id && !mr.inherited_from.nil?} %> <%=h role %></label><br />
+        <% end %></p>
+        <%= 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;" %></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;", :class => 'icon icon-edit' %>
+      <%= link_to_remote(l(:button_delete), { :url => { :controller => 'users', :action => 'destroy_membership', :id => @user, :membership_id => membership },
+                                                                                                                                                               :method => :post },
+                                                                                                                                                   :class => 'icon icon-del') if membership.deletable? %>
+  </td>
+      <%= call_hook(:view_users_memberships_table_row, :user => @user, :membership => membership, :roles => roles, :projects => projects )%>
+       </tr>
+  <% end; reset_cycle %>
+       </tbody>
+</table>
+<% else %>
+<p class="nodata"><%= l(:label_no_data) %></p>
+<% end %>
+</div>
+
+<div class="splitcontentright">
+<% if projects.any? %>
+<fieldset><legend><%=l(:label_project_new)%></legend>
+<% remote_form_for(:membership, :url => { :action => 'edit_membership', :id => @user }) do %>
+<%= select_tag 'membership[project_id]', options_for_membership_project_select(@user, projects) %>
+<p><%= l(:label_role_plural) %>:
+<% roles.each do |role| %>
+  <label><%= check_box_tag 'membership[role_ids][]', role.id %> <%=h role %></label>
+<% end %></p>
+<p><%= submit_tag l(:button_add) %></p>
+<% end %>
+</fieldset>
+<% end %>
+</div>

diff --git a/app/views/users/_memberships.rhtml b/app/views/users/_memberships.rhtml
deleted file mode 100644 (file)
index 7d97c5f..0000000
--- a/app/views/users/_memberships.rhtml
+++ /dev/null
@@ -1,62 +0,0 @@
-<% roles = Role.find_all_givable %>
-<% projects = Project.active.find(:all, :order => 'lft') %>
-
-<div class="splitcontentleft">
-<% if @user.memberships.any? %>
-<table class="list memberships">
-       <thead><tr>
-         <th><%= l(:label_project) %></th>
-         <th><%= l(:label_role_plural) %></th>
-         <th style="width:15%"></th>
-      <%= call_hook(:view_users_memberships_table_header, :user => @user )%>
-       </tr></thead>
-       <tbody>
-       <% @user.memberships.each do |membership| %>
-       <% next if membership.new_record? %>
-       <tr id="member-<%= membership.id %>" class="<%= cycle 'odd', 'even' %> class">
-  <td class="project">
-    <%= link_to_project membership.project %>
-  </td>
-  <td class="roles">
-    <span id="member-<%= membership.id %>-roles"><%=h membership.roles.sort.collect(&:to_s).join(', ') %></span>
-    <% remote_form_for(:membership, :url => { :action => 'edit_membership', :id => @user, :membership_id => membership },
-                                                                                                                 :html => { :id => "member-#{membership.id}-roles-form", :style => 'display:none;'}) do %>
-       <p><% roles.each do |role| %>
-        <label><%= check_box_tag 'membership[role_ids][]', role.id, membership.roles.include?(role),
-                                                                                                                                                                                                                :disabled => membership.member_roles.detect {|mr| mr.role_id == role.id && !mr.inherited_from.nil?} %> <%=h role %></label><br />
-        <% end %></p>
-        <%= 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;" %></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;", :class => 'icon icon-edit' %>
-      <%= link_to_remote(l(:button_delete), { :url => { :controller => 'users', :action => 'destroy_membership', :id => @user, :membership_id => membership },
-                                                                                                                                                               :method => :post },
-                                                                                                                                                   :class => 'icon icon-del') if membership.deletable? %>
-  </td>
-      <%= call_hook(:view_users_memberships_table_row, :user => @user, :membership => membership, :roles => roles, :projects => projects )%>
-       </tr>
-  <% end; reset_cycle %>
-       </tbody>
-</table>
-<% else %>
-<p class="nodata"><%= l(:label_no_data) %></p>
-<% end %>
-</div>
-
-<div class="splitcontentright">
-<% if projects.any? %>
-<fieldset><legend><%=l(:label_project_new)%></legend>
-<% remote_form_for(:membership, :url => { :action => 'edit_membership', :id => @user }) do %>
-<%= select_tag 'membership[project_id]', options_for_membership_project_select(@user, projects) %>
-<p><%= l(:label_role_plural) %>:
-<% roles.each do |role| %>
-  <label><%= check_box_tag 'membership[role_ids][]', role.id %> <%=h role %></label>
-<% end %></p>
-<p><%= submit_tag l(:button_add) %></p>
-<% end %>
-</fieldset>
-<% end %>
-</div>