aboutsummaryrefslogtreecommitdiffstats
path: root/openo-portal
diff options
context:
space:
mode:
authorBrendan Hassett <brendan.hassett@huawei.com>2016-09-20 09:33:47 +0000
committerGerrit Code Review <gerrit@open-o.org>2016-09-20 09:33:47 +0000
commit9dd2f25b26ac2a8674ca6fbd3efbdf7b1282b774 (patch)
treec9a9c914e269acd00668278fd1be78239779938e /openo-portal
parent43c58b26448f87c698b023a0cfedd9377dfc5d4a (diff)
parent1dfd64573810ef9f5c1c53bce4646873fdf22cc9 (diff)
Merge "1. change the 3rd party path of the user."
Diffstat (limited to 'openo-portal')
-rw-r--r--openo-portal/portal-auth/src/main/webapp/user/changePassword.html2
-rw-r--r--openo-portal/portal-auth/src/main/webapp/user/createUser.html2
-rw-r--r--openo-portal/portal-auth/src/main/webapp/user/modifyUser.html2
-rw-r--r--openo-portal/portal-auth/src/main/webapp/user/user.html8
4 files changed, 7 insertions, 7 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 3b987033..1cf987be 100644
--- a/openo-portal/portal-auth/src/main/webapp/user/changePassword.html
+++ b/openo-portal/portal-auth/src/main/webapp/user/changePassword.html
@@ -20,7 +20,7 @@
<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">
- <script type="text/javascript" src="/openoui/auth/v1/user/3rd_lib/jquery-1.11.1.min.js"></script>
+ <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>
</head>
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 ff12593c..14283fd1 100644
--- a/openo-portal/portal-auth/src/main/webapp/user/createUser.html
+++ b/openo-portal/portal-auth/src/main/webapp/user/createUser.html
@@ -21,7 +21,7 @@
<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">
- <script type="text/javascript" src="/openoui/auth/v1/user/3rd_lib/jquery-1.11.1.min.js"></script>
+ <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>
</head>
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 2c3bdcae..6a4abba9 100644
--- a/openo-portal/portal-auth/src/main/webapp/user/modifyUser.html
+++ b/openo-portal/portal-auth/src/main/webapp/user/modifyUser.html
@@ -21,7 +21,7 @@
<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">
- <script type="text/javascript" src="/openoui/auth/v1/user/3rd_lib/jquery-1.11.1.min.js"></script>
+ <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>
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 39050638..dbd0adc9 100644
--- a/openo-portal/portal-auth/src/main/webapp/user/user.html
+++ b/openo-portal/portal-auth/src/main/webapp/user/user.html
@@ -19,10 +19,10 @@
<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/3rd_lib/jquery.dataTables.min.css">
- <script type="text/javascript" src="/openoui/auth/v1/user/3rd_lib/jquery-1.11.1.min.js"></script>
- <script type="text/javascript" src="/openoui/auth/v1/user/3rd_lib/bootbox.min.js"></script>
- <script type="text/javascript" charset="utf8" src="/openoui/auth/v1/user/3rd_lib/jquery.dataTables.min.js"></script>
+ <link rel="stylesheet" type="text/css" href="/openoui/common/thirdparty/data-table/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>