Skip to content

Resolved height issue with ui grid tables in workzone. #941

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 2 commits into from
Nov 18, 2016
Merged

Resolved height issue with ui grid tables in workzone. #941

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f90dc5a
Resolved height issue with ui grid tables in workzone.
divakarkonakalla Nov 18, 2016
da7a857
Show/hide left side tree elements on click of provider in design.
divakarkonakalla Nov 18, 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
5 changes: 2 additions & 3 deletions client/cat3/src/partials/global.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ $imagePath : "../../../../../../cat3/images";
#section-name {
font-size: 14px;
font-weight: bold;
padding: 10px 0;
padding: 0;

.menu-icon {
float: left;
Expand All @@ -115,7 +115,6 @@ $imagePath : "../../../../../../cat3/images";
#breadcrumb-nav {
ul {
margin: 0px;
padding: 10px 0;
li {
list-style: none;
display: inline;
Expand Down Expand Up @@ -649,7 +648,7 @@ option.script {
background: #fcfcfc;
border-bottom-width: 1px;
@include theme-border-color;
min-height: 40px !important;
height: 40px;
padding: 5px 15px;
position:relative;
z-index:3;
Expand Down
1 change: 1 addition & 0 deletions client/cat3/src/partials/sections/dashboard/design/aDesignCtrl.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@
}])
.controller('designCtrl',['$scope','$rootScope','$state','genericServices', function ($scope,$rootScope,$state,genericServices) {
var design= this;
$scope.isTreeOpen = false;
$rootScope.state = $state;
design.providersList= function () {
var params = {
Expand Down
8 changes: 4 additions & 4 deletions client/cat3/src/partials/sections/dashboard/design/design.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@
<div id='navigPage-inner'>
<div id="treeParent">
<ul class="tree-ul">
<li ng-repeat="provider in desCtrl.providersMenu">
<li ng-repeat="provider in desCtrl.providersMenu">
<div class="liContents">
<i class="icon fa fa-building label-spacing"></i>
<span>{{provider.name}}</span>
<div data-ng-hide="node.collapsed" data-tree-id="relevancelab" data-analytics-tree-model="node.nodes" data-node-id="rowid" data-node-label="text" data-node-children="nodes">
<span class="cursor" ng-click="isTreeOpen = !isTreeOpen">{{provider.name}}</span>
<div ng-class="{'show-providers':isTreeOpen === true}" data-ng-hide="node.collapsed" data-tree-id="relevancelab" data-analytics-tree-model="node.nodes" data-node-id="rowid" data-node-label="text" data-node-children="nodes">
<ul class="tree-ul">
<li ng-repeat='tempType in desCtrl.templateTypes | inArray:provider.filterArray:"templatetype"' ui-sref="dashboard.design.list({providerName:provider.name,templateObj:tempType,view:'list'})" class="pointer-cursor" >
<div class="liContents">
Expand Down Expand Up @@ -81,4 +81,4 @@
<div ui-view></div>
</div>
</div>
</div>
</div>
3 changes: 3 additions & 0 deletions client/cat3/src/partials/sections/dashboard/design/design.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -418,4 +418,7 @@ ul.simple-list > li::after {
padding-left: 0px;
text-overflow: ellipsis;
white-space: nowrap;
}
.show-providers {
display: none;
}