Merge branch 'master' of ssh://expo.survex.com/home/expo/troggle

This commit is contained in:
Martin Green 2023-07-05 18:27:49 +01:00
commit a70cf6cad3
2 changed files with 2 additions and 0 deletions

View File

@ -14,6 +14,7 @@
<div id="header"> <div id="header">
<h1>CUCC Expeditions to Austria: 1976 - 2022</h1> <h1>CUCC Expeditions to Austria: 1976 - 2022</h1>
<div id="editLinks"> {% block loginInfo %} <div id="editLinks"> {% block loginInfo %}
{% if settings.DEVSERVER %}<b style="color:red">RUNNING ON LOCALSERVER</b>{% endif %}
<a href="/">Home</a> | <a href="/">Home</a> |
<a id="cuccLink" href="http://camcaving.uk/">CUCC</a> | <a id="cuccLink" href="http://camcaving.uk/">CUCC</a> |
<a id="expoWebsiteLink" href="http://expo.survex.com">expo.survex</a> | <a id="expoWebsiteLink" href="http://expo.survex.com">expo.survex</a> |

View File

@ -44,6 +44,7 @@
<input type=submit value="Search"></form></li> <input type=submit value="Search"></form></li>
{% if editable %}<li><a href="{% if local %}https://expo.survex.com{% endif %}{% url "editexpopage" path %}" class="editlink"><strong>Edit this page</strong></a></li>{% endif %} {% if editable %}<li><a href="{% if local %}https://expo.survex.com{% endif %}{% url "editexpopage" path %}" class="editlink"><strong>Edit this page</strong></a></li>{% endif %}
{% if cave_editable %}<li><a href="{% if local %}https://expo.survex.com{% endif %}{% url "edit_cave" cave.url_parent cave.slug %}" class="editlink"><strong>Edit this cave</strong></a></li>{% endif %} {% if cave_editable %}<li><a href="{% if local %}https://expo.survex.com{% endif %}{% url "edit_cave" cave.url_parent cave.slug %}" class="editlink"><strong>Edit this cave</strong></a></li>{% endif %}
<li> {% if settings.DEVSERVER %}<b style="color:red">RUNNING ON LOCALSERVER</b>{% endif %}
</ul> </ul>
</div> </div>
{% endif %} {% endif %}