diff options
| author | substantialnoninfringinguser <substantialnoninfringinguser@gmail.com> | 2009-05-13 05:48:10 +0100 |
|---|---|---|
| committer | substantialnoninfringinguser <substantialnoninfringinguser@gmail.com> | 2009-05-13 05:48:10 +0100 |
| commit | ed345f25760d8927f834a69202c2b9b2cef71ee0 (patch) | |
| tree | 652dba01640060cc2106af850955728828bcd8f0 /templates/base.html | |
| parent | cdd4e685ee95e44b9a599b03cf11723a4ce7b7c6 (diff) | |
| download | troggle-ed345f25760d8927f834a69202c2b9b2cef71ee0.tar.gz troggle-ed345f25760d8927f834a69202c2b9b2cef71ee0.tar.bz2 troggle-ed345f25760d8927f834a69202c2b9b2cef71ee0.zip | |
[svn] Add user registration and user profiles.
Used modified versions of django-registration and django-profiles , both on bitbucket.
The Person model is now set up as the profile for auth.User s.
I set up a requestcontext so that settings is automatically passed to every template, no need to repeat ourselves in views. However, this needs to be refined: I will soon change it to only pass a subset of settings. E.G. we do not need to be passing the DB login and password!
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8231 by aaron @ 1/29/2009 11:02 PM
Diffstat (limited to 'templates/base.html')
| -rw-r--r-- | templates/base.html | 29 |
1 files changed, 21 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 %}
|