aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjin xin <j00101220@huawei.com>2016-10-18 06:51:21 +0000
committerGerrit Code Review <gerrit@open-o.org>2016-10-18 06:51:21 +0000
commita42e5251bed0f92a3a429dfe0e7805bf7d271515 (patch)
tree0d93cda3ca8675c23ffbccde772375c73f25e05a
parentee710e35d150b83a48605cd613bd3da5c43e0238 (diff)
parentae6504e2975ae86e0e1e530cb4635aebdee1b342 (diff)
Merge "integration with CMCC portal."
Diffstat
-rw-r--r--openo-portal/portal-auth/src/main/webapp/user/changePassword.html8
-rw-r--r--openo-portal/portal-auth/src/main/webapp/user/createUser.html8
-rw-r--r--openo-portal/portal-auth/src/main/webapp/user/css/component.css6
-rw-r--r--openo-portal/portal-auth/src/main/webapp/user/js/changePassword.js4
-rw-r--r--openo-portal/portal-auth/src/main/webapp/user/js/createUser.js4
-rw-r--r--openo-portal/portal-auth/src/main/webapp/user/js/modifyUser.js4
-rw-r--r--openo-portal/portal-auth/src/main/webapp/user/js/user.js10
-rw-r--r--openo-portal/portal-auth/src/main/webapp/user/modifyUser.html8
-rw-r--r--openo-portal/portal-auth/src/main/webapp/user/user.html14
9 files changed, 33 insertions, 33 deletions
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 @@
<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 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 @@
<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 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 = "<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 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 @@
<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 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 @@
<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>