Merge branch 'dev-v7' into dev-v7

.github/CONTRIBUTING.md

@@ -1,4 +1,4 @@
-_Looking for Umbraco version 8? [Click here](https://github.com/umbraco/Umbraco-CMS/blob/temp8/docs/CONTRIBUTING.md) to go to the v8 branch_
+_Looking for Umbraco version 8? [Click here](https://github.com/umbraco/Umbraco-CMS/blob/temp8/.github/V8_GETTING_STARTED.md) to go to the v8 branch_
 # Contributing to Umbraco CMS
 
 👍🎉 First off, thanks for taking the time to contribute! 🎉👍
@@ -72,7 +72,6 @@ The pull request team consists of a member of Umbraco HQ, [Sebastiaan](https://g
 - [Anders Bjerner](https://github.com/abjerner)
 - [Dave Woestenborghs](https://github.com/dawoe)
 - [Emma Burstow](https://github.com/emmaburstow)
-- [Kyle Weems](https://github.com/cssquirrel)
 - [Poornima Nayar](https://github.com/poornimanayar)
 
 These wonderful volunteers will provide you with a first reply to your PR, review and test out your changes and might ask more questions. After that they'll let Umbraco HQ know if everything seems okay. 

.github/README.md

@@ -30,7 +30,7 @@ As an Open Source platform, Umbraco is more than just a CMS. We are transparent
 
 ## Trying out Umbraco CMS
 
-[Umbraco Cloud](https://umbraco.com/cloud) is the easiest and fastest way to use Umbraco yet with full support for all your custom .NET code and integrations. You're up and running in less than a minute and your life will be made easier with automated upgrades and a built-in deployment engine. We offer a free 14 day trial, no credit card needed.
+[Umbraco Cloud](https://umbraco.com/cloud) is the easiest and fastest way to use Umbraco yet with full support for all your custom .NET code and integrations. You're up and running in less than a minute and your life will be made easier with automated upgrades and a built-in deployment engine. We offer a free 14-day trial, no credit card needed.
 
 If you want to DIY you can [download Umbraco](https://our.umbraco.com/download) either as a ZIP file or via NuGet. It's the same version of Umbraco CMS that powers Umbraco Cloud, but you'll need to find a place to host yourself and handling deployments and upgrades is all down to you.
 
@@ -47,4 +47,4 @@ Umbraco is contribution focused and community driven. If you want to contribute
 Another way you can contribute to Umbraco is by providing issue reports. For information on how to submit an issue report refer to our [online guide for reporting issues](https://github.com/umbraco/Umbraco-CMS/blob/dev-v7/.github/CONTRIBUTING.md).
 
 You can comment and report issues on the [github issue tracker](https://github.com/umbraco/Umbraco-CMS/issues).
-Since [September 2018](https://umbraco.com/blog/a-second-take-on-umbraco-issue-tracker-hello-github-issues/) the old issue tracker is in read only mode, but can still be found at [http://issues.umbraco.org](http://issues.umbraco.org).
+Since [September 2018](https://umbraco.com/blog/a-second-take-on-umbraco-issue-tracker-hello-github-issues/) the old issue tracker is in read-only mode, but can still be found at [http://issues.umbraco.org](http://issues.umbraco.org).

build.bat

@@ -9,6 +9,6 @@ IF ERRORLEVEL 1 (
 
 :error
 ECHO.
-ECHO Can not run build\build.ps1.
+ECHO Cannot run build\build.ps1.
 ECHO If this is due to a SecurityError then please refer to BUILD.md for help!
 ECHO.

src/Umbraco.Core/Persistence/DatabaseModelDefinitions/DefinitionFactory.cs

@@ -158,9 +158,7 @@ public static IndexDefinition GetIndexDefinition(Type modelType, PropertyInfo pr
                                      Name = indexName,
                                      IndexType = attribute.IndexType,
                                      ColumnName = columnName,
-                                     TableName = tableName,
-                                     IsClustered = attribute.IndexType == IndexTypes.Clustered,
-                                     IsUnique = attribute.IndexType == IndexTypes.UniqueNonClustered
+                                     TableName = tableName,                                                                     
                                  };
 
             if (string.IsNullOrEmpty(attribute.ForColumns) == false)
@@ -174,4 +172,4 @@ public static IndexDefinition GetIndexDefinition(Type modelType, PropertyInfo pr
             return definition;
         }
     }
-}
+}

src/Umbraco.Core/Persistence/DatabaseModelDefinitions/IndexDefinition.cs

@@ -1,3 +1,4 @@
+using System;
 using System.Collections.Generic;
 using Umbraco.Core.Persistence.DatabaseAnnotations;
 
@@ -14,9 +15,13 @@ public IndexDefinition()
         public virtual string SchemaName { get; set; }
         public virtual string TableName { get; set; }
         public virtual string ColumnName { get; set; }
+
+        [Obsolete("Use the IndexType property instead and set it to IndexTypes.UniqueNonClustered")]
         public virtual bool IsUnique { get; set; }
+
+        [Obsolete("Use the IndexType property instead and set it to IndexTypes.Clustered")]
         public bool IsClustered { get; set; }
         public virtual ICollection<IndexColumnDefinition> Columns { get; set; }
         public IndexTypes IndexType { get; set; }
     }
-}
+}

src/Umbraco.Core/Persistence/Migrations/Syntax/Alter/Column/AlterColumnBuilder.cs

@@ -1,4 +1,5 @@
 using System.Data;
+using Umbraco.Core.Persistence.DatabaseAnnotations;
 using Umbraco.Core.Persistence.DatabaseModelDefinitions;
 using Umbraco.Core.Persistence.Migrations.Syntax.Alter.Expressions;
 using Umbraco.Core.Persistence.Migrations.Syntax.Expressions;
@@ -139,10 +140,12 @@ public IAlterColumnOptionSyntax Unique(string indexName)
             {
                 Name = indexName,
                 SchemaName = Expression.SchemaName,
-                TableName = Expression.TableName,
-                IsUnique = true
+                TableName = Expression.TableName,                
+                IndexType = IndexTypes.UniqueNonClustered
             });
 
+
+
             index.Index.Columns.Add(new IndexColumnDefinition
                                         {
                                             Name = Expression.Column.Name
@@ -242,4 +245,4 @@ public IAlterColumnOptionSyntax OnDeleteOrUpdate(Rule rule)
             return this;
         }
     }
-}
+}

src/Umbraco.Core/Persistence/Migrations/Syntax/Alter/Table/AlterTableBuilder.cs

@@ -1,4 +1,5 @@
 using System.Data;
+using Umbraco.Core.Persistence.DatabaseAnnotations;
 using Umbraco.Core.Persistence.DatabaseModelDefinitions;
 using Umbraco.Core.Persistence.Migrations.Syntax.Alter.Expressions;
 using Umbraco.Core.Persistence.Migrations.Syntax.Expressions;
@@ -124,8 +125,8 @@ public IAlterTableColumnOptionSyntax Unique(string indexName)
             {
                 Name = indexName,
                 SchemaName = Expression.SchemaName,
-                TableName = Expression.TableName,
-                IsUnique = true
+                TableName = Expression.TableName,               
+                IndexType = IndexTypes.UniqueNonClustered
             });
 
             index.Index.Columns.Add(new IndexColumnDefinition
@@ -259,4 +260,4 @@ public IAlterTableColumnOptionSyntax OnDeleteOrUpdate(Rule rule)
             return this;
         }
     }
-}
+}

src/Umbraco.Core/Persistence/Migrations/Syntax/Create/Column/CreateColumnBuilder.cs

@@ -1,4 +1,5 @@
 using System.Data;
+using Umbraco.Core.Persistence.DatabaseAnnotations;
 using Umbraco.Core.Persistence.DatabaseModelDefinitions;
 using Umbraco.Core.Persistence.Migrations.Syntax.Expressions;
 using Umbraco.Core.Persistence.SqlSyntax;
@@ -114,8 +115,8 @@ public ICreateColumnOptionSyntax Unique(string indexName)
             {
                 Name = indexName,
                 SchemaName = Expression.SchemaName,
-                TableName = Expression.TableName,
-                IsUnique = true
+                TableName = Expression.TableName,               
+                IndexType = IndexTypes.UniqueNonClustered
             });
 
             index.Index.Columns.Add(new IndexColumnDefinition
@@ -217,4 +218,4 @@ public ICreateColumnOptionSyntax OnDeleteOrUpdate(Rule rule)
             return this;
         }
     }
-}
+}

