From 508be2f4ebb31ed7ce71ee5703f549ed20449892 Mon Sep 17 00:00:00 2001 From: Oskar Hahn Date: Thu, 8 Sep 2011 09:23:21 +0200 Subject: [PATCH] beamer clean link --- openslides/agenda/templates/agenda/overview.html | 2 +- openslides/agenda/urls.py | 2 ++ openslides/agenda/views.py | 3 +++ 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/openslides/agenda/templates/agenda/overview.html b/openslides/agenda/templates/agenda/overview.html index 0e62211dd..4ac70b8af 100644 --- a/openslides/agenda/templates/agenda/overview.html +++ b/openslides/agenda/templates/agenda/overview.html @@ -49,7 +49,7 @@ {% trans "Adjust projector view" %}: - {# #} + {% endif %} diff --git a/openslides/agenda/urls.py b/openslides/agenda/urls.py index ebb1b7d37..cf056be23 100644 --- a/openslides/agenda/urls.py +++ b/openslides/agenda/urls.py @@ -64,4 +64,6 @@ urlpatterns = patterns('agenda.views', url(r'^beamer/up$', 'beamer_edit', {'direction': 'up'}, name='beamer_up'), url(r'^beamer/down$', 'beamer_edit', {'direction': 'down'}, name='beamer_down'), + + url(r'^beamer/clean$', 'beamer_edit', {'direction': 'clean'}, name='beamer_clean'), ) diff --git a/openslides/agenda/views.py b/openslides/agenda/views.py index f26610350..3413f973e 100644 --- a/openslides/agenda/views.py +++ b/openslides/agenda/views.py @@ -100,6 +100,9 @@ def beamer_edit(request, direction): config_set('up', int(config_get('up', 0)) - 10) elif direction == 'down': config_set('up', int(config_get('up', 0)) + 10) + elif direction == 'clean': + config_set('up', 0) + config_set('bigger', 100) if request.is_ajax(): return ajax_request({})