From 3af311a796eeeef00a1906c44044bd95f0acc06e Mon Sep 17 00:00:00 2001
From: Divakar Konakalla <divakar.konakalla@relevancelab.com>
Date: Thu, 6 Oct 2016 17:29:02 +0530
Subject: [PATCH 1/2] floating menu issue with firefox got resolved, moved all
 the common css to global file and removed duplicate CSS from both workzone &
 analytics.

---
 client/cat3/main.html                         |   7 +-
 client/cat3/src/partials/global.scss          | 127 +++++++++++++++++-
 .../globals/breadcrumb/breadcrumbService.js   |   8 ++
 .../sections/dashboard/analytics/analytics.js |   8 --
 .../analytics/view/analyticsTreeMenu.html     |   5 +-
 .../analytics/view/analyticsTreeMenu.scss     |  69 ----------
 .../sections/dashboard/dashboardCtrl.js       |  16 ---
 .../dashboard/workzone/workzoneCtrl.js        |   7 -
 .../workzoneTreeMenu/workzoneTreeMenu.html    |   5 +-
 .../workzoneTreeMenu/workzoneTreeMenu.scss    | 101 --------------
 10 files changed, 140 insertions(+), 213 deletions(-)

diff --git a/client/cat3/main.html b/client/cat3/main.html
index 7679fa5ba..1d152b839 100644
--- a/client/cat3/main.html
+++ b/client/cat3/main.html
@@ -53,8 +53,11 @@
 		</div>
 		<div class="breadcrumb-wrapper">
 			<div class="container-fluid" id="breadcrumb-block" ng-controller="breadcrumbCtrl" ng-show="isBreadCrumbAvailable">
-				<div id="section-name" class="col-lg-2 col-md-2 col-sm-2 col-xs-2">
-					Menu
+				<div class="col-lg-2 col-md-2 col-sm-2 col-xs-2 no-padding">
+					<div id="section-name" ng-click="showTreeOverlay()" ng-mouseleave="hideTreeOverlay()" class="cursor">
+						<i class="fa fa-bars tree-toggle"></i>
+						<span>Menu</span>
+					</div>
 				</div>
 				<div id="breadcrumb-nav" class="col-lg-10 col-md-10 col-sm-10 col-xs-10">
 					<ul>
diff --git a/client/cat3/src/partials/global.scss b/client/cat3/src/partials/global.scss
index 3ec0aa66d..933f670b6 100644
--- a/client/cat3/src/partials/global.scss
+++ b/client/cat3/src/partials/global.scss
@@ -64,10 +64,18 @@ $imagePath : "../../../../../../cat3/images";
     color: white;
 }
 
+.tree-toggle {
+    z-index: 100;
+    color: #fff;
+    font-size: 1.2em;
+    padding-right: 4px;
+}
+
 #section-name {
-    padding: 6px 10px 6px 10px;
-    font-size: 14px; 
+    padding: 6px 0px 6px 12px;
+    font-size: 14px;
     font-weight: bold;
+    width: 35%;
 }
 
 #breadcrumb-nav {
@@ -85,6 +93,121 @@ $imagePath : "../../../../../../cat3/images";
     display: inline;
 }
 
