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

Merge pull request #1116 from emanuelschuetze/template-fix2

Browse Source 
Minor template fixes
This commit is contained in:
Norman Jäckel 2013-11-23 08:25:33 -08:00
commit 2af3b320c8
4 changed files with 31 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -11,7 +11,6 @@ tr.topline td {
} }
table#agendatime { table#agendatime {
float: right;
width: auto; width: auto;
margin-bottom: 1em; margin-bottom: 1em;
font-size: 12px; font-size: 12px;

4
openslides/agenda/static/styles/agenda_sort.css
View File

@ -54,8 +54,8 @@ ol.agenda_list {
} }
.agenda_list .openclose { width: 40px; float: left; min-height: 1px; } .agenda_list .openclose { width: 40px; float: left; min-height: 1px; }
.agenda_list .duration { width: 92px; float: right; min-height: 1px; padding-right: 25px; text-align: right; } .agenda_list .duration { width: 92px; float: right; min-height: 1px; text-align: right; }
.agenda_list .manage { width: 200px; float: right; min-height: 1px; padding-left: 5px; } .agenda_list .manage { width: 200px; float: right; min-height: 1px; padding-left: 15px; }
.agenda_list .title { float: left; padding-left: 5px;} .agenda_list .title { float: left; padding-left: 5px;}
.agenda_list .optional { float: left; } .agenda_list .optional { float: left; }
.agenda_list .opener_closer { float: left; margin-right: 8px; margin-left:-4px;} .agenda_list .opener_closer { float: left; margin-right: 8px; margin-left:-4px;}

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

@ -43,31 +43,35 @@
</small> </small>
</h1> </h1>
{% if perms.agenda.can_see_orga_items %} <div class="row-fluid">
{% if start and end %} <div class="span6">
<table id="agendatime" class="table table-bordered"> <label class="checkbox">
<tr> <input type="checkbox" id="hide_closed_items"> {% trans "Hide closed items" %}
<td>{% trans "Start of event" %}:</td> </label>
<td>{{ start|date:"DATETIME_FORMAT" }}</td> <small><i>{{ items|length }}
</tr> {% blocktrans count counter=items|length %}item{% plural %}items{% endblocktrans %}<span id="hiddencount"></span>
<tr> </i></small>
<td>{% trans "Estimated end" %}:</td> </div>
<td>{{ end|date:"DATETIME_FORMAT" }}</td> <div class="span6">
</tr> {% if perms.agenda.can_see_orga_items %}
</table> {% if start and end %}
{% else %} <table id="agendatime" class="table table-bordered pull-right">
<div style="float: right;"> <tr>
<a href="{% url 'config_agenda' %}" class="btn btn-mini">{% trans 'Set start time of event' %}</a> <td>{% trans "Start of event" %}:</td>
</div> <td>{{ start|date:"DATETIME_FORMAT" }}</td>
{% endif %} </tr>
{% endif %} <tr>
<label class="checkbox"> <td>{% trans "Estimated end" %}:</td>
<input type="checkbox" id="hide_closed_items"> {% trans "Hide closed items" %} <td>{{ end|date:"DATETIME_FORMAT" }}</td>
</label> </tr>
</table>
{% else %}
<a href="{% url 'config_agenda' %}" class="btn btn-mini pull-right">{% trans 'Set start time of event' %}</a>
{% endif %}
{% endif %}
</div>
</div>
<small><i>{{ items|length }}
{% blocktrans count counter=items|length %}item{% plural %}items{% endblocktrans %}<span id="hiddencount"></span>
</i></small>
<table id="menu-overview" class="table table-striped table-bordered"> <table id="menu-overview" class="table table-striped table-bordered">
<tr> <tr>
<th class="title">{% trans "Item" %}</th> <th class="title">{% trans "Item" %}</th>

2
openslides/assignment/templates/assignment/assignment_detail.html
View File

@ -150,7 +150,7 @@
<th>{% trans "Candidates" %}</th> <th>{% trans "Candidates" %}</th>
{% for poll in polls %} {% for poll in polls %}
<th style="white-space:nowrap;" class="span1"> <th style="white-space:nowrap;" class="span1">
{% if perms.assignment.can_manage_assignment %}<p>{% endif %} {% if perms.assignment.can_manage_assignment %}<p class="text-center">{% endif %}
{{ poll.get_ballot|ordinal|safe }} {% trans 'ballot' %} {{ poll.get_ballot|ordinal|safe }} {% trans 'ballot' %}
{% if perms.assignment.can_manage_assignment %} {% if perms.assignment.can_manage_assignment %}
<a class="publish_link btn btn-mini btn-danger {% if poll.published %}btn-primary{% endif %}" <a class="publish_link btn btn-mini btn-danger {% if poll.published %}btn-primary{% endif %}"