Backed out changeset: 4552f42bdf54

core/admin.py

@@ -124,19 +124,18 @@ admin.site.register(CaveAndEntrance)
 admin.site.register(NewSubCave)
 admin.site.register(CaveDescription)
 admin.site.register(Entrance, EntranceAdmin)
+admin.site.register(SurvexBlock, SurvexBlockAdmin)
 admin.site.register(Expedition)
 admin.site.register(Person,PersonAdmin)
+admin.site.register(SurvexPersonRole)
 admin.site.register(PersonExpedition,PersonExpeditionAdmin)
 admin.site.register(LogbookEntry, LogbookEntryAdmin)
 #admin.site.register(PersonTrip)
 admin.site.register(QM, QMAdmin)
 admin.site.register(Survey, SurveyAdmin)
 admin.site.register(ScannedImage)
-
-admin.site.register(SurvexFile)
 admin.site.register(SurvexStation)
-admin.site.register(SurvexBlock)
+
-admin.site.register(SurvexPersonRole)
 admin.site.register(SurvexScansFolder)
 admin.site.register(SurvexScanSingle)
 

core/models.py

@@ -10,7 +10,7 @@ from django.db.models import Min, Max
 from django.conf import settings
 from decimal import Decimal, getcontext
 from django.core.urlresolvers import reverse
-from imagekit.models import ProcessedImageField #ImageModel
+from imagekit.models import ImageModel
 from django.template import Context, loader
 import settings
 getcontext().prec=2 #use 2 significant figures for decimal calculations
@@ -248,7 +248,7 @@ class LogbookEntry(TroggleModel):
         ("html", "Html style logbook")
     )
 
-    date    = models.DateTimeField()#MJG wants to turn this into a datetime such that multiple Logbook entries on the same day can be ordered.ld()
+    date    = models.DateField()#MJG wants to turn this into a datetime such that multiple Logbook entries on the same day can be ordered.ld()
     expeditionday = models.ForeignKey("ExpeditionDay", null=True)#MJG wants to KILL THIS (redundant information)
     expedition  = models.ForeignKey(Expedition,blank=True,null=True)  # yes this is double-
     title      = models.CharField(max_length=settings.MAX_LOGBOOK_ENTRY_TITLE_LENGTH)

core/models_survex.py

@@ -30,9 +30,6 @@ class SurvexFile(models.Model):
     class Meta:
         ordering = ('id',)
     
-    def __unicode__(self):
-        return self.path + '.svx' or 'no file'
-    
     def exists(self):
         fname = os.path.join(settings.SURVEX_DATA, self.path + ".svx")
         return os.path.isfile(fname)
@@ -70,9 +67,6 @@ class SurvexStation(models.Model):
     y = models.FloatField(blank=True, null=True)
     z = models.FloatField(blank=True, null=True)
     
-    def __unicode__(self):
-        return self.block.cave.slug() + '/' + self.block.name + '/' + self.name or 'No station name'
-    
     def path(self):
         r = self.name
         b = self.block
@@ -115,7 +109,7 @@ class SurvexBlock(models.Model):
     text       = models.TextField()
     cave       = models.ForeignKey('Cave', blank=True, null=True)
     
-    date       = models.DateTimeField(blank=True, null=True)
+    date       = models.DateField(blank=True, null=True)
     expeditionday = models.ForeignKey("ExpeditionDay", null=True)
     expedition = models.ForeignKey('Expedition', blank=True, null=True)
         
@@ -201,9 +195,6 @@ class SurvexScansFolder(models.Model):
     class Meta:
         ordering = ('walletname',)
     
-    def __unicode__(self):
-        return self.walletname or 'no wallet'
-    
     def get_absolute_url(self):
         return urlparse.urljoin(settings.URL_ROOT, reverse('surveyscansfolder', kwargs={"path":re.sub("#", "%23", self.walletname)}))
     
@@ -215,9 +206,6 @@ class SurvexScanSingle(models.Model):
     class Meta:
         ordering = ('name',)
     
-    def __unicode__(self):
-        return self.survexscansfolder.walletname + '/' + self.name
-    
     def get_absolute_url(self):
         return urlparse.urljoin(settings.URL_ROOT, reverse('surveyscansingle', kwargs={"path":re.sub("#", "%23", self.survexscansfolder.walletname), "file":self.name}))
     

core/views_caves.py

@@ -50,7 +50,7 @@ def caveCmp(x, y):
         return numericalcmp(x.unofficial_number, y.unofficial_number)
 
 def caveindex(request):
