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

#246 open activate slide view ajax

Browse Source
This commit is contained in:
Oskar Hahn 2012-07-01 11:07:04 +02:00
parent ea4da31b0c
commit 6c206fa740
3 changed files with 23 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
openslides/application/templates/application/base_application.html
View File

@ -45,7 +45,9 @@
<li><a href="{% url print_application application.id %}"><img src="{% static 'images/icons/pdf.png' %}"> {%trans 'Application as PDF' %}</a></li> <li><a href="{% url print_application application.id %}"><img src="{% static 'images/icons/pdf.png' %}"> {%trans 'Application as PDF' %}</a></li>
{# activate and polls #} {# activate and polls #}
{% if perms.projector.can_manage_projector %} {% if perms.projector.can_manage_projector %}
<li><a href="{% url projector_activate_slide application.sid %}"><img src="{% static 'images/icons/projector.png' %}"> {%trans 'Show Application' %}</a></li> <li>
<a class="activate_link {% if item.active %}active{% endif %}" href="{% url projector_activate_slide application.sid %}"><img src="{% static 'images/icons/projector.png' %}"> {%trans 'Show Application' %}</a>
</li>
{% endif %} {% endif %}
{% if perms.application.can_manage_application %} {% if perms.application.can_manage_application %}
{% for poll in application.polls %} {% for poll in application.polls %}

22
openslides/assignment/templates/assignment/base_assignment.html
View File

@ -27,22 +27,34 @@
<ul> <ul>
{# view assignemnt #} {# view assignemnt #}
{% url assignment_view assignment.id as url_assignmentview %} {% url assignment_view assignment.id as url_assignmentview %}
<li class="{% if request.path == url_assignmentview %}selected{% endif %}"><a href="{% url assignment_view assignment.id %}">{%trans 'View election' %}</a></li> <li class="{% if request.path == url_assignmentview %}selected{% endif %}">
<a href="{% url assignment_view assignment.id %}">{%trans 'View election' %}</a>
</li>
{% if perms.assignment.can_manage_assignment %} {% if perms.assignment.can_manage_assignment %}
{# edit assignemnt #} {# edit assignemnt #}
{% url assignment_edit assignment.id as url_assignmentedit %} {% url assignment_edit assignment.id as url_assignmentedit %}
<li class="{% if request.path == url_assignmentedit %}selected{% endif %}"><a href="{% url assignment_edit assignment.id %}"><img src="{% static 'images/icons/edit.png' %}"> {%trans 'Edit election' %}</a></li> <li class="{% if request.path == url_assignmentedit %}selected{% endif %}">
<a href="{% url assignment_edit assignment.id %}"><img src="{% static 'images/icons/edit.png' %}"> {%trans 'Edit election' %}</a>
</li>
{# delete assignment #} {# delete assignment #}
<li><a href="{% url assignment_delete assignment.id %}"><img src="{% static 'images/icons/delete.png' %}"> {%trans 'Delete election' %}</a></li> <li>
<a href="{% url assignment_delete assignment.id %}"><img src="{% static 'images/icons/delete.png' %}"> {%trans 'Delete election' %}</a>
</li>
{% endif %} {% endif %}
{# PDF #} {# PDF #}
<li><a href="{% url print_assignment assignment.id %}"><img src="{% static 'images/icons/pdf.png' %}"> {%trans 'Election as PDF' %}</a></li> <li>
<a href="{% url print_assignment assignment.id %}"><img src="{% static 'images/icons/pdf.png' %}"> {%trans 'Election as PDF' %}</a>
</li>
{# activate #} {# activate #}
{% if perms.projector.can_manage_projector %} {% if perms.projector.can_manage_projector %}
<li><a href="{% url projector_activate_slide assignment.sid %}"><img src="{% static 'images/icons/projector.png' %}"> {%trans 'Show election' %}</a></li> <li>
<a class="activate_link {% if item.active %}active{% endif %}" href="{% url projector_activate_slide assignment.sid %}"><img src="{% static 'images/icons/projector.png' %}"> {%trans 'Show election' %}</a>
</li>
{% endif %} {% endif %}
{# agenda #} {# agenda #}

4
openslides/projector/views.py
View File

@ -105,12 +105,8 @@ class ActivateView(RedirectView):
def pre_redirect(self, request, *args, **kwargs): def pre_redirect(self, request, *args, **kwargs):
set_active_slide(kwargs['sid']) set_active_slide(kwargs['sid'])
def get_ajax_context(self, **kwargs):
context = super(ActivateView, self).get_ajax_context()
config['up'] = 0 config['up'] = 0
config['bigger'] = 100 config['bigger'] = 100
return context
class CustomSlideCreateView(CreateView): class CustomSlideCreateView(CreateView):