From 56cc825ef4318b2484cc14b9c037f492d96d6599 Mon Sep 17 00:00:00 2001 From: sharonlucong Date: Tue, 20 Jan 2015 17:30:59 -0800 Subject: [PATCH] review page updated Change-Id: I7a42610ca4ace1088a24d353705b5f8ab5ecb86a --- v2/assets/css/style.css | 41 +++ v2/src/app/wizard/review.tpl.html | 469 ++++++++++++++++-------------- v2/src/app/wizard/wizard.js | 43 ++- 3 files changed, 334 insertions(+), 219 deletions(-) diff --git a/v2/assets/css/style.css b/v2/assets/css/style.css index a2551a8..40c286f 100644 --- a/v2/assets/css/style.css +++ b/v2/assets/css/style.css @@ -1039,6 +1039,7 @@ div.toc ul li a { vertical-align: baseline; white-space: nowrap; margin-right: 2px; + width: 120px; } .autofill-success { margin-top: 20px; @@ -1056,3 +1057,43 @@ h4.widget-title:hover { .loadingMask .mask{ opacity: 0.5; } +.tab-panel { + z-index: 10; + margin-left: 30px; +} +.tab-panel.stick { + position: fixed; + z-index: 10000; + top: 10px; +} +.review-padding{ + padding-left: 60px; + padding-right: 60px; +} +.review-network-badge{ + width:130px; +} +.review-targetconfig{ + background:#7E6EB0; +} +.review-host{ + background:#307ECC; +} +.review-osconfig{ + background:#69AA46; +} +.table-border-green{ + border-bottom: 1px solid #69AA46; +} +.table-border-blue{ + border-bottom: 1px solid #307ECC; +} +.table-border-purple{ + border-bottom: 1px solid #7E6EB0; +} +.table-border-grey{ + border-bottom: 1px solid #DDD; +} +.table-review-padding{ + padding-left:20px; +} \ No newline at end of file diff --git a/v2/src/app/wizard/review.tpl.html b/v2/src/app/wizard/review.tpl.html index 925e600..21a20bf 100644 --- a/v2/src/app/wizard/review.tpl.html +++ b/v2/src/app/wizard/review.tpl.html @@ -1,131 +1,77 @@ -
-
-
-
-
-

- - Hosts -

-
- - - -
-
+
-
-
-
- - - - - - - - - - - - - +
+
-
{{column.title}}
- 		- {{key}} -
- - - - - - - - - - - - - {{cluster.name}}  - - - - - {{role.display_name}} - - - - {{server[column.field]}} - - - - {{server.networks[key].ip}} -
-
-
-
-
-
+
  • + + Host + +
    • + +
  • + + Target Config + +
    • +
    -
    -
    -
    -
    + +
    + +
    +
    -

    - - Network Mapping +

    + OS Config

    -
    - - - -
    +
    -
    - - - - - - - +
    +
    +
    + OS Global Configurations +
    +
    +
    NetworkInterface
    - - + + + + + + + + + + + + + +
    {{key}}
    {{key}} + {{value}}
    Server Credentials +
    Username + {{server_credentials.username}}
    Password + {{server_credentials.password}}
    -
    -
    -
    -
    -
    -
    -
    -
    -

    - - Partition -

    -
    - - - -
    -
    -
    -
    -
    - +
    +
    +
    +
    + Partition +
    +
    +
    @@ -135,7 +81,7 @@ - + @@ -146,126 +92,221 @@ - -
    -
    -
    -
    +
    +
    +
    -

    - - OS Global Configurations +

    + Host

    -
    - - - -
    +
    -
    -
    -
    Mount Point
    {{key}}{{key}} {{value.percentage}} {{value.max_size}}
    - - - - - - - - - - - - - - - - - - -
    {{key}}{{value}}
    Server Credentials
    Username{{server_credentials.username}}
    Password{{server_credentials.password}}
    +
    +
    +
    +
    +
    + Hosts +
    +
    + + + + + + + + + + + + + +
    +
    {{column.title}}
    +     		+ {{key}} +
    + + + + + + + - + + + + + {{cluster.name}}  + + + + + {{server[column.field]}} + + + + {{server.networks[key].ip}} +
    +
    +
    +
    +
    + Roles +
    +
    + + + + + + + + + + + + + +
    HostnameRoles
    + {{server.hostname}} + + + {{role.display_name}} + +
    + +
    +
    -
    -
    +
    +
    +
    -

    - - Target System Configurations -

    -
    - -
    +

    + Target Config +

    +
    -
    -
    -
    - - - +
    +
    +
    +
    +
    +
    + +
    -
    +
    \ No newline at end of file diff --git a/v2/src/app/wizard/wizard.js b/v2/src/app/wizard/wizard.js index e94a24e..a32af65 100644 --- a/v2/src/app/wizard/wizard.js +++ b/v2/src/app/wizard/wizard.js @@ -406,6 +406,7 @@ define(['uiRouter', 'angularTable', 'angularDragDrop', 'angularTouch', 'ngSpinne dataService.getServerColumns().success(function(data) { $scope.server_columns = data.showall; + //console.log($scope.server_columns); }); $scope.hideUnselected = function() { @@ -674,6 +675,7 @@ define(['uiRouter', 'angularTable', 'angularDragDrop', 'angularTouch', 'ngSpinne var cluster = wizardFactory.getClusterInfo(); $scope.subnetworks = wizardFactory.getSubnetworks(); $scope.interfaces = wizardFactory.getInterfaces(); + //console.log($scope.interfaces); $scope.autoFill = false; $scope.autoFillButtonDisplay = "Enable Autofill"; //$scope.servers = wizardFactory.getServers(); @@ -692,7 +694,7 @@ define(['uiRouter', 'angularTable', 'angularDragDrop', 'angularTouch', 'ngSpinne dataService.getClusterHosts(cluster.id).success(function(data) { $scope.servers = data; - + //console.log($scope.servers); // Assume all hosts in the same cluster have same interface settings if ($scope.servers[0].networks) { if (Object.keys($scope.servers[0].networks).length != 0) { @@ -1271,9 +1273,9 @@ define(['uiRouter', 'angularTable', 'angularDragDrop', 'angularTouch', 'ngSpinne targetSysConfigData["package_config"]["ceph_config"] = $scope.cephConfig; } if ($scope.currentAdapterName == "ceph_firefly") { - targetSysConfigData["package_config"]={}; - targetSysConfigData["package_config"]["ceph_config"] = $scope.cephConfig; - } + targetSysConfigData["package_config"] = {}; + targetSysConfigData["package_config"]["ceph_config"] = $scope.cephConfig; + } dataService.updateClusterConfig(cluster.id, targetSysConfigData).success(function(data) { var commitState = { "name": "package_config", @@ -1645,7 +1647,7 @@ define(['uiRouter', 'angularTable', 'angularDragDrop', 'angularTouch', 'ngSpinne }; }); - wizardModule.controller('reviewCtrl', function($scope, wizardFactory, dataService, $filter, ngTableParams, sortingService) { + wizardModule.controller('reviewCtrl', function($scope, wizardFactory, dataService, $filter, ngTableParams, sortingService, $anchorScroll, $location) { var cluster = wizardFactory.getClusterInfo(); $scope.servers = wizardFactory.getServers(); $scope.interfaces = wizardFactory.getInterfaces(); @@ -1659,8 +1661,38 @@ define(['uiRouter', 'angularTable', 'angularDragDrop', 'angularTouch', 'ngSpinne dataService.getServerColumns().success(function(data) { $scope.server_columns = data.review; + + for (var i = 0; i < data.review.length; i++) { + if (data.review[i].title == "Hostname") { + var temp = $scope.server_columns[0]; + $scope.server_columns[0] = data.review[i]; + $scope.server_columns[i] = temp; + } + if (data.review[i].title == "Host MAC Addr") { + var temp = $scope.server_columns[1]; + $scope.server_columns[1] = data.review[i]; + $scope.server_columns[i] = temp; + } + if (data.review[i].title == "Switch IP") { + var temp = $scope.server_columns[2]; + $scope.server_columns[2] = data.review[i]; + $scope.server_columns[i] = temp; + } + if (data.review[i].title == "Port") { + var temp = $scope.server_columns[3]; + $scope.server_columns[3] = data.review[i]; + $scope.server_columns[i] = temp; + } + } }); + $scope.scrollTo = function(id) { + var old = $location.hash(); + $location.hash(id); + $anchorScroll(); + $location.hash(old); + }; + $scope.tabs = [{ "title": "Database & Queue", "url": "service.tpl.html" @@ -1792,6 +1824,7 @@ define(['uiRouter', 'angularTable', 'angularDragDrop', 'angularTouch', 'ngSpinne }; }); + //Used for roles panel on Role Assignment page wizardModule.directive("rolepanelscroll", function($window) { return function(scope, element, attrs) {