From a1a745b4820ec46a2e707d77f6178cf9e97654f6 Mon Sep 17 00:00:00 2001
From: SerenaFeng <feng.xiaowei@zte.com.cn>
Date: Fri, 12 May 2017 18:33:00 +0800
Subject: refactor static_path to accomodate web portal

move tornado_swagger/static to opnfv_testapi/static
move swagger related 3rd libs to 3rd_party/swagger

Change-Id: I32bba10584c99d13687b93f32577e37581db0c63
Signed-off-by: SerenaFeng <feng.xiaowei@zte.com.cn>
---
 .../testapi/3rd_party/static/testapi-ui/app.js     | 32 +++++++--------
 .../testapi/3rd_party/static/testapi-ui/index.html | 46 +++++++++++-----------
 2 files changed, 39 insertions(+), 39 deletions(-)

(limited to 'utils/test/testapi/3rd_party/static/testapi-ui')

diff --git a/utils/test/testapi/3rd_party/static/testapi-ui/app.js b/utils/test/testapi/3rd_party/static/testapi-ui/app.js
index 91e53f49a..4a2f23af9 100644
--- a/utils/test/testapi/3rd_party/static/testapi-ui/app.js
+++ b/utils/test/testapi/3rd_party/static/testapi-ui/app.js
@@ -37,56 +37,56 @@
         $stateProvider.
             state('home', {
                 url: '/',
-                templateUrl: '/swagger/testapi-ui/components/home/home.html'
+                templateUrl: '/testapi-ui/components/home/home.html'
             }).
             state('about', {
                 url: '/about',
-                templateUrl: '/swagger/testapi-ui/components/about/about.html'
+                templateUrl: '/testapi-ui/components/about/about.html'
             }).
             state('guidelines', {
                 url: '/guidelines',
-                templateUrl: '/swagger/testapi-ui/components/guidelines/guidelines.html',
+                templateUrl: '/testapi-ui/components/guidelines/guidelines.html',
                 controller: 'GuidelinesController as ctrl'
             }).
             state('communityResults', {
                 url: '/community_results',
-                templateUrl: '/swagger/testapi-ui/components/results/results.html',
+                templateUrl: '/testapi-ui/components/results/results.html',
                 controller: 'ResultsController as ctrl'
             }).
             state('userResults', {
                 url: '/user_results',
-                templateUrl: '/swagger/testapi-ui/components/results/results.html',
+                templateUrl: '/testapi-ui/components/results/results.html',
                 controller: 'ResultsController as ctrl'
             }).
             state('resultsDetail', {
                 url: '/results/:testID',
-                templateUrl: '/swagger/testapi-ui/components/results-report' +
+                templateUrl: '/testapi-ui/components/results-report' +
                              '/resultsReport.html',
                 controller: 'ResultsReportController as ctrl'
             }).
             state('profile', {
                 url: '/profile',
-                templateUrl: '/swagger/testapi-ui/components/profile/profile.html',
+                templateUrl: '/testapi-ui/components/profile/profile.html',
                 controller: 'ProfileController as ctrl'
             }).
             state('authFailure', {
                 url: '/auth_failure',
-                templateUrl: '/swagger/testapi-ui/components/home/home.html',
+                templateUrl: '/testapi-ui/components/home/home.html',
                 controller: 'AuthFailureController as ctrl'
             }).
             state('logout', {
                 url: '/logout',
-                templateUrl: '/swagger/testapi-ui/components/logout/logout.html',
+                templateUrl: '/testapi-ui/components/logout/logout.html',
                 controller: 'LogoutController as ctrl'
             }).
             state('userVendors', {
                 url: '/user_vendors',
-                templateUrl: '/swagger/testapi-ui/components/vendors/vendors.html',
+                templateUrl: '/testapi-ui/components/vendors/vendors.html',
                 controller: 'VendorsController as ctrl'
             }).
             state('publicVendors', {
                 url: '/public_vendors',
-                templateUrl: '/swagger/testapi-ui/components/vendors/vendors.html',
+                templateUrl: '/testapi-ui/components/vendors/vendors.html',
                 controller: 'VendorsController as ctrl'
             }).
             state('vendor', {
@@ -96,22 +96,22 @@
             }).
             state('userProducts', {
                 url: '/user_products',
-                templateUrl: '/swagger/testapi-ui/components/products/products.html',
+                templateUrl: '/testapi-ui/components/products/products.html',
                 controller: 'ProductsController as ctrl'
             }).
             state('publicProducts', {
                 url: '/public_products',
-                templateUrl: '/swagger/testapi-ui/components/products/products.html',
+                templateUrl: '/testapi-ui/components/products/products.html',
                 controller: 'ProductsController as ctrl'
             }).
             state('cloud', {
                 url: '/cloud/:id',
-                templateUrl: '/swagger/testapi-ui/components/products/cloud.html',
+                templateUrl: '/testapi-ui/components/products/cloud.html',
                 controller: 'ProductController as ctrl'
             }).
             state('distro', {
                 url: '/distro/:id',
-                templateUrl: '/swagger/testapi-ui/components/products/distro.html',
+                templateUrl: '/testapi-ui/components/products/distro.html',
                 controller: 'ProductController as ctrl'
             });
     }
@@ -211,7 +211,7 @@
             angular.bootstrap(document, ['testapiApp']);
         }
 
