diff options
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/onthisdate.html | 11 | ||||
| -rw-r--r-- | templates/svxfile.html | 7 | ||||
| -rw-r--r-- | templates/walletform.html | 24 |
3 files changed, 20 insertions, 22 deletions
diff --git a/templates/onthisdate.html b/templates/onthisdate.html index dd75144..e2f44d1 100644 --- a/templates/onthisdate.html +++ b/templates/onthisdate.html @@ -3,7 +3,7 @@ {% if svxothers %}<u>Survex files</u> on this date:<br>
<span style="font-size: 70%; ">
{% for item in svxothers %}
- {% if item.isSurvexBlock %} <a href="/survexfile/{{item.survexfile.path}}">{{item.survexfile.path|safe}}</a><br/>{% endif %}
+ <a href="/survexfile/{{item.path}}">{{item.path|safe}}</a><br/>
{% empty %}
<em>None found for this date.</em><br>
{% endfor %}
@@ -16,11 +16,8 @@ {% for item in wallets %}
<a href="/survey_scans/{{item.walletname|urlencode}}/">{{item.walletname|safe}}</a>
{% if item.name %}
- {{item.name|safe}} <br/>
- {% else %}
- {{item.get_fnames|safe}}
- <br/>
- {% endif %}
+ {{item.name|safe}}
+ {% endif %}{{item.get_fnames|truncatechars:80}}<br/>
{% empty %}
<em>None found for this date.</em><br>
{% endfor %}
@@ -28,7 +25,7 @@ {% else %}
<em>No wallets files found for this date.</em><br>
{% endif %}
- {% if trips %}<u>All logbook trips</u> on this date:<br>
+ {% if trips %}<u>Logbook trips</u> on this date:<br>
<span style="font-size: 70%; ">
{% for item in trips %}
{% if item.isLogbookEntry %} <a href="{{item.get_absolute_url}}">{{item.title|safe}}</a><br/>{% endif %}
diff --git a/templates/svxfile.html b/templates/svxfile.html index 5d493f8..e37c48f 100644 --- a/templates/svxfile.html +++ b/templates/svxfile.html @@ -83,16 +83,15 @@ LOGMESSAGES <span style="font-family: monospace; font-size: 130%; "> {% for sb in svxblocks %} {% empty %} -Cannot find any survex blocks in this survex file (not looking at *include files). <br /> +Cannot find any <em>dated</em> survex blocks in this survex file (not looking at *include files). <br /> Report this to a nerd if you think this is incorrect. <hr /> {% endfor %} {% for key, value in events.items %} <details {% if forloop.first %} open{% endif %}> -<summary><b><a href="/expedition/{{key|date:"Y"}}">{{key|date:"Y"}}</a>{{key|date:"-m-d"}}</b> </summary> -<br /> -{% with trips=value.0 svxfiles=value.1 wallets=value.2 %} +<summary><b><a href="/expedition/{{key|date:"Y"}}">{{key|date:"Y"}}</a>{{key|date:"-m-d"}}</b> {{value.3}}</summary> +{% with trips=value.0 svxothers=value.1 wallets=value.2 %} {% include 'onthisdate.html' %} {% endwith %} </details> diff --git a/templates/walletform.html b/templates/walletform.html index c35fa03..801b5a2 100644 --- a/templates/walletform.html +++ b/templates/walletform.html @@ -228,6 +228,7 @@ </button>{% endif %} </form> </div> + <span style="font-family: monospace; font-size: 150%; "> {% if trips %}<u>Logbook trips</u> on this date:<br> @@ -241,17 +242,18 @@ {% else %} <em>No Logbook trips found for this date.</em><br> {% endif %} - {% if svxothers %}<u>Other survex files</u> on this date:<br> - <span style="font-size: 70%; "> - {% for item in svxothers %} - {% if item.isSurvexBlock %} <a href="/survexfile/{{item.survexfile.path}}">{{item.survexfile.path|safe}}</a><br/>{% endif %} - {% empty %} - <em>None found for this date, but there should be..</em><br> - {% endfor %} - </span> - {% else %} - <em>No other survex files found for this date.</em><br> - {% endif %} + + {% if svxothers %}<u>Survex files</u> on this date:<br> + <span style="font-size: 70%; "> + {% for item in svxothers %} + <a href="/survexfile/{{item.path}}">{{item.path|safe}}</a><br/> + {% empty %} + <em>None found for this date.</em><br> + {% endfor %} + </span> + {% else %} + <em>No survex files found for this date.</em><br> + {% endif %} {% if metadataurl %}<span style="font-size: 70%; "><details><summary> JSON <br> |