From: Toshi MARUYAMA <marutosijp2@yahoo.co.jp>
Date: Fri, 26 Aug 2011 06:37:01 +0000 (+0000)
Subject: rename .rhtml to .html.erb of app/views/watchers/_watchers.rhtml.
X-Git-Tag: 1.3.0~1320
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=f1339b033f62687d18c8ad6f556cdb4103913d42;p=redmine.git

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

diff --git a/app/views/watchers/_watchers.html.erb b/app/views/watchers/_watchers.html.erb
new file mode 100644
index 000000000..8e361ede6
--- /dev/null
+++ b/app/views/watchers/_watchers.html.erb
@@ -0,0 +1,26 @@
+<div class="contextual">
+<%= link_to_remote l(:button_add), 
+                   :url => {:controller => 'watchers',
+                            :action => 'new',
+                            :object_type => watched.class.name.underscore,
+                            :object_id => watched} if User.current.allowed_to?(:add_issue_watchers, @project) %>
+</div>
+
+<h3><%= l(:label_issue_watchers) %> (<%= watched.watcher_users.size %>)</h3>
+
+<% unless @watcher.nil? %>
+	<% remote_form_for(:watcher, @watcher, 
+                	   :url => {:controller => 'watchers',
+              	              :action => 'new',
+            	                :object_type => watched.class.name.underscore,
+         	                    :object_id => watched},
+       	             :method => :post,
+      	             :html => {:id => 'new-watcher-form'}) do |f| %>
+		<p><%= f.select :user_id, (watched.addable_watcher_users.collect {|m| [m.name, m.id]}), :prompt => "--- #{l(:actionview_instancetag_blank_option)} ---" %>
+
+		<%= submit_tag l(:button_add) %>
+		<%= toggle_link l(:button_cancel), 'new-watcher-form'%></p>
+	<% end %>
+<% end %>
+
+<%= watchers_list(watched) %>
diff --git a/app/views/watchers/_watchers.rhtml b/app/views/watchers/_watchers.rhtml
deleted file mode 100644
index 8e361ede6..000000000
--- a/app/views/watchers/_watchers.rhtml
+++ /dev/null
@@ -1,26 +0,0 @@
-<div class="contextual">
-<%= link_to_remote l(:button_add), 
-                   :url => {:controller => 'watchers',
-                            :action => 'new',
-                            :object_type => watched.class.name.underscore,
-                            :object_id => watched} if User.current.allowed_to?(:add_issue_watchers, @project) %>
-</div>
-
-<h3><%= l(:label_issue_watchers) %> (<%= watched.watcher_users.size %>)</h3>
-
-<% unless @watcher.nil? %>
-	<% remote_form_for(:watcher, @watcher, 
-                	   :url => {:controller => 'watchers',
-              	              :action => 'new',
-            	                :object_type => watched.class.name.underscore,
-         	                    :object_id => watched},
-       	             :method => :post,
-      	             :html => {:id => 'new-watcher-form'}) do |f| %>
-		<p><%= f.select :user_id, (watched.addable_watcher_users.collect {|m| [m.name, m.id]}), :prompt => "--- #{l(:actionview_instancetag_blank_option)} ---" %>
-
-		<%= submit_tag l(:button_add) %>
-		<%= toggle_link l(:button_cancel), 'new-watcher-form'%></p>
-	<% end %>
-<% end %>
-
-<%= watchers_list(watched) %>