Skip to content

C
check
Commit c5eefe89 by Hayato Kamimura
Options

【規約同意】名前修正

parent 65787c76
Showing with 32 additions and 32 deletions
abweb/common/json/lang/lang-en.json
...@@ -129,7 +129,7 @@ ...@@ -129,7 +129,7 @@
"errorSendMsg": "Send failed.", "errorSendMsg": "Send failed.",
"sitePolicy": "Site Policy", "sitePolicy": "Site Policy",
"agrementToTermsTitle": "Terms of Service", "agreementToTermsTitle": "Terms of Service",
"TermAgree": "Agree", "TermAgree": "Agree",
"TermDisagree": "Disagree", "TermDisagree": "Disagree",
"msgDisagreeTerm": "Log out and then go to the login screen. Are you okay?" "msgDisagreeTerm": "Log out and then go to the login screen. Are you okay?"
......
abweb/common/json/lang/lang-ja.json
...@@ -127,7 +127,7 @@ ...@@ -127,7 +127,7 @@
"errorSendMsg": "送信に失敗しました。", "errorSendMsg": "送信に失敗しました。",
"sitePolicy": "サイトポリシー", "sitePolicy": "サイトポリシー",
"agrementToTermsTitle": "利用規約", "agreementToTermsTitle": "利用規約",
"TermAgree": "同意する", "TermAgree": "同意する",
"TermDisagree": "同意しない", "TermDisagree": "同意しない",
"msgDisagreeTerm": "ログアウトされ、ログイン画面に遷移します。よろしいでしょうか？" "msgDisagreeTerm": "ログアウトされ、ログイン画面に遷移します。よろしいでしょうか？"
......
abweb/common/json/lang/lang-ko.json
...@@ -126,7 +126,7 @@ ...@@ -126,7 +126,7 @@
"errorSendMsg": "전송에 실패했습니다.", "errorSendMsg": "전송에 실패했습니다.",
"sitePolicy": "사이트 정책", "sitePolicy": "사이트 정책",
"agrementToTermsTitle": "이용규약", "agreementToTermsTitle": "이용규약",
"TermAgree": "동의", "TermAgree": "동의",
"TermDisagree": "동의 안함", "TermDisagree": "동의 안함",
"msgDisagreeTerm": "로그 아웃되어 로그인 화면으로 이동합니다. 실행 하시겠습니까?" "msgDisagreeTerm": "로그 아웃되어 로그인 화면으로 이동합니다. 실행 하시겠습니까?"
......
abweb/html/agrementToTerms.html → abweb/html/agreementToTerms.html
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
<link rel="stylesheet" type="text/css" href="../common/css/loading.css"> <link rel="stylesheet" type="text/css" href="../common/css/loading.css">
<link rel="stylesheet" type="text/css" href="../common/css/header.css"> <link rel="stylesheet" type="text/css" href="../common/css/header.css">
<link rel="stylesheet" type="text/css" href="../common/css/style.css"> <link rel="stylesheet" type="text/css" href="../common/css/style.css">
<link rel="stylesheet" type="text/css" href="../css/agrementToTerms/agrementToTerms.css"> <link rel="stylesheet" type="text/css" href="../css/agreementToTerms/agreementToTerms.css">
<!-- vender css --> <!-- vender css -->
<link rel="stylesheet" type="text/css" href="../common/css/fontawesome_relative_path.css"> <link rel="stylesheet" type="text/css" href="../common/css/fontawesome_relative_path.css">
...@@ -33,11 +33,11 @@ ...@@ -33,11 +33,11 @@
<script type="text/javascript" src="../common/js/common.js?__UPDATEID__"></script> <script type="text/javascript" src="../common/js/common.js?__UPDATEID__"></script>
<script type="text/javascript" src="../common/js/header.js"></script> <script type="text/javascript" src="../common/js/header.js"></script>
<script type="text/javascript" src="../js/login/login.js?__UPDATEID__"></script> <script type="text/javascript" src="../js/login/login.js?__UPDATEID__"></script>
<script type="text/javascript" src="../js/agrementToTerms/agrementToTerms.js"></script> <script type="text/javascript" src="../js/agreementToTerms/agreementToTerms.js"></script>
<script type="text/javascript"> <script type="text/javascript">
$(document).ready(function(){ $(document).ready(function(){
agrementToTerms.initAgrement(); agreementToTerms.initagreement();
}) })
</script> </script>
</head> </head>
...@@ -53,8 +53,8 @@ ...@@ -53,8 +53,8 @@
<p id="agreement"></p> <p id="agreement"></p>
</div> </div>
<div class="btn-wrapper"> <div class="btn-wrapper">
<button class="btn btn-agree" id="agreeTerm" onclick="agrementToTerms.sendAgreeTerms()">同意する</a> <button class="btn btn-agree" id="agreeTerm" onclick="agreementToTerms.sendAgreeTerms()">同意する</a>
<button class="btn btn-disagree" id="disagreeTerm" onclick="agrementToTerms.disagreeTerm()">同意しない</a> <button class="btn btn-disagree" id="disagreeTerm" onclick="agreementToTerms.disagreeTerm()">同意しない</a>
</div> </div>
</div> </div>
......
abweb/html/index.html
...@@ -31,13 +31,13 @@ ...@@ -31,13 +31,13 @@
<script src="../js/dashboard/dashboard.js?__UPDATEID__"></script> <script src="../js/dashboard/dashboard.js?__UPDATEID__"></script>
<script src="../js/topPage/topPage.js?__UPDATEID__"></script> <script src="../js/topPage/topPage.js?__UPDATEID__"></script>
<script src="../js/reportForm/reportForm.js?__UPDATEID__"></script> <script src="../js/reportForm/reportForm.js?__UPDATEID__"></script>
<script src="../js/agrementToTerms/agrementToTerms.js"></script> <script src="../js/agreementToTerms/agreementToTerms.js"></script>
<script type="text/javascript"> <script type="text/javascript">
$(document).ready(function(){ $(document).ready(function(){
if(window.performance){ if(window.performance){
if(window.performance.navigation.type === 1){ if(window.performance.navigation.type === 1){
agrementToTerms.destinationHtml(); agreementToTerms.destinationHtml();
} }
} }
}) })
......
abweb/html/login.html
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
<script type="text/javascript" src="../common/js/validation.js?__UPDATEID__"></script> <script type="text/javascript" src="../common/js/validation.js?__UPDATEID__"></script>
<script type="text/javascript" src="../js/login/login.js?__UPDATEID__"></script> <script type="text/javascript" src="../js/login/login.js?__UPDATEID__"></script>
<script type="text/javascript" src="../js/agrementToTerms/agrementToTerms.js"></script> <script type="text/javascript" src="../js/agreementToTerms/agreementToTerms.js"></script>
<script type="text/javascript"> <script type="text/javascript">
......
abweb/js/agrementToTerms/agrementToTerms.js → abweb/js/agreementToTerms/agreementToTerms.js
//サービスオプション「規約同意」 //サービスオプション「規約同意」
var agrementToTerms = {}; var agreementToTerms = {};
agrementToTerms.baseApiUrl = COMMON.format(ClientData.conf_apiUrl(), ClientData.userInfo_accountPath()); agreementToTerms.baseApiUrl = COMMON.format(ClientData.conf_apiUrl(), ClientData.userInfo_accountPath());
//言語、規約情報読み込み //言語、規約情報読み込み
agrementToTerms.initAgrement = function(){ agreementToTerms.initagreement = function(){
var data = agrementToTerms.requireTerms(); var data = agreementToTerms.requireTerms();
$("#termsTitle").text(I18N.i18nText("agrementToTermsTitle")); $("#termsTitle").text(I18N.i18nText("agreementToTermsTitle"));
$("#agreeTerm").text(I18N.i18nText("TermAgree")); $("#agreeTerm").text(I18N.i18nText("TermAgree"));
$("#disagreeTerm").text(I18N.i18nText("TermDisagree")); $("#disagreeTerm").text(I18N.i18nText("TermDisagree"));
$("#termsVersion").text(data.termsVersion); $("#termsVersion").text(data.termsVersion);
...@@ -13,13 +13,13 @@ agrementToTerms.initAgrement = function(){ ...@@ -13,13 +13,13 @@ agrementToTerms.initAgrement = function(){
} }
//遷移先の決定 //遷移先の決定
agrementToTerms.destinationHtml = function(){ agreementToTerms.destinationHtml = function(){
var data = agrementToTerms.requireTerms(); var data = agreementToTerms.requireTerms();
if(data.httpStatus == CONSTANT.HTTP_STATUS.OK){ if(data.httpStatus == CONSTANT.HTTP_STATUS.OK){
//公開中バージョンに未同意の場合 //公開中バージョンに未同意の場合
if(data.termsVersion || data.agreement){ if(data.termsVersion || data.agreement){
//利用規約画面に遷移 //利用規約画面に遷移
COMMON.avwScreenMove("agrementToTerms.html"); COMMON.avwScreenMove("agreementToTerms.html");
}else{ }else{
//規約同意が設定されていない or 公開中バージョンに同意している //規約同意が設定されていない or 公開中バージョンに同意している
//ホーム画面に遷移 //ホーム画面に遷移
...@@ -32,13 +32,13 @@ agrementToTerms.destinationHtml = function(){ ...@@ -32,13 +32,13 @@ agrementToTerms.destinationHtml = function(){
} }
//利用規約情報の取得 //利用規約情報の取得
agrementToTerms.requireTerms = function(){ agreementToTerms.requireTerms = function(){
var apiData = {}; var apiData = {};
var params = { var params = {
sid: COMMON.getSid(), sid: COMMON.getSid(),
}; };
const url = agrementToTerms.baseApiUrl + "/requireTerms/"; const url = agreementToTerms.baseApiUrl + "/requireTerms/";
COMMON.cmsAjax( COMMON.cmsAjax(
url, url,
params, params,
...@@ -58,13 +58,13 @@ agrementToTerms.requireTerms = function(){ ...@@ -58,13 +58,13 @@ agrementToTerms.requireTerms = function(){
}; };
//利用規約情報同意の送信 //利用規約情報同意の送信
agrementToTerms.sendAgreeTerms = function(){ agreementToTerms.sendAgreeTerms = function(){
var apiData = agrementToTerms.requireTerms(); var apiData = agreementToTerms.requireTerms();
params = { params = {
sid: COMMON.getSid(), sid: COMMON.getSid(),
termsVersion: apiData.termsVersion, termsVersion: apiData.termsVersion,
}; };
const url = agrementToTerms.baseApiUrl + "/agreeTerms/"; const url = agreementToTerms.baseApiUrl + "/agreeTerms/";
COMMON.cmsAjax( COMMON.cmsAjax(
url, url,
params, params,
...@@ -84,7 +84,7 @@ agrementToTerms.sendAgreeTerms = function(){ ...@@ -84,7 +84,7 @@ agrementToTerms.sendAgreeTerms = function(){
} }
//利用規約に同意しない //利用規約に同意しない
agrementToTerms.disagreeTerm = function(){ agreementToTerms.disagreeTerm = function(){
if(confirm(I18N.i18nText("msgDisagreeTerm"))){ if(confirm(I18N.i18nText("msgDisagreeTerm"))){
//ログアウトし、ログイン画面に遷移する //ログアウトし、ログイン画面に遷移する
HEADER.processLogout(); HEADER.processLogout();
......
abweb/js/login/login.js
...@@ -219,7 +219,7 @@ LOGIN.processLogin = function () { ...@@ -219,7 +219,7 @@ LOGIN.processLogin = function () {
ClientData.userInfo_sid(ClientData.userInfo_sid_local()); ClientData.userInfo_sid(ClientData.userInfo_sid_local());
//利用規約に同意しているかの確認 //利用規約に同意しているかの確認
agrementToTerms.destinationHtml(); agreementToTerms.destinationHtml();
} else if (data.requirePasswordChange == 1) { } else if (data.requirePasswordChange == 1) {
$('#getToken').val(data.token); $('#getToken').val(data.token);
if (LOGIN.force_pw_change_on_login == 2) { if (LOGIN.force_pw_change_on_login == 2) {
...@@ -248,7 +248,7 @@ LOGIN.processLogin = function () { ...@@ -248,7 +248,7 @@ LOGIN.processLogin = function () {
if (numDay <= 30) { if (numDay <= 30) {
ClientData.userInfo_sid(ClientData.userInfo_sid_local()); ClientData.userInfo_sid(ClientData.userInfo_sid_local());
//利用規約に同意しているかの確認 //利用規約に同意しているかの確認
agrementToTerms.destinationHtml(); agreementToTerms.destinationHtml();
} else if (numDay > 30) { } else if (numDay > 30) {
LOGIN.OpenChangePasswordDialog(); LOGIN.OpenChangePasswordDialog();
$('#btnSkip').show(); $('#btnSkip').show();
...@@ -260,7 +260,7 @@ LOGIN.processLogin = function () { ...@@ -260,7 +260,7 @@ LOGIN.processLogin = function () {
ClientData.userInfo_sid(ClientData.userInfo_sid_local()); ClientData.userInfo_sid(ClientData.userInfo_sid_local());
//利用規約に同意しているかの確認 //利用規約に同意しているかの確認
agrementToTerms.destinationHtml(); agreementToTerms.destinationHtml();
} }
} else if (data.requirePasswordChange == 2) { } else if (data.requirePasswordChange == 2) {
$('#getToken').val(data.token); $('#getToken').val(data.token);
...@@ -283,7 +283,7 @@ LOGIN.processLogin = function () { ...@@ -283,7 +283,7 @@ LOGIN.processLogin = function () {
ClientData.userInfo_sid(ClientData.userInfo_sid_local()); ClientData.userInfo_sid(ClientData.userInfo_sid_local());
//利用規約画面に遷移 //利用規約画面に遷移
agrementToTerms.destinationHtml(); agreementToTerms.destinationHtml();
} else if (numDay > 30) { } else if (numDay > 30) {
LOGIN.OpenChangePasswordDialog(); LOGIN.OpenChangePasswordDialog();
$('.ui-dialog-titlebar').hide(); $('.ui-dialog-titlebar').hide();
...@@ -302,7 +302,7 @@ LOGIN.processLogin = function () { ...@@ -302,7 +302,7 @@ LOGIN.processLogin = function () {
// No need to change password // No need to change password
ClientData.userInfo_sid(ClientData.userInfo_sid_local()); ClientData.userInfo_sid(ClientData.userInfo_sid_local());
//利用規約に同意しているかの確認 //利用規約に同意しているかの確認
agrementToTerms.destinationHtml(); agreementToTerms.destinationHtml();
} }
} }
} else { } else {
...@@ -360,7 +360,7 @@ LOGIN.changePasswordProcess = function () { ...@@ -360,7 +360,7 @@ LOGIN.changePasswordProcess = function () {
ClientData.userInfo_sid(ClientData.userInfo_sid_local()); ClientData.userInfo_sid(ClientData.userInfo_sid_local());
//利用規約に同意しているかの確認 //利用規約に同意しているかの確認
agrementToTerms.destinationHtml(); agreementToTerms.destinationHtml();
} 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') {
...@@ -417,7 +417,7 @@ LOGIN.skipPassFunction = function () { ...@@ -417,7 +417,7 @@ LOGIN.skipPassFunction = function () {
ClientData.userInfo_sid(ClientData.userInfo_sid_local()); ClientData.userInfo_sid(ClientData.userInfo_sid_local());
//利用規約に同意しているかの確認 //利用規約に同意しているかの確認
agrementToTerms.destinationHtml(); agreementToTerms.destinationHtml();
}; };
// Open Change Password Dialog // Open Change Password Dialog
......
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