Skip to content

Commit

Permalink
better account messaging
Browse files Browse the repository at this point in the history
  • Loading branch information
potch committed Sep 27, 2010
1 parent 7217e55 commit 1fb5256
Show file tree
Hide file tree
Showing 6 changed files with 42 additions and 13 deletions.
18 changes: 17 additions & 1 deletion media/css/forms.css
Expand Up @@ -18,7 +18,19 @@ form label {
vertical-align: top;
}
form input[type=submit] {
margin-left: 208px;
cursor: pointer;
min-width: 10em;
margin: 0 0 0 212px;
border: 0;
font-family: Matiz, Helvetica, Arial, sans-serif;
color: #fff;
letter-spacing: .5px;
font-size: 1.2em;
text-transform: uppercase;
text-shadow: 0 1px 2px rgba(0,0,0,.5);
}
form input[type=submit]:hover {
color: #FDEB6A;
}
ul.errorlist + label:before {
content: "! ";
Expand Down Expand Up @@ -47,4 +59,8 @@ ul.errorlist li {
margin: 4px 0;
}

.form h1 {
font-size: 3em;
margin-bottom: 1em;
}

18 changes: 12 additions & 6 deletions media/css/screen.css
Expand Up @@ -67,9 +67,8 @@ h1, h2, h3 {font-family: 'OrbitronMed', Verdana, sans-serif; text-transform: upp
padding-top: 1em;
}

.copy p,
.form p {
width: 60%;
p {
width: 500px;
font-size: 1em;
line-height: 1.6em;
}
Expand All @@ -90,9 +89,11 @@ h2:target:after {
content: " <";
}

nav.toc {
nav.toc,
aside {
max-width: 300px;
display: block;
float: right;
text-align: right;
background: rgba(0,0,0,.2);
padding: 2em;
-webkit-border-radius: 1em;
Expand All @@ -102,6 +103,7 @@ nav.toc {

nav.toc a {
display: block;
text-align: right;
}

.home #content {
Expand Down Expand Up @@ -129,6 +131,10 @@ nav.toc a {
text-shadow: 0 0 2px rgba(0,0,0,.6);
}

.home-welcome p {
max-width: 440px;
}

.header-left {
position: absolute;
bottom: 0;
Expand Down Expand Up @@ -255,7 +261,7 @@ header nav {
margin-top: 20px;
}

header nav .selected {
header nav .selected, input[type=submit] {
margin-bottom: 40px;
font-size: 13px;
-moz-border-radius: 0.5em;
Expand Down
6 changes: 4 additions & 2 deletions templates/registration/activate.html
@@ -1,11 +1,13 @@
{% extends "base.html" %}

{% block class %}form{% endblock %}

{% block content %}
<h1>user activation</h1>
{% if account %}
<p class="success">You have successfully activated!</p>
<h1>Email confirmed!</h1>
<h3><a href="{% url games.create %}">Login and submit a game!</a></p>
{% else %}
<h1>Something is wrong.</h1>
<p class="failure">We could not activate your account. Please make sure that you have clicked the correct link in your e-mail or typed in the correct address.</p>
{% endif %}
{% endblock %}
3 changes: 3 additions & 0 deletions templates/registration/login.html
@@ -1,6 +1,9 @@
{% extends "base.html" %}

{% block class %}form{% endblock %}

{% block content %}
{% include "registration/account_note.html" %}
<h1>Login</h1>
<h3>Don't have an account yet? <a href="{% url registration_register %}">Register!</a></h3>
<form method="post" action="">
Expand Down
6 changes: 4 additions & 2 deletions templates/registration/registration_complete.html
@@ -1,10 +1,12 @@
{% extends "base.html" %}

{% block class %}form{% endblock %}

{% block content %}
<h1>registration successful</h1>
<h1>registration successful!</h1>
<p>
You have been registered, but your account still needs to be activated.
An e-mail has been sent to the address that you entered,
An e-mail has been sent to the address that you signed up with,
so please check your e-mail and activate your account at this time.
</p>
{% endblock %}
4 changes: 2 additions & 2 deletions templates/registration/registration_form.html
Expand Up @@ -3,9 +3,9 @@
{% block class %}form{% endblock %}

{% block content %}
{% include "registration/account_note.html" %}
<h1>Register</h1>
<p>You'll need to register so you can sign in later to modify your submissions and so we know how to reach you if you win!</p>
<p>Already registered? <a href="{% url auth_login %}">Login here!</a></p>
<h3>Already registered? <a href="{% url auth_login %}">Login here!</a></h3>
<p>Fill in the information below to get started:</p>
{% if form.errors %}
<ul class="errorlist">
Expand Down

0 comments on commit 1fb5256

Please sign in to comment.