+/*CSS for tree starts here*/
+#navigPage {
+  background: transparent;
+  position: fixed;
+  width: 254px;
+  z-index: 10;
+  transition: all .4s ease 0s;
+  left: -254px;
+
+  &.show-left-tree {
+      left: 0px;
+  }
+
+  #navigPage-inner {
+      background: linear-gradient(to right, #2c3638 99%, #2c3638 100%);
+      color: #fff;
+      overflow-y: auto;
+  }
+
+  div[data-angular-treeview] {
+      color: #fff;
+      font-size: 12px;
+      font-family: "Open Sans", Arial, Helvetica, Sans-Serif;
+  }
+
+  div[data-tree-model] li .selected {
+      padding: 0px;
+  }
+
+  div[data-tree-model] li span:hover {
+      text-decoration: underline;
+  }
+
+  div[data-tree-model] li {
+      line-height: 2.2;
+      padding: 0;
+  }
+      
+  div[data-tree-model] ul {
+      margin-left:-10px;
+      ul {
+          margin-left:-20px;
+          ul {
+              margin-left:-30px;
+              ul {
+                  margin-left:-40px;
+              }
+          }
+      }
+  }
+
+  div[data-tree-model] .liContents {
+      margin-left: 20px;
+      .liContents  {
+          margin-left: 30px;
+          .liContents {
+              margin-left: 40px;
+              .liContents {
+                  margin-left: 50px;
+              }
+          }
+      }
+  }
+
+  div[data-tree-model] li.selected{
+      background:#3b4142;
+  }
+
+  .collapse-spacing {
+      padding-right: 10px;
+  }
+
+  .label-spacing {
+      padding-right: 5px;
+  }
+
+  .caret-spacing {
+      margin-top: 8px;
+  }
+
+  i,span {
+      color:#fff;
+  }
+}
+
+#analyticsTreeMenuPage {
+  #navigPage {
+    .tree-ul {
+      padding: 0px;
+    }
+
+    .liContents {
+      line-height: 2.2;
+
+      .liContents-wrapper {
+        margin-left: 15px;
+      }
+
+      .caret-spacing {
+        margin-top: 8px;
+      }
+
+      .fa {
+        margin-left: 15px;
+      }
+    }
+
+    .activeSection {
+      font-weight: bold;
+      background: #3b4142;
+    }
+  }
+}
+/*CSS for tree ends here*/
+
 @media (min-width : 0px) and (max-width: 767px) {
     #breadcrumb-nav {
         display: none;
diff --git a/client/cat3/src/partials/globals/breadcrumb/breadcrumbService.js b/client/cat3/src/partials/globals/breadcrumb/breadcrumbService.js
index 8ef917f2c..33f49d010 100644
--- a/client/cat3/src/partials/globals/breadcrumb/breadcrumbService.js
+++ b/client/cat3/src/partials/globals/breadcrumb/breadcrumbService.js
@@ -49,5 +49,13 @@
 		$rootScope.$on('HIDE_BREADCRUMB',function(){
 			$rootScope.isBreadCrumbAvailable=false;
 		});
+		$rootScope.showTree=false;
+		$rootScope.showTreeOverlay = function () {
+	        $rootScope.showTree = true;
+	    };
+
+	    $rootScope.hideTreeOverlay = function () {
+	        $rootScope.showTree = false;
+	    };
 	}]);
 })(angular);
\ No newline at end of file
diff --git a/client/cat3/src/partials/sections/dashboard/analytics/analytics.js b/client/cat3/src/partials/sections/dashboard/analytics/analytics.js
index 1af64e90e..61d40bc85 100644
--- a/client/cat3/src/partials/sections/dashboard/analytics/analytics.js
+++ b/client/cat3/src/partials/sections/dashboard/analytics/analytics.js
@@ -64,7 +64,6 @@
 		var splitUp=null;
 		analytic.tabShowChat=true;
 		analytic.tabShowReport=false;
-		$scope.showTreeMenu = false;
 		$rootScope.isOpenSidebar = false;
 		$rootScope.dashboardChild = 'analytics';
 		$rootScope.stateItems = $state.params;
@@ -104,17 +103,10 @@
 		if (!$rootScope.stateParams.view) {
 			$state.go('dashboard.analytics.cost');
 		}
-		$scope.hideTreeOverlay =function (){
-			$scope.showTreeMenu = false;
-		};
-		$scope.showTreeOverlay =function (){
-			$scope.showTreeMenu = true;
-		};
 		analytic.tabShow=function(chat,report){
 			analytic.tabShowChat=chat;
 			analytic.tabShowReport=report;
 		};
