]> source.dussan.org Git - redmine.git/commitdiff
rename .rhtml to .html.erb of app/views/settings/_repositories.rhtml.
authorToshi MARUYAMA <marutosijp2@yahoo.co.jp>
Thu, 25 Aug 2011 01:23:44 +0000 (01:23 +0000)
committerToshi MARUYAMA <marutosijp2@yahoo.co.jp>
Thu, 25 Aug 2011 01:23:44 +0000 (01:23 +0000)
: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@6618 e93f8b46-1217-0410-a6f0-8f06a7374b81

app/views/settings/_repositories.html.erb [new file with mode: 0644]
app/views/settings/_repositories.rhtml [deleted file]

diff --git a/app/views/settings/_repositories.html.erb b/app/views/settings/_repositories.html.erb
new file mode 100644 (file)
index 0000000..d5da7c1
--- /dev/null
@@ -0,0 +1,96 @@
+<% form_tag({:action => 'edit', :tab => 'repositories'}) do %>
+
+<fieldset class="box tabular settings enabled_scm">
+<legend><%= l(:setting_enabled_scm) %></legend>
+<table>
+  <tr>
+    <th></th>
+    <th><%= l(:text_scm_command)         %></th>
+    <th><%= l(:text_scm_command_version) %></th>
+  </tr>
+  <% Redmine::Scm::Base.all.collect do |choice| %>
+    <% scm_class = "Repository::#{choice}".constantize %>
+    <% text, value = (choice.is_a?(Array) ? choice : [choice, choice]) %>
+    <% setting = :enabled_scm %>
+    <tr>
+      <td class="scm_name">
+        <%= 
+          check_box_tag(
+              "settings[#{setting}][]",
+               value,
+               Setting.send(setting).include?(value))
+         %>
+        <%= text.to_s %>
+      </td>
+      <td>
+         <%=
+           image_tag(
+              (scm_class.scm_available ? 'true.png' : 'exclamation.png'),
+              :style => "vertical-align:bottom;"
+           )
+           %>
+          <%= scm_class.scm_command %>
+       </td>
+       <td>
+          <%= scm_class.scm_version_string %>
+       </td>
+     </tr>
+  <% end %>
+</table>
+<p class="scm_config">
+<%= l(:text_scm_config) %>
+</p>
+</fieldset>
+
+<div class="box tabular settings">
+<p><%= setting_check_box :autofetch_changesets %></p>
+
+<p><%= setting_check_box :sys_api_enabled,
+                         :onclick =>
+                             "if (this.checked) { Form.Element.enable('settings_sys_api_key'); } else { Form.Element.disable('settings_sys_api_key'); }" %></p>
+
+<p><%= setting_text_field :sys_api_key,
+                          :size     => 30,
+                          :id       => 'settings_sys_api_key',
+                          :disabled => !Setting.sys_api_enabled?,
+                          :label    => :setting_mail_handler_api_key %>
+  <%= link_to_function l(:label_generate_key),
+                       "if ($('settings_sys_api_key').disabled == false) { $('settings_sys_api_key').value = randomKey(20) }" %>
+</p>
+
+<p><%= setting_text_field :repositories_encodings, :size => 60 %><br />
+<em><%= l(:text_comma_separated) %></em></p>
+
+<p><%= setting_text_field :repository_log_display_limit, :size => 6 %></p>
+</div>
+
+<fieldset class="box tabular settings">
+<legend><%= l(:text_issues_ref_in_commit_messages) %></legend>
+<p><%= setting_text_field :commit_ref_keywords, :size => 30 %><br />
+<em><%= l(:text_comma_separated) %></em></p>
+
+<p><%= setting_text_field :commit_fix_keywords, :size => 30 %>
+&nbsp;<%= l(:label_applied_status) %>: <%= setting_select :commit_fix_status_id,
+                                                          [["", 0]] +
+                                                              IssueStatus.find(:all).collect{
+                                                                 |status| [status.name, status.id.to_s]
+                                                              },
+                                                          :label => false %>
+&nbsp;<%= l(:field_done_ratio) %>: <%= setting_select :commit_fix_done_ratio,
+                                                       (0..10).to_a.collect {|r| ["#{r*10} %", "#{r*10}"] },
+                                                       :blank => :label_no_change_option,
+                                                       :label => false %>
+<br /><em><%= l(:text_comma_separated) %></em></p>
+
+<p><%= setting_check_box :commit_logtime_enabled,
+                         :onclick =>
+                            "if (this.checked) { Form.Element.enable('settings_commit_logtime_activity_id'); } else { Form.Element.disable('settings_commit_logtime_activity_id'); }"%></p>
+
+<p><%= setting_select :commit_logtime_activity_id,
+                      [[l(:label_default), 0]] +
+                          TimeEntryActivity.shared.active.collect{|activity| [activity.name, activity.id.to_s]},
+                      :disabled => !Setting.commit_logtime_enabled?%></p>
+</fieldset>
+
+<%= submit_tag l(:button_save) %>
+<% end %>
diff --git a/app/views/settings/_repositories.rhtml b/app/views/settings/_repositories.rhtml
deleted file mode 100644 (file)
index d5da7c1..0000000
+++ /dev/null
@@ -1,96 +0,0 @@
-<% form_tag({:action => 'edit', :tab => 'repositories'}) do %>
-
-<fieldset class="box tabular settings enabled_scm">
-<legend><%= l(:setting_enabled_scm) %></legend>
-<table>
-  <tr>
-    <th></th>
-    <th><%= l(:text_scm_command)         %></th>
-    <th><%= l(:text_scm_command_version) %></th>
-  </tr>
-  <% Redmine::Scm::Base.all.collect do |choice| %>
-    <% scm_class = "Repository::#{choice}".constantize %>
-    <% text, value = (choice.is_a?(Array) ? choice : [choice, choice]) %>
-    <% setting = :enabled_scm %>
-    <tr>
-      <td class="scm_name">
-        <%= 
-          check_box_tag(
-              "settings[#{setting}][]",
-               value,
-               Setting.send(setting).include?(value))
-         %>
-        <%= text.to_s %>
-      </td>
-      <td>
-         <%=
-           image_tag(
-              (scm_class.scm_available ? 'true.png' : 'exclamation.png'),
-              :style => "vertical-align:bottom;"
-           )
-           %>
-          <%= scm_class.scm_command %>
-       </td>
-       <td>
-          <%= scm_class.scm_version_string %>
-       </td>
-     </tr>
-  <% end %>
-</table>
-<p class="scm_config">
-<%= l(:text_scm_config) %>
-</p>
-</fieldset>
-
-<div class="box tabular settings">
-<p><%= setting_check_box :autofetch_changesets %></p>
-
-<p><%= setting_check_box :sys_api_enabled,
-                         :onclick =>
-                             "if (this.checked) { Form.Element.enable('settings_sys_api_key'); } else { Form.Element.disable('settings_sys_api_key'); }" %></p>
-
-<p><%= setting_text_field :sys_api_key,
-                          :size     => 30,
-                          :id       => 'settings_sys_api_key',
-                          :disabled => !Setting.sys_api_enabled?,
-                          :label    => :setting_mail_handler_api_key %>
-  <%= link_to_function l(:label_generate_key),
-                       "if ($('settings_sys_api_key').disabled == false) { $('settings_sys_api_key').value = randomKey(20) }" %>
-</p>
-
-<p><%= setting_text_field :repositories_encodings, :size => 60 %><br />
-<em><%= l(:text_comma_separated) %></em></p>
-
-<p><%= setting_text_field :repository_log_display_limit, :size => 6 %></p>
-</div>
-
-<fieldset class="box tabular settings">
-<legend><%= l(:text_issues_ref_in_commit_messages) %></legend>
-<p><%= setting_text_field :commit_ref_keywords, :size => 30 %><br />
-<em><%= l(:text_comma_separated) %></em></p>
-
-<p><%= setting_text_field :commit_fix_keywords, :size => 30 %>
-&nbsp;<%= l(:label_applied_status) %>: <%= setting_select :commit_fix_status_id,
-                                                          [["", 0]] +
-                                                              IssueStatus.find(:all).collect{
-                                                                 |status| [status.name, status.id.to_s]
-                                                              },
-                                                          :label => false %>
-&nbsp;<%= l(:field_done_ratio) %>: <%= setting_select :commit_fix_done_ratio,
-                                                       (0..10).to_a.collect {|r| ["#{r*10} %", "#{r*10}"] },
-                                                       :blank => :label_no_change_option,
-                                                       :label => false %>
-<br /><em><%= l(:text_comma_separated) %></em></p>
-
-<p><%= setting_check_box :commit_logtime_enabled,
-                         :onclick =>
-                            "if (this.checked) { Form.Element.enable('settings_commit_logtime_activity_id'); } else { Form.Element.disable('settings_commit_logtime_activity_id'); }"%></p>
-
-<p><%= setting_select :commit_logtime_activity_id,
-                      [[l(:label_default), 0]] +
-                          TimeEntryActivity.shared.active.collect{|activity| [activity.name, activity.id.to_s]},
-                      :disabled => !Setting.commit_logtime_enabled?%></p>
-</fieldset>
-
-<%= submit_tag l(:button_save) %>
-<% end %>