-    #caves = Cave.objects.all()
+    caves = Cave.objects.all()
     notablecavehrefs = settings.NOTABLECAVESHREFS
     notablecaves = [Cave.objects.get(kataster_number=kataster_number)  for kataster_number in notablecavehrefs ]
     caves1623 = list(Cave.objects.filter(area__short_name = "1623"))
@@ -240,7 +240,7 @@ def entranceSlug(request, slug):
 
 def survexblock(request, survexpath):
     survexpath = re.sub("/", ".", survexpath)
-    print("jjjjjj", survexpath)
+    print "jjjjjj", survexpath
     survexblock = models.SurvexBlock.objects.get(survexpath=survexpath)
     #ftext = survexblock.filecontents()
     ftext = survexblock.text
@@ -481,8 +481,7 @@ def prospecting_image(request, name):
 		if station:
 			#try:
 				areaName = entrance.caveandentrance_set.all()[0].cave.getArea().short_name
-                plot(station, "%s-%s" % (areaName, str(entrance)
+				plot(station, "%s-%s" % (areaName, str(entrance)[5:]), entrance.needs_surface_work(), str(entrance), name, draw, img)
-                                    [5:]), entrance.needs_surface_work(), str(entrance), name, draw, img)
 			#except:
 			#	pass
 				

databaseReset.py

@@ -90,11 +90,9 @@ def reset():
     import_caves()
     import_people()
     import_surveyscans()
-    
+    import_survex()
     import_logbooks()
     import_QMs()
-
-    import_survex()
     try:
         import_tunnelfiles()
     except:

docker/requirements.txt.dj-1.7.11

@@ -6,4 +6,3 @@ django-imagekit
 Image
 django-tinymce==2.7.0
 smartencoding
-fuzzywuzzy

parsers/logbooks.py

@@ -172,8 +172,8 @@ def Parseloghtmltxt(year, expedition, txt):
         tripid, tripid1, tripdate, trippeople, triptitle, triptext, tu = s.groups()
         ldate = ParseDate(tripdate.strip(), year)
         #assert tripid[:-1] == "t" + tripdate, (tripid, tripdate)
-        #trippeople = re.sub(r"Ol(?!l)", "Olly", trippeople)        
+        trippeople = re.sub(r"Ol(?!l)", "Olly", trippeople)        
-        #trippeople = re.sub(r"Wook(?!e)", "Wookey", trippeople)        
+        trippeople = re.sub(r"Wook(?!e)", "Wookey", trippeople)        
         triptitles = triptitle.split(" - ")
         if len(triptitles) >= 2:
             tripcave = triptitles[0]

parsers/survex.py

@@ -5,14 +5,9 @@ import troggle.settings as settings
 from subprocess import call, Popen, PIPE
 
 from troggle.parsers.people import GetPersonExpeditionNameLookup
-from django.utils.timezone import get_current_timezone
-from django.utils.timezone import make_aware
-
 import re
 import os
-from datetime import datetime
 
-line_leg_regex = re.compile(r"[\d\-+.]+$")
 
 def LoadSurvexLineLeg(survexblock, stardata, sline, comment):
     ls = sline.lower().split()
@@ -58,8 +53,8 @@ def LoadSurvexLineLeg(survexblock, stardata, sline, comment):
                 survexleg.compass = 1000
             survexleg.clino = -90.0
         else:
-            assert line_leg_regex.match(lcompass), ls
+            assert re.match(r"[\d\-+.]+$", lcompass), ls
-            assert line_leg_regex.match(lclino) and lclino != "-", ls
+            assert re.match(r"[\d\-+.]+$", lclino) and lclino != "-", ls
             survexleg.compass = float(lcompass)
             survexleg.clino = float(lclino)
         
@@ -90,12 +85,6 @@ def LoadSurvexLinePassage(survexblock, stardata, sline, comment):
 stardatadefault = {"type":"normal", "t":"leg", "from":0, "to":1, "tape":2, "compass":3, "clino":4}
 stardataparamconvert = {"length":"tape", "bearing":"compass", "gradient":"clino"}
 
-regex_comment = re.compile(r"([^;]*?)\s*(?:;\s*(.*))?\n?$")
-regex_ref     = re.compile(r'.*?ref.*?(\d+)\s*#\s*(\d+)')
-regex_star    = re.compile(r'\s*\*[\s,]*(\w+)\s*(.*?)\s*(?:;.*)?$')
-regex_team    = re.compile(r"(Insts|Notes|Tape|Dog|Useless|Pics|Helper|Disto|Consultant)\s+(.*)$(?i)")
-regex_team_member        = re.compile(r" and | / |, | & | \+ |^both$|^none$(?i)")
-
 def RecursiveLoad(survexblock, survexfile, fin, textlines):
     iblankbegins = 0
     text = [ ]
