Merge "update the license."
authorjin xin <j00101220@huawei.com>
Tue, 20 Sep 2016 09:45:49 +0000 (09:45 +0000)
committerGerrit Code Review <gerrit@open-o.org>
Tue, 20 Sep 2016 09:45:49 +0000 (09:45 +0000)
openo-portal/portal-auth/src/main/webapp/user/changePassword.html
openo-portal/portal-auth/src/main/webapp/user/createUser.html
openo-portal/portal-auth/src/main/webapp/user/modifyUser.html
openo-portal/portal-auth/src/main/webapp/user/user.html

index 3b98703..1cf987b 100644 (file)
@@ -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>
index ff12593..14283fd 100644 (file)
@@ -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>
index 2c3bdca..6a4abba 100644 (file)
@@ -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>
     
index 3905063..dbd0adc 100644 (file)
 <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>