From: Toshi MARUYAMA <marutosijp2@yahoo.co.jp>
Date: Fri, 2 Sep 2011 04:33:06 +0000 (+0000)
Subject: rename .rhtml to .html.erb of app/views/queries/_columns.rhtml.
X-Git-Tag: 1.3.0~916
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=1e105a55678d9e161537ad7d3b72e67f675721bc;p=redmine.git

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

diff --git a/app/views/queries/_columns.html.erb b/app/views/queries/_columns.html.erb
new file mode 100644
index 000000000..f96d87b0a
--- /dev/null
+++ b/app/views/queries/_columns.html.erb
@@ -0,0 +1,26 @@
+<table style="border-collapse: collapse; border:0;">
+	<tr>
+		<td style="padding-left:0"><%= select_tag 'available_columns',
+		          options_for_select((query.available_columns - query.columns).collect {|column| [column.caption, column.name]}),
+		          :multiple => true, :size => 10, :style => "width:150px" %>
+		</td>
+		<td align="center" valign="middle">
+			<input type="button" value="&#8594;"
+			 onclick="moveOptions(this.form.available_columns, this.form.selected_columns);" /><br />
+			<input type="button" value="&#8592;"
+			 onclick="moveOptions(this.form.selected_columns, this.form.available_columns);" />
+		</td>
+		<td><%= select_tag 'c[]',
+		          options_for_select(query.columns.collect {|column| [column.caption, column.name]}),
+		          :id => 'selected_columns', :multiple => true, :size => 10, :style => "width:150px" %>
+		</td>
+		<td align="center" valign="middle">
+			<input type="button" value="&#8593;" onclick="moveOptionUp(this.form.selected_columns);" /><br />
+			<input type="button" value="&#8595;" onclick="moveOptionDown(this.form.selected_columns);" />
+		</td>
+	</tr>
+</table>
+
+<% content_for :header_tags do %>
+<%= javascript_include_tag 'select_list_move' %>
+<% end %>
diff --git a/app/views/queries/_columns.rhtml b/app/views/queries/_columns.rhtml
deleted file mode 100644
index f96d87b0a..000000000
--- a/app/views/queries/_columns.rhtml
+++ /dev/null
@@ -1,26 +0,0 @@
-<table style="border-collapse: collapse; border:0;">
-	<tr>
-		<td style="padding-left:0"><%= select_tag 'available_columns',
-		          options_for_select((query.available_columns - query.columns).collect {|column| [column.caption, column.name]}),
-		          :multiple => true, :size => 10, :style => "width:150px" %>
-		</td>
-		<td align="center" valign="middle">
-			<input type="button" value="&#8594;"
-			 onclick="moveOptions(this.form.available_columns, this.form.selected_columns);" /><br />
-			<input type="button" value="&#8592;"
-			 onclick="moveOptions(this.form.selected_columns, this.form.available_columns);" />
-		</td>
-		<td><%= select_tag 'c[]',
-		          options_for_select(query.columns.collect {|column| [column.caption, column.name]}),
-		          :id => 'selected_columns', :multiple => true, :size => 10, :style => "width:150px" %>
-		</td>
-		<td align="center" valign="middle">
-			<input type="button" value="&#8593;" onclick="moveOptionUp(this.form.selected_columns);" /><br />
-			<input type="button" value="&#8595;" onclick="moveOptionDown(this.form.selected_columns);" />
-		</td>
-	</tr>
-</table>
-
-<% content_for :header_tags do %>
-<%= javascript_include_tag 'select_list_move' %>
-<% end %>