diff options
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/base.html | 25 | ||||
| -rw-r--r-- | templates/tasks.html | 49 |
2 files changed, 49 insertions, 25 deletions
diff --git a/templates/base.html b/templates/base.html index 7e2d1d3..2afab1f 100644 --- a/templates/base.html +++ b/templates/base.html @@ -4,22 +4,23 @@ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> <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="stylesheet" type="text/css" href="{{ settings.MEDIA_URL }}css/dropdownNavStyle.css" /> +<!-- Only used on old troggle menu removed in 2020 +<link rel="stylesheet" type="text/css" href="{{ settings.MEDIA_URL }}css/dropdownNavStyle.css" />--> <title>{% block title %}Troggle{% endblock %}</title> <!-- <script src="{{ settings.JSLIB_URL }}jquery/jquery.min.js" type="text/javascript"></script> --> {% block head %}{% endblock %} </head> -<body onLoad="contentHeight();"> +<body> <div id="header"> <h1>CUCC Expeditions to Austria: 1976 - 2021</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>) - {% endif %}. + <a href="/">Home</a> | + <a id="cuccLink" href="http://camcaving.uk/">CUCC</a> | + <a id="expoWebsiteLink" href="http://expo.survex.com">expo.survex</a> | + {% if user.username %}User:{{ user.username }} + {% if user.person %}(<a href="{{ user.person.get_absolute_url }}">{{ user.person }}</a>){% endif %} | <a <a href='/accounts/logout/'>Log out</a> {% else %} <a href='/accounts/login/'>Log in</a> {% endif %} {% endblock%} {% block editLink %} @@ -38,14 +39,14 @@ <a href="{% url "expedition" 2018 %}">Expo2018</a> | <a href="{% url "expedition" 2019 %}">Expo2019</a> | <br> - <a id="cuccLink" href="https://camcaving.uk">cucc server</a> | - <a id="expoWebsiteLink" href="http://expo.survex.com">expo server</a> | - <a href="{% url "frontpage" %}">tasks to do </a> | + <a href="/handbook/computing/onlinesystems.html">handbook</a> | + <a href="/handbook/computing/todo-data.html">tasks to do </a> | <a id="cavesLink" href="{% url "caveindex" %}">caves</a> | - <a id="caversLink" href="{% url "personindex" %}">people</a> | + <a id="folklink" href="/folk">expoers</a> | + <a id="caversLink" href="{% url "personindex" %}">survey lengths</a> | <a href="{% url "stats" %}">expo statistics</a> | - <a href="{% url "controlpanel" %}">import/export data</a> + <a href="{% url "controlpanel" %}">import/export</a> | <a href="/admin/">Django admin</a> </div> diff --git a/templates/tasks.html b/templates/tasks.html index f092493..3029ac4 100644 --- a/templates/tasks.html +++ b/templates/tasks.html @@ -5,7 +5,8 @@ {% block title %}Cambridge Expeditions to Austria{% endblock %} {% block related %} - <h2>Recent Actions - admin user</h5> +<!-- + <h2>Recent Actions - expoadmin</h5> {% load log %} {% get_admin_log 10 as admin_log for_user 1 %} {% if not admin_log %} @@ -29,21 +30,30 @@ {% endfor %} </ul> {% endif %} - {% endblock %} - + --> + {% endblock %} + {% block content %} -<h2>This is not fully working currently</h2> -<h2>The code behind this page is under repair</h2> +<style> +ul {list-style: disc} +</style> +<h2>You are now logged in</h2> +<p>Now you can: +<ul> +<li>Use 'Edit This Page' to fix errors in the online handbook webpages +<li>Edit the data on an existing cave description +<li>Create a new cave description for a new cave, including all cave discovery data +<li>Edit the data on an existing entrance description +<li>Create a new cave description for a new cave, including all entrance discovery data +<li>Edit any archived survex file online +<li>Upload or type in new survex data for a new trip (see below) +</ul> +<p>See the logged-in status indicator in the top-right of the page, in gray in the banner picture. <!--<h2>Expo member tasks</h2>--> -<h3>Expo member tasks</h3> -<h3>Add new data</h3> +<h3></h3> -<li><a href="">Upload a photo</a></li> -<li><a href="">Upload a GPS track</a></li> -<li><a href="">Upload a Tunnel or Therion drawing</a></li> -<li><a href="/survexfile/caves-1623/999/999.svx">Upload or type in a Survex file</a></li> <h3>Unfinished wallets work to do:</h3> <a href="/expofiles/surveyscans/2016/walletindex.html">2016 wallets</a><br> @@ -51,18 +61,31 @@ <a href="/expofiles/surveyscans/2018/walletindex.html">2018 wallets</a><br> <a href="/expofiles/surveyscans/2019/walletindex.html">2019 wallets</a><br> +<h3>Upload new data</h3> +<ul> + +<li><a style="color:grey"href=""><font style="color:grey">Upload a photo</font></a></li> +<li><a style="color:grey" href="">Upload a GPS track</a></li> +<li><a style="color:grey"href="">Upload a Tunnel or Therion drawing</a></li> + +<li><a href="/survexfile/caves-1623/999/999.svx">Upload or type in a Survex file</a> - overwrite the area/number data in the browser title bar after the page loads, from 'caves-1623/999/999.svx' to whatever you need for your cave. +</ul> +<p> +<h3>Unfinished surveys</h3> {% for survey in surveys_unfinished %} <li>{{survey|link}}</li> + {% empty %} + [none found in database[surveys_unfinished]] {% endfor %} <h3>Caving QM recommendations</h3> {% for qm in qms_recommended %} <li>{{qm|link}}</li> + {% empty %} + [none found in database[qms_recommended]] {% endfor %} {% endblock content %} {% block margins %} -<img class="leftMargin eyeCandy fadeIn" src="{{ settings.MEDIA_URL }}eieshole.jpg"> -<img class="rightMargin eyeCandy fadeIn" src="{{ settings.MEDIA_URL }}goesser.jpg"> {% endblock margins %} |