diff options
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/person.html | 19 | ||||
| -rw-r--r-- | templates/personexpedition.html | 2 | ||||
| -rw-r--r-- | templates/personindex.html | 2 | ||||
| -rw-r--r-- | templates/svxcavesingle.html | 7 |
4 files changed, 16 insertions, 14 deletions
diff --git a/templates/person.html b/templates/person.html index 64896a7..d9d8cb8 100644 --- a/templates/person.html +++ b/templates/person.html @@ -9,21 +9,14 @@ {% endblock %} {% block content %} -{% if person.blurb %} -{{person.blurb|safe}} -{% endif %} -{% for pic in person.photo_set.all %} -{% if pic.is_mugshot %} + +{% if person.mug_shot %} <div class="figure"> - <p> <img src="{{ pic.thumbnail_image.url }}" class="thumbnail" /> - <p> {{ pic.caption }}</p> - <p> <a href="{{ pic.get_admin_url }}">edit {{pic}}</a> </> - </p> + <p> <img src="{{ person.mug_shot }}" class="thumbnail" /> </p> </div> {% endif %} -{% endfor %} <br class="clearfloat" /> <h3>{{person|wiki_to_html_short}} has been on expo in the following years:</h3> @@ -38,5 +31,11 @@ </ul> </p> +{% if person.blurb %} +{{person.blurb|safe}} +{% else %} +To add a blurb file for a person, create /folk/l/<id>.html and register it in /folk/folk.csv . +Documented in <a href="/handbook/computing/folkupdate.html">/handbook/computing/folkupdate.html</a> +{% endif %} {% endblock %} diff --git a/templates/personexpedition.html b/templates/personexpedition.html index e04952e..48e94ac 100644 --- a/templates/personexpedition.html +++ b/templates/personexpedition.html @@ -64,7 +64,7 @@ it duplicates the entry but gets it wrong. The length from the first block is di - The template is in <var>troggle/templates/personexpedition.html</var> <br> - The code is in function <var>personexpedition()</var> which calls -<var>GetPersonChronology()</var> in <var>troggle/core/views/logbooks.py</var> +<var>get_person_chronology()</var> in <var>troggle/core/views/logbooks.py</var> <br> - the connection between the two is made in the URL resolver in <var>troggle/urls.py</var> <p>To be fixed! diff --git a/templates/personindex.html b/templates/personindex.html index 10ac7f6..5338bd7 100644 --- a/templates/personindex.html +++ b/templates/personindex.html @@ -22,7 +22,7 @@ <h2>All expoers</h2> <table class="searchable"> <tr> -{% for persons in personss %} +{% for persons in pcols %} <td> <table> diff --git a/templates/svxcavesingle.html b/templates/svxcavesingle.html index cefe961..a53889f 100644 --- a/templates/svxcavesingle.html +++ b/templates/svxcavesingle.html @@ -5,7 +5,7 @@ {% block content %} {% autoescape off %} -<h1>Surveys for <a href="/{{cave.url}}">{{cave.official_name}}</a> - identifier:{{cave}}</h1> +<h1>Surveys for <a href="/{{cave.url}}">{{cave.official_name}}</a> - id:{{cave}}</h1> {% endautoescape %} <!-- the only thing passed into this template is the object identifier for a cave. All the processing to extract the survex subdriectories and survex files is done in this template --> @@ -17,7 +17,10 @@ All the processing to extract the survex subdriectories and survex files is done <a href="#T_{{survexdirectory.primarysurvexfile.path}}">{{survexdirectory.path}}</a> {% empty %} <p>If you were expecting to see a list of survex files here and a summary table of who did what and when, perhaps - because you followed a link from <a href="/survexfile/caves/">the master caves' survex list</a> page which showed that such survex files clearly existed, and yet there is nothing here but a blank; then this will be because the survex (.svx) files have been stored on the server in the + because you followed a link from <a href="/survexfile/caves/">the master caves' survex list</a> page which showed that such survex files clearly existed, and yet there is nothing here but a blank; then this will be because <br> + [a] - this cave has no survex survey files at all, or <br> + [b] - you have run a 'caves' parsing import after running a 'survex' import and the survex data has been blanked out, or <br> + [c] - the survex (.svx) files have been stored on the server in the <a href="/handbook/computing/repos.html"><var>:loser:</var></a> repository but whoever was responsible has not yet created the appropriate entries in the XML file in the |