diff options
| author |   Dan Timoney <dtimoney@att.com> | 2018-10-29 12:40:41 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2018-10-29 12:40:41 +0000 |
| commit | 88997049c63356187e6b40e24694bcd291fea360 (patch) | |
| tree | a290a2fed501a7069d40eb1c0b3375dd07266636 | |
| parent | 01902f5b0ab6a4545c3b0dacbe47a26cf3238e68 (diff) | |
| parent | 1450782e1d24493a28dfc6f0fff480bb919bdd36 (diff) | |
Merge "Added some dependencies and plugin in SDNC-231"
Former-commit-id: cf20b144fd3f50a252b0a209e900fc13359d56f0
3 files changed, 29 insertions, 5 deletions
diff --git a/configbackuprestore/vnfconfigbackupservice/pom.xml b/configbackuprestore/vnfconfigbackupservice/pom.xml index 606062ea..ef9a981e 100644 --- a/configbackuprestore/vnfconfigbackupservice/pom.xml +++ b/configbackuprestore/vnfconfigbackupservice/pom.xml @@ -131,11 +131,35 @@ <artifactId>jackson-xml-databind</artifactId> <version>0.6.2</version> </dependency> + + <dependency> + <groupId>org.webjars</groupId> + <artifactId>bootstrap</artifactId> + <version>3.3.7</version> + </dependency> + + <dependency> + <groupId>org.webjars</groupId> + <artifactId>bootstrap-datepicker</artifactId> + <version>1.0.1</version> + </dependency> + + <dependency> + <groupId>org.webjars.bower</groupId> + <artifactId>angular-object-diff</artifactId> + <version>1.0.1</version> + </dependency> </dependencies> <build> <plugins> + + <plugin> + <groupId>org.springframework.boot</groupId> + <artifactId>spring-boot-maven-plugin</artifactId> + </plugin> + <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> diff --git a/configbackuprestore/vnfconfigbackupservice/src/main/webapp/WEB-INF/views/index.jsp b/configbackuprestore/vnfconfigbackupservice/src/main/webapp/WEB-INF/views/index.jsp index b6a3e552..95b64141 100644 --- a/configbackuprestore/vnfconfigbackupservice/src/main/webapp/WEB-INF/views/index.jsp +++ b/configbackuprestore/vnfconfigbackupservice/src/main/webapp/WEB-INF/views/index.jsp @@ -26,8 +26,8 @@ <!-- CSS --> <script src="./node_modules/jquery.min.js"></script> <script src="./node_modules/tether.min.js" ></script> - <link rel="stylesheet" href="./node_modules/bootstrap-3.3.7/dist/css/bootstrap.min.css"> - <script src="./node_modules/bootstrap-3.3.7/dist/js/bootstrap.min.js"></script> + <link rel="stylesheet" href="./webjars/bootstrap/3.3.7/css/bootstrap.min.css"> + <script src="./webjars/bootstrap/3.3.7/js/bootstrap.min.js"></script> <link rel="stylesheet" href="/static/style/sdnc-style.css"> <!-- JS --> <!-- load angular,date-time picker,pagination,growl and ui-router --> @@ -53,8 +53,8 @@ <script src="./node_modules/ng-ip-address/ngIpAddress.min.js" ></script> <link rel="stylesheet" type="text/css" href="./node_modules/angular-growl-v2/build/angular-growl.css"> <link rel="stylesheet" href="/static/style/w3.css"> - <link type="text/css" href="./node_modules/angular-object-diff/dist/angular-object-diff.css" rel='stylesheet'> - <script type="text/javascript" src="/node_modules/angular-object-diff/dist/angular-object-diff.js"></script> + <link type="text/css" href="./webjars/angular-object-diff/1.0.1/dist/angular-object-diff.css" rel='stylesheet'> + <script type="text/javascript" src="/webjars/angular-object-diff/1.0.1/dist/angular-object-diff.js"></script> </head> <!-- apply our angular app --> <body> diff --git a/configbackuprestore/vnfconfigbackupservice/src/main/webapp/static/views/tabs.html b/configbackuprestore/vnfconfigbackupservice/src/main/webapp/static/views/tabs.html index 178a8180..b8b65c69 100644 --- a/configbackuprestore/vnfconfigbackupservice/src/main/webapp/static/views/tabs.html +++ b/configbackuprestore/vnfconfigbackupservice/src/main/webapp/static/views/tabs.html @@ -10,7 +10,7 @@ </div> </div> <li><div class="dropdown"> - <button class="dropbtn">DEVICE CONFIGRUATION</button> + <button class="dropbtn">DEVICE CONFIGURATION</button> <div class="dropdown-content"> <a ng-href="#deviceConfig">Backup Config</a> <a ng-href="#applyConfig">Apply Config</a> |