diff options
| author | substantialnoninfringinguser <substantialnoninfringinguser@gmail.com> | 2009-05-13 05:39:52 +0100 |
|---|---|---|
| committer | substantialnoninfringinguser <substantialnoninfringinguser@gmail.com> | 2009-05-13 05:39:52 +0100 |
| commit | 0ba4dd4ef47eeeb8ef38b4c30b6d39649c56342a (patch) | |
| tree | 7a806015bda042e5d13d55e6d52a37924fb4e11e /templates | |
| parent | 39ab4d25147a8e115fc4f6f05c8246dbe51c3ca0 (diff) | |
| download | troggle-0ba4dd4ef47eeeb8ef38b4c30b6d39649c56342a.tar.gz troggle-0ba4dd4ef47eeeb8ef38b4c30b6d39649c56342a.tar.bz2 troggle-0ba4dd4ef47eeeb8ef38b4c30b6d39649c56342a.zip | |
[svn] survey block object
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8199 by julian @ 1/19/2009 12:22 AM
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/base.html | 3 | ||||
| -rw-r--r-- | templates/expedition.html | 4 | ||||
| -rw-r--r-- | templates/index.html | 12 | ||||
| -rw-r--r-- | templates/logbookentry.html | 3 | ||||
| -rw-r--r-- | templates/personexpedition.html | 10 | ||||
| -rw-r--r-- | templates/survexblock.html | 47 |
6 files changed, 71 insertions, 8 deletions
diff --git a/templates/base.html b/templates/base.html index d189ae6..bca30f0 100644 --- a/templates/base.html +++ b/templates/base.html @@ -9,7 +9,9 @@ <script src="{{ settings.MEDIA_URL }}js/base.js" type="text/javascript"></script>
{% block javascript %}{% endblock %}
</head>
+
<body>
+<a href="/">
<div style="float:none">
<div id="expoHeader" style="background:#222"> <img src="{{ settings.MEDIA_URL }}loserBanner.jpg" style="position:relative;width:inherit;height:inherit;"/>
<div id="expoHeaderText">
@@ -26,6 +28,7 @@ {% endblock %}
</div>
</div>
+</a>
<div id="nav" style="float:left; top:200; background:#999; width:200; height:100%"> {% block nav %}
{% endblock %} </div>
diff --git a/templates/expedition.html b/templates/expedition.html index bcbed62..a7add92 100644 --- a/templates/expedition.html +++ b/templates/expedition.html @@ -18,7 +18,7 @@ <tr><th>Caver</th><th>From</th><th>To</th></tr> {% for personexpedition in expedition.personexpedition_set.all %} <tr> - <td><a href="{% url personexpedition personexpedition.person.href personexpedition.expedition.year%}">{{personexpedition.person}}</a></td> + <td><a href="{% url personexpedition personexpedition.person.href personexpedition.expedition.year %}">{{personexpedition.person}}</a></td> <td>{{personexpedition.date_from}}</td> <td>{{personexpedition.date_to}}</td> </tr> @@ -37,7 +37,7 @@ <tr> <td>{{logbookentry.date}}</td> <td><a href="{% url logbookentry logbookentry.href %}">{{logbookentry.title|safe}}</td> - <td><a href="{% url person logbookentry.author.person.href%}">{{logbookentry.author.name}}</a></td> + <td><a href="{% url personexpedition logbookentry.author.person.href logbookentry.author.expedition.year %}">{{logbookentry.author.name}}</a></td> <td>{{logbookentry.place}}</td> </tr> {% endfor %} diff --git a/templates/index.html b/templates/index.html index 667fa28..0122bdd 100644 --- a/templates/index.html +++ b/templates/index.html @@ -6,7 +6,12 @@ {% block content %}
<h2>The unfinished front page</h2>
-<p>Some handy links into the less incomplete parts of this webpage</p>
+<b>Work down through an expedition page link</b>
+<p class="indent">Remaining work: continue to build up the network; tables of trips per year per person; parse 1996 logbook;
+continue to correct the name matching and spelling; detect T/U on log entries; match caves to log entries; see the cave list;
+simplify the survex parsing code (if necessary); vast front-page layout table of folks and caving trips and years;
+links between logbooks and survex blocks to cave things; where are the subcaves; mini-tree of survexblocks; connect sketches
+to caves to survey blocks and render thumbnailwise; all images to start appearing in pages; and so on</p>
<h3>{{message}}</h3>
@@ -15,7 +20,10 @@ <li><a href="/statistics">Statistics of what's loaded in the database</a></li>
</ul>
-<form action="" method="GET"><input type="submit" name="reload" value="Reload"></form>
+<form action="" method="GET">
+ <input type="submit" name="reloadexpos" value="Reload Expos">
+ <input type="submit" name="reloadsurvex" value="Reload Survex">
+</form>
<ul id="expeditionlist">
<li>
diff --git a/templates/logbookentry.html b/templates/logbookentry.html index 6ed9b32..f742edd 100644 --- a/templates/logbookentry.html +++ b/templates/logbookentry.html @@ -25,11 +25,10 @@ <tr>
{% ifequal persontrip.person_expedition logbookentry.author %}
<td class="author">
-{{persontrip.person_expedition.person.personrole_set.count}}
{% else %}
<td>
{% endifequal %}
- <a href="{% url person persontrip.person_expedition.person.href %}">{{persontrip.person_expedition.person}}</a>
+ <a href="{% url personexpedition persontrip.person_expedition.person.href persontrip.person_expedition.expedition.year %}">{{persontrip.person_expedition.person}}</a>
</td>
<td>
diff --git a/templates/personexpedition.html b/templates/personexpedition.html index 91c618a..bbbc067 100644 --- a/templates/personexpedition.html +++ b/templates/personexpedition.html @@ -7,13 +7,19 @@ {% block content %}
<h2>{{personexpedition.person}}: {{personexpedition.expedition}} ({{personexpedition.date_from}} - {{personexpedition.date_to}})</h2>
+<h3>{{message}}</h3>
+
+<p>Needs links fore and back through expeditions attended by this person (or as a complete barchart type list with one date in bold)</p>
+<p>Needs lists below to be sorted by date, and the duplicates removed from survey role list</p>
+<p>Finally, a correspondence between these two columns</p>
+
<div id="col2">
<table class="survexcontibutions">
<tr><th>Date</th><th>Place</th><th>Role</th></tr>
{% for personrole in personexpedition.personrole_set.all %}
<tr>
- <td>{{personrole.survex_block.start_month}}</td>
- <td>{{personrole.survex_block.name}}</td>
+ <td>{{personrole.survex_block.date}}</td>
+ <td><a href="{% url survexblock personrole.survex_block.survexpath %}">{{personrole.survex_block.survexpath}}</a></td>
<td>{{personrole.role}}</td>
</tr>
{% endfor %}
diff --git a/templates/survexblock.html b/templates/survexblock.html new file mode 100644 index 0000000..ef392df --- /dev/null +++ b/templates/survexblock.html @@ -0,0 +1,47 @@ +{% extends "base.html" %}
+{% load wiki_markup %}
+{% load survex_markup %}
+
+
+{% block title %}Survex Block{% endblock %}
+
+{% block content %}
+<h2>Survex Block {{survexblock.survexpath}}</h2>
+
+<p>Needs duplicates removed from right hand column</p>
+<p>Needs links to survex file presentation</p>
+<p>Needs to start dealing with misspellings of names (prob by editing the originals)</p>
+
+<div id="col2">
+
+{% if survexblock.parent %}
+ <p>Survey block above:</p>
+ <p class="indent"><a href="{% url survexblock survexblock.parent.survexpath %}">{{survexblock.parent.survexpath}}</a></p>
+{% endif %}
+
+{% if survexblock.survexblock_set.all %}
+ <p>Survey blocks below:</p>
+{% for survexblockdown in survexblock.survexblock_set.all %}
+ <p class="indent"><a href="{% url survexblock survexblockdown.survexpath %}">{{survexblockdown.survexpath}}</a></p>
+{% endfor %}
+{% endif %}
+
+<p>Date: {{survexblock.date}}</p>
+
+<table>
+{% for personrole in survexblock.personrole_set.all %}
+<tr>
+ <td><a href="{% url personexpedition personrole.personexpedition.person.href personrole.personexpedition.expedition.year%}">{{personrole.personexpedition.person}}</a></td>
+ <td>{{personrole.role}}</td>
+</tr>
+{% endfor %}
+</table>
+
+
+</div>
+
+<div id="col1">
+{{ftext|survex_to_html}}
+</div>
+
+{% endblock %}
|