From df41813ce2937f4807675b1e19077d8c46db41b3 Mon Sep 17 00:00:00 2001
From: Warren Buckley <warren@umbraco.com>
Date: Wed, 13 Feb 2019 15:12:25 +0000
Subject: [PATCH 1/2] Update the help drawer/sidebar to work with custom
 dashboards section targeting user-help. Starterkit is the only thing that
 seems to use this

---
 .../src/views/common/drawers/help/help.html        | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/common/drawers/help/help.html b/src/Umbraco.Web.UI.Client/src/views/common/drawers/help/help.html
index f38bb78929..56db1fd88a 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/drawers/help/help.html
+++ b/src/Umbraco.Web.UI.Client/src/views/common/drawers/help/help.html
@@ -12,7 +12,7 @@
         <div class="umb-help-section" ng-if="vm.tours" data-element="help-tours">
 
             <h5 class="umb-help-section__title">Tours</h5>
-                
+
             <div ng-repeat="tourGroup in vm.tours | orderBy:'groupOrder'">
 
                     <div class="umb-help-list">
@@ -38,7 +38,7 @@
                                         <span ng-class="{'strike': tour.completed}" class="umb-help-list-item__title">{{ tour.name }}</span>
                                     </div>
                                     <div>
-                                        <umb-button ng-if="!tour.completed && vm.showTourButton($index, tourGroup)" button-style="primary" size="xxs" type="button" label="Start" action="vm.startTour(tour)"></umb-button>       
+                                        <umb-button ng-if="!tour.completed && vm.showTourButton($index, tourGroup)" button-style="primary" size="xxs" type="button" label="Start" action="vm.startTour(tour)"></umb-button>
                                         <umb-button ng-if="tour.completed" size="xxs" type="button" label="Rerun" action="vm.startTour(tour)"></umb-button>
                                     </div>
                                 </div>
@@ -51,11 +51,11 @@
 
         <!-- Show in custom help dashboard -->
         <div class="umb-help-section" data-element="help-custom-dashboard" ng-if="vm.customDashboard.length > 0">
-            <div ng-repeat="tab in vm.customDashboard">
-                <div ng-repeat="property in tab.properties">
+            <div ng-repeat="dashboard in vm.customDashboard">
+                <h5 ng-show="dashboard.label">{{dashboard.label}}</h5>
+                <div ng-repeat="property in dashboard.properties">
                     <div>
-                        <h5 ng-if="property.caption">{{property.caption}}</h5>
-                        <div ng-include="property.path"></div>
+                        <div ng-include="property.view"></div>
                     </div>
                 </div>
             </div>
@@ -105,7 +105,7 @@
 
             <a data-element="help-link-our-umbraco" class="umb-help-badge" target="_blank" href="https://our.umbraco.com?utm_source=core&utm_medium=help&utm_content=link&utm_campaign=our">
                 <i class="umb-help-badge__icon icon-favorite"></i>
-                    
+
                 <div class="umb-help-badge__title">Visit our.umbraco.com</div>
                 <small>
                     <localize key="defaultdialogs_theFriendliestCommunity">The friendliest community</localize>

From 9003314d565744ee69e156d987585b2618464aa8 Mon Sep 17 00:00:00 2001
From: Kenn Jacobsen <post@kennjacobsen.dk>
Date: Wed, 13 Feb 2019 16:43:13 +0100
Subject: [PATCH 2/2] Make sure the sticky sub header do not clash with the
 actions menu (#4503)

---
 .../common/directives/components/umbstickybar.directive.js    | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbstickybar.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbstickybar.directive.js
index a00138db15..fb5a558fd0 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbstickybar.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbstickybar.directive.js
@@ -133,7 +133,9 @@ Use this directive make an element sticky and follow the page when scrolling.
                 clonedBar.addClass('-umb-sticky-bar');
                 clonedBar.css({
                     'position': 'fixed',
-                    'z-index': 500,
+                    // if you change this z-index value, make sure the sticky editor sub headers do not 
+                    // clash with umb-dropdown (e.g. the content actions dropdown in content list view)
+                    'z-index': 99, 
                     'visibility': 'hidden'
                 });