Skip to content

floating menu issue with firefox got resolved, moved all the common css to global file and removed duplicate CSS from both workzone & analytics. #806

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Oct 6, 2016
Merged

floating menu issue with firefox got resolved, moved all the common css to global file and removed duplicate CSS from both workzone & analytics. #806

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3af311a
floating menu issue with firefox got resolved, moved all the common c…
divakarkonakalla Oct 6, 2016
60dd8ae
Merge remote-tracking branch 'upstream/dev' into dev-divakar
divakarkonakalla Oct 6, 2016
6787c70
removed both the css files for left tree menu as all the css moved to…
divakarkonakalla Oct 6, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions client/cat3/main.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
127 changes: 125 additions & 2 deletions client/cat3/src/partials/global.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand All @@ -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;
Expand Down
8 changes: 8 additions & 0 deletions client/cat3/src/partials/globals/breadcrumb/breadcrumbService.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
8 changes: 0 additions & 8 deletions client/cat3/src/partials/sections/dashboard/analytics/analytics.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,6 @@
var splitUp=null;
analytic.tabShowChat=true;
analytic.tabShowReport=false;
$scope.showTreeMenu = false;
$rootScope.isOpenSidebar = false;
Copy link
Collaborator

@hrushikesh07 hrushikesh07 Oct 7, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@udeshrl
Remove left tree function from child controller .
Use dashboard controller .

$rootScope.dashboardChild = 'analytics';
$rootScope.stateItems = $state.params;
Expand Down Expand Up @@ -105,17 +104,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;
Expand Down
5 changes: 1 addition & 4 deletions client/cat3/src/partials/sections/dashboard/analytics/view/analyticsTreeMenu.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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">
Expand Down
69 changes: 0 additions & 69 deletions client/cat3/src/partials/sections/dashboard/analytics/view/analyticsTreeMenu.scss
View file
Open in desktop

This file was deleted.

16 changes: 0 additions & 16 deletions client/cat3/src/partials/sections/dashboard/dashboardCtrl.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
7 changes: 0 additions & 7 deletions client/cat3/src/partials/sections/dashboard/workzone/workzoneCtrl.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 = [];
Expand All @@ -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 {
Expand Down
5 changes: 1 addition & 4 deletions client/cat3/src/partials/sections/dashboard/workzone/workzoneTreeMenu/workzoneTreeMenu.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -19,7 +16,7 @@
</div>

<script>
$(document).ready(function() {
$(document).ready(function() {
function setHeight() {
var windowHeight = $(window).innerHeight();
var brdcrmbHeight = $('#breadcrumb-block').outerHeight();
Expand Down
Loading