From 8d514e9fcfb641bea8846586f2dbded0457d7f1f Mon Sep 17 00:00:00 2001 From: Emanuel Schuetze Date: Tue, 6 Mar 2012 19:55:19 +0100 Subject: [PATCH] Renamed SettingView to ControlView. --- openslides/projector/urls.py | 4 ++-- openslides/projector/views.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/openslides/projector/urls.py b/openslides/projector/urls.py index 891db32a7..9b4c6286b 100644 --- a/openslides/projector/urls.py +++ b/openslides/projector/urls.py @@ -12,14 +12,14 @@ from django.conf.urls.defaults import * -from projector.views import SettingView, ActivateView +from projector.views import ControlView, ActivateView urlpatterns = patterns('projector.views', url(r'^$', 'active_slide', name='projector_show'), url(r'^control$', - SettingView.as_view(), + ControlView.as_view(), name='projector_control', ), diff --git a/openslides/projector/views.py b/openslides/projector/views.py index d3a2ec067..39010695d 100644 --- a/openslides/projector/views.py +++ b/openslides/projector/views.py @@ -29,11 +29,11 @@ from projector.api import get_active_slide, set_active_slide from projector.models import SLIDE -class SettingView(TemplateView): +class ControlView(TemplateView): template_name = 'projector/control.html' def get_context_data(self, **kwargs): - context = super(SettingView, self).get_context_data(**kwargs) + context = super(ControlView, self).get_context_data(**kwargs) categories = {} for slide in SLIDE.values(): if not categories.has_key(slide.category):