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

Merge pull request #2879 from emanuelschuetze/projector-url

Browse Source 
Use always '/' at the end of projector url.
This commit is contained in:
Norman Jäckel 2017-01-15 12:20:55 +01:00 committed by GitHub
commit 0461238831
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
openslides/core/static/js/core/site.js
View File

@ -266,7 +266,7 @@ angular.module('OpenSlidesApp.core.site', [
},
})
.state('projector', {
url: '/projector/{id:int}',
url: '/projector/{id:int}/',
templateUrl: 'static/templates/projector-container.html',
data: {extern: true},
onEnter: function($window) {
@ -274,7 +274,7 @@ angular.module('OpenSlidesApp.core.site', [
}
})
.state('real-projector', {
url: '/real-projector/{id:int}',
url: '/real-projector/{id:int}/',
templateUrl: 'static/templates/projector.html',
data: {extern: true},
onEnter: function($window) {

2
openslides/core/static/templates/core/manage-projectors.html
View File

@ -125,7 +125,7 @@
<a ui-sref="projector({id: projector.id})" target="_blank">
<div class="iframewrapper" id="iframewrapper_{{ projector.id }}">
<iframe class="iframe" id="iframe_{{ projector.id }}" ng-src="{{ '/real-projector/' + projector.id }}" frameborder="0"></iframe>
<iframe class="iframe" id="iframe_{{ projector.id }}" ng-src="{{ '/real-projector/' + projector.id + '/' }}" frameborder="0"></iframe>
<div class="iframeoverlay" id="iframeoverlay_{{ projector.id }}"></div>
</div>
</a>

2
openslides/core/static/templates/core/projector-controls.html
View File

@ -78,7 +78,7 @@
<a ui-sref="projector({id: active_projector.id })" target="_blank">
<div class="iframewrapper" id="iframewrapper_sidebar">
<iframe class="iframe" id="iframe_sidebar" ng-src="{{ '/real-projector/' + active_projector.id }}" frameborder="0"></iframe>
<iframe class="iframe" id="iframe_sidebar" ng-src="{{ '/real-projector/' + active_projector.id + '/'}}" frameborder="0"></iframe>
<div class="iframeoverlay" id="iframeoverlay_sidebar"></div>
</div>
</a>

2
openslides/core/static/templates/projector-container.html
View File

@ -39,7 +39,7 @@
</style>
<div id="iframewrapper" ng-hide="error">
<iframe id="iframe" ng-src="{{ '/real-projector/' + projectorId }}" frameborder="0"></iframe>
<iframe id="iframe" ng-src="{{ '/real-projector/' + projectorId + '/'}}" frameborder="0"></iframe>
<div id="iframeoverlay"></div>
</div>