From 97ac31a858fed26bdeb7d384de6263500bf0a1d3 Mon Sep 17 00:00:00 2001
From: Kenn Jacobsen <kja@vertica.dk>
Date: Wed, 28 Aug 2019 18:30:11 +0200
Subject: [PATCH] Fix preview with multiple cultures + highlight the current
 culture

---
 .../src/less/canvas-designer.less                      | 10 +++++++++-
 .../src/preview/preview.controller.js                  |  5 ++++-
 src/Umbraco.Web.UI/Umbraco/Views/Preview/Index.cshtml  |  8 ++++----
 3 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/less/canvas-designer.less b/src/Umbraco.Web.UI.Client/src/less/canvas-designer.less
index 4db2e434d2..8b043c9045 100644
--- a/src/Umbraco.Web.UI.Client/src/less/canvas-designer.less
+++ b/src/Umbraco.Web.UI.Client/src/less/canvas-designer.less
@@ -272,7 +272,6 @@ a, a:hover{
 ul.sections {
     display: block;
     background: #1b264f;
-    height: 100%;
     position:absolute;
     top: 90px;
     width: 80px;
@@ -281,12 +280,21 @@ ul.sections {
     margin:0;
     padding:0;
     margin-left: -80px;
+    overflow: scroll;
+    overflow-x: hidden;
+    height: calc(100% - 91px);
+
+    &::-webkit-scrollbar {
+        width: 0px;
+        background: transparent; 
+    }
 }
 
 ul.sections li {
     display: block;
     border-left: 4px #1b264f solid;
     transition: all .3s linear;
+    cursor: pointer;
 }
 
 .fix-left-menu ul.sections li a span,
diff --git a/src/Umbraco.Web.UI.Client/src/preview/preview.controller.js b/src/Umbraco.Web.UI.Client/src/preview/preview.controller.js
index 1316642e93..c4cb821818 100644
--- a/src/Umbraco.Web.UI.Client/src/preview/preview.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/preview/preview.controller.js
@@ -143,7 +143,10 @@ var app = angular.module("umbraco.preview", ['umbraco.resources', 'umbraco.servi
                 setPageUrl();
             }
         };
-        
+
+        $scope.isCurrentCulture = function(culture) {
+            return $location.search().culture === culture;
+        }
     })
 
 
diff --git a/src/Umbraco.Web.UI/Umbraco/Views/Preview/Index.cshtml b/src/Umbraco.Web.UI/Umbraco/Views/Preview/Index.cshtml
index 17a2f3c66a..65f77dbf85 100644
--- a/src/Umbraco.Web.UI/Umbraco/Views/Preview/Index.cshtml
+++ b/src/Umbraco.Web.UI/Umbraco/Views/Preview/Index.cshtml
@@ -44,21 +44,21 @@
             </div>
             <ul class="sections" ng-class="{selected: showDevicesPreview && showDevices}">
                 <li ng-repeat="device in devices" ng-class="{ current:previewDevice==device }">
-                    <a href="" ng-click="updatePreviewDevice(device)"><i class="icon {{device.icon}}" title="{{device.title}}"></i><span></span></a>
+                    <a ng-click="updatePreviewDevice(device)"><i class="icon {{device.icon}}" title="{{device.title}}"></i><span></span></a>
                 </li>
 
                 @if (Model.Languages != null && Model.Languages.Count() > 1)
                 {
                     foreach (var previewLink in Model.Languages)
                      {
-                         <li>
-                             <a href="" ng-click="changeCulture('@previewLink.IsoCode')" title="Preview in @previewLink.CultureName"><i class="icon icon-globe-europe---africa"></i><span>@previewLink.CultureName</span></a>
+                         <li ng-class="{ current:isCurrentCulture('@previewLink.IsoCode') }">
+                             <a ng-click="changeCulture('@previewLink.IsoCode')" title="Preview in @previewLink.CultureName"><i class="icon icon-globe-europe---africa"></i><span>@previewLink.CultureName</span></a>
                          </li>
                      }
                 }
 
                 <li>
-                    <a href="" ng-click="exitPreview()" title="Exit Preview"><i class="icon icon-wrong"></i><span> </span></a>
+                    <a ng-click="exitPreview()" title="Exit Preview"><i class="icon icon-wrong"></i><span> </span></a>
                 </li>
             </ul>
         </div>