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

Automated merge with ssh://oshahn.de/openslides

Browse Source
This commit is contained in:
Oskar Hahn 2011-08-31 14:17:20 +02:00
commit 1c6c977624
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -55,13 +55,15 @@
</tr> </tr>
<tr {% if overview %}class="activeline"{% endif %}> <tr {% if overview %}class="activeline"{% endif %}>
<td {% if perms.agenda.can_manage_agenda %} <td {% if perms.agenda.can_manage_agenda %}
class="select" onclick="window.location.href='{% url item_activate 0 %}'" class="select"
{% endif %}> {% endif %}>
<a href="{% url item_activate 0 %}">
{% if overview %} {% if overview %}
<img class="center" src="/static/images/icons/task-accepted.png" title="{% trans 'Agenda selected' %}"> <img class="center" src="/static/images/icons/task-accepted.png" title="{% trans 'Agenda selected' %}">
{% else %} {% else %}
{% if perms.agenda.can_manage_agenda %}<img class="center" src="/static/images/icons/task-accepted-grey.png" title="{% trans 'Select agenda' %}">{% endif %} {% if perms.agenda.can_manage_agenda %}<img class="center" src="/static/images/icons/task-accepted-grey.png" title="{% trans 'Select agenda' %}">{% endif %}
{% endif %} {% endif %}
</a>
</td> </td>
<td><i>{% trans "Agenda" %} ({{ items|length }} {% trans "items" %})</i></td> <td><i>{% trans "Agenda" %} ({{ items|length }} {% trans "items" %})</i></td>
{% if perms.agenda.can_manage_agenda %} {% if perms.agenda.can_manage_agenda %}
@ -77,13 +79,15 @@
{% if item.parent.active and summary %}activesummarychildline{% endif %} {% if item.parent.active and summary %}activesummarychildline{% endif %}
{% endif %}"> {% endif %}">
<td {% if perms.agenda.can_manage_agenda %} <td {% if perms.agenda.can_manage_agenda %}
class="select" onclick="window.location.href='{% url item_activate item.id %}'" class="select"
{% endif %}> {% endif %}>
<a id="activate_link_{{ item.id }}" class="activate_link" href="{% url item_activate item.id %}">
{% if item.active %} {% if item.active %}
<img class="center" src="/static/images/icons/task-accepted.png" title="{% trans 'Item selected' %}"></span> <img class="center" src="/static/images/icons/task-accepted.png" title="{% trans 'Item selected' %}"></span>
{% else %} {% else %}
{% if perms.agenda.can_manage_agenda %}<img class="center" src="/static/images/icons/task-accepted-grey.png" title="{% trans 'Select item' %}"> {% endif %} {% if perms.agenda.can_manage_agenda %}<img class="center" src="/static/images/icons/task-accepted-grey.png" title="{% trans 'Select item' %}"> {% endif %}
{% endif %} {% endif %}
</a>
</td> </td>
<td> <td>
{% for p in item.parents %} {% for p in item.parents %}
@ -135,7 +139,7 @@
{% if item.children.exists %} {% if item.children.exists %}
<a href="{% url item_activate_summary item.id %}"><img src="/static/images/icons/view-list-tree.png" title="{% trans 'Select item overview' %}"></a> <a href="{% url item_activate_summary item.id %}"><img src="/static/images/icons/view-list-tree.png" title="{% trans 'Select item overview' %}"></a>
{% endif %} {% endif %}
{% endif %} {% endif %}
</td> </td>
{% if perms.agenda.can_manage_agenda %} {% if perms.agenda.can_manage_agenda %}
<td class="tabledrag-hide"> <td class="tabledrag-hide">

2
openslides/agenda/views.py
View File

@ -43,7 +43,7 @@ def view(request, item_id):
""" """
item = Item.objects.get(id=item_id) item = Item.objects.get(id=item_id)
votes = assignment_votes(item) votes = assignment_votes(item)
return render_to_response('beamer/%s.html' % item.type, return render_to_response('beamer/%s.html' % item.type,
{ {
'item': item.cast(), 'item': item.cast(),