From 1b03dbd9c29b90c630c9fffba3b047d0cd9bd2a0 Mon Sep 17 00:00:00 2001
From: Per Ploug <pph@umbraco.dk>
Date: Fri, 5 Jul 2013 14:22:19 +0200
Subject: [PATCH] Adds compat.js click registering, adds bg load

---
 src/Umbraco.Web.UI.Client/lib/umbraco/compat.js               | 1 +
 src/Umbraco.Web.UI.Client/src/less/hacks.less                 | 4 ++--
 .../src/views/content/contentedit.controller.js               | 2 +-
 src/Umbraco.Web.UI.Client/src/views/content/edit.html         | 2 +-
 .../src/views/directives/umb-navigation.html                  | 2 +-
 src/Umbraco.Web.UI/umbraco/Views/Default.cshtml               | 2 +-
 6 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/lib/umbraco/compat.js b/src/Umbraco.Web.UI.Client/lib/umbraco/compat.js
index e662b1190e..2d0d9edf7b 100644
--- a/src/Umbraco.Web.UI.Client/lib/umbraco/compat.js
+++ b/src/Umbraco.Web.UI.Client/lib/umbraco/compat.js
@@ -17,6 +17,7 @@ jQuery(document).ready(function () {
 });
 
 
+
 function scaleScrollables(selector){
 	jQuery(".umb-scrollable").each(function () {
             var el = jQuery(this);
diff --git a/src/Umbraco.Web.UI.Client/src/less/hacks.less b/src/Umbraco.Web.UI.Client/src/less/hacks.less
index 866dbb3b99..18ef0881e8 100644
--- a/src/Umbraco.Web.UI.Client/src/less/hacks.less
+++ b/src/Umbraco.Web.UI.Client/src/less/hacks.less
@@ -18,8 +18,8 @@
   max-width: none !important;
 }
 
-/* loading animation for iframes */
-iframe {
+/* loading animation for iframes and content pages */
+iframe, .content-column-body {
     background: center center url(../img/loader.gif) no-repeat;
 }
 
diff --git a/src/Umbraco.Web.UI.Client/src/views/content/contentedit.controller.js b/src/Umbraco.Web.UI.Client/src/views/content/contentedit.controller.js
index 448a6223c3..fd268b6c65 100644
--- a/src/Umbraco.Web.UI.Client/src/views/content/contentedit.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/content/contentedit.controller.js
@@ -79,7 +79,7 @@ function ContentEditController($scope, $routeParams, contentResource, notificati
     }
     else {
         contentResource.getById($routeParams.id)
-            .then(function(data) {
+            .then(function (data) {
                 $scope.content = data;
             });
     }
diff --git a/src/Umbraco.Web.UI.Client/src/views/content/edit.html b/src/Umbraco.Web.UI.Client/src/views/content/edit.html
index 142d3cedea..311c5bba1c 100644
--- a/src/Umbraco.Web.UI.Client/src/views/content/edit.html
+++ b/src/Umbraco.Web.UI.Client/src/views/content/edit.html
@@ -1,4 +1,4 @@
-<ng-form name="contentForm">
+<ng-form name="contentForm" ng-show="contentLoaded">
     <umb-panel ng-controller="Umbraco.Editors.ContentEditController" val-show-validation>
         <umb-header tabs="content.tabs">
                 <div class="span4">
diff --git a/src/Umbraco.Web.UI.Client/src/views/directives/umb-navigation.html b/src/Umbraco.Web.UI.Client/src/views/directives/umb-navigation.html
index 224cf16ecf..f6bdec4787 100644
--- a/src/Umbraco.Web.UI.Client/src/views/directives/umb-navigation.html
+++ b/src/Umbraco.Web.UI.Client/src/views/directives/umb-navigation.html
@@ -3,7 +3,7 @@
         <ul class="sections">
             
             <li class="avatar">
-                <a href="#" ng-click="showUserDialog()" title="{{user.name}}">
+                <a href="#" ng-click="showUserDialog()" title="{{user.name}}" prevent-default>
                     <img ng-src="{{user.avatar}}" />
                 </a>
             </li>
diff --git a/src/Umbraco.Web.UI/umbraco/Views/Default.cshtml b/src/Umbraco.Web.UI/umbraco/Views/Default.cshtml
index fc3a58858f..2c68aa95c5 100644
--- a/src/Umbraco.Web.UI/umbraco/Views/Default.cshtml
+++ b/src/Umbraco.Web.UI/umbraco/Views/Default.cshtml
@@ -53,7 +53,7 @@
 
         <section id="contentwrapper">
             <div id="contentcolumn">
-                <div ng-view></div>
+                <div class="content-column-body" ng-view></div>
             </div>
         </section>