From 3f0ea176e3aa4266e14e4b982c9ceaf52b77698f Mon Sep 17 00:00:00 2001
From: bjarnef <bjarne_fyrstenborg@hotmail.com>
Date: Mon, 8 Jun 2015 01:42:51 +0200
Subject: [PATCH 1/3] Add ng-cloak for login view

Add ng-cloak for login view to prevent Angular from briefly displaying
raw (uncompiled) content ```{{ }}```.
---
 .../src/views/common/dialogs/login.html                    | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/common/dialogs/login.html b/src/Umbraco.Web.UI.Client/src/views/common/dialogs/login.html
index 718415831b..b5c4883fdd 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/dialogs/login.html
+++ b/src/Umbraco.Web.UI.Client/src/views/common/dialogs/login.html
@@ -1,6 +1,5 @@
 <form name="loginForm" ng-submit="loginSubmit(login, password)" ng-controller="Umbraco.Dialogs.LoginController">
-    <div id="login" class="umb-modalcolumn" ng-class="{'show-validation': loginForm.$invalid}">
-
+    <div id="login" class="umb-modalcolumn" ng-class="{'show-validation': loginForm.$invalid}" ng-cloak>
         <div class="form">
             <h1>{{greeting}}</h1>
             <p>
@@ -13,11 +12,11 @@
             </div>
 
             <div class="control-group" ng-class="{error: loginForm.password.$invalid}">
-                <input type="password" ng-model="password" name="password" class="input-xlarge" localize="placeholder" placeholder="@placeholders_password"  />
+                <input type="password" ng-model="password" name="password" class="input-xlarge" localize="placeholder" placeholder="@placeholders_password" />
             </div>
 
             <button type="submit" class="btn" val-trigger-change="#login .form input"><localize key="general_login">Login</localize></button>
-            
+
             <div class="control-group" ng-show="loginForm.$invalid">
                 <div class="alert alert-error">{{errorMsg}}</div>
             </div>

From 09552d282f5bba1c50863a054376ae6baf85415a Mon Sep 17 00:00:00 2001
From: hartvig <nh@umbraco.dk>
Date: Wed, 10 Jun 2015 09:19:44 +0200
Subject: [PATCH 2/3] Update canvasdesigner.controller.js

---
 .../src/canvasdesigner/canvasdesigner.controller.js       | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/Umbraco.Web.UI.Client/src/canvasdesigner/canvasdesigner.controller.js b/src/Umbraco.Web.UI.Client/src/canvasdesigner/canvasdesigner.controller.js
index 477d1e5f5b..c0646fed0f 100644
--- a/src/Umbraco.Web.UI.Client/src/canvasdesigner/canvasdesigner.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/canvasdesigner/canvasdesigner.controller.js
@@ -35,6 +35,14 @@ var app = angular.module("Umbraco.canvasdesigner", ['colorpicker', 'ui.slider',
         $scope.previewDevice = device;
     };
 
+    /*****************************************************************************/
+    /* Exit Preview */
+    /*****************************************************************************/
+
+    $scope.exitPreview = function () {
+        window.top.location.href = "/umbraco/endPreview.aspx?redir=%2f" + $scope.pageId;
+    };
+
     /*****************************************************************************/
     /* UI designer managment */
     /*****************************************************************************/

From e639869bb13f6c9fe0a6d5cbc3b79a8e78b002d4 Mon Sep 17 00:00:00 2001
From: hartvig <nh@umbraco.dk>
Date: Wed, 10 Jun 2015 09:20:25 +0200
Subject: [PATCH 3/3] Update index.html

---
 src/Umbraco.Web.UI.Client/src/canvasdesigner/index.html | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/Umbraco.Web.UI.Client/src/canvasdesigner/index.html b/src/Umbraco.Web.UI.Client/src/canvasdesigner/index.html
index 3db48d1940..e078f0cc46 100644
--- a/src/Umbraco.Web.UI.Client/src/canvasdesigner/index.html
+++ b/src/Umbraco.Web.UI.Client/src/canvasdesigner/index.html
@@ -34,6 +34,9 @@
                         <i></i>
                     </a>
                 </li>
+                <li ng-click="exitPreview()">
+                    <a href="#" title="Exit Preview"><i class="icon icon-wrong"></i><span> </span></a>
+                </li>                
             </ul>
 
             <ul class="sections" ng-class="{selected: !showDevicesPreview}" ng-if="enableCanvasdesigner > 0">