From a4f83e0125f8b68e08d7ca31acce8cea9197272f Mon Sep 17 00:00:00 2001 From: Chris Houston Date: Thu, 3 Nov 2016 14:41:41 +0000 Subject: [PATCH 01/15] Style changes to the developer dashboard area. --- .../lib/bootstrap/less/thumbnails.less | 13 ++++++++----- .../src/less/healthcheck.less | 4 ++-- .../developer/developerdashboardvideos.html | 16 +++++++--------- .../views/dashboard/developer/healthcheck.html | 2 +- 4 files changed, 18 insertions(+), 17 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/lib/bootstrap/less/thumbnails.less b/src/Umbraco.Web.UI.Client/lib/bootstrap/less/thumbnails.less index 513039cca4..dd5db3891a 100644 --- a/src/Umbraco.Web.UI.Client/lib/bootstrap/less/thumbnails.less +++ b/src/Umbraco.Web.UI.Client/lib/bootstrap/less/thumbnails.less @@ -31,15 +31,18 @@ display: block; padding: 4px; line-height: @baseLineHeight; - border: 1px solid #ddd; + border: 1px solid @grayLight; .border-radius(@baseBorderRadius); .box-shadow(0 1px 3px rgba(0,0,0,.055)); .transition(all .2s ease-in-out); + background-color: @grayLighter; } -// Add a hover/focus state for linked versions only -a.thumbnail:hover, -a.thumbnail:focus { - border-color: @linkColor; +// Add a hover/focus state for linked versions only. +a.thumbnail:hover, +a.thumbnail:focus, +a div.thumbnail:hover, +a div.thumbnail:focus { + border-color: @blue; .box-shadow(0 1px 4px rgba(0,105,214,.25)); } diff --git a/src/Umbraco.Web.UI.Client/src/less/healthcheck.less b/src/Umbraco.Web.UI.Client/src/less/healthcheck.less index 6e82d424bb..b5e1622214 100644 --- a/src/Umbraco.Web.UI.Client/src/less/healthcheck.less +++ b/src/Umbraco.Web.UI.Client/src/less/healthcheck.less @@ -31,12 +31,12 @@ box-sizing: border-box; text-align: center; - border: 2px solid transparent; + border: 1px solid @grayLight; height: 100%; } .umb-healthcheck-group:hover { - border: 2px solid @blue; + border: 1px solid @blue; cursor: pointer; } diff --git a/src/Umbraco.Web.UI.Client/src/views/dashboard/developer/developerdashboardvideos.html b/src/Umbraco.Web.UI.Client/src/views/dashboard/developer/developerdashboardvideos.html index bbf94629a0..0ad779cf3e 100644 --- a/src/Umbraco.Web.UI.Client/src/views/dashboard/developer/developerdashboardvideos.html +++ b/src/Umbraco.Web.UI.Client/src/views/dashboard/developer/developerdashboardvideos.html @@ -1,5 +1,5 @@

Hours of Umbraco training videos are only a click away

-

Want to master Umbraco? Spend a couple of minutes learning some best practices by watching one of these videos about using Umbraco. And visit umbraco.tv for even more Umbraco videos

+

