From bcf491e31336e798b615e252ee2a8043694c4cf2 Mon Sep 17 00:00:00 2001 From: CongLu Date: Wed, 4 Mar 2015 11:56:28 -0800 Subject: [PATCH] review page Change-Id: I760e58a105f2bd684902a9fb73e09877d86bf8d6 --- v2.5/assets/css/style.css | 26 ++ .../app/controllers/wizardController.coffee | 10 +- v2.5/src/app/partials/review.tpl.html | 364 +++++++++++++++++- v2.5/src/app/services/wizardService.coffee | 17 + 4 files changed, 414 insertions(+), 3 deletions(-) diff --git a/v2.5/assets/css/style.css b/v2.5/assets/css/style.css index afe2e66..480e65b 100644 --- a/v2.5/assets/css/style.css +++ b/v2.5/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,6 +1057,31 @@ 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; +} .centerLoading{ padding-top: 20%; padding-left: 45%; diff --git a/v2.5/src/app/controllers/wizardController.coffee b/v2.5/src/app/controllers/wizardController.coffee index 2024d0b..803ec9f 100644 --- a/v2.5/src/app/controllers/wizardController.coffee +++ b/v2.5/src/app/controllers/wizardController.coffee @@ -257,11 +257,17 @@ define(['./baseController'], ()-> $scope.commit = (sendRequest) -> wizardService.networkMappingCommit($scope, sendRequest) ] - .controller 'reviewCtrl', ['$scope', 'wizardService', 'ngTableParams', '$filter', - ($scope, wizardService, ngTableParams, $filter) -> + .controller 'reviewCtrl', ['$scope', 'wizardService', 'ngTableParams', '$filter', '$location', '$anchorScroll' + ($scope, wizardService, ngTableParams, $filter, $location, $anchorScroll) -> wizardService.reviewInit($scope) wizardService.watchingTriggeredStep($scope) + $scope.scrollTo = (id) -> + old = $location.hash(); + $location.hash(id); + $anchorScroll(); + $location.hash(old); + $scope.commit = (sendRequest) -> wizardService.reviewCommit(sendRequest) diff --git a/v2.5/src/app/partials/review.tpl.html b/v2.5/src/app/partials/review.tpl.html index 925e600..bbc26f6 100644 --- a/v2.5/src/app/partials/review.tpl.html +++ b/v2.5/src/app/partials/review.tpl.html @@ -1,4 +1,365 @@ -
+
+ + + +
+ +
+
+
+

+ OS Config +

+
+ +
+
+
+
+
+ OS Global Configurations +
+
+ + + + + + + + + + + + + + + + + + + +
{{key}} + {{value}}
Server Credentials +
Username + {{server_credentials.username}}
Password + {{server_credentials.password}}
+
+
+
+
+ Partition +
+
+ + + + + + + + + + + + + + + +
Mount PointSize Percentage (%)Max Size (G)
{{key}}{{value.percentage}}{{value.max_size}}
+
+
+
+
+
+
+
+
+
+

+ Host +

+
+ +
+
+
+
+
+
+ Hosts +
+
+ + + + + + + + + + + + + +
+
{{column.title}}
+ 		+ {{key}} +
+ + + + + + + - + + + + + {{cluster.name}}  + + + + + {{server[column.field]}} + + + + {{server.networks[key].ip}} +
+
+
+
+
+ Roles +
+
+ + + + + + + + + + + + + +
HostnameRoles
+ {{server.hostname}} + + + {{role.display_name}} + +
+ +
+
+
+ +
+
+
+
+
+
+
+

+ Target Config +

+
+ +
+ +
+
+
+
+
+ Network Mapping +
+
+ + + + + + + + + + + + + +
NetworkInterface
+
+ {{key}} +
+ 		{{value}}
+
+
+ +
+
+ Target System Configurations - cephConfig +
+
+ + + + + + + + + + + +
{{key}}{{value}}
{{key}}{{value}}
+
+
+ + +
+
+ Target System Configurations - NeutronConfig +
+
+ + + + + + + + + + + + + + + + + + + +
tenent_network_type{{neutronConfig.openvswitch.tenant_network_type}}
tunnel_id_ranges_{{key}}{{value}}
network_vlan_ranges_{{key}}{{value}}
bridge_mappins_{{key}}{{value}}
+
+
+ + +
+
+ Target System Configurations - High Availability Config +
+
+ + + + + + + +
VIP{{haConfig.ha_proxy.vip}}
+
+
+ +
+
+ Target System Configurations - console_credentials +
+
+ + + + + + + + + + + + + + + +
ServiceUsernamePassword
{{key}}{{value.username}}{{value.password}}
+
+
+
+
+ Target System Configurations - service_credentials +
+
+ + + + + + + + + + + + + + + +
ServiceUsernamePassword
{{key}}{{value.username}}{{value.password}}
+
+
+
+
+
+
+ +
+
+
+
+
+
+
+
+ + \ No newline at end of file diff --git a/v2.5/src/app/services/wizardService.coffee b/v2.5/src/app/services/wizardService.coffee index f1269c5..64bdef8 100644 --- a/v2.5/src/app/services/wizardService.coffee +++ b/v2.5/src/app/services/wizardService.coffee @@ -326,6 +326,23 @@ define(['./baseService'], ()-> @getServerColumns().success (data) -> $scope.server_columns = data.review + for value, index in data.review + if value.title == "Hostname" + temp = $scope.server_columns[0]; + $scope.server_columns[0] = value; + $scope.server_columns[index] = temp; + if value.title == "Host MAC Addr" + temp = $scope.server_columns[1]; + $scope.server_columns[1] = value; + $scope.server_columns[index] = temp; + if value.title == "Switch IP" + temp = $scope.server_columns[2]; + $scope.server_columns[2] = value; + $scope.server_columns[index] = temp; + if value.title == "Port" + temp = $scope.server_columns[3]; + $scope.server_columns[3] = value; + $scope.server_columns[index] = temp; $scope.tabs =[{ "title": "Database & Queue"