From: Toshi MARUYAMA Date: Sun, 28 Aug 2011 08:20:14 +0000 (+0000) Subject: rename .rhtml to .html.erb of app/views/versions/show.rhtml. X-Git-Tag: 1.3.0~1267 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=864d17213d34310badfe2fbb5876eeae93724d04;p=redmine.git rename .rhtml to .html.erb of app/views/versions/show.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@6695 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- diff --git a/app/views/versions/show.html.erb b/app/views/versions/show.html.erb new file mode 100644 index 000000000..1cd4f7de4 --- /dev/null +++ b/app/views/versions/show.html.erb @@ -0,0 +1,56 @@ +
+<%= link_to(l(:button_edit), edit_version_path(@version), :class => 'icon icon-edit') if User.current.allowed_to?(:manage_versions, @version.project) %> +<%= link_to_if_authorized(l(:button_edit_associated_wikipage, :page_title => @version.wiki_page_title), {:controller => 'wiki', :action => 'edit', :project_id => @version.project, :id => Wiki.titleize(@version.wiki_page_title)}, :class => 'icon icon-edit') unless @version.wiki_page_title.blank? || @version.project.wiki.nil? %> +<%= link_to(l(:button_delete), version_path(@version, :back_url => url_for(:controller => 'versions', :action => 'index', :project_id => @version.project)), + :confirm => l(:text_are_you_sure), :method => :delete, :class => 'icon icon-del') if User.current.allowed_to?(:manage_versions, @version.project) %> +<%= call_hook(:view_versions_show_contextual, { :version => @version, :project => @project }) %> +
+ +

<%= h(@version.name) %>

+ +
+<%= render :partial => 'versions/overview', :locals => {:version => @version} %> +<%= render(:partial => "wiki/content", :locals => {:content => @version.wiki_page.content}) if @version.wiki_page %> + +
+<% if @version.estimated_hours > 0 || User.current.allowed_to?(:view_time_entries, @project) %> +
<%= l(:label_time_tracking) %> + + + + + +<% if User.current.allowed_to?(:view_time_entries, @project) %> + + + + +<% end %> +
<%= l(:field_estimated_hours) %><%= html_hours(l_hours(@version.estimated_hours)) %>
<%= l(:label_spent_time) %><%= html_hours(l_hours(@version.spent_hours)) %>
+
+<% end %> + +
+<%= render_issue_status_by(@version, params[:status_by]) if @version.fixed_issues.count > 0 %> +
+
+ +<% if @issues.present? %> +<% form_tag({}) do -%> + + + <%- @issues.each do |issue| -%> + + + + + <% end %> + +<% end %> +<%= context_menu issues_context_menu_path %> +<% end %> +
+ +<%= call_hook :view_versions_show_bottom, :version => @version %> + +<% html_title h(@version.name) %> diff --git a/app/views/versions/show.rhtml b/app/views/versions/show.rhtml deleted file mode 100644 index 1cd4f7de4..000000000 --- a/app/views/versions/show.rhtml +++ /dev/null @@ -1,56 +0,0 @@ -
-<%= link_to(l(:button_edit), edit_version_path(@version), :class => 'icon icon-edit') if User.current.allowed_to?(:manage_versions, @version.project) %> -<%= link_to_if_authorized(l(:button_edit_associated_wikipage, :page_title => @version.wiki_page_title), {:controller => 'wiki', :action => 'edit', :project_id => @version.project, :id => Wiki.titleize(@version.wiki_page_title)}, :class => 'icon icon-edit') unless @version.wiki_page_title.blank? || @version.project.wiki.nil? %> -<%= link_to(l(:button_delete), version_path(@version, :back_url => url_for(:controller => 'versions', :action => 'index', :project_id => @version.project)), - :confirm => l(:text_are_you_sure), :method => :delete, :class => 'icon icon-del') if User.current.allowed_to?(:manage_versions, @version.project) %> -<%= call_hook(:view_versions_show_contextual, { :version => @version, :project => @project }) %> -
- -

<%= h(@version.name) %>

- -
-<%= render :partial => 'versions/overview', :locals => {:version => @version} %> -<%= render(:partial => "wiki/content", :locals => {:content => @version.wiki_page.content}) if @version.wiki_page %> - -
-<% if @version.estimated_hours > 0 || User.current.allowed_to?(:view_time_entries, @project) %> -
<%= l(:label_time_tracking) %> - - - - - -<% if User.current.allowed_to?(:view_time_entries, @project) %> - - - - -<% end %> -
<%= l(:field_estimated_hours) %><%= html_hours(l_hours(@version.estimated_hours)) %>
<%= l(:label_spent_time) %><%= html_hours(l_hours(@version.spent_hours)) %>
-
-<% end %> - -
-<%= render_issue_status_by(@version, params[:status_by]) if @version.fixed_issues.count > 0 %> -
-
- -<% if @issues.present? %> -<% form_tag({}) do -%> - - - <%- @issues.each do |issue| -%> - - - - - <% end %> - -<% end %> -<%= context_menu issues_context_menu_path %> -<% end %> -
- -<%= call_hook :view_versions_show_bottom, :version => @version %> - -<% html_title h(@version.name) %>