Merge remote-tracking branch 'origin/dev-v8' into temp8-4217-datatype…

…-edits-updates-content-editor

src/Umbraco.Core/Persistence/Repositories/Implement/DocumentRepository.cs

@@ -232,7 +232,7 @@ public override IEnumerable<IContent> GetAllVersionsSlim(int nodeId, int skip, i
                 .OrderByDescending<ContentVersionDto>(x => x.Current)
                 .AndByDescending<ContentVersionDto>(x => x.VersionDate);
 
-            return MapDtosToContent(Database.Fetch<DocumentDto>(sql), true, true);
+            return MapDtosToContent(Database.Fetch<DocumentDto>(sql), true, true).Skip(skip).Take(take);
         }
 
         public override IContent GetVersion(int versionId)

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

@@ -56,7 +56,7 @@ Use this directive make an element sticky and follow the page when scrolling.
                 }
 
                 if (attr.scrollableContainer) {
-                    scrollableContainer = $(attr.scrollableContainer);
+                    scrollableContainer = bar.closest(attr.scrollableContainer);
                 } else {
                     scrollableContainer = $(window);
                 }
@@ -121,7 +121,7 @@ Use this directive make an element sticky and follow the page when scrolling.
             function calculateSize() {
                 var width = bar.innerWidth();
                 clonedBar.css({
-                    width: width
+                    width: width + 10 // + 10 (5*2) because we need to add border to avoid seeing the shadow beneath. Look at the CSS.
                 });
             }
 

src/Umbraco.Web.UI.Client/src/less/components/editor.less

@@ -167,23 +167,23 @@ a.umb-editor-header__close-split-view:hover {
 	text-decoration: none !important;
 	font-size: 13px;
 	//color: @gray-4;
-    color: @ui-action-disgrete-type;
+    color: @ui-action-discreet-type;
 	//background-color: @white;
 }
 
 a.umb-variant-switcher__toggle {
 	transition: color 0.2s ease-in-out;
 	&:hover {
 		//background-color: @gray-10;
-        color: @ui-action-disgrete-type-hover;
+        color: @ui-action-discreet-type-hover;
         .umb-variant-switcher__expand {
-            color: @ui-action-disgrete-type-hover;
+            color: @ui-action-discreet-type-hover;
         }
 	}
 }
 
 .umb-variant-switcher__expand {
-    color: @ui-action-disgrete-type;
+    color: @ui-action-discreet-type;
 	margin-top: 3px;
 	margin-left: 5px;
 	margin-right: -5px;

src/Umbraco.Web.UI.Client/src/less/components/editor/subheader/umb-editor-sub-header.less

@@ -1,7 +1,11 @@
 .umb-editor-sub-header {
    padding: 10px 0;
    margin-bottom: 10px;
-   background: @gray-10;
+   background: @brownGrayLight;
+   border-left: 5px solid @brownGrayLight;
+   border-right: 5px solid @brownGrayLight;
+   margin-left: -5px;
+   margin-right: -5px;
    display: flex;
    justify-content: space-between;
    margin-top: -10px;
@@ -12,7 +16,7 @@
     &.nested {
         margin-top: 0;
         margin-bottom: 0;
-        background: @gray-10;
+        background: @brownGrayLight;
     }
 }
 
@@ -25,10 +29,14 @@
 
 .umb-editor-sub-header.-umb-sticky-bar {
     box-shadow: 0 6px 3px -3px rgba(0,0,0,.16);
-    transition: box-shadow 1s;
-    top: calc(@appHeaderHeight + @editorHeaderHeight);
+    transition: box-shadow 240ms;
     margin-top: 0;
     margin-bottom: 0;
+    top: calc(@appHeaderHeight + @editorHeaderHeight);
+
+    .umb-editor--infinityMode & {
+        top: calc(@editorHeaderHeight);
+    }
 }
 
 .umb-group-builder__property-preview .umb-editor-sub-header {

src/Umbraco.Web.UI.Client/src/less/components/umb-file-dropzone.less

@@ -41,13 +41,13 @@
   // file select link
   .file-select {
     font-size: 15px;
-    color: @ui-action-disgrete-type;
+    color: @ui-action-discreet-type;
     cursor: pointer;
 
     margin-top: 10px;
 
     &:hover {
-        color: @ui-action-disgrete-type-hover;
+        color: @ui-action-discreet-type-hover;
         text-decoration: none;
     }
   }

src/Umbraco.Web.UI.Client/src/less/components/umb-media-grid.less

@@ -218,7 +218,7 @@
     transition: opacity 150ms;
 
     &:hover {
-        color: @ui-action-disgrete-type-hover;
+        color: @ui-action-discreet-type-hover;
     }
 }
 

src/Umbraco.Web.UI.Client/src/less/components/umb-node-preview.less

@@ -89,16 +89,16 @@
     display: flex;
     align-items: center;
     justify-content: center;
-    border: 1px dashed @ui-action-disgrete-border;
-    color: @ui-action-disgrete-type;
+    border: 1px dashed @ui-action-discreet-border;
+    color: @ui-action-discreet-type;
     font-weight: bold;
     padding: 5px 15px;
     box-sizing: border-box;
 }
 
 .umb-node-preview-add:hover {
-    color: @ui-action-disgrete-type-hover;
-    border-color: @ui-action-disgrete-border-hover;
+    color: @ui-action-discreet-type-hover;
+    border-color: @ui-action-discreet-border-hover;
     text-decoration: none;
 }
 

