From 4fa36cd4247ccab1115869dcb3beba3e60be2c09 Mon Sep 17 00:00:00 2001 From: Mads Rasmussen Date: Fri, 13 Jan 2017 13:16:47 +0100 Subject: [PATCH] fine tuning --- .../components/umbnodepreview.directive.js | 2 -- .../src/less/components/umb-node-preview.less | 15 ++++++--- .../views/components/umb-node-preview.html | 5 ++- .../contentpicker/contentpicker.controller.js | 32 +++++++++++-------- .../contentpicker/contentpicker.html | 9 +++--- 5 files changed, 36 insertions(+), 27 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbnodepreview.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbnodepreview.directive.js index 51e9b265f5..62a8bc766e 100644 --- a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbnodepreview.directive.js +++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbnodepreview.directive.js @@ -16,10 +16,8 @@ name: "=", description: "=?", sortable: "=?", - allowEdit: "=?", allowOpen: "=?", allowRemove: "=?", - onEdit: "&?", onOpen: "&?", onRemove: "&?" }, diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-node-preview.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-node-preview.less index 952a49f692..b69d4b4b22 100644 --- a/src/Umbraco.Web.UI.Client/src/less/components/umb-node-preview.less +++ b/src/Umbraco.Web.UI.Client/src/less/components/umb-node-preview.less @@ -1,11 +1,11 @@ .umb-node-preview { padding: 5px 15px; margin-bottom: 5px; - border: 2px solid #f8f8f8; + background: @grayLighter; border-radius: 3px; display: flex; align-items: center; - background: @white; + max-width: 66.6%; } .umb-node-preview--sortable { @@ -38,22 +38,28 @@ } .umb-node-preview__description { - font-size: 12px; + font-size: 11px; + line-height: 1.5em; } .umb-node-preview__actions { flex: 0 0 auto; + display: flex; + align-items: center; } .umb-node-preview__action { margin-left: 5px; margin-right: 5px; - font-size: 16px; + font-size: 13px; + font-weight: bold; + opacity: 0.5; } .umb-node-preview__action:hover { color: @blue; text-decoration: none; + opacity: 1; } .umb-node-preview-add { @@ -64,6 +70,7 @@ color: @blue; font-weight: bold; padding: 5px 15px; + max-width: 66.6%; } .umb-node-preview-add:hover { diff --git a/src/Umbraco.Web.UI.Client/src/views/components/umb-node-preview.html b/src/Umbraco.Web.UI.Client/src/views/components/umb-node-preview.html index 4bcd1f39e2..b811ae8eec 100644 --- a/src/Umbraco.Web.UI.Client/src/views/components/umb-node-preview.html +++ b/src/Umbraco.Web.UI.Client/src/views/components/umb-node-preview.html @@ -5,9 +5,8 @@
{{ description }}
- - - + Open + Remove
\ No newline at end of file diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.controller.js index c02ab7a588..ccf9d865bc 100644 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.controller.js @@ -1,7 +1,7 @@ //this controller simply tells the dialogs service to open a mediaPicker window //with a specified callback, this callback will receive an object with a selection on it -function contentPickerController($scope, dialogService, entityResource, editorState, $log, iconHelper, $routeParams, fileManager, contentEditingHelper, angularHelper, navigationService, $location, $timeout, miniEditorHelper) { +function contentPickerController($scope, dialogService, entityResource, contentResource, editorState, $log, iconHelper, $routeParams, fileManager, contentEditingHelper, angularHelper, navigationService, $location, $timeout, miniEditorHelper) { function trim(str, chr) { var rgxtrim = (!chr) ? new RegExp('^\\s+|\\s+$', 'g') : new RegExp('^' + chr + '+|' + chr + '+$', 'g'); @@ -221,26 +221,32 @@ function contentPickerController($scope, dialogService, entityResource, editorSt //load current data var modelIds = $scope.model.value ? $scope.model.value.split(',') : []; - entityResource.getByIds(modelIds, entityType).then(function (data) { + var nodePromise = (entityType === "Document") ? contentResource.getByIds(modelIds) : entityResource.getByIds(modelIds, entityType); - //Ensure we populate the render model in the same order that the ids were stored! - _.each(modelIds, function (id, i) { - var entity = _.find(data, function (d) { - return d.id == id; - }); - - if (entity) { - entity.icon = iconHelper.convertFromLegacyIcon(entity.icon); - $scope.renderModel.push({ name: entity.name, id: entity.id, icon: entity.icon, path: entity.path }); - } + nodePromise.then(function (data) { + + _.each(modelIds, function (id, i) { + var entity = _.find(data, function (d) { + return d.id == id; + }); + + if (entity) { + entity.icon = iconHelper.convertFromLegacyIcon(entity.icon); + + var url = (entity.urls && entity.urls.length > 0) ? entity.urls[0] : ""; + var path = ($scope.model.config.showPathOnHover) ? entity.path : ""; + + $scope.renderModel.push({ name: entity.name, id: entity.id, icon: entity.icon, path: path, url: url }); + } - }); + }); //everything is loaded, start the watch on the model startWatch(); }); + } angular.module('umbraco').controller("Umbraco.PropertyEditors.ContentPickerController", contentPickerController); diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.html index 760063b94b..abcb7f20c0 100644 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.html +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.html @@ -1,20 +1,19 @@
- +
+ on-open="openMiniEditor(node)">