From 8022add1377d29d83fb7cc81899db5b7b5cbbea8 Mon Sep 17 00:00:00 2001 From: Andromeda Yelton Date: Fri, 13 Jan 2012 16:24:34 -0500 Subject: [PATCH] now the rest of the registration-related stuff is prettier --- frontend/templates/registration/activate.html | 6 ++---- .../registration/activation_complete.html | 15 ++++++--------- frontend/templates/registration/login.html | 6 ------ .../registration/password_change_form.html | 5 +---- .../registration/password_reset_complete.html | 2 +- .../registration/password_reset_confirm.html | 7 +++---- .../registration/password_reset_done.html | 3 ++- .../registration/password_reset_form.html | 6 +----- .../registration/registration_base.html | 4 ++++ .../registration/registration_form.html | 18 +++++------------- .../registration/user_change_form.html | 12 +++++------- static/css/book_list.css | 2 +- static/css/book_panel.css | 2 +- static/css/campaign.css | 2 +- static/css/documentation.css | 4 ++-- static/css/landingpage.css | 4 ++-- static/css/learnmore.css | 2 +- static/css/registration.css | 18 +++++++++++++++--- static/css/sitewide.css | 2 +- static/css/supporter_layout.css | 2 +- static/css/variables.css | 2 +- static/less/registration.less | 14 ++++++++++++++ static/less/variables.less | 2 +- 23 files changed, 71 insertions(+), 69 deletions(-) diff --git a/frontend/templates/registration/activate.html b/frontend/templates/registration/activate.html index c28f6d9d..c8759165 100644 --- a/frontend/templates/registration/activate.html +++ b/frontend/templates/registration/activate.html @@ -1,12 +1,10 @@ {% extends "registration/registration_base.html" %} {% block title %}{% if account %}Activation complete{% else %}Activation problem{% endif %}{% endblock %} -{% block content %} -
+{% block doccontent %} {% if account %} -Thanks {{ account }}, activation complete! You may now login using the username and password you set at registration. +Thanks {{ account }}, activation complete! You may now sign in using the username and password you set at registration. {% else %} Oops – it seems that your activation key is invalid. Please check the url again. {% endif %} -
{% endblock %} diff --git a/frontend/templates/registration/activation_complete.html b/frontend/templates/registration/activation_complete.html index 139efc93..66239e80 100644 --- a/frontend/templates/registration/activation_complete.html +++ b/frontend/templates/registration/activation_complete.html @@ -1,16 +1,13 @@ {% extends "registration/registration_base.html" %} {% block title %}Activation complete{% endblock %} {% block doccontent %} -
-{% if request.user.is_authenticated %} -Your password has been changed. -{% else %} -Thanks, your activation is complete! You may now sign in using the username and password you set at registration: - - +
+

Thanks, your activation is complete! You may now sign in using the username and password you set at registration:

{% include "login_form.html" %} -{% endif %} -Already forgot your password? +
+
+
+Forgot your password?
{% endblock %} diff --git a/frontend/templates/registration/login.html b/frontend/templates/registration/login.html index 014cbcfb..f607dfef 100644 --- a/frontend/templates/registration/login.html +++ b/frontend/templates/registration/login.html @@ -2,9 +2,6 @@ {% block title %}login{% endblock %} {% block doccontent %} -
-
- {% if form.errors %}

Your username and password didn't match. Please try again.

{% endif %} @@ -20,7 +17,4 @@
Or: Sign in with Google
-
-
- {% endblock %} diff --git a/frontend/templates/registration/password_change_form.html b/frontend/templates/registration/password_change_form.html index 773e7382..4e0fffe4 100644 --- a/frontend/templates/registration/password_change_form.html +++ b/frontend/templates/registration/password_change_form.html @@ -2,8 +2,6 @@ {% block title %}Change password{% endblock %} {% block doccontent %} -
-
{% if request.user.is_authenticated %} {% ifequal request.user.password '!' %}
@@ -22,7 +20,6 @@
You must be logged in to change your password.
Log in
 {% endif %} -
-
+

Want to change your username instead?

{% endblock %} diff --git a/frontend/templates/registration/password_reset_complete.html b/frontend/templates/registration/password_reset_complete.html index f4c649cb..48b2ef22 100644 --- a/frontend/templates/registration/password_reset_complete.html +++ b/frontend/templates/registration/password_reset_complete.html @@ -7,7 +7,7 @@
{% if not request.user.is_authenticated %} - You may now log in. +
Log in
 {% else %}
