4 files changed, 20 insertions, 40 deletions
diff --git a/templates/base.html b/templates/base.html
index 8c79f87..bf31676 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -3,16 +3,12 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
 <link rel="stylesheet" type="text/css" href="{{ settings.MEDIA_URL }}css/main3.css" />
-
 <title>{% block title %}THE TITLE{% endblock %}</title>
-
 <script src="{{ settings.MEDIA_URL }}js/base.js" type="text/javascript"></script>
 {% block head %}{% endblock %}
 </head>
-
 <body>
-
-<div>
+<div class="wrapper">
   <div id="expoHeader"> <img id="frontPageBanner" src="{{ settings.MEDIA_URL }}loserBanner.jpg"/>
     <div id="expoHeaderText">
       <h1>CUCC Expeditions to Austria: 1976 - </h1>
@@ -22,46 +18,28 @@
     </div>
   </div>
   <hr/>
-  <div id="editLink"> 
-  	{% block loginInfo %}
-    	{% if user.username %}
-	    	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 %}
+  <div id="editLink"> {% block loginInfo %}
+    {% if user.username %}
+    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 %}
-
-    {% endblock %}
-  </div>
-</div>
-
-
-
+    {% block editLink %}
+    
+    {% endblock %} </div>
   {% block nav %}
   <!-- Use id="nav" for the left side menu -->
-  {% endblock %} 
-
-
-
-<div id="content" >
-{% block contentheader %}
-{% endblock %}
-{% block content %}
+  {% endblock %}
+  <div id="content" > {% block contentheader %}
+    {% endblock %}
+    {% block content %}
     REPLACE : The content
-{% endblock %} 
-<br class="clearfloat" /> <!--This is to ensure that the content div expands around floated objects*/-->
+    {% endblock %} <br class="clearfloat" />
+    <!--This is to ensure that the content div expands around floated objects*/-->
+  </div>
 </div>
-
-
-<div id="footer">
-{% block footer %}
-  THE FOOTER
-{% endblock %}
+<div class="push"></div>
 </div>
+<div id="footer"> {% block footer %} <a href="http://cucc.survex.com"> CUCC website</a>| <a href="http://cucc.survex.com/expo"> Expedition website </a>| <a href="{% url frontpage %}"> Troggle front page </a>| <a href="{% url caveindex %}"> All caves </a>| <a href="{% url personindex %}"> All cavers </a>| <a href="{% url caveindex %}"> Virtual survey binder </a>| <a href="{% url survey %}"> Expedition statistics </a>| <a href="{% url calendar 2007 %}"> Expedition calendar </a> {% endblock %} </div>
 </body>
 </html>
-
diff --git a/templates/logbookentry.html b/templates/logbookentry.html
index 5b972e8..812197a 100644
--- a/templates/logbookentry.html
+++ b/templates/logbookentry.html
@@ -56,6 +56,7 @@
 </tr>
 {% endfor %}
 </table>
+<a href="{{newQMlink}}">Add QM found on this trip</a>
 </div>
 
 <div id="col1">
diff --git a/templates/qm.html b/templates/qm.html
index db3edc4..06e6e0e 100644
--- a/templates/qm.html
+++ b/templates/qm.html
@@ -18,6 +18,7 @@
 {% endblock %}
 
 {% block content %}
+
 <h3>Location</h3>
 {{qm.location_description}}
 
diff --git a/templates/registration/registration_complete.html b/templates/registration/registration_complete.html
index 5351574..263cce8 100644
--- a/templates/registration/registration_complete.html
+++ b/templates/registration/registration_complete.html
@@ -9,5 +9,5 @@ registration_complete.html | {{ block.super }}
 {% endblock %}
 
 {% block content %}
-Thank you for signing up, {{ user.username }}. An email with the activation code has been sent to your inbox. If you have been on the expedition in the past, you already have a profile in the system; <a href={% url profiles_select_profile %}>click here </a> to find it and link it to your account. Otherwise, please <a href={% url profiles_create_profile %}> create yourself a new profile</a>. If you have been on the expedition in the past, this step allows existing expedition data to be linked to your new account.
+Thank you for signing up, {{ user.username }}. An email with the activation code has been sent to your inbox. If you have been on the expedition in the past, you already have a profile in the system; <a href={% url profiles_select_profile %}>click here </a> to find it and link it to your account. Otherwise, please <a href={% url profiles_create_profile %}> create yourself a new profile</a>. 
 {% endblock %}
 \ No newline at end of file