Maria has proposed merging lp:~mariak-2/postorius/html_login into lp:postorius.
Requested reviews:
Mailman Coders (mailman-coders)
For more details, see:
https://code.launchpad.net/~mariak-2/postorius/html_login/+merge/154161
I made the browser login window prettier
--
https://code.launchpad.net/~mariak-2/postorius/html_login/+merge/154161
Your team Mailman Coders is requested to review the proposed merge of
lp:~mariak-2/postorius/html_login into lp:postorius.
=== modified file 'src/postorius/static/postorius/css/style.css'
--- src/postorius/static/postorius/css/style.css 2013-03-18 21:55:33 +0000
+++ src/postorius/static/postorius/css/style.css 2013-03-19 18:19:27 +0000
@@ -228,9 +228,17 @@
}
/* login form */
+#container {
+ width: 600px;
+ margin: 0 auto;
+}
.mm_login {
- width: 400px;
- margin: 40px auto;
+ width: 300px;
+ float: left;
+}
+.mm_login_b {
+ width: 200px;
+ float: right;
}
.mm_login label {
display: block;
=== modified file 'src/postorius/templates/postorius/login.html'
--- src/postorius/templates/postorius/login.html 2013-01-11 01:13:15 +0000
+++ src/postorius/templates/postorius/login.html 2013-03-19 18:19:27 +0000
@@ -3,39 +3,29 @@
{% load i18n %}
{% load staticfiles %}
{% block main %}
-
- <div class="mm_login">
- <h2>Login with username and password</h2>
-
- <form action="" method="post" class="login mm_clear well"> {% csrf_token %}
- {{ form.as_p }}
- <div class="field">
- <button class="btn btn-primary" type="submit">{% trans "Login" %}</button>
- </div>
- </form>
-
- <hr />
-
- <!--
- <h2>Login using OpenID</h2>
-
- <form method="post" action="{% url 'socialauth_begin' 'openid' %}"> {% csrf_token %}
- OpenID URL: <input type="text" name="openid_identifier" />
- <button type="submit">Login using OpenID</button>
- </form>
-
- <hr />
- -->
-
- <h2>Login using BrowserID</h2>
-
- <form method="post" action="{% url 'socialauth_complete' "browserid" %}"> {% csrf_token %}
- <input type="hidden" name="assertion" value="" />
- <a rel="nofollow" id="browserid" href="#"><img src="{% static 'postorius/img/sign_in_blue.png' %}" alt="Login using BrowserID" /></a>
- </form>
-
- <h2>New user? Click on 'sign in' button to get started.</h2>
- </div>
+
+<div id="container">
+ <p><strong>Login with username and password or with Mozilla Persona</strong></p>
+
+ <div class="mm_login">
+ <form action="" method="post" class="login mm_clear well"> {% csrf_token %}
+ {{ form.as_p }}
+ <div class="field">
+ <button class="btn btn-primary" type="submit">{% trans "Login" %}</button>
+ </div>
+ </form>
+ </div>
+
+ <div class="mm_login_b">
+ <form method="post" action="{% url 'socialauth_complete' "browserid" %}"> {% csrf_token %}
+ <input type="hidden" name="assertion" value="" />
+ <a rel="nofollow" id="browserid" href="#"><img src="{% static 'postorius/img/sign_in_blue.png' %}" alt="Login using BrowserID" /></a>
+ </form>
+ <p>Mozilla Persona is an easy way to sign into multiple websites, while still controlling your personal data. For more information <a href="http://www.mozilla.org/en-US/persona";>see the mozilla website</a><</p>
+ </div>
+<div style="clear:both">
+</div>
+</div>
{% endblock %}
{% block additionaljs %}
_______________________________________________
Mailman-coders mailing list
[email protected]
http://mail.python.org/mailman/listinfo/mailman-coders
