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.UI.Client/lib/bootstrap/less/thumbnails.less b/src/Umbraco.Web.UI.Client/lib/bootstrap/less/thumbnails.less index 513039cca4..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,15 +31,17 @@ display: block; padding: 4px; line-height: @baseLineHeight; - border: 1px solid #ddd; + border: 1px solid @gray-8; .border-radius(@baseBorderRadius); .box-shadow(0 1px 3px rgba(0,0,0,.055)); .transition(all .2s ease-in-out); } -// 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: @turquoise; .box-shadow(0 1px 4px rgba(0,105,214,.25)); } 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 2dd287e81a..f09e31924f 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,8 +242,8 @@ var propGroups = _.find(genericTab.properties, function (item) { return item.alias === "_umb_membergroup"; }); - saveModel.email = propEmail.value; - saveModel.username = propLogin.value; + saveModel.email = propEmail.value.trim(); + saveModel.username = propLogin.value.trim(); saveModel.password = this.formatChangePasswordModel(propPass.value); diff --git a/src/Umbraco.Web.UI.Client/src/less/healthcheck.less b/src/Umbraco.Web.UI.Client/src/less/healthcheck.less index 24660396d6..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: 2px solid transparent; + border: 1px solid @gray-8; height: 100%; } .umb-healthcheck-group:hover { - border: 2px solid @turquoise; + border: 1px solid @turquoise; cursor: pointer; } 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 e4baaae593..3a1f65b696 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 @@ @@ -107,14 +111,14 @@
{{node.releaseDateDay}} {{node.releaseDate | amDateFormat:'HH:mm'}}
- Set date + Set date - Clear date + Clear date @@ -139,14 +143,14 @@
{{node.removeDateDay}} {{node.removeDate | amDateFormat:'HH:mm'}}
- Set date + Set date - Clear date + Clear date @@ -160,7 +164,7 @@ - {{node.createDateFormatted | amDateFormat:'MMMM Do YYYY, HH:mm'}} by {{ node.owner.name }} + {{node.createDateFormatted | amDateFormat:'MMMM Do YYYY, HH:mm'}} by {{ node.owner.name }} 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/umbraco/config/lang/da.xml b/src/Umbraco.Web.UI/umbraco/config/lang/da.xml index 4f5bd4fbb5..5938454193 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 @@ -194,6 +195,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 @@ -530,6 +532,7 @@ Højde Hjælp Skjul + Historik Ikon Importer Indre margen @@ -576,6 +579,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 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 + 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 + diff --git a/src/Umbraco.Web/Editors/MemberController.cs b/src/Umbraco.Web/Editors/MemberController.cs index 888d097bf4..5e246c0d59 100644 --- a/src/Umbraco.Web/Editors/MemberController.cs +++ b/src/Umbraco.Web/Editors/MemberController.cs @@ -393,7 +393,7 @@ 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.Email = contentItem.Email; contentItem.PersistedContent.Username = contentItem.Username; //use the base method to map the rest of the properties