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

Merge remote-tracking branch 'origin/dev-v7' into temp8

Browse Source 
# Conflicts:
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.html
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.html
This commit is contained in:
Shannon
2018-11-20 18:14:36 +11:00
parent e6718c6989 3dfa3eaac7
commit fad566afba
1 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.html
View File

@@ -17,11 +17,18 @@
</div>
<!-- IMAGE -->
<img ng-class="{'trashed': media.trashed}" ng-src="{{media.thumbnail}}" alt="" ng-show="media.thumbnail" title="{{media.trashed ? 'Trashed: ' + media.name : media.name}}" />
<img ng-if="media.thumbnail"
ng-class="{'trashed': media.trashed}" ng-src="{{media.thumbnail}}"
alt="" title="{{media.trashed ? 'Trashed: ' + media.name : media.name}}" />
<!-- SVG -->
<img ng-class="{'trashed': media.trashed}" ng-if="media.metaData.umbracoExtension.Value === 'svg'" ng-src="{{media.metaData.umbracoFile.Value}}" alt="" title="{{media.trashed ? 'Trashed: ' + media.name : media.name}}" />
<img ng-class="{'trashed': media.trashed}" ng-if="media.extension === 'svg'" ng-src="{{media.file}}" alt="" />
<img ng-if="!media.thumbnail && media.metaData.umbracoExtension.Value === 'svg'"
ng-class="{'trashed': media.trashed}" ng-src="{{media.metaData.umbracoFile.Value}}"
alt="" title="{{media.trashed ? 'Trashed: ' + media.name : media.name}}" />
<img ng-if="!media.thumbnail && media.metaData.umbracoExtension.Value !== 'svg' && media.extension === 'svg'"
ng-class="{'trashed': media.trashed}" ng-src="{{media.file}}"
alt=""
title="{{media.trashed ? 'Trashed: ' + media.name : media.name}}" />
<!-- FILE -->
<div ng-class="{'trashed': media.trashed}" class="umb-icon-holder" ng-hide="media.thumbnail || media.metaData.umbracoExtension.Value === 'svg' || media.extension === 'svg'">