Code Review / vnfsdk / refrepo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | patch | inline | side by side (from parent 1: 044aaaa)
integration with CMCC portal.
authorzhouruiyu <zhouruiyu@huawei.com>
Fri, 14 Oct 2016 09:30:21 +0000 (17:30 +0800)
committerzhouruiyu <zhouruiyu@huawei.com>
Fri, 14 Oct 2016 09:30:21 +0000 (17:30 +0800)
1. change the import js and css path into the right one ;

https://jira.open-o.org/browse/OCS-113

Change-Id: I40bd3fe5e8cd532f260db1275292a7c0f9e3f4a9
Signed-off-by: zhouruiyu <zhouruiyu@huawei.com>
openo-portal/portal-auth/src/main/webapp/user/changePassword.html patch | blob | history
openo-portal/portal-auth/src/main/webapp/user/createUser.html patch | blob | history
openo-portal/portal-auth/src/main/webapp/user/css/component.css patch | blob | history
openo-portal/portal-auth/src/main/webapp/user/js/changePassword.js patch | blob | history
openo-portal/portal-auth/src/main/webapp/user/js/createUser.js patch | blob | history
openo-portal/portal-auth/src/main/webapp/user/js/modifyUser.js patch | blob | history
openo-portal/portal-auth/src/main/webapp/user/js/user.js patch | blob | history
openo-portal/portal-auth/src/main/webapp/user/modifyUser.html patch | blob | history
openo-portal/portal-auth/src/main/webapp/user/user.html patch | blob | history

diff --git a/openo-portal/portal-auth/src/main/webapp/user/changePassword.html b/openo-portal/portal-auth/src/main/webapp/user/changePassword.html
index 1cf987b..2baf87f 100644 (file)
--- a/openo-portal/portal-auth/src/main/webapp/user/changePassword.html
+++ b/openo-portal/portal-auth/src/main/webapp/user/changePassword.html
@@ -18,11 +18,11 @@
 <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
-    <link rel="stylesheet" type="text/css" href="/openoui/auth/v1/user/css/component.css">
-    <link rel="stylesheet" type="text/css" href="/openoui/auth/v1/user/css/user.css">
+    <link rel="stylesheet" type="text/css" href="/openoui/user/css/component.css">
+    <link rel="stylesheet" type="text/css" href="/openoui/user/css/user.css">
     <script type="text/javascript" src="/openoui/common/thirdparty/jquery/jquery-1.11.2.min.js"></script>
-    <script type="text/javascript" src="/openoui/auth/v1/user/js/userTools.js"></script>
-    <script type="text/javascript" src="/openoui/auth/v1/user/js/changePassword.js"></script>
+    <script type="text/javascript" src="/openoui/user/js/userTools.js"></script>
+    <script type="text/javascript" src="/openoui/user/js/changePassword.js"></script>
 </head>
 
 <body class="hw_body">
diff --git a/openo-portal/portal-auth/src/main/webapp/user/createUser.html b/openo-portal/portal-auth/src/main/webapp/user/createUser.html
index 14283fd..5b3cbba 100644 (file)
--- a/openo-portal/portal-auth/src/main/webapp/user/createUser.html
+++ b/openo-portal/portal-auth/src/main/webapp/user/createUser.html
@@ -19,11 +19,11 @@
 <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
-    <link rel="stylesheet" type="text/css" href="/openoui/auth/v1/user/css/component.css">
-    <link rel="stylesheet" type="text/css" href="/openoui/auth/v1/user/css/user.css">
+    <link rel="stylesheet" type="text/css" href="/openoui/user/css/component.css">
+    <link rel="stylesheet" type="text/css" href="/openoui/user/css/user.css">
     <script type="text/javascript" src="/openoui/common/thirdparty/jquery/jquery-1.11.2.min.js"></script>
-    <script type="text/javascript" src="/openoui/auth/v1/user/js/userTools.js"></script>
-    <script type="text/javascript" src="/openoui/auth/v1/user/js/createUser.js"></script>
+    <script type="text/javascript" src="/openoui/user/js/userTools.js"></script>
+    <script type="text/javascript" src="/openoui/user/js/createUser.js"></script>
 </head>
 
 <body class="hw_body">