Back to my account
 {% endif %} diff --git a/frontend/templates/registration/password_reset_confirm.html b/frontend/templates/registration/password_reset_confirm.html index dd160c58..f0a41cb9 100644 --- a/frontend/templates/registration/password_reset_confirm.html +++ b/frontend/templates/registration/password_reset_confirm.html @@ -1,11 +1,10 @@ {% extends "registration/registration_base.html" %} {% block title %}Confirm password reset{% endblock %} {% block doccontent %} -Enter your new password below to reset your password: +Enter your new password below to reset your password.

+
{% csrf_token %} - {{ form.as_table }} - -
+
{% endblock %} diff --git a/frontend/templates/registration/password_reset_done.html b/frontend/templates/registration/password_reset_done.html index 3add5714..1ff4ed7f 100644 --- a/frontend/templates/registration/password_reset_done.html +++ b/frontend/templates/registration/password_reset_done.html @@ -2,7 +2,8 @@ {% block title %}Password reset{% endblock %} {% block doccontent %}

-We have sent you an email with a link to reset your password. Please check +We've sent you an email with a link to reset your password. Please check your email and click the link to continue.

+

If you don't see the email soon, please check your spam folder and make sure info@gluejar.com is on your whitelist.

{% endblock %} diff --git a/frontend/templates/registration/password_reset_form.html b/frontend/templates/registration/password_reset_form.html index d92e2894..4677cfa0 100644 --- a/frontend/templates/registration/password_reset_form.html +++ b/frontend/templates/registration/password_reset_form.html @@ -1,7 +1,6 @@ {% extends "registration/registration_base.html" %} {% block title %}Reset password{% endblock %} {% block doccontent %} - {% if request.user.is_authenticated and request.user.password == '!' %}

Sorry for the extra step, but just click and we'll email you @@ -19,11 +18,8 @@ Forgot your password? Enter your email in the form below and we'll send you instructions for creating a new one.

{% csrf_token %} - {{ form }} - -
+
{% endif %} - {% endblock %} diff --git a/frontend/templates/registration/registration_base.html b/frontend/templates/registration/registration_base.html index 11252955..0c503de2 100644 --- a/frontend/templates/registration/registration_base.html +++ b/frontend/templates/registration/registration_base.html @@ -9,8 +9,12 @@ {% block content %}
+
+
{% block doccontent %} {% endblock %}
+
+
{% endblock %} diff --git a/frontend/templates/registration/registration_form.html b/frontend/templates/registration/registration_form.html index d42b1adb..a640dcc9 100644 --- a/frontend/templates/registration/registration_form.html +++ b/frontend/templates/registration/registration_form.html @@ -3,25 +3,17 @@ {% block title %}Register for an account{% endblock %} {% block doccontent %} -
-
-

Sign up for a Unglue It account:

-{% csrf_token %} {{ form }} - + -
- -

-
-
-

Or use an account you already have:

- -

+ diff --git a/frontend/templates/registration/user_change_form.html b/frontend/templates/registration/user_change_form.html index 34a2722c..ddb5bea5 100644 --- a/frontend/templates/registration/user_change_form.html +++ b/frontend/templates/registration/user_change_form.html @@ -1,19 +1,17 @@ {% extends "registration/registration_base.html" %} {% block title %}Change User Data{% endblock %} {% block doccontent %} -
-

Changing your Username.

+

Changing Your Username

-

If you change your Username, the web address for your profile page will change as well.

+

If you change your username, the web address for your profile page will change as well.

-

Your current Username: {{ user.username }}

+

Your current username: {{ user.username }}

{% csrf_token %} {{ form.as_p }} - +
-

Change your password

-
+

Want to change your password instead?

