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

Merge pull request #3355 from FinnStutzenstein/Issue3169

Browse Source 
Mediafile fullscreen (fixes #3169)
This commit is contained in:
Norman Jäckel 2017-08-18 14:26:38 +02:00 committed by GitHub
commit effe42464f
3 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG
View File

@ -73,6 +73,7 @@ Core:
Mediafiles: Mediafiles:
- Fixed reloading of PDF on page change [#3274]. - Fixed reloading of PDF on page change [#3274].
- Custom CKEditor plugin for browsing mediafiles [#3337]. - Custom CKEditor plugin for browsing mediafiles [#3337].
- Project images always in fullscreen [#3355].
General: General:
- Several bugfixes and minor improvements. - Several bugfixes and minor improvements.

2
openslides/mediafiles/static/js/mediafiles/list.js
View File

@ -158,7 +158,7 @@ angular.module('OpenSlidesApp.mediafiles.list', [
rotate: 0, rotate: 0,
visible: true, visible: true,
playing: false, playing: false,
fullscreen: mediafile.is_pdf fullscreen: mediafile.is_pdf || mediafile.is_image
}]; }];
$http.post(postUrl, data); $http.post(postUrl, data);
} }

2
openslides/mediafiles/static/templates/mediafiles/mediafile-list.html
View File

@ -60,7 +60,7 @@
<button class="btn" ng-click="mediafileFit(presentedMediafile)" <button class="btn" ng-click="mediafileFit(presentedMediafile)"
title="{{ 'Reset zoom' | translate }}" title="{{ 'Reset zoom' | translate }}"
ng-class="presentedMediafile.scale=='page-fit' ? 'btn-primary' : 'btn-default'"> ng-class="presentedMediafile.scale=='page-fit' ? 'btn-primary' : 'btn-default'">
<i class="fa fa-arrows-alt"></i> <i class="fa fa-undo"></i>
</button> </button>
<button class="btn btn-default" ng-click="mediafileZoomIn(presentedMediafile)" <button class="btn btn-default" ng-click="mediafileZoomIn(presentedMediafile)"
title="{{ 'Zoom in' | translate }}"> title="{{ 'Zoom in' | translate }}">