@@ -103,25 +92,18 @@ def RecursiveLoad(survexblock, survexfile, fin, textlines):
     teammembers = [ ]
  
 # uncomment to print out all files during parsing 
-    print("  - Reading file: " + survexblock.survexfile.path)
+    print("Reading file: " + survexblock.survexfile.path)
-    stamp = datetime.now()
-    lineno = 0
     while True:
         svxline = fin.readline().decode("latin1")
         if not svxline:
-            print('   - Not survex')
             return
         textlines.append(svxline)
 
-        lineno += 1
-
-        print('   - Line: %d' % lineno)
-
         # break the line at the comment
-        sline, comment = regex_comment.match(svxline.strip()).groups()
+        sline, comment = re.match(r"([^;]*?)\s*(?:;\s*(.*))?\n?$", svxline.strip()).groups()
         
         # detect ref line pointing to the scans directory
-        mref = comment and regex_ref.match(comment)
+        mref = comment and re.match(r'.*?ref.*?(\d+)\s*#\s*(\d+)', comment)
         if mref:
             refscan = "%s#%s" % (mref.group(1), mref.group(2))
             survexscansfolders = models.SurvexScansFolder.objects.filter(walletname=refscan)
@@ -135,15 +117,12 @@ def RecursiveLoad(survexblock, survexfile, fin, textlines):
             continue
         
         # detect the star command
-        mstar = regex_star.match(sline)
+        mstar = re.match(r'\s*\*[\s,]*(\w+)\s*(.*?)\s*(?:;.*)?$', sline)
         if not mstar:
             if "from" in stardata:
                 LoadSurvexLineLeg(survexblock, stardata, sline, comment)
-                print('   - From: ')
-                #print(stardata)
             elif stardata["type"] == "passage":
                 LoadSurvexLinePassage(survexblock, stardata, sline, comment)
-                print('   - Pasage: ')
             #Missing "station" in stardata.
             continue
         
@@ -152,7 +131,6 @@ def RecursiveLoad(survexblock, survexfile, fin, textlines):
         cmd = cmd.lower()
         if re.match("include$(?i)", cmd):
             includepath = os.path.join(os.path.split(survexfile.path)[0], re.sub(r"\.svx$", "", line))
-            print('   - Include file found including - ' + includepath)
             includesurvexfile = models.SurvexFile(path=includepath, cave=survexfile.cave)
             includesurvexfile.save()
             includesurvexfile.SetDirectory()
@@ -163,7 +141,6 @@ def RecursiveLoad(survexblock, survexfile, fin, textlines):
         elif re.match("begin$(?i)", cmd):
             if line: 
                 name = line.lower()
-                #print('   - Begin found for: ' + name)
                 survexblockdown = models.SurvexBlock(name=name, begin_char=fin.tell(), parent=survexblock, survexpath=survexblock.survexpath+"."+name, cave=survexblock.cave, survexfile=survexfile, totalleglength=0.0)
                 survexblockdown.save()
                 textlinesdown = [ ]
@@ -177,16 +154,11 @@ def RecursiveLoad(survexblock, survexfile, fin, textlines):
             else:
                 survexblock.text = "".join(textlines)
                 survexblock.save()
-                print('   - End found: ')
-                endstamp = datetime.now()
-                timetaken = endstamp - stamp
-                print('   - Time to process: ' + str(timetaken))
                 return
         
         elif re.match("date$(?i)", cmd):
             if len(line) == 10:
-                #print('   - Date found: ' + line)
+                survexblock.date = re.sub(r"\.", "-", line)
-                survexblock.date = make_aware(datetime.strptime(re.sub(r"\.", "-", line), '%Y-%m-%d'), get_current_timezone())
                 expeditions = models.Expedition.objects.filter(year=line[:4])
                 if expeditions:
                     assert len(expeditions) == 1
@@ -195,11 +167,9 @@ def RecursiveLoad(survexblock, survexfile, fin, textlines):
                     survexblock.save()
                     
         elif re.match("team$(?i)", cmd):
-            pass
+            mteammember = re.match(r"(Insts|Notes|Tape|Dog|Useless|Pics|Helper|Disto|Consultant)\s+(.*)$(?i)", line)
-            print('   - Team found: ')
-            mteammember = regex_team.match(line)
             if mteammember:
