diff options
| author |   Kotagiri, Ramprasad (rp5662) <rp5662@att.com> | 2020-02-13 16:39:57 -0500 |
|---|---|---|
| committer | Kotagiri, Ramprasad (rp5662) <rp5662@att.com> | 2020-02-18 10:11:47 -0500 |
| commit | 7019f6d9af89b6fadc72d3d9f1f303b5278e7555 (patch) | |
| tree | fdd79713623b4349b64aa09a7aacb61ae2174787 /ccsdk-app-overlay/src/main/webapp/app | |
| parent | c73866cf44cad2be9a91ea1e2a3a77fcc29d9c2a (diff) | |
DCAE dashboard updates ver 1.3.0
Update DB Schema to include new menu items for API doc
Update the page footer for latest copyright
Issue-ID: DCAEGEN2-1856
Issue-ID: DCAEGEN2-1556
Change-Id: Ia7f52b6f0151db62f2155fa26d0f50a1157e7481
Signed-off-by: Kotagiri, Ramprasad (rp5662) <rp5662@att.com>
Diffstat (limited to 'ccsdk-app-overlay/src/main/webapp/app')
6 files changed, 10 insertions, 35 deletions
diff --git a/ccsdk-app-overlay/src/main/webapp/app/ccsdk/home/oom-router.js b/ccsdk-app-overlay/src/main/webapp/app/ccsdk/home/oom-router.js index 592ab15..0b43341 100644 --- a/ccsdk-app-overlay/src/main/webapp/app/ccsdk/home/oom-router.js +++ b/ccsdk-app-overlay/src/main/webapp/app/ccsdk/home/oom-router.js @@ -36,6 +36,10 @@ appDS2.config(function($routeProvider) { templateUrl: 'app/ccsdk/inventory/inventory_deployment_table.html', controller : 'inventoryDeploymentTableController' }) + .when('/idep/:depId', { + templateUrl: 'app/ccsdk/inventory/inventory_deployment_table.html', + controller : 'inventoryDeploymentTableController' + }) .when('/sh', { templateUrl: 'app/ccsdk/consul/service_health_table.html', controller : 'serviceHealthTableController' diff --git a/ccsdk-app-overlay/src/main/webapp/app/ccsdk/inventory/deployment-controllers.js b/ccsdk-app-overlay/src/main/webapp/app/ccsdk/inventory/deployment-controllers.js index 714528c..e17dcae 100644 --- a/ccsdk-app-overlay/src/main/webapp/app/ccsdk/inventory/deployment-controllers.js +++ b/ccsdk-app-overlay/src/main/webapp/app/ccsdk/inventory/deployment-controllers.js @@ -1,5 +1,7 @@ appDS2.controller('inventoryDeploymentTableController', function( - $rootScope, $scope, $interval, $log, $modal, modalService, InventoryDeploymentService, InventoryBlueprintService) { + $rootScope, $scope, $routeParams, $route, + $interval, $log, $modal, modalService, + InventoryDeploymentService, InventoryBlueprintService) { 'use strict'; @@ -19,7 +21,7 @@ appDS2.controller('inventoryDeploymentTableController', function( // sorting $scope.ecdapp.sortBy = null; // searching - $scope.ecdapp.searchBy = null; + $scope.ecdapp.searchBy = $routeParams.depId; $scope.ecdapp.selectedRow = null; // initialize our variable to null $scope.ecdapp.setClickedRow = function(index){ //function that sets the value of selectedRow to current index $scope.ecdapp.selectedRow = index; diff --git a/ccsdk-app-overlay/src/main/webapp/app/ccsdk/inventory/inventory_blueprint_table.html b/ccsdk-app-overlay/src/main/webapp/app/ccsdk/inventory/inventory_blueprint_table.html index 6dd0f07..763d956 100644 --- a/ccsdk-app-overlay/src/main/webapp/app/ccsdk/inventory/inventory_blueprint_table.html +++ b/ccsdk-app-overlay/src/main/webapp/app/ccsdk/inventory/inventory_blueprint_table.html @@ -143,7 +143,8 @@ <div> <span class="font-medium">{{$index+1}}</span> </div> <div class="b2b-leading-dots"> <span class="font-medium">Deployment ID</span> - <span class="pull-right" ng-bind="srvcData.serviceId"/> + <!-- <span class="pull-right" ng-bind="srvcData.serviceId"><a href="ecd#/idep/{{srvcData.serviceId}}"></a></span>--> + <span class="pull-right"><a href="ecd#/idep/{{srvcData.serviceId}}">{{srvcData.serviceId}}</a></span> </div> <div class="b2b-leading-dots"> <span class="font-medium">Created timestamp</span> diff --git a/ccsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/footer.html b/ccsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/footer.html deleted file mode 100644 index 65ac372..0000000 --- a/ccsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/footer.html +++ /dev/null @@ -1,13 +0,0 @@ -<div style="width: 100%"> - <footer class="b2b-footer-wrapper" role="contentinfo" aria-label="footer"> - <div class="b2b-footer-container" > - <div class="divider-bottom-footer"> - <div class="span12 footerLogo"> - <p class="copyright-text"> - © 2020 ONAP. The Linux Foundation. <span class="build_number">Build Number: {{build_number}}</span> - </p> - </div> - </div> - </div> - </footer> -</div>
\ No newline at end of file diff --git a/ccsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/header-logo.html b/ccsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/header-logo.html deleted file mode 100644 index 942af9b..0000000 --- a/ccsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/header-logo.html +++ /dev/null @@ -1,3 +0,0 @@ -<div style="margin-right: 40px;"> <img src="app/ccsdk/images/onap_16x16.ico"> - <span style="font-size: 16px;margin-left: 10px;">DCAE Dashboard</span> -</div>
\ No newline at end of file diff --git a/ccsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/welcome.html b/ccsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/welcome.html deleted file mode 100644 index 1c90f97..0000000 --- a/ccsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/welcome.html +++ /dev/null @@ -1,16 +0,0 @@ - <html> - <head> - <title>Redirecting</title> - <meta http-equiv="refresh" content="0;URL='ecd#'" /> - <style> - body { - font-family: Sans-Serif; - } - </style> - </head> - <body> - <p> - Redirecting to the <a href="ecd#">DCAE Dashboard</a>.. - </p> - </body> -</html> |