src/Umbraco.Web.UI.Client/src/less/components/umb-packages.less

@@ -408,7 +408,7 @@ a.umb-package-details__back-link {
 
 .umb-gallery__thumbnail {
     flex: 0 1 100px;
-    border: 1px solid @ui-action-disgrete-border;
+    border: 1px solid @ui-action-discreet-border;
     border-radius: 3px;
     margin: 5px;
     padding: 10px;
@@ -418,7 +418,7 @@ a.umb-package-details__back-link {
 
 .umb-gallery__thumbnail:hover {
     cursor: pointer;
-    border-color: @ui-action-disgrete-border-hover;
+    border-color: @ui-action-discreet-border-hover;
 }
 
 /* PACKAGE LIST */

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

@@ -239,8 +239,8 @@
 
 .list-view-add-layout {
    margin-top: 10px;
-   color: @ui-action-disgrete-type;
-   border: 1px dashed @ui-action-disgrete-border;
+   color: @ui-action-discreet-type;
+   border: 1px dashed @ui-action-discreet-border;
    display: flex;
    align-items: center;
    justify-content: center;
@@ -250,6 +250,6 @@
 
 .list-view-add-layout:hover {
    text-decoration: none;
-   color: @ui-action-disgrete-type-hover;
-   border-color: @ui-action-disgrete-border-hover;
+   color: @ui-action-discreet-type-hover;
+   border-color: @ui-action-discreet-border-hover;
 }

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

@@ -346,15 +346,15 @@
   justify-content: center;
   align-items: center;
   background: @white;
-  border: 1px solid @ui-action-disgrete-border;
+  border: 1px solid @ui-action-discreet-border;
   animation: fadeIn 0.5s;
   border-radius: 3px;
   width: 50px;
   &:hover {
       .icon {
           opacity: 0.8;
       }
-      border-color: @ui-action-disgrete-border-hover;
+      border-color: @ui-action-discreet-border-hover;
   }
 }
 

src/Umbraco.Web.UI.Client/src/less/property-editors.less

@@ -269,8 +269,8 @@
     transition: all 150ms ease-in-out;
 
     &:hover {
-        color: @ui-action-disgrete-type-hover;
-        border-color: @ui-action-disgrete-type-hover;
+        color: @ui-action-discreet-type-hover;
+        border-color: @ui-action-discreet-type-hover;
     }
 }
 

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

@@ -166,12 +166,12 @@
 @ui-action-border:             @blueExtraDark;
 @ui-action-border-hover:       @blueMid;
 
-@ui-action-disgrete:              white;
-@ui-action-disgrete-hover:        @sand-7;
-@ui-action-disgrete-type:         @blueExtraDark;
-@ui-action-disgrete-type-hover:   @blueMid;
-@ui-action-disgrete-border:         @gray-7;
-@ui-action-disgrete-border-hover:   @blueMid;
+@ui-action-discreet:              white;
+@ui-action-discreet-hover:        @sand-7;
+@ui-action-discreet-type:         @blueExtraDark;
+@ui-action-discreet-type-hover:   @blueMid;
+@ui-action-discreet-border:         @gray-7;
+@ui-action-discreet-border-hover:   @blueMid;
 
 @type-white:                      @white;
 @type-black:                      @blueNight;

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

@@ -5,7 +5,7 @@
     <form name="vm.domainForm" ng-submit="vm.save()" novalidate>
 
         <div ng-hide="vm.loading" class="umb-dialog-body">
-            
+
             <umb-pane ng-if="!currentNode.metaData.variesByCulture">
                 <h5 class="umb-pane-title"><localize key="assignDomain_setLanguage">Culture</localize></h5>
                 <label for="assignDomain_language" class="control-label"><localize key="general_language"></localize></label>
@@ -18,14 +18,14 @@ <h5 class="umb-pane-title"><localize key="assignDomain_setLanguage">Culture</loc
 
                 <h5 class="umb-pane-title"><localize key="assignDomain_setDomains">Domains</localize></h5>
                 <small class="db" style="margin-bottom: 10px;">
-                    <localize key="assignDomain_domainHelp"></localize>
+                    <localize key="assignDomain_domainHelpWithVariants"></localize>
                 </small>
                 <div class="umb-el-wrap  hidelabel">
                     <table class="table table-condensed table-bordered domains" style="margin-bottom: 10px;" ng-if="vm.domains.length > 0">
                         <thead>
                             <tr>
                                 <th>
-                                    <localize key="assignDomain_domain"></localize>                    
+                                    <localize key="assignDomain_domain"></localize>
                                     <span class="umb-control-required">*</span>
                                 </th>
                                 <th>
@@ -45,17 +45,17 @@ <h5 class="umb-pane-title"><localize key="assignDomain_setDomains">Domains</loca
                                     <span ng-show="domain.duplicate" class="help-inline"><localize key="assignDomain_duplicateDomain"></localize><span ng-show="domain.other">({{domain.other}})</span></span>
                                 </td>
                                 <td>
-                                    <select 
-                                        style="width: 100%; margin-bottom: 0;" 
-                                        name="domain_language_{{$index}}" 
-                                        class="language" 
-                                        ng-model="domain.lang" 
+                                    <select
+                                        style="width: 100%; margin-bottom: 0;"
+                                        name="domain_language_{{$index}}"
+                                        class="language"
+                                        ng-model="domain.lang"
                                         ng-options="lang.name for lang in vm.languages"
                                         required>
                                     </select>
                                 </td>
                                 <td>
-                                    <umb-button 
+                                    <umb-button
                                         icon="icon-trash"
                                         action="vm.removeDomain($index)"
                                         type="button"
@@ -66,8 +66,8 @@ <h5 class="umb-pane-title"><localize key="assignDomain_setDomains">Domains</loca
                         </tbody>
                     </table>
                 </div>
-                
-                <umb-button 
+
+                <umb-button
                     label-key="assignDomain_addNew"
                     action="vm.addDomain()"
                     type="button"
@@ -80,14 +80,14 @@ <h5 class="umb-pane-title"><localize key="assignDomain_setDomains">Domains</loca
 
         <div class="umb-dialog-footer btn-toolbar umb-btn-toolbar">
 
-            <umb-button 
+            <umb-button
                 label-key="general_close"
                 action="vm.closeDialog()"
                 type="button"
                 button-style="link">
             </umb-button>
 
-            <umb-button 
+            <umb-button
                 label-key="buttons_save"
                 type="submit"
                 button-style="success"
@@ -97,5 +97,5 @@ <h5 class="umb-pane-title"><localize key="assignDomain_setDomains">Domains</loca
         </div>
 
     </form>
-    
+
 </div>

src/Umbraco.Web.UI.Client/src/views/propertyeditors/checkboxlist/checkboxlist.controller.js

@@ -33,9 +33,7 @@ angular.module("umbraco").controller("Umbraco.PropertyEditors.CheckboxListContro
         }
 
         function updateViewModel(configItems) {
-
-            //check if it's already in sync
-
+
             //get the checked vals from the view model
             var selectedVals = _.map(
                 _.filter($scope.selectedItems,
@@ -47,22 +45,22 @@ angular.module("umbraco").controller("Umbraco.PropertyEditors.CheckboxListContro
                     return m.value;
                 }
             );
-            //get all of the same values between the arrays
-            var same = _.intersection($scope.model.value, selectedVals);
-            //if the lengths are the same as the value, then we are in sync, just exit
-
-            if (same.length === $scope.model.value.length === selectedVals.length) {
+
+            //if the length is zero, then we are in sync, just exit.
+            if (_.difference($scope.model.value, selectedVals).length === 0) {
                 return;
             }
 
             $scope.selectedItems = [];
-
+
+            var iConfigItem;
             for (var i = 0; i < configItems.length; i++) {
-                var isChecked = _.contains($scope.model.value, configItems[i].value);
+                iConfigItem = configItems[i];
+                var isChecked = _.contains($scope.model.value, iConfigItem.value);
                 $scope.selectedItems.push({
                     checked: isChecked,
-                    key: configItems[i].id,
-                    val: configItems[i].value
+                    key: iConfigItem.id,
+                    val: iConfigItem.value
                 });
             }
         }

src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.html

@@ -1,6 +1,6 @@
 <div ng-controller="Umbraco.PropertyEditors.GridController" class="umb-grid umb-property-editor clearfix" id="umb-grid">
 
-    <umb-editor-sub-header ng-if="showReorderButton()" style="background-color: white;">
+    <umb-editor-sub-header ng-if="showReorderButton()" style="background-color: white; border-color: white;">
 
         <umb-editor-sub-header-content-right>
             <umb-button

src/Umbraco.Web.UI/Umbraco/config/lang/cs.xml

@@ -47,8 +47,6 @@
     <key alias="domainCreated">Nová doména '%0%' byla vytvořena</key>
     <key alias="domainDeleted">Doména '%0%' je odstraněna</key>
     <key alias="domainExists">Doména '%0%' už byla přiřazena</key>
-    <key alias="domainHelp"><![CDATA[Platná doménová jména jsou: "example.com", "www.example.com", "example.com:8080" nebo
-        "https://www.example.com/".<br /><br />Jednoúrovňové cesty v doménách jsou podporovány, např. "example.com/en". Měli byste se jich nicméně vyvarovat. Raději použijte nastavení kultury výše.]]></key>
     <key alias="domainUpdated">Doména '%0%' byla aktualizována</key>
     <key alias="orEdit">Editace aktuálních domén</key>
     <key alias="inherit">Dědit</key>

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

@@ -95,7 +95,8 @@
     <key alias="domainExists">Domænet '%0%' er oprettet</key>
     <key alias="domainUpdated">Domænet '%0%' er nu opdateret</key>
     <key alias="orEdit">eller rediger nuværende domæner</key>
-    <key alias="domainHelp">f.eks. ditdomaene.com, www.ditdomaene.com</key>
+    <key alias="domainHelpWithVariants"><![CDATA[Gyldige domænenavne er: "example.com", "www.example.com", "example.com:8080" eller "https://www.example.com/".
+     Yderlgiere understøttes også første niveau af stien efter domænet, f.eks. "Example.com/en" eller "/en". ]]></key>
     <key alias="inherit">Nedarv</key>
     <key alias="setLanguage">Sprog</key>
     <key alias="setLanguageHelp"><![CDATA[Indstil sproget for noder under den aktuelle node,<br /> eller nedarv sprog fra forældre noder. Gælder også<br />
@@ -277,7 +278,7 @@
     <key alias="languagesToUnpublish">Vælg sproget du vil afpublicere. Afpublicering af et obligatorisk sprog vil afpublicere alle sprog.</key>
     <key alias="publishedLanguages">Udgivne sprog</key>
     <key alias="unpublishedLanguages">Ikke-udgivne sprog</key>
-    <key alias="unmodifiedLanguages">Uændrede sprog</key>
+    <key alias="unmodifiedLanguages">Uændrede sprog</key>
     <key alias="untouchedLanguagesForFirstTime">Disse sprog er ikke blevet oprettet</key>
     <key alias="readyToPublish">Klar til at udgive?</key>
     <key alias="readyToSave">Klar til at gemme?</key>
@@ -986,7 +987,7 @@ Mange hilsner fra Umbraco robotten
     <key alias="contentPublishedFailedInvalid"><![CDATA[
     %0% kunne ikke publiceres da følgende egenskaber :  %1%  ikke overholdte valderingsreglerne.
     ]]></key>
-    <key alias="contentPublishedFailedByEvent">%0% kunne ikke udgives, fordi et 3. parts modul annullerede handlingen</key>
+    <key alias="contentPublishedFailedByEvent">%0% kunne ikke udgives, fordi et 3. parts modul annullerede handlingen</key>
     <key alias="contentPublishedFailedByMissingName"><![CDATA[%0% kan ikke udgives, fordi det mangler et navn.]]></key>
     <key alias="includeUnpublished">Medtag ikke-udgivede undersider</key>
     <key alias="inProgress">Publicerer - vent venligst...</key>