martin/blechreiz-website
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bugfixes, Daten umgezogen

Browse Source
This commit is contained in:
Martin Bauer
2013-10-15 21:51:05 +02:00
parent 175df72a21
commit cd635aff9b
31 changed files with 71 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
eventplanner/templates/eventplanner/events_grid.html
View File

@@ -17,17 +17,25 @@
{% addtoblock "css" %}
<style>
button.eventButton {
width: 55px;
width: 42px;
}
span.eventButton {
height: 16px;
width: 45px;
width: 32px;
text-align: center;
}
.eventButton i {
margin-right:2px;
}
.with_comment {
font-style: italic;
}
.usernameHeader {
font-size:11px;
text-align: center;
}
</style>
{% endaddtoblock %}
@@ -125,7 +133,7 @@
<th> Termin </th>
<th> Datum </th>
{% for name in usernames %}
<th> {{ name|capfirst }} </th>
<th class='usernameHeader'> {{ name|capfirst }} </th>
{% endfor %}
<th> </th>
@@ -146,18 +154,15 @@
<td class="center userEventTableData" data-username="{{p.user.username}}" data-event="{{event.pk}}">
{% if p.status == "Yes" %}
<button class="btn btn-mini btn-success eventButton" title="{{p.comment}}" data-status="{{p.status}}">
{% if p.comment %} <i class="icon-comment icon-white"></i> {% endif %}
<span class="text">Ja</span>
<span class="text {% if p.comment %}with_comment{% endif %}">Ja</span>
</button>
{% elif p.status == "No" %}
<button class="btn btn-mini btn-danger eventButton" title="{{p.comment}}" data-status="{{p.status}}">
{% if p.comment%} <i class="icon-comment icon-white"></i> {% endif %}
<span class="text">Nein</span>
<span class="text {% if p.comment %}with_comment{% endif %}">Nein</span>
</button>
{% else %}
<button class="btn btn-mini btn-warning eventButton" title="{{p.comment}}" data-status="{{p.status}}">
{% if p.comment %} <i class="icon-comment icon-white"></i> {% endif %}
<span class="text">?</span>
<span class="text {% if p.comment %}with_comment{% endif %}">?</span>
</button>
{% endif %}
</td>
@@ -165,18 +170,15 @@
<td class="center userEventTableData" data-username="{{p.user.username}}" data-event="{{event.pk}}">
{% if p.status == "Yes" %}
<span class="badge badge-success eventButton" title="{{p.comment}}" data-status="{{p.status}}">
{% if p.comment %} <i class="icon-comment icon-white"></i> {% endif %}
<span class="text">Ja</span>
<span class="text {% if p.comment %}with_comment{% endif %}">Ja</span>
</span>
{% elif p.status == "No" %}
<span class="badge badge-important eventButton" title="{{p.comment}}" data-status="{{p.status}}">
{% if p.comment%} <i class="icon-comment icon-white"></i> {% endif %}
<span class="text">Nein</span>
<span class="text {% if p.comment %}with_comment{% endif %}">Nein</span>
</span>
{% else %}
<span class="badge badge-warning eventButton" title="{{p.comment}}" data-status="{{p.status}}">
{% if p.comment %} <i class="icon-comment icon-white"></i> {% endif %}
<span class="text">?</span>
<span class="text {% if p.comment %}with_comment{% endif %}">?</span>
</span>
{% endif %}
</td>
@@ -185,17 +187,18 @@
{% endfor %}
<td>
<a class="btn btn-mini btn-inverse deleteButton" data-pk="{{event.pk}}"><i class="icon-trash icon-white"></i> Löschen </a>
<a class="btn btn-mini btn-inverse deleteButton" data-pk="{{event.pk}}"><i class="icon-trash icon-white"></i> </a>
</td>
</tr>
{% endfor %}
{% if perms.eventplanner.admin %}
<tr>
<td class="center"> <a href="add">Termin hinzufügen...</a> </td>
<td class="center" colspan="80"> <a href="add">Termin hinzufügen...</a> </td>
<tr>
{% endif %}</form>
{% endif %}
</form>
</tbody>
</table>