Commit 19d07c2e by Takumi Imai

Merge branch 'feature/1.0_check_web_dev' into 'feature/1.0_check_web'

Feature/1.0 check web dev

See merge request !110
parents 47357646 971a5a7d
...@@ -6169,6 +6169,17 @@ body { ...@@ -6169,6 +6169,17 @@ body {
text-align: left; text-align: left;
background-color: #ffffff; background-color: #ffffff;
} }
::-webkit-scrollbar {
width: 8px;
height: 8px;
}
::-webkit-scrollbar-thumb{
background: #c5c5c563;
border-radius: 2px;
}
::-webkit-scrollbar-thumb:hover{
background: #c5c5c5;
}
[tabindex="-1"]:focus:not(:focus-visible) { [tabindex="-1"]:focus:not(:focus-visible) {
outline: 0!important outline: 0!important
...@@ -20385,13 +20396,8 @@ button { ...@@ -20385,13 +20396,8 @@ button {
} }
.breadcrumb .breadcrumb-item { .breadcrumb .breadcrumb-item {
font-size: 1rem font-size: 1rem;
} display: flex;
@media (max-width: 767.98px) {
.breadcrumb-item+.breadcrumb-item {
padding-right:1rem
}
} }
.has-search .form-control { .has-search .form-control {
......
...@@ -458,24 +458,6 @@ var ClientData = { ...@@ -458,24 +458,6 @@ var ClientData = {
} }
}, },
// Session :Business Option (serviceOpt)_ABookCheck:Char(Y:Enable, N:Disable)
serviceOpt_abook_check: function (data) {
if (arguments.length > 0) {
SessionStorageUtils.set(CONSTANT.KEYS.serviceOpt_abook_check, data);
} else {
return SessionStorageUtils.get(CONSTANT.KEYS.serviceOpt_abook_check);
}
},
// Session : Tenant Service_Option(serviceOpt)_ChatFunction:Char(Y:Use, N:Unused)
serviceOpt_chat_function: function (data) {
if (arguments.length > 0) {
SessionStorageUtils.set(CONSTANT.KEYS.serviceOpt_abook_check, data);
} else {
return SessionStorageUtils.get(CONSTANT.KEYS.serviceOpt_abook_check);
}
},
// Session :Business Option(serviceOpt)_Forced password change at first login:Integer(0:None, 1:Prompt, 2:Forced) // Session :Business Option(serviceOpt)_Forced password change at first login:Integer(0:None, 1:Prompt, 2:Forced)
serviceOpt_force_pw_change_on_login: function (data) { serviceOpt_force_pw_change_on_login: function (data) {
if (arguments.length > 0) { if (arguments.length > 0) {
......
...@@ -358,13 +358,8 @@ LOGIN.changePasswordProcess = function () { ...@@ -358,13 +358,8 @@ LOGIN.changePasswordProcess = function () {
$('#dialog-error-message').css('display', 'none'); $('#dialog-error-message').css('display', 'none');
ClientData.userInfo_sid(ClientData.userInfo_sid_local()); ClientData.userInfo_sid(ClientData.userInfo_sid_local());
if (ClientData.serviceOpt_abook_check() == 'Y') {
// move to home.html page // move to home.html page
COMMON.avwScreenMove('index.html'); COMMON.avwScreenMove('index.html');
} else {
$('#dialog-error-message').html(I18N.i18nText('msgPwdChangeNG'));
$('#dialog-error-message').show();
}
} else if (result.httpStatus == '401') { } else if (result.httpStatus == '401') {
COMMON.goUrlWithCurrentParams(CONSTANT.PAGE_NAME.LOGIN); COMMON.goUrlWithCurrentParams(CONSTANT.PAGE_NAME.LOGIN);
} else if (result.httpStatus == '403') { } else if (result.httpStatus == '403') {
...@@ -420,13 +415,8 @@ LOGIN.skipPassFunction = function () { ...@@ -420,13 +415,8 @@ LOGIN.skipPassFunction = function () {
ClientData.userInfo_pwdSkipDt(date); ClientData.userInfo_pwdSkipDt(date);
ClientData.userInfo_sid(ClientData.userInfo_sid_local()); ClientData.userInfo_sid(ClientData.userInfo_sid_local());
if (ClientData.serviceOpt_abook_check() == 'Y') {
// move to home.html page // move to home.html page
COMMON.avwScreenMove('index.html'); COMMON.avwScreenMove('index.html');
} else {
$('#main-error-message').html(COMMON.format(I18N.i18nText('msgLoginErrWrong'), 'E001'));
$('#main-error-message').show();
}
}; };
// Open Change Password Dialog // Open Change Password Dialog
...@@ -451,10 +441,6 @@ LOGIN.saveServiceUserOption = function () { ...@@ -451,10 +441,6 @@ LOGIN.saveServiceUserOption = function () {
ClientData.serviceOpt_force_pw_change_on_login(option.value); ClientData.serviceOpt_force_pw_change_on_login(option.value);
} else if (option.serviceOptionId == 49) { } else if (option.serviceOptionId == 49) {
ClientData.serviceOpt_usable_push_message(option.value); ClientData.serviceOpt_usable_push_message(option.value);
} else if (option.serviceOptionId == 161) {
ClientData.serviceOpt_abook_check(option.value);
} else if (option.serviceOptionId == 183) {
ClientData.serviceOpt_chat_function(option.value);
} }
}); });
}; };
......
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