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

Merge pull request #3359 from FinnStutzenstein/MediafilesLayout

Browse Source 
Fixing layout issues in mediafiles list view
This commit is contained in:
Norman Jäckel 2017-08-18 14:24:38 +02:00 committed by GitHub
commit 8f9d6fcc07
2 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
openslides/core/static/css/app.css
View File

@ -1083,6 +1083,16 @@ img {
padding: 5px 5px 5px 0; padding: 5px 5px 5px 0;
} }
/** Mediafile table **/
#mediafile-table .icon-column {
width: 10%;
}
#mediafile-table .title-column {
padding: 0px 10px;
width: 90%;
}
/** Config **/ /** Config **/
.input-comments > div { .input-comments > div {
margin-bottom: 5px margin-bottom: 5px

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

@ -144,7 +144,7 @@
{{(mediafiles|filter:{selected:true}).length}} {{ "selected" | translate }}</span> {{(mediafiles|filter:{selected:true}).length}} {{ "selected" | translate }}</span>
</div> </div>
<div class="os-table container-fluid"> <div id="mediafile-table" class="os-table container-fluid">
<div class="row header-row"> <div class="row header-row">
<div class="col-xs-1 centered" ng-show="isSelectMode" os-perms="mediafiles.can_manage"> <div class="col-xs-1 centered" ng-show="isSelectMode" os-perms="mediafiles.can_manage">
<i class="fa text-danger pointer" ng-class="selectedAll ? 'fa-check-square-o' : 'fa-square-o'" <i class="fa text-danger pointer" ng-class="selectedAll ? 'fa-check-square-o' : 'fa-square-o'"
@ -279,13 +279,13 @@
<div class="no-projector-spacer" os-perms="!core.can_manage_projector"></div> <div class="no-projector-spacer" os-perms="!core.can_manage_projector"></div>
<!-- main content column --> <!-- main content column -->
<div class="col-xs-5 content"> <div class="col-xs-5 content">
<div class="spacer-right"> <!-- horizontal block --> <div class="icon-column"> <!-- horizontal block -->
<i ng-style="{'visibility': mediafile.hidden ? 'visible' : 'hidden'}" class="fa fa-lock fa-lg" <i ng-style="{'visibility': mediafile.hidden ? 'visible' : 'hidden'}" class="fa fa-lock fa-lg"
title="{{ 'Is hidden' | translate }}"></i> title="{{ 'Is hidden' | translate }}"></i>
<i ng-style="{'visibility': mediafile.isUsedAsLogo() ? 'visible' : 'hidden'}" class="fa fa-picture-o fa-lg spacer-left" <i ng-style="{'visibility': mediafile.isUsedAsLogo() ? 'visible' : 'hidden'}" class="fa fa-picture-o fa-lg spacer-left"
title="{{ 'Is used as a logo' | translate }}" os-perms="core.can_manage_logos"></i> title="{{ 'Is used as a logo' | translate }}" os-perms="core.can_manage_logos"></i>
</div> </div>
<div> <div class="title-column">
<div> <!-- vertical block --> <div> <!-- vertical block -->
<a ng-href="{{ mediafile.mediafileUrl }}" class="title" target="_blank">{{ mediafile.title_or_filename }}</a> <a ng-href="{{ mediafile.mediafileUrl }}" class="title" target="_blank">{{ mediafile.title_or_filename }}</a>
</div> </div>