better display

1 files changed, 21 insertions, 15 deletions

diff --git a/templates/stations.html b/templates/stations.html
index c2b3eda..7011bd2 100644
--- a/templates/stations.html
+++ b/templates/stations.html
@@ -7,18 +7,25 @@
 
 <p>This next table is of all the survex stations in troggle: i.e. only those survey stations which have been identified with an Entrance by manually editing the Entrance data.
 <table cellpadding="6" cellspacing="8">
-<tr><th>Survex Station</th><th>x</th><th>y</th><th>lat.</th><th>long.</th><th>alt</th><th>SRTM alt</th><th>SRTM ref</th><th>Used on ent</th></tr>
+<tr><th>Survex Station</th><th>x</th><th>y</th><th>lat.</th><th>long.</th><th>alt</th><th>SRTM<br> alt</th><th>SRTM<br> ref</th><th>Used on ent</th><th>Cave</th></tr>
 {% for s in stations %}
 <tr>
-  <td style="text-align:left; width:240px"> {{s.name|safe}} </td>
-  <td style="text-align:right; width:90px"> {{s.x|floatformat:2}} </td>
-  <td style="text-align:right; width:90px"> {{s.y|floatformat:2}} </td>
-  <td style="text-align:right; width:90px"> <em>{{s.lat|floatformat:6}} </em></td>
-  <td style="text-align:right; width:90px"> <em>{{s.long|floatformat:6}} </em></td>
-  <td style="text-align:right; width:90px"> {{s.z|floatformat:0}} </td>
-  <td style="text-align:right; width:90px"> {{s.srtm_diff.0|safe}} </td>
-  <td style="text-align:right; width:90px"> {{s.srtm_diff.1|floatformat:0}}m <small>away</small></td>
+  <td style="text-align:left; "> {{s.name|safe}} </td>
+  <td style="text-align:right; width:10"> {{s.x|floatformat:2}} </td>
+  <td style="text-align:right; width:10"> {{s.y|floatformat:2}} </td>
+  <td style="text-align:right; width:10"> <em>{{s.lat|floatformat:6}} </em></td>
+  <td style="text-align:right; width:10"> <em>{{s.long|floatformat:6}} </em></td>
+  <td style="text-align:right; "> {{s.z|floatformat:0}} </td>
+  <td style="text-align:right; "> {{s.srtm_diff.0|safe}} </td>
+  <td style="text-align:right; "> {{s.srtm_diff.1|floatformat:0}}m <small></small></td>
   <td style="text-align:right;" > <a href="/cave/{{s.entrance.firstcave|safe}}">{{s.entrance|safe}}</a> </td>
+  <td style="text-align:right;" > <small>
+    {% if s.entrance.firstcave.official_name %}
+        {{s.entrance.firstcave.official_name|safe}}
+    {% else %}
+        <em>{{s.entrance.firstcave|safe}}</em>
+    {% endif %}</small>
+  </td>
 </tr>
 {% empty %}
   <td colspan="3"> NO STATION DATA - This is due to survex (cavern) failing on the entire dataset.
@@ -32,7 +39,7 @@
 {% endfor %}
 </table>
 
-<p>The SRTM altitude is that measured at a nearby reference point. The horizontal distance between the survey station and the SRTM reference point is shown in the "SRTM ref" column. It is always less than 35m for our dataset. Differences between teh recorded altitude and the SRTM altitude are in <b>bold</b> if the discrepancy is more than 60m.
+<p>The SRTM altitude is that measured at a nearby reference point. The horizontal distance between the survey station and the SRTM reference point is shown in the "SRTM ref" column. It is always less than 35m for our dataset. Differences between the recorded altitude and the SRTM altitude are in <b>bold</b> if the discrepancy is more than 60m vertically.
 
 <p>
 Coordinate systems in Austria are explained in:<br>
@@ -49,14 +56,12 @@ Otherwise whatever other name we can find for it is shown <em>in italics</em>.
 th, td {
   padding-left: 5px;
   padding-right: 5px;
+}
 </style>
 
-<p>
-
-
 <table>
 <tr><th>Cave</th><th>Ent slug</th>
-<th>tag</th><th>tag x</th><th>tag y</th><<th>tag other</th><th>other x</th><th>other y</th></tr>
+<th>tag</th><th>tag x</th><th>tag y</th><th>tag other</th><th>other x</th><th>other y</th></tr>
 {% for ent in ents %}
 <tr>
   <td style="text-align:left">
@@ -116,7 +121,8 @@ th, td {
 the assemblage of survex files, including fixed point files, and is probably 'correct'. 
 <p>But which coordinate system are they in ? Read these three articles to find out:
 <br>
-<a href="/eastings">Troggle UTM data report</a><br>
+<a href="/stations">Troggle UTM and lat./lomg. and altitude report</a><br>
+<a href="/entrances">Troggle entrances</a><br>
 <a href="/handbook/survey/lasers.htm">Geographical fixed points on Loser</a><br>
 <a href="/handbook/survey/coord2.html">GPS and coordinate systems</a><br>
 <a href="/handbook/survey/coord.htm">Basic Coordinate Systems</a>.