From a51f7b29de9c95b751f6997d1f18fd6f51fb5917 Mon Sep 17 00:00:00 2001 From: leekelleher Date: Wed, 11 Sep 2019 17:55:39 +0100 Subject: [PATCH 01/19] Help Drawer - Hide Tours if there are none `vm.tours` is declared as an empty array (in the controller), it isn't null, so we need to check the array length. Otherwise if there are none, the "Tours" title is displayed. --- .../src/views/common/drawers/help/help.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Umbraco.Web.UI.Client/src/views/common/drawers/help/help.html b/src/Umbraco.Web.UI.Client/src/views/common/drawers/help/help.html index a0413ce1a6..4ae3121098 100644 --- a/src/Umbraco.Web.UI.Client/src/views/common/drawers/help/help.html +++ b/src/Umbraco.Web.UI.Client/src/views/common/drawers/help/help.html @@ -9,7 +9,7 @@ -
+
Tours
From 3f4bff9ac366405052dfd51201d8a8ef2d0e38df Mon Sep 17 00:00:00 2001 From: Kenn Jacobsen Date: Mon, 9 Sep 2019 19:40:08 +0200 Subject: [PATCH 02/19] Don't show NC delete confirmation if an item can't be deleted --- .../src/less/components/umb-nested-content.less | 5 +++++ .../nestedcontent/nestedcontent.controller.js | 12 +++++++----- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-nested-content.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-nested-content.less index 59c90972d2..d018e76c0d 100644 --- a/src/Umbraco.Web.UI.Client/src/less/components/umb-nested-content.less +++ b/src/Umbraco.Web.UI.Client/src/less/components/umb-nested-content.less @@ -154,6 +154,11 @@ .umb-nested-content__icon--disabled { opacity: 0.3; + cursor: default !important; + + &:hover { + color: @ui-option-type; + } } diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.controller.js index fbaab3f94f..ffc9f13286 100644 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.controller.js @@ -271,13 +271,15 @@ angular.module("umbraco").controller("Umbraco.PropertyEditors.NestedContent.Prop }; $scope.deleteNode = function (idx) { - if ($scope.nodes.length > $scope.model.config.minItems) { - $scope.nodes.splice(idx, 1); - $scope.setDirty(); - updateModel(); - } + $scope.nodes.splice(idx, 1); + $scope.setDirty(); + updateModel(); }; $scope.requestDeleteNode = function (idx) { + if ($scope.nodes.length <= $scope.model.config.minItems) { + return; + } + if ($scope.model.config.confirmDeletes === true) { localizationService.localizeMany(["content_nestedContentDeleteItem", "general_delete", "general_cancel", "contentTypeEditor_yesDelete"]).then(function (data) { const overlay = { From e83760c6bdc01523ac348a55772503cbbf001917 Mon Sep 17 00:00:00 2001 From: Kenn Jacobsen Date: Sun, 8 Sep 2019 20:43:27 +0200 Subject: [PATCH 03/19] Fix textbox aria-required --- .../src/views/propertyeditors/textbox/textbox.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/textbox/textbox.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/textbox/textbox.html index ff62629b1c..f8f9b18c7f 100644 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/textbox/textbox.html +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/textbox/textbox.html @@ -4,7 +4,7 @@ class="umb-property-editor umb-textstring textstring" val-server="value" ng-required="model.validation.mandatory" - aria-required="model.validation.mandatory" + aria-required="{{model.validation.mandatory}}" aria-invalid="False" ng-trim="false" ng-keyup="model.change()" /> From 1c9ed847a16bb6494335844b09ea233d60fa366d Mon Sep 17 00:00:00 2001 From: Michael Pontin Date: Fri, 6 Sep 2019 17:39:57 +0100 Subject: [PATCH 04/19] Added double check for the decimal label --- .../PropertyEditors/ValueConverters/LabelValueConverter.cs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/Umbraco.Core/PropertyEditors/ValueConverters/LabelValueConverter.cs b/src/Umbraco.Core/PropertyEditors/ValueConverters/LabelValueConverter.cs index 84baf226cf..eb461b4920 100644 --- a/src/Umbraco.Core/PropertyEditors/ValueConverters/LabelValueConverter.cs +++ b/src/Umbraco.Core/PropertyEditors/ValueConverters/LabelValueConverter.cs @@ -65,6 +65,8 @@ namespace Umbraco.Core.PropertyEditors.ValueConverters if (source is decimal sourceDecimal) return sourceDecimal; if (source is string sourceDecimalString) return decimal.TryParse(sourceDecimalString, NumberStyles.Any, CultureInfo.InvariantCulture, out var d) ? d : 0; + if (source is double sourceDouble) + return Convert.ToDecimal(sourceDouble); return (decimal) 0; case ValueTypes.Integer: if (source is int sourceInt) return sourceInt; From 26b40ebfd2cd3d454ef4e8c91be1d7a2ff448518 Mon Sep 17 00:00:00 2001 From: Kenn Jacobsen Date: Sun, 8 Sep 2019 20:33:28 +0200 Subject: [PATCH 05/19] Make integer properties work with mandatory validation clientside --- .../src/views/propertyeditors/integer/integer.html | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/integer/integer.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/integer/integer.html index 549a07319d..5c10790400 100644 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/integer/integer.html +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/integer/integer.html @@ -5,6 +5,8 @@ pattern="[\-0-9]*" class="umb-property-editor umb-number" ng-model="model.value" + ng-required="model.validation.mandatory" + aria-required="{{model.validation.mandatory}}" id="{{model.alias}}" val-server="value" fix-number min="{{model.config.min}}" max="{{model.config.max}}" step="{{model.config.step}}" /> From 0582e4f72ea503f6baf4589eca1b35e8bfa12822 Mon Sep 17 00:00:00 2001 From: Kenn Jacobsen Date: Sun, 8 Sep 2019 20:26:45 +0200 Subject: [PATCH 06/19] Make decimal properties work with mandatory validation clientside --- .../src/views/propertyeditors/decimal/decimal.html | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/decimal/decimal.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/decimal/decimal.html index 28cb909cc0..d5560c8433 100644 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/decimal/decimal.html +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/decimal/decimal.html @@ -5,6 +5,8 @@ pattern="[\-0-9]+([,\.][0-9]+)?" class="umb-property-editor umb-number" ng-model="model.value" + ng-required="model.validation.mandatory" + aria-required="{{model.validation.mandatory}}" val-server="value" fix-number min="{{model.config.min}}" max="{{model.config.max}}" step="{{model.config.step}}" /> From de656acec6a3b8a38c4fd5e83bcdc0309026e6c9 Mon Sep 17 00:00:00 2001 From: Jan Skovgaard Date: Sun, 15 Sep 2019 15:01:53 +0200 Subject: [PATCH 07/19] Links components (e.g. 'Footer links') can not be tabbed to (#6305) --- .../src/less/components/umb-node-preview.less | 3 + .../views/components/umb-node-preview.html | 77 +++++++++++++++++-- .../src/views/prevalueeditors/treepicker.html | 2 +- 3 files changed, 76 insertions(+), 6 deletions(-) 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 1edaffe824..46bfbfa4e6 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 @@ -67,6 +67,9 @@ } .umb-node-preview__action { + background: transparent; + padding: 0; + border: 0 none; margin-left: 5px; margin-right: 5px; font-size: 13px; 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 00ca425d7a..4f835f4c04 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 @@ -1,7 +1,7 @@
- +
- +
{{ name }}
{{ description }}
@@ -13,9 +13,76 @@
- Edit - Open - Remove + + + Edit + {{name}} + + + + + + + Open + {{name}} + + + + + + + Remove + {{name}} + + +
diff --git a/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/treepicker.html b/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/treepicker.html index ae260b4502..ab1b84db97 100644 --- a/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/treepicker.html +++ b/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/treepicker.html @@ -11,7 +11,7 @@ allow-remove="allowRemove" allow-edit="allowEdit" on-remove="remove($index)" - on-edit="openContentPicker()"> + on-edit="openContentPicker()">
From 41c4f12d1b7bcca9a8a10ec31a58f9c157871ab2 Mon Sep 17 00:00:00 2001 From: Jan Skovgaard Date: Sun, 15 Sep 2019 15:08:23 +0200 Subject: [PATCH 08/19] Links components (e.g. 'Footer links'), 'Add' is identfied as "Add link" but doesn't identify the label (#6304) --- .../src/less/components/umb-node-preview.less | 2 ++ .../contentpicker/contentpicker.controller.js | 8 ++++++-- .../contentpicker/contentpicker.html | 16 ++++++++++------ 3 files changed, 18 insertions(+), 8 deletions(-) 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 46bfbfa4e6..cdd9dfa958 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 @@ -92,11 +92,13 @@ display: flex; align-items: center; justify-content: center; + background: transparent; border: 1px dashed @ui-action-discreet-border; color: @ui-action-discreet-type; font-weight: bold; padding: 5px 15px; box-sizing: border-box; + width: 100%; } .umb-node-preview-add:hover { 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 be99ffe8f9..0c8d77eabb 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 @@ -16,7 +16,8 @@ function contentPickerController($scope, entityResource, editorState, iconHelper var vm = { labels: { - general_recycleBin: "" + general_recycleBin: "", + general_add: "" } }; @@ -78,6 +79,8 @@ function contentPickerController($scope, entityResource, editorState, iconHelper $scope.renderModel = []; $scope.sortableModel = []; + $scope.labels = vm.labels; + $scope.dialogEditor = editorState && editorState.current && editorState.current.isDialogEditor === true; //the default pre-values @@ -479,9 +482,10 @@ function contentPickerController($scope, entityResource, editorState, iconHelper } function init() { - localizationService.localizeMany(["general_recycleBin"]) + localizationService.localizeMany(["general_recycleBin", "general_add"]) .then(function(data) { vm.labels.general_recycleBin = data[0]; + vm.labels.general_add = data[1]; syncRenderModel(false).then(function () { //everything is loaded, start the watch on the model 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 a589cf8947..cd24988b3d 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 @@ -19,13 +19,17 @@ - +
From a4ac2328f9f67f0739cffbf7d65c0596791e3c32 Mon Sep 17 00:00:00 2001 From: Jan Skovgaard Date: Sun, 15 Sep 2019 15:29:44 +0200 Subject: [PATCH 09/19] =?UTF-8?q?"Actions"=20is=20identified=20as=20a=20bu?= =?UTF-8?q?tton,=20but=20behaves=20like=20a=20drop=20do=E2=80=A6=20(#6303)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/buttons/umbbutton.directive.js | 11 +++++--- .../views/components/buttons/umb-button.html | 25 +++++++++++++------ .../components/editor/umb-editor-menu.html | 13 ++++++---- 3 files changed, 34 insertions(+), 15 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/buttons/umbbutton.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/buttons/umbbutton.directive.js index f026a05c45..56416e3544 100644 --- a/src/Umbraco.Web.UI.Client/src/common/directives/components/buttons/umbbutton.directive.js +++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/buttons/umbbutton.directive.js @@ -67,6 +67,9 @@ Use this directive to render an umbraco button. The directive can be used to gen @param {boolean=} disabled Set to true to disable the button. @param {string=} addEllipsis Adds an ellipsis character (…) to the button label which means the button will open a dialog or prompt the user for more information. @param {string=} showCaret Shows a caret on the right side of the button label +@param {string=} autoFocus add autoFocus to the button +@param {string=} hasPopup Used to expose to the accessibility API whether the button will trigger a popup or not +@param {string=]} isExpanded Used to add an aria-expanded attribute and expose whether the button has expanded a popup or not **/ @@ -96,7 +99,9 @@ Use this directive to render an umbraco button. The directive can be used to gen alias: "@?", addEllipsis: "@?", showCaret: "@?", - autoFocus: "@?" + autoFocus: "@?", + hasPopup: "@?", + isExpanded: " - + {{vm.buttonLabel}} - + - diff --git a/src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor-menu.html b/src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor-menu.html index c621670462..fe90fef07a 100644 --- a/src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor-menu.html +++ b/src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor-menu.html @@ -5,15 +5,18 @@ button-style="white" action="dropdown.isOpen = !dropdown.isOpen" label-key="general_actions" - show-caret="true"> + show-caret="true" + has-popup="true" + is-expanded="dropdown.isOpen" + > - + - - + From dce593d26028a0cefdedfcc6a658d2e6090e5f61 Mon Sep 17 00:00:00 2001 From: Jan Skovgaard Date: Sun, 15 Sep 2019 15:40:22 +0200 Subject: [PATCH 10/19] Add leave function for "Save and publish" options popup #6298 (#6300) --- .../src/views/components/buttons/umb-button-group.html | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/Umbraco.Web.UI.Client/src/views/components/buttons/umb-button-group.html b/src/Umbraco.Web.UI.Client/src/views/components/buttons/umb-button-group.html index de082fb48e..2f5b21ca72 100644 --- a/src/Umbraco.Web.UI.Client/src/views/components/buttons/umb-button-group.html +++ b/src/Umbraco.Web.UI.Client/src/views/components/buttons/umb-button-group.html @@ -31,7 +31,13 @@ - + 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 4f835f4c04..f2c86c46ab 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 @@ -31,10 +31,9 @@ title="Edit {{name}}" ng-if="allowEdit && !editUrl" ng-click="onEdit()" - aria-haspopup="dialog" > Edit - {{name}} + {{name}}... @@ -55,10 +54,9 @@ title="Open {{name}}" ng-if="allowOpen && !openUrl" ng-click="onOpen()" - aria-haspopup="dialog" > Open - {{name}} + {{name}}... 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 cd24988b3d..ab9b078433 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 @@ -26,9 +26,9 @@ ng-click="openCurrentPicker()" id="{{model.alias}}" aria-label="{{model.label}}: {{labels.general_add}}" - aria-haspopup="dialog" > Add + ...
From be0d38f2af8a15b9850708ef38a85eb5f859c884 Mon Sep 17 00:00:00 2001 From: Bjarne Fyrstenborg Date: Mon, 16 Sep 2019 12:56:37 +0200 Subject: [PATCH 15/19] v8: Fix onChange callback in umbCheckbox and umbRadiobutton (#6345) --- .../components/forms/umbcheckbox.directive.js | 10 +++++----- .../components/forms/umbradiobutton.directive.js | 7 ++++--- .../src/views/components/forms/umb-checkbox.html | 2 +- .../src/views/components/forms/umb-radiobutton.html | 2 +- .../checkboxlist/checkboxlist.controller.js | 4 ++-- .../propertyeditors/checkboxlist/checkboxlist.html | 2 +- .../propertyeditors/radiobuttons/radiobuttons.html | 2 +- 7 files changed, 15 insertions(+), 14 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/forms/umbcheckbox.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/forms/umbcheckbox.directive.js index f8643ad191..274d6e1241 100644 --- a/src/Umbraco.Web.UI.Client/src/common/directives/components/forms/umbcheckbox.directive.js +++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/forms/umbcheckbox.directive.js @@ -36,17 +36,17 @@ (function () { 'use strict'; - function UmbCheckboxController($timeout) { var vm = this; - if (vm.onChange) { - $timeout(function() { - vm.onChange({model:vm.model, value:vm.value}); + vm.change = change; + + function change() { + $timeout(function () { + vm.onChange({ model: vm.model, value: vm.value }); }, 0); } - } var component = { diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/forms/umbradiobutton.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/forms/umbradiobutton.directive.js index 933107527b..59c3c3c35d 100644 --- a/src/Umbraco.Web.UI.Client/src/common/directives/components/forms/umbradiobutton.directive.js +++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/forms/umbradiobutton.directive.js @@ -38,12 +38,13 @@ var vm = this; - if (vm.onChange) { + vm.change = change; + + function change() { $timeout(function () { vm.onChange({ model: vm.model, value: vm.value }); }, 0); - } - + } } var component = { diff --git a/src/Umbraco.Web.UI.Client/src/views/components/forms/umb-checkbox.html b/src/Umbraco.Web.UI.Client/src/views/components/forms/umb-checkbox.html index 2f90905c7d..fd3b451e90 100644 --- a/src/Umbraco.Web.UI.Client/src/views/components/forms/umb-checkbox.html +++ b/src/Umbraco.Web.UI.Client/src/views/components/forms/umb-checkbox.html @@ -8,7 +8,7 @@ ng-model="vm.model" ng-disabled="vm.disabled" ng-required="vm.required" - ng-change="vm.onChange()"/> + ng-change="vm.change()"/>