-                for tm in regex_team_member.split(mteammember.group(2)):
+                for tm in re.split(r" and | / |, | & | \+ |^both$|^none$(?i)", mteammember.group(2)):
                     if tm:
                         personexpedition = survexblock.expedition and GetPersonExpeditionNameLookup(survexblock.expedition).get(tm.lower())
                         if (personexpedition, tm) not in teammembers:
@@ -211,7 +181,6 @@ def RecursiveLoad(survexblock, survexfile, fin, textlines):
                             personrole.save()
                             
         elif cmd == "title":
-            #print('   - Title found: ')
             survextitle = models.SurvexTitle(survexblock=survexblock, title=line.strip('"'), cave=survexblock.cave)
             survextitle.save()
             
@@ -220,11 +189,8 @@ def RecursiveLoad(survexblock, survexfile, fin, textlines):
             pass
 
         elif cmd == "data":
-            #print('   - Data found: ')
             ls = line.lower().split()
             stardata = { "type":ls[0] }
-            #print('    - Star data: ', stardata)
-            #print(ls)
             for i in range(0, len(ls)):
                 stardata[stardataparamconvert.get(ls[i], ls[i])] = i - 1
             if ls[0] in ["normal", "cartesian", "nosurvey"]:
@@ -235,32 +201,26 @@ def RecursiveLoad(survexblock, survexfile, fin, textlines):
                 assert ls[0] == "passage", line
         
         elif cmd == "equate":
-            #print('   - Equate found: ')
             LoadSurvexEquate(survexblock, line)
 
         elif cmd == "fix":
-            #print('   - Fix found: ')
             survexblock.MakeSurvexStation(line.split()[0])
 
         else:
-            #print('   - Stuff')
             if cmd not in ["sd", "include", "units", "entrance", "data", "flags", "title", "export", "instrument",
                            "calibrate", "set", "infer", "alias", "ref", "cs", "declination", "case"]:
                 print("Unrecognised command in line:", cmd, line, survexblock, survexblock.survexfile.path)
-        endstamp = datetime.now()
-        timetaken = endstamp - stamp
-        print('   - Time to process: ' + str(timetaken))
 
 
 def ReloadSurvexCave(survex_cave, area):
-    print(' - Area: ' + str(area) + ' Cave: ' + str(survex_cave))
+    print(survex_cave, area)
     cave = models.Cave.objects.get(kataster_number=survex_cave, area__short_name=area)
-    print(' - ' + str(cave))
+    print(cave)
+    #cave = models.Cave.objects.get(kataster_number=survex_cave)
     cave.survexblock_set.all().delete()
     cave.survexfile_set.all().delete()
     cave.survexdirectory_set.all().delete()
     
-    file_stamp_start = datetime.now()
     survexfile = models.SurvexFile(path="caves-" + cave.kat_area() + "/" + survex_cave + "/" + survex_cave, cave=cave)
     survexfile.save()
     survexfile.SetDirectory()
@@ -268,9 +228,6 @@ def ReloadSurvexCave(survex_cave, area):
     survexblockroot = models.SurvexBlock(name="root", survexpath="caves-" + cave.kat_area(), begin_char=0, cave=cave, survexfile=survexfile, totalleglength=0.0)
     survexblockroot.save()
     fin = survexfile.OpenFile()
-    file_stamp_end = datetime.now()
-    file_time = file_stamp_end - file_stamp_start
-    print(' - Files time to process: ' + str(file_time))
     textlines = [ ]
     RecursiveLoad(survexblockroot, survexfile, fin, textlines)
     survexblockroot.text = "".join(textlines)
@@ -311,15 +268,10 @@ def LoadAllSurvexBlocks():
     print(" - Reloading all caves")
     caves = models.Cave.objects.all()
     for cave in caves:
-        rec_stamp_start = datetime.now()
         if cave.kataster_number and os.path.isdir(os.path.join(settings.SURVEX_DATA, "caves-" + cave.kat_area(), cave.kataster_number)):
             if cave.kataster_number not in ['40']:
-                print(" - Loading " + str(cave) + " " + cave.kat_area())
+                print("loading", cave, cave.kat_area())
                 ReloadSurvexCave(cave.kataster_number, cave.kat_area())
-                rec_stamp_end = datetime.now()
-        timetaken = rec_stamp_end - rec_stamp_start
-        print(' - Time to process: ' + str(timetaken))
-        print('--------')
 
 
 poslineregex = re.compile(r"^\(\s*([+-]?\d*\.\d*),\s*([+-]?\d*\.\d*),\s*([+-]?\d*\.\d*)\s*\)\s*([^\s]+)$")

