From: Toshi MARUYAMA <marutosijp2@yahoo.co.jp>
Date: Sun, 28 Aug 2011 06:11:24 +0000 (+0000)
Subject: rename .rhtml to .html.erb of app/views/ldap_auth_sources/_form.rhtml.
X-Git-Tag: 1.3.0~1276
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=29785b1117937f7d9540cdd7777253314e30f263;p=redmine.git

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

diff --git a/app/views/ldap_auth_sources/_form.html.erb b/app/views/ldap_auth_sources/_form.html.erb
new file mode 100644
index 000000000..9ffffafc7
--- /dev/null
+++ b/app/views/ldap_auth_sources/_form.html.erb
@@ -0,0 +1,44 @@
+<%= error_messages_for 'auth_source' %>
+
+<div class="box">
+<!--[form:auth_source]-->
+<p><label for="auth_source_name"><%=l(:field_name)%> <span class="required">*</span></label>
+<%= text_field 'auth_source', 'name'  %></p>
+
+<p><label for="auth_source_host"><%=l(:field_host)%> <span class="required">*</span></label>
+<%= text_field 'auth_source', 'host'  %></p>
+
+<p><label for="auth_source_port"><%=l(:field_port)%> <span class="required">*</span></label>
+<%= text_field 'auth_source', 'port', :size => 6 %> <%= check_box 'auth_source', 'tls'  %> LDAPS</p>
+
+<p><label for="auth_source_account"><%=l(:field_account)%></label>
+<%= text_field 'auth_source', 'account'  %></p>
+
+<p><label for="auth_source_account_password"><%=l(:field_password)%></label>
+<%= password_field 'auth_source', 'account_password', :name => 'ignore',
+                                           :value => ((@auth_source.new_record? || @auth_source.account_password.blank?) ? '' : ('x'*15)),
+                                           :onfocus => "this.value=''; this.name='auth_source[account_password]';",
+                                           :onchange => "this.name='auth_source[account_password]';" %></p>
+
+<p><label for="auth_source_base_dn"><%=l(:field_base_dn)%> <span class="required">*</span></label>
+<%= text_field 'auth_source', 'base_dn', :size => 60 %></p>
+
+<p><label for="auth_source_onthefly_register"><%=l(:field_onthefly)%></label>
+<%= check_box 'auth_source', 'onthefly_register' %></p>
+</div>
+
+<fieldset class="box"><legend><%=l(:label_attribute_plural)%></legend>
+<p><label for="auth_source_attr_login"><%=l(:field_login)%> <span class="required">*</span></label>
+<%= text_field 'auth_source', 'attr_login', :size => 20  %></p>
+
+<p><label for="auth_source_attr_firstname"><%=l(:field_firstname)%></label>
+<%= text_field 'auth_source', 'attr_firstname', :size => 20  %></p>
+
+<p><label for="auth_source_attr_lastname"><%=l(:field_lastname)%></label>
+<%= text_field 'auth_source', 'attr_lastname', :size => 20  %></p>
+
+<p><label for="auth_source_attr_mail"><%=l(:field_mail)%></label>
+<%= text_field 'auth_source', 'attr_mail', :size => 20  %></p>
+</fieldset>
+<!--[eoform:auth_source]-->
+
diff --git a/app/views/ldap_auth_sources/_form.rhtml b/app/views/ldap_auth_sources/_form.rhtml
deleted file mode 100644
index 9ffffafc7..000000000
--- a/app/views/ldap_auth_sources/_form.rhtml
+++ /dev/null
@@ -1,44 +0,0 @@
-<%= error_messages_for 'auth_source' %>
-
-<div class="box">
-<!--[form:auth_source]-->
-<p><label for="auth_source_name"><%=l(:field_name)%> <span class="required">*</span></label>
-<%= text_field 'auth_source', 'name'  %></p>
-
-<p><label for="auth_source_host"><%=l(:field_host)%> <span class="required">*</span></label>
-<%= text_field 'auth_source', 'host'  %></p>
-
-<p><label for="auth_source_port"><%=l(:field_port)%> <span class="required">*</span></label>
-<%= text_field 'auth_source', 'port', :size => 6 %> <%= check_box 'auth_source', 'tls'  %> LDAPS</p>
-
-<p><label for="auth_source_account"><%=l(:field_account)%></label>
-<%= text_field 'auth_source', 'account'  %></p>
-
-<p><label for="auth_source_account_password"><%=l(:field_password)%></label>
-<%= password_field 'auth_source', 'account_password', :name => 'ignore',
-                                           :value => ((@auth_source.new_record? || @auth_source.account_password.blank?) ? '' : ('x'*15)),
-                                           :onfocus => "this.value=''; this.name='auth_source[account_password]';",
-                                           :onchange => "this.name='auth_source[account_password]';" %></p>
-
-<p><label for="auth_source_base_dn"><%=l(:field_base_dn)%> <span class="required">*</span></label>
-<%= text_field 'auth_source', 'base_dn', :size => 60 %></p>
-
-<p><label for="auth_source_onthefly_register"><%=l(:field_onthefly)%></label>
-<%= check_box 'auth_source', 'onthefly_register' %></p>
-</div>
-
-<fieldset class="box"><legend><%=l(:label_attribute_plural)%></legend>
-<p><label for="auth_source_attr_login"><%=l(:field_login)%> <span class="required">*</span></label>
-<%= text_field 'auth_source', 'attr_login', :size => 20  %></p>
-
-<p><label for="auth_source_attr_firstname"><%=l(:field_firstname)%></label>
-<%= text_field 'auth_source', 'attr_firstname', :size => 20  %></p>
-
-<p><label for="auth_source_attr_lastname"><%=l(:field_lastname)%></label>
-<%= text_field 'auth_source', 'attr_lastname', :size => 20  %></p>
-
-<p><label for="auth_source_attr_mail"><%=l(:field_mail)%></label>
-<%= text_field 'auth_source', 'attr_mail', :size => 20  %></p>
-</fieldset>
-<!--[eoform:auth_source]-->
-