diff --git a/openo-portal/portal-auth/src/main/webapp/user/css/component.css b/openo-portal/portal-auth/src/main/webapp/user/css/component.css
index 9c81d66..13566b9 100644 (file)
--- a/openo-portal/portal-auth/src/main/webapp/user/css/component.css
+++ b/openo-portal/portal-auth/src/main/webapp/user/css/component.css
@@ -33,7 +33,7 @@
     background: -webkit-gradient(linear,left top,left bottom,color-stop(0,#fff),color-stop(100%,#fafafa));
     background: -webkit-linear-gradient(top,#fff,#fafafa);
     background: linear-gradient(to bottom,#fff,#fafafa);
-    border-radius: 6px;
+    border-radius: 6px!important;
 }
 .fk_button:hover {
     color: #009ae7;    
@@ -48,10 +48,10 @@
     margin-right: 10px;
 }
 .add_imag {
-    background-image: url(/openoui/auth/v1/user/images/add.png);
+    background-image: url(/openoui/user/images/add.png);
 }
 .delete_imag {
-    background-image: url(/openoui/auth/v1/user/images/delete.png);
+    background-image: url(/openoui/user/images/delete.png);
 }
 .button_imag {
     padding-left: 25px;
diff --git a/openo-portal/portal-auth/src/main/webapp/user/js/changePassword.js b/openo-portal/portal-auth/src/main/webapp/user/js/changePassword.js
index afe96b3..f499bfc 100644 (file)
--- a/openo-portal/portal-auth/src/main/webapp/user/js/changePassword.js
+++ b/openo-portal/portal-auth/src/main/webapp/user/js/changePassword.js
@@ -38,7 +38,7 @@ $(document).ready(function() {
             var data = getModifyUser();
             changePsd(data).done(function() {
                 top.bootbox.alert("Password change successfully.", function(e) {
-                    Rest.turn2URI("/openoui/auth/v1/user/html/user.html");
+                    Rest.turn2URI("/openoui/user/user.html");
                 })
             }).fail(function(e) {
                 if (e.statusText == "Unauthorized") {
@@ -49,7 +49,7 @@ $(document).ready(function() {
             })
         })
         $("#cancel").click(function(e) {
-            window.document.location = "/openoui/auth/v1/user/html/user.html";
+            window.document.location = "/openoui/user/user.html";
         })
     }
 
diff --git a/openo-portal/portal-auth/src/main/webapp/user/js/createUser.js b/openo-portal/portal-auth/src/main/webapp/user/js/createUser.js
index 7a95a8e..f27214a 100644 (file)
--- a/openo-portal/portal-auth/src/main/webapp/user/js/createUser.js
+++ b/openo-portal/portal-auth/src/main/webapp/user/js/createUser.js
@@ -30,11 +30,11 @@ $(document).ready(function() {
             }
             var data = getCreateUser();
             createUser(data).done(function() {
-                window.document.location = "/openoui/auth/v1/user/html/user.html";
+                window.document.location = "/openoui/user/user.html";
             })
         })
         $("#cancel").click(function(e) {
-            window.document.location = "/openoui/auth/v1/user/html/user.html";
+            window.document.location = "/openoui/user/user.html";
         })
     }
 
diff --git a/openo-portal/portal-auth/src/main/webapp/user/js/modifyUser.js b/openo-portal/portal-auth/src/main/webapp/user/js/modifyUser.js
index b01cebe..e75e977 100644 (file)
--- a/openo-portal/portal-auth/src/main/webapp/user/js/modifyUser.js
+++ b/openo-portal/portal-auth/src/main/webapp/user/js/modifyUser.js
@@ -26,11 +26,11 @@ $(document).ready(function() {
         $("#confirm").click(function(e) {
             var data = getModifyUser();
             modifyUser(data).done(function() {
-                window.document.location = "/openoui/auth/v1/user/html/user.html";
+                window.document.location = "/openoui/user/user.html";
             })
         })
         $("#cancel").click(function(e) {
-            window.document.location = "/openoui/auth/v1/user/html/user.html";
+            window.document.location = "/openoui/user/user.html";
         })
     }
 
diff --git a/openo-portal/portal-auth/src/main/webapp/user/js/user.js b/openo-portal/portal-auth/src/main/webapp/user/js/user.js
index bc44261..11f2326 100644 (file)
--- a/openo-portal/portal-auth/src/main/webapp/user/js/user.js
+++ b/openo-portal/portal-auth/src/main/webapp/user/js/user.js
@@ -15,8 +15,8 @@
  */
 $(document).ready(function() {
     var USER_SERVICE = "/openoapi/auth/v1/users";
-    var deleteEditOpt = "<img class='edit' title='edit' src='/openoui/auth/v1/user/images/edit.png'><img class='changePsd' title='Change Password' src='/openoui/auth/v1/user/images/reset.png'><img class='delete' title='delete' src='/openoui/auth/v1/user/images/delete.png'>";
-    var editOpt = "<img class='edit' title='edit' src='/openoui/auth/v1/user/images/edit.png'><img class='changePsd' title='Change Password' src='/openoui/auth/v1/user/images/reset.png'>";
+    var deleteEditOpt = "<img class='edit' title='edit' src='/openoui/user/images/edit.png'><img class='changePsd' title='Change Password' src='/openoui/user/images/reset.png'><img class='delete' title='delete' src='/openoui/user/images/delete.png'>";
+    var editOpt = "<img class='edit' title='edit' src='/openoui/user/images/edit.png'><img class='changePsd' title='Change Password' src='/openoui/user/images/reset.png'>";
 
     var userListHeader = [
         { title: "User", data: "User",width: "20%"},
@@ -54,14 +54,14 @@ $(document).ready(function() {
                     }
                 })
             } else if (classname == "edit") {
-                window.document.location = "/openoui/auth/v1/user/html/modifyUser.html" + "?id=" + id;
+                window.document.location = "/openoui/user/modifyUser.html" + "?id=" + id;
             } else if (classname == "changePsd") {
-                window.document.location = "/openoui/auth/v1/user/html/changePassword.html" + "?id=" + id;
+                window.document.location = "/openoui/user/changePassword.html" + "?id=" + id;
             }
         })
 
         $("#create").click(function(e) {
-            window.document.location = "/openoui/auth/v1/user/html/createUser.html";
+            window.document.location = "/openoui/user/createUser.html";
         })
     }
 
diff --git a/openo-portal/portal-auth/src/main/webapp/user/modifyUser.html b/openo-portal/portal-auth/src/main/webapp/user/modifyUser.html
index 6a4abba..6e55303 100644 (file)
--- a/openo-portal/portal-auth/src/main/webapp/user/modifyUser.html
+++ b/openo-portal/portal-auth/src/main/webapp/user/modifyUser.html
@@ -19,11 +19,11 @@
 <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
-    <link rel="stylesheet" type="text/css" href="/openoui/auth/v1/user/css/component.css">
-    <link rel="stylesheet" type="text/css" href="/openoui/auth/v1/user/css/user.css">
+    <link rel="stylesheet" type="text/css" href="/openoui/user/css/component.css">
+    <link rel="stylesheet" type="text/css" href="/openoui/user/css/user.css">
     <script type="text/javascript" src="/openoui/common/thirdparty/jquery/jquery-1.11.2.min.js"></script>
-    <script type="text/javascript" src="/openoui/auth/v1/user/js/userTools.js"></script>
-    <script type="text/javascript" src="/openoui/auth/v1/user/js/modifyUser.js"></script>
+    <script type="text/javascript" src="/openoui/user/js/userTools.js"></script>
+    <script type="text/javascript" src="/openoui/user/js/modifyUser.js"></script>
     
 </head>
 
diff --git a/openo-portal/portal-auth/src/main/webapp/user/user.html b/openo-portal/portal-auth/src/main/webapp/user/user.html
index dbd0adc..58ef9df 100644 (file)
--- a/openo-portal/portal-auth/src/main/webapp/user/user.html
+++ b/openo-portal/portal-auth/src/main/webapp/user/user.html
@@ -19,14 +19,14 @@
 <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
-    <link rel="stylesheet" type="text/css" href="/openoui/common/thirdparty/data-table/jquery.dataTables.min.css">
+    <link rel="stylesheet" type="text/css" href="/openoui/common/thirdparty/data-tables/jquery.dataTables.min.css">
     <script type="text/javascript" src="/openoui/common/thirdparty/jquery/jquery-1.11.2.min.js"></script>
     <script type="text/javascript" src="/openoui/common/thirdparty/bootbox/bootbox.min.js"></script>
-    <script type="text/javascript" charset="utf8" src="/openoui/common/thirdparty/data-table/jquery.dataTables.min.js"></script>
-    <link rel="stylesheet" type="text/css" href="/openoui/auth/v1/user/css/component.css">
-    <script type="text/javascript" src="/openoui/auth/v1/user/js/userTools.js"></script>
-    <script type="text/javascript" src="/openoui/auth/v1/user/js/user.js"></script>
-    <link rel="stylesheet" type="text/css" href="/openoui/auth/v1/user/css/user.css">
+    <script type="text/javascript" charset="utf8" src="/openoui/common/thirdparty/data-tables/jquery.dataTables.min.js"></script>
+    <link rel="stylesheet" type="text/css" href="/openoui/user/css/component.css">
+    <script type="text/javascript" src="/openoui/user/js/userTools.js"></script>
+    <script type="text/javascript" src="/openoui/user/js/user.js"></script>
+    <link rel="stylesheet" type="text/css" href="/openoui/user/css/user.css">
 </head>
 
 <body class="hw_body" style="visibility: hidden;">
@@ -34,7 +34,7 @@
         <button class="fk_button add_imag button_imag" id="create">Create</button>
     </div>
     <div>
-       <table id="table_id" class="display" style="table-layout: fixed"></table>
+       <table id="table_id"></table>
     </div>
 </body>
 
This repository is for a reference vnf repository