edward/agenda
1
0
Fork 0
Code Issues 27 Pull requests Packages Projects Releases Wiki Activity

Compare commits

base: edward:34b78b0ce8b87ce89805a40817344991312d0232
Branches Tags
edward:main
edward:launch-page
edward:navbar
...
compare: edward:45e4a04fb9420f4c31277c266b4ea09179908070
Branches Tags
edward:main
edward:launch-page
edward:navbar

2 commits
34b78b0ce8 ... 45e4a04fb9

Author SHA1 Message Date
Edward Betts 45e4a04fb9 Merge branch 'main' of git.4angle.com:edward/agenda 2023-12-28 20:14:05 +00:00
Edward Betts 81f6d457b5 Show end dates or duration in event list 
Closes: #85
 2023-12-28 20:14:03 +00:00
1 changed files with 8 additions and 2 deletions
Show stats Expand all files Collapse all files

10
templates/index.html
View file

@ -160,7 +160,7 @@
{% else %} {% else %}
{% set cell_bg = " bg-warning-subtle" if delta == "today" else "" %} {% set cell_bg = " bg-warning-subtle" if delta == "today" else "" %}
<div class="row border border-1 {% if event.name in class_map %} {{ class_map[event.name]}}{% else %}{{ cell_bg }}{% endif %}"> <div class="row border border-1 {% if event.name in class_map %} {{ class_map[event.name]}}{% else %}{{ cell_bg }}{% endif %}">
<div class="col-md-3{{ cell_bg }}"> <div class="col-md-2{{ cell_bg }}">
{{event.as_date.strftime("%a, %d, %b")}} {{event.as_date.strftime("%a, %d, %b")}}
&nbsp; &nbsp;
&nbsp; &nbsp;
@ -170,7 +170,13 @@
{{event.display_timezone or ""}} {{event.display_timezone or ""}}
</div> </div>
<div class="col-md-8 text-start"> <div class="col-md-2{{ cell_bg }}">
{% if event.end_date and event.end_as_date != event.as_date %}
{{event.end_date}}
{% endif %}
</div>
<div class="col-md-7 text-start">
{% if event.url %}<a href="{{ event.url }}">{% endif %} {% if event.url %}<a href="{{ event.url }}">{% endif %}
{{ event_labels.get(event.name) or event.name }} {{ event_labels.get(event.name) or event.name }}
{%- if event.title -%}: {{ event.title }}{% endif %} {%- if event.title -%}: {{ event.title }}{% endif %}