Fixes: U4-7824 Remove media section dropzone and folders in recycle bin

This commit is contained in:
Mads Rasmussen
2016-01-25 12:17:26 +01:00
parent baea34b6a4
commit 08cfececd9
7 changed files with 21 additions and 2 deletions

View File

@@ -28,7 +28,8 @@
</div>
<umb-empty-state
ng-if="!content">
ng-if="!content"
position="center">
<localize key="content_noItemsToShow">There are no items to show</localize>
</umb-empty-state>

View File

@@ -26,6 +26,7 @@
on-drag-enter="vm.dragEnter()">
<umb-file-dropzone
ng-if="!vm.isRecycleBin"
parent-id="{{vm.nodeId}}"
files-uploaded="vm.onUploadComplete"
accept="{{vm.acceptedFileTypes}}"
@@ -36,7 +37,7 @@
</umb-file-dropzone>
<umb-folder-grid
ng-if="folders.length > 0"
ng-if="folders.length > 0 && !vm.isRecycleBin"
folders="folders"
on-click="vm.selectFolder"
on-click-name="vm.goToItem">
@@ -60,6 +61,12 @@
</ul>
</umb-tooltip>
<umb-empty-state
ng-if="vm.itemsWithoutFolders.length === 0 && vm.isRecycleBin"
position="center">
<localize key="general_recycleBinEmpty"></localize>
</umb-empty-state>
<umb-empty-state
ng-if="vm.itemsWithoutFolders.length === 0 && options.filter"
position="center">

View File

@@ -19,6 +19,7 @@
vm.activeDrag = false;
vm.mediaDetailsTooltip = {};
vm.itemsWithoutFolders = [];
vm.isRecycleBin = $scope.contentId === '-21';
vm.dragEnter = dragEnter;
vm.dragLeave = dragLeave;

View File

@@ -9,6 +9,7 @@
on-drag-enter="vm.dragEnter()">
<umb-file-dropzone
ng-if="!vm.isRecycleBin"
parent-id="{{vm.nodeId}}"
files-uploaded="vm.onUploadComplete"
accept="{{vm.acceptedFileTypes}}"
@@ -30,6 +31,12 @@
on-sort="vm.sort">
</umb-table>
<umb-empty-state
ng-if="!items && vm.isRecycleBin"
position="center">
<localize key="general_recycleBinEmpty"></localize>
</umb-empty-state>
</div>
<div ng-if="entityType !== 'media'">

View File

@@ -10,6 +10,7 @@
vm.acceptedFileTypes = mediaHelper.formatFileTypes(Umbraco.Sys.ServerVariables.umbracoSettings.imageFileTypes);
vm.maxFileSize = Umbraco.Sys.ServerVariables.umbracoSettings.maxFileSize + "KB";
vm.activeDrag = false;
vm.isRecycleBin = $scope.contentId === '-21';
vm.selectItem = selectItem;
vm.clickItem = clickItem;