From: simonbrandhof <simon.brandhof@gmail.com>
Date: Wed, 3 Nov 2010 14:52:33 +0000 (+0000)
Subject: rename login.rhtml to login.html.erb + minor change of html
X-Git-Tag: 2.6~671
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=234896aad838f72a5762ae45039bd673c1ff57a7;p=sonarqube.git

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
index 00000000000..b4a6ccb4897
--- /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
index 6a95a10cc23..00000000000
--- 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 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] %>