src/Umbraco.Core/Persistence/Migrations/Syntax/Create/Index/CreateIndexBuilder.cs

@@ -47,39 +47,27 @@ public ICreateIndexOnColumnSyntax Descending()
         }
 
         ICreateIndexOnColumnSyntax ICreateIndexColumnOptionsSyntax.Unique()
-        {
-            Expression.Index.IsUnique = true;
-            //if it is Unique then it must be unique nonclustered and set the other flags
-            Expression.Index.IndexType = IndexTypes.UniqueNonClustered;
-            Expression.Index.IsClustered = false;
+        {                       
+            Expression.Index.IndexType = IndexTypes.UniqueNonClustered;            
             return this;
         }
 
         public ICreateIndexOnColumnSyntax NonClustered()
         {
-            Expression.Index.IndexType = IndexTypes.NonClustered;
-            Expression.Index.IsClustered = false;
-            Expression.Index.IndexType = IndexTypes.NonClustered;
-            Expression.Index.IsUnique = false;
+            Expression.Index.IndexType = IndexTypes.NonClustered;            
             return this;
         }
 
         public ICreateIndexOnColumnSyntax Clustered()
-        {
-            Expression.Index.IndexType = IndexTypes.Clustered;
-            Expression.Index.IsClustered = true;
-            //if it is clustered then we have to change the index type set the other flags
-            Expression.Index.IndexType = IndexTypes.Clustered;
-            Expression.Index.IsClustered = true;
-            Expression.Index.IsUnique = false;
-            return this;
+        {           
+           Expression.Index.IndexType = IndexTypes.Clustered;           
+           return this;
         }
 
         ICreateIndexOnColumnSyntax ICreateIndexOptionsSyntax.Unique()
         {
-            Expression.Index.IndexType = IndexTypes.UniqueNonClustered;
-            Expression.Index.IsUnique = true;
+            Expression.Index.IndexType = IndexTypes.UniqueNonClustered;           
             return this;
         }
     }
-}
+}

