From b72d52bf90bac1ed1aa4babdc44ed1756af6bc97 Mon Sep 17 00:00:00 2001 From: Lesley Date: Thu, 18 Feb 2016 17:16:01 +0000 Subject: [PATCH 01/10] Fix U4-8029 The div was too wide so description text was unreadable. --- .../src/views/propertyeditors/grid/grid.prevalues.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.prevalues.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.prevalues.html index 3061f01c29..9d9626694a 100644 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.prevalues.html +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.prevalues.html @@ -1,5 +1,5 @@
-
+

From 233e3d9387f2022f524fd981cb74e9fa1fb1e029 Mon Sep 17 00:00:00 2001 From: bjarnef Date: Sun, 27 Mar 2016 19:07:09 +0200 Subject: [PATCH 02/10] Fix issues with tree icons + legacy icons --- .../components/tree/umbtreeitem.directive.js | 11 +++++------ src/Umbraco.Web.UI.Client/src/less/hacks.less | 8 ++++++-- src/Umbraco.Web.UI.Client/src/less/tree.less | 19 +++++++++++++------ 3 files changed, 24 insertions(+), 14 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/tree/umbtreeitem.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/tree/umbtreeitem.directive.js index 20fdc6e332..f4fe0db4e6 100644 --- a/src/Umbraco.Web.UI.Client/src/common/directives/components/tree/umbtreeitem.directive.js +++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/tree/umbtreeitem.directive.js @@ -34,7 +34,7 @@ angular.module("umbraco.directives") //TODO: Remove more of the binding from this template and move the DOM manipulation to be manually done in the link function, // this will greatly improve performance since there's potentially a lot of nodes being rendered = a LOT of watches! - template: '
  • ' + + template: '
  • ' + '
    ' + //NOTE: This ins element is used to display the search icon if the node is a container/listview and the tree is currently in dialog //'' + @@ -72,14 +72,13 @@ angular.module("umbraco.directives") //set the padding .css("padding-left", (node.level * 20) + "px"); - //remove first 'ins' if there is no children - //show/hide last 'ins' depending on children + //toggle visibility of last 'ins' depending on children + //visibility still ensure the space is "reserved", so both nodes with and without children are aligned. if (!node.hasChildren) { - element.find("ins:first").remove(); - element.find("ins").last().hide(); + element.find("ins").last().css("visibility", "hidden"); } else { - element.find("ins").last().show(); + element.find("ins").last().css("visibility", "visible"); } var icon = element.find("i:first"); diff --git a/src/Umbraco.Web.UI.Client/src/less/hacks.less b/src/Umbraco.Web.UI.Client/src/less/hacks.less index 0d41eed050..fb809af015 100644 --- a/src/Umbraco.Web.UI.Client/src/less/hacks.less +++ b/src/Umbraco.Web.UI.Client/src/less/hacks.less @@ -63,9 +63,13 @@ iframe, .content-column-body { /*tree legacy icon*/ -.legacy-custom-file{ - width: 16px; height: 16px; margin-right: 11px; display: inline-block; +.legacy-custom-file { + width: 16px; + height: 16px; + min-width: 20px; /* this ensure the icon takes up same space as font-icon (20px) */ + display: inline-block; background-position: center center; + background-repeat: no-repeat; } /* diff --git a/src/Umbraco.Web.UI.Client/src/less/tree.less b/src/Umbraco.Web.UI.Client/src/less/tree.less index 185b5a6e3b..61286c05a9 100644 --- a/src/Umbraco.Web.UI.Client/src/less/tree.less +++ b/src/Umbraco.Web.UI.Client/src/less/tree.less @@ -155,6 +155,11 @@ display: flex; } +.umb-tree li > div:hover a:not(.umb-options) { + overflow: hidden; + margin-right: 6px; +} + .umb-tree .icon { vertical-align: middle; margin: 0 13px 0 0; @@ -477,7 +482,6 @@ div.locked:before{ width:100%; height:1px; overflow:hidden; - position: absolute; left: 0; bottom: 0; @@ -495,15 +499,18 @@ div.locked:before{ /*body.touch .umb-tree .icon{font-size: 19px;}*/ body.touch .umb-tree ins{font-size: 14px; visibility: visible; padding: 7px;} -body.touch .umb-tree li div { +body.touch .umb-tree li > div { padding-top: 8px; padding-bottom: 8px; font-size: 110%; } -body.touch .umb-actions a{ - padding: 7px 25px 7px 20px; - font-size: 110%; +// change height of this if touch devices should have a different height of preloader. +body.touch .umb-tree li div.l div { + padding: 0; } -body.touch a.umb-options i {margin-top: 20px;} +body.touch .umb-actions a { + padding: 7px 25px 7px 20px; + font-size: 110%; +} \ No newline at end of file From 0c9dcc1f5ad65b761588b889795b7b524653f906 Mon Sep 17 00:00:00 2001 From: bjarnef Date: Mon, 28 Mar 2016 01:47:01 +0200 Subject: [PATCH 03/10] Fix errors when saving document type when no icon is selected. --- .../editor/umbeditorheader.directive.js | 23 ++++++++++++------- .../src/common/services/iconhelper.service.js | 13 +++++++++-- .../common/dialogs/iconpicker.controller.js | 11 +++++---- 3 files changed, 32 insertions(+), 15 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/editor/umbeditorheader.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/editor/umbeditorheader.directive.js index 1f12164b18..cc57eb6e74 100644 --- a/src/Umbraco.Web.UI.Client/src/common/directives/components/editor/umbeditorheader.directive.js +++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/editor/umbeditorheader.directive.js @@ -212,15 +212,22 @@ Use this directive to construct a header inside the main editor window. scope.dialogModel = { view: "iconpicker", show: true, - submit: function(model) { - if (model.color) { - scope.icon = model.icon + " " + model.color; - } else { - scope.icon = model.icon; - } + submit: function (model) { - // set form to dirty - ctrl.$setDirty(); + /* ensure an icon is selected, because on focus on close button + or an element in background no icon is submitted. So don't clear/update existing icon/preview. + */ + if (model.icon) { + + if (model.color) { + scope.icon = model.icon + " " + model.color; + } else { + scope.icon = model.icon; + } + + // set form to dirty + ctrl.$setDirty(); + } scope.dialogModel.show = false; scope.dialogModel = null; diff --git a/src/Umbraco.Web.UI.Client/src/common/services/iconhelper.service.js b/src/Umbraco.Web.UI.Client/src/common/services/iconhelper.service.js index 6d83c1b907..04194838ab 100644 --- a/src/Umbraco.Web.UI.Client/src/common/services/iconhelper.service.js +++ b/src/Umbraco.Web.UI.Client/src/common/services/iconhelper.service.js @@ -109,11 +109,16 @@ function iconHelper($q, $timeout) { }, formatContentTypeIcons: function (contentTypes) { for (var i = 0; i < contentTypes.length; i++) { - contentTypes[i].icon = this.convertFromLegacyIcon(contentTypes[i].icon); + if (!contentTypes[i].icon) { + //just to be safe (e.g. when focus was on close link and hitting save) + contentTypes[i].icon = "icon-document"; // default icon + } else { + contentTypes[i].icon = this.convertFromLegacyIcon(contentTypes[i].icon); + } //couldnt find replacement if(contentTypes[i].icon.indexOf(".") > 0){ - contentTypes[i].icon = "icon-document-dashed-line"; + contentTypes[i].icon = "icon-document-dashed-line"; } } return contentTypes; @@ -128,6 +133,10 @@ function iconHelper($q, $timeout) { }, /** If the icon is legacy */ isLegacyIcon: function (icon) { + if(!icon) { + return false; + } + if(icon.startsWith('..')){ return false; } diff --git a/src/Umbraco.Web.UI.Client/src/views/common/dialogs/iconpicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/dialogs/iconpicker.controller.js index de71977ebe..ec1ad6e663 100644 --- a/src/Umbraco.Web.UI.Client/src/views/common/dialogs/iconpicker.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/common/dialogs/iconpicker.controller.js @@ -7,13 +7,14 @@ angular.module("umbraco") $scope.icons = icons; }); - $scope.submitClass = function(icon){ - if($scope.color) - { + $scope.submitClass = function (icon) { + if($scope.color) { $scope.submit(icon + " " + $scope.color); - }else{ - $scope.submit(icon); + } + else { + $scope.submit(icon); } }; + } ); \ No newline at end of file From 30e9a1ef82549c15493fbf791ae2305d9c9de948 Mon Sep 17 00:00:00 2001 From: bjarnef Date: Mon, 28 Mar 2016 02:29:03 +0200 Subject: [PATCH 04/10] Don't set dirty when just filtering icons. --- .../src/views/common/dialogs/iconpicker.html | 5 +++-- .../src/views/common/overlays/iconpicker/iconpicker.html | 3 ++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/views/common/dialogs/iconpicker.html b/src/Umbraco.Web.UI.Client/src/views/common/dialogs/iconpicker.html index 260d8ff85c..96ab990447 100644 --- a/src/Umbraco.Web.UI.Client/src/views/common/dialogs/iconpicker.html +++ b/src/Umbraco.Web.UI.Client/src/views/common/dialogs/iconpicker.html @@ -4,10 +4,11 @@
    + placeholder="Filter..." + no-dirty-check>
    • diff --git a/src/Umbraco.Web.UI.Client/src/views/common/overlays/iconpicker/iconpicker.html b/src/Umbraco.Web.UI.Client/src/views/common/overlays/iconpicker/iconpicker.html index 83a02a4504..0091289e6e 100644 --- a/src/Umbraco.Web.UI.Client/src/views/common/overlays/iconpicker/iconpicker.html +++ b/src/Umbraco.Web.UI.Client/src/views/common/overlays/iconpicker/iconpicker.html @@ -9,7 +9,8 @@ class="umb-search-field search-query input-block-level" localize="placeholder" placeholder="@placeholders_filter" - umb-auto-focus> + umb-auto-focus + no-dirty-check>
    From 3564e702594385770c553bd13dd4a8354f1013e2 Mon Sep 17 00:00:00 2001 From: bjarnef Date: Mon, 18 Apr 2016 20:42:19 +0200 Subject: [PATCH 05/10] Localize "unsaved changes" dialog. --- .../views/common/notifications/confirmroutechange.html | 10 +++++----- src/Umbraco.Web.UI/Umbraco/config/lang/cs.xml | 6 ++++++ src/Umbraco.Web.UI/Umbraco/config/lang/nb.xml | 6 ++++++ src/Umbraco.Web.UI/umbraco/config/lang/da.xml | 6 ++++++ src/Umbraco.Web.UI/umbraco/config/lang/de.xml | 6 ++++++ src/Umbraco.Web.UI/umbraco/config/lang/en.xml | 6 ++++++ src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml | 6 ++++++ src/Umbraco.Web.UI/umbraco/config/lang/es.xml | 6 ++++++ src/Umbraco.Web.UI/umbraco/config/lang/fr.xml | 6 ++++++ src/Umbraco.Web.UI/umbraco/config/lang/he.xml | 6 ++++++ src/Umbraco.Web.UI/umbraco/config/lang/it.xml | 6 ++++++ src/Umbraco.Web.UI/umbraco/config/lang/ja.xml | 6 ++++++ src/Umbraco.Web.UI/umbraco/config/lang/ko.xml | 6 ++++++ src/Umbraco.Web.UI/umbraco/config/lang/nl.xml | 6 ++++++ src/Umbraco.Web.UI/umbraco/config/lang/pl.xml | 6 ++++++ src/Umbraco.Web.UI/umbraco/config/lang/pt.xml | 6 ++++++ src/Umbraco.Web.UI/umbraco/config/lang/ru.xml | 6 ++++++ src/Umbraco.Web.UI/umbraco/config/lang/sv.xml | 6 ++++++ src/Umbraco.Web.UI/umbraco/config/lang/zh.xml | 6 ++++++ 19 files changed, 113 insertions(+), 5 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/views/common/notifications/confirmroutechange.html b/src/Umbraco.Web.UI.Client/src/views/common/notifications/confirmroutechange.html index 80942baaeb..c3b72f67a8 100644 --- a/src/Umbraco.Web.UI.Client/src/views/common/notifications/confirmroutechange.html +++ b/src/Umbraco.Web.UI.Client/src/views/common/notifications/confirmroutechange.html @@ -1,7 +1,7 @@
    -

    You have unsaved changes

    -

    Are you sure you want to navigate away from this page? - you have unsaved changes

    +

    You have unsaved changes

    +

    Are you sure you want to navigate away from this page? - you have unsaved changes

    - - -
    + + +
    \ No newline at end of file diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/cs.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/cs.xml index 62aeb85cc0..7d6c52ad9b 100644 --- a/src/Umbraco.Web.UI/Umbraco/config/lang/cs.xml +++ b/src/Umbraco.Web.UI/Umbraco/config/lang/cs.xml @@ -179,6 +179,12 @@ Navštívit Vítejte + + Stay + Discard changes + You have unsaved changes + Are you sure you want to navigate away from this page? - you have unsaved changes + Název Spravovat názvy hostitelů diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/nb.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/nb.xml index a02fa21219..47bf684818 100644 --- a/src/Umbraco.Web.UI/Umbraco/config/lang/nb.xml +++ b/src/Umbraco.Web.UI/Umbraco/config/lang/nb.xml @@ -186,6 +186,12 @@ Besøk Velkommen + + Stay + Discard changes + You have unsaved changes + Are you sure you want to navigate away from this page? - you have unsaved changes + Navn på lokal link Rediger domener diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/da.xml b/src/Umbraco.Web.UI/umbraco/config/lang/da.xml index 446796dd88..4c3dcc749f 100644 --- a/src/Umbraco.Web.UI/umbraco/config/lang/da.xml +++ b/src/Umbraco.Web.UI/umbraco/config/lang/da.xml @@ -187,6 +187,12 @@ Besøg Velkommen + + Bliv + Kassér ændringer + Du har ikke-gemte ændringer + Er du sikker på du vil navigere væk fra denne side? - du har ikke-gemte ændringer + Navn på lokalt link Rediger domæner diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/de.xml b/src/Umbraco.Web.UI/umbraco/config/lang/de.xml index 1dab89a922..a3f40cc0ea 100644 --- a/src/Umbraco.Web.UI/umbraco/config/lang/de.xml +++ b/src/Umbraco.Web.UI/umbraco/config/lang/de.xml @@ -186,6 +186,12 @@ Besuchen Willkommen + + Stay + Discard changes + You have unsaved changes + Are you sure you want to navigate away from this page? - you have unsaved changes + Name Hostnamen verwalten diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/en.xml b/src/Umbraco.Web.UI/umbraco/config/lang/en.xml index b810183d42..7b476e5e8b 100644 --- a/src/Umbraco.Web.UI/umbraco/config/lang/en.xml +++ b/src/Umbraco.Web.UI/umbraco/config/lang/en.xml @@ -197,6 +197,12 @@ Visit Welcome + + Stay + Discard changes + You have unsaved changes + Are you sure you want to navigate away from this page? - you have unsaved changes + Name Manage hostnames 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 402902f48c..534185e5db 100644 --- a/src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml +++ b/src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml @@ -199,6 +199,12 @@ Visit Welcome + + Stay + Discard changes + You have unsaved changes + Are you sure you want to navigate away from this page? - you have unsaved changes + Name Manage hostnames diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/es.xml b/src/Umbraco.Web.UI/umbraco/config/lang/es.xml index c1478abbb1..9e79db1efa 100644 --- a/src/Umbraco.Web.UI/umbraco/config/lang/es.xml +++ b/src/Umbraco.Web.UI/umbraco/config/lang/es.xml @@ -185,6 +185,12 @@ Visita Bienvenido + + Stay + Discard changes + You have unsaved changes + Are you sure you want to navigate away from this page? - you have unsaved changes + Nombre Administrar dominios diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/fr.xml b/src/Umbraco.Web.UI/umbraco/config/lang/fr.xml index a0842c8821..45153d78fa 100644 --- a/src/Umbraco.Web.UI/umbraco/config/lang/fr.xml +++ b/src/Umbraco.Web.UI/umbraco/config/lang/fr.xml @@ -181,6 +181,12 @@ Visiter Bienvenue + + Stay + Discard changes + You have unsaved changes + Are you sure you want to navigate away from this page? - you have unsaved changes + Name Gérer les noms d'hôtes diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/he.xml b/src/Umbraco.Web.UI/umbraco/config/lang/he.xml index 4b006e8524..fab17bb6a4 100644 --- a/src/Umbraco.Web.UI/umbraco/config/lang/he.xml +++ b/src/Umbraco.Web.UI/umbraco/config/lang/he.xml @@ -131,6 +131,12 @@ בקר ברוכים הבאים + + Stay + Discard changes + You have unsaved changes + Are you sure you want to navigate away from this page? - you have unsaved changes + שם ניהול שם מתחם diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/it.xml b/src/Umbraco.Web.UI/umbraco/config/lang/it.xml index d07d0cb049..7c26a2538a 100644 --- a/src/Umbraco.Web.UI/umbraco/config/lang/it.xml +++ b/src/Umbraco.Web.UI/umbraco/config/lang/it.xml @@ -127,6 +127,12 @@ Visita Benvenuto + + Stay + Discard changes + You have unsaved changes + Are you sure you want to navigate away from this page? - you have unsaved changes + Nome Gestione alias Hostnames diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/ja.xml b/src/Umbraco.Web.UI/umbraco/config/lang/ja.xml index e1b675b208..177e9d6aa5 100644 --- a/src/Umbraco.Web.UI/umbraco/config/lang/ja.xml +++ b/src/Umbraco.Web.UI/umbraco/config/lang/ja.xml @@ -194,6 +194,12 @@ 訪れる ようこそ + + Stay + Discard changes + You have unsaved changes + Are you sure you want to navigate away from this page? - you have unsaved changes + 名前 ドメインの割り当て diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/ko.xml b/src/Umbraco.Web.UI/umbraco/config/lang/ko.xml index ee8db9901c..db0aa62d11 100644 --- a/src/Umbraco.Web.UI/umbraco/config/lang/ko.xml +++ b/src/Umbraco.Web.UI/umbraco/config/lang/ko.xml @@ -125,6 +125,12 @@ 방문 환영합니다 + + Stay + Discard changes + You have unsaved changes + Are you sure you want to navigate away from this page? - you have unsaved changes + 이름 호스트네임 관리 diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/nl.xml b/src/Umbraco.Web.UI/umbraco/config/lang/nl.xml index 9c8f587ca2..9fb6f51402 100644 --- a/src/Umbraco.Web.UI/umbraco/config/lang/nl.xml +++ b/src/Umbraco.Web.UI/umbraco/config/lang/nl.xml @@ -188,6 +188,12 @@ Bezoek Welkom + + Stay + Discard changes + You have unsaved changes + Are you sure you want to navigate away from this page? - you have unsaved changes + Naam Beheer domeinnamen diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/pl.xml b/src/Umbraco.Web.UI/umbraco/config/lang/pl.xml index 3c24885eb3..1a3058e289 100644 --- a/src/Umbraco.Web.UI/umbraco/config/lang/pl.xml +++ b/src/Umbraco.Web.UI/umbraco/config/lang/pl.xml @@ -125,6 +125,12 @@ Odwiedź Witaj + + Stay + Discard changes + You have unsaved changes + Are you sure you want to navigate away from this page? - you have unsaved changes + Nazwa Zarządzaj nazwami hostów diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/pt.xml b/src/Umbraco.Web.UI/umbraco/config/lang/pt.xml index 4c039524ab..736bb7a507 100644 --- a/src/Umbraco.Web.UI/umbraco/config/lang/pt.xml +++ b/src/Umbraco.Web.UI/umbraco/config/lang/pt.xml @@ -125,6 +125,12 @@ Visitar Bem Vindo(a) + + Stay + Discard changes + You have unsaved changes + Are you sure you want to navigate away from this page? - you have unsaved changes + Nome Gerenciar hostnames diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/ru.xml b/src/Umbraco.Web.UI/umbraco/config/lang/ru.xml index fbf0e0adf2..8f039dcc71 100644 --- a/src/Umbraco.Web.UI/umbraco/config/lang/ru.xml +++ b/src/Umbraco.Web.UI/umbraco/config/lang/ru.xml @@ -254,6 +254,12 @@ Посетить Рады приветствовать + + Stay + Discard changes + You have unsaved changes + Are you sure you want to navigate away from this page? - you have unsaved changes + Название Управление доменами diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/sv.xml b/src/Umbraco.Web.UI/umbraco/config/lang/sv.xml index b620ecc168..c397c735b3 100644 --- a/src/Umbraco.Web.UI/umbraco/config/lang/sv.xml +++ b/src/Umbraco.Web.UI/umbraco/config/lang/sv.xml @@ -181,6 +181,12 @@ Välkommen Besök + + Stay + Discard changes + You have unsaved changes + Are you sure you want to navigate away from this page? - you have unsaved changes + Namn Hantera domännamn diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/zh.xml b/src/Umbraco.Web.UI/umbraco/config/lang/zh.xml index 6237bb4f07..69f938c42d 100644 --- a/src/Umbraco.Web.UI/umbraco/config/lang/zh.xml +++ b/src/Umbraco.Web.UI/umbraco/config/lang/zh.xml @@ -166,6 +166,12 @@ 访问 欢迎 + + Stay + Discard changes + You have unsaved changes + Are you sure you want to navigate away from this page? - you have unsaved changes + 锚点名称 管理主机名 From bad137231375c1baac24b12e808ae36f3fde542c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=B8ren=20Gregersen?= Date: Sat, 23 Apr 2016 15:58:18 +0200 Subject: [PATCH 06/10] Update ICacheProvider.cs Not really an abstract class... :) --- src/Umbraco.Core/Cache/ICacheProvider.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Umbraco.Core/Cache/ICacheProvider.cs b/src/Umbraco.Core/Cache/ICacheProvider.cs index 0d2bb1bdb6..e53123d7e8 100644 --- a/src/Umbraco.Core/Cache/ICacheProvider.cs +++ b/src/Umbraco.Core/Cache/ICacheProvider.cs @@ -4,7 +4,7 @@ using System.Collections.Generic; namespace Umbraco.Core.Cache { /// - /// An abstract class for implementing a basic cache provider + /// An interface for implementing a basic cache provider /// public interface ICacheProvider { @@ -65,4 +65,4 @@ namespace Umbraco.Core.Cache object GetCacheItem(string cacheKey, Func getCacheItem); } -} \ No newline at end of file +} From fcdf212c4cbf7246901e1b9afd663d053f27417e Mon Sep 17 00:00:00 2001 From: bjarnef Date: Sun, 24 Apr 2016 18:42:46 +0200 Subject: [PATCH 07/10] Rename area alias --- .../views/common/notifications/confirmroutechange.html | 8 ++++---- src/Umbraco.Web.UI/Umbraco/config/lang/cs.xml | 2 +- src/Umbraco.Web.UI/Umbraco/config/lang/nb.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 +- 19 files changed, 22 insertions(+), 22 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/views/common/notifications/confirmroutechange.html b/src/Umbraco.Web.UI.Client/src/views/common/notifications/confirmroutechange.html index c3b72f67a8..0b2926307c 100644 --- a/src/Umbraco.Web.UI.Client/src/views/common/notifications/confirmroutechange.html +++ b/src/Umbraco.Web.UI.Client/src/views/common/notifications/confirmroutechange.html @@ -1,7 +1,7 @@
    -

    You have unsaved changes

    -

    Are you sure you want to navigate away from this page? - you have unsaved changes

    +

    You have unsaved changes

    +

    Are you sure you want to navigate away from this page? - you have unsaved changes

    - - + +
    \ No newline at end of file diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/cs.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/cs.xml index 7d6c52ad9b..1ae28daafe 100644 --- a/src/Umbraco.Web.UI/Umbraco/config/lang/cs.xml +++ b/src/Umbraco.Web.UI/Umbraco/config/lang/cs.xml @@ -179,7 +179,7 @@ Navštívit Vítejte - + Stay Discard changes You have unsaved changes diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/nb.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/nb.xml index 47bf684818..275267e98c 100644 --- a/src/Umbraco.Web.UI/Umbraco/config/lang/nb.xml +++ b/src/Umbraco.Web.UI/Umbraco/config/lang/nb.xml @@ -186,7 +186,7 @@ Besøk Velkommen - + Stay Discard changes You have unsaved changes diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/da.xml b/src/Umbraco.Web.UI/umbraco/config/lang/da.xml index 4c3dcc749f..56d8384bb1 100644 --- a/src/Umbraco.Web.UI/umbraco/config/lang/da.xml +++ b/src/Umbraco.Web.UI/umbraco/config/lang/da.xml @@ -187,7 +187,7 @@ Besøg Velkommen - + Bliv Kassér ændringer Du har ikke-gemte ændringer diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/de.xml b/src/Umbraco.Web.UI/umbraco/config/lang/de.xml index a3f40cc0ea..3b4c1ee5ab 100644 --- a/src/Umbraco.Web.UI/umbraco/config/lang/de.xml +++ b/src/Umbraco.Web.UI/umbraco/config/lang/de.xml @@ -186,7 +186,7 @@ Besuchen Willkommen - + Stay Discard changes You have unsaved changes diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/en.xml b/src/Umbraco.Web.UI/umbraco/config/lang/en.xml index 7b476e5e8b..0c21e157a6 100644 --- a/src/Umbraco.Web.UI/umbraco/config/lang/en.xml +++ b/src/Umbraco.Web.UI/umbraco/config/lang/en.xml @@ -197,7 +197,7 @@ Visit Welcome - + Stay Discard changes You have unsaved changes 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 534185e5db..4ebcad987c 100644 --- a/src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml +++ b/src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml @@ -199,7 +199,7 @@ Visit Welcome - + Stay Discard changes You have unsaved changes diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/es.xml b/src/Umbraco.Web.UI/umbraco/config/lang/es.xml index 9e79db1efa..80e39fe219 100644 --- a/src/Umbraco.Web.UI/umbraco/config/lang/es.xml +++ b/src/Umbraco.Web.UI/umbraco/config/lang/es.xml @@ -185,7 +185,7 @@ Visita Bienvenido - + Stay Discard changes You have unsaved changes diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/fr.xml b/src/Umbraco.Web.UI/umbraco/config/lang/fr.xml index 45153d78fa..59021956a5 100644 --- a/src/Umbraco.Web.UI/umbraco/config/lang/fr.xml +++ b/src/Umbraco.Web.UI/umbraco/config/lang/fr.xml @@ -181,7 +181,7 @@ Visiter Bienvenue - + Stay Discard changes You have unsaved changes diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/he.xml b/src/Umbraco.Web.UI/umbraco/config/lang/he.xml index fab17bb6a4..aa9c2112e2 100644 --- a/src/Umbraco.Web.UI/umbraco/config/lang/he.xml +++ b/src/Umbraco.Web.UI/umbraco/config/lang/he.xml @@ -131,7 +131,7 @@ בקר ברוכים הבאים - + Stay Discard changes You have unsaved changes diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/it.xml b/src/Umbraco.Web.UI/umbraco/config/lang/it.xml index 7c26a2538a..9c0682eba0 100644 --- a/src/Umbraco.Web.UI/umbraco/config/lang/it.xml +++ b/src/Umbraco.Web.UI/umbraco/config/lang/it.xml @@ -127,7 +127,7 @@ Visita Benvenuto - + Stay Discard changes You have unsaved changes diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/ja.xml b/src/Umbraco.Web.UI/umbraco/config/lang/ja.xml index 177e9d6aa5..6acfd997e1 100644 --- a/src/Umbraco.Web.UI/umbraco/config/lang/ja.xml +++ b/src/Umbraco.Web.UI/umbraco/config/lang/ja.xml @@ -194,7 +194,7 @@ 訪れる ようこそ - + Stay Discard changes You have unsaved changes diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/ko.xml b/src/Umbraco.Web.UI/umbraco/config/lang/ko.xml index db0aa62d11..c7178e312b 100644 --- a/src/Umbraco.Web.UI/umbraco/config/lang/ko.xml +++ b/src/Umbraco.Web.UI/umbraco/config/lang/ko.xml @@ -125,7 +125,7 @@ 방문 환영합니다 - + Stay Discard changes You have unsaved changes diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/nl.xml b/src/Umbraco.Web.UI/umbraco/config/lang/nl.xml index 9fb6f51402..7d1a4cc2d3 100644 --- a/src/Umbraco.Web.UI/umbraco/config/lang/nl.xml +++ b/src/Umbraco.Web.UI/umbraco/config/lang/nl.xml @@ -188,7 +188,7 @@ Bezoek Welkom - + Stay Discard changes You have unsaved changes diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/pl.xml b/src/Umbraco.Web.UI/umbraco/config/lang/pl.xml index 1a3058e289..c2c8b4d073 100644 --- a/src/Umbraco.Web.UI/umbraco/config/lang/pl.xml +++ b/src/Umbraco.Web.UI/umbraco/config/lang/pl.xml @@ -125,7 +125,7 @@ Odwiedź Witaj - + Stay Discard changes You have unsaved changes diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/pt.xml b/src/Umbraco.Web.UI/umbraco/config/lang/pt.xml index 736bb7a507..016f7c2a19 100644 --- a/src/Umbraco.Web.UI/umbraco/config/lang/pt.xml +++ b/src/Umbraco.Web.UI/umbraco/config/lang/pt.xml @@ -125,7 +125,7 @@ Visitar Bem Vindo(a) - + Stay Discard changes You have unsaved changes diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/ru.xml b/src/Umbraco.Web.UI/umbraco/config/lang/ru.xml index 8f039dcc71..e162dbaead 100644 --- a/src/Umbraco.Web.UI/umbraco/config/lang/ru.xml +++ b/src/Umbraco.Web.UI/umbraco/config/lang/ru.xml @@ -254,7 +254,7 @@ Посетить Рады приветствовать - + Stay Discard changes You have unsaved changes diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/sv.xml b/src/Umbraco.Web.UI/umbraco/config/lang/sv.xml index c397c735b3..ea1f0c9ef0 100644 --- a/src/Umbraco.Web.UI/umbraco/config/lang/sv.xml +++ b/src/Umbraco.Web.UI/umbraco/config/lang/sv.xml @@ -181,7 +181,7 @@ Välkommen Besök - + Stay Discard changes You have unsaved changes diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/zh.xml b/src/Umbraco.Web.UI/umbraco/config/lang/zh.xml index 69f938c42d..372bc480cc 100644 --- a/src/Umbraco.Web.UI/umbraco/config/lang/zh.xml +++ b/src/Umbraco.Web.UI/umbraco/config/lang/zh.xml @@ -166,7 +166,7 @@ 访问 欢迎 - + Stay Discard changes You have unsaved changes From 9b39f712be9dbbcbed343a6eb6fbdde8f48f6008 Mon Sep 17 00:00:00 2001 From: Claus Date: Mon, 25 Apr 2016 10:11:54 +0200 Subject: [PATCH 08/10] U4-3411 Adding new language doesn't sync the tree --- .../umbraco.presentation/umbraco/create/language.ascx.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/create/language.ascx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/create/language.ascx.cs index 328e459c6c..df66e925b1 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/create/language.ascx.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/create/language.ascx.cs @@ -45,7 +45,7 @@ namespace umbraco.cms.presentation.create.controls Cultures.SelectedValue); BasePage.Current.ClientTools - .ChildNodeCreated() + .ReloadActionNode(false, true) .CloseModalWindow(); } From 7e9a14be83fc0fd8c82f03ed27d10a387dbba5e6 Mon Sep 17 00:00:00 2001 From: Stephan Date: Mon, 25 Apr 2016 11:18:22 +0200 Subject: [PATCH 09/10] RteMacroRenderingValueConverter should return an IHtmlString --- .../ValueConverters/RteMacroRenderingValueConverter.cs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/Umbraco.Web/PropertyEditors/ValueConverters/RteMacroRenderingValueConverter.cs b/src/Umbraco.Web/PropertyEditors/ValueConverters/RteMacroRenderingValueConverter.cs index 2802a4d631..d6e866e06a 100644 --- a/src/Umbraco.Web/PropertyEditors/ValueConverters/RteMacroRenderingValueConverter.cs +++ b/src/Umbraco.Web/PropertyEditors/ValueConverters/RteMacroRenderingValueConverter.cs @@ -15,7 +15,7 @@ namespace Umbraco.Web.PropertyEditors.ValueConverters { /// - /// A value converter for TinyMCE that will ensure any macro content is rendered properly even when + /// A value converter for TinyMCE that will ensure any macro content is rendered properly even when /// used dynamically. /// // because that version of RTE converter parses {locallink} and executes macros, when going from @@ -38,7 +38,7 @@ namespace Umbraco.Web.PropertyEditors.ValueConverters UmbracoContext.Current.InPreviewMode = preview; var sb = new StringBuilder(); - + try { var umbracoHelper = new UmbracoHelper(UmbracoContext.Current); @@ -55,7 +55,7 @@ namespace Umbraco.Web.PropertyEditors.ValueConverters finally { // restore - UmbracoContext.Current.InPreviewMode = inPreviewMode; + UmbracoContext.Current.InPreviewMode = inPreviewMode; } return sb.ToString(); @@ -109,12 +109,12 @@ namespace Umbraco.Web.PropertyEditors.ValueConverters if (modified) { - return doc.DocumentNode.OuterHtml; + return new HtmlString(doc.DocumentNode.OuterHtml); } } } - return sourceString; + return new HtmlString(sourceString ?? string.Empty); } } } \ No newline at end of file From fb99e375d086bf4616974c22d8ca918a400939bd Mon Sep 17 00:00:00 2001 From: Stephan Date: Mon, 25 Apr 2016 14:14:55 +0200 Subject: [PATCH 10/10] U4-5699 - update template alias in gui after saving --- .../umbraco_client/Editors/EditTemplate.js | 19 ++++++---- .../umbraco_client/Editors/EditView.js | 37 ++++++++++--------- .../WebServices/SaveFileController.cs | 3 +- 3 files changed, 33 insertions(+), 26 deletions(-) diff --git a/src/Umbraco.Web.UI/umbraco_client/Editors/EditTemplate.js b/src/Umbraco.Web.UI/umbraco_client/Editors/EditTemplate.js index b8c1a203d6..e3a3ee4bf2 100644 --- a/src/Umbraco.Web.UI/umbraco_client/Editors/EditTemplate.js +++ b/src/Umbraco.Web.UI/umbraco_client/Editors/EditTemplate.js @@ -7,9 +7,9 @@ _opts: null, _openMacroModal: function(alias) { - + var self = this; - + UmbClientMgr.openAngularModalWindow({ template: "views/common/dialogs/insertmacro.html", dialogData: { @@ -66,7 +66,7 @@ constructor: function(opts) { // Merge options with default this._opts = $.extend({ - + // Default options go here }, opts); @@ -82,7 +82,7 @@ event.preventDefault(); self.doSubmit(); }); - + $("#sb").click(function() { self._insertCodeBlock(); }); @@ -112,7 +112,7 @@ }); }, - doSubmit: function() { + doSubmit: function() { this.save(jQuery('#' + this._opts.templateNameClientId).val(), jQuery('#' + this._opts.templateAliasClientId).val(), UmbEditor.GetCode()); }, @@ -134,7 +134,7 @@ self.submitFailure(e.message, e.header); } }); - + }, submitSuccess: function (args) { @@ -151,7 +151,10 @@ if (args.contents) { UmbEditor.SetCode(args.contents); } - + + var alias = args.alias; + this._opts.aliasTxtBox.val(alias); + top.UmbSpeechBubble.ShowMessage('save', header, msg); UmbClientMgr.mainTree().setActiveTreeType('templates'); if (pathChanged) { @@ -167,7 +170,7 @@ top.UmbSpeechBubble.ShowMessage('error', header, err); } }); - + //Set defaults for jQuery ajax calls. $.ajaxSetup({ dataType: 'json', diff --git a/src/Umbraco.Web.UI/umbraco_client/Editors/EditView.js b/src/Umbraco.Web.UI/umbraco_client/Editors/EditView.js index 87b180ce2d..a93f4cf815 100644 --- a/src/Umbraco.Web.UI/umbraco_client/Editors/EditView.js +++ b/src/Umbraco.Web.UI/umbraco_client/Editors/EditView.js @@ -33,19 +33,19 @@ insertMacroMarkup: function(alias) { /// callback used to insert the markup for a macro with no parameters - + UmbEditor.Insert("@Umbraco.RenderMacro(\"" + alias + "\")", "", this._opts.codeEditorElementId); }, insertRenderBody: function() { UmbEditor.Insert("@RenderBody()", "", this._opts.codeEditorElementId); }, - + openMacroModal: function (alias) { /// callback used to display the modal dialog to insert a macro with parameters - + var self = this; - + UmbClientMgr.openAngularModalWindow({ template: "views/common/dialogs/insertmacro.html", dialogData: { @@ -141,7 +141,7 @@ }); } else { - //saving a partial view + //saving a partial view var actionName = this._opts.editorType === "PartialViewMacro" ? "SavePartialViewMacro" : "SavePartialView"; $.post(self._opts.restServiceLocation + actionName, @@ -159,9 +159,9 @@ }); } }, - + submitSuccess: function (args) { - + var msg = args.message; var header = args.header; var path = this._opts.treeSyncPath; @@ -183,6 +183,9 @@ if (this._opts.editorType == "Template") { + var alias = args.alias; + this._opts.aliasTxtBox.val(alias); + top.UmbSpeechBubble.ShowMessage('save', header, msg); //templates are different because they are ID based, whereas view files are file based without a static id @@ -194,12 +197,12 @@ else { UmbClientMgr.mainTree().syncTree(path, true); } - + } else { var newFilePath = this._opts.nameTxtBox.val(); - + function trimStart(str, trim) { if (str.startsWith(trim)) { return str.substring(trim.length); @@ -219,12 +222,12 @@ var newLocation = window.location.pathname + "?" + notFileParts.join("&") + "&file=" + newFilePath; UmbClientMgr.contentFrame(newLocation); - + //we need to do this after we navigate otherwise the navigation will wait unti lthe message timeout is done! top.UmbSpeechBubble.ShowMessage('save', header, msg); } else { - + top.UmbSpeechBubble.ShowMessage('save', header, msg); if (args && args.name) { @@ -235,15 +238,15 @@ } UmbClientMgr.mainTree().syncTree(path, true, null, newFilePath.split("/")[1]); - } + } } - + }, - + submitFailure: function (err, header) { - top.UmbSpeechBubble.ShowMessage('error', header, err); + top.UmbSpeechBubble.ShowMessage('error', header, err); }, - + changeMasterPageFile: function ( ) { //var editor = document.getElementById(this._opts.sourceEditorId); var templateDropDown = this._opts.masterPageDropDown.get(0); @@ -279,7 +282,7 @@ $.ajaxSetup({ dataType: 'json', cache: false, - contentType: 'application/json; charset=utf-8' + contentType: 'application/json; charset=utf-8' }); })(jQuery); \ No newline at end of file diff --git a/src/Umbraco.Web/WebServices/SaveFileController.cs b/src/Umbraco.Web/WebServices/SaveFileController.cs index 55e16a356e..871f1512ef 100644 --- a/src/Umbraco.Web/WebServices/SaveFileController.cs +++ b/src/Umbraco.Web/WebServices/SaveFileController.cs @@ -192,7 +192,8 @@ namespace Umbraco.Web.WebServices new { path = syncPath, - contents = t.Design + contents = t.Design, + alias = t.Alias // might have been updated! }); } catch (Exception ex)