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

Merge pull request #1290 from ostcar/fix_overlay_on_preview

Browse Source 
Fixed default-slide-preview-url.
This commit is contained in:
Norman Jäckel 2014-05-19 09:48:16 +02:00
commit 8d72345747
3 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
openslides/core/templates/core/widget_customslide.html
View File

@ -10,7 +10,7 @@
rel="tooltip" data-original-title="{% trans 'Show' %}"> rel="tooltip" data-original-title="{% trans 'Show' %}">
<i class="icon-facetime-video {% if welcomepage_is_active %}icon-white{% endif %}"></i> <i class="icon-facetime-video {% if welcomepage_is_active %}icon-white{% endif %}"></i>
</a>&nbsp; </a>&nbsp;
<a href="{% url 'projctor_preview_welcomepage' %}" <a href="{% url 'projector_preview' callback='default' %}"
rel="tooltip" data-original-title="{% trans 'Preview' %}" class="btn btn-mini right"> rel="tooltip" data-original-title="{% trans 'Preview' %}" class="btn btn-mini right">
<i class="icon-search"></i> <i class="icon-search"></i>
</a> </a>

5
openslides/projector/urls.py
View File

@ -10,11 +10,6 @@ urlpatterns = patterns(
views.ProjectorView.as_view(), views.ProjectorView.as_view(),
name='projector_show'), name='projector_show'),
url(r'^preview/$',
views.ProjectorView.as_view(),
{'callback': None},
name='projctor_preview_welcomepage'),
url(r'^preview/(?P<callback>[^/]*)/$', url(r'^preview/(?P<callback>[^/]*)/$',
views.ProjectorView.as_view(), views.ProjectorView.as_view(),
name='projector_preview'), name='projector_preview'),

1
openslides/projector/views.py
View File

@ -50,6 +50,7 @@ class ActivateView(RedirectView):
def pre_redirect(self, request, *args, **kwargs): def pre_redirect(self, request, *args, **kwargs):
if (kwargs['callback'] == 'mediafile' and if (kwargs['callback'] == 'mediafile' and
get_active_slide()['callback'] == 'mediafile'): 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, # 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 # we dont have to use set_active_slide, because is causes a content
# reload. # reload.