src/Umbraco.Core/Persistence/Migrations/Syntax/Create/Table/CreateTableBuilder.cs

@@ -1,4 +1,5 @@
 using System.Data;
+using Umbraco.Core.Persistence.DatabaseAnnotations;
 using Umbraco.Core.Persistence.DatabaseModelDefinitions;
 using Umbraco.Core.Persistence.Migrations.Syntax.Create.Expressions;
 using Umbraco.Core.Persistence.Migrations.Syntax.Expressions;
@@ -164,8 +165,8 @@ public ICreateTableColumnOptionSyntax Unique(string indexName)
             {
                 Name = indexName,
                 SchemaName = Expression.SchemaName,
-                TableName = Expression.TableName,
-                IsUnique = true
+                TableName = Expression.TableName,                
+                IndexType = IndexTypes.UniqueNonClustered
             });
 
             index.Index.Columns.Add(new IndexColumnDefinition
@@ -267,4 +268,4 @@ public ICreateTableColumnOptionSyntax OnDeleteOrUpdate(Rule rule)
             return this;
         }
     }
-}
+}

src/Umbraco.Tests/Persistence/SyntaxProvider/SqlCeSyntaxProviderTests.cs

@@ -89,7 +89,7 @@ public void Format_SqlServer_NonClusteredIndexDefinition_UsingIsClusteredFalse_A
             var sqlSyntax = new SqlServerSyntaxProvider();
 
             var indexDefinition = CreateIndexDefinition();
-            indexDefinition.IsClustered = false;
+            indexDefinition.IndexType = IndexTypes.Clustered;
 
             var actual = sqlSyntax.Format(indexDefinition);
             Assert.AreEqual("CREATE CLUSTERED INDEX [IX_A] ON [TheTable] ([A])", actual);
@@ -159,4 +159,4 @@ private static IndexDefinition CreateIndexDefinition()
         }
 
     }
-}
+}

src/Umbraco.Web.UI.Client/bower.json

@@ -33,6 +33,9 @@
     "clipboard": "1.7.1",
     "font-awesome": "~4.7"
   },