Want to master Umbraco? Spend a couple of minutes learning some best practices by watching one of these videos about using Umbraco, then visit umbraco.tv for even more Umbraco videos.

  • -
    - - {{video.title}} - - -
    {{video.title}}
    -     -
    + +
    + {{video.title}} +
    {{video.title}}
    +
    +
    • diff --git a/src/Umbraco.Web.UI.Client/src/views/dashboard/developer/healthcheck.html b/src/Umbraco.Web.UI.Client/src/views/dashboard/developer/healthcheck.html index ca796043e6..79081e5933 100644 --- a/src/Umbraco.Web.UI.Client/src/views/dashboard/developer/healthcheck.html +++ b/src/Umbraco.Web.UI.Client/src/views/dashboard/developer/healthcheck.html @@ -2,7 +2,7 @@
    -

    Health Check

    +

    Health Check

    The health checker evaluates various areas of your site for best practice settings, configuration, potential problems, etc. You can easily fix problems by pressing a button. You can add your own health checks, have a look at the documentation for more information about custom health checks.

    From 0b2cfe956d50f62614fc51ff7480ad3baab11613 Mon Sep 17 00:00:00 2001 From: Robert Date: Tue, 31 Oct 2017 15:19:06 +0100 Subject: [PATCH 02/15] Triming login field to avoid validation errors --- .../src/common/services/umbdataformatter.service.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Umbraco.Web.UI.Client/src/common/services/umbdataformatter.service.js b/src/Umbraco.Web.UI.Client/src/common/services/umbdataformatter.service.js index 5fc2416927..2edd8e709a 100644 --- a/src/Umbraco.Web.UI.Client/src/common/services/umbdataformatter.service.js +++ b/src/Umbraco.Web.UI.Client/src/common/services/umbdataformatter.service.js @@ -243,7 +243,7 @@ return item.alias === "_umb_membergroup"; }); saveModel.email = propEmail.value; - saveModel.username = propLogin.value; + saveModel.username = propLogin.value.trim(); saveModel.password = this.formatChangePasswordModel(propPass.value); From 8676a99b3ae5cb87c1115ce2f4c846268800aadd Mon Sep 17 00:00:00 2001 From: Robert Date: Wed, 1 Nov 2017 09:00:05 +0100 Subject: [PATCH 03/15] Trimming login input on the server-side as well --- src/Umbraco.Web/Editors/MemberController.cs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/Umbraco.Web/Editors/MemberController.cs b/src/Umbraco.Web/Editors/MemberController.cs index 888d097bf4..59030dbb40 100644 --- a/src/Umbraco.Web/Editors/MemberController.cs +++ b/src/Umbraco.Web/Editors/MemberController.cs @@ -393,8 +393,9 @@ namespace Umbraco.Web.Editors UpdateName(contentItem); //map the custom properties - this will already be set for new entities in our member binder - contentItem.PersistedContent.Email = contentItem.Email; - contentItem.PersistedContent.Username = contentItem.Username; + contentItem.PersistedContent.Email = contentItem.Email; + //trim the username as we do not want trailing space - issue U4-10589 + contentItem.PersistedContent.Username = contentItem.Username.Trim(); //use the base method to map the rest of the properties base.MapPropertyValues(contentItem); From 73b2d31298f496c6381d674de591d31a2ed5b96f Mon Sep 17 00:00:00 2001 From: Robert Date: Wed, 1 Nov 2017 13:08:17 +0100 Subject: [PATCH 04/15] Moved username trimming to service level, also added email trimming --- src/Umbraco.Core/Services/MemberService.cs | 6 +++++- src/Umbraco.Web/Editors/MemberController.cs | 3 +-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/Umbraco.Core/Services/MemberService.cs b/src/Umbraco.Core/Services/MemberService.cs index 22684f36ba..494a8bc376 100644 --- a/src/Umbraco.Core/Services/MemberService.cs +++ b/src/Umbraco.Core/Services/MemberService.cs @@ -986,7 +986,11 @@ namespace Umbraco.Core.Services /// Optional parameter to raise events. /// Default is True otherwise set to False to not raise events public void Save(IMember entity, bool raiseEvents = true) - { + { + //trimming username and email to make sure we have no trailing space + entity.Username = entity.Username.Trim(); + entity.Email = entity.Email.Trim(); + using (var uow = UowProvider.GetUnitOfWork()) { var saveEventArgs = new SaveEventArgs(entity); diff --git a/src/Umbraco.Web/Editors/MemberController.cs b/src/Umbraco.Web/Editors/MemberController.cs index 59030dbb40..5e246c0d59 100644 --- a/src/Umbraco.Web/Editors/MemberController.cs +++ b/src/Umbraco.Web/Editors/MemberController.cs @@ -394,8 +394,7 @@ namespace Umbraco.Web.Editors //map the custom properties - this will already be set for new entities in our member binder contentItem.PersistedContent.Email = contentItem.Email; - //trim the username as we do not want trailing space - issue U4-10589 - contentItem.PersistedContent.Username = contentItem.Username.Trim(); + contentItem.PersistedContent.Username = contentItem.Username; //use the base method to map the rest of the properties base.MapPropertyValues(contentItem); From 838d7975c9974e7c2f0c5a842bf4b16e1a57a6cd Mon Sep 17 00:00:00 2001 From: Mads Rasmussen Date: Wed, 8 Nov 2017 11:36:23 +0100 Subject: [PATCH 05/15] Update healthcheck.less prevent UI from "jumping" on hover --- src/Umbraco.Web.UI.Client/src/less/healthcheck.less | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/less/healthcheck.less b/src/Umbraco.Web.UI.Client/src/less/healthcheck.less index 9c17b6f54e..9a8c55d08b 100644 --- a/src/Umbraco.Web.UI.Client/src/less/healthcheck.less +++ b/src/Umbraco.Web.UI.Client/src/less/healthcheck.less @@ -29,12 +29,12 @@ padding: 15px 10px; box-sizing: border-box; text-align: center; - border: 1px solid @grayLight; + border: 1px solid @gray-8; height: 100%; } .umb-healthcheck-group:hover { - border: 2px solid @turquoise; + border: 1px solid @turquoise; cursor: pointer; } From 3c7c6b4ad7e8521834110e4bc596e91f7e034d2e Mon Sep 17 00:00:00 2001 From: Mads Rasmussen Date: Wed, 8 Nov 2017 11:38:32 +0100 Subject: [PATCH 06/15] Update thumbnails.less Use new color variables --- src/Umbraco.Web.UI.Client/lib/bootstrap/less/thumbnails.less | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/lib/bootstrap/less/thumbnails.less b/src/Umbraco.Web.UI.Client/lib/bootstrap/less/thumbnails.less index dd5db3891a..c81b6398ed 100644 --- a/src/Umbraco.Web.UI.Client/lib/bootstrap/less/thumbnails.less +++ b/src/Umbraco.Web.UI.Client/lib/bootstrap/less/thumbnails.less @@ -31,18 +31,17 @@ display: block; padding: 4px; line-height: @baseLineHeight; - border: 1px solid @grayLight; + border: 1px solid @gray-8; .border-radius(@baseBorderRadius); .box-shadow(0 1px 3px rgba(0,0,0,.055)); .transition(all .2s ease-in-out); - background-color: @grayLighter; } // Add a hover/focus state for linked versions only. a.thumbnail:hover, a.thumbnail:focus, a div.thumbnail:hover, a div.thumbnail:focus { - border-color: @blue; + border-color: @turquoise; .box-shadow(0 1px 4px rgba(0,105,214,.25)); } From dc67d82671f97d84e76f32ae26819553fc2075ee Mon Sep 17 00:00:00 2001 From: Claus Date: Wed, 8 Nov 2017 12:08:30 +0100 Subject: [PATCH 07/15] adding trim. --- .../src/common/services/umbdataformatter.service.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Umbraco.Web.UI.Client/src/common/services/umbdataformatter.service.js b/src/Umbraco.Web.UI.Client/src/common/services/umbdataformatter.service.js index 2edd8e709a..a59e10a69f 100644 --- a/src/Umbraco.Web.UI.Client/src/common/services/umbdataformatter.service.js +++ b/src/Umbraco.Web.UI.Client/src/common/services/umbdataformatter.service.js @@ -242,7 +242,7 @@ var propGroups = _.find(genericTab.properties, function (item) { return item.alias === "_umb_membergroup"; }); - saveModel.email = propEmail.value; + saveModel.email = propEmail.value.trim(); saveModel.username = propLogin.value.trim(); saveModel.password = this.formatChangePasswordModel(propPass.value); From dac882ce9f7d5b2c9deb880d058f14ab6a07145a Mon Sep 17 00:00:00 2001 From: Anders Bjerner Date: Sat, 11 Nov 2017 17:10:25 +0100 Subject: [PATCH 08/15] Added Danish translations for the new "History" and "Scheduled Publishing" headers --- src/Umbraco.Web.UI/umbraco/config/lang/da.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/da.xml b/src/Umbraco.Web.UI/umbraco/config/lang/da.xml index 4f5bd4fbb5..83fedabc25 100644 --- a/src/Umbraco.Web.UI/umbraco/config/lang/da.xml +++ b/src/Umbraco.Web.UI/umbraco/config/lang/da.xml @@ -530,6 +530,7 @@ Højde Hjælp Skjul + Historik Ikon Importer Indre margen @@ -576,6 +577,7 @@ Hent Prøv igen Rettigheder + Planlagt publicering Søg Beklager, vi kan ikke finde det, du leder efter. Ingen elementer er blevet tilføjet From 0ccf798f14dc7691bf7e8502fc831bb628ddc150 Mon Sep 17 00:00:00 2001 From: Anders Bjerner Date: Sat, 11 Nov 2017 18:23:47 +0100 Subject: [PATCH 09/15] "Set date" and "Clear date" in the new Info tab can now be localized --- .../components/content/umb-content-node-info.html | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/views/components/content/umb-content-node-info.html b/src/Umbraco.Web.UI.Client/src/views/components/content/umb-content-node-info.html index a188d76347..0384e4d4ce 100644 --- a/src/Umbraco.Web.UI.Client/src/views/components/content/umb-content-node-info.html +++ b/src/Umbraco.Web.UI.Client/src/views/components/content/umb-content-node-info.html @@ -107,14 +107,14 @@
    {{node.releaseDate | amDateFormat:'dddd'}} {{node.releaseDate | amDateFormat:'HH:mm'}}
    - Set date + Set date
    - Clear date + Clear date @@ -139,14 +139,14 @@
    {{node.removeDate | amDateFormat:'dddd'}} {{node.removeDate | amDateFormat:'HH:mm'}}
    - Set date + Set date - Clear date + Clear date @@ -191,4 +191,4 @@ - \ No newline at end of file + From c371f003155e6d46720120d9161480ab7a3b0b87 Mon Sep 17 00:00:00 2001 From: Anders Bjerner Date: Sat, 11 Nov 2017 18:25:57 +0100 Subject: [PATCH 10/15] Added English translation for "content_setDate" --- src/Umbraco.Web.UI/umbraco/config/lang/en.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/en.xml b/src/Umbraco.Web.UI/umbraco/config/lang/en.xml index 4d82fa69a4..0674e81066 100644 --- a/src/Umbraco.Web.UI/umbraco/config/lang/en.xml +++ b/src/Umbraco.Web.UI/umbraco/config/lang/en.xml @@ -198,6 +198,7 @@ Publish at Unpublish at Clear Date + Set date Sortorder is updated To sort the nodes, simply drag the nodes or click one of the column headers. You can select multiple nodes by holding the "shift" or "control" key while selecting Statistics @@ -2101,4 +2102,4 @@ To manage your website, simply open the Umbraco back office and start adding con characters left - \ No newline at end of file + From 8be02ff7b0a44834567b88b62a3d9fa79bb452c1 Mon Sep 17 00:00:00 2001 From: Anders Bjerner Date: Sat, 11 Nov 2017 18:26:41 +0100 Subject: [PATCH 11/15] Added English (US) translation for "content_setDate" --- src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 11461a1581..8a5ab85793 100644 --- a/src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml +++ b/src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml @@ -201,6 +201,7 @@ Publish at Unpublish at Clear Date + Set date Sortorder is updated To sort the nodes, simply drag the nodes or click one of the column headers. You can select multiple nodes by holding the "shift" or "control" key while selecting Statistics @@ -2100,4 +2101,4 @@ To manage your website, simply open the Umbraco back office and start adding con characters left - \ No newline at end of file + From 3405a1f6004da9372971c3b72862701a252aad9e Mon Sep 17 00:00:00 2001 From: Anders Bjerner Date: Sat, 11 Nov 2017 18:27:55 +0100 Subject: [PATCH 12/15] Added Danish translation for "content_setDate" --- 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 4f5bd4fbb5..36437cd5e2 100644 --- a/src/Umbraco.Web.UI/umbraco/config/lang/da.xml +++ b/src/Umbraco.Web.UI/umbraco/config/lang/da.xml @@ -194,6 +194,7 @@ Udgivelsesdato Dato for Fortryd udgivelse Fjern dato + Vælg dato Sorteringsrækkefølgen er opdateret For at sortere, træk siderne eller klik på en af kolonnehovederne. Du kan vælge flere sider ved at holde "shift" eller "control" nede mens du vælger. Statistik From 83f229abc6ced7fe62bd1d8a84e5433bc6ea42e0 Mon Sep 17 00:00:00 2001 From: Anders Bjerner Date: Sat, 11 Nov 2017 18:45:37 +0100 Subject: [PATCH 13/15] "by" in the new Info tab is now localized --- .../src/views/components/content/umb-content-node-info.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/views/components/content/umb-content-node-info.html b/src/Umbraco.Web.UI.Client/src/views/components/content/umb-content-node-info.html index a188d76347..74285ed39e 100644 --- a/src/Umbraco.Web.UI.Client/src/views/components/content/umb-content-node-info.html +++ b/src/Umbraco.Web.UI.Client/src/views/components/content/umb-content-node-info.html @@ -160,7 +160,7 @@ - {{node.createDate | amDateFormat:'MMMM Do YYYY, HH:mm'}} by {{ node.owner.name }} + {{node.createDate | amDateFormat:'MMMM Do YYYY, HH:mm'}} by {{ node.owner.name }} @@ -191,4 +191,4 @@ - \ No newline at end of file + From 6fd197d1bfb864fd2c74efaeea75087aaeace71f Mon Sep 17 00:00:00 2001 From: Mads Rasmussen Date: Mon, 13 Nov 2017 13:32:03 +0100 Subject: [PATCH 14/15] fixes: U4-10667 7.8 Item not published is still a hyperlink --- .../src/views/components/content/umb-content-node-info.html | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/Umbraco.Web.UI.Client/src/views/components/content/umb-content-node-info.html b/src/Umbraco.Web.UI.Client/src/views/components/content/umb-content-node-info.html index a188d76347..e428cff790 100644 --- a/src/Umbraco.Web.UI.Client/src/views/components/content/umb-content-node-info.html +++ b/src/Umbraco.Web.UI.Client/src/views/components/content/umb-content-node-info.html @@ -7,10 +7,14 @@ From 2c248791e1cdcf8cfda16a7860abe891a9267e39 Mon Sep 17 00:00:00 2001 From: Anders Bjerner Date: Sat, 11 Nov 2017 17:14:36 +0100 Subject: [PATCH 15/15] Added Danish translation for "content_noChanges" --- 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 4f5bd4fbb5..09b2014301 100644 --- a/src/Umbraco.Web.UI/umbraco/config/lang/da.xml +++ b/src/Umbraco.Web.UI/umbraco/config/lang/da.xml @@ -182,6 +182,7 @@ Medlemsgruppe Rolle Medlemstype + Der er endnu ikke lavet nogle ændringer. Ingen dato valgt Sidetitel Egenskaber