From: Toshi MARUYAMA <marutosijp2@yahoo.co.jp>
Date: Thu, 1 Sep 2011 13:55:19 +0000 (+0000)
Subject: rename .rhtml to .html.erb of app/views/issues/_form.rhtml.
X-Git-Tag: 1.3.0~949
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=6b462e36f8164820bb39be4b11939a3ce980fc3a;p=redmine.git

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

diff --git a/app/views/issues/_form.html.erb b/app/views/issues/_form.html.erb
new file mode 100644
index 000000000..d88b771b9
--- /dev/null
+++ b/app/views/issues/_form.html.erb
@@ -0,0 +1,40 @@
+<%= call_hook(:view_issues_form_details_top, { :issue => @issue, :form => f }) %>
+
+<div id="issue_descr_fields" <%= 'style="display:none"' unless @issue.new_record? || @issue.errors.any? %>>
+<% if @issue.safe_attribute_names.include?('is_private') %>
+<p style="float:right; margin-right:1em;">
+  <label class="inline" for="issue_is_private" id="issue_is_private_label"><%= f.check_box :is_private, :no_label => true %> <%= l(:field_is_private) %></label>
+</p>
+<% end %>
+<p><%= f.select :tracker_id, @project.trackers.collect {|t| [t.name, t.id]}, :required => true %></p>
+<%= observe_field :issue_tracker_id, :url => { :action => :new, :project_id => @project, :id => @issue },
+                                     :update => :attributes,
+                                     :with => "Form.serialize('issue-form')" %>
+
+<p><%= f.text_field :subject, :size => 80, :required => true %></p>
+<p><%= f.text_area :description,
+                   :cols => 60,
+                   :rows => (@issue.description.blank? ? 10 : [[10, @issue.description.length / 50].max, 100].min),
+                   :accesskey => accesskey(:edit),
+                   :class => 'wiki-edit' %></p>
+</div>
+
+<div id="attributes" class="attributes">
+	<%= render :partial => 'issues/attributes' %>
+</div>
+
+<% if @issue.new_record? %>
+<p id="attachments_form"><%= label_tag('attachments[1][file]', l(:label_attachment_plural))%><%= render :partial => 'attachments/form' %></p>
+<% end %>
+
+<% if @issue.new_record? && User.current.allowed_to?(:add_issue_watchers, @project) -%>
+<p id="watchers_form"><label><%= l(:label_issue_watchers) %></label>
+<% @issue.project.users.sort.each do |user| -%>
+<label class="floating"><%= check_box_tag 'issue[watcher_user_ids][]', user.id, @issue.watched_by?(user) %> <%=h user %></label>
+<% end -%>
+</p>
+<% end %>
+
+<%= call_hook(:view_issues_form_details_bottom, { :issue => @issue, :form => f }) %>
+
+<%= wikitoolbar_for 'issue_description' %>
diff --git a/app/views/issues/_form.rhtml b/app/views/issues/_form.rhtml
deleted file mode 100644
index d88b771b9..000000000
--- a/app/views/issues/_form.rhtml
+++ /dev/null
@@ -1,40 +0,0 @@
-<%= call_hook(:view_issues_form_details_top, { :issue => @issue, :form => f }) %>
-
-<div id="issue_descr_fields" <%= 'style="display:none"' unless @issue.new_record? || @issue.errors.any? %>>
-<% if @issue.safe_attribute_names.include?('is_private') %>
-<p style="float:right; margin-right:1em;">
-  <label class="inline" for="issue_is_private" id="issue_is_private_label"><%= f.check_box :is_private, :no_label => true %> <%= l(:field_is_private) %></label>
-</p>
-<% end %>
-<p><%= f.select :tracker_id, @project.trackers.collect {|t| [t.name, t.id]}, :required => true %></p>
-<%= observe_field :issue_tracker_id, :url => { :action => :new, :project_id => @project, :id => @issue },
-                                     :update => :attributes,
-                                     :with => "Form.serialize('issue-form')" %>
-
-<p><%= f.text_field :subject, :size => 80, :required => true %></p>
-<p><%= f.text_area :description,
-                   :cols => 60,
-                   :rows => (@issue.description.blank? ? 10 : [[10, @issue.description.length / 50].max, 100].min),
-                   :accesskey => accesskey(:edit),
-                   :class => 'wiki-edit' %></p>
-</div>
-
-<div id="attributes" class="attributes">
-	<%= render :partial => 'issues/attributes' %>
-</div>
-
-<% if @issue.new_record? %>
-<p id="attachments_form"><%= label_tag('attachments[1][file]', l(:label_attachment_plural))%><%= render :partial => 'attachments/form' %></p>
-<% end %>
-
-<% if @issue.new_record? && User.current.allowed_to?(:add_issue_watchers, @project) -%>
-<p id="watchers_form"><label><%= l(:label_issue_watchers) %></label>
-<% @issue.project.users.sort.each do |user| -%>
-<label class="floating"><%= check_box_tag 'issue[watcher_user_ids][]', user.id, @issue.watched_by?(user) %> <%=h user %></label>
-<% end -%>
-</p>
-<% end %>
-
-<%= call_hook(:view_issues_form_details_bottom, { :issue => @issue, :form => f }) %>
-
-<%= wikitoolbar_for 'issue_description' %>