From ae6504e2975ae86e0e1e530cb4635aebdee1b342 Mon Sep 17 00:00:00 2001 From: zhouruiyu Date: Fri, 14 Oct 2016 17:30:21 +0800 Subject: integration with CMCC portal. 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 --- .../portal-auth/src/main/webapp/user/changePassword.html | 8 ++++---- .../portal-auth/src/main/webapp/user/createUser.html | 8 ++++---- .../portal-auth/src/main/webapp/user/css/component.css | 6 +++--- .../portal-auth/src/main/webapp/user/js/changePassword.js | 4 ++-- .../portal-auth/src/main/webapp/user/js/createUser.js | 4 ++-- .../portal-auth/src/main/webapp/user/js/modifyUser.js | 4 ++-- openo-portal/portal-auth/src/main/webapp/user/js/user.js | 10 +++++----- .../portal-auth/src/main/webapp/user/modifyUser.html | 8 ++++---- openo-portal/portal-auth/src/main/webapp/user/user.html | 14 +++++++------- 9 files changed, 33 insertions(+), 33 deletions(-) (limited to 'openo-portal/portal-auth') 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 1cf987be..2baf87fc 100644 --- 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 @@ - - + + - - + + 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 14283fd1..5b3cbbae 100644 --- 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 @@ - - + + - - + + 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 9c81d666..13566b98 100644 --- 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 afe96b3d..f499bfc2 100644 --- 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 7a95a8ee..f27214a6 100644 --- 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 b01cebe4..e75e9779 100644 --- 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 bc442616..11f2326c 100644 --- 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 = " edit

"; - var editOpt = " edit

"; + var deleteEditOpt = " edit

"; + var editOpt = " edit

"; 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 6a4abba9..6e55303d 100644 --- 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 @@ - - + + - - + + 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 dbd0adc9..58ef9df9 100644 --- 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 @@ - + - - - - - + + + + + @@ -34,7 +34,7 @@

-- cgit 1.2.3-korg