From 234896aad838f72a5762ae45039bd673c1ff57a7 Mon Sep 17 00:00:00 2001
From: simonbrandhof <simon.brandhof@gmail.com>
Date: Wed, 3 Nov 2010 14:52:33 +0000
Subject: [PATCH] rename login.rhtml to login.html.erb + minor change of html

---
 .../WEB-INF/app/views/sessions/{login.rhtml => login.html.erb}  | 2 +-
 .../src/main/webapp/WEB-INF/app/views/sessions/new.html.erb     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
 rename sonar-server/src/main/webapp/WEB-INF/app/views/sessions/{login.rhtml => login.html.erb} (91%)

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.html.erb
similarity index 91%
rename from sonar-server/src/main/webapp/WEB-INF/app/views/sessions/login.rhtml
rename to sonar-server/src/main/webapp/WEB-INF/app/views/sessions/login.html.erb
index 6a95a10cc23..b4a6ccb4897 100644
--- 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.html.erb
@@ -19,7 +19,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] %>
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 42a88e35c90..b5705d7ff98 100644
--- 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] %>
-- 
2.39.5