From: seshukm <seshu.kumar.m@huawei.com>
Date: Tue, 18 Apr 2017 13:19:42 +0000 (+0530)
Subject: SDN Controller merge issue resolution
X-Git-Tag: release/mercury~38
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=6e36a2778c822bcb44e1add72baa498734075f29;p=vnfsdk%2Frefrepo.git

SDN Controller merge issue resolution

IssueID : CLIENT-189

Change-Id: If51334683c7a6dab900688641cd178e1a0464d56
Signed-off-by: seshukm <seshu.kumar.m@huawei.com>
---

diff --git a/extsys/src/main/webapp/extsys/sdncontroller/index.html b/extsys/src/main/webapp/extsys/sdncontroller/index.html
index bb8e3cb9..62855576 100644
--- a/extsys/src/main/webapp/extsys/sdncontroller/index.html
+++ b/extsys/src/main/webapp/extsys/sdncontroller/index.html
@@ -22,21 +22,22 @@
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <title>Controller</title>
-    <link href="thirdparty/css/bootstrap.min.css" rel="stylesheet"/>
-    <link href="framework/css/open-ostyle.css" rel="stylesheet"/>
-    <link rel="stylesheet"; href="https://unpkg.com/ng-table@2.0.2/bundles/ng-table.min.css">
-    <script src="thirdparty/js/angular.min.js"></script>
-    <script src="thirdparty/js/angular-ui-router.min.js"></script>
+    <link href="/openoui/thirdparty/css/bootstrap.min.css" rel="stylesheet"/>
+    <link href="/openoui/framework/css/open-ostyle.css" rel="stylesheet"/>
+    <!--<link rel="stylesheet"; href="https://unpkg.com/ng-table@2.0.2/bundles/ng-table.min.css">-->
+    <link href="/openoui/thirdparty/css/ng-table.min.css" rel="stylesheet"/>
+    <script src="/openoui/thirdparty/js/angular.min.js"></script>
+    <script src="/openoui/thirdparty/js/angular-ui-router.min.js"></script>
     <!--<script src="https://unpkg.com/ng-table@2.0.2/bundles/ng-table.min.js"></script>-->
-    <script src="thirdparty/js/ng-table.min.js"></script>
-    <script src="thirdparty/js/jquery_1.12.4.min.js"></script>
+    <script src="/openoui/thirdparty/js/ng-table.min.js"></script>
+    <script src="/openoui/thirdparty/js/jquery_1.12.4.min.js"></script>
     <!--<script src="https://code.jquery.com/ui/1.12.1/jquery-ui.js"></script>-->
-    <script src="thirdparty/js/jquery-ui.js"></script>
-    <script type="text/javascript" src="thirdparty/js/bootstrap.min.js"></script>
-    <script src="js/app.js"></script>
-    <script src="js/rest.js"></script>
-    <script src="framework/js/DataService.js"></script>
-    <script src="thirdparty/js/mustache.js"></script>
+    <script src="/openoui/thirdparty/js/jquery-ui.js"></script>
+    <script type="text/javascript" src="/openoui/thirdparty/js/bootstrap.min.js"></script>
+    <script src="/openoui/extsys/sdncontroller/js/app.js"></script>
+    <script src="/openoui/extsys/sdncontroller/js/rest.js"></script>
+    <script src="/openoui/framework/js/DataService.js"></script>
+    <script src="/openoui/thirdparty/js/mustache.js"></script>
 
 
 </head>
diff --git a/login/src/main/webapp/login/html/menu.html b/login/src/main/webapp/login/html/menu.html
index 388de035..7a2bb9df 100644
--- a/login/src/main/webapp/login/html/menu.html
+++ b/login/src/main/webapp/login/html/menu.html
@@ -89,7 +89,7 @@
                             <ul class="submenu">
                                 <li><a href="/openoui/extsys/vim/vimView.html" target="mainFrame">VIM Manage</a></li>
                                 <li><a href="/openoui/extsys/vnfm/vnfmView.html" target="mainFrame">VNFM</a></li>
-                                <li><a href="/openoui/extsys/sdncontroller/controller.html" target="mainFrame">SDN Controller</a></li>
+                                <li><a href="/openoui/extsys/sdncontroller/index.html" target="mainFrame">SDN Controller</a></li>
                             </ul>
                         </li>
                         <li>