{% endblock %} diff --git a/static/css/book_list.css b/static/css/book_list.css index c7a374ca..8d10e847 100755 --- a/static/css/book_list.css +++ b/static/css/book_list.css @@ -43,7 +43,7 @@ font-weight: bold; padding: 0 15px; border: none; - margin-top: 15px; + margin: 5px 0; } /* Cross-browser language */ /* rows in listview should alternate colors */ diff --git a/static/css/book_panel.css b/static/css/book_panel.css index 3e317b56..7eecfdf8 100644 --- a/static/css/book_panel.css +++ b/static/css/book_panel.css @@ -43,7 +43,7 @@ font-weight: bold; padding: 0 15px; border: none; - margin-top: 15px; + margin: 5px 0; } /* Local variables */ .greenpanelstuff { diff --git a/static/css/campaign.css b/static/css/campaign.css index 1e7e998e..a72f03b3 100755 --- a/static/css/campaign.css +++ b/static/css/campaign.css @@ -43,7 +43,7 @@ font-weight: bold; padding: 0 15px; border: none; - margin-top: 15px; + margin: 5px 0; } #js-page-wrap { overflow: hidden; diff --git a/static/css/documentation.css b/static/css/documentation.css index 043950ae..611cc43c 100644 --- a/static/css/documentation.css +++ b/static/css/documentation.css @@ -50,7 +50,7 @@ font-weight: bold; padding: 0 15px; border: none; - margin-top: 15px; + margin: 5px 0; } /* variables and mixins used in multiple less files go here */ .header-text { @@ -104,7 +104,7 @@ font-weight: bold; padding: 0 15px; border: none; - margin-top: 15px; + margin: 5px 0; } .user-block-hide { float: left; diff --git a/static/css/landingpage.css b/static/css/landingpage.css index a956dbf8..893f4089 100644 --- a/static/css/landingpage.css +++ b/static/css/landingpage.css @@ -50,7 +50,7 @@ font-weight: bold; padding: 0 15px; border: none; - margin-top: 15px; + margin: 5px 0; } /* variables and mixins used in multiple less files go here */ .header-text { @@ -104,7 +104,7 @@ font-weight: bold; padding: 0 15px; border: none; - margin-top: 15px; + margin: 5px 0; } .user-block-hide { float: left; diff --git a/static/css/learnmore.css b/static/css/learnmore.css index bd9bac38..fad5c881 100644 --- a/static/css/learnmore.css +++ b/static/css/learnmore.css @@ -43,7 +43,7 @@ font-weight: bold; padding: 0 15px; border: none; - margin-top: 15px; + margin: 5px 0; } .user-block-hide { float: left; diff --git a/static/css/registration.css b/static/css/registration.css index dc5168e2..ab7bf00a 100644 --- a/static/css/registration.css +++ b/static/css/registration.css @@ -43,7 +43,7 @@ font-weight: bold; padding: 0 15px; border: none; - margin-top: 15px; + margin: 5px 0; } .errorlist { -moz-border-radius: 32px; @@ -58,6 +58,10 @@ line-height: 16px; text-align: center; } +.errorlist li { + list-style: none; + border: none; +} #login_centerer { padding: 10px 25%; width: 960px; @@ -67,6 +71,8 @@ padding: 10px; margin: 0 auto; padding: 10px 0; + font-size: 13px; + line-height: 18px; } #registration input[type="submit"] { margin: 0 auto; @@ -114,7 +120,13 @@ font-weight: bold; padding: 0 15px; border: none; - margin-top: 15px; + margin: 5px 0; +} +#login form span.helptext { + display: block; + margin-top: -11px; + font-style: italic; + font-size: 12px; } #login .google_signup { padding: 14px 0; @@ -142,6 +154,6 @@ font-weight: bold; padding: 0 15px; border: none; - margin-top: 15px; + margin: 5px 0; float: left; } diff --git a/static/css/sitewide.css b/static/css/sitewide.css index e9872055..ab2bfcae 100644 --- a/static/css/sitewide.css +++ b/static/css/sitewide.css @@ -44,7 +44,7 @@ font-weight: bold; padding: 0 15px; border: none; - margin-top: 15px; + margin: 5px 0; } /* Local variables */ .utilityheaders { diff --git a/static/css/supporter_layout.css b/static/css/supporter_layout.css index 49bbad87..b1e8804e 100644 --- a/static/css/supporter_layout.css +++ b/static/css/supporter_layout.css @@ -43,7 +43,7 @@ font-weight: bold; padding: 0 15px; border: none; - margin-top: 15px; + margin: 5px 0; } .block-inner { padding-right: 10px; diff --git a/static/css/variables.css b/static/css/variables.css index fc3a97f7..0597fee9 100644 --- a/static/css/variables.css +++ b/static/css/variables.css @@ -43,5 +43,5 @@ font-weight: bold; padding: 0 15px; border: none; - margin-top: 15px; + margin: 5px 0; } diff --git a/static/less/registration.less b/static/less/registration.less index 8c5febfb..9608df7b 100644 --- a/static/less/registration.less +++ b/static/less/registration.less @@ -9,6 +9,11 @@ padding: 7px 0; .height(16px); text-align: center; + + li { + list-style: none; + border: none; + } } #login_centerer { @@ -21,6 +26,8 @@ padding: 10px; margin: 0 auto; padding: 10px 0; + font-size: 13px; + line-height: 18px; } #registration input[type="submit"] { @@ -58,6 +65,13 @@ .actionbuttons; } } + + span.helptext { + display: block; + margin-top: -11px; + font-style: italic; + font-size: 12px; + } } .google_signup { diff --git a/static/less/variables.less b/static/less/variables.less index f411aea8..0cbf0d59 100644 --- a/static/less/variables.less +++ b/static/less/variables.less @@ -90,5 +90,5 @@ font-weight: bold; padding: 0 15px; border:none; - margin-top: 15px; + margin: 5px 0; } \ No newline at end of file