diff options
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/base.html | 29 | ||||
| -rw-r--r-- | templates/personForm.html | 6 | ||||
| -rw-r--r-- | templates/profiles/create_profile.html | 13 | ||||
| -rw-r--r-- | templates/profiles/profile_list.html | 0 | ||||
| -rw-r--r-- | templates/registration/activate.html | 13 | ||||
| -rw-r--r-- | templates/registration/activation_email.txt | 3 | ||||
| -rw-r--r-- | templates/registration/activation_email_subject.txt | 1 | ||||
| -rw-r--r-- | templates/registration/login.html | 19 | ||||
| -rw-r--r-- | templates/registration/logout.html | 4 | ||||
| -rw-r--r-- | templates/registration/registration_activate.html | 6 | ||||
| -rw-r--r-- | templates/registration/registration_complete.html | 13 | ||||
| -rw-r--r-- | templates/registration/registration_form.html | 56 |
12 files changed, 155 insertions, 8 deletions
diff --git a/templates/base.html b/templates/base.html index b1fc47f..c88ac19 100644 --- a/templates/base.html +++ b/templates/base.html @@ -2,7 +2,7 @@ <html lang="en">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
-<link rel="stylesheet" type="text/css" href="{{ settings.MEDIA_URL }}css/main2.css" />
+<link rel="stylesheet" type="text/css" href="{{ settings.MEDIA_URL }}css/main3.css" />
<title>{% block title %}THE TITLE{% endblock %}</title>
@@ -11,21 +11,34 @@ </head>
<body>
-<a href="/">
-<div style="float:none">
- <div id="expoHeader" style="background:#222"> <img src="{{ settings.MEDIA_URL }}loserBanner.jpg" style="position:relative;width:inherit;height:inherit;"/>
+
+<div>
+ <div id="expoHeader"> <img id="frontPageBanner" src="{{ settings.MEDIA_URL }}loserBanner.jpg"/>
<div id="expoHeaderText">
- <h1>CUCC Expeditions to Austria: 1976 - 2008</h1>
+ <h1>CUCC Expeditions to Austria: 1976 - </h1>
+ <div id="expoFinalDate">
+ <h1>2009</h1>
+ </div>
</div>
</div>
<hr/>
- <div id="editLink" style="right:0px; top:0px; text-align: right; position: absolute; top:0; right:0; z-index:1; background:#999">
+ <div id="editLink">
+ {% block loginInfo %}
+ {% if user %}
+ You are logged in as {{ user.username }}.
+ | <a href="{{ settings.URL_ROOT }}/accounts/logout">Log out</a>
+ {% else %}
+ <a href="{{ settings.URL_ROOT }}/accounts/register">Sign up</a>
+ | <a href="{{ settings.URL_ROOT }}/accounts/login">Log in</a>
+ {% endif %}
+ {% endblock%}
+ | <a href="{{ settings.URL_ROOT }}">Home </a>
{% block editLink %}
- not editable
+
{% endblock %}
</div>
</div>
-</a>
+
{% block nav %}
diff --git a/templates/personForm.html b/templates/personForm.html new file mode 100644 index 0000000..84ee7b7 --- /dev/null +++ b/templates/personForm.html @@ -0,0 +1,6 @@ +{% extends "base.html" %}
+{% block content %}
+
+{{ form }}
+
+{% endblock %}
\ No newline at end of file diff --git a/templates/profiles/create_profile.html b/templates/profiles/create_profile.html new file mode 100644 index 0000000..2eed3e4 --- /dev/null +++ b/templates/profiles/create_profile.html @@ -0,0 +1,13 @@ +{% extends "base.html" %}
+
+{% block content %}
+
+<form method="post">
+{{ form }}
+<input type="submit" />
+</form>
+
+{% if form.errors %}
+ <p class="errornote">Please correct the errors below</p>
+{% endif %}
+{% endblock %}
\ No newline at end of file diff --git a/templates/profiles/profile_list.html b/templates/profiles/profile_list.html new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/templates/profiles/profile_list.html diff --git a/templates/registration/activate.html b/templates/registration/activate.html new file mode 100644 index 0000000..f87d519 --- /dev/null +++ b/templates/registration/activate.html @@ -0,0 +1,13 @@ +{% extends "base.html" %} + +{% block title %} +registration_form.html | {{ block.super }} +{% endblock %} + +{% block header %} +<h1>activate.html</h1> +{% endblock %} + +{% block content %} +You are now activated. +{% endblock %}
\ No newline at end of file diff --git a/templates/registration/activation_email.txt b/templates/registration/activation_email.txt new file mode 100644 index 0000000..3047d8f --- /dev/null +++ b/templates/registration/activation_email.txt @@ -0,0 +1,3 @@ +Activate your account in {{ expiration_days }} days...
+{{ URL_ROOT }}{% url registration_activate activation_key %}
+
diff --git a/templates/registration/activation_email_subject.txt b/templates/registration/activation_email_subject.txt new file mode 100644 index 0000000..78ae905 --- /dev/null +++ b/templates/registration/activation_email_subject.txt @@ -0,0 +1 @@ +[CUCC Expo] Activation email
\ No newline at end of file diff --git a/templates/registration/login.html b/templates/registration/login.html new file mode 100644 index 0000000..04b5074 --- /dev/null +++ b/templates/registration/login.html @@ -0,0 +1,19 @@ +{% extends "base.html" %}
+
+{% block content %}
+
+{% if form.errors %}
+<p>Your username and password didn't match. Please try again.</p>
+{% endif %}
+
+<form method="post" action=".">
+<table>
+<tr><td>{{ form.username.label_tag }}</td><td>{{ form.username }}</td></tr>
+<tr><td>{{ form.password.label_tag }}</td><td>{{ form.password }}</td></tr>
+</table>
+
+<input type="submit" value="login" />
+<input type="hidden" name="next" value="{{ next }}" />
+</form>
+
+{% endblock %}
diff --git a/templates/registration/logout.html b/templates/registration/logout.html new file mode 100644 index 0000000..9e40c20 --- /dev/null +++ b/templates/registration/logout.html @@ -0,0 +1,4 @@ +{% extends "base.html" %}
+{% block content %}
+ You have been logged out.
+{% endblock %}
\ No newline at end of file diff --git a/templates/registration/registration_activate.html b/templates/registration/registration_activate.html new file mode 100644 index 0000000..cbd540e --- /dev/null +++ b/templates/registration/registration_activate.html @@ -0,0 +1,6 @@ +{% extends “base.html” %}
+{% block body %}
+Hello {{ account }}!
+
+Check your email to confirm the activation. There are {{ expiration_days }} days left to do it.
+{% endblock %}
\ No newline at end of file diff --git a/templates/registration/registration_complete.html b/templates/registration/registration_complete.html new file mode 100644 index 0000000..552fa04 --- /dev/null +++ b/templates/registration/registration_complete.html @@ -0,0 +1,13 @@ +{% extends "base.html" %}
+
+{% block title %}
+registration_complete.html | {{ block.super }}
+{% endblock %}
+
+{% block header %}
+<h1>registration_complete.html</h1>
+{% endblock %}
+
+{% block content %}
+Thank you for signing up. An email with the activation code has been sent to your inbox.
+{% endblock %}
\ No newline at end of file diff --git a/templates/registration/registration_form.html b/templates/registration/registration_form.html new file mode 100644 index 0000000..17bebf2 --- /dev/null +++ b/templates/registration/registration_form.html @@ -0,0 +1,56 @@ +{% extends "base.html" %} + +{% block title %} +registration_form.html | {{ block.super }} +{% endblock %} + +{% block header %} +<h1>registration_form.html</h1> +{% endblock %} + +{% block content %} +<form action="{% url registration_register %}" method="POST"> +<table> +<tr> + <td align="right" valign="top">Username:</td> + <td> + {{ form.username }} <br/> + {% for error in form.username.errors %} + <span style="color:red">{{ error }}</span> + {% endfor %} + </td> +</tr> +<tr> + <td align="right" valign="top">Email:</td> + <td> + {{ form.email }} <br/> + {% for error in form.email.errors %} + <span style="color:red">{{ error }}</span> + {% endfor %} + </td> +</tr> +<tr> + <td align="right" valign="top">Password:</td> + <td> + {{ form.password1 }} <br/> + {% for error in form.password1.errors %} + <span style="color:red">{{ error }}</span> + {% endfor %} + </td> +</tr> +<tr> + <td align="right" valign="top">Password (again):</td> + <td> + {{ form.password2 }} <br/> + {% for error in form.password2.errors %} + <span style="color:red">{{ error }}</span> + {% endfor %} + </td> +</tr> +<tr> + <td> </td> + <td><input type="submit" value="Register" /></td> +</tr> +</table> +</form> +{% endblock %}
\ No newline at end of file |