EbookFoundation
/
regluit
mirror of https://github.com/EbookFoundation/regluit.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

now the rest of the registration-related stuff is prettier

pull/1/head
Andromeda Yelton 2012-01-13 16:24:34 -05:00
parent a4cc873cc9
commit 8022add137
23 changed files with 71 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
frontend/templates/registration/activate.html
View File

@ -1,12 +1,10 @@
{% extends "registration/registration_base.html" %}
{% block title %}{% if account %}Activation complete{% else %}Activation problem{% endif %}{% endblock %}
{% block content %}
<div id="registration">
{% block doccontent %}
{% if account %}
Thanks {{ account }}, activation complete! You may now <a href='{% url auth_login %}'>login</a> using the username and password you set at registration.
Thanks {{ account }}, activation complete! You may now <a href='{% url auth_login %}'>sign in</a> using the username and password you set at registration.
{% else %}
Oops &ndash; it seems that your activation key is invalid. Please check the url again.
{% endif %}
</div>
{% endblock %}

15
frontend/templates/registration/activation_complete.html
View File

@ -1,16 +1,13 @@
{% extends "registration/registration_base.html" %}
{% block title %}Activation complete{% endblock %}
{% block doccontent %}
<div id="registration">
{% 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:
<div>
<p>Thanks, your activation is complete! You may now sign in using the username and password you set at registration:</p>
{% include "login_form.html" %}
{% endif %}
<a href="{% url auth_password_reset %}">Already forgot</a> your password?
</div>
<br />
<div>
<a href="{% url auth_password_reset %}">Forgot</a> your password?
</div>
{% endblock %}

6
frontend/templates/registration/login.html
View File

@ -2,9 +2,6 @@
{% block title %}login{% endblock %}
{% block doccontent %}
<div id="login_centerer">
<div id="login">
{% if form.errors %}
<p class="errorlist">Your username and password didn't match. Please try again.</p>
{% endif %}
@ -20,7 +17,4 @@
<a href="/socialauth/login/google?next=/"><img src="{{ STATIC_URL }}images/auth/google_32_noborder.png"></a><div>Or: <a href="/socialauth/login/google?next=/">Sign in with Google</a></div>
</div>
</div>
</div>
{% endblock %}

5
frontend/templates/registration/password_change_form.html
View File

@ -2,8 +2,6 @@
{% block title %}Change password{% endblock %}
{% block doccontent %}
<div id="login_centerer">
<div id="login">
{% if request.user.is_authenticated %}
{% ifequal request.user.password '!' %}
<div>
@ -22,7 +20,6 @@
<div>You must be logged in to change your password.</div>
<a href="{% url auth_login %}?next={% firstof request.path '/' %}" class="nounderline"><div class="actionbutton">Log in</div></a>
{% endif %}
</div>
</div>
<p>Want to <a href="/accounts/edit/">change your username</a> instead?</p>
{% endblock %}

2
frontend/templates/registration/password_reset_complete.html
View File

@ -7,7 +7,7 @@
<div>
{% if not request.user.is_authenticated %}
You may now <a href="{{ login_url }}">log in</a>.
<a href="{{ login_url }}" class="nounderline"><div class="actionbutton">Log in</div></a>
{% else %}
<a href="/" class="nounderline"><div class="actionbutton">Back to my account</div></a>
{% endif %}

7
frontend/templates/registration/password_reset_confirm.html
View File

@ -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.<br /><br />
<form method="post" action="">{% csrf_token %}
<table>
{{ form.as_table }}
<tr><td></ td><td><input type="submit" value="Set password" /></td></tr>
</table>
<input type="submit" value="Set password" />
</form>
{% endblock %}

3
frontend/templates/registration/password_reset_done.html
View File

@ -2,7 +2,8 @@
{% block title %}Password reset{% endblock %}
{% block doccontent %}
<p>
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.
</p>
<p>If you don't see the email soon, please check your spam folder and make sure info@gluejar.com is on your whitelist.</p>
{% endblock %}

6
frontend/templates/registration/password_reset_form.html
View File

@ -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 == '!' %}
<p>
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.
</p>
<form method='post' action=''>{% csrf_token %}
<table>
{{ form }}
<tr><td></td><td><input type='submit' value="Reset password" /></td></tr>
</table>
<input type='submit' value="Reset password" />
</form>
{% endif %}
{% endblock %}

