Put troggle reports menu on troggle handbook pages

1 files changed, 10 insertions, 35 deletions

diff --git a/templates/base.html b/templates/base.html
index 6434d1d..27a78df 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -25,46 +25,20 @@
     <a href="/">Home</a> |
     <a id="cuccLink" href="http://camcaving.uk/">CUCC</a> |
     <a id="expoWebsiteLink" href="http://expo.survex.com">expo.survex</a> |
-    <a id="handbook" href="/handbook/computing/onlinesystems.html">Handbook</a> |
-    {% if user.username %}User:{{ user.username }}
-    {% if user.person %}(<a href="{{ user.person.get_absolute_url }}">{{ user.person }}</a>){% endif %}
-    | <a href='/accounts/logout/'>Log out</a> {% else %} <a href='/accounts/register/'>Register</a> | <a href='/accounts/login/'>Log in</a> {% endif %}
+    <a id="handbook" href="/handbook/index.htm">Handbook</a> |
+    {% if user.person %}User:(<a href="{{ user.person.get_absolute_url }}">{{ user.person }}</a>)
+		| <a href='/accounts/logout/'>Log out</a> 
+    {% elif user.username %}User:{{ user.username }}
+	    | <a href='/accounts/logout/'>Log out</a> 
+	{% else %} 
+        | <a href='/accounts/login/'>Log in</a> 
+	{% endif %}
+		| <a href='/accounts/register/'>Register</a>
     {% endblock%}
 
    </div>
 </div>
-{% if settings.DEVSERVER %}
-<div class="toolbarlinkslocal">
-{% else %}
-<div class="toolbarlinks">
-{% endif %}
-    <a href="/logbookedit/">Logbook Entry</a> |
-    <!--<a href="/1626/359/359.html">359 (HC)</a> |-->
-    <a id="cavesLink" href="/caves">Caves</a>  |
-    <a id="qmsLink" href="{% url "caveQMs" "1623-290" %}">QMs</a>  |
-    <a href="/survexfile/">Survex</a> |
-    <a href="{% url "survexcaveslist" %}">All Survex</a> |
-    <a href="{% url "allscans" %}">Scans</a> |
-    <a href="{% url "walletedit"   %}">Upload Scans</a> |
-    <a href="{% url "dwgallfiles" %}">Drawings</a> |
-    <a href="{% url "dwgupload" %}">Upload Drawings</a> |
-    <a href="{% url "photoupload" %}">Upload Photos</a> |
-    <a href="{% url "gpxupload" %}">Upload GPX</a> |
 
-    <br>
-    
-    <a href="{% url "dataissues" %}">Data Issues</a> |
-    <a href="/handbook/computing/todo-data.html">tasks to do </a>  |
-    <a id="entsLink" href="{% url "entranceindex" %}">ents</a>  |
-    <a id="folklink" href="/folk">expoers</a>  |
-    <a id="caversLink" href="{% url "notablepersons" %}">survey lengths</a>  |
-    <a href="{% url "stats" %}">statistics</a> |
-    <a href="/survexfilewild/{{current_year}}">Wild Survex({{current_year}})</a> |
-    <a href="/wallets/year/{{current_year}}">Wallets({{current_year}})</a> |
-    <a href="{% url "expedition" current_year %}">Expo({{current_year}})</a> |
-    <a href="{% url "controlpanel" %}">Control panel</a>  | 
-
-</div>
     
 <div id="nav">
   {% block nav %} 
@@ -81,6 +55,7 @@
         {% block related %}
         {% endblock %}
     </div>
+	{% include 'troggletoolbar.html' %}
     {% block content %}
     REPLACE : The content
     {% endblock %}