diff --git a/v2/assets/css/style.css b/v2/assets/css/style.css index 09370c4..03b6b52 100644 --- a/v2/assets/css/style.css +++ b/v2/assets/css/style.css @@ -181,6 +181,9 @@ select { .no-cluster-panel h4 { padding-top: 50px; } +.widget-box { + padding-bottom: 20px; +} .widget-body .table { border-top: 0px !important; } @@ -975,28 +978,32 @@ circle[depth='4'] { background-color: #687074 !important; color: #FFF !important; } -.role-assign-drop { - min-height: 25px; - min-width: 100px; - /* background-color: rgba(221, 221, 221, 0.32); */ +.margin-left-neg4 { + margin-left: -4px; +} +.table-col { + width: 87%; +} +.role-col { + width: 10%; +} +.role-panel { + z-index: 10; +} +.role-panel.stick { + position: fixed; + z-index: 10000; + top: 0px; } .role-assign-drag { border: 1px solid rgba(190, 210, 219, 0.5) !important; border-radius: 4px; min-height: 120px; - min-width: 120px; + width: 122px; } -.role-table-padding { - padding: 0px 0px 15px 0px !important; - width: 87%; -} -.role-widget-box { - position: fixed !important; - margin-left: 0px !important; - z-index: 10; -} -.margin-left-neg4 { - margin-left: -4px; +.role-assign-drop { + min-height: 30px; + min-width: 150px; } .drag-roles { margin-left: 7px; @@ -1005,16 +1012,6 @@ circle[depth='4'] { width: 105px !important; border-radius: 4px !important; } -.drag-role-col { - width: 13%; -} -.role-col { - float: left !important; - min-height: 1px; - padding-left: 15px; - padding-right: 15px; - position: relative; -} .drag-enter-role { background: none repeat scroll 0 0 #F0F9FF; border: 2px dashed #BED2DB !important; diff --git a/v2/src/app/wizard/global.tpl.html b/v2/src/app/wizard/global.tpl.html index 10fa8c5..6f0e2db 100644 --- a/v2/src/app/wizard/global.tpl.html +++ b/v2/src/app/wizard/global.tpl.html @@ -173,7 +173,7 @@ - + - - - - - -
- - +
+
+
+ + + + + + +
+ + +
+
+
+ + + + +
+ + +
+
-
-
- - - - -
- - -
-
-
-
-
+
@@ -136,10 +137,10 @@
-
-
-
-
+
+
+
+

Drag to Assign

@@ -150,5 +151,6 @@
+
\ No newline at end of file diff --git a/v2/src/app/wizard/wizard.js b/v2/src/app/wizard/wizard.js index 54d5496..d8f18f6 100644 --- a/v2/src/app/wizard/wizard.js +++ b/v2/src/app/wizard/wizard.js @@ -106,16 +106,6 @@ angular.module('compass.wizard', [ $scope.steps = wizardStepsData["os_and_ts"]; wizardFactory.setSteps($scope.steps); - // start loading spinner - $scope.startSpin = function() { - usSpinnerService.spin('spinner-1'); - }; - - // stop loading spinner - $scope.stopSpin = function() { - usSpinnerService.stop('spinner-1'); - }; - // Watch commit state change $scope.$watch(function() { $scope.loading = false; @@ -209,9 +199,6 @@ angular.module('compass.wizard', [ } } if (newStep == $scope.networkStep + 1) { - if ($scope.maxStep > $scope.roleAssignStep) { - $scope.steps[$scope.roleAssignStep].state = "incomplete"; - } if ($scope.maxStep > $scope.networkMappingStep) { $scope.steps[$scope.networkMappingStep].state = "incomplete"; } @@ -1692,24 +1679,44 @@ angular.module('compass.wizard', [ }; }) - .directive('ngKeypress', function() { - return function(scope, element, attrs) { - element.bind("keydown keypress", function(event) { - if (event.which === 9) { // 9 is tab key - var current = attrs.position; - var result = current.split('_'); - var next = result[0] + "_" + (parseInt(result[1]) + 1); - if ($("input[data-position=" + next + "]").length) { - $("input[data-position=" + next + "]").focus(); - } else { - $(".btn-next").focus(); - } - event.preventDefault(); +.directive('ngKeypress', function() { + return function(scope, element, attrs) { + element.bind("keydown keypress", function(event) { + if (event.which === 9) { // 9 is tab key + var current = attrs.position; + var result = current.split('_'); + var next = result[0] + "_" + (parseInt(result[1]) + 1); + if ($("input[data-position=" + next + "]").length) { + + $("input[data-position=" + next + "]").focus(); + } else { + $(".btn-next").focus(); } - }); - }; - }); + event.preventDefault(); + } + }); + }; +}) + +//Used for roles panel on Role Assignment page +.directive("rolepanelscroll", function($window) { + return function(scope, element, attrs) { + angular.element($window).bind("scroll", function() { + var window_top = this.pageYOffset; + var sticky_anchor_elem = angular.element($('#sticky-anchor')); + if(sticky_anchor_elem.length != 0) { + var div_top = sticky_anchor_elem.offset().top; + if (window_top > div_top) { + $('.role-panel').addClass('stick'); + } else { + $('.role-panel').removeClass('stick'); + } + scope.$apply(); + } + }); + }; +}); var wizardModalInstanceCtrl = function($scope, $modalInstance, warning) { $scope.warning = warning;