From 552cbada887dbed0e7027b94b753b13824fd427e Mon Sep 17 00:00:00 2001
From: Simon Busborg <simon@busb.org>
Date: Tue, 22 Dec 2015 15:07:57 +0100
Subject: [PATCH] Fix for http://issues.umbraco.org/issue/U4-7573

---
 .../components/editor/umbeditorview.directive.js          | 5 ++++-
 src/Umbraco.Web.UI.Client/src/less/components/editor.less | 8 ++++++--
 .../src/less/components/overlays.less                     | 6 ++++--
 src/Umbraco.Web.UI.Client/src/views/common/dashboard.html | 4 +++-
 .../src/views/components/editor/umb-editor-view.html      | 6 +++++-
 5 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/editor/umbeditorview.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/editor/umbeditorview.directive.js
index aad87178cc..8a79b64649 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/editor/umbeditorview.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/editor/umbeditorview.directive.js
@@ -7,7 +7,10 @@
          transclude: true,
          restrict: 'E',
          replace: true,
-         templateUrl: 'views/components/editor/umb-editor-view.html'
+         templateUrl: 'views/components/editor/umb-editor-view.html',
+         scope: {
+             footer: "@"
+         }
       };
 
       return directive;
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/editor.less b/src/Umbraco.Web.UI.Client/src/less/components/editor.less
index b90271b5e5..6d43286f2d 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/editor.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/editor.less
@@ -20,16 +20,20 @@
 }
 
 
-.umb-editor-container{
+.umb-editor-container {
 	top: 101px;
 	left: 0px;
 	right: 0px;
-	bottom: 60px;
+	bottom: 52px;
 	position: absolute;
 	clear: both;
 	overflow: auto;
 }
 
+.umb-editor-wrapper.-no-footer .umb-editor-container {
+	bottom: 0;
+}
+
 .umb-editor-container.-stop-scrolling {
 	overflow: hidden;
 }
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/overlays.less b/src/Umbraco.Web.UI.Client/src/less/components/overlays.less
index 49153ea6a8..eff17fb20a 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/overlays.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/overlays.less
@@ -46,7 +46,9 @@
     height: 31px;
     padding: 10px;
     margin: 0;
-    background: #ffffff;
+
+    background: @grayLighter;
+    border-top: 1px solid @grayLight;
 }
 
 .umb-overlay .umb-overlay-drawer .umb-overlay-drawer-content {
@@ -114,7 +116,7 @@
     top: 100px;
     left: 0;
     right: 0;
-    bottom: 51px;
+    bottom: 52px;
     padding: 20px;
 }
 
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/dashboard.html b/src/Umbraco.Web.UI.Client/src/views/common/dashboard.html
index 0c9f319e17..3136bc28e7 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/dashboard.html
+++ b/src/Umbraco.Web.UI.Client/src/views/common/dashboard.html
@@ -7,7 +7,9 @@
       class="umb-dashboard"
       val-form-manager>
 
-      <umb-editor-view umb-tabs>
+      <umb-editor-view
+        footer="false"
+        umb-tabs>
 
          <umb-editor-header
             name="dashboard.name"
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor-view.html b/src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor-view.html
index a04ae13145..a10ff503b9 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor-view.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor-view.html
@@ -1,3 +1,7 @@
-<div class="umb-panel umb-editor-wrapper animated -half-second fadeIn" ng-transclude>
+<div class="umb-panel umb-editor-wrapper animated -half-second fadeIn"
+    ng-class="{
+        '-no-footer': footer === 'false'
+    }"
+    ng-transclude>
 
 </div>