-        $http.get('swagger/testapi-ui/config.json').success(function (data) {
+        $http.get('testapi-ui/config.json').success(function (data) {
             startApp(data);
         }).error(function () {
             startApp({});
diff --git a/utils/test/testapi/3rd_party/static/testapi-ui/index.html b/utils/test/testapi/3rd_party/static/testapi-ui/index.html
index 4bf3c0d1b..46ccc61b8 100644
--- a/utils/test/testapi/3rd_party/static/testapi-ui/index.html
+++ b/utils/test/testapi/3rd_party/static/testapi-ui/index.html
@@ -21,39 +21,39 @@
         <meta name="viewport" content="width=device-width">
         <title>TestAPI</title>
 
-        <link rel="icon" type="image/png" href="swagger/testapi-ui/favicon-16x16.png" sizes="16x16" />
-        <link rel="icon" type="image/png" href="swagger/testapi-ui/favicon-32x32.png" sizes="32x32" />
+        <link rel="icon" type="image/png" href="testapi-ui/favicon-16x16.png" sizes="16x16" />
+        <link rel="icon" type="image/png" href="testapi-ui/favicon-32x32.png" sizes="32x32" />
 
-        <link rel="stylesheet" href="swagger/testapi-ui/assets/lib/bootstrap/dist/css/bootstrap.min.css">
-        <link rel="stylesheet" href="swagger/testapi-ui/assets/lib/angular-busy/dist/angular-busy.min.css">
-        <link rel="stylesheet" href="swagger/testapi-ui/assets/css/style.css">
+        <link rel="stylesheet" href="testapi-ui/assets/lib/bootstrap/dist/css/bootstrap.min.css">
+        <link rel="stylesheet" href="testapi-ui/assets/lib/angular-busy/dist/angular-busy.min.css">
+        <link rel="stylesheet" href="testapi-ui/assets/css/style.css">
 
-        <script src="swagger/testapi-ui/assets/lib/angular/angular.min.js"></script>
-        <script src="swagger/testapi-ui/assets/lib/angular-ui-router/release/angular-ui-router.min.js"></script>
-        <script src="swagger/testapi-ui/assets/lib/angular-resource/angular-resource.min.js"></script>
-        <script src="swagger/testapi-ui/assets/lib/angular-bootstrap/ui-bootstrap-tpls.min.js"></script>
-        <script src="swagger/testapi-ui/assets/lib/angular-busy/dist/angular-busy.min.js"></script>
-        <script src="swagger/testapi-ui/assets/lib/angular-confirm-modal/angular-confirm.js"></script>
-        <script src="swagger/testapi-ui/app.js"></script>
+        <script src="testapi-ui/assets/lib/angular/angular.min.js"></script>
+        <script src="testapi-ui/assets/lib/angular-ui-router/release/angular-ui-router.min.js"></script>
+        <script src="testapi-ui/assets/lib/angular-resource/angular-resource.min.js"></script>
+        <script src="testapi-ui/assets/lib/angular-bootstrap/ui-bootstrap-tpls.min.js"></script>
+        <script src="testapi-ui/assets/lib/angular-busy/dist/angular-busy.min.js"></script>
+        <script src="testapi-ui/assets/lib/angular-confirm-modal/angular-confirm.js"></script>
+        <script src="testapi-ui/app.js"></script>
 
         <!-- Controllers -->
-        <script src="swagger/testapi-ui/shared/header/headerController.js"></script>
-        <script src="swagger/testapi-ui/shared/alerts/alertModalFactory.js"></script>
-        <script src="swagger/testapi-ui/shared/alerts/confirmModalFactory.js"></script>
-        <script src="swagger/testapi-ui/components/guidelines/guidelinesController.js"></script>
-        <script src="swagger/testapi-ui/components/results/resultsController.js"></script>
-        <script src="swagger/testapi-ui/components/results-report/resultsReportController.js"></script>
-        <script src="swagger/testapi-ui/components/profile/profileController.js"></script>
-        <script src="swagger/testapi-ui/components/auth-failure/authFailureController.js"></script>
-        <script src="swagger/testapi-ui/components/logout/logoutController.js"></script>
+        <script src="testapi-ui/shared/header/headerController.js"></script>
+        <script src="testapi-ui/shared/alerts/alertModalFactory.js"></script>
+        <script src="testapi-ui/shared/alerts/confirmModalFactory.js"></script>
+        <script src="testapi-ui/components/guidelines/guidelinesController.js"></script>
+        <script src="testapi-ui/components/results/resultsController.js"></script>
+        <script src="testapi-ui/components/results-report/resultsReportController.js"></script>
+        <script src="testapi-ui/components/profile/profileController.js"></script>
+        <script src="testapi-ui/components/auth-failure/authFailureController.js"></script>
+        <script src="testapi-ui/components/logout/logoutController.js"></script>
 
         <!-- Filters -->
-        <script src="swagger/testapi-ui/shared/filters.js"></script>
+        <script src="testapi-ui/shared/filters.js"></script>
 
     </head>
 
     <body class="container">
-        <header ng-include src="'swagger/testapi-ui/shared/header/header.html'"></header>
+        <header ng-include src="'testapi-ui/shared/header/header.html'"></header>
 
         <div ui-view></div>
     </body>
-- 
cgit 1.2.3-korg