summaryrefslogtreecommitdiffstats
path: root/templates
diff options
context:
space:
mode:
Diffstat (limited to 'templates')
-rw-r--r--templates/frontpage.html6
-rw-r--r--templates/qm.html2
-rw-r--r--templates/tasks.html11
-rw-r--r--templates/todo.html61
4 files changed, 5 insertions, 75 deletions
diff --git a/templates/frontpage.html b/templates/frontpage.html
index a11b6f7..5f0bf18 100644
--- a/templates/frontpage.html
+++ b/templates/frontpage.html
@@ -46,12 +46,12 @@ Here you will find information about the {{expedition.objects.count}} expedition
</p>
<p class="indent">
-If you are an expedition member, please sign up using the link to the top right.
+You are not logged-in, so not all the pages will be visible and you will not be able to edit anything.
</p>
{% 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">
+<img src="{{ settings.MEDIA_URL }}eieshole.jpg">
+<img src="{{ settings.MEDIA_URL }}goesser.jpg">
{% endblock margins %} \ No newline at end of file
diff --git a/templates/qm.html b/templates/qm.html
index f960197..007dadb 100644
--- a/templates/qm.html
+++ b/templates/qm.html
@@ -24,7 +24,7 @@
<h2>Related items</h2>
Parent cave: {{qm.found_by.cave|link}}
-(todo: add parent survey and parent subcave)
+(to do: add parent survey and parent subcave)
{% block content %}
<h3>Location</h3>
diff --git a/templates/tasks.html b/templates/tasks.html
index 36d35f4..97a924f 100644
--- a/templates/tasks.html
+++ b/templates/tasks.html
@@ -12,25 +12,16 @@
<li><a href="">Upload a photo</a></li>
<li><a href="">Record a new trip</a></li>
-<h3>Your unfinished business</h3>
+<h3>Unfinished wallets work to do:</h3>
{% for survey in surveys_unfinished %}
<li>{{survey|link}}</li>
{% endfor %}
-<h3>General unfinished business</h3>
-add wikilinks
-
<h3>Caving recommendations</h3>
{% for qm in qms_recommended %}
<li>{{qm|link}}</li>
{% endfor %}
-<h3>Profile tasks</h3>
-
-<li>Dates present on expo</li>
-<li>Mugshot</li>
-<li>Blurb</li>
-
{% endblock content %}
{% block margins %}
diff --git a/templates/todo.html b/templates/todo.html
deleted file mode 100644
index 7482b72..0000000
--- a/templates/todo.html
+++ /dev/null
@@ -1,61 +0,0 @@
-{% extends "base.html" %}
-{% load wiki_markup %}
-
-{% block title %}Cambridge Expeditions to Austria{% endblock %}
-
-{% block content %}
-
-<h2>The unfinished front page</h2>
-<ul>
- <li><b>About {{totallogbookentries}} logbook entries have been loaded</b></li>
- <li><b><a href="{% url "personindex" %}">List of People</a></b></li>
- <li><b><a href="{% url "caveindex" %}">List of Caves</a></b></li>
- <li><a href="{% url "jgtfile" aaaa %}">JGT list of files</a> (temporary simple file list and tunnel use)</li>
- <li><a href="{% url "survey" %}">Survey files</a></li>
- <li><a href="{% url "survexindex" all %}">Survex directory</a></li>
- <li><a href="{% url "expedition" 2008 %}">Expedition 2008</a></li>
- <li><a href="{% url "expedition" 2007 %}">Expedition 2007</a></li>
- <li><a href="{% url "expedition" 1993 %}">Expedition 1993</a> (earliest parsed)</li>
-</ul>
-
-<h2>Further work</h2>
-
-<p>Please see the <a href="http://code.google.com/p/troggle/issues/list">issues</a> tracker on google code. You can contribute new feature requests and bug reports.</p>
-
-<p>Julian's work:
-<p>parse 1992-1976 logbooks; (esp top 161)</p>
-<p>detect T/U on log entries; </p>
-<p>name matching and spelling in survex files; </p>
-<p>Improve logbook wikihtml text</p>
-
-<p>Other work:</p>
-<p>surf through the tunnel sketches and images</p>
-<p>bugs with all.svx block (double dot)
-<p>render bitmap view of every survex block as a thumbnail</p>
-<p>upload tunnel images and tunnel sketches</p>
-<p>where are the subcaves; </p>
-<p>cave section entrance match for logbook entries</p>
-<p>simplify the survex parsing code (if necessary); </p>
-<p>wiki survex stop linegap between comment lins</p>
-<p>links between logbooks and survex blocks to cave things; </p>
-<p>mini-tree of survexblocks; </p>
-<p>connect sketches to caves to survey blocks and render thumbnailwise; </p>
-<p>all images to start appearing in pages; and so on</p>
-
-<h3>{{message}}</h3>
-
-<form action="" method="GET">
- <input type="submit" name="reloadexpos" value="Reload Expos">
- <input type="submit" name="reloadsurvex" value="Reload Survex">
-</form>
-
-<ul id="expeditionlist">
-{% for expedition in expeditions %}
-<li>
- <a href="{% url "expedition" expedition.year %}">{{expedition.name}}</a>
- - <b>{{expedition.logbookentry_set.count}}</b> logbook entries
-</li>
-{% endfor %}
-</ul>
-
-{% endblock %}