settings.py

@@ -129,7 +129,7 @@ INSTALLED_APPS = (
     'troggle.profiles',
     'troggle.core',
     'troggle.flatpages',
-    'imagekit', 
+    'troggle.imagekit', 
 )
 
 MIDDLEWARE_CLASSES = (

templates/base.html

@@ -3,14 +3,8 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
 <link rel="stylesheet" type="text/css" href="{{ settings.MEDIA_URL }}css/main3.css" title="eyeCandy"/>
-<!-- <link rel="alternate stylesheet" type="text/css" href="{{ settings.MEDIA_URL }}css/mainplain.css" title="plain"/> -->
+<link rel="alternate stylesheet" type="text/css" href="{{ settings.MEDIA_URL }}css/mainplain.css" title="plain"/>
 <link rel="stylesheet" type="text/css" href="{{ settings.MEDIA_URL }}css/dropdownNavStyle.css" />
-
-<link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/css/bootstrap.min.css" integrity="sha384-ggOyR0iXCbMQv3Xipma34MD+dH/1fQ784/j6cY/iJTQUOhcWr7x9JvoRxT2MZw1T" crossorigin="anonymous">
-<script src="https://code.jquery.com/jquery-3.3.1.slim.min.js" integrity="sha384-q8i/X+965DzO0rT7abK41JStQIAqVgRVzpbzo5smXKp4YfRvH+8abtTE1Pi6jizo" crossorigin="anonymous"></script>
-<script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.14.7/umd/popper.min.js" integrity="sha384-UO2eT0CpHqdSJQ6hJty5KVphtPhzWj9WO1clHTMGa3JDZwrnQq4sF86dIHNDz0W1" crossorigin="anonymous"></script>
-<script src="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/js/bootstrap.min.js" integrity="sha384-JjSmVgyd0p3pXB1rRibZUAYoIIy6OrQ6VrjIEaFf/nJGzIxFDsf4x0xIM+B07jRM" crossorigin="anonymous"></script>
-
 <title>{% block title %}Troggle{% endblock %}</title>
 <!-- <script src="{{ settings.JSLIB_URL }}jquery/jquery.min.js" type="text/javascript"></script> -->
 <script src="{{ settings.MEDIA_URL }}js/jquery.quicksearch.js" type="text/javascript"></script>
@@ -21,98 +15,37 @@
 </head>
 <body  onLoad="contentHeight();">
 
-  <nav class="navbar navbar-expand-lg navbar-dark bg-dark">
-    <a class="navbar-brand" href="#">CUCC Expo</a>
-    <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">
-      <span class="navbar-toggler-icon"></span>
-    </button>
-  
-    <div class="collapse navbar-collapse" id="navbarSupportedContent">
-      <ul class="navbar-nav mr-auto">
-        <li class="nav-item">
-          <a class="nav-link" href="{{settings.EXPOWEB_URL}}">Home <span class="sr-only">(current)</span></a>
-        </li>
-        <li class="nav-item active">
-          <a class="nav-link" href="{% url "frontpage" %}">Troggle</a>
-        </li>
-        <li class="nav-item">
-          <a class="nav-link" href="{% url "survexcaveslist" %}">All Survex</a>
-        </li>
-        <li class="nav-item">
-          <a class="nav-link" href="{% url "surveyscansfolders" %}">Scans</a>
-        </li>
-        <li class="nav-item">
-          <a class="nav-link" href="{% url "tunneldata" %}">Tunneldata</a>
-        </li>
-        <li class="nav-item dropdown">
-          <a class="nav-link dropdown-toggle" href="#" id="navbarDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-            Caves
-          </a>
-          <div class="dropdown-menu" aria-labelledby="navbarDropdown">
-            <a class="dropdown-item" href="{% url "survexcavessingle" 107 %}">107</a>
-            <a class="dropdown-item" href="{% url "survexcavessingle" 161 %}">161</a>
-            <a class="dropdown-item" href="{% url "survexcavessingle" 204 %}">204</a>
-            <a class="dropdown-item" href="{% url "survexcavessingle" 258 %}">258</a>
-            <a class="dropdown-item" href="{% url "survexcavessingle" 264 %}">264</a>
-            <div class="dropdown-divider"></div>
-            <a class="dropdown-item" href="{% url "caveindex" %}">All</a>
-          </div>
-        </li>
-        <li class="nav-item dropdown">
-          <a class="nav-link dropdown-toggle" href="#" id="navbarDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-            Expos
-          </a>
-           <div class="dropdown-menu" aria-labelledby="navbarDropdown">
-             <a class="dropdown-item" href="{% url "expedition" 2018 %}">Expo2018</a>
-             <a class="dropdown-item" href="{% url "expedition" 2017 %}">Expo2017</a>
-             <a class="dropdown-item" href="{% url "expedition" 2016 %}">Expo2016</a>
-            <div class="dropdown-divider"></div>
-             <a class="dropdown-item" href="{% url "expeditions" %}">All</a>
-          </div>
-        </li>
-        <li class="nav-item">
-          <a class="nav-link" href="{% url "personindex" %}">Cavers</a>
-        </li>
-      </ul>
-      <ul class="navbar-nav my-2 my-lg-0">
-        <li class="nav-item">
-            <a class="nav-link" href="/admin/">Django admin</a>
-        </li>
-      {% block loginInfo %}
-        {% if user.username %}
-          <li class="nav-item">
-            <span class="navbar-text">
-              You are logged in as {{ user.username }}
-            </span>
-          </li>
-          <li class="nav-item">
-            <a class="nav-link" href="{% url "auth_logout" %}">Log out</a>
-          </li>
-        {% else %}
-          <li class="nav-item">
-            <a class="nav-link" href="{% url "registration_register" %}">Sign up</a>
-          </li>
-          <li class="nav-item">
-            <a class="nav-link" href="{% url "auth_login" %}">Log in</a>
-          </li>
-        {% endif %}
-      {% endblock%}
-      </ul>
-      <!-- <form class="form-inline my-2 my-lg-0">
-        <input class="form-control mr-sm-2" type="search" placeholder="Search" aria-label="Search">
-        <button class="btn btn-outline-success my-2 my-sm-0" type="submit">Search</button>
-      </form> -->
-    </div>
-  </nav>
-
 <div id="header"> 
-  <div id="editLinks"> 
+  <h1>CUCC Expeditions to Austria: 1976 - 2018</h1>
-
+  <div id="editLinks"> {% block loginInfo %}
+    <a href="{{settings.EXPOWEB_URL}}">Website home</a> |
+    {% if user.username %}
+    You are logged in as {{ user.username }} 
+    	{% if user.person %}(<a href="{{ user.person.get_absolute_url }}">{{ user.person }}</a>)
+        	{% else %}<a href={% url "profiles_select_profile" %}>sort your profile</a>
+        {% endif %}.
+    | <a href="{% url "auth_logout" %}">Log out</a> {% else %} <a href="{% url "registration_register" %}">Sign up</a> | <a href="{% url "auth_login" %}">Log in</a> {% endif %}
+    {% endblock%}
     {% block editLink %}
 
     {% endblock %}
    </div>
 </div>
+<div class="toolbarlinks">
+    <a href="{% url "survexcaveslist" %}">All Survex</a> |
+    <a href="{% url "surveyscansfolders" %}">Scans</a> |
+    <a href="{% url "tunneldata" %}">Tunneldata</a> |
+    <a href="{% url "survexcavessingle" 107 %}">107</a> |
+    <a href="{% url "survexcavessingle" 161 %}">161</a> |
+    <a href="{% url "survexcavessingle" 204 %}">204</a> |
+    <a href="{% url "survexcavessingle" 258 %}">258</a> |
+    <a href="{% url "survexcavessingle" 264 %}">264</a> |
+    <a href="{% url "expedition" 2016 %}">Expo2016</a> |
+    <a href="{% url "expedition" 2017 %}">Expo2017</a> |
+    <a href="{% url "expedition" 2018 %}">Expo2018</a> |
+ 
+    <a href="/admin/">Django admin</a>
+</div>
     
 <div id="nav">
 
@@ -145,6 +78,7 @@
 
     <div class="footer">
 	<ul class="dropdown" id="footerLinks">
+
 		<li><a href="#">External links</a>
                 <ul class="sub_menu">
                     <li><a id="cuccLink" href="http://www.srcf.ucam.org/caving/wiki/Main_Page">CUCC website</a></li>
@@ -172,6 +106,7 @@
                     <li><a id="expoWebsiteLink" href="{{ settings.URL_ROOT }}admin">Troggle administration pages</a></li>
                 </ul>
         <li class="toggleMenu"><a href="#">hide menu</a></li>
+
 	</ul>
     </div>
 </body>