diff options
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/base.html | 5 | ||||
| -rw-r--r-- | templates/index.html | 2 | ||||
| -rw-r--r-- | templates/person.html | 26 | ||||
| -rw-r--r-- | templates/personexpedition.html | 1 | ||||
| -rw-r--r-- | templates/personindex.html | 35 |
5 files changed, 25 insertions, 44 deletions
diff --git a/templates/base.html b/templates/base.html index 36ae852..5357af1 100644 --- a/templates/base.html +++ b/templates/base.html @@ -15,10 +15,7 @@ <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">
- <h1>CUCC Expeditions to Austria: 1976 - </h1>
- <div id="expoFinalDate" style="display:inline;" >
- <h1>1976</h1>
- </div>
+ <h1>CUCC Expeditions to Austria: 1976 - 2008</h1>
</div>
</div>
<hr/>
diff --git a/templates/index.html b/templates/index.html index bc0bfa9..cafc8a8 100644 --- a/templates/index.html +++ b/templates/index.html @@ -27,8 +27,8 @@ <h3>{{message}}</h3>
<ul>
- <li><a href="{% url caveindex %}">List of Caves</a></li>
<li><a href="{% url personindex %}">List of People</a></li>
+ <li><a href="{% url caveindex %}">List of Caves</a></li>
<li><a href="/statistics">Statistics of what's loaded in the database</a></li>
<li><a href="{% url survexindex survex_file=all %}">Survex directory</a></li>
<li><a href="{% url survey %}">Survey files</a></li>
diff --git a/templates/person.html b/templates/person.html index 04eae1b..140aa8d 100644 --- a/templates/person.html +++ b/templates/person.html @@ -4,25 +4,13 @@ {% block title %}Person {{person|wiki_to_html_short}}{% endblock %}
{% block content %}
-<div class="personblock"><a href="{% url person person.href%}">{{person|wiki_to_html_short}}</a>
-<ul>
+
+<p>{{person|wiki_to_html_short}} has been on expo in the following years:</p>
+<p>
{% for personexpedition in person.personexpedition_set.all %}
- <li>
- <table><tr><td>
- {{personexpedition.expedition}}
- </td><td>
- <div>
- <ul>
- {% for persontrip in personexpedition.persontrip_set.all %}
- <li><a href="{% url logbookentry persontrip.logbook_entry.id %}">{{persontrip.date}}</a> {{persontrip.logbookentry}}
- ({{persontrip.logbookentry.place|wiki_to_html_short}}) -
- {{persontrip.logbookentry.title|wiki_to_html_short}}</li>
- {% endfor %}
- <ul>
- </div>
- </td></tr></table>
- </li>
+ | <a href="{% url personexpedition personexpedition.person.href personexpedition.expedition.year %}">{{personexpedition.expedition.year}}</a>
{% endfor %}
-</ul>
-</div>
+</p>
+
+
{% endblock %}
diff --git a/templates/personexpedition.html b/templates/personexpedition.html index 07dcb54..792e20a 100644 --- a/templates/personexpedition.html +++ b/templates/personexpedition.html @@ -10,6 +10,7 @@ <h3>{{message}}</h3>
<p><b><a href="{% url expedition personexpedition.expedition.year %}">Main page for expedition: {{personexpedition.expedition}}</a></b></p>
+<p><b><a href="{% url person personexpedition.person.href %}">Main page for person: {{personexpedition.person}}</a></b></p>
<p>List of other expos by this person</p>
<p>
diff --git a/templates/personindex.html b/templates/personindex.html index ca8b9b5..c328628 100644 --- a/templates/personindex.html +++ b/templates/personindex.html @@ -5,28 +5,23 @@ {% block content %}
+<table>
+<tr>
+{% for persons in personss %}
+<td>
+<table>
+<tr><th>Person</th><th>First</th><th>Last</th></tr>
{% for person in persons %}
-<div class="personblock"><a href="{% url person person.href%}">{{person|wiki_to_html_short}}</a>
-<ul>
-{% for personexpedition in person.personexpedition_set.all %}
- <li>
-
- <table><tr><td>
- {{personexpedition.expedition}}
- </td><td>
-
- <div>
- {% for persontrip in personexpedition.persontrip_set.all %}
- <a href="{% url logbookentry persontrip.logbook_entry.id %}">{{persontrip.date}}</a>
- {% endfor %}
- </div>
-
- </td></tr></table>
-
- </li>
+<tr>
+ <td><a href="{% url person person.href%}">{{person|wiki_to_html_short}}</a></td>
+ <td><a href="{% url personexpedition person.href person.Firstexpedition.expedition.year %}">{{person.Firstexpedition.expedition.year}}</a></td>
+ <td><a href="{% url personexpedition person.href person.Lastexpedition.expedition.year %}">{{person.Lastexpedition.expedition.year}}</a></td>
+</tr>
{% endfor %}
-</ul>
-</div>
+</table>
+</td>
{% endfor %}
+</tr>
+</table>
{% endblock %}
|