Automated merge with ssh://openslides.org/openslides
This commit is contained in:
commit
687f5ea710
@ -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',
|
||||
),
|
||||
|
||||
|
@ -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):
|
||||
|
Loading…
Reference in New Issue
Block a user