xle/troggle-unchained
2
0
Fork 0
forked from expo/troggle
Code Issues 4 Pull Requests Projects 1 Wiki Activity

Removed jQuery

Browse Source
This commit is contained in:
Martin Green 2022-06-24 21:58:00 +01:00
parent 7db7c67065
commit 5ac2e24cc2
3 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
core/views/expo.py
View File

@ -175,6 +175,7 @@ def expowebpage(request, expowebpath, path):
if menumatch: if menumatch:
has_menu = True has_menu = True
#Determine which caves this page relates to
m = re.search(r"(162\d\/[^\/]+)[\/\.]", path, re.DOTALL + re.IGNORECASE) m = re.search(r"(162\d\/[^\/]+)[\/\.]", path, re.DOTALL + re.IGNORECASE)
if m: if m:
path_start, = m.groups() path_start, = m.groups()
@ -182,9 +183,19 @@ def expowebpage(request, expowebpath, path):
else: else:
parent_caves = None parent_caves = None
#Determine if this page relates to a particular year
m = re.search(r"years\/(\d\d\d\d)\/.*", path, re.DOTALL + re.IGNORECASE)
if m:
year, = m.groups()
else:
year = None
#Determine if this page is part of the handbook
handbook = path.startswith("handbook") handbook = path.startswith("handbook")
return render(request, 'expopage.html', {'editable': editable, 'path': path, 'title': title, return render(request, 'expopage.html', {'editable': editable, 'path': path, 'title': title,
'body': body, 'homepage': (path == "index.htm"), 'has_menu': has_menu, 'handbook': handbook, 'parent_caves': parent_caves}) 'body': body, 'homepage': (path == "index.htm"), 'has_menu': has_menu,
'year': year,'handbook': handbook, 'parent_caves': parent_caves})
def mediapage(request, subpath=None, doc_root=None): def mediapage(request, subpath=None, doc_root=None):
'''This is for special prefix paths /photos/ /site_media/, /static/ etc. '''This is for special prefix paths /photos/ /site_media/, /static/ etc.

2
media/js/jquery-3.6.0.min.js vendored
View File

File diff suppressed because one or more lines are too long

3
templates/menu.html
View File

@ -34,6 +34,9 @@
{% endif%}</li> {% endif%}</li>
<li><a href="/infodx.htm">Site index</a></li> <li><a href="/infodx.htm">Site index</a></li>
<li><a href="/pubs.htm">Reports</a></li> <li><a href="/pubs.htm">Reports</a></li>
{% if year %}
<ul><li><a href="/years/{{ year }}">{{ year }}</a></li></ul>
{% endif %}
<li><a href="/guidebook/areas.htm">Areas</a></li> <li><a href="/guidebook/areas.htm">Areas</a></li>
<li><a href="/expedition/2019">Troggle</a></li> <li><a href="/expedition/2019">Troggle</a></li>
<li><form name=P method=get action="/search" target="_top"> <li><form name=P method=get action="/search" target="_top">