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

This commit is contained in:
Martin Green 2023-07-05 17:45:21 +01:00
commit 2b30b7b624
3 changed files with 19 additions and 3 deletions

View File

@ -385,7 +385,13 @@ div#editLinks a{
text-align:center;
font-weight:bold;
}
.toolbarlinkslocal
{
padding:5px;
background-color:#f9f;
text-align:center;
font-weight:bold;
}
.footer {
Dposition:fixed;
visibility:none;
@ -664,4 +670,4 @@ a.deletelink:link, a.deletelink:visited {
a.deletelink:hover {
color: #993333;
}
}

View File

@ -1,3 +1,4 @@
import sys
"""
Django settings for troggle project.
@ -17,7 +18,12 @@ https://docs.djangoproject.com/en/dev/ref/settings/
print("* importing troggle/settings.py")
if 'runserver' in sys.argv:
print(">>>>running on dev local runserver<<<<")
DEVSERVER = True
else:
DEVSERVER = False
# default value, then gets overwritten by real secrets
SECRET_KEY = "not-the-real-secret-key-a#vaeozn0---^fj!355qki*vj2"

View File

@ -25,7 +25,11 @@
</div>
</div>
{% if settings.DEVSERVER %}
<div class="toolbarlinkslocal">
{% else %}
<div class="toolbarlinks">
{% endif %}
<a href="/survexfile/caves-1623/264/264.svx">264</a> |
<a href="/survexfile/caves-1623/290/290.svx">290</a> |
<a href="/survexfile/caves-1626/359/359.svx">359</a> |