-		$scope.hideTreeOverlay();
 		$scope.getAllRegionsList = function() {
             workzoneServices.getAllRegionsList().then(function(response) {
                 $scope.allRegions = response.data;
diff --git a/client/cat3/src/partials/sections/dashboard/analytics/view/analyticsTreeMenu.html b/client/cat3/src/partials/sections/dashboard/analytics/view/analyticsTreeMenu.html
index 7f35c262c..4e1c17730 100644
--- a/client/cat3/src/partials/sections/dashboard/analytics/view/analyticsTreeMenu.html
+++ b/client/cat3/src/partials/sections/dashboard/analytics/view/analyticsTreeMenu.html
@@ -2,10 +2,7 @@
 <link rel="stylesheet" type="text/css" href="catalyst/partials/globals/treeComponent/treeDirective.css"/>
 
 <div id='analyticsTreeMenuPage' ng-controller="analyticsCtrl">
-	<span ng-show="!isLoading" class="tree-wrapper">
-		<i ng-mouseover="showTreeOverlay()" ng-mouseleave="hideTreeOverlay()" class="fa fa-bars cursor tree-toggle"></i>
-	</span>
-	<div id='navigPage' ng-mouseover="showTreeOverlay()" ng-mouseleave="hideTreeOverlay()" ng-class="{'show-left-tree':showTreeMenu}">
+	<div id='navigPage' ng-mouseover="showTreeOverlay()" ng-mouseleave="hideTreeOverlay()" ng-class="{'show-left-tree':showTree}">
 		<div id='navigPage-inner'>
 			<div id="treeParent">
 				<ul class="tree-ul">
diff --git a/client/cat3/src/partials/sections/dashboard/analytics/view/analyticsTreeMenu.scss b/client/cat3/src/partials/sections/dashboard/analytics/view/analyticsTreeMenu.scss
index 2fea39565..e69de29bb 100644
--- a/client/cat3/src/partials/sections/dashboard/analytics/view/analyticsTreeMenu.scss
+++ b/client/cat3/src/partials/sections/dashboard/analytics/view/analyticsTreeMenu.scss
@@ -1,69 +0,0 @@
-#navigPage {
-  background: transparent;
-  z-index: 1;
-  position: fixed;
-  width: 254px;
-  z-index: 10;
-  transition: all .4s ease 0s;
-  left: -254px;
-
-  #navigPage-inner {
-    background: linear-gradient(to right, #2c3638 99%, #2c3638 100%);
-    color: #fff;
-    z-index: 1;
-    position: fixed;
-    width: 254px;
-    overflow-y: auto;
-  }
-
-  .tree-ul {
-    padding: 0px;
-  }
-
-  .liContents {
-    line-height: 2.2;
-
-    .liContents-wrapper {
-      margin-left: 15px;
-    }
-
-    .caret-spacing {
-      margin-top: 8px;
-    }
-
-    .fa {
-      margin-left: 15px;
-    }
-  }
-
-  i {
-    color:#fff;
-  }
-
-  span {
-    color:#fff;
-  }
-
-  .activeSection {
-    font-weight: bold;
-    background: #3b4142;
-  }
-}
-
-.tree-toggle {
-  position: absolute;
-  top: -35px;
-  z-index: 100;
-  color: #fff;
-  font-size: 1.2em;
-  padding: 11px;
-  padding-right: 50px;
-}
-
-#section-name {
-   padding: 6px 10px 6px 35px;
-}
-
-.show-left-tree {
-  left: 0px !important;
-}
\ No newline at end of file
diff --git a/client/cat3/src/partials/sections/dashboard/dashboardCtrl.js b/client/cat3/src/partials/sections/dashboard/dashboardCtrl.js
index 0e36f880c..5b9d187e9 100644
--- a/client/cat3/src/partials/sections/dashboard/dashboardCtrl.js
+++ b/client/cat3/src/partials/sections/dashboard/dashboardCtrl.js
@@ -31,21 +31,5 @@
             $state.go('dashboard.settings');
         }
     }
