From: Toshi MARUYAMA <marutosijp2@yahoo.co.jp>
Date: Thu, 1 Sep 2011 11:48:50 +0000 (+0000)
Subject: rename .rhtml to .html.erb of app/views/projects/settings/_versions.rhtml.
X-Git-Tag: 1.3.0~980
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=fd748a558ba0b7309eafe4fdc3db1a4111ebd698;p=redmine.git

rename .rhtml to .html.erb of app/views/projects/settings/_versions.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@6983 e93f8b46-1217-0410-a6f0-8f06a7374b81
---

diff --git a/app/views/projects/settings/_versions.html.erb b/app/views/projects/settings/_versions.html.erb
new file mode 100644
index 000000000..d4d283f5a
--- /dev/null
+++ b/app/views/projects/settings/_versions.html.erb
@@ -0,0 +1,41 @@
+<% if @project.shared_versions.any? %>
+<table class="list versions">
+	<thead><tr>
+    <th><%= l(:label_version) %></th>
+    <th><%= l(:field_effective_date) %></th>
+    <th><%= l(:field_description) %></th>
+    <th><%= l(:field_status) %></th>
+    <th><%= l(:field_sharing) %></th>
+    <th><%= l(:label_wiki_page) %></th>
+    <th style="width:15%"></th>
+    </tr></thead>
+	<tbody>
+<% for version in @project.shared_versions.sort %>
+    <tr class="version <%= cycle 'odd', 'even' %> <%=h version.status %> <%= 'shared' if version.project != @project %>">
+    <td class="name"><%= link_to_version version %></td>
+    <td class="date"><%= format_date(version.effective_date) %></td>
+    <td class="description"><%=h version.description %></td>
+    <td class="status"><%= l("version_status_#{version.status}") %></td>
+    <td class="sharing"><%=h format_version_sharing(version.sharing) %></td>
+    <td><%= link_to_if_authorized(h(version.wiki_page_title), {:controller => 'wiki', :action => 'show', :project_id => version.project, :id => Wiki.titleize(version.wiki_page_title)}) || h(version.wiki_page_title) unless version.wiki_page_title.blank? || version.project.wiki.nil? %></td>
+    <td class="buttons">
+    	<% if version.project == @project && User.current.allowed_to?(:manage_versions, @project) %>
+    		<%= link_to l(:button_edit), edit_version_path(version), :class => 'icon icon-edit' %>
+    		<%= link_to l(:button_delete), version_path(version), :confirm => l(:text_are_you_sure), :method => :delete, :class => 'icon icon-del' %>
+    	<% end %>
+   	</td>
+    </tr>
+<% end; reset_cycle %>
+    </tbody>
+</table>
+<% else %>
+<p class="nodata"><%= l(:label_no_data) %></p>
+<% end %>
+
+<div class="contextual">
+<% if @project.versions.any? %>
+	<%= link_to l(:label_close_versions), close_completed_project_versions_path(@project), :method => :put %>
+<% end %>
+</div>
+
+<p><%= link_to_if_authorized l(:label_version_new), :controller => 'versions', :action => 'new', :project_id => @project %></p>
diff --git a/app/views/projects/settings/_versions.rhtml b/app/views/projects/settings/_versions.rhtml
deleted file mode 100644
index d4d283f5a..000000000
--- a/app/views/projects/settings/_versions.rhtml
+++ /dev/null
@@ -1,41 +0,0 @@
-<% if @project.shared_versions.any? %>
-<table class="list versions">
-	<thead><tr>
-    <th><%= l(:label_version) %></th>
-    <th><%= l(:field_effective_date) %></th>
-    <th><%= l(:field_description) %></th>
-    <th><%= l(:field_status) %></th>
-    <th><%= l(:field_sharing) %></th>
-    <th><%= l(:label_wiki_page) %></th>
-    <th style="width:15%"></th>
-    </tr></thead>
-	<tbody>
-<% for version in @project.shared_versions.sort %>
-    <tr class="version <%= cycle 'odd', 'even' %> <%=h version.status %> <%= 'shared' if version.project != @project %>">
-    <td class="name"><%= link_to_version version %></td>
-    <td class="date"><%= format_date(version.effective_date) %></td>
-    <td class="description"><%=h version.description %></td>
-    <td class="status"><%= l("version_status_#{version.status}") %></td>
-    <td class="sharing"><%=h format_version_sharing(version.sharing) %></td>
-    <td><%= link_to_if_authorized(h(version.wiki_page_title), {:controller => 'wiki', :action => 'show', :project_id => version.project, :id => Wiki.titleize(version.wiki_page_title)}) || h(version.wiki_page_title) unless version.wiki_page_title.blank? || version.project.wiki.nil? %></td>
-    <td class="buttons">
-    	<% if version.project == @project && User.current.allowed_to?(:manage_versions, @project) %>
-    		<%= link_to l(:button_edit), edit_version_path(version), :class => 'icon icon-edit' %>
-    		<%= link_to l(:button_delete), version_path(version), :confirm => l(:text_are_you_sure), :method => :delete, :class => 'icon icon-del' %>
-    	<% end %>
-   	</td>
-    </tr>
-<% end; reset_cycle %>
-    </tbody>
-</table>
-<% else %>
-<p class="nodata"><%= l(:label_no_data) %></p>
-<% end %>
-
-<div class="contextual">
-<% if @project.versions.any? %>
-	<%= link_to l(:label_close_versions), close_completed_project_versions_path(@project), :method => :put %>
-<% end %>
-</div>
-
-<p><%= link_to_if_authorized l(:label_version_new), :controller => 'versions', :action => 'new', :project_id => @project %></p>