+  "resolutions": {
+    "font-awesome": "~4.7"
+  },
   "install": {
     "path": "lib-bower",
     "ignore": [

src/Umbraco.Web.UI.Client/src/common/directives/components/grid/grid.rte.directive.js

@@ -1,5 +1,5 @@
 angular.module("umbraco.directives")
-    .directive('gridRte', function (tinyMceService, stylesheetResource, angularHelper, assetsService, $q, $timeout) {
+    .directive('gridRte', function (tinyMceService, stylesheetResource, angularHelper, assetsService, $q, $timeout, eventsService) {
         return {
             scope: {
                 uniqueId: '=',
@@ -362,8 +362,16 @@ angular.module("umbraco.directives")
                             //    tinyMceEditor.fire('LoadContent', null);
                             //};
 
+
+                            var tabShownListener = eventsService.on("valTab.tabShown", function (e, args) {
+                                //the tab has been shown, trigger the mceAutoResize (as it could have timed out before the tab was shown)
+                                if (tinyMceEditor !== undefined && tinyMceEditor != null) {
+                                    tinyMceEditor.execCommand('mceAutoResize', false, null, null);
+                                }
+                            });
+
                             //listen for formSubmitting event (the result is callback used to remove the event subscription)
-                            var unsubscribe = scope.$on("formSubmitting", function () {
+                            var formSubmittingListener = scope.$on("formSubmitting", function () {
                                 //TODO: Here we should parse out the macro rendered content so we can save on a lot of bytes in data xfer
                                 // we do parse it out on the server side but would be nice to do that on the client side before as well.
                                 scope.value = tinyMceEditor ? tinyMceEditor.getContent() : null;
@@ -373,7 +381,8 @@ angular.module("umbraco.directives")
                             // NOTE: this is very important otherwise if this is part of a modal, the listener still exists because the dom
                             // element might still be there even after the modal has been hidden.
                             scope.$on('$destroy', function () {
-                                unsubscribe();
+                                formSubmittingListener();
+                                eventsService.unsubscribe(tabShownListener);
 								if (tinyMceEditor !== undefined && tinyMceEditor != null) {
 									tinyMceEditor.destroy()
 								}

src/Umbraco.Web.UI.Client/src/common/directives/validation/valtab.directive.js

@@ -6,15 +6,15 @@
 * @description Used to show validation warnings for a tab to indicate that the tab content has validations errors in its data.
 * In order for this directive to work, the valFormManager directive must be placed on the containing form.
 **/
-function valTab() {
+function valTab(eventsService) {
     return {
         require: ['^form', '^valFormManager'],
         restrict: "A",
         link: function (scope, element, attr, ctrs) {
 
             var valFormManager = ctrs[1];
-            var tabId = "tab" + scope.tab.id;                        
-            scope.tabHasError = false;
+            var tabId = "tab" + scope.tab.id;
+            scope.tabHasError = false;            
 
             //listen for form validation changes
             valFormManager.onValidationStatusChanged(function (evt, args) {
@@ -31,8 +31,17 @@ function valTab() {
                     scope.tabHasError = false;
                 }
             });
+            var tabShownFunc = function (e) {
+                var tabContent = element.closest(".umb-panel").find("#" + tabId);
+                eventsService.emit('valTab.tabShown', { originalEvent: e, tab: scope.tab, content: tabContent });
 
+            };
+            var anchorElement = element.find("a[data-toggle='tab']");
+            anchorElement.on('shown.bs.tab', tabShownFunc);
+            scope.$on('$destroy', function () {
+                anchorElement.off('shown.bs.tab', tabShownFunc);
+            });
         }
     };
 }
-angular.module('umbraco.directives.validation').directive("valTab", valTab);
+angular.module('umbraco.directives.validation').directive("valTab", valTab);

src/Umbraco.Web.UI.Client/src/common/services/navigation.service.js

@@ -463,7 +463,7 @@ function navigationService($rootScope, $routeParams, $log, $location, $q, $timeo
 
                     //if it is not two parts long then this most likely means that it's a legacy action
                     var js = action.metaData["jsAction"].replace("javascript:", "");
-                    //there's not really a different way to acheive this except for eval
+                    //there's not really a different way to achieve this except for eval
                     eval(js);
                 }
                 else {

src/Umbraco.Web.UI.Client/src/controllers/navigation.controller.js

@@ -11,7 +11,7 @@
  */
 function NavigationController($scope, $rootScope, $location, $log, $routeParams, $timeout, appState, navigationService, keyboardService, dialogService, historyService, eventsService, sectionResource, angularHelper) {
 
-    //TODO: Need to think about this and an nicer way to acheive what this is doing.
+    //TODO: Need to think about this and an nicer way to achieve what this is doing.
     //the tree event handler i used to subscribe to the main tree click events
     $scope.treeEventHandler = $({});
     navigationService.setupTreeEvents($scope.treeEventHandler);

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

@@ -101,6 +101,7 @@
 @import "components/umb-confirm-action.less";
 @import "components/umb-keyboard-shortcuts-overview.less";
 @import "components/umb-checkbox-list.less";
+@import "components/umb-radiobuttons-list.less";
 @import "components/umb-locked-field.less";
 @import "components/umb-tabs.less";
 @import "components/umb-load-indicator.less";

src/Umbraco.Web.UI.Client/src/less/components/prevalues/multivalues.less

@@ -5,6 +5,10 @@
     .umb-overlay & {
         width: 500px;
     }
+
+    p{
+        margin: 7px 0;
+    }
 }
 
 .umb-prevalues-multivalues__left {

src/Umbraco.Web.UI.Client/src/less/components/umb-color-swatches.less

@@ -42,8 +42,8 @@
     &.with-labels {
 
         .umb-color-box {
-            width: 120px;
-            height: 100%;
+            width: 130px;
+            height: auto;
             display: flex;
             flex-flow: row wrap;
 
@@ -53,15 +53,21 @@
                 flex: 0 0 100%;
                 max-width: 100%;
                 min-height: 80px;
-                padding-top: 10px;
+                padding: 0;
+
+                .check_circle {
+                    margin: 15px auto;
+                }
 
                 .umb-color-box__label {
                     background: @white;
                     font-size: 14px;
                     display: flex;
                     flex-flow: column wrap;
-                    flex: 0 0 100%;
+                    flex: 1 0 100%;
+                    justify-content: flex-end;
                     padding: 1px 5px;
+                    min-height: 45px;
                     max-width: 100%;
                     margin-top: auto;
                     margin-bottom: -3px;