PR#153: Improve the meeting widget - fedora-hubs

fedora-hubs

#153 Improve the meeting widget

Merged 7 years ago by pingou. Opened 7 years ago by pingou.

pingou/fedora-hubs meeting_widget into develop

Link to the meeting detail page for more info

Pierre-Yves Chibon • 7 years ago

2844984

Keep the meeting description short

Pierre-Yves Chibon • 7 years ago

bbe25f1

Make the `Add to calendar` button in the meeting widget working

Pierre-Yves Chibon • 7 years ago

477fdc3

hubs/widgets/meetings.py

file modified

+9 -7

		`@@ -17,13 +17,15 @@`
		`def next_meeting(meetings):`
		`now = datetime.datetime.utcnow()`
		`for meeting in meetings:`
		`- start_string = "%s %s" % (meeting['meeting_date'],`
		`- meeting['meeting_time_start'])`
		`- start_dt = datetime.datetime.strptime(start_string, "%Y-%m-%d %H:%M:%S")`
		`-`
		`- stop_string = "%s %s" % (meeting['meeting_date_end'],`
		`- meeting['meeting_time_stop'])`
		`- stop_dt = datetime.datetime.strptime(stop_string, "%Y-%m-%d %H:%M:%S")`
		`+ start_string = "%s %s" % (`
		`+ meeting['meeting_date'], meeting['meeting_time_start'])`
		`+ start_dt = datetime.datetime.strptime(`
		`+ start_string, "%Y-%m-%d %H:%M:%S")`
		`+`
		`+ stop_string = "%s %s" % (`
		`+ meeting['meeting_date_end'], meeting['meeting_time_stop'])`
		`+ stop_dt = datetime.datetime.strptime(`
		`+ stop_string, "%Y-%m-%d %H:%M:%S")`

		`# Loop over them until we find a good one.`
		`# Meetings before now are no good. We want the first one after now.`

hubs/widgets/templates/meetings.html

file modified

+31 -24

		`@@ -1,34 +1,41 @@`
		`{% if meetings %}`
		`{% for title, next in meetings.items() %}`
		`<div class="meeting">`
		`- <div class="row">`
		`- <h5>  The {{ next.meeting_name }} is {{ next.start_dt \| humanize }}</h5>`
		`+ <div class="row">`
		`+ <h5>  The {{ next.meeting_name }} is {{ next.start_dt \| humanize }}</h5>`
		`+ </div>`
		`+ <div class="row">`
		`+ <div class="col-md-4 meeting-date">`
		`+ {% if next.display_duration %}`
		`+ <strong>{{ next.start_date }} - {{ next.stop_date }}</strong>`
		`+ {% else %}`
		`+ <strong>{{next.start_date}}</strong>`
		`+ {% endif %}`
		`</div>`
		`- <div class="row">`
		`- <div class="col-md-4 meeting-date">`
		`- {% if next.display_duration %}`
		`- <strong>{{next.start_date}} - {{next.stop_date}}</strong>`
		`- {% else %}`
		`- <strong>`
		`- {{next.start_date}}`
		`- </strong>`
		`- {% endif %}`
		`- </div>`
		`- <div class="col-md-4 meeting-time">`
		`- {% if next.display_time %}`
		`- @{{next.start_time}}{% endif %}<br>`
		`+ <div class="col-md-4 meeting-time">`
		`+ {% if next.display_time %}`
		`+ @{{ next.start_time }}{% endif %}<br>`

		`- <a href="#">{{next.location}}</a>`
		`- </div>`
		`- <div class="col-md-4">`
		`- <button class="btn btn-default btn-sm add-calendar"><strong>Add to calendar</strong></button>`
		`- </div>`
		`+ <a href="#">{{ next.location }}</a>`
		`</div>`
		`- <div class="row">`
		`- <div class="col-md-12 meeting-info">`
		`- {{next.meeting_information_html}}`
		`- </div>`
		`+ <div class="col-md-4">`
		`+ <a href="https://apps.fedoraproject.org/calendar/ical/calendar/meeting/{{ next.meeting_id }}/">`
		`+ <button class="btn btn-default btn-sm add-calendar">`
		`+ <strong>Add to calendar</strong>`
		`+ </button>`
		`+ </a>`
		`</div>`
		`+ </div>`
		`+ <div class="row">`
		`+ <div class="col-md-12 meeting-info">`
		`+ {{ next.meeting_information_html[:150] }}`
		`+ {%- if next.meeting_information_html \| length > 150 %}...`
		`+ <p>`
		`+ <a href="https://apps.fedoraproject.org/calendar/meeting/{{ next.meeting_id }}/">Full description</a>`
		`+ </p>`
		`+ {% endif %}`
		`+ </div>`
		`+ </div>`
		`</div>`
		`{% if meetings \| length > 1 %} <hr> {% endif %}`
		`{% endfor %}`