diff options
| author | Evgeny Fadeev <evgeny.fadeev@gmail.com> | 2011-06-08 23:30:16 -0400 |
|---|---|---|
| committer | Evgeny Fadeev <evgeny.fadeev@gmail.com> | 2011-06-08 23:30:45 -0400 |
| commit | f063ee23e049f16fe070630e5910abab8598edf3 (patch) | |
| tree | d6585d4fdbe251e01e675561ffe770ec9791df73 | |
| parent | b05b0cd5e8e1e5fc738df862681a5d26389b2b6e (diff) | |
| download | askbot-f063ee23e049f16fe070630e5910abab8598edf3.tar.gz askbot-f063ee23e049f16fe070630e5910abab8598edf3.tar.bz2 askbot-f063ee23e049f16fe070630e5910abab8598edf3.zip | |
placed login fields into a table as suggested by Samuel, and incremented the version
| -rw-r--r-- | askbot/__init__.py | 2 | ||||
| -rwxr-xr-x | askbot/skins/default/media/jquery-openid/openid.css | 2 | ||||
| -rw-r--r-- | askbot/skins/default/templates/authopenid/signin.html | 44 |
3 files changed, 29 insertions, 19 deletions
diff --git a/askbot/__init__.py b/askbot/__init__.py index 4ddd7fea..b0397ee3 100644 --- a/askbot/__init__.py +++ b/askbot/__init__.py @@ -9,7 +9,7 @@ import smtplib import sys import logging -VERSION = (0, 6, 94) +VERSION = (0, 6, 95) #necessary for interoperability of django and coffin try: diff --git a/askbot/skins/default/media/jquery-openid/openid.css b/askbot/skins/default/media/jquery-openid/openid.css index 39920a50..da541e45 100755 --- a/askbot/skins/default/media/jquery-openid/openid.css +++ b/askbot/skins/default/media/jquery-openid/openid.css @@ -14,6 +14,8 @@ ul.large input {height: 40px; width: 90px;border:1px solid #ccc;margin:0 5px 5px /*#signin-form #account-recovery-form input {cursor:pointer;} #signin-form #account-recovery-form input.text {cursor:default;}*/ +table.login { text-align: right;} + .openid-signin .submit-b { cursor: pointer; /*letter-spacing:1px;*/ margin: 0 0 2px 0; diff --git a/askbot/skins/default/templates/authopenid/signin.html b/askbot/skins/default/templates/authopenid/signin.html index 5cff194b..c6a67051 100644 --- a/askbot/skins/default/templates/authopenid/signin.html +++ b/askbot/skins/default/templates/authopenid/signin.html @@ -91,14 +91,16 @@ {% if login_form.password_login_failed %}
<p class="error">{% trans %}Login failed, please try again{% endtrans %}</p>
{% endif %}
- <p>
- <label for="id_username">{% trans %}Login name{% endtrans %}</label>
- {{login_form.username}}
- </p>
- <p>
- <label for="id_password">{% trans %}Password{% endtrans %}</label>
- {{login_form.password}}
- </p>
+ <table class="login">
+ <tr>
+ <td><label for="id_username">{% trans %}Login name{% endtrans %}</label></td>
+ <td>{{login_form.username}}</td>
+ </tr>
+ <tr>
+ <td><label for="id_password">{% trans %}Password{% endtrans %}</label></td>
+ <td>{{login_form.password}}</td>
+ </tr>
+ </table>
<p id="local_login_buttons">
<input class="submit-b" name="login_with_password" type="submit" value="{% trans %}Login{% endtrans %}" />
{% if settings.USE_LDAP_FOR_PASSWORD_LOGIN == False %}
@@ -109,16 +111,22 @@ <h2 id="password-heading">
{% trans %}To change your password - please enter the new one twice, then submit{% endtrans %}
</h2>
- <p>
- <label for="id_new_password">{% trans %}New password{% endtrans %}</label>
- {{login_form.new_password}}
- <span class="error">{{login_form.new_password.errors[0]}}</span>
- </p>
- <p>
- <label for="id_new_password_retyped">{% trans %}Please, retype{% endtrans %}</label>
- {{login_form.new_password_retyped}}
- <span class="error">{{login_form.new_password_retyped.errors[0]}}</span>
- </p>
+ <table class="login">
+ <tr>
+ <td><label for="id_new_password">{% trans %}New password{% endtrans %}</label></td>
+ <td>
+ {{login_form.new_password}}
+ <span class="error">{{login_form.new_password.errors[0]}}</span>
+ </td>
+ </tr>
+ <tr>
+ <td><label for="id_new_password_retyped">{% trans %}Please, retype{% endtrans %}</label></td>
+ <td>
+ {{login_form.new_password_retyped}}
+ <span class="error">{{login_form.new_password_retyped.errors[0]}}</span>
+ </td>
+ </tr>
+ </table>
<p id="local_login_buttons">
<input class="submit-b" name="change_password" type="submit" value="{% trans %}Change password{% endtrans %}" />
</p>
|