ag-admin/OpenSlides
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Changed agenda start/end time to djangos DATETIME_FORMAT.

Browse Source
This commit is contained in:
Emanuel Schuetze 2013-02-09 22:59:15 +01:00
parent d6084f7c8b
commit a51a296434
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
openslides/agenda/static/styles/agenda.css
View File

@ -25,10 +25,11 @@ table#menu-overview {
table#agendatime { table#agendatime {
float: right; float: right;
width: 25%; width: auto;
margin-bottom: 1em; margin-bottom: 1em;
} }
table#agendatime td { table#agendatime td {
padding: 5px; padding: 5px;
white-space: nowrap;
} }

2
openslides/agenda/templates/agenda/item_row.html
View File

@ -29,7 +29,7 @@
</td> </td>
{% endif %} {% endif %}
{% if perms.agenda.can_see_orga_items %} {% if perms.agenda.can_see_orga_items %}
<td {% if item.tooltip %}title="{% trans 'End' %}: {{ item.tooltip|date:"D d M Y H.i" }}"{% endif %}> <td {% if item.tooltip %}title="{% trans 'End' %}: {{ item.tooltip|date:"DATETIME_FORMAT" }}"{% endif %}>
{% if item.duration %} {% if item.duration %}
{{ item.duration }}h {{ item.duration }}h
{% endif %} {% endif %}

4
openslides/agenda/templates/agenda/overview.html
View File

@ -55,11 +55,11 @@
<table id="agendatime"> <table id="agendatime">
<tr> <tr>
<td>{% trans "Start of event" %}:</td> <td>{% trans "Start of event" %}:</td>
<td>{{ start|date:"D d M Y H.i" }}h</td> <td>{{ start|date:"DATETIME_FORMAT" }}</td>
</tr> </tr>
<tr> <tr>
<td>{% trans "Estimated end" %}:</td> <td>{% trans "Estimated end" %}:</td>
<td>{{ end|date:"D d M Y H.i" }}h</td> <td>{{ end|date:"DATETIME_FORMAT" }}</td>
</tr> </tr>
</table> </table>
{% endif %} {% endif %}