diff --git a/openslides/core/templates/core/widget_customslide.html b/openslides/core/templates/core/widget_customslide.html index e74678a78..a2ff73294 100644 --- a/openslides/core/templates/core/widget_customslide.html +++ b/openslides/core/templates/core/widget_customslide.html @@ -10,7 +10,7 @@ rel="tooltip" data-original-title="{% trans 'Show' %}">   - diff --git a/openslides/projector/urls.py b/openslides/projector/urls.py index 5689fbfc9..b266dc1d0 100644 --- a/openslides/projector/urls.py +++ b/openslides/projector/urls.py @@ -10,11 +10,6 @@ urlpatterns = patterns( views.ProjectorView.as_view(), name='projector_show'), - url(r'^preview/$', - views.ProjectorView.as_view(), - {'callback': None}, - name='projctor_preview_welcomepage'), - url(r'^preview/(?P[^/]*)/$', views.ProjectorView.as_view(), name='projector_preview'), diff --git a/openslides/projector/views.py b/openslides/projector/views.py index 8bcb59437..080d02284 100644 --- a/openslides/projector/views.py +++ b/openslides/projector/views.py @@ -50,6 +50,7 @@ class ActivateView(RedirectView): def pre_redirect(self, request, *args, **kwargs): if (kwargs['callback'] == 'mediafile' and get_active_slide()['callback'] == 'mediafile'): + # TODO: find a way to do this in the mediafile-app # If the current slide is a pdf and the new page is also a slide, # we dont have to use set_active_slide, because is causes a content # reload.