From cfd299562ef9f38d49c80c5034c84c81dd84e69d Mon Sep 17 00:00:00 2001
From: Per Ploug <pph@umbraco.dk>
Date: Fri, 5 Jul 2013 12:58:36 +0200
Subject: [PATCH] rename umb leftcol to umb navigation

---
 src/Umbraco.Web.UI.Client/gruntFile.js        |   3 +-
 ...irective.js => umbnavigation.directive.js} |   6 +-
 src/Umbraco.Web.UI.Client/src/index.html      |   2 +-
 ...mb-leftcolumn.html => umb-navigation.html} | 170 +++++++++---------
 .../App_Plugins/property editors/mntp/mntp.js |   2 +-
 .../umbraco/Views/Default.cshtml              |   3 +-
 src/Umbraco.Web.UI/umbraco/index.html         |   4 +-
 7 files changed, 96 insertions(+), 94 deletions(-)
 rename src/Umbraco.Web.UI.Client/src/common/directives/{umbleftcolumn.directive.js => umbnavigation.directive.js} (60%)
 rename src/Umbraco.Web.UI.Client/src/views/directives/{umb-leftcolumn.html => umb-navigation.html} (97%)

diff --git a/src/Umbraco.Web.UI.Client/gruntFile.js b/src/Umbraco.Web.UI.Client/gruntFile.js
index 0a48b63e3f..406314e921 100644
--- a/src/Umbraco.Web.UI.Client/gruntFile.js
+++ b/src/Umbraco.Web.UI.Client/gruntFile.js
@@ -112,9 +112,8 @@ module.exports = function (grunt) {
       mocks: {
         files: [{ dest: '<%= distdir %>/js', src : '*.js', expand: true, cwd: 'src/common/mocks/' }]
       },
-
       vs: {
-        files: [{ dest: '<%= vsdir %>/js', src : '**', expand: true, cwd: '<%= distdir %>/js/' }]
+        files: [{ dest: '<%= vsdir %>/', src : '**', expand: true, cwd: '<%= distdir %>/' }]
       },
       packages: {
         files: [{ dest: '<%= vsdir %>/../App_Plugins', src : '**', expand: true, cwd: 'src/packages/' }]
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/umbleftcolumn.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/umbnavigation.directive.js
similarity index 60%
rename from src/Umbraco.Web.UI.Client/src/common/directives/umbleftcolumn.directive.js
rename to src/Umbraco.Web.UI.Client/src/common/directives/umbnavigation.directive.js
index 0c74915fa8..e0c0e34ac2 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/umbleftcolumn.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/umbnavigation.directive.js
@@ -1,14 +1,14 @@
 /**
 * @ngdoc directive 
-* @name umbraco.directive:leftColumn
+* @name umbraco.directive:umbNavigation
 * @restrict E
 **/
 function leftColumnDirective() {
     return {
         restrict: "E",    // restrict to an element
         replace: true,   // replace the html element with the template
-        templateUrl: 'views/directives/umb-leftcolumn.html'
+        templateUrl: 'views/directives/umb-navigation.html'
     };
 }
 
-angular.module('umbraco.directives').directive("umbLeftColumn", leftColumnDirective);
+angular.module('umbraco.directives').directive("umbNavigation", leftColumnDirective);
diff --git a/src/Umbraco.Web.UI.Client/src/index.html b/src/Umbraco.Web.UI.Client/src/index.html
index bac166cb41..f8f4f79785 100644
--- a/src/Umbraco.Web.UI.Client/src/index.html
+++ b/src/Umbraco.Web.UI.Client/src/index.html
@@ -12,7 +12,7 @@
 
     <div ng-hide="!authenticated" ng-cloak ng-animate="'fade'" id="Div1" class="clearfix" ng-click="closeDialogs($event)">
 
-        <umb-left-column></umb-left-column>
+        <umb-navigation></umb-navigation>
 
         <section id="contentwrapper">
             <div id="contentcolumn">
diff --git a/src/Umbraco.Web.UI.Client/src/views/directives/umb-leftcolumn.html b/src/Umbraco.Web.UI.Client/src/views/directives/umb-navigation.html
similarity index 97%
rename from src/Umbraco.Web.UI.Client/src/views/directives/umb-leftcolumn.html
rename to src/Umbraco.Web.UI.Client/src/views/directives/umb-navigation.html
index f9d0e62c04..224cf16ecf 100644
--- a/src/Umbraco.Web.UI.Client/src/views/directives/umb-leftcolumn.html
+++ b/src/Umbraco.Web.UI.Client/src/views/directives/umb-navigation.html
@@ -1,85 +1,85 @@
-<div id="leftcolumn" ng-controller="NavigationController" ng-mouseleave="hideTree()">
-    <div id="applications" ng-class="{faded:ui.stickyNavigation}">
-        <ul class="sections">
-            
-            <li class="avatar">
-                <a href="#" ng-click="showUserDialog()" title="{{user.name}}">
-                    <img ng-src="{{user.avatar}}" />
-                </a>
-            </li>
-
-            <li ng-repeat="section in sections" ng-class="{current: section.alias == ui.currentSection}">
-                <a href="#/{{section.alias}}"
-                   ng-click="changeSection(section.alias)"
-                   ng-mouseenter="showTree(section.alias)"
-                   prevent-default>
-                    <section-icon icon="{{section.cssclass}}"></section-icon>  
-                    <span>{{section.name}}</span>
-                </a>
-            </li>
-
-            <li class="help">
-                <a class="help" href="#/help">
-                    <img src="assets/img/applicationIcons/help.svg" style="height: 30px; width: 30px;" />
-                    <span>Help</span>
-                </a>
-            </li>
-        </ul>
-    </div>
-
-    <!-- navigation container -->
-    <div id="navigation" class="fill shadow umb-panel umb-modalcolumn"
-            ng-show="ui.showNavigation" 
-            ng-animate="'slide'">
-        <!-- the search -->
-        <div id="search-form" ng-animate="'slide'">
-            <div class="umb-panel-header">
-                <form class="form-search" ng-controller="SearchController" novalidate>
-                    <i class="icon-search"></i>
-                    <input type="text"
-                        ng-model="ui.searchTerm"
-                        class="umb-search-field search-query"
-                        placeholder="{{localization.app.search.typeToSearch}}"
-                        on-blur="deActivateSearch()"
-                        on-keyup="performSearch(ui.searchTerm)">
-                </form>
-            </div>
-        </div>
-
-        <!-- Search results -->
-        <div id="search-results" class="umb-scrollable umb-panel" auto-scale="0"
-            ng-show="ui.showSearchResults" ng-animate="'slide'">
-
-            <h5>Search results</h5>
-
-            <ul class="searchResults" ng-repeat="resultGroup in ui.searchResults">
-                <li class="umb-icon-item" ng-class="{selected:$index==ui.selectedSearchResult}" ng-repeat="result in resultGroup.matches">
-                    <i class="icon umb-tree-icon sprTree {{result.icon}}" ng-show="$first"></i>
-                    <a ng-href="#{{result.view}}">{{result.name}}
-                                <small>{{result.path}}</small>
-                    </a>
-                    <i class="umb-options" ng-click="showMenu(result, $event)"><i></i><i></i><i></i></i>
-                </li>
-            </ul>
-        </div>
-
-        <!-- the tree -->
-        <div id="tree" class="span5 umb-scrollable umb-panel" auto-scale="0" ng-animate="'slide'">
-            <umb-tree section="{{ui.currentTree}}" ></umb-tree>
-        </div>        
-
-        <!-- The context menu -->
-        <umb-context-menu></umb-context-menu>
-        
-        <!-- Tree dialogs -->
-        <div id="dialog" class='umb-modalcolumn fill shadow umb-panel'
-            ng-show="ui.showContextMenuDialog" ng-animate="'slide'">
-            <div class='umb-panel-header'>
-                <h1>{{ui.dialogTitle}}</h1>
-            </div>
-            <div class='umb-panel-body'>
-            </div>
-        </div>
-    </div>
-
-</div>
+<div id="leftcolumn" ng-controller="NavigationController" ng-mouseleave="hideTree()">
+    <div id="applications" ng-class="{faded:ui.stickyNavigation}">
+        <ul class="sections">
+            
+            <li class="avatar">
+                <a href="#" ng-click="showUserDialog()" title="{{user.name}}">
+                    <img ng-src="{{user.avatar}}" />
+                </a>
+            </li>
+
+            <li ng-repeat="section in sections" ng-class="{current: section.alias == ui.currentSection}">
+                <a href="#/{{section.alias}}"
+                   ng-click="changeSection(section.alias)"
+                   ng-mouseenter="showTree(section.alias)"
+                   prevent-default>
+                    <section-icon icon="{{section.cssclass}}"></section-icon>  
+                    <span>{{section.name}}</span>
+                </a>
+            </li>
+
+            <li class="help">
+                <a class="help" href="#/help">
+                    <img src="assets/img/applicationIcons/help.svg" style="height: 30px; width: 30px;" />
+                    <span>Help</span>
+                </a>
+            </li>
+        </ul>
+    </div>
+
+    <!-- navigation container -->
+    <div id="navigation" class="fill shadow umb-panel umb-modalcolumn"
+            ng-show="ui.showNavigation" 
+            ng-animate="'slide'">
+        <!-- the search -->
+        <div id="search-form" ng-animate="'slide'">
+            <div class="umb-panel-header">
+                <form class="form-search" ng-controller="SearchController" novalidate>
+                    <i class="icon-search"></i>
+                    <input type="text"
+                        ng-model="ui.searchTerm"
+                        class="umb-search-field search-query"
+                        placeholder="{{localization.app.search.typeToSearch}}"
+                        on-blur="deActivateSearch()"
+                        on-keyup="performSearch(ui.searchTerm)">
+                </form>
+            </div>
+        </div>
+
+        <!-- Search results -->
+        <div id="search-results" class="umb-scrollable umb-panel" auto-scale="0"
+            ng-show="ui.showSearchResults" ng-animate="'slide'">
+
+            <h5>Search results</h5>
+
+            <ul class="searchResults" ng-repeat="resultGroup in ui.searchResults">
+                <li class="umb-icon-item" ng-class="{selected:$index==ui.selectedSearchResult}" ng-repeat="result in resultGroup.matches">
+                    <i class="icon umb-tree-icon sprTree {{result.icon}}" ng-show="$first"></i>
+                    <a ng-href="#{{result.view}}">{{result.name}}
+                                <small>{{result.path}}</small>
+                    </a>
+                    <i class="umb-options" ng-click="showMenu(result, $event)"><i></i><i></i><i></i></i>
+                </li>
+            </ul>
+        </div>
+
+        <!-- the tree -->
+        <div id="tree" class="span5 umb-scrollable umb-panel" auto-scale="0" ng-animate="'slide'">
+            <umb-tree section="{{ui.currentTree}}" ></umb-tree>
+        </div>        
+
+        <!-- The context menu -->
+        <umb-context-menu></umb-context-menu>
+        
+        <!-- Tree dialogs -->
+        <div id="dialog" class='umb-modalcolumn fill shadow umb-panel'
+            ng-show="ui.showContextMenuDialog" ng-animate="'slide'">
+            <div class='umb-panel-header'>
+                <h1>{{ui.dialogTitle}}</h1>
+            </div>
+            <div class='umb-panel-body'>
+            </div>
+        </div>
+    </div>
+
+</div>
diff --git a/src/Umbraco.Web.UI/App_Plugins/property editors/mntp/mntp.js b/src/Umbraco.Web.UI/App_Plugins/property editors/mntp/mntp.js
index fabaea3b8b..7f8681adba 100644
--- a/src/Umbraco.Web.UI/App_Plugins/property editors/mntp/mntp.js	
+++ b/src/Umbraco.Web.UI/App_Plugins/property editors/mntp/mntp.js	
@@ -12,4 +12,4 @@ angular.module('umbraco')
     function populate(data){
         $scope.model.value = data.selection;
     }
-});
+});
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI/umbraco/Views/Default.cshtml b/src/Umbraco.Web.UI/umbraco/Views/Default.cshtml
index 824d8f906b..fc3a58858f 100644
--- a/src/Umbraco.Web.UI/umbraco/Views/Default.cshtml
+++ b/src/Umbraco.Web.UI/umbraco/Views/Default.cshtml
@@ -48,7 +48,8 @@
 </head>
 <body ng-controller="MainController" id="umbracoMainPageBody">
     <div ng-cloak id="Div1" class="clearfix" ng-click="closeDialogs($event)">
-        <umb-left-column></umb-left-column>
+
+        <umb-navigation></umb-navigation>
 
         <section id="contentwrapper">
             <div id="contentcolumn">
diff --git a/src/Umbraco.Web.UI/umbraco/index.html b/src/Umbraco.Web.UI/umbraco/index.html
index d715deb792..4dc83db4f3 100644
--- a/src/Umbraco.Web.UI/umbraco/index.html
+++ b/src/Umbraco.Web.UI/umbraco/index.html
@@ -12,15 +12,17 @@
 
     <div ng-hide="!authenticated" ng-cloak ng-animate="'fade'" id="Div1" class="clearfix" ng-click="closeDialogs($event)">
 
-        <umb-left-column></umb-left-column>
+        <umb-navigation></umb-navigation>
 
         <section id="contentwrapper">
             <div id="contentcolumn">
                 <div ng-view></div>
             </div>
         </section>
+        
     </div>
 
+
     <umb-notifications></umb-notifications>