yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

in media selection, made folder name clickable to select into a folder. Added not allowed cursor on not allowed items.

Browse Source
This commit is contained in:
Kevin Meilander
2021-10-31 10:40:06 -05:00
committed by Nathan Woulfe
parent ba1518bc5c
commit 1125644eb3
2 changed files with 22 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/Umbraco.Web.UI.Client/src/less/components/umb-media-grid.less
View File

@@ -225,6 +225,17 @@
.umb-media-grid__list-item.selected, .umb-media-grid__list-item.selected:hover, .umb-media-grid__list-item.selected:focus {
border: 2px solid #f5c1bc !important;
}
.umb-media-grid__list-item-name:hover {
text-decoration:underline;
}
.umb-media-grid__list-item.-filtered:not(.-folder) {
cursor: not-allowed;
* {
pointer-events: none;
}
}
.umb-media-grid__list-view .umb-table-cell.umb-table__name {
flex: 1 1 25%;

19
src/Umbraco.Web.UI.Client/src/views/components/umb-media-grid.html
View File

@@ -79,19 +79,22 @@
</div>
</div>
<div class="umb-table-body">
<div class="umb-table-row umb-media-grid__list-item -selectable" ng-click="clickItem(item, $event, $index)" ng-repeat="item in items | filter:filterBy | orderBy:sortBy:sortReverse" ng-class="{'-selected': item.selected}">
<div class="umb-table-body">
<div class="umb-table-row umb-media-grid__list-item -selectable"
ng-click="clickItem(item, $event, $index)"
ng-repeat="item in items | filter:filterBy | orderBy:sortBy:sortReverse"
ng-class="{'-selected': item.selected, '-folder': item.isFolder, '-filtered': item.filtered}">
<div class="umb-table-cell">
<umb-icon icon="icon-check" class="umb-table-body__icon umb-table-body__checkicon" ng-if="item.selected"></umb-icon>
<umb-icon icon="{{item.thumbnail ? 'icon-picture' : item.icon}}" class="umb-table-body__icon" ng-if="!item.selected"></umb-icon>
</div>
<div class="umb-table-cell umb-table__name">
<umb-icon icon="icon-navigation-right"
ng-show="item.isFolder"
ng-class="{'-locked': item.selected || !item.file || !item.thumbnail}"
ng-click="clickItemName(item, $event, $index)">
</umb-icon>
<span data-src="{{item.value.src}}" class="item-name">{{item.name}}</span>
<div class="umb-media-grid__list-item-name"
ng-class="{'-locked': item.selected || !item.file || !item.thumbnail}"
ng-click="clickItemName(item, $event, $index)">
<umb-icon icon="icon-navigation-right" ng-show="item.isFolder"></umb-icon>
<span data-src="{{item.value.src}}" class="item-name">{{item.name}}</span>
</div>
</div>
<div class="umb-table-cell">
<span class="muted small" style="font-size:0.8em">{{item.updateDate | date:'medium'}}</span>