diff options
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/logbookentry.html | 10 | ||||
| -rw-r--r-- | templates/logbookform.html | 10 |
2 files changed, 16 insertions, 4 deletions
diff --git a/templates/logbookentry.html b/templates/logbookentry.html index 4185512..e15cec3 100644 --- a/templates/logbookentry.html +++ b/templates/logbookentry.html @@ -27,6 +27,12 @@ {% endif %} </p> +<style> +th, td { + padding-left: 3px; + padding-right: 3px; +} +</style> <table class="cavers"> <tr><th>Caver</th><th>T/U</th><th>Prev</th><th>Next</th></tr> {% for personlogentry in logbookentry.personlogentry_set.all %} @@ -36,7 +42,7 @@ {% else %} <td> {% endif %} - <a href="{{ personlogentry.personexpedition.get_absolute_url }}">{{personlogentry.personexpedition.person}}</a> + <a href="{{ personlogentry.personexpedition.get_absolute_url }}">{{personlogentry.nickname_used}} ({{personlogentry.personexpedition.person}})</a> </td> <td> @@ -64,7 +70,7 @@ <div id="col1"> <div class="logbookentry"> <b>{{logbookentry.date|date:"D d M Y"}}</b> - {% for personlogentry in logbookentry.personlogentry_set.all %}{% if personlogentry.is_logbook_entry_author %}<br />{{personlogentry.personexpedition.person}}{% endif %}{% endfor %} + {% for personlogentry in logbookentry.personlogentry_set.all %}{% if personlogentry.is_logbook_entry_author %}<br />{{personlogentry.nickname_used}} {% endif %}{% endfor %} <p>{{logbookentry.text|safe}}</p> </div> <p><a href="/logbookedit/{{logbookentry.slug|safe}}">Edit this entry</a>. diff --git a/templates/logbookform.html b/templates/logbookform.html index f9b12ea..9c33a50 100644 --- a/templates/logbookform.html +++ b/templates/logbookform.html @@ -4,8 +4,11 @@ {% block content %} +{% if date %} +<h2>Edit Logbook Entry on {{date}}</h2> +{% else %} <h2>New Logbook Entry in {{year}}</h2> - +{% endif %} {% if save_bad %} <p style="font-family: monospace; font-weight: bold; color: red; font-size: 130%; text-align: center"> @@ -24,12 +27,15 @@ {% csrf_token %} <br /> + <span {% if dateflag %}style="color:red"{% endif %}> <label for="date">Date of the activity</label> <input {% if not user.username %} disabled{% endif %} label = "Date" name = "date" size="12" title="Date of the activity, a single day, in ISO format: 2020-08-17" - {% if date %}value="{{date}}"{% else %}placeholder="2023-08-12"{% endif %} + {% if date %}value="{{date}}"{% else %}placeholder="2023-08-12"{% endif %} required /> + </span> + <br /><br /> <label for="author">Your name (author) <a href="/aliases/{{year}}">[valid authors]</a></label> <input {% if not user.username %} disabled{% endif %} |