diff options
| author | Martin Green <martin.speleo@gmail.com> | 2022-06-25 01:07:17 +0100 |
|---|---|---|
| committer | Martin Green <martin.speleo@gmail.com> | 2022-06-25 01:07:17 +0100 |
| commit | d607b30953a7b08ea3573067b46956ae5200181f (patch) | |
| tree | 83536c8e0d8563db987cf15bfe685b4b53922140 | |
| parent | abdea228995e9b873d0ea60aec275fc8c144f9e9 (diff) | |
| download | troggle-d607b30953a7b08ea3573067b46956ae5200181f.tar.gz troggle-d607b30953a7b08ea3573067b46956ae5200181f.tar.bz2 troggle-d607b30953a7b08ea3573067b46956ae5200181f.zip | |
Do not allow for the main menu to be overriden, instead display old menu at bottom of page. To do this the id of the main menu was changed from links to menulinks
| -rw-r--r-- | core/views/expo.py | 5 | ||||
| -rw-r--r-- | templates/menu.html | 2 |
2 files changed, 2 insertions, 5 deletions
diff --git a/core/views/expo.py b/core/views/expo.py index 55a34be..00cb6dc 100644 --- a/core/views/expo.py +++ b/core/views/expo.py @@ -168,12 +168,9 @@ def expowebpage(request, expowebpath, path): editable = os.access(expowebpath / path, os.W_OK) # are file permissions writeable? has_menu = False - menumatch = re.match(r'(.*)<div id="menu">', body, re.DOTALL + re.IGNORECASE) - if menumatch: - has_menu = True menumatch = re.match(r'(.*)<ul id="links">', body, re.DOTALL + re.IGNORECASE) if menumatch: - has_menu = True + has_menu = False #Determine which caves this page relates to m = re.search(r"(162\d\/[^\/]+)[\/\.]", path, re.DOTALL + re.IGNORECASE) diff --git a/templates/menu.html b/templates/menu.html index 86277fd..3ec6152 100644 --- a/templates/menu.html +++ b/templates/menu.html @@ -1,6 +1,6 @@ {% if not homepage %} <div id="menu"> -<ul id="links"> +<ul id="menulinks"> <li><a href="/index.htm">Home</a></li> <li><a href="/handbook/index.htm">Handbook</a> {% if handbook %} |