Skip to content

C
check
Commit 2571d555 by Kang Donghun
Options

コード整理

parent cf2c0a2c
Showing with 41 additions and 40 deletions
abvw/common/js/appCommon/check-common.js
......@@ -28,7 +28,6 @@ CHK_Common.setLangCodeWeb = function () {
} else {
lang = CHK_CONSTANT.LANG.JAPAN;
}
CHK_Common.lang = lang;
};
......@@ -204,7 +203,7 @@ CHK_Common.getUrlParameter = function () {
* @returns sid
*/
CHK_Common.getSid = function () {
return 'sid';
return ClientData.userInfo_sid_local();
};
/**
......
abvw/common/js/web/avweb.js
......@@ -301,12 +301,14 @@ AVWEB.avwSysSettingObj = null;
$(function () {
// システム設定ファイルの配置先パスの決定
var location = window.location.toString().toLowerCase();
var sysFile = '';
if (location.indexOf('/abvw') < 0) {
sysFile = './abvw/common/json/sys/conf.json';
sysFile = '../abvw/common/json/sys/conf.json';
} else {
sysFile = './common/json/sys/conf.json';
sysFile = '../common/json/sys/conf.json';
}
// システム設定ファイルを読み込む
......
abvw/common/js/web/i18n.js
......@@ -40,10 +40,10 @@ I18N.initi18n = function(){
var location = window.location.toString().toLowerCase();
if (location.indexOf(I18N.avwsys_dir) < 0) {
// I18N.avwsys_dirディレクトリ配下ではない場合は、I18N.avwsys_dirディレクトリをつける
I18N.avwsys_location = "." + I18N.avwsys_dir + I18N.avwsys_location;
I18N.avwsys_location = ".." + I18N.avwsys_dir + I18N.avwsys_location;
} else {
// I18N.avwsys_dirディレクトリ配下の場合は、相対パスに変換
I18N.avwsys_location = "." + I18N.avwsys_location;
I18N.avwsys_location = ".." + I18N.avwsys_location;
}
var lang = "en";
......
abvw/html/index.html
......@@ -23,6 +23,9 @@
<script src="/abvw/js/dashboard/check-dashboard.js?__UPDATEID__"></script>
<script src="/abvw/common/js/appCommon/check-footer.js?__UPDATEID__"></script>
<script src="/abvw/common/js/appCommon/check-common.js?__UPDATEID__"></script>
<script src="/abvw/common/js/web/common.js?__UPDATEID__"></script>
<script src="/abvw/common/js/web/avweb.js?__UPDATEID__"></script>
<script src="/abvw/common/js/appCommon/app.js?__UPDATEID__" defer></script>
</head>
......@@ -196,7 +199,5 @@
<p id="checkLoadingMessage"></p>
<div id="checkLoadingImage"><img src='${check}images/transferLoading.gif' /></div>
</div>
<script type="text/javascript" src="/abvw/common/js/appCommon/app.js?__UPDATEID__" defer></script>
</body>
</html>
\ No newline at end of file
abvw/html/login.html
......@@ -11,28 +11,28 @@
<title></title>
<link rel="stylesheet" type="text/css" href="./abvw/css/layout/common.css?__UPDATEID__" />
<link rel="stylesheet" type="text/css" href="/abvw/common/css/web/common.css?__UPDATEID__1" />
<!-- <link rel="stylesheet" type="text/css" href="./abvw/common/css/jquery-ui.css?__UPDATEID__" /> -->
<link rel="stylesheet" type="text/css" href="./abvw/common/css/jquery-ui.min.css?__UPDATEID__" />
<link rel="stylesheet" type="text/css" href="./abvw/common/css/jquery-ui.structure.min.css?__UPDATEID__" />
<link rel="stylesheet" type="text/css" href="./abvw/common/css/jquery-ui.theme.min.css?__UPDATEID__" />
<link rel="stylesheet" type="text/css" href="/abvw/common/css/jquery/jquery-ui.min.css?__UPDATEID__1" />
<link rel="stylesheet" type="text/css" href="/abvw/common/css/jquery/jquery-ui.structure.min.css?__UPDATEID__1" />
<link rel="stylesheet" type="text/css" href="/abvw/common/css/jquery/jquery-ui.theme.min.css?__UPDATEID__1" />
<!-- <link rel="stylesheet" type="text/css" href="./abvw/common/css/jquery.toastmessage.css?__UPDATEID__" /> -->
<link rel="stylesheet" type="text/css" href="./abvw/css/layout/login.css?__UPDATEID__" />
<link rel="stylesheet" type="text/css" href="./abvw/css/layout/login_validation.css?__UPDATEID__" />
<link rel="stylesheet" type="text/css" href="/abvw/css/login/login.css?__UPDATEID__1" />
<link rel="stylesheet" type="text/css" href="/abvw/css/login/login_validation.css?__UPDATEID__1" />
<!-- <link rel="stylesheet" type="text/css" href="./abvw/css/layout/limit_access.css?__UPDATEID__" /> -->
<script type="text/javascript" src="./abvw/common/js/jquery-3.6.0.min.js?__UPDATEID__"></script>
<script type="text/javascript" src="./abvw/common/js/jquery-ui.min.js?__UPDATEID__"></script>
<!-- <script type="text/javascript" src="./abvw/common/js/jquery-1.8.1.min.js?__UPDATEID__"></script>
<script type="text/javascript" src="/abvw/common/js/jquery/jquery-3.6.0.min.js?__UPDATEID__1"></script>
<script type="text/javascript" src="/abvw/common/js/jquery/jquery-ui.min.js?__UPDATEID__1"></script>
<!-- <script type="text/javascript" src="./abvw/common/js/jquery-1.8.1.min.js?__UPDATEID__"></script>-->
<!-- <script type="text/javascript" src="./abvw/common/js/jquery-ui-1.8.23.custom.min.js?__UPDATEID__"></script> -->
<!-- <script type="text/javascript" src="./abvw/common/js/jquery.toastmessage.js?__UPDATEID__"></script> -->
<!-- <script type="text/javascript" src="./abvw/common/js/screenLock.js?__UPDATEID__" ></script> -->
<script type="text/javascript" src="./abvw/common/js/thickbox.js?__UPDATEID__"></script>
<script type="text/javascript" src="./abvw/common/js/avweb.js?__UPDATEID__"></script>
<script type="text/javascript" src="./abvw/common/js/i18n.js?__UPDATEID__"></script>
<script type="text/javascript" src="./abvw/common/js/common.js?__UPDATEID__"></script>
<script type="text/javascript" src="/abvw/common/js/web/thickbox.js?__UPDATEID__1"></script>
<script type="text/javascript" src="/abvw/common/js/web/avweb.js?__UPDATEID__1"></script>
<script type="text/javascript" src="/abvw/common/js/web/i18n.js?__UPDATEID__1"></script>
<script type="text/javascript" src="/abvw/common/js/web/common.js?__UPDATEID__1"></script>
<!-- <script type="text/javascript" src="./abvw/js/Limit_Access_Content.js?__UPDATEID__"></script> -->
<script type="text/javascript" src="./abvw/js/login.js?__UPDATEID__"></script>
<script type="text/javascript" src="/abvw/js/login/login.js?__UPDATEID__1"></script>
<!--[if gte IE 9]>
<style type="text/css">
......@@ -52,7 +52,7 @@
<body id="login">
<div id="anonymous">
<img src="./abvw/img/login/logo_login.png" width="200" class="clearboth"/>
<img src="/abvw/img/login/logo_login.png" width="200" class="clearboth"/>
</div>
<div id="normalUser">
......@@ -62,9 +62,9 @@
-->
<div class="wrapper">
<div id="main-ws">
<ul class="floatR" id="menu-language"><li class="language"><a id="language-ja"><img src="./abvw/img/common/flg_jpn.png" width="29" height="20"></a></li><li class="language"><a id="language-en"><img src="./abvw/img/common/flg_usa.png" width="29" height="20"></a></li><li class="language"><a id="language-ko"><img src="./abvw/img/common/flg_kor.png" width="29" height="20"></a></li></ul>
<ul class="floatR" id="menu-language"><li class="language"><a id="language-ja"><img src="/abvw/img/login/flg_jpn.png" width="29" height="20"></a></li><li class="language"><a id="language-en"><img src="/abvw/img/login/flg_usa.png" width="29" height="20"></a></li><li class="language"><a id="language-ko"><img src="/abvw/img/login/flg_kor.png" width="29" height="20"></a></li></ul>
<article>
<img src="./abvw/img/login/logo_login.png" width="200" class="clearboth" id="logologin">
<img src="/abvw/img/login/logo_login.png" width="200" class="clearboth" id="logologin">
<section id="formlogin" style="display:none;">
<table width="440" border="0" cellspacing="0">
<tr>
......
abvw/js/login/login.js
......@@ -197,8 +197,8 @@ LOGIN.processLogin = function() {
if (data.requirePasswordChange == 0) {
ClientData.userInfo_sid(ClientData.userInfo_sid_local());
// ホームへ移動 ################ホーム画面ＵＲＬ入力
AVWEB.avwScreenMove("abvw/dummy.html");
// ホームへ移動
AVWEB.avwScreenMove("index.html");
} else if (data.requirePasswordChange == 1) {
......@@ -226,8 +226,8 @@ LOGIN.processLogin = function() {
if (numDay <= 30) {
ClientData.userInfo_sid(ClientData.userInfo_sid_local());
// ホームへ移動 ################ホーム画面ＵＲＬ入力
AVWEB.avwScreenMove("abvw/dummy.html");
// ホームへ移動
AVWEB.avwScreenMove("index.html");
} else if (numDay > 30) {
LOGIN.OpenChangePasswordDialog();
$('#btnSkip').show();
......@@ -237,8 +237,8 @@ LOGIN.processLogin = function() {
} else { // no need to change password
ClientData.userInfo_sid(ClientData.userInfo_sid_local());
// ホームへ移動 ################ホーム画面ＵＲＬ入力
AVWEB.avwScreenMove("abvw/dummy.html");
// ホームへ移動
AVWEB.avwScreenMove("index.html");
}
} else if (data.requirePasswordChange == 2) {
......@@ -260,8 +260,8 @@ LOGIN.processLogin = function() {
if (numDay <= 30) {
ClientData.userInfo_sid(ClientData.userInfo_sid_local());
// ホームへ移動 ################ホーム画面ＵＲＬ入力
AVWEB.avwScreenMove("abvw/dummy.html");
// ホームへ移動
AVWEB.avwScreenMove("index.html");
} else if (numDay > 30) {
LOGIN.OpenChangePasswordDialog();
......@@ -278,8 +278,8 @@ LOGIN.processLogin = function() {
$("#txtPwdRemind").css('visibility', 'hidden');
} else { // No need to change password
ClientData.userInfo_sid(ClientData.userInfo_sid_local());
// ホームへ移動 ################ホーム画面ＵＲＬ入力
AVWEB.avwScreenMove("abvw/dummy.html");
// ホームへ移動
AVWEB.avwScreenMove("index.html");
}
}
} else {
......@@ -326,8 +326,8 @@ LOGIN.changePasswordProcess = function() {
ClientData.userInfo_sid(ClientData.userInfo_sid_local());
if (ClientData.serviceOpt_abook_check() == 'Y') {
// ホームへ移動 ################ホーム画面ＵＲＬ入力
AVWEB.avwScreenMove("abvw/dummy.html");
// ホームへ移動
AVWEB.avwScreenMove("index.html");
} else {
$('#main-error-message').html(AVWEB.format(I18N.i18nText('msgLoginErrWrong'), 'E001'));
$('#main-error-message').show();
......@@ -400,8 +400,8 @@ LOGIN.skipPassFunction = function() {
ClientData.userInfo_sid(ClientData.userInfo_sid_local());
if (ClientData.serviceOpt_abook_check() == 'Y') {
// ホームへ移動 ################ホーム画面ＵＲＬ入力
AVWEB.avwScreenMove("abvw/dummy.html");
// ホームへ移動
AVWEB.avwScreenMove("index.html");
} else {
$('#main-error-message').html(AVWEB.format(I18N.i18nText('msgLoginErrWrong'), 'E001'));
$('#main-error-message').show();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment