Introduced properties overlay

.github/CONTRIBUTING.md

@@ -16,7 +16,7 @@ This document gives you a quick overview on how to get started, we will link to
 
 ## Guidelines for contributions we welcome
 
-Not all changes are wanted, so on occassion we might close a PR without merging it. We will give you feedback why we can't accept your changes and we'll be nice about it, thanking you for spending your valuable time.
+Not all changes are wanted, so on occassion we might close a PR without merging it. We will give you feedback why we can't accept your changes and we'll be nice about it, thanking you for spending your valueable time.
 
 We have [documented what we consider small and large changes](CONTRIBUTION_GUIDELINES.md). Make sure to talk to us before making large changes.
 

src/Umbraco.Core/IO/MediaFileSystem.cs

@@ -1,6 +1,4 @@
-using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
-using System;
+using System;
 using System.Collections.Generic;
 using System.Drawing;
 using System.Drawing.Drawing2D;
@@ -295,12 +293,6 @@ namespace Umbraco.Core.IO
         {
             var property = GetProperty(content, propertyTypeAlias);
             var svalue = property.Value as string;
-            if (svalue != null && svalue.DetectIsJson())
-            {
-                // the property value is a JSON serialized image crop data set - grab the "src" property as the file source
-                var jObject = JsonConvert.DeserializeObject<JObject>(svalue);
-                svalue = jObject != null ? jObject.GetValueAsString("src") : svalue;
-            }
             var oldpath = svalue == null ? null : GetRelativePath(svalue);
             var filepath = StoreFile(content, property.PropertyType, filename, filestream, oldpath);
             property.Value = GetUrl(filepath);

src/Umbraco.Web.UI.Client/src/less/helveticons.less

@@ -17,14 +17,12 @@
   -webkit-font-smoothing: antialiased;
   *margin-right: .3em;
 }
-
 [class^="icon-"]:before,
 [class*=" icon-"]:before {
   text-decoration: inherit;
   display: inline-block;
   speak: none;
 }
