[svn] cave maps to all logbook entry trips done there

Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8228 by julian @ 1/24/2009 11:59 PM

6 files changed, 55 insertions, 18 deletions

diff --git a/templates/cave.html b/templates/cave.html
index 24c0101..f8a511d 100644
--- a/templates/cave.html
+++ b/templates/cave.html
@@ -2,6 +2,19 @@
 {% load wiki_markup %}

 

 {% block content %}

+

+<div id="col2">

+  <h3>All trips done in this cave</h3>

+  <table>

+  {% for logbookentry in cave.logbookentry_set.all %}

+    <tr>

+      <td>{{logbookentry.date}}</td>

+      <td><a href="{% url logbookentry logbookentry.href %}">{{logbookentry.title|safe}}</a></td>

+    </tr>

+  {% endfor %}

+  </table>

+</div>

+

 {% if cave.entrances %}

     <h2>Entrances</h2>

     {% for ent in cave.entrances %}

diff --git a/templates/caveindex.html b/templates/caveindex.html
index d97aff8..b38e69f 100644
--- a/templates/caveindex.html
+++ b/templates/caveindex.html
@@ -4,7 +4,19 @@
 {% block title %}Cave Index{% endblock %}

 

 {% block content %}

+

+<h3>Notable caves</h3>

+<ul>

+{% for cave in notablecaves %}

+  <li> <a href="{% url cave cave.href %}">{{cave.official_name|wiki_to_html_short}} ({{cave.href}})</a> </li>

+{% endfor %}

+</ul>

+

+<h3>All caves</h3>

+<ul>

 {% for cave in caves %}

-<p>{{ cave }} <a href="{{settings.URL_ROOT}}cave/{{ cave.kataster_number }}/">{{ cave.official_name|wiki_to_html_short }}</a> </p>

+  <li> <a href="{% url cave cave.href %}">{{cave.official_name|wiki_to_html_short}} ({{cave.href}})</a> </li>

 {% endfor %}

+</ul>

+

 {% endblock %}
\ No newline at end of file
diff --git a/templates/expedition.html b/templates/expedition.html
index a7add92..e4f12f0 100644
--- a/templates/expedition.html
+++ b/templates/expedition.html
@@ -38,7 +38,12 @@
     <td>{{logbookentry.date}}</td>
     <td><a href="{% url logbookentry logbookentry.href %}">{{logbookentry.title|safe}}</td>
     <td><a href="{% url personexpedition logbookentry.author.person.href logbookentry.author.expedition.year %}">{{logbookentry.author.name}}</a></td>
-    <td>{{logbookentry.place}}</td>
+
+    {% if logbookentry.cave %}
+      <td><a href="{% url cave logbookentry.cave.href %}">{{logbookentry.place}}</a></td>
+    {% else %}
+      <td>{{logbookentry.place}}</td>
+    {% endif %}
   </tr>
 {% endfor %}
 </table>
diff --git a/templates/index.html b/templates/index.html
index f30c100..2dad17b 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -9,26 +9,25 @@
 <b>Work down through an expedition page link</b>

 <p class="indent"><b>Remaining work:</b> 

 

-<p>continue to build up the network; </p>

-<p>tables of trips per year per person;</p> 

+<p>(separate out the recent/notable people) vast front-page layout table of folks and caving trips and years; </p>

 <p>parse 1995-1976 logbooks; </p>

-<p>continue to correct the name matching and spelling; </p>

+<p>name matching and spelling in survex files; </p>

 <p>detect T/U on log entries; </p>

+<p>Improve logbook wikihtml text</p>

 <p>match caves to log entries; </p>

-<p>see the cave list;</p> 

 <p>simplify the survex parsing code (if necessary); </p>

-<p>vast front-page layout table of folks and caving trips and years; </p>

 <p>links between logbooks and survex blocks to cave things; </p>

 <p>where are the subcaves; </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>

+<p>tables of trips per year per person;</p> 

 

 <h3>{{message}}</h3>

 

 <ul>

-    <li><a href="{% url personindex %}">List of People</a></li>

-    <li><a href="{% url caveindex %}">List of Caves</a></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="/statistics">Statistics of what's loaded in the database</a></li>

     <li><a href="{% url survexindex all %}">Survex directory</a></li>

     <li><a href="{% url survey %}">Survey files</a></li>

@@ -40,13 +39,11 @@
 </form>

 

 <ul id="expeditionlist">

-

-    {% for expedition in expeditions %}

-        <li>

-            <a href="{% url expedition expedition.year %}">{{expedition.name}}</a>

-        </li>

-    {% endfor %}

-

+{% for expedition in expeditions %}

+<li>

+  <a href="{% url expedition expedition.year %}">{{expedition.name}}</a>

+</li>

+{% endfor %}

 </ul>

 

 {% endblock %}

diff --git a/templates/logbookentry.html b/templates/logbookentry.html
index f742edd..57c1c18 100644
--- a/templates/logbookentry.html
+++ b/templates/logbookentry.html
@@ -8,7 +8,12 @@
 

 <div id="col2">

 <p><a href="{% url expedition logbookentry.expedition.year %}">{{logbookentry.expedition.name}}</a></p>

-<p>place: {{logbookentry.place}}</p>

+

+{% if logbookentry.cave %}

+  <p>place: <a href="{% url cave logbookentry.cave.href %}">{{logbookentry.place}}</p>

+{% else %}

+  <p>{{logbookentry.place}}</p>

+{% endif %}

 

 <p>

   {% if logbookentry.logbookentry_prev %}

diff --git a/templates/personexpedition.html b/templates/personexpedition.html
index 792e20a..e1e481b 100644
--- a/templates/personexpedition.html
+++ b/templates/personexpedition.html
@@ -36,7 +36,12 @@
     {% for persontrip in persondate.1.persontrips %}

       <tr>

         <td class="trip"><a href="{% url logbookentry persontrip.logbook_entry.href %}">{{persontrip.logbook_entry.title|safe}}</a></td>

-        <td class="place">{{persontrip.place}}</td>

+

+        {% if persontrip.logbook_entry.cave %}

+          <td><a href="{% url cave persontrip.logbook_entry.cave.href %}">{{persontrip.place}}</a></td>

+        {% else %}

+          <td>{{persontrip.place}}</td>

+        {% endif %}

       </tr>

     {% endfor %}

     </table>