summaryrefslogtreecommitdiffstats
path: root/templates
diff options
context:
space:
mode:
Diffstat (limited to 'templates')
-rw-r--r--templates/logbookentry.html42
-rw-r--r--templates/onthisdate.html42
-rw-r--r--templates/svxfile.html15
-rw-r--r--templates/wallet_table.html2
-rw-r--r--templates/walletform.html2
5 files changed, 58 insertions, 45 deletions
diff --git a/templates/logbookentry.html b/templates/logbookentry.html
index 6fff583..2fdfb41 100644
--- a/templates/logbookentry.html
+++ b/templates/logbookentry.html
@@ -71,46 +71,6 @@
</div>
<span style="font-family: monospace; font-size: 150%; ">
-
- {% if svxothers %}<u>Survex files</u> on this date:<br>
- <span style="font-size: 70%; ">
- {% for item in svxothers %}
- {% if item.isSurvexBlock %}&nbsp;&nbsp;&nbsp;&nbsp;<a href="/survexfile/{{item.survexfile.path}}">{{item.survexfile.path|safe}}</a><br/>{% endif %}
- {% empty %}
- <em>None found for this date.</em><br>
- {% endfor %}
- </span>
- {% else %}
- <em>No survex files found for this date.</em><br>
- {% endif %}
- {% if wallets %}<u>Wallets</u> on this date:<br>
- <span style="font-size: 70%; ">
- {% for item in wallets %}
- &nbsp;&nbsp;&nbsp;&nbsp;<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 %}
- {% empty %}
- <em>None found for this date.</em><br>
- {% endfor %}
- </span>
- {% else %}
- <em>No wallets files found for this date.</em><br>
- {% endif %}
- {% if trips %}<u>All logbook trips</u> on this date:<br>
- <span style="font-size: 70%; ">
- {% for item in trips %}
- {% if item.isLogbookEntry %}&nbsp;&nbsp;&nbsp;&nbsp;<a href="{{item.get_absolute_url}}">{{item.title|safe}}</a><br/>{% endif %}
- {% empty %}
- <em>None found for this date, but there should be..</em><br>
- {% endfor %}
- </span>
- {% else %}
- <em>Hmm...</em><br>
- {% endif %}
-
+ {% include 'onthisdate.html' %}
</span>
{% endblock %}
diff --git a/templates/onthisdate.html b/templates/onthisdate.html
new file mode 100644
index 0000000..dd75144
--- /dev/null
+++ b/templates/onthisdate.html
@@ -0,0 +1,42 @@
+<!-- this is an INCLUDED template onthisdate.html-->
+
+ {% if svxothers %}<u>Survex files</u> on this date:<br>
+ <span style="font-size: 70%; ">
+ {% for item in svxothers %}
+ {% if item.isSurvexBlock %}&nbsp;&nbsp;&nbsp;&nbsp;<a href="/survexfile/{{item.survexfile.path}}">{{item.survexfile.path|safe}}</a><br/>{% endif %}
+ {% empty %}
+ <em>None found for this date.</em><br>
+ {% endfor %}
+ </span>
+ {% else %}
+ <em>No survex files found for this date.</em><br>
+ {% endif %}
+ {% if wallets %}<u>Wallets</u> on this date:<br>
+ <span style="font-size: 70%; ">
+ {% for item in wallets %}
+ &nbsp;&nbsp;&nbsp;&nbsp;<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 %}
+ {% empty %}
+ <em>None found for this date.</em><br>
+ {% endfor %}
+ </span>
+ {% else %}
+ <em>No wallets files found for this date.</em><br>
+ {% endif %}
+ {% if trips %}<u>All logbook trips</u> on this date:<br>
+ <span style="font-size: 70%; ">
+ {% for item in trips %}
+ {% if item.isLogbookEntry %}&nbsp;&nbsp;&nbsp;&nbsp;<a href="{{item.get_absolute_url}}">{{item.title|safe}}</a><br/>{% endif %}
+ {% empty %}
+ <em>None found for this date, but there should be..</em><br>
+ {% endfor %}
+ </span>
+ {% else %}
+ <em>Hmm...</em><br>
+ {% endif %}
+ \ No newline at end of file
diff --git a/templates/svxfile.html b/templates/svxfile.html
index 3417859..45e0127 100644
--- a/templates/svxfile.html
+++ b/templates/svxfile.html
@@ -80,6 +80,17 @@ LOGMESSAGES
-->
{% endif %}
</div>
-
-
+<span style="font-family: monospace; font-size: 130%; ">
+{% for sb in svxblocks %}
+<details {% if forloop.first %} open{% endif %}><summary><b>{{sb.date|date:"Y-m-d"}}</b> {{sb.title}} '{{sb.name}}'</summary>
+List of Logbook entries, wallets and other survex files on {{sb.date|date:"Y-m-d"}}.
+<br />
+[Work in progress, Feb. 2023...]<br />
+ {% include 'onthisdate.html' %}
+</details>
+{% empty %}
+Cannot find any survex blocks in this survex file. <br />
+Report this to a nerd if you think this is incorrect.
+{% endfor %}
+</span>
{% endblock %}
diff --git a/templates/wallet_table.html b/templates/wallet_table.html
index d5aead8..4e1c81b 100644
--- a/templates/wallet_table.html
+++ b/templates/wallet_table.html
@@ -1,4 +1,4 @@
-
+<!-- this is an INCLUDED template wallet_table.html-->
<table width=95%>
<tr><th>Wallet</th><th width=15%>Wallet Date</th><th>Cave</th><th>Wallet Name</th><th>Survex survey length</th>
diff --git a/templates/walletform.html b/templates/walletform.html
index 1583393..c35fa03 100644
--- a/templates/walletform.html
+++ b/templates/walletform.html
@@ -246,7 +246,7 @@
{% for item in svxothers %}
{% if item.isSurvexBlock %}&nbsp;&nbsp;&nbsp;&nbsp;<a href="/survexfile/{{item.survexfile.path}}">{{item.survexfile.path|safe}}</a><br/>{% endif %}
{% empty %}
- <em>None found for this date, bit there should be..</em><br>
+ <em>None found for this date, but there should be..</em><br>
{% endfor %}
</span>
{% else %}