jro_apps/redmine Commit - r15213:8ea17100f1bd

Replaces the login table with a div....

Jean-Philippe Lang -

r15213:8ea17100f1bd

parent child

Context file:

r15213:8ea17100f1bd

Collapse all files

app/views/account/login.html.erb +25 -37

@@ -1,43 +1,31
1	<%= call_hook :view_account_login_top %>	1	<%= call_hook :view_account_login_top %>
		2
2	<div id="login-form">	3	<div id="login-form">
3	<%= form_tag(signin_path, onsubmit: 'return keepAnchorOnSignIn(this);') do %>	4	<%= form_tag(signin_path, onsubmit: 'return keepAnchorOnSignIn(this);') do %>
4	<%= back_url_hidden_field_tag %>	5	<%= back_url_hidden_field_tag %>
5	<table>	6
6	<tr>	7	<label for="username"><%=l(:field_login)%></label>
7	<td style="text-align:right;"><label for="username"><%=l(:field_login)%>:</label></td>	8	<%= text_field_tag 'username', params[:username], :tabindex => '1' %>
8	<td style="text-align:left;"><%= text_field_tag 'username', params[:username], :tabindex => '1' %></td>	9
9	</tr>	10	<label for="password">
10	<tr>	11	<%=l(:field_password)%>
11	<td style="text-align:right;"><label for="password"><%=l(:field_password)%>:</label></td>	12	<%= link_to l(:label_password_lost), lost_password_path, :class => "lost_password" if Setting.lost_password? %>
12	<td style="text-align:left;"><%= password_field_tag 'password', nil, :tabindex => '2' %></td>	13	</label>
13	</tr>	14	<%= password_field_tag 'password', nil, :tabindex => '2' %>
14	<% if Setting.openid? %>	15
15	<tr>	16	<% if Setting.openid? %>
16	~~<td style="text-align:right;">~~<label for="openid_url"><%=l(:field_identity_url)%></label>~~</td>~~	17	<label for="openid_url"><%=l(:field_identity_url)%></label>
17	~~<td style="text-align:left;">~~<%= text_field_tag "openid_url", nil, :tabindex => '3' %>~~</td>~~	18	<%= text_field_tag "openid_url", nil, :tabindex => '3' %>
18	</tr>	19	<% end %>
19	<% end %>	20
20	<tr>	21	<% if Setting.autologin? %>
21	<td></td>	22	<label for="autologin"><%= check_box_tag 'autologin', 1, false, :tabindex => 4 %> <%= l(:label_stay_logged_in) %></label>
22	<td style="text-align:left;">	23	<% end %>
23	<% if Setting.autologin? %>	24
24	<label for="autologin"><%= check_box_tag 'autologin', 1, false, :tabindex => 4 %> <%= l(:label_stay_logged_in) %></label>	25	<input type="submit" name="login" value="<%=l(:button_login)%>" tabindex="5" id="login-submit" />
25	<% end %>	26	<% end %>
26	</td>
27	</tr>
28	<tr>
29	<td style="text-align:left;">
30	<% if Setting.lost_password? %>
31	<%= link_to l(:label_password_lost), lost_password_path %>
32	<% end %>
33	</td>
34	<td style="text-align:right;">
35	<input type="submit" name="login" value="<%=l(:button_login)%> »" tabindex="5"/>
36	</td>
37	</tr>
38	</table>
39	<% end %>
40	</div>	27	</div>
		28
41	<%= call_hook :view_account_login_bottom %>	29	<%= call_hook :view_account_login_bottom %>
42		30
43	<% if params[:username].present? %>	31	<% if params[:username].present? %>

public/stylesheets/application.css +8 -6

             #footer {clear: both; border-top: 1px solid #bbb; font-size: 0.9em; color: #aaa; padding: 5px; text-align:center; background:#fff;}
-            #login-form table {margin-top:5em; padding:1em; margin-left: auto; margin-right: auto; border: 2px solid #FDBF3B; background-color:#FFEBC1; }
+            #login-form {margin:5em auto 2em auto; padding:20px; width:340px; border:1px solid #FDBF3B; background-color:#FFEBC1; border-radius:4px; box-sizing: border-box;}
-            #login-form table td {padding: 6px;}
+            #login-form label {display:block; margin-bottom:5px;}
-            #login-form label {font-weight: bold;}
+            #login-form input[type=text], #login-form input[type=password] {border:1px solid #ccc; border-radius:3px; margin-bottom:15px; padding:7px; display:block; width:100%; box-sizing: border-box;}
-            #login-form input#username, #login-form input#password { width: 300px; }
+            #login-form label {font-weight:bold;}
+            #login-form label[for=autologin] {font-weight:normal;}
+            #login-form a.lost_password {float:right; font-weight:normal;}
+            #login-form input#openid_url {background:#fff url(../images/openid-bg.gif) no-repeat 4px 50%; padding-left:24px !important;}
+            #login-form input#login-submit {margin-top:15px; padding:7px; display:block; width:100%; box-sizing: border-box;}
             div.modal { border-radius:5px; background:#fff; z-index:50; padding:4px;}
             div.modal h3.title {display:none;}
             div.modal p.buttons {text-align:right; margin-bottom:0;}
             div.modal .box p {margin: 0.3em 0;}
-            input#openid_url { background: url(../images/openid-bg.gif) no-repeat; background-color: #fff; background-position: 0 50%; padding-left: 18px; }
             .clear:after{ content: "."; display: block; height: 0; clear: both; visibility: hidden; }
             .mobile-show {display: none;}

public/stylesheets/responsive.css +2 0

               .pagination ul.pages li.current,
               .pagination ul.pages li.previous,
               .pagination ul.pages li.next {display:inline-block; width:32%; overflow:hidden;}
+              #login-form {width:100%; margin-top:2em;}
             }

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages