Integration of Client pages to Main GUI

IssueId : CLIENT-189

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

4 files changed, 31 insertions, 28 deletions

diff --git a/provincemgr/src/main/webapp/provincemgr/index.html b/provincemgr/src/main/webapp/provincemgr/index.html
index f53edcca..6f9b8996 100644
--- a/provincemgr/src/main/webapp/provincemgr/index.html
+++ b/provincemgr/src/main/webapp/provincemgr/index.html
@@ -23,23 +23,24 @@
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <title>Province Management</title>
-    <link href="thirdparty/css/bootstrap.min.css" rel="stylesheet"/>
-    <link href="thirdparty/css/font-awesome.min.css" rel="stylesheet">
-    <link href="thirdparty/css/zTreeStyle.css" rel="stylesheet"/>
-    <link href="thirdparty/css/magic-check.css" rel="stylesheet"/>
-    <link href="thirdparty/css/ng-table.min.css" rel="stylesheet"/>
-    <link href="framework/css/open-ostyle.css" rel="stylesheet"/>
-    <script src="thirdparty/js/angular.min.js"></script>
-    <script src="thirdparty/js/angular-ui-router.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="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="thirdparty/js/jquery.ztree.core-3.5.js"></script>
+    <link href="/openoui/thirdparty/css/bootstrap.min.css" rel="stylesheet"/>
+    <link href="/openoui/thirdparty/css/font-awesome.min.css" rel="stylesheet">
+    <link href="/openoui/thirdparty/css/zTreeStyle.css" rel="stylesheet"/>
+    <link href="/openoui/thirdparty/css/magic-check.css" rel="stylesheet"/>
+    <link href="/openoui/thirdparty/css/ng-table.min.css" rel="stylesheet"/>
+    <link href="/openoui/framework/css/open-ostyle.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="/openoui/thirdparty/js/ng-table.min.js"></script>
+    <script src="/openoui/thirdparty/js/jquery_1.12.4.min.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/provincemgr/js/app.js"></script>
+    <script src="/openoui/provincemgr/js/rest.js"></script>
+	<script type="text/javascript" src="/openoui/provincemgr/js/DataService.js"></script>
+    <script src="/openoui/thirdparty/js/mustache.js"></script>
+    <script src="/openoui/thirdparty/js/jquery.ztree.core-3.5.js"></script>
 
 </head>
 
diff --git a/provincemgr/src/main/webapp/provincemgr/js/app.js b/provincemgr/src/main/webapp/provincemgr/js/app.js
index b8979dd9..7a972175 100644
--- a/provincemgr/src/main/webapp/provincemgr/js/app.js
+++ b/provincemgr/src/main/webapp/provincemgr/js/app.js
@@ -6,7 +6,7 @@
  you may not use this file except in compliance with the License.

  You may obtain a copy of the License at

 

-      http://www.apache.org/licenses/LICENSE-2.0

+ http://www.apache.org/licenses/LICENSE-2.0

 

  Unless required by applicable law or agreed to in writing, software

  distributed under the License is distributed on an "AS IS" BASIS,

@@ -33,7 +33,7 @@ var app = angular.module("ProvinceManagementApp", ["ui.router", "ngTable"])
 

 

     .controller("managementCtrl", function($scope, $log, provinceDataService, $state, $compile, NgTableParams){

-        $scope.message = "Management";

+        $scope.title = "Management";

 

         $scope.init = function() {

             provinceDataService.getAllProvinceData()

@@ -43,6 +43,7 @@ var app = angular.module("ProvinceManagementApp", ["ui.router", "ngTable"])
                     loadButtons();

                     $log.info(data.provinceData);

                 }, function(reason){

+					loadButtons();

                     $scope.message = "Error is :" + JSON.stringify(reason);

                 });

 

@@ -284,20 +285,20 @@ var app = angular.module("ProvinceManagementApp", ["ui.router", "ngTable"])
 

 var modelTemplate = "";

 function loadTemplate() {

-    $.get('framework/template.html', function (template) {

+    $.get('/openoui/resmgr/templates/template.html', function (template) {

         modelTemplate += template;

     });

-    $.get('framework/templateContainer.html', function (template) {

+    $.get('/openoui/resmgr/templates/templateContainer.html', function (template) {

         modelTemplate += template;

     });

-    $.get('framework/templateWidget.html', function (template) {

+    $.get('/openoui/resmgr/templates/templateWidget.html', function (template) {

         //console.log("Template is : "+template);

         modelTemplate += template;

     });

-    $.get('framework/templateNotification.html', function (template) {

+    $.get('/openoui/resmgr/templates/templateNotification.html', function (template) {

         modelTemplate += template;

     });

-    $.get('framework/templateFunctional.html', function (template) {

+    $.get('/openoui/resmgr/templates/templateFunctional.html', function (template) {

         modelTemplate += template;

     });

 }
\ No newline at end of file
diff --git a/provincemgr/src/main/webapp/provincemgr/js/rest.js b/provincemgr/src/main/webapp/provincemgr/js/rest.js
index 6432ca16..b2c994cf 100644
--- a/provincemgr/src/main/webapp/provincemgr/js/rest.js
+++ b/provincemgr/src/main/webapp/provincemgr/js/rest.js
@@ -18,7 +18,8 @@
 

 

 app.factory("provinceDataService", function($http,DataService, $log){

-    var uri ;//'http://192.168.9.13:18008';

+    /* var uri = 'http://192.168.9.13:18008'; */

+    var uri ;

     return {

         getAllProvinceData : function() {

             /*return $http({

diff --git a/provincemgr/src/main/webapp/provincemgr/templates/management.html b/provincemgr/src/main/webapp/provincemgr/templates/management.html
index 934eff09..ccbd45eb 100644
--- a/provincemgr/src/main/webapp/provincemgr/templates/management.html
+++ b/provincemgr/src/main/webapp/provincemgr/templates/management.html
@@ -17,7 +17,7 @@
 -->

 <div class="homecontent center">

 <div class="col-md-12 col-sm-12 col-lg-12">

-    <h4>{{message}}</h4>

+    <h4>{{title}}</h4>

     <br><br>

     <div id="provinceAction" ng-init="init()">

 

@@ -43,8 +43,8 @@
                 {{provinceData.desc}}

             </td>

             <td title="'Action'">

-                <span  ng-click="editData(provinceData.id)" style="cursor: pointer;margin: 0 5px"> <img src="framework/images/edit.png" height="15" align="left"/></span>

-                <span  ng-click="deleteData(provinceData.id)" style="cursor: pointer;margin: 0 5px"><img src="framework/images/delete.png" height="15" align="middle"/></span>

+                <span  ng-click="editData(provinceData.id)" style="cursor: pointer;margin: 0 5px"> <img src="/openoui/framework/browser/thirdparty/images/edit.png" height="15" align="left"/></span>

+                <span  ng-click="deleteData(provinceData.id)" style="cursor: pointer;margin: 0 5px"><img src="/openoui/framework/browser/thirdparty/images/delete.png" height="15" align="middle"/></span>

             </td>

         </tr>

     </table>