created remote console page
TODO: Remove HTERM.
Change-Id: I72026e5ea64c9fba3089b68dfd2b8198255dabb8
Signed-off-by: Michael Davis <michael.s.davis@ibm.com>
diff --git a/app/common/directives/app-navigation.js b/app/common/directives/app-navigation.js
index 00c3ec7..6e3025e 100644
--- a/app/common/directives/app-navigation.js
+++ b/app/common/directives/app-navigation.js
@@ -11,6 +11,7 @@
'path': '=',
'showNavigation': '='
},
+<<<<<<< HEAD
'controller': ['$scope', '$location', 'dataService', function($scope, $location, dataService){
$scope.showSubMenu = false;
$scope.change = function(firstLevel){
@@ -33,6 +34,13 @@
$scope.firstLevel = 'overview';
}
+=======
+ 'controller': ['$scope', 'dataService', function($scope, dataService){
+ $scope.$watch('showNavigation', function(){
+ var paddingTop = 0;
+ $scope.firstLevel = 'overview';
+ $scope.secondLevel = 'system_overview';
+>>>>>>> 4c1a3dd... Major update to code structure
if($scope.showNavigation){
paddingTop = document.getElementById('header__wrapper').offsetHeight;
}