ahtlon/deck
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Add avatars to share selection

Browse Source 
fix #208

Signed-off-by: Julius Härtl <jus@bitgrid.net>
This commit is contained in:
Julius Härtl
2017-12-05 11:33:10 +01:00
committed by Julius Härtl
parent a8aab8d049
commit 367873beaa
2 changed files with 26 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
css/style.scss
View File

@@ -874,6 +874,12 @@ input.input-inline {
/** /**
* Board details * Board details
*/ */
#tabBoardShare .select2 .ui-select-choices-row-inner {
display: flex;
padding: 5px !important;
}
#shareWithList { #shareWithList {
list-style-type: none; list-style-type: none;
padding: 0 0 16px; padding: 0 0 16px;
@@ -912,8 +918,9 @@ input.input-inline {
.shareOption { .shareOption {
margin-top: 5px; margin-top: 5px;
} }
}
.avatardiv { .avatardiv {
background-color: $color-lightgrey; background-color: $color-lightgrey;
border-radius: 16px; border-radius: 16px;
width: 32px; width: 32px;
@@ -923,7 +930,6 @@ input.input-inline {
padding: 16px; padding: 16px;
opacity: 0.5; opacity: 0.5;
} }
}
} }
#board-detail-labels { #board-detail-labels {
@@ -1017,6 +1023,9 @@ input.input-inline {
overflow: hidden; overflow: hidden;
} }
} }
.select2-choice {
height: auto;
}
} }
.ui-select-container[disabled] .ui-select-match-item { .ui-select-container[disabled] .ui-select-match-item {
@@ -1036,9 +1045,9 @@ input.input-inline {
.select2-result-label { .select2-result-label {
padding: 0px !important; padding: 0px !important;
span {
display: flex; display: flex;
span {
flex-grow: 1;
padding: 6px; padding: 6px;
} }
} }

8
templates/part.board.sidebarView.php
View File

@@ -18,7 +18,7 @@
<li class="tabHeader" ng-class="{'selected': (status.boardtab==1)}" ng-click="status.boardtab=1"><a><?php p($l->t('Tags')); ?></a></li> <li class="tabHeader" ng-class="{'selected': (status.boardtab==1)}" ng-click="status.boardtab=1"><a><?php p($l->t('Tags')); ?></a></li>
</ul> </ul>
<div class="tabsContainer"> <div class="tabsContainer">
<div id="commentsTabView" class="tab commentsTabView" ng-if="status.boardtab==0 || !status.boardtab"> <div id="tabBoardShare" class="tab" ng-if="status.boardtab==0 || !status.boardtab">
<ui-select ng-if="boardservice.canShare()" ng-model="status.addSharee" theme="select2" <ui-select ng-if="boardservice.canShare()" ng-model="status.addSharee" theme="select2"
title="<?php p($l->t('Select users or groups to share with')); ?>" title="<?php p($l->t('Select users or groups to share with')); ?>"
@@ -28,7 +28,11 @@
<span><i class="icon icon-{{aclTypeString($item)}}"></i> {{ $item.participant.displayname }}</span> <span><i class="icon icon-{{aclTypeString($item)}}"></i> {{ $item.participant.displayname }}</span>
</ui-select-match> </ui-select-match>
<ui-select-choices refresh="searchForUser($select.search)" refresh-delay="0" repeat="sharee in boardservice.sharees"> <ui-select-choices refresh="searchForUser($select.search)" refresh-delay="0" repeat="sharee in boardservice.sharees">
<span><i class="icon icon-{{aclTypeString(sharee)}}"></i> {{ sharee.participant.displayname }}</span> <div class="avatardiv" avatar displayname="{{ sharee.participant.uid }}" ng-if="sharee.type==OC.Share.SHARE_TYPE_USER"></div>
<div class="avatardiv" ng-if="sharee.type==OC.Share.SHARE_TYPE_GROUP"><i class="icon icon-{{aclTypeString(sharee)}}" title="<?php p($l->t('Access for')); ?> {{aclTypeString(sharee)}}"></i></div>
<span class="has-tooltip username">
{{ sharee.participant.displayname }}
</span>
</ui-select-choices> </ui-select-choices>
<ui-select-no-choice> <ui-select-no-choice>
<?php p($l->t('No matching user or group found.')); ?> <?php p($l->t('No matching user or group found.')); ?>