Quam Plures

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

  1. login_links
  2. Merge into trunk
Proposed by Lee Turner
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 Approve
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.
Revision history for this message
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
=== modified file 'qp_rsc/css/login.css'
--- qp_rsc/css/login.css 2010-12-31 12:12:03 +0000
+++ qp_rsc/css/login.css 2011-11-27 20:22:27 +0000
@@ -13,7 +13,7 @@
1313
14body {14body {
15 margin: 0;15 margin: 0;
16 background-color: #fff;16 background-color: #f9f9f9;
17 color: #000;17 color: #000;
18 font-family: Verdana, Geneva, Arial, Helvetica, sans-serif;18 font-family: Verdana, Geneva, Arial, Helvetica, sans-serif;
19 font-size: 84%;19 font-size: 84%;
@@ -39,14 +39,20 @@
3939
40/* Form elements: */40/* Form elements: */
41input.input_text {41input.input_text {
42 border: 1px solid #ccc;42 border: 1px solid #e5e5e5;
43 background-color: #eee;43 background-color: #FBFBFB;
44 padding: 1px;44 padding: 1px;
45 vertical-align: middle;45 vertical-align: middle;
46 width: 97%;46 width: 97%;
47 margin: 1px;47 font-weight:200;
48 margin-left: 0;48 font-size:14px;
49 margin-right: 0;49 padding:3px;
50 margin-right:6px;
51 margin-bottom:6px;
52 outline:none;
53 -moz-box-shadow:inset 1px 1px 2px rgba(200,200,200,0.2);
54 -webkit-box-shadow:inset 1px 1px 2px rgba(200,200,200,0.2);
55 box-shadow:inset 1px 1px 2px rgba(200,200,200,0.2);
50}56}
51input.field_error {57input.field_error {
52 background:#fbf2ee;58 background:#fbf2ee;
@@ -65,6 +71,13 @@
65}71}
6672
67div.loginblock {73div.loginblock {
74 border-radius: 10px;
75 -moz-border-radius: 10px;
76 padding: 20px 32px 20px 25px;
77 background: #fff;
78 -moz-box-shadow: 4px 4px 5px #888888;
79 -webkit-box-shadow: 4px 4px 5px #888888;
80 box-shadow: 4px 4px 5px #888888;
68 border: 1px solid #CCCCCC;81 border: 1px solid #CCCCCC;
69 padding: 2ex;82 padding: 2ex;
70 margin: 3ex auto;83 margin: 3ex auto;
@@ -88,3 +101,5 @@
88 padding-bottom: 1ex;101 padding-bottom: 1ex;
89 clear: both;102 clear: both;
90}103}
104
105
91106
=== modified file 'qp_view_admin/login/_html_footer.inc.php'
--- qp_view_admin/login/_html_footer.inc.php 2010-12-31 12:12:03 +0000
+++ qp_view_admin/login/_html_footer.inc.php 2011-11-27 20:22:27 +0000
@@ -30,11 +30,6 @@
3030
31</div>31</div>
3232
33<p class="footer"><?php echo $app_footer_text; ?></p>
34<p class="footer"><?php echo $copyright_text; ?></p>
35<p class="footer">
36</p>
37
38</body>33</body>
39</html>34</html>
40<?php35<?php
4136
=== modified file 'qp_view_admin/login/_lostpass_form.main.php'
--- qp_view_admin/login/_lostpass_form.main.php 2010-12-31 12:12:03 +0000
+++ qp_view_admin/login/_lostpass_form.main.php 2011-11-27 20:22:27 +0000
@@ -54,11 +54,14 @@
54 $Form->text( 'login', $login, 16, T_('Login'), '', 20, 'input_text' );54 $Form->text( 'login', $login, 16, T_('Login'), '', 20, 'input_text' );
5555
56 $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' )) );56 $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' )) );
57
58 $Form->end_fieldset();;57 $Form->end_fieldset();;
59
60$Form->end_form();58$Form->end_form();
59?>
60<div class="login_actions" style="text-align:right">
61<a href="<?php echo get_login_url(); ?>" title="<?php echo T_('Back to login'); ?>"><?php echo T_('Back to login'); ?></a>
62</div>
6163
64<?php
62require dirname(__FILE__).'/_html_footer.inc.php';65require dirname(__FILE__).'/_html_footer.inc.php';
6366
64?>
65\ No newline at end of file67\ No newline at end of file
68?>

Subscribers

People subscribed via source and target branches