Skip to content

Commit

Permalink
Merge branch 'release'
Browse files Browse the repository at this point in the history
  • Loading branch information
pitpalme committed Sep 11, 2015
2 parents 209cbc9 + 2001e38 commit d895df1
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions scheduler/templates/helpdesk_single.html
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ <h2>Dienstpläne für "{{ needs.0.location.name }}" am {{ needs.0.time_period_to
<h3>{{ need.topic.title }}</h3>
<div class="help-text-wrapper" style="margin:10px 0px 10px 0"><span aria-hidden="true" class="glyphicon glyphicon-info-sign"></span> {{ need.topic.description }}</div>
{% endifchanged %}
<p class="need" data-need-id="{{ need.pk }}"><strong>von {{ need.time_period_from.date_time|date:"H" }} -
{{ need.time_period_to.date_time|date:"H" }} Uhr</strong> (benötigt: {{ need.slots }}/angemeldet:
<p class="need" data-need-id="{{ need.pk }}"><strong>von {{ need.time_period_from.date_time|date:"H:i" }} -
{{ need.time_period_to.date_time|date:"H:i" }} Uhr</strong> (benötigt: {{ need.slots }}/angemeldet:
{{ need.get_volunteer_total }})| Freiwillige:{% for volunteer in need.get_volunteers %}
{{ volunteer.user.username }},{% endfor %}| {% if need.slots > need.get_volunteer_total %}
<span style="color:red">Wird gebraucht </span><span aria-hidden="true" class="glyphicon glyphicon-exclamation-sign">
Expand Down

0 comments on commit d895df1

Please sign in to comment.