From 89cbe53b632539f037c716ffc2946bdb85c8124c Mon Sep 17 00:00:00 2001 From: bjarnef Date: Tue, 22 Nov 2016 23:00:25 +0100 Subject: [PATCH 01/12] Fix z-index of focal point --- src/Umbraco.Web.UI.Client/src/less/property-editors.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Umbraco.Web.UI.Client/src/less/property-editors.less b/src/Umbraco.Web.UI.Client/src/less/property-editors.less index 573f218fb1..15f1c86a0b 100644 --- a/src/Umbraco.Web.UI.Client/src/less/property-editors.less +++ b/src/Umbraco.Web.UI.Client/src/less/property-editors.less @@ -305,7 +305,7 @@ ul.color-picker li a { top: 0; left: 0; cursor: move; - z-index: 6001; + z-index: 499; position: absolute; } From 3df103eae25d68792880f85d975a5cc56230b8ac Mon Sep 17 00:00:00 2001 From: Marc Goodson Date: Wed, 22 Mar 2017 22:35:53 +0000 Subject: [PATCH 02/12] In reorder mode, present an additional toggle button, to show the individual property editor sort ordinals, in input boxes, enabling their order to be manually overridden (for curating property order on tabs, when properties come from two different compositions) see U4-6738 --- .../components/umbgroupsbuilder.directive.js | 10 ++++++++++ .../src/views/components/umb-groups-builder.html | 9 +++++++++ 2 files changed, 19 insertions(+) diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbgroupsbuilder.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbgroupsbuilder.directive.js index caa79439be..063e7af378 100644 --- a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbgroupsbuilder.directive.js +++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbgroupsbuilder.directive.js @@ -9,6 +9,7 @@ var tabNoSortOrderTranslated = ""; scope.sortingMode = false; + scope.showSortOrdinals = false; scope.toolbar = []; scope.sortableOptionsGroup = {}; scope.sortableOptionsProperty = {}; @@ -240,6 +241,15 @@ } + }; + //show sort order input boxes for property sort order + scope.toggleSortOrderOverride = function (tool) { + if (scope.showSortOrdinals === true) { + scope.showSortOrdinals = false; + } + else { + scope.showSortOrdinals = true; + } }; scope.openCompositionsDialog = function() { diff --git a/src/Umbraco.Web.UI.Client/src/views/components/umb-groups-builder.html b/src/Umbraco.Web.UI.Client/src/views/components/umb-groups-builder.html index 3533255288..e0642b7efa 100644 --- a/src/Umbraco.Web.UI.Client/src/views/components/umb-groups-builder.html +++ b/src/Umbraco.Web.UI.Client/src/views/components/umb-groups-builder.html @@ -22,6 +22,14 @@ action="toggleSortingMode();"> + + + @@ -187,6 +195,7 @@ {{ property.label }} ({{ property.alias }}) + From 51215f11af8495d892308cd59c0fe51f4f0079ce Mon Sep 17 00:00:00 2001 From: Marc Goodson Date: Fri, 24 Mar 2017 10:20:31 +0000 Subject: [PATCH 03/12] toggle the show ordinals label button to hide, when in show ordinal mode --- .../common/directives/components/umbgroupsbuilder.directive.js | 3 +++ .../src/views/components/umb-groups-builder.html | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbgroupsbuilder.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbgroupsbuilder.directive.js index 063e7af378..754d17d95a 100644 --- a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbgroupsbuilder.directive.js +++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbgroupsbuilder.directive.js @@ -14,6 +14,7 @@ scope.sortableOptionsGroup = {}; scope.sortableOptionsProperty = {}; scope.sortingButtonKey = "general_reorder"; + scope.showOrdinalsButtonKey = "general_showOrdinals"; function activate() { @@ -246,9 +247,11 @@ scope.toggleSortOrderOverride = function (tool) { if (scope.showSortOrdinals === true) { scope.showSortOrdinals = false; + scope.showOrdinalsButtonKey = "general_showOrdinals"; } else { scope.showSortOrdinals = true; + scope.showOrdinalsButtonKey = "general_hideOrdinals"; } }; diff --git a/src/Umbraco.Web.UI.Client/src/views/components/umb-groups-builder.html b/src/Umbraco.Web.UI.Client/src/views/components/umb-groups-builder.html index e0642b7efa..2577d21206 100644 --- a/src/Umbraco.Web.UI.Client/src/views/components/umb-groups-builder.html +++ b/src/Umbraco.Web.UI.Client/src/views/components/umb-groups-builder.html @@ -25,7 +25,7 @@ From 8ab2f7c257f28c5da0865d449283a05e57af2573 Mon Sep 17 00:00:00 2001 From: Marc Goodson Date: Fri, 24 Mar 2017 10:21:01 +0000 Subject: [PATCH 04/12] add language translations keys for showOrdinals and hideOrdinals --- src/Umbraco.Web.UI/Umbraco/config/lang/cs.xml | 2 ++ src/Umbraco.Web.UI/umbraco/config/lang/da.xml | 2 ++ src/Umbraco.Web.UI/umbraco/config/lang/de.xml | 2 ++ src/Umbraco.Web.UI/umbraco/config/lang/en.xml | 2 ++ src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml | 2 ++ src/Umbraco.Web.UI/umbraco/config/lang/es.xml | 2 ++ src/Umbraco.Web.UI/umbraco/config/lang/fr.xml | 2 ++ src/Umbraco.Web.UI/umbraco/config/lang/he.xml | 2 ++ src/Umbraco.Web.UI/umbraco/config/lang/it.xml | 2 ++ src/Umbraco.Web.UI/umbraco/config/lang/ja.xml | 2 ++ src/Umbraco.Web.UI/umbraco/config/lang/ko.xml | 2 ++ src/Umbraco.Web.UI/umbraco/config/lang/nl.xml | 2 ++ src/Umbraco.Web.UI/umbraco/config/lang/pl.xml | 2 ++ src/Umbraco.Web.UI/umbraco/config/lang/pt.xml | 2 ++ src/Umbraco.Web.UI/umbraco/config/lang/ru.xml | 2 ++ src/Umbraco.Web.UI/umbraco/config/lang/sv.xml | 2 ++ src/Umbraco.Web.UI/umbraco/config/lang/zh.xml | 2 ++ 17 files changed, 34 insertions(+) diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/cs.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/cs.xml index 50d5c0d911..b15e510e54 100644 --- a/src/Umbraco.Web.UI/Umbraco/config/lang/cs.xml +++ b/src/Umbraco.Web.UI/Umbraco/config/lang/cs.xml @@ -428,6 +428,8 @@ Výsledky hledání Reorder I am done reordering + Show Ordinals + Hide Ordinals Background color diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/da.xml b/src/Umbraco.Web.UI/umbraco/config/lang/da.xml index b0452fb631..ebef4bba83 100644 --- a/src/Umbraco.Web.UI/umbraco/config/lang/da.xml +++ b/src/Umbraco.Web.UI/umbraco/config/lang/da.xml @@ -489,6 +489,8 @@ Søgeresultater Sorter Afslut sortering + Show Ordinals + Hide Ordinals Eksempel Skift kodeord til diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/de.xml b/src/Umbraco.Web.UI/umbraco/config/lang/de.xml index ed7f1e07a2..dba11a74fc 100644 --- a/src/Umbraco.Web.UI/umbraco/config/lang/de.xml +++ b/src/Umbraco.Web.UI/umbraco/config/lang/de.xml @@ -443,6 +443,8 @@ Suchergebnisse Reorder I am done reordering + Show Ordinals + Hide Ordinals Hintergrundfarbe diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/en.xml b/src/Umbraco.Web.UI/umbraco/config/lang/en.xml index f7ac08d837..b5bdcca453 100644 --- a/src/Umbraco.Web.UI/umbraco/config/lang/en.xml +++ b/src/Umbraco.Web.UI/umbraco/config/lang/en.xml @@ -514,6 +514,8 @@ Search results Reorder I am done reordering + Show Ordinals + Hide Ordinals Preview Change password to diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml b/src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml index f68359b0af..50bfb95929 100644 --- a/src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml +++ b/src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml @@ -519,6 +519,8 @@ Search results Reorder I am done reordering + Show Ordinals + Hide Ordinals Preview Change password to diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/es.xml b/src/Umbraco.Web.UI/umbraco/config/lang/es.xml index 09af60593f..4c21b82335 100644 --- a/src/Umbraco.Web.UI/umbraco/config/lang/es.xml +++ b/src/Umbraco.Web.UI/umbraco/config/lang/es.xml @@ -444,6 +444,8 @@ Si Reorder I am done reordering + Show Ordinals + Hide Ordinals Color de fondo diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/fr.xml b/src/Umbraco.Web.UI/umbraco/config/lang/fr.xml index 39cafeef7f..84b4803144 100644 --- a/src/Umbraco.Web.UI/umbraco/config/lang/fr.xml +++ b/src/Umbraco.Web.UI/umbraco/config/lang/fr.xml @@ -509,6 +509,8 @@ Résultats de recherche Réorganiser J'ai fini de réorganiser + Show Ordinals + Hide Ordinals Prévisualiser Modifier le mot de passe vers diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/he.xml b/src/Umbraco.Web.UI/umbraco/config/lang/he.xml index 02d8311c14..07ce2c4e60 100644 --- a/src/Umbraco.Web.UI/umbraco/config/lang/he.xml +++ b/src/Umbraco.Web.UI/umbraco/config/lang/he.xml @@ -367,6 +367,8 @@ כן Reorder I am done reordering + Show Ordinals + Hide Ordinals צבע רקע diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/it.xml b/src/Umbraco.Web.UI/umbraco/config/lang/it.xml index 8be7261a8d..551b8636da 100644 --- a/src/Umbraco.Web.UI/umbraco/config/lang/it.xml +++ b/src/Umbraco.Web.UI/umbraco/config/lang/it.xml @@ -360,6 +360,8 @@ Si Reorder I am done reordering + Show Ordinals + Hide Ordinals Colore di sfondo diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/ja.xml b/src/Umbraco.Web.UI/umbraco/config/lang/ja.xml index d01caaa315..f8b60bfe30 100644 --- a/src/Umbraco.Web.UI/umbraco/config/lang/ja.xml +++ b/src/Umbraco.Web.UI/umbraco/config/lang/ja.xml @@ -489,6 +489,8 @@ 検索結果 順序変更 順序変更終了 + Show Ordinals + Hide Ordinals プレビュー パスワードの変更 ->　 diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/ko.xml b/src/Umbraco.Web.UI/umbraco/config/lang/ko.xml index b72503e987..c0a6d273e8 100644 --- a/src/Umbraco.Web.UI/umbraco/config/lang/ko.xml +++ b/src/Umbraco.Web.UI/umbraco/config/lang/ko.xml @@ -360,6 +360,8 @@ 예 Reorder I am done reordering + Show Ordinals + Hide Ordinals 배경색 diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/nl.xml b/src/Umbraco.Web.UI/umbraco/config/lang/nl.xml index 84ef529bdb..482f207bb5 100644 --- a/src/Umbraco.Web.UI/umbraco/config/lang/nl.xml +++ b/src/Umbraco.Web.UI/umbraco/config/lang/nl.xml @@ -519,6 +519,8 @@ Zoekresultaten Herschik Ik ben klaar met herschikken + Show Ordinals + Hide Ordinals Voorvertoning Wachtwoord veranderen naar diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/pl.xml b/src/Umbraco.Web.UI/umbraco/config/lang/pl.xml index 312e863c36..bed846c51d 100644 --- a/src/Umbraco.Web.UI/umbraco/config/lang/pl.xml +++ b/src/Umbraco.Web.UI/umbraco/config/lang/pl.xml @@ -358,6 +358,8 @@ Możesz dodać dodatkowe języki w menu "Języki" po lewej stronie.]]> Tak Zmień kolejność Kolejność została zmieniona + Show Ordinals + Hide Ordinals Kolor tła diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/pt.xml b/src/Umbraco.Web.UI/umbraco/config/lang/pt.xml index e67a4c4b15..b6859e821f 100644 --- a/src/Umbraco.Web.UI/umbraco/config/lang/pt.xml +++ b/src/Umbraco.Web.UI/umbraco/config/lang/pt.xml @@ -357,6 +357,8 @@ Sim Reorder I am done reordering + Show Ordinals + Hide Ordinals Cor de fundo diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/ru.xml b/src/Umbraco.Web.UI/umbraco/config/lang/ru.xml index c6f94949d2..a133348730 100644 --- a/src/Umbraco.Web.UI/umbraco/config/lang/ru.xml +++ b/src/Umbraco.Web.UI/umbraco/config/lang/ru.xml @@ -557,6 +557,8 @@ Да Пересортировать Пересортировка завершена + Show Ordinals + Hide Ordinals Предпросмотр Сменить пароль к diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/sv.xml b/src/Umbraco.Web.UI/umbraco/config/lang/sv.xml index aeaf8bd49b..dade4c28a5 100644 --- a/src/Umbraco.Web.UI/umbraco/config/lang/sv.xml +++ b/src/Umbraco.Web.UI/umbraco/config/lang/sv.xml @@ -430,6 +430,8 @@ Ja Reorder I am done reordering + Show Ordinals + Hide Ordinals Bakgrundsfärg diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/zh.xml b/src/Umbraco.Web.UI/umbraco/config/lang/zh.xml index b8c933c101..ec2e5cd4c6 100644 --- a/src/Umbraco.Web.UI/umbraco/config/lang/zh.xml +++ b/src/Umbraco.Web.UI/umbraco/config/lang/zh.xml @@ -400,6 +400,8 @@ 是 Reorder I am done reordering + Show Ordinals + Hide Ordinals 背景色 From 3caecf516126570d73c4bd7c01a173b3b87c14e5 Mon Sep 17 00:00:00 2001 From: Claus Date: Thu, 7 Sep 2017 12:57:06 +0200 Subject: [PATCH 05/12] U4-10384 Error when changing content type on media item --- src/Umbraco.Core/Models/PropertyCollection.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Umbraco.Core/Models/PropertyCollection.cs b/src/Umbraco.Core/Models/PropertyCollection.cs index 67a6914739..21c7bf5efc 100644 --- a/src/Umbraco.Core/Models/PropertyCollection.cs +++ b/src/Umbraco.Core/Models/PropertyCollection.cs @@ -95,6 +95,7 @@ namespace Umbraco.Core.Models var property = this[key]; if (item.Value == null && property.Value != null) { + item.Id = property.Id; item.Value = property.Value; } From 598944d3d83753d2e2051a0bdbe3edf50ddb39e2 Mon Sep 17 00:00:00 2001 From: Claus Date: Thu, 7 Sep 2017 13:13:03 +0200 Subject: [PATCH 06/12] ensuring id is only set if unset. --- src/Umbraco.Core/Models/PropertyCollection.cs | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/Umbraco.Core/Models/PropertyCollection.cs b/src/Umbraco.Core/Models/PropertyCollection.cs index 21c7bf5efc..efa5111ecb 100644 --- a/src/Umbraco.Core/Models/PropertyCollection.cs +++ b/src/Umbraco.Core/Models/PropertyCollection.cs @@ -93,9 +93,12 @@ namespace Umbraco.Core.Models //NOTE: Consider checking type before value is set: item.PropertyType.DataTypeId == property.PropertyType.DataTypeId //Transfer the existing value to the new property var property = this[key]; - if (item.Value == null && property.Value != null) + if (item.Id == 0 && property.Id != 0) { item.Id = property.Id; + } + if (item.Value == null && property.Value != null) + { item.Value = property.Value; } From 9c2b0a3ef6ae7eec1ba29d3d3dee984d90cc1d02 Mon Sep 17 00:00:00 2001 From: Mads Rasmussen Date: Thu, 14 Sep 2017 11:04:34 +0200 Subject: [PATCH 07/12] fixes: U4-10413 Composition/Reorder bar gets in the way when editing or adding a property --- src/Umbraco.Web.UI.Client/gulpfile.js | 2 +- src/Umbraco.Web.UI.Client/src/less/components/overlays.less | 2 +- src/Umbraco.Web.UI.Client/src/less/components/umb-lightbox.less | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/gulpfile.js b/src/Umbraco.Web.UI.Client/gulpfile.js index 30ef9c749f..089f55f9bf 100644 --- a/src/Umbraco.Web.UI.Client/gulpfile.js +++ b/src/Umbraco.Web.UI.Client/gulpfile.js @@ -41,7 +41,7 @@ function processLess(files, out) { var processors = [ autoprefixer, - cssnano + cssnano({zindex: false}), ]; return gulp.src(files) diff --git a/src/Umbraco.Web.UI.Client/src/less/components/overlays.less b/src/Umbraco.Web.UI.Client/src/less/components/overlays.less index 0a8dfe6f71..68d3b20cab 100644 --- a/src/Umbraco.Web.UI.Client/src/less/components/overlays.less +++ b/src/Umbraco.Web.UI.Client/src/less/components/overlays.less @@ -2,7 +2,7 @@ position: fixed; overflow: hidden; background: @white; - z-index: 996660; + z-index: 7500; animation: fadeIn 0.2s; box-shadow: 0 10px 20px rgba(0,0,0,0.19), 0 6px 6px rgba(0,0,0,0.23); } diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-lightbox.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-lightbox.less index fb2cc036f4..6fe68ff490 100644 --- a/src/Umbraco.Web.UI.Client/src/less/components/umb-lightbox.less +++ b/src/Umbraco.Web.UI.Client/src/less/components/umb-lightbox.less @@ -6,7 +6,7 @@ left: 0; width: 100%; height: 100%; - z-index: 999; + z-index: 5000; display: flex; align-items: center; justify-content: center; From 26a5682a144cfce4809b0c1614682f4aab7d8f45 Mon Sep 17 00:00:00 2001 From: Warren Buckley Date: Thu, 14 Sep 2017 14:08:00 +0100 Subject: [PATCH 08/12] Revert "add language translations keys for showOrdinals and hideOrdinals" This reverts commit 8ab2f7c257f28c5da0865d449283a05e57af2573. --- src/Umbraco.Web.UI/Umbraco/config/lang/cs.xml | 2 -- src/Umbraco.Web.UI/umbraco/config/lang/da.xml | 2 -- src/Umbraco.Web.UI/umbraco/config/lang/de.xml | 2 -- src/Umbraco.Web.UI/umbraco/config/lang/en.xml | 2 -- src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml | 2 -- src/Umbraco.Web.UI/umbraco/config/lang/es.xml | 2 -- src/Umbraco.Web.UI/umbraco/config/lang/fr.xml | 2 -- src/Umbraco.Web.UI/umbraco/config/lang/he.xml | 2 -- src/Umbraco.Web.UI/umbraco/config/lang/it.xml | 2 -- src/Umbraco.Web.UI/umbraco/config/lang/ja.xml | 2 -- src/Umbraco.Web.UI/umbraco/config/lang/ko.xml | 2 -- src/Umbraco.Web.UI/umbraco/config/lang/nl.xml | 2 -- src/Umbraco.Web.UI/umbraco/config/lang/pl.xml | 2 -- src/Umbraco.Web.UI/umbraco/config/lang/pt.xml | 2 -- src/Umbraco.Web.UI/umbraco/config/lang/ru.xml | 2 -- src/Umbraco.Web.UI/umbraco/config/lang/sv.xml | 2 -- src/Umbraco.Web.UI/umbraco/config/lang/zh.xml | 2 -- 17 files changed, 34 deletions(-) diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/cs.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/cs.xml index b15e510e54..50d5c0d911 100644 --- a/src/Umbraco.Web.UI/Umbraco/config/lang/cs.xml +++ b/src/Umbraco.Web.UI/Umbraco/config/lang/cs.xml @@ -428,8 +428,6 @@ Výsledky hledání Reorder I am done reordering - Show Ordinals - Hide Ordinals Background color diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/da.xml b/src/Umbraco.Web.UI/umbraco/config/lang/da.xml index ebef4bba83..b0452fb631 100644 --- a/src/Umbraco.Web.UI/umbraco/config/lang/da.xml +++ b/src/Umbraco.Web.UI/umbraco/config/lang/da.xml @@ -489,8 +489,6 @@ Søgeresultater Sorter Afslut sortering - Show Ordinals - Hide Ordinals Eksempel Skift kodeord til diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/de.xml b/src/Umbraco.Web.UI/umbraco/config/lang/de.xml index dba11a74fc..ed7f1e07a2 100644 --- a/src/Umbraco.Web.UI/umbraco/config/lang/de.xml +++ b/src/Umbraco.Web.UI/umbraco/config/lang/de.xml @@ -443,8 +443,6 @@ Suchergebnisse Reorder I am done reordering - Show Ordinals - Hide Ordinals Hintergrundfarbe diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/en.xml b/src/Umbraco.Web.UI/umbraco/config/lang/en.xml index b5bdcca453..f7ac08d837 100644 --- a/src/Umbraco.Web.UI/umbraco/config/lang/en.xml +++ b/src/Umbraco.Web.UI/umbraco/config/lang/en.xml @@ -514,8 +514,6 @@ Search results Reorder I am done reordering - Show Ordinals - Hide Ordinals Preview Change password to diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml b/src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml index 50bfb95929..f68359b0af 100644 --- a/src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml +++ b/src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml @@ -519,8 +519,6 @@ Search results Reorder I am done reordering - Show Ordinals - Hide Ordinals Preview Change password to diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/es.xml b/src/Umbraco.Web.UI/umbraco/config/lang/es.xml index 4c21b82335..09af60593f 100644 --- a/src/Umbraco.Web.UI/umbraco/config/lang/es.xml +++ b/src/Umbraco.Web.UI/umbraco/config/lang/es.xml @@ -444,8 +444,6 @@ Si Reorder I am done reordering - Show Ordinals - Hide Ordinals Color de fondo diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/fr.xml b/src/Umbraco.Web.UI/umbraco/config/lang/fr.xml index 84b4803144..39cafeef7f 100644 --- a/src/Umbraco.Web.UI/umbraco/config/lang/fr.xml +++ b/src/Umbraco.Web.UI/umbraco/config/lang/fr.xml @@ -509,8 +509,6 @@ Résultats de recherche Réorganiser J'ai fini de réorganiser - Show Ordinals - Hide Ordinals Prévisualiser Modifier le mot de passe vers diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/he.xml b/src/Umbraco.Web.UI/umbraco/config/lang/he.xml index 07ce2c4e60..02d8311c14 100644 --- a/src/Umbraco.Web.UI/umbraco/config/lang/he.xml +++ b/src/Umbraco.Web.UI/umbraco/config/lang/he.xml @@ -367,8 +367,6 @@ כן Reorder I am done reordering - Show Ordinals - Hide Ordinals צבע רקע diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/it.xml b/src/Umbraco.Web.UI/umbraco/config/lang/it.xml index 551b8636da..8be7261a8d 100644 --- a/src/Umbraco.Web.UI/umbraco/config/lang/it.xml +++ b/src/Umbraco.Web.UI/umbraco/config/lang/it.xml @@ -360,8 +360,6 @@ Si Reorder I am done reordering - Show Ordinals - Hide Ordinals Colore di sfondo diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/ja.xml b/src/Umbraco.Web.UI/umbraco/config/lang/ja.xml index f8b60bfe30..d01caaa315 100644 --- a/src/Umbraco.Web.UI/umbraco/config/lang/ja.xml +++ b/src/Umbraco.Web.UI/umbraco/config/lang/ja.xml @@ -489,8 +489,6 @@ 検索結果 順序変更 順序変更終了 - Show Ordinals - Hide Ordinals プレビュー パスワードの変更 ->　 diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/ko.xml b/src/Umbraco.Web.UI/umbraco/config/lang/ko.xml index c0a6d273e8..b72503e987 100644 --- a/src/Umbraco.Web.UI/umbraco/config/lang/ko.xml +++ b/src/Umbraco.Web.UI/umbraco/config/lang/ko.xml @@ -360,8 +360,6 @@ 예 Reorder I am done reordering - Show Ordinals - Hide Ordinals 배경색 diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/nl.xml b/src/Umbraco.Web.UI/umbraco/config/lang/nl.xml index 482f207bb5..84ef529bdb 100644 --- a/src/Umbraco.Web.UI/umbraco/config/lang/nl.xml +++ b/src/Umbraco.Web.UI/umbraco/config/lang/nl.xml @@ -519,8 +519,6 @@ Zoekresultaten Herschik Ik ben klaar met herschikken - Show Ordinals - Hide Ordinals Voorvertoning Wachtwoord veranderen naar diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/pl.xml b/src/Umbraco.Web.UI/umbraco/config/lang/pl.xml index bed846c51d..312e863c36 100644 --- a/src/Umbraco.Web.UI/umbraco/config/lang/pl.xml +++ b/src/Umbraco.Web.UI/umbraco/config/lang/pl.xml @@ -358,8 +358,6 @@ Możesz dodać dodatkowe języki w menu "Języki" po lewej stronie.]]> Tak Zmień kolejność Kolejność została zmieniona - Show Ordinals - Hide Ordinals Kolor tła diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/pt.xml b/src/Umbraco.Web.UI/umbraco/config/lang/pt.xml index b6859e821f..e67a4c4b15 100644 --- a/src/Umbraco.Web.UI/umbraco/config/lang/pt.xml +++ b/src/Umbraco.Web.UI/umbraco/config/lang/pt.xml @@ -357,8 +357,6 @@ Sim Reorder I am done reordering - Show Ordinals - Hide Ordinals Cor de fundo diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/ru.xml b/src/Umbraco.Web.UI/umbraco/config/lang/ru.xml index a133348730..c6f94949d2 100644 --- a/src/Umbraco.Web.UI/umbraco/config/lang/ru.xml +++ b/src/Umbraco.Web.UI/umbraco/config/lang/ru.xml @@ -557,8 +557,6 @@ Да Пересортировать Пересортировка завершена - Show Ordinals - Hide Ordinals Предпросмотр Сменить пароль к diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/sv.xml b/src/Umbraco.Web.UI/umbraco/config/lang/sv.xml index dade4c28a5..aeaf8bd49b 100644 --- a/src/Umbraco.Web.UI/umbraco/config/lang/sv.xml +++ b/src/Umbraco.Web.UI/umbraco/config/lang/sv.xml @@ -430,8 +430,6 @@ Ja Reorder I am done reordering - Show Ordinals - Hide Ordinals Bakgrundsfärg diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/zh.xml b/src/Umbraco.Web.UI/umbraco/config/lang/zh.xml index ec2e5cd4c6..b8c933c101 100644 --- a/src/Umbraco.Web.UI/umbraco/config/lang/zh.xml +++ b/src/Umbraco.Web.UI/umbraco/config/lang/zh.xml @@ -400,8 +400,6 @@ 是 Reorder I am done reordering - Show Ordinals - Hide Ordinals 背景色 From 07d05c9e0d4ad94e51d06f620ac9b7f9afbf0e5c Mon Sep 17 00:00:00 2001 From: Warren Buckley Date: Thu, 14 Sep 2017 14:09:00 +0100 Subject: [PATCH 09/12] Revert "toggle the show ordinals label button to hide, when in show ordinal mode" This reverts commit 51215f11af8495d892308cd59c0fe51f4f0079ce. --- .../common/directives/components/umbgroupsbuilder.directive.js | 3 --- .../src/views/components/umb-groups-builder.html | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbgroupsbuilder.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbgroupsbuilder.directive.js index 754d17d95a..063e7af378 100644 --- a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbgroupsbuilder.directive.js +++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbgroupsbuilder.directive.js @@ -14,7 +14,6 @@ scope.sortableOptionsGroup = {}; scope.sortableOptionsProperty = {}; scope.sortingButtonKey = "general_reorder"; - scope.showOrdinalsButtonKey = "general_showOrdinals"; function activate() { @@ -247,11 +246,9 @@ scope.toggleSortOrderOverride = function (tool) { if (scope.showSortOrdinals === true) { scope.showSortOrdinals = false; - scope.showOrdinalsButtonKey = "general_showOrdinals"; } else { scope.showSortOrdinals = true; - scope.showOrdinalsButtonKey = "general_hideOrdinals"; } }; diff --git a/src/Umbraco.Web.UI.Client/src/views/components/umb-groups-builder.html b/src/Umbraco.Web.UI.Client/src/views/components/umb-groups-builder.html index 2577d21206..e0642b7efa 100644 --- a/src/Umbraco.Web.UI.Client/src/views/components/umb-groups-builder.html +++ b/src/Umbraco.Web.UI.Client/src/views/components/umb-groups-builder.html @@ -25,7 +25,7 @@ From 2b0ea45da961fd8a32cd1b5868734a96d673ba78 Mon Sep 17 00:00:00 2001 From: Warren Buckley Date: Thu, 14 Sep 2017 14:13:42 +0100 Subject: [PATCH 10/12] Remove the extra button/click in the UI & show the property sortOrder value when we are sorting --- .../src/views/components/umb-groups-builder.html | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/views/components/umb-groups-builder.html b/src/Umbraco.Web.UI.Client/src/views/components/umb-groups-builder.html index e0642b7efa..860180bcb3 100644 --- a/src/Umbraco.Web.UI.Client/src/views/components/umb-groups-builder.html +++ b/src/Umbraco.Web.UI.Client/src/views/components/umb-groups-builder.html @@ -22,14 +22,6 @@ action="toggleSortingMode();"> - - - @@ -195,7 +187,7 @@ {{ property.label }} ({{ property.alias }}) - + From ac3eaf43cba3bcf6401ba8113b294a00ab76a586 Mon Sep 17 00:00:00 2001 From: Warren Buckley Date: Thu, 14 Sep 2017 14:16:47 +0100 Subject: [PATCH 11/12] Forgot to revert the logic for the extra button/label click to show the sort order on properties --- .../components/umbgroupsbuilder.directive.js | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbgroupsbuilder.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbgroupsbuilder.directive.js index 063e7af378..caa79439be 100644 --- a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbgroupsbuilder.directive.js +++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbgroupsbuilder.directive.js @@ -9,7 +9,6 @@ var tabNoSortOrderTranslated = ""; scope.sortingMode = false; - scope.showSortOrdinals = false; scope.toolbar = []; scope.sortableOptionsGroup = {}; scope.sortableOptionsProperty = {}; @@ -241,15 +240,6 @@ } - }; - //show sort order input boxes for property sort order - scope.toggleSortOrderOverride = function (tool) { - if (scope.showSortOrdinals === true) { - scope.showSortOrdinals = false; - } - else { - scope.showSortOrdinals = true; - } }; scope.openCompositionsDialog = function() { From bca46f11ad8436d0173a5e433de849bcb1a13dbc Mon Sep 17 00:00:00 2001 From: Sebastiaan Janssen Date: Thu, 14 Sep 2017 16:11:23 +0200 Subject: [PATCH 12/12] Makes the sort order input same size as the one on tabs --- .../src/views/components/umb-groups-builder.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Umbraco.Web.UI.Client/src/views/components/umb-groups-builder.html b/src/Umbraco.Web.UI.Client/src/views/components/umb-groups-builder.html index c2fefbeae7..98e2443085 100644 --- a/src/Umbraco.Web.UI.Client/src/views/components/umb-groups-builder.html +++ b/src/Umbraco.Web.UI.Client/src/views/components/umb-groups-builder.html @@ -187,7 +187,7 @@ {{ property.label }} ({{ property.alias }}) - +