-
 /*
 [class^="icon-"]:before, [class*=" icon-"]:before {
 	font-family: 'icomoon';
@@ -40,6 +38,7 @@
 i.large{
 	font-size: 32px;
 }
+
 i.medium{
 	font-size: 24px;
 }
@@ -188,6 +187,8 @@ i.small{
 .icon-umb-translation:before, .traytranslation:before {
 	content: "\e1fd";
 }
+
+
 .icon-tv:before {
 	content: "\e02e";
 }
@@ -212,8 +213,7 @@ i.small{
 .icon-train:before {
 	content: "\e035";
 }
-.icon-trafic:before,
-.icon-traffic:before {
+.icon-trafic:before {
 	content: "\e036";
 }
 .icon-traffic-alt:before {
@@ -255,7 +255,6 @@ i.small{
 .icon-target:before {
 	content: "\e043";
 }
-.icon-temperature-alt:before,
 .icon-temperatrure-alt:before {
 	content: "\e044";
 }
@@ -268,7 +267,6 @@ i.small{
 .icon-theater:before {
 	content: "\e047";
 }
-.icon-thief:before,
 .icon-theif:before {
 	content: "\e048";
 }
@@ -377,7 +375,6 @@ i.small{
 .icon-shuffle:before {
 	content: "\e06b";
 }
-.icon-science:before,
 .icon-sience:before {
 	content: "\e06c";
 }
@@ -750,7 +747,6 @@ i.small{
 .icon-pictures-alt-2:before {
 	content: "\e0e7";
 }
-.icon-panel-close:before,
 .icon-pannel-close:before {
 	content: "\e0e8";
 }
@@ -1631,7 +1627,6 @@ i.small{
 .icon-alarm-clock:before {
 	content: "\e20c";
 }
-.icon-addressbook:before,
 .icon-adressbook:before {
 	content: "\e20d";
 }

src/Umbraco.Web.UI.Client/src/views/common/overlays/properties/properties.html

@@ -0,0 +1,7 @@
+<div>
+    <form ng-submit="model.submit(model)">
+        <umb-property property="property" ng-repeat="property in model.properties">
+            <umb-property-editor model="property"></umb-property-editor>
+        </umb-property>
+    </form>
+</div>

src/Umbraco.Web.UI.Client/src/views/content/content.notify.controller.js

@@ -3,8 +3,7 @@
         $scope,
         contentResource,
         navigationService,
-        angularHelper,
-        localizationService) {
+        angularHelper) {
         var vm = this;
         var currentForm;
         vm.notifyOptions = [];
@@ -12,8 +11,7 @@
         vm.cancel = cancel;
         vm.message = {
             name: $scope.currentNode.name
-        };
-        vm.labels = {};
+        };;
         function onInit() {
             vm.loading = true;
             contentResource.getNotifySettingsById($scope.currentNode.id).then(function (options) {
@@ -21,9 +19,6 @@
                 vm.loading = false;
                 vm.notifyOptions = options;
             });
-            localizationService.localize("notifications_editNotifications", [$scope.currentNode.name]).then(function(value) {
-                vm.labels.headline = value;
-            });
         }
         function cancel() {
             navigationService.hideMenu();

src/Umbraco.Web.UI.Client/src/views/content/copy.html

@@ -11,17 +11,14 @@
 
             <div ng-show="success">
                 <div class="alert alert-success">
-                    <strong>{{currentNode.name}}</strong>
-                    <localize key="actions_wasCopiedTo">was copied to</localize>
+                    <strong>{{currentNode.name}}</strong> was copied to
                     <strong>{{target.name}}</strong>
                 </div>
                 <button class="btn btn-primary" ng-click="nav.hideDialog()">Ok</button>
             </div>
 
             <p class="abstract" ng-hide="success">
-                <localize key="actions_chooseWhereToCopy">Choose where to copy</localize>
-                <strong>{{currentNode.name}}</strong>
-                <localize key="actions_toInTheTreeStructureBelow">to in the tree structure below</localize>
+                Choose where to copy <strong>{{currentNode.name}}</strong> to in the tree structure below
             </p>
 
             <div class="umb-loader-wrapper" ng-show="busy">

src/Umbraco.Web.UI.Client/src/views/content/move.html

@@ -11,9 +11,7 @@
 
             <div ng-show="success">
                 <div class="alert alert-success">
-                    <strong>{{currentNode.name}}</strong>
-                    <localize key="actions_wasMovedTo">was moved to</localize>
-                    <strong>{{target.name}}</strong>
+                    <strong>{{currentNode.name}}</strong> was moved underneath&nbsp;<strong>{{target.name}}</strong>
                 </div>
                 <button class="btn btn-primary" ng-click="nav.hideDialog()">Ok</button>
             </div>

src/Umbraco.Web.UI.Client/src/views/content/notify.html

@@ -13,13 +13,13 @@
                 </div>
                 <div ng-show="vm.saveSuccces" ng-cloak>
                     <div class="alert alert-success">
-                        <localize key="notifications_notificationsSavedFor"></localize> <strong>{{currentNode.name}}</strong>
+                        <localize key="notify_notificationsSavedFor"></localize><strong> {{currentNode.name}}</strong>
                     </div>
                     <button class="btn btn-primary" ng-click="vm.cancel()"><localize key="general_ok">Ok</localize></button>
                 </div>
                 <div ng-hide="vm.saveSuccces || vm.saveError" ng-cloak>
                     <div class="block-form" ng-show="!vm.loading">
-                        <span ng-bind-html="vm.labels.headline"></span>
+                        <localize key="notify_notifySet">Set your notification for</localize> <strong>{{ currentNode.name }}</strong>
                         <umb-control-group>
                             <umb-permission ng-repeat="option in vm.notifyOptions"
                                             name="option.name"

src/Umbraco.Web.UI.Client/src/views/media/move.html

@@ -11,9 +11,7 @@
 
 		    <div ng-show="success">
 			    <div class="alert alert-success">
-			        <strong>{{currentNode.name}}</strong>
-			        <localize key="actions_wasMovedTo">was moved to</localize>
-			        <strong>{{target.name}}</strong>
+				    <strong>{{currentNode.name}}</strong> was moved underneath <strong>{{target.name}}</strong>
 			    </div>
 			    <button class="btn btn-primary" ng-click="nav.hideDialog()">Ok</button>
 		    </div>

src/Umbraco.Web.UI/umbraco/config/lang/da.xml

@@ -32,11 +32,8 @@
     <key alias="rename" version="7.3.0">Omdøb</key>
     <key alias="restore" version="7.3.0">Gendan</key>
     <key alias="SetPermissionsForThePage">Sæt rettigheder for siden %0%</key>
-    <key alias="chooseWhereToCopy">Vælg hvor du vil kopiere</key>
     <key alias="chooseWhereToMove">Vælg hvortil du vil flytte</key>
-    <key alias="toInTheTreeStructureBelow">til i træstrukturen nedenfor</key>
-    <key alias="wasMovedTo">blev flyttet til</key>
-    <key alias="wasCopiedTo">blev kopieret til</key>
+    <key alias="toInTheTreeStructureBelow">I træstrukturen nedenfor</key>
     <key alias="rights">Rettigheder</key>
     <key alias="rollback">Fortryd ændringer</key>
     <key alias="sendtopublish">Send til udgivelse</key>
@@ -833,8 +830,7 @@
     <key alias="relateToOriginal">Relater det kopierede element til originalen</key>
   </area>
   <area alias="notifications">
-    <key alias="editNotifications"><![CDATA[Vælg dine notificeringer for <strong>%0%</strong>]]></key>
-    <key alias="notificationsSavedFor">Notificeringer er gemt for</key>
+    <key alias="editNotifications">Rediger dine notificeringer for %0%</key>
     <key alias="mailBody">
       <![CDATA[
 Hej %0%
@@ -1008,7 +1004,6 @@ Mange hilsner fra Umbraco robotten
 
 
   <area alias="rollback">
-    <key alias="headline">Vælg en version at sammenligne med den nuværende version</key>
     <key alias="currentVersion">Nuværende version</key>
     <key alias="diffHelp"><![CDATA[Her vises forskellene mellem den nuværende version og den valgte version<br /><del>Rød</del> tekst vil ikke blive vist i den valgte version. <ins>Grøn betyder tilføjet</ins>]]></key>
     <key alias="documentRolledBack">Dokument tilbagerullet</key>

src/Umbraco.Web.UI/umbraco/config/lang/en.xml

@@ -33,11 +33,8 @@
         <key alias="rename" version="7.3.0">Rename</key>
         <key alias="restore" version="7.3.0">Restore</key>
         <key alias="SetPermissionsForThePage">Set permissions for the page %0%</key>
-        <key alias="chooseWhereToCopy">Choose where to copy</key>
         <key alias="chooseWhereToMove">Choose where to move</key>
-        <key alias="toInTheTreeStructureBelow">to in the tree structure below</key>
-        <key alias="wasMovedTo">was moved to</key>
-        <key alias="wasCopiedTo">was copied to</key>
+        <key alias="toInTheTreeStructureBelow">In the tree structure below</key>
         <key alias="rights">Permissions</key>
         <key alias="rollback">Rollback</key>
         <key alias="sendtopublish">Send To Publish</key>
@@ -1041,8 +1038,7 @@ To manage your website, simply open the Umbraco back office and start adding con
         <key alias="relateToOriginal">Relate copied items to original</key>
     </area>
     <area alias="notifications">
-        <key alias="editNotifications"><![CDATA[Select your notification for <strong>%0%</strong>]]></key>
-        <key alias="notificationsSavedFor">Notification settings saved for</key>
+        <key alias="editNotifications">Edit your notification for %0%</key>
         <key alias="mailBody">
             <![CDATA[
       Hi %0%
@@ -1314,7 +1310,6 @@ To manage your website, simply open the Umbraco back office and start adding con
         <key alias="undoEditCrop">Undo edits</key>
     </area>
     <area alias="rollback">
-        <key alias="headline">Select a version to compare with the current version</key>
         <key alias="currentVersion">Current version</key>
         <key alias="diffHelp"><![CDATA[This shows the differences between the current version and the selected version<br /><del>Red</del> text will not be shown in the selected version. , <ins>green means added</ins>]]></key>
         <key alias="documentRolledBack">Document has been rolled back</key>

src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml

@@ -33,11 +33,8 @@
         <key alias="rename" version="7.3.0">Rename</key>
         <key alias="restore" version="7.3.0">Restore</key>
         <key alias="SetPermissionsForThePage">Set permissions for the page %0%</key>
-        <key alias="chooseWhereToCopy">Choose where to copy</key>
         <key alias="chooseWhereToMove">Choose where to move</key>
-        <key alias="toInTheTreeStructureBelow">to in the tree structure below</key>
-        <key alias="wasMovedTo">was moved to</key>
-        <key alias="wasCopiedTo">was copied to</key>
+        <key alias="toInTheTreeStructureBelow">In the tree structure below</key>
         <key alias="rights">Permissions</key>
         <key alias="rollback">Rollback</key>
         <key alias="sendtopublish">Send To Publish</key>
@@ -1040,8 +1037,7 @@ To manage your website, simply open the Umbraco back office and start adding con
         <key alias="relateToOriginal">Relate copied items to original</key>
     </area>
     <area alias="notifications">
-        <key alias="editNotifications"><![CDATA[Select your notification for <strong>%0%</strong>]]></key>
-        <key alias="notificationsSavedFor">Notification settings saved for</key>
+        <key alias="editNotifications">Edit your notification for %0%</key>
         <key alias="mailBody">
             <![CDATA[
       Hi %0%
@@ -1313,7 +1309,6 @@ To manage your website, simply open the Umbraco back office and start adding con
         <key alias="undoEditCrop">Undo edits</key>
     </area>
     <area alias="rollback">
-        <key alias="headline">Select a version to compare with the current version</key>
         <key alias="currentVersion">Current version</key>
         <key alias="diffHelp"><![CDATA[This shows the differences between the current version and the selected version<br /><del>Red</del> text will not be shown in the selected version. , <ins>green means added</ins>]]></key>
         <key alias="documentRolledBack">Document has been rolled back</key>
@@ -2225,4 +2220,8 @@ To manage your website, simply open the Umbraco back office and start adding con
         <key alias="itemCannotBeRestoredHelpText">There is no location where this item can be automatically restored. You can move the item manually using the tree below.</key>
         <key alias="wasRestored">was restored under</key>
     </area>
+    <area alias="notify">
+        <key alias="notifySet">Select your notifications for</key>
+        <key alias="notificationsSavedFor">Notification settings saved for </key>
+    </area>
 </language>

src/Umbraco.Web.UI/umbraco/dialogs/rollBack.aspx

@@ -55,7 +55,7 @@
     </div>
 
     <div runat="server" id="pl_buttons" class="umb-dialog-footer btn-toolbar umb-btn-toolbar">
-        <a href="#" class="btn btn-link" onclick="UmbClientMgr.closeModalWindow()"><%=umbraco.ui.Text("general", "close")%></a>
+        <a href="#" class="btn btn-link" onclick="UmbClientMgr.closeModalWindow()"><%=umbraco.ui.Text("general", "cancel")%></a>
         <asp:Button ID="Button1" runat="server" visible="false" CssClass="btn btn-primary" OnClick="doRollback_Click"></asp:Button>
     </div>  
 </asp:Content>

src/Umbraco.Web/Editors/LogController.cs

@@ -27,7 +27,7 @@ namespace Umbraco.Web.Editors
             long totalRecords;
             var dateQuery = sinceDate.HasValue ? Query<IAuditItem>.Builder.Where(x => x.CreateDate >= sinceDate) : null;
             var result = Services.AuditService.GetPagedItemsByEntity(id, pageNumber - 1, pageSize, out totalRecords, orderDirection, customFilter: dateQuery);
-            var mapped = result.Select(item => Mapper.Map<AuditLog>(item));        
+            var mapped = Mapper.Map<IEnumerable<AuditLog>>(result);
             
             var page = new PagedResult<AuditLog>(totalRecords, pageNumber, pageSize)
             {
@@ -85,17 +85,16 @@ namespace Umbraco.Web.Editors
 
         private IEnumerable<AuditLog> MapAvatarsAndNames(IEnumerable<AuditLog> items)
         {
-            var mappedItems = items.ToList();
-            var userIds = mappedItems.Select(x => x.UserId).ToArray();
+            var userIds = items.Select(x => x.UserId).ToArray();
             var users = Services.UserService.GetUsersById(userIds)
                 .ToDictionary(x => x.Id, x => x.GetUserAvatarUrls(ApplicationContext.ApplicationCache.RuntimeCache));
             var userNames = Services.UserService.GetUsersById(userIds).ToDictionary(x => x.Id, x => x.Name);
-            foreach (var item in mappedItems)
+            foreach (var item in items)
             {
                 item.UserAvatars = users[item.UserId];
                 item.UserName = userNames[item.UserId];
             }
-            return mappedItems;
+            return items;
         }
     }
 }

src/Umbraco.Web/Editors/PasswordChanger.cs

@@ -100,7 +100,7 @@ namespace Umbraco.Web.Editors
                 {
                     var errors = string.Join(". ", resetResult.Errors);
                     _logger.Warn<PasswordChanger>(string.Format("Could not reset user password {0}", errors));
-                    return Attempt.Fail(new PasswordChangedModel { ChangeError = new ValidationResult(errors, new[] { "resetPassword" }) });
+                    return Attempt.Fail(new PasswordChangedModel { ChangeError = new ValidationResult("Could not reset password, errors: " + errors, new[] { "resetPassword" }) });
                 }
 
                 return Attempt.Succeed(new PasswordChangedModel());
@@ -120,30 +120,21 @@ namespace Umbraco.Web.Editors
                 return Attempt.Fail(new PasswordChangedModel { ChangeError = new ValidationResult("Password cannot be changed without the old password", new[] { "oldPassword" }) });
             }
 
-            //get the user
-            var backOfficeIdentityUser = await userMgr.FindByIdAsync(savingUser.Id);
-            if (backOfficeIdentityUser == null)
+            if (passwordModel.OldPassword.IsNullOrWhiteSpace() == false)
             {
-                //this really shouldn't ever happen... but just in case
-                return Attempt.Fail(new PasswordChangedModel { ChangeError = new ValidationResult("Password could not be verified", new[] { "oldPassword" }) });
+                //if an old password is suplied try to change it
+                var changeResult = await userMgr.ChangePasswordAsync(savingUser.Id, passwordModel.OldPassword, passwordModel.NewPassword);
+                if (changeResult.Succeeded == false)
+                {
+                    var errors = string.Join(". ", changeResult.Errors);
+                    _logger.Warn<PasswordChanger>(string.Format("Could not change user password {0}", errors));
+                    return Attempt.Fail(new PasswordChangedModel { ChangeError = new ValidationResult("Could not change password, errors: " + errors, new[] { "oldPassword" }) });
+                }
+                return Attempt.Succeed(new PasswordChangedModel());
             }
-            //is the old password correct?
-            var validateResult = await userMgr.CheckPasswordAsync(backOfficeIdentityUser, passwordModel.OldPassword);
-            if(validateResult == false)
-            {
-                //no, fail with an error message for "oldPassword"
-                return Attempt.Fail(new PasswordChangedModel { ChangeError = new ValidationResult("Incorrect password", new[] { "oldPassword" }) });
-            }
-            //can we change to the new password?
-            var changeResult = await userMgr.ChangePasswordAsync(savingUser.Id, passwordModel.OldPassword, passwordModel.NewPassword);
-            if (changeResult.Succeeded == false)
-            {
-                //no, fail with error messages for "password"
-                var errors = string.Join(". ", changeResult.Errors);
-                _logger.Warn<PasswordChanger>(string.Format("Could not change user password {0}", errors));
-                return Attempt.Fail(new PasswordChangedModel { ChangeError = new ValidationResult(errors, new[] { "password" }) });
-            }
-            return Attempt.Succeed(new PasswordChangedModel());
+
+            //We shouldn't really get here
+            return Attempt.Fail(new PasswordChangedModel { ChangeError = new ValidationResult("Could not change password, invalid information supplied", new[] { "value" }) });
         }
 
         /// <summary>

src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/rollBack.aspx.cs

@@ -116,11 +116,6 @@ namespace umbraco.presentation.dialogs
             currentVersionTitle.Text = currentDoc.Text;
             currentVersionMeta.Text = ui.Text("content", "createDate") + ": " + currentDoc.VersionDate.ToShortDateString() + " " + currentDoc.VersionDate.ToShortTimeString();
 
-		    pp_selectVersion.Text = ui.Text("rollback", "headline");
-		    pp_currentVersion.Text = ui.Text("rollback", "currentVersion");
-		    pp_view.Text = ui.Text("rollback", "view");
-		    pp_rollBackTo.Text = ui.Text("rollback", "rollbackTo");
-
             if (!IsPostBack) {
                 allVersions.Items.Add(new ListItem(ui.Text("rollback", "selectVersion")+ "...", ""));