Merge lp:~leeturner/quam-plures/login_links into lp:quam-plures

Proposed by Lee Turner on 2011-11-27
Status: Merged
Merged at revision: 7639
Proposed branch: lp:~leeturner/quam-plures/login_links
Merge into: lp:quam-plures
Diff against target: 97 lines (+27/-14)
3 files modified
qp_rsc/css/login.css (+21/-6)
qp_view_admin/login/_html_footer.inc.php (+0/-5)
qp_view_admin/login/_lostpass_form.main.php (+6/-3)
To merge this branch: bzr merge lp:~leeturner/quam-plures/login_links
Reviewer Review Type Date Requested Status
EdB 2011-11-27 Approve on 2011-11-29
Review via email: mp+83528@code.launchpad.net

Description of the change

http://forums.quamplures.net/viewtopic.php?f=11&t=1008

tweaking the login UI in the hope to make it cleaner and more in line with the changes we made to the installer. The main changes are I have removed all the links underneath the login form. I don't think these needs to be there and it certainly removes all the outbound links from the public side of a qp site (other than the one on the QP image on the login form). There are the same UI changes as in the installer as well - light grey background, round corners on browsers that support it etc etc:

To post a comment you must log in.
EdB (edb) wrote :

will merge in a few days to give everyone else time to ... do nothing.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'qp_rsc/css/login.css'
2--- qp_rsc/css/login.css 2010-12-31 12:12:03 +0000
3+++ qp_rsc/css/login.css 2011-11-27 20:22:27 +0000
4@@ -13,7 +13,7 @@
5
6 body {
7 margin: 0;
8- background-color: #fff;
9+ background-color: #f9f9f9;
10 color: #000;
11 font-family: Verdana, Geneva, Arial, Helvetica, sans-serif;
12 font-size: 84%;
13@@ -39,14 +39,20 @@
14
15 /* Form elements: */
16 input.input_text {
17- border: 1px solid #ccc;
18- background-color: #eee;
19+ border: 1px solid #e5e5e5;
20+ background-color: #FBFBFB;
21 padding: 1px;
22 vertical-align: middle;
23 width: 97%;
24- margin: 1px;
25- margin-left: 0;
26- margin-right: 0;
27+ font-weight:200;
28+ font-size:14px;
29+ padding:3px;
30+ margin-right:6px;
31+ margin-bottom:6px;
32+ outline:none;
33+ -moz-box-shadow:inset 1px 1px 2px rgba(200,200,200,0.2);
34+ -webkit-box-shadow:inset 1px 1px 2px rgba(200,200,200,0.2);
35+ box-shadow:inset 1px 1px 2px rgba(200,200,200,0.2);
36 }
37 input.field_error {
38 background:#fbf2ee;
39@@ -65,6 +71,13 @@
40 }
41
42 div.loginblock {
43+ border-radius: 10px;
44+ -moz-border-radius: 10px;
45+ padding: 20px 32px 20px 25px;
46+ background: #fff;
47+ -moz-box-shadow: 4px 4px 5px #888888;
48+ -webkit-box-shadow: 4px 4px 5px #888888;
49+ box-shadow: 4px 4px 5px #888888;
50 border: 1px solid #CCCCCC;
51 padding: 2ex;
52 margin: 3ex auto;
53@@ -88,3 +101,5 @@
54 padding-bottom: 1ex;
55 clear: both;
56 }
57+
58+
59
60=== modified file 'qp_view_admin/login/_html_footer.inc.php'
61--- qp_view_admin/login/_html_footer.inc.php 2010-12-31 12:12:03 +0000
62+++ qp_view_admin/login/_html_footer.inc.php 2011-11-27 20:22:27 +0000
63@@ -30,11 +30,6 @@
64
65 </div>
66
67-<p class="footer"><?php echo $app_footer_text; ?></p>
68-<p class="footer"><?php echo $copyright_text; ?></p>
69-<p class="footer">
70-</p>
71-
72 </body>
73 </html>
74 <?php
75
76=== modified file 'qp_view_admin/login/_lostpass_form.main.php'
77--- qp_view_admin/login/_lostpass_form.main.php 2010-12-31 12:12:03 +0000
78+++ qp_view_admin/login/_lostpass_form.main.php 2011-11-27 20:22:27 +0000
79@@ -54,11 +54,14 @@
80 $Form->text( 'login', $login, 16, T_('Login'), '', 20, 'input_text' );
81
82 $Form->buttons_input( array(array( /* TRANS: Text for submit button to request an activation link by email */ 'value' => T_('Send me an email now!'), 'class' => 'ActionButton' )) );
83-
84 $Form->end_fieldset();;
85-
86 $Form->end_form();
87+?>
88+<div class="login_actions" style="text-align:right">
89+<a href="<?php echo get_login_url(); ?>" title="<?php echo T_('Back to login'); ?>"><?php echo T_('Back to login'); ?></a>
90+</div>
91
92+<?php
93 require dirname(__FILE__).'/_html_footer.inc.php';
94
95-?>
96\ No newline at end of file
97+?>

Subscribers

People subscribed via source and target branches