rename login.rhtml to login.html.erb + minor change of html

diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/sessions/login.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/sessions/login.html.erb
new file mode 100644 (file)
index 0000000..b4a6ccb
--- /dev/null
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/sessions/login.html.erb
@@ -0,0 +1,36 @@
+  <table class="spaced">
+               <tr>
+                       <td align="center">
+                               <div id="login_form">
+                                       <form action="<%= url_for :controller => 'sessions', :action => 'login' -%>" method="post">
+                                               <h3><%= label_tag 'login' %></h3>
+                                               <p>
+                                                       <%= text_field_tag 'login', '', {:maxlength => 40, :size => 30, :disabled => false} %>
+
+                                                       <% if Property.value('sonar.allowUsersToSignUp')=='true' %>
+                                                         <br/><span class="desc">Not a member? <%= link_to 'Sign up', :controller => 'users', :action => 'new' -%> for an account.</span>
+                                                       <% end %>
+                                               </p>
+                                               <h3><%= label_tag 'password' %></h3>
+                                               <p>
+                                                       <%= password_field_tag 'password', nil, :size => 30 %>
+                                               </p>
+                                               <p>
+                                                       <%= check_box_tag 'remember_me', '1', @remember_me %> <%= label_tag 'remember_me', 'Remember me on this computer' %>
+                                               </p>
+                                               <p>
+                                                       <%= submit_tag 'Log in' %> or <a href="<%= home_path -%>" class="action">Cancel</a>
+                                               </p>
+                                       </form>
+                                       <% if flash[:loginerror] %>
+                                               <div class="error" style=""> <%= flash[:loginerror]  %></div>
+                                       <% end %>       
+                               </div>                          
+                       </td>
+               </tr>
+       </table>        
+<script type="text/javascript">
+//<![CDATA[
+    $('login').activate();
+//]]>
+</script>
\ No newline at end of file

diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/sessions/login.rhtml b/sonar-server/src/main/webapp/WEB-INF/app/views/sessions/login.rhtml
deleted file mode 100644 (file)
index 6a95a10..0000000
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/sessions/login.rhtml
+++ /dev/null
@@ -1,36 +0,0 @@
-  <table class="spaced">
-               <tr>
-                       <td align="center">
-                               <div id="login_form">
-                                       <form action="<%= url_for :controller => 'sessions', :action => 'login' -%>" method="post">
-                                               <h3><%= label_tag 'login' %></h3>
-                                               <p>
-                                                       <%= text_field_tag 'login', '', {:maxlength => 40, :size => 30, :disabled => false} %>
-
-                                                       <% if Property.value('sonar.allowUsersToSignUp')=='true' %>
-                                                         <br/><span class="desc">Not a member? <%= link_to 'Sign up', :controller => 'users', :action => 'new' -%> for an account.</span>
-                                                       <% end %>
-                                               </p>
-                                               <h3><%= label_tag 'password' %></h3>
-                                               <p>
-                                                       <%= password_field_tag 'password', nil, :size => 30 %>
-                                               </p>
-                                               <p>
-                                                       <%= check_box_tag 'remember_me', '1', @remember_me %> <%= label_tag 'remember_me', 'Remember me on this computer' %>
-                                               </p>
-                                               <p>
-                                                       <%= submit_tag 'Log in' %> <a href="<%= home_path -%>" class="action">Cancel</a>
-                                               </p>
-                                       </form>
-                                       <% if flash[:loginerror] %>
-                                               <div class="error" style=""> <%= flash[:loginerror]  %></div>
-                                       <% end %>       
-                               </div>                          
-                       </td>
-               </tr>
-       </table>        
-<script type="text/javascript">
-//<![CDATA[
-    $('login').activate();
-//]]>
-</script>
\ No newline at end of file

diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/sessions/new.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/sessions/new.html.erb
index 42a88e35c907efec7ae79e8ceb98d16d9be5ab2e..b5705d7ff98ea29f89f1e39996dc8425df84db67 100644 (file)
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/sessions/new.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/sessions/new.html.erb
@@ -22,7 +22,7 @@
             <%= check_box_tag 'remember_me', '1', @remember_me %> <%= label_tag 'remember_me', 'Remember me on this computer' %>
           </p>
           <p>
-            <%= submit_tag 'Log in' %> <a href="<%= home_path -%>" class="action">cancel</a>
+            <%= submit_tag 'Log in' %> or <a href="<%= home_path -%>" class="action">Cancel</a>
           </p>
         </form>
         <% if flash[:loginerror] %>