diff --git a/server.py b/server.py index 92f5b840332157d46679d8949bafb550bef0667c..0f60ae4ec4827f337acb85ce05ebedf66c501dd2 100644 --- a/server.py +++ b/server.py @@ -288,6 +288,10 @@ def human_semester(s, long=False): def human_date(d): return d.strftime('%d.%m.%Y') +@app.template_filter(name='fulldate') +def human_fulldate(d): + return d.strftime('%a, %d.%m.%Y, %H:%M Uhr') + @app.template_filter(name='time') def human_time(d): return d.strftime('%H:%M') diff --git a/templates/macros.html b/templates/macros.html index 4431f9a6c448a54b0334c801d42f97b3659acb33..ab1a2c9b3815ffda6154be50b5a5ed8d91e21aa2 100644 --- a/templates/macros.html +++ b/templates/macros.html @@ -13,7 +13,7 @@ <div class="col-xs-4"> <span><strong>{{ lecture.course.short }}</strong> {{livelabel(0, lecture.livehandle)}}{% if ismod() %} <i>({{lecture.course_id}})</i>{% endif %}</span><br> <span>{% if ismod() %}ID: {{lecture.id}}{% endif %}</span><br> - <span>{{ lecture['time'] }}</span> + <span>{{ lecture['time']|fulldate }}</span> {% if lecture['speaker'] %} <div class="small">Gehalten von {{ lecture['speaker']|safe }} </div> {% endif %} @@ -32,7 +32,7 @@ <strong>{{ lecture.course.title }}</strong> {{livelabel(0, lecture.livehandle)}} </li> - <li>{{ lecture['time'] }}</li> + <li>{{ lecture['time']|fulldate }}</li> {% if lecture['speaker'] %} <li> <span class="small">Gehalten von {{ lecture['speaker']|safe }} </span> @@ -218,10 +218,12 @@ $('#embedcodebtn').popover( <ul class="list-unstyled col-sm-3 col-xs-12"> <li>{{ moderator_editor(['lectures',lecture.id,'title'], lecture.title) }}{{livelabel((lecture.live and lecture.time > datetime.now()-timedelta(days=1)), videos|selectattr("livehandle")|list|length)}}</li> {% if lecture.speaker or ismod() %}<li>Gehalten von {{ moderator_editor(['lectures',lecture.id,'speaker'], lecture.speaker) }}</li>{% endif %} - <li>{{ moderator_editor(['lectures',lecture.id,'time'], lecture.time) }} </li> {% if ismod() %} + <li>{{ moderator_editor(['lectures',lecture.id,'time'], lecture.time) }} </li> <li>Dauer: {{ moderator_editor(['lectures',lecture.id,'duration'], lecture.duration) }} min</li> <li>ID: <a href="{{url_for('course',handle=lecture.course.handle)}}#lecture-{{lecture.id}}">{{lecture.id}}</a></li> + {% else %} + <li>{{ lecture.time|fulldate }}</li> {% endif %} </ul> <ul class="list-unstyled col-sm-3 col-xs-12"> @@ -261,7 +263,11 @@ $('#embedcodebtn').popover( <li>{{ moderator_editor(['lectures',lecture.id,'title'], lecture.title) }}{{livelabel((lecture.live and lecture.time > datetime.now()-timedelta(days=1)), videos|selectattr("livehandle")|list|length)}}</li> </ul> <ul class="list-unstyled col-sm-3 col-xs-12"> + {% if ismod() %} <li>{{ moderator_editor(['lectures',lecture.id,'time'], lecture.time) }} </li> + {% else %} + <li>{{ lecture.time|fulldate }}</li> + {% endif %} </ul> <ul class="list-inline col-sm-4 col-xs-12"> <li>{{ moderator_editor(['lectures',lecture.id,'comment'], lecture.comment) }}</li>