-            $rootScope.hideTreeOverlay = function () {
-                $rootScope.showTreeMenu = false;
-                $(".panelRight").css("width", "calc(100% - 39px)");
-                $("#navigPage").addClass("tree-close");
-                $(".minifyme").css("left", "0px");
-                $(".minifyme").css("border-radius", "0px");
-                $(".minifyme").css("width", "35px");
-        };
-            $rootScope.showTreeOverlay = function () {
-                $rootScope.showTreeMenu = true;
-                $(".panelRight").css("width", "calc(100% - 258px)");
-                $("#navigPage").removeClass("tree-close");
-                $(".minifyme").css("left", "216px");
-                $(".minifyme").css("width", "38px");
-                $(".minifyme").css("border-radius", "5px 0 0 5px");
-        };
 }]);
 })(angular);
\ No newline at end of file
diff --git a/client/cat3/src/partials/sections/dashboard/workzone/workzoneCtrl.js b/client/cat3/src/partials/sections/dashboard/workzone/workzoneCtrl.js
index 915abeab3..6764c38e7 100644
--- a/client/cat3/src/partials/sections/dashboard/workzone/workzoneCtrl.js
+++ b/client/cat3/src/partials/sections/dashboard/workzone/workzoneCtrl.js
@@ -91,7 +91,6 @@ angular.module('dashboard.workzone', ['angularTreeview', 'mgcrea.ngStrap', 'work
 		'use strict';
 		//For showing menu icon in menu over breadcrumb without position flickering during load
 		$scope.isLoading = true;
-		$scope.showTree = false;
 		function getParams(str) {
 			var l = str.split('&');
 			var list = [];
@@ -105,12 +104,6 @@ angular.module('dashboard.workzone', ['angularTreeview', 'mgcrea.ngStrap', 'work
 				env: list[3]
 			};
 		}
-		$scope.showTreeOverlay = function () {
- 			$scope.showTree = true;
- 		};
-		$scope.hideTreeOverlay = function () {
-			$scope.showTree = false;
-		};
 		//this function is applicable only if enviornments are only selectable items.
 		function getNames(node) {
 			return {
diff --git a/client/cat3/src/partials/sections/dashboard/workzone/workzoneTreeMenu/workzoneTreeMenu.html b/client/cat3/src/partials/sections/dashboard/workzone/workzoneTreeMenu/workzoneTreeMenu.html
index 0fc169ed5..071ecf9eb 100644
--- a/client/cat3/src/partials/sections/dashboard/workzone/workzoneTreeMenu/workzoneTreeMenu.html
+++ b/client/cat3/src/partials/sections/dashboard/workzone/workzoneTreeMenu/workzoneTreeMenu.html
@@ -2,9 +2,6 @@
 <link rel="stylesheet" type="text/css" href="catalyst/partials/globals/treeComponent/treeDirective.css"/>
 
 <div id='workzoneTreeMenuPage' ng-controller="workzoneTreeCtrl">
-	<span ng-show="!isLoading" class="tree-wrapper">
-		<i ng-mouseover="showTreeOverlay()" ng-mouseleave="hideTreeOverlay()" class="fa fa-bars cursor tree-toggle"></i>
-	</span>
 	<div id='navigPage' ng-mouseover="showTreeOverlay()" ng-mouseleave="hideTreeOverlay()" ng-class="{'show-left-tree':showTree}">
 		<div id='navigPage-inner'>
 			<div id="treeParent"
@@ -19,7 +16,7 @@
 </div>
 
 <script>
-	$(document).ready(function() {
+	$(document).ready(function() { 
 		function setHeight() {
 			var windowHeight = $(window).innerHeight();
 			var brdcrmbHeight = $('#breadcrumb-block').outerHeight();
diff --git a/client/cat3/src/partials/sections/dashboard/workzone/workzoneTreeMenu/workzoneTreeMenu.scss b/client/cat3/src/partials/sections/dashboard/workzone/workzoneTreeMenu/workzoneTreeMenu.scss
index a9f1d5f09..e69de29bb 100644
--- a/client/cat3/src/partials/sections/dashboard/workzone/workzoneTreeMenu/workzoneTreeMenu.scss
+++ b/client/cat3/src/partials/sections/dashboard/workzone/workzoneTreeMenu/workzoneTreeMenu.scss
@@ -1,101 +0,0 @@
-#navigPage {
-	background: transparent;
-	z-index: 1;
-	position: fixed;
-	width: 254px;
-	z-index: 10;
-	transition: all .4s ease 0s;
-	left: -254px;
-
-	#navigPage-inner {
-		background: linear-gradient(to right, #2c3638 99%, #2c3638 100%);
-		color: #fff;
-		z-index: 1;
-		position: fixed;
- 		width: 254px;
-		overflow-y: auto;
-	}
-
-	div[data-angular-treeview] {
-		color: #fff;
-		font-size: 12px;
-		font-family: "Open Sans", Arial, Helvetica, Sans-Serif;
-	}
-
-	div[data-tree-model] li .selected {
-		padding: 0px;
-	}
-
-	div[data-tree-model] li span:hover {
-		text-decoration: underline;
-	}
-
-	div[data-tree-model] li {
-		line-height: 2.2;
-		padding: 0;
-	}
-		
-	div[data-tree-model] ul {
-		margin-left:-10px;
-		ul {
-			margin-left:-20px;
-			ul {
-				margin-left:-30px;
-				ul {
-					margin-left:-40px;
-				}
-			}
-		}
-	}
-
-	div[data-tree-model] .liContents {
-		margin-left: 20px;
-		.liContents  {
-			margin-left: 30px;
-			.liContents {
-				margin-left: 40px;
-				.liContents {
-					margin-left: 50px;
-				}
-			}
-		}
-	}
-
-	div[data-tree-model] li.selected{
-		background:#3b4142;
-	}
-
-	.collapse-spacing {
-		padding-right: 10px;
-	}
-
-	.label-spacing {
-		padding-right: 5px;
-	}
-
-	.caret-spacing {
-		margin-top: 8px;
-	}
-
-	i {
-		color:#fff;
-	}
-}
-
-.tree-toggle {
- 	position: absolute;
- 	top: -35px;
- 	z-index: 100;
- 	color: #fff;
- 	font-size: 1.2em;
- 	padding: 11px;
- 	padding-right: 50px;
-}
-
-#section-name {
-   padding: 6px 10px 6px 35px;
-}
-
-.show-left-tree {
-	left: 0px !important;
-}
\ No newline at end of file

From 6787c70b2c3cdb419a8d2c014294d93a8d016c8f Mon Sep 17 00:00:00 2001
From: Divakar Konakalla <divakar.konakalla@relevancelab.com>
Date: Thu, 6 Oct 2016 17:34:06 +0530
Subject: [PATCH 2/2] removed both the css files for left tree menu as all the
 css moved to global file.

---
 .../sections/dashboard/analytics/view/analyticsTreeMenu.scss      | 0
 .../dashboard/workzone/workzoneTreeMenu/workzoneTreeMenu.scss     | 0
 2 files changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 client/cat3/src/partials/sections/dashboard/analytics/view/analyticsTreeMenu.scss
 delete mode 100644 client/cat3/src/partials/sections/dashboard/workzone/workzoneTreeMenu/workzoneTreeMenu.scss

diff --git a/client/cat3/src/partials/sections/dashboard/analytics/view/analyticsTreeMenu.scss b/client/cat3/src/partials/sections/dashboard/analytics/view/analyticsTreeMenu.scss
deleted file mode 100644
index e69de29bb..000000000
diff --git a/client/cat3/src/partials/sections/dashboard/workzone/workzoneTreeMenu/workzoneTreeMenu.scss b/client/cat3/src/partials/sections/dashboard/workzone/workzoneTreeMenu/workzoneTreeMenu.scss
deleted file mode 100644
index e69de29bb..000000000