forked from expo/troggle
bug fixes renaming
This commit is contained in:
parent
3aca0d0c76
commit
b98d7d246c
@ -21,7 +21,7 @@ Exported on {% now 'Y-m-d H:m' %} using control panel webpage and exportlogbook(
|
|||||||
<hr />
|
<hr />
|
||||||
|
|
||||||
<div class="tripdate" id="{{logbook_entry.slug}}">{{logbook_entry.date|date:'Y-m-d'}}</div>
|
<div class="tripdate" id="{{logbook_entry.slug}}">{{logbook_entry.date|date:'Y-m-d'}}</div>
|
||||||
<div class="trippeople">{% for persontrip in logbook_entry.persontrip_set.all %}{% if persontrip.is_logbook_entry_author %}<u>{{persontrip.personexpedition.person|safe}}</u>{% else %}{{ persontrip.personexpedition.person|safe }}{% endif %}, {% endfor %}</div>
|
<div class="trippeople">{% for personlogentry in logbook_entry.personlogentry_set.all %}{% if personlogentry.is_logbook_entry_author %}<u>{{personlogentry.personexpedition.person|safe}}</u>{% else %}{{ personlogentry.personexpedition.person|safe }}{% endif %}, {% endfor %}</div>
|
||||||
<div class="triptitle">{{logbook_entry.title|safe}}</div>
|
<div class="triptitle">{{logbook_entry.title|safe}}</div>
|
||||||
|
|
||||||
{{logbook_entry.text|safe}}
|
{{logbook_entry.text|safe}}
|
||||||
|
@ -29,7 +29,7 @@
|
|||||||
|
|
||||||
<table class="cavers">
|
<table class="cavers">
|
||||||
<tr><th>Caver</th><th>T/U</th><th>Prev</th><th>Next</th></tr>
|
<tr><th>Caver</th><th>T/U</th><th>Prev</th><th>Next</th></tr>
|
||||||
{% for personlogentry in logbookentry.persontrip_set.all %}
|
{% for personlogentry in logbookentry.personlogentry_set.all %}
|
||||||
<tr>
|
<tr>
|
||||||
{% if personlogentry.is_logbook_entry_author %}
|
{% if personlogentry.is_logbook_entry_author %}
|
||||||
<td class="author">
|
<td class="author">
|
||||||
@ -64,7 +64,7 @@
|
|||||||
<div id="col1">
|
<div id="col1">
|
||||||
<div class="logbookentry">
|
<div class="logbookentry">
|
||||||
<b>{{logbookentry.date|date:"D d M Y"}}</b>
|
<b>{{logbookentry.date|date:"D d M Y"}}</b>
|
||||||
{% for personlogentry in logbookentry.persontrip_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.personexpedition.person}}{% endif %}{% endfor %}
|
||||||
<p>{{logbookentry.text|safe}}</p>
|
<p>{{logbookentry.text|safe}}</p>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
@ -24,8 +24,8 @@
|
|||||||
<td> <a href="{{ personexpedition.get_absolute_url }}">{{personexpedition.expedition.year}}</a>
|
<td> <a href="{{ personexpedition.get_absolute_url }}">{{personexpedition.expedition.year}}</a>
|
||||||
</td>
|
</td>
|
||||||
<td>
|
<td>
|
||||||
<span style="padding-left:{{personexpedition.persontrip_set.all|length}}0px; background-color:red"></span>
|
<span style="padding-left:{{personexpedition.personlogentry_set.all|length}}0px; background-color:red"></span>
|
||||||
{{personexpedition.persontrip_set.all|length}}
|
{{personexpedition.personlogentry_set.all|length}}
|
||||||
</td>
|
</td>
|
||||||
|
|
||||||
<td>
|
<td>
|
||||||
|
Loading…
Reference in New Issue
Block a user