From 04775098febca714fe9e0f0349817c3f65683d64 Mon Sep 17 00:00:00 2001 From: Karl Tynan Date: Wed, 1 Aug 2018 09:10:40 +0100 Subject: [PATCH 01/13] Updated some grammar on en.xml --- src/Umbraco.Web.UI/umbraco/config/lang/en.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/en.xml b/src/Umbraco.Web.UI/umbraco/config/lang/en.xml index 57cc9a84ad..5e1ed29573 100644 --- a/src/Umbraco.Web.UI/umbraco/config/lang/en.xml +++ b/src/Umbraco.Web.UI/umbraco/config/lang/en.xml @@ -2039,9 +2039,9 @@ To manage your website, simply open the Umbraco back office and start adding con Validation - Validate as email + Validate as an email Validate as a number - Validate as a Url + Validate as a url ...or enter a custom validation Field is mandatory Enter a regular expression From dbd9db780c4ef6917939b57cab37e59f54668dfc Mon Sep 17 00:00:00 2001 From: Karl Tynan Date: Wed, 1 Aug 2018 09:11:19 +0100 Subject: [PATCH 02/13] Also updated the en_us.xml --- src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 c4eae684ca..6517a7fcbc 100644 --- a/src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml +++ b/src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml @@ -2031,9 +2031,9 @@ To manage your website, simply open the Umbraco back office and start adding con Validation - Validate as email + Validate as an email Validate as a number - Validate as a Url + Validate as a url ...or enter a custom validation Field is mandatory Enter a regular expression From c97311607dd817424588ac68d80f97b009adacad Mon Sep 17 00:00:00 2001 From: Karl Tynan Date: Wed, 1 Aug 2018 09:22:45 +0100 Subject: [PATCH 03/13] Improved text for email and capitalisation for URL --- src/Umbraco.Web.UI/umbraco/config/lang/en.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/en.xml b/src/Umbraco.Web.UI/umbraco/config/lang/en.xml index 5e1ed29573..d676e67b9c 100644 --- a/src/Umbraco.Web.UI/umbraco/config/lang/en.xml +++ b/src/Umbraco.Web.UI/umbraco/config/lang/en.xml @@ -2039,9 +2039,9 @@ To manage your website, simply open the Umbraco back office and start adding con Validation - Validate as an email + Validate as an email address Validate as a number - Validate as a url + Validate as a URL ...or enter a custom validation Field is mandatory Enter a regular expression From db2d7687e4aa58e66d51b2879d12a38af37037ec Mon Sep 17 00:00:00 2001 From: Karl Tynan Date: Wed, 1 Aug 2018 09:23:15 +0100 Subject: [PATCH 04/13] And updated the en_us.xml version too --- src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 6517a7fcbc..70f6470a20 100644 --- a/src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml +++ b/src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml @@ -2031,9 +2031,9 @@ To manage your website, simply open the Umbraco back office and start adding con Validation - Validate as an email + Validate as an email address Validate as a number - Validate as a url + Validate as a URL ...or enter a custom validation Field is mandatory Enter a regular expression From 89bdbf500e080934fc4be30e0fd1d550dfdf16ed Mon Sep 17 00:00:00 2001 From: Sebastiaan Janssen Date: Thu, 2 Aug 2018 10:47:53 +0200 Subject: [PATCH 05/13] Revert "Fixed issue with creating doctypes & templated with an Ampersand : http://issues.umbraco.org/issue/U4-11550 (#2828)" Revert "We need to create the template from it's alias, which is the safeAlias, which is the correct filename" This reverts commit 9663cfde82f68039a10a758fb2755152fbc2cb23 and commit 11aea0f51510d9981f3211fe0afe86ed99f850a3 --- .../src/common/resources/entity.resource.js | 2 +- src/Umbraco.Web/Editors/TemplateController.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/common/resources/entity.resource.js b/src/Umbraco.Web.UI.Client/src/common/resources/entity.resource.js index 780a336fce..72f8ad5539 100644 --- a/src/Umbraco.Web.UI.Client/src/common/resources/entity.resource.js +++ b/src/Umbraco.Web.UI.Client/src/common/resources/entity.resource.js @@ -46,7 +46,7 @@ function entityResource($q, $http, umbRequestHelper) { $http.get( umbRequestHelper.getApiUrl( "entityApiBaseUrl", - "GetSafeAlias", { value: encodeURIComponent(value), camelCase: camelCase })), + "GetSafeAlias", { value: value, camelCase: camelCase })), 'Failed to retrieve content type scaffold'); }, diff --git a/src/Umbraco.Web/Editors/TemplateController.cs b/src/Umbraco.Web/Editors/TemplateController.cs index e38f08665e..100a266dff 100644 --- a/src/Umbraco.Web/Editors/TemplateController.cs +++ b/src/Umbraco.Web/Editors/TemplateController.cs @@ -184,7 +184,7 @@ namespace Umbraco.Web.Editors throw new HttpResponseException(HttpStatusCode.NotFound); } - var template = Services.FileService.CreateTemplateWithIdentity(display.Alias, display.Content, master); + var template = Services.FileService.CreateTemplateWithIdentity(display.Name, display.Content, master); Mapper.Map(template, display); } From afa27ce87266cd82a9c836536e304ccb1876f616 Mon Sep 17 00:00:00 2001 From: "Andy Hawken (SP4)" Date: Thu, 2 Aug 2018 13:34:30 +0100 Subject: [PATCH 06/13] Tour Step 7 Wording Change wording of tour step 7 to "Now click on" to indicate that clicking on the avatar is a step in the tour, rather than a description of what it does at runtime --- src/Umbraco.Web.UI/config/BackOfficeTours/getting-started.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Umbraco.Web.UI/config/BackOfficeTours/getting-started.json b/src/Umbraco.Web.UI/config/BackOfficeTours/getting-started.json index e6c42930a8..dbd6b8d4f5 100644 --- a/src/Umbraco.Web.UI/config/BackOfficeTours/getting-started.json +++ b/src/Umbraco.Web.UI/config/BackOfficeTours/getting-started.json @@ -54,7 +54,7 @@ { "element": "#applications [data-element='section-user']", "title": "User profile", - "content": "Click on your user avatar to open the user profile dialog.", + "content": "Now click on your user avatar to open the user profile dialog.", "event": "click", "backdropOpacity": 0.6 }, From fc7db11c6c0ce9b4468d07188427a65fdba6a98b Mon Sep 17 00:00:00 2001 From: elitsa Date: Mon, 6 Aug 2018 10:45:51 +0200 Subject: [PATCH 07/13] Changed the Danish language file - added the Dictionary title --- src/Umbraco.Web.UI/umbraco/config/lang/da.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/da.xml b/src/Umbraco.Web.UI/umbraco/config/lang/da.xml index fb5dc26a1a..0bec7b968d 100644 --- a/src/Umbraco.Web.UI/umbraco/config/lang/da.xml +++ b/src/Umbraco.Web.UI/umbraco/config/lang/da.xml @@ -422,6 +422,7 @@ Navnet '%0%' eksisterer allerede. ]]> + Ordbog Indtast dit brugernavn From 2b6c6b30221f17cce4fb85bc9cdbcfcbb7eb03a0 Mon Sep 17 00:00:00 2001 From: Mike Date: Mon, 6 Aug 2018 19:52:29 +0100 Subject: [PATCH 08/13] http://issues.umbraco.org/issue/U4-10801 Fixes label ui issue on template editor ui. Updated notification settings ui to use angular instead of web forms. --- .../src/common/resources/content.resource.js | 23 ++++ .../less/components/buttons/umb-toggle.less | 18 ++- .../less/components/users/umb-permission.less | 3 +- .../editorsettings/editorsettings.html | 3 - .../overlays/insertfield/insertfield.html | 12 +- .../views/components/buttons/umb-toggle.html | 4 +- .../content/content.notify.controller.js | 49 ++++++++ .../src/views/content/notify.html | 44 +++++++ src/Umbraco.Web.UI/Umbraco.Web.UI.csproj | 2 +- .../umbraco/config/lang/en_us.xml | 4 + .../umbraco/dialogs/notifications.aspx | 18 --- src/Umbraco.Web/Editors/ContentController.cs | 40 ++++++- .../Models/ContentEditing/NotifySetting.cs | 22 ++++ .../Trees/ContentTreeController.cs | 6 +- src/Umbraco.Web/Umbraco.Web.csproj | 11 +- .../umbraco/dialogs/notifications.aspx | 18 --- .../umbraco/dialogs/notifications.aspx.cs | 108 ------------------ .../dialogs/notifications.aspx.designer.cs | 42 ------- 18 files changed, 205 insertions(+), 222 deletions(-) create mode 100644 src/Umbraco.Web.UI.Client/src/views/content/content.notify.controller.js create mode 100644 src/Umbraco.Web.UI.Client/src/views/content/notify.html delete mode 100644 src/Umbraco.Web.UI/umbraco/dialogs/notifications.aspx create mode 100644 src/Umbraco.Web/Models/ContentEditing/NotifySetting.cs delete mode 100644 src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/notifications.aspx delete mode 100644 src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/notifications.aspx.cs delete mode 100644 src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/notifications.aspx.designer.cs diff --git a/src/Umbraco.Web.UI.Client/src/common/resources/content.resource.js b/src/Umbraco.Web.UI.Client/src/common/resources/content.resource.js index 1ba454ac65..7c9dbd90e5 100644 --- a/src/Umbraco.Web.UI.Client/src/common/resources/content.resource.js +++ b/src/Umbraco.Web.UI.Client/src/common/resources/content.resource.js @@ -337,6 +337,29 @@ function contentResource($q, $http, umbDataFormatter, umbRequestHelper) { 'Failed to retrieve data for content id ' + id); }, + getNotifySettingsById: function (id) { + return umbRequestHelper.resourcePromise( + $http.get( + umbRequestHelper.getApiUrl( + "contentApiBaseUrl", + "GetNotificationOptions", + [{ contentId: id }])), + 'Failed to retrieve data for content id ' + id); + }, + + setNotifySettingsById: function (id, options) { + if (!id) { + throw "contentId cannot be null"; + } + return umbRequestHelper.resourcePromise( + $http.post( + umbRequestHelper.getApiUrl( + "contentApiBaseUrl", + "SetNotificationOptions", + { contentId: id, notifyOptions: options })), + 'Failed to set notify settings for content id ' + id); + }, + /** * @ngdoc method * @name umbraco.resources.contentResource#getByIds diff --git a/src/Umbraco.Web.UI.Client/src/less/components/buttons/umb-toggle.less b/src/Umbraco.Web.UI.Client/src/less/components/buttons/umb-toggle.less index 2156f75d00..73f059b4ee 100644 --- a/src/Umbraco.Web.UI.Client/src/less/components/buttons/umb-toggle.less +++ b/src/Umbraco.Web.UI.Client/src/less/components/buttons/umb-toggle.less @@ -1,10 +1,20 @@ .umb-toggle { - display: flex; - align-items: center; + display: flex; + align-items: center; + background: none; + border: none; + padding: 0; + + &:focus { + outline: 0; + } } .umb-toggle__handler { - display: inline-block; + position: absolute; + top: 0; + left: 0; + display: block; width: 24px; height: 24px; background-color: @white; @@ -62,4 +72,4 @@ .umb-toggle__icon--right { right: 7px; color: @gray-5; -} \ No newline at end of file +} diff --git a/src/Umbraco.Web.UI.Client/src/less/components/users/umb-permission.less b/src/Umbraco.Web.UI.Client/src/less/components/users/umb-permission.less index faed098fc8..9447a48217 100644 --- a/src/Umbraco.Web.UI.Client/src/less/components/users/umb-permission.less +++ b/src/Umbraco.Web.UI.Client/src/less/components/users/umb-permission.less @@ -16,6 +16,7 @@ .umb-permission__content { display: flex; flex-direction: column; + justify-content: center; flex: 1 1 auto; cursor: pointer; } @@ -23,4 +24,4 @@ .umb-permission__description { font-size: 13px; color: @gray-5; -} \ No newline at end of file +} diff --git a/src/Umbraco.Web.UI.Client/src/views/common/overlays/contenttypeeditor/editorsettings/editorsettings.html b/src/Umbraco.Web.UI.Client/src/views/common/overlays/contenttypeeditor/editorsettings/editorsettings.html index 027f6cfc2d..d1833a5af0 100644 --- a/src/Umbraco.Web.UI.Client/src/views/common/overlays/contenttypeeditor/editorsettings/editorsettings.html +++ b/src/Umbraco.Web.UI.Client/src/views/common/overlays/contenttypeeditor/editorsettings/editorsettings.html @@ -7,9 +7,6 @@
-
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/overlays/insertfield/insertfield.html b/src/Umbraco.Web.UI.Client/src/views/common/overlays/insertfield/insertfield.html index 3218b44dd8..233d04c5ca 100644 --- a/src/Umbraco.Web.UI.Client/src/views/common/overlays/insertfield/insertfield.html +++ b/src/Umbraco.Web.UI.Client/src/views/common/overlays/insertfield/insertfield.html @@ -66,10 +66,8 @@
-