4
frontend/templates/registration/registration_base.html
View File

@ -9,8 +9,12 @@
{% block content %}
<div id="registration">
<div id="login_centerer">
<div id="login">
{% block doccontent %}
{% endblock %}
</div>
</div>
</div>
<div class="spacer"></div>
{% endblock %}

18
frontend/templates/registration/registration_form.html
View File

@ -3,25 +3,17 @@
{% block title %}Register for an account{% endblock %}
{% block doccontent %}
<div id="login_centerer">
<div id="login">
<h3>Sign up for a Unglue It account:</h3>
<table>
<form method='post' action=''>{% csrf_token %}
{{ form }}
<tr><td></td><td><input type="submit" value="Send activation email" /></td>
<input type="submit" value="Send activation email" />
</form>
</table>
<p>
<br>
<br>
<h3>Or use an account you already have:</h3>
<a href="/socialauth/login/google"><img src="{{ STATIC_URL }}/images/auth/google_64.png"</a>
</p>
<div>
<div class="google_signup">
<h3>Or use an account you already have:</h3>
<a href="/socialauth/login/google?next=/"><img src="{{ STATIC_URL }}images/auth/google_32_noborder.png"><div>Sign in with Google</div></a>
</div>
</div>

12
frontend/templates/registration/user_change_form.html
View File

@ -1,19 +1,17 @@
{% extends "registration/registration_base.html" %}
{% block title %}Change User Data{% endblock %}
{% block doccontent %}
<div id="registration">
<h1>Changing your Username.</h1>
<h1>Changing Your Username</h1>
<p> If you change your Username, the web address for your profile page will change as well.</p>
<p> If you change your username, the web address for your profile page will change as well.</p>
<p> <b>Your current Username:</b> {{ user.username }}</p>
<p> <b>Your current username:</b> {{ user.username }}</p>
<form method="POST" action="">
{% csrf_token %}
{{ form.as_p }}
<input type="submit" name="submit" value="Change" id="submit">
<input type="submit" name="submit" value="Change username" id="submit">
</form>
<p><a href="/accounts/password/change/">Change your password</a></p>
</div>
<p>Want to <a href="/accounts/password/change/">change your password</a> instead?</p>
{% endblock %}

2
static/css/book_list.css
View File

@ -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 */

2
static/css/book_panel.css
View File

@ -43,7 +43,7 @@
font-weight: bold;
padding: 0 15px;
border: none;
margin-top: 15px;
margin: 5px 0;
}
/* Local variables */
.greenpanelstuff {

2
static/css/campaign.css
View File

@ -43,7 +43,7 @@
font-weight: bold;
padding: 0 15px;
border: none;
margin-top: 15px;
margin: 5px 0;
}
#js-page-wrap {
overflow: hidden;

4
static/css/documentation.css
View File

@ -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;

4
static/css/landingpage.css
View File

@ -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;

2
static/css/learnmore.css
View File

@ -43,7 +43,7 @@
font-weight: bold;
padding: 0 15px;
border: none;
margin-top: 15px;
margin: 5px 0;
}
.user-block-hide {
float: left;

18
static/css/registration.css
View File

@ -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;
}

2
static/css/sitewide.css
View File

@ -44,7 +44,7 @@
font-weight: bold;
padding: 0 15px;
border: none;
margin-top: 15px;
margin: 5px 0;
}
/* Local variables */
.utilityheaders {

2
static/css/supporter_layout.css
View File

@ -43,7 +43,7 @@
font-weight: bold;
padding: 0 15px;
border: none;
margin-top: 15px;
margin: 5px 0;
}
.block-inner {
padding-right: 10px;

2
static/css/variables.css
View File

@ -43,5 +43,5 @@
font-weight: bold;
padding: 0 15px;
border: none;
margin-top: 15px;
margin: 5px 0;
}

14
static/less/registration.less
View File

@ -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 {

2
static/less/variables.less
View File

@ -90,5 +90,5 @@
font-weight: bold;
padding: 0 15px;
border:none;
margin-top: 15px;
margin: 5px 0;
}