Skip to content

C
check
Commit 3debc584 by Masaru Abe
Options

HTMLカスタムログ対応

parent 178f9281
Showing with 614 additions and 386 deletions
abvw/common/js/common.js
......@@ -430,6 +430,8 @@ function LogEntity() {
this.pageLogArray = [];
// 詳細ログ配列
this.objectLogArray = [];
// カスタムログ配列
this.customLogArray = [];
};
// Entity for PageLog
function PageLogEntity() {
......@@ -455,6 +457,16 @@ function ObjectLogEntity() {
this.locationHeight = "";
this.locationWidth = "";
};
//Entity for CustomLog
function CustomLogEntity() {
this.contentid = "";
this.actionDate = new Date();
this.param1 = "";
this.param2 = "";
this.param3 = "";
this.param4 = "";
this.param5 = "";
};
/*
* Extract memo data from result of API and merge with local memo
......@@ -2479,6 +2491,26 @@ COMMON.SetObjectLogActionTime = function(strContentId, objectId, actionTime) {
};
//カスタムログを作成
COMMON.SetCustomLog = function(strContentId, customLog) {
// オーサリングプレビューなら無視
if (COMMON.isAuthoringPreview()) {
return;
}
var arrContentLogs = ClientData.ContentLogData();
for ( var nIndex = 0; nIndex < arrContentLogs.length; nIndex++) {
if (arrContentLogs[nIndex].contentid == strContentId) {
// ObjectLog追加
arrContentLogs[nIndex].customLogArray.push(customLog);
}
}
ClientData.ContentLogData(arrContentLogs);
};
/*
* Register reading log of content to server by calling api
*/
......@@ -2499,6 +2531,7 @@ COMMON.RegisterLog = function(is) {
// ページログJSONデータの作成
var pageLogJson = "";
var objectLogJson = "";
var customLogJson = "";
// biz/adモードで詳細ログY か getitsでgetits詳細ログY の場合
if ((ClientData.isGetitsMode() == false && ClientData.serviceOpt_usable_readinglog_object() == 'Y')
......@@ -2608,6 +2641,67 @@ COMMON.RegisterLog = function(is) {
}
//カスタムログが有効な場合
if(ClientData.serviceOpt_html_custom_log() == 'Y'){
var customLogArray = arrContentLogs[nIndex].customLogArray;
// カスタムログオプションが有効ならログデータ作成
if (customLogArray != null && customLogArray.length > 0) {
var lines = [];
var actionDate;
// JSONデータ作成
for ( var nIndex2 = 0; nIndex2 < customLogArray.length; nIndex2++) {
actionDate = new Date(customLogArray[nIndex2].actionDate);
var line = [];
line.push(actionDate.jpDateTimeString1());
if (customLogArray[nIndex2].param1 != null) {
line.push(customLogArray[nIndex2].param1);
} else {
line.push("");
}
if (customLogArray[nIndex2].param2 != null) {
line.push(customLogArray[nIndex2].param2);
} else {
line.push("");
}
if (customLogArray[nIndex2].param3 != null) {
line.push(customLogArray[nIndex2].param3);
} else {
line.push("");
}
if (customLogArray[nIndex2].param4 != null) {
line.push(customLogArray[nIndex2].param4);
} else {
line.push("");
}
if (customLogArray[nIndex2].param5 != null) {
line.push(customLogArray[nIndex2].param5);
} else {
line.push("");
}
lines.push(line);
}
if (lines.length > 0) {
customLogJson = "{ header:[\"actionDate\",\"param1\",\"param2\",\"param3\",\"param4\",\"param5\"],";
customLogJson = customLogJson + "lines:";
customLogJson = customLogJson + JSON.stringify(lines);
customLogJson = customLogJson + "}";
}
}
}
var params = {
sid : ClientData.userInfo_sid(),
contentId : arrContentLogs[nIndex].contentid,
......@@ -2619,6 +2713,7 @@ COMMON.RegisterLog = function(is) {
longitude : arrContentLogs[nIndex].longitude,
pageLog : pageLogJson,
objectLog : objectLogJson,
customLog : customLogJson,
isStreaming : ClientData.isStreamingMode()
};
// API送信結果判定
......
abvw/contentview_openuri.html 0 → 100644
<!DOCTYPE html>
<html>
<head>
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
<meta http-equiv="Pragma" content="no-cache">
<meta http-equiv="Cache-Control" content="no-store">
<meta http-equiv="Cache-Control" content="no-cache">
<meta http-equiv="Expires" content="-1">
<meta name="viewport" content="">
<title></title>
<link rel="stylesheet" type="text/css" href="common/css/default.css?__UPDATEID__" />
<link rel="stylesheet" type="text/css" href="common/css/jquery-ui.css?__UPDATEID__" />
<link rel="stylesheet" type="text/css" href="common/css/jquery.toastmessage.css?__UPDATEID__" />
<link rel="stylesheet" type="text/css" href="common/css/default.css?__UPDATEID__" />
<link rel="stylesheet" type="text/css" href="common/css/screenLock.css?__UPDATEID__" />
<link rel="stylesheet" type="text/css" href="css/reset.css?__UPDATEID__" />
<!-- CSSビュー -->
<link rel="stylesheet" type="text/css" href="common/css/jquery.powertip.css?__UPDATEID__" />
<link rel="stylesheet" type="text/css" href="css/layout/viewer.css?__UPDATEID__" />
<link rel="stylesheet" type="text/css" href="css/layout/Anket.css?__UPDATEID__" />
<link rel="stylesheet" type="text/css" href="css/delete_shiori.css?__UPDATEID__" />
<script type="text/javascript" src="./common/js/jquery-1.8.1.min.js?__UPDATEID__"></script>
<script type="text/javascript" src="./common/js/jquery-ui-1.8.23.custom.min.js?__UPDATEID__"></script>
<script type="text/javascript" src="./common/js/jquery.ui.touch-punch.min.js?__UPDATEID__"></script>
<script type="text/javascript" src="./common/js/jquery.toastmessage.js?__UPDATEID__"></script>
<script type="text/javascript" src="./common/js/jquery.cookie.js?__UPDATEID__" ></script>
<script type="text/javascript" src="./common/js/jquery.treeview.js?__UPDATEID__" ></script>
<script type="text/javascript" src="./common/js/jquery.treeview.edit.js?__UPDATEID__" ></script>
<script type="text/javascript" src="./common/js/screenLock.js?__UPDATEID__"></script>
<script type="text/javascript" src="./common/js/avweb.js?__UPDATEID__"></script>
<script type="text/javascript" src="./common/js/i18n.js?__UPDATEID__"></script>
<script type="text/javascript" src="./common/js/common.js?__UPDATEID__"></script>
<script type="text/javascript" src="./common/js/uuid.js?__UPDATEID__"></script>
<script type="text/javascript" src="./js/contentview_OpenUri.js?__UPDATEID__"></script>
<style>
html{
-ms-touch-action : none;
}
</style>
<script type="text/javascript">
$(document).ready(function() {
CONTENTVIEW_OPENURI.ready();
});
</script>
</head>
<body id="contentview_openuri" oncontextmenu="return false;">
<div id="ws-body" class="wrapper_ws" >
<div id="main-ws">
</div>
</div>
<div id="viewer" style="display:none;" >
</div>
<iframe style="height:0px;width:0px;visibility:hidden" src="about:blank">
this frame prevents back forward cache
</iframe>
</body>
</html>
\ No newline at end of file
abvw/js/contentpreview.js
......@@ -11,9 +11,10 @@ CONTENTPREVIEW.ready = function(){
var sid = COMMON.getUrlParam('sid','');
var contentId = COMMON.getUrlParam('contentId','');
var urlPath = COMMON.getUrlParam('urlpath','');
ClientData.userInfo_sid(sid);
ClientData.userInfo_sid_local(sid);
ClientData.userInfo_accountPath(COMMON.getUrlParam('urlpath',''));
ClientData.userInfo_accountPath(urlPath);
ClientData.contentInfo_contentId(contentId);
ClientData.conf_apiUrl( sysSettings.apiUrl );
......
abvw/js/contentview.js
......@@ -2116,12 +2116,11 @@ CONTENTVIEW.displayOverlayForSpecifyContentType = function( resourceUrl ){
}
else if(CONTENTVIEW_GENERAL.contentType == COMMON.ContentTypeKeys.Type_Html){
//DHカスタム
var linkUrlTmp = resourceUrl;
//DHカスタム
if( ClientData.serviceOpt_daihatsu() == 'Y'){
//HTMLカスタムログオプション有り
if(ClientData.serviceOpt_html_custom_log() == 'Y'){
var apiUrl = AVWEB.getApiUrl(ClientData.userInfo_accountPath());
linkUrlTmp = linkUrlTmp + "?sid=" + CONTENTVIEW.getSessionId() + "&apiurl=" + apiUrl ;
linkUrlTmp = linkUrlTmp + "?sid=" + CONTENTVIEW.getSessionId() + "&apiurl=" + apiUrl + "&cid=" + CONTENTVIEW_GENERAL.contentID;
}
CONTENTVIEW.handleForContentTypeHTML(linkUrlTmp);
}
......@@ -5753,6 +5752,7 @@ CONTENTVIEW.ready = function(initContentId){
getType: 1,
isStreaming: ClientData.isStreamingMode()
};
AVWEB.avwCmsApi(ClientData.userInfo_accountPath(),
"webGetContent",
"GET",
......@@ -5941,4 +5941,51 @@ CONTENTVIEW.getSessionId = function(){
};
CONTENTVIEW.resvCustomLog = function(param1,param2,param3,param4,param5){
console.log("resvCustomLog:" + param1 + "-" + param2);
//カスタムログ作成
var customLog = new CustomLogEntity();
customLog.contentid = CONTENTVIEW_GENERAL.contentID;
if(param1 == null){
customLog.param1 = "";
} else {
customLog.param1 = param1;
}
if(param2 == null){
customLog.param2 = "";
} else {
customLog.param2 = param2;
}
if(param3 == null){
customLog.param3 = "";
} else {
customLog.param3 = param3;
}
if(param4 == null){
customLog.param4 = "";
} else {
customLog.param4 = param4;
}
if(param5 == null){
customLog.param5 = "";
} else {
customLog.param5 = param5;
}
COMMON.SetCustomLog(CONTENTVIEW_GENERAL.contentID, customLog);
};
window.addEventListener("message", receiveSize, false);
function receiveSize(e) {
//if (e.origin === "http://hogehoge.com") // for security: set this to the domain of the iframe - use e.uri if you need more specificity
// document.getElementById("bar").style.height = e.data + "px";
console.log("receiveSize:" + e.data);
};
abvw/js/contentview_CreateObjects.js
......@@ -1788,12 +1788,16 @@ CONTENTVIEW_CREATEOBJECT.linkURL = function (mediaType, actionType, id, imageUrl
//---
var linkUrlTmp = linkUrl;
//DHカスタム
if( ClientData.serviceOpt_daihatsu() == 'Y'){
//HTMLカスタムログオプション有り
if(ClientData.serviceOpt_html_custom_log() == 'Y'){
var apiUrl = AVWEB.getApiUrl(ClientData.userInfo_accountPath());
linkUrlTmp = linkUrlTmp + "?sid=" + CONTENTVIEW.getSessionId() + "&apiurl=" + apiUrl ;
linkUrlTmp = linkUrlTmp + "?sid=" + CONTENTVIEW.getSessionId() + "&apiurl=" + apiUrl + "&cid=" + CONTENTVIEW_GENERAL.contentID;
}
//モバイル＆getitsなら強制的にWindowOpen
if (CONTENTVIEW_GENERAL.avwUserEnvObj.isMobile() && ClientData.isGetitsMode() ) {
browserType = 1;
}
if( browserType == 0 ){
CONTENTVIEW_CREATEOBJECT.showHtml(linkUrlTmp, objectId );
CONTENTVIEW_GENERAL.showDialog(true);
......
abvw/js/contentview_GetData.js
......@@ -324,10 +324,10 @@ CONTENTVIEW_GETDATA.getMediaType1 = function(iValueObj) {
if(tempData.resourceId == resourceId){
resourceUrl = tempData.resourceUrl;
//DHカスタム
if( ClientData.serviceOpt_daihatsu() == 'Y'){
//HTMLカスタムログオプション有り
if(ClientData.serviceOpt_html_custom_log() == 'Y'){
var apiUrl = AVWEB.getApiUrl(ClientData.userInfo_accountPath());
resourceUrl = resourceUrl + "?sid=" + CONTENTVIEW.getSessionId() + "&apiurl=" + apiUrl ;
resourceUrl = resourceUrl + "?sid=" + CONTENTVIEW.getSessionId() + "&apiurl=" + apiUrl + "&cid=" + CONTENTVIEW_GENERAL.contentID;
}
break;
}
......@@ -766,10 +766,10 @@ CONTENTVIEW_GETDATA.getMediaType9 = function(iValueObj) {
if(tempData.resourceId == resourceId){
resourceUrl = tempData.resourceUrl;
//DHカスタム
if( ClientData.serviceOpt_daihatsu() == 'Y'){
//HTMLカスタムログオプション有り
if(ClientData.serviceOpt_html_custom_log() == 'Y'){
var apiUrl = AVWEB.getApiUrl(ClientData.userInfo_accountPath());
resourceUrl = resourceUrl + "?sid=" + CONTENTVIEW.getSessionId() + "&apiurl=" + apiUrl ;
resourceUrl = resourceUrl + "?sid=" + CONTENTVIEW.getSessionId() + "&apiurl=" + apiUrl + "&cid=" + CONTENTVIEW_GENERAL.contentID;
}
break;
}
......
abvw/js/contentview_OpenUri.js 0 → 100644
//名前空間用のオブジェクトを用意する
var CONTENTVIEW_OPENURI = {};
CONTENTVIEW_OPENURI.ready = function(){
//ビューア、共有表示パーツ読み込み
$("#viewer").load("./inc_contentview.html?__UPDATEID__", function (myData, myStatus, xhr){
//読み込み完了時の処理
I18N.i18nReplaceText();
});
setTimeout(function(){
CONTENTVIEW_OPENURI.showContentView();
}, 200);
};
CONTENTVIEW_OPENURI.showContentView = function(){
$("#ws-body").hide();
//$("#topcontrol").hide();
CONTENTVIEW_INITOBJECT.clearViewerComponent();
CONTENTVIEW.cssInit();
$("#viewer").show();
CONTENTVIEW.ready();
};
$("document").ready(function () {
//CONTENTVIEW_OPENURI.ready();
});
abvw/js/login.js
//グローバルの名前空間用のオブジェクトを用意する
var LOGIN = {};
//var requirePasswordChange;
// var requirePasswordChange;
LOGIN.userinfo_sid;
LOGIN.userInfo_userName;
LOGIN.optionList = [];
......@@ -18,7 +17,7 @@ LOGIN.avwUserEnvObj = new UserEnvironment();
LOGIN.timeWaitSplashScreen = 2000;// wait splash screen 2 second
//Load login Info
// Load login Info
LOGIN.loadLoginInfo = function() {
$('#chkRemember').attr('checked', 'checked');
if (ClientData.userInfo_accountPath() != null) {
......@@ -30,14 +29,14 @@ LOGIN.loadLoginInfo = function() {
}
};
//Initial Screen
// Initial Screen
LOGIN.initialScreen = function() {
if (ClientData.userInfo_rememberLogin()) {
LOGIN.loadLoginInfo();
}
};
//check Save Login Info
// check Save Login Info
LOGIN.saveLoginInfo = function() {
var lang = I18N.getCurrentLanguage();
......@@ -60,32 +59,29 @@ LOGIN.saveLoginInfo = function() {
ClientData.userInfo_loginId_session(loginId);
ClientData.userInfo_userName(LOGIN.userInfo_userName);
if(chkRemember == 'checked')
{
if (chkRemember == 'checked') {
ClientData.userInfo_rememberLogin(true);
}
else
{
} else {
ClientData.userInfo_rememberLogin(false);
}
ClientData.userInfo_lastLoginTime(date.jpDateTimeString());
ClientData.userInfo_sid_local(LOGIN.userinfo_sid);
//バックアップにも保持
// バックアップにも保持
ClientData.userInfo_sid_local_bak(LOGIN.userinfo_sid);
LOGIN.saveServiceUserOption();
//ページジャンプ設定をクリア
// ページジャンプ設定をクリア
ClientData.JumpQueue([]);
ClientData.IsJumpBack(false);
};
//Check validation
// Check validation
LOGIN.checkValidation = function() {
//暗号化モードならチェック無し
if(ClientData.serviceOpt_encryption() == 'Y') {
// 暗号化モードならチェック無し
if (ClientData.serviceOpt_encryption() == 'Y') {
return true;
}
......@@ -99,27 +95,24 @@ LOGIN.checkValidation = function() {
msgError.attr('lang', 'msgLoginEmpty');
msgError.show();
return false;
}
else if (!ValidationUtil.CheckRequiredForText(loginId)) {
} else if (!ValidationUtil.CheckRequiredForText(loginId)) {
LOGIN.login_errorMessage = "";
msgError.html(I18N.i18nText('msgLoginEmpty'));
msgError.attr('lang', 'msgLoginEmpty');
msgError.show();
return false;
}
else if (!ValidationUtil.CheckRequiredForText(password)) {
} else if (!ValidationUtil.CheckRequiredForText(password)) {
LOGIN.login_errorMessage = "";
msgError.html(I18N.i18nText('msgLoginEmpty'));
msgError.attr('lang', 'msgLoginEmpty');
msgError.show();
return false;
}
else {
} else {
return true;
}
};
//Check Dialog validation
// Check Dialog validation
LOGIN.checkDialogValidation = function() {
var currentPass = $('#txtCurrentPass').val();
var newPass = $('#txtNewPass').val();
......@@ -132,30 +125,26 @@ LOGIN.checkDialogValidation = function() {
msgError.attr('lang', 'msgPwdEmpty');
msgError.show();
return false;
}
else if (!ValidationUtil.CheckRequiredForText(newPass)) {
} else if (!ValidationUtil.CheckRequiredForText(newPass)) {
LOGIN.login_errorMessage = "";
msgError.html(I18N.i18nText('msgPwdEmpty'));
msgError.attr('lang', 'msgPwdEmpty');
msgError.show();
return false;
}
else
{
if(newPass != confirmPass){
} else {
if (newPass != confirmPass) {
LOGIN.login_errorMessage = "";
msgError.html(I18N.i18nText('msgPwdNotMatch'));
msgError.attr('lang', 'msgPwdNotMatch');
msgError.show();
return false;
}
else{
} else {
return true;
}
}
};
//Login Process
// Login Process
LOGIN.processLogin = function() {
var accountPath = "";
var loginId = "";
......@@ -170,21 +159,21 @@ LOGIN.processLogin = function() {
var skipPwdDate;
var params = {
previousSid: '',
loginId: loginId,
password: password,
urlpath: accountPath
previousSid : '',
loginId : loginId,
password : password,
urlpath : accountPath
};
//引数パラメータがあれば取得
// 引数パラメータがあれば取得
var paramContentID = COMMON.getUrlParam('cid', '');
// Set sid for login, this will be checked authoring 2 sessions
if (ClientData.userInfo_sid_local()) {
params.previousSid = ClientData.userInfo_sid_local();
} else {
//OpenUrlでコンテンツ開く場合
if( paramContentID != '' ){
// OpenUrlでコンテンツ開く場合
if (paramContentID != '') {
if (ClientData.userInfo_sid_local_bak()) {
params.previousSid = ClientData.userInfo_sid_local_bak();
}
......@@ -192,9 +181,9 @@ LOGIN.processLogin = function() {
}
// Get url to login
var apiLoginUrl = ClientData.conf_apiLoginUrl(); //sysSettings.apiLoginUrl;
var apiLoginUrl = ClientData.conf_apiLoginUrl(); // sysSettings.apiLoginUrl;
AVWEB.avwCmsApiWithUrl(apiLoginUrl, null, 'webClientLogin', 'GET', params, function (data) {
AVWEB.avwCmsApiWithUrl(apiLoginUrl, null, 'webClientLogin', 'GET', params, function(data) {
LOGIN.userinfo_sid = data.sid;
LOGIN.userInfo_userName = data.userName;
LOGIN.optionList = data.serviceOptionList;
......@@ -210,31 +199,32 @@ LOGIN.processLogin = function() {
$('#main-error-message').css('display', 'none');
if(ClientData.serviceOpt_encryption() == 'Y') {
if (ClientData.serviceOpt_encryption() == 'Y') {
data.requirePasswordChange = 0;
}
if (data.requirePasswordChange == 0) {
ClientData.userInfo_sid(ClientData.userInfo_sid_local());
//OpenUrlでコンテンツ開く場合
if( paramContentID != '' ){
// OpenUrlでコンテンツ開く場合
if (paramContentID != '') {
LOGIN.showContentViewByOpenUrl(paramContentID);
} else {
//ホームへ移動
// ホームへ移動
AVWEB.avwScreenMove("abvw/" + COMMON.ScreenIds.Home);
}
}
else if (data.requirePasswordChange == 1) {
} else if (data.requirePasswordChange == 1) {
if (LOGIN.force_pw_change_on_login == 2) { // force to change password
if (LOGIN.force_pw_change_on_login == 2) { // force to change
// password
LOGIN.OpenChangePasswordDialog();
$(".ui-dialog-titlebar").hide();
$('#btnSkip').hide();
$("#txtPwdRemind").css('visibility', 'hidden');
}
else if (LOGIN.force_pw_change_on_login == 1) { // recommend to change password
} else if (LOGIN.force_pw_change_on_login == 1) { // recommend
// to change
// password
// Check 30 days
skipPwdDate = ClientData.userInfo_pwdSkipDt();
......@@ -243,53 +233,50 @@ LOGIN.processLogin = function() {
LOGIN.OpenChangePasswordDialog();
$('#btnSkip').show();
$(".ui-dialog-titlebar").hide();
}
else {
} else {
var date = new Date();
var skpPwdDt = new Date(skipPwdDate);
var numDay = date.subtractByDays(skpPwdDt);
if (numDay <= 30) {
ClientData.userInfo_sid(ClientData.userInfo_sid_local());
//OpenUrlでコンテンツ開く場合
if( paramContentID != '' ){
// OpenUrlでコンテンツ開く場合
if (paramContentID != '') {
LOGIN.showContentViewByOpenUrl(paramContentID);
} else {
//ホームへ移動
// ホームへ移動
AVWEB.avwScreenMove("abvw/" + COMMON.ScreenIds.Home);
}
}
else if (numDay > 30) {
} else if (numDay > 30) {
LOGIN.OpenChangePasswordDialog();
$('#btnSkip').show();
$(".ui-dialog-titlebar").hide();
}
}
}
else { // no need to change password
} else { // no need to change password
ClientData.userInfo_sid(ClientData.userInfo_sid_local());
//OpenUrlでコンテンツ開く場合
if( paramContentID != '' ){
// OpenUrlでコンテンツ開く場合
if (paramContentID != '') {
LOGIN.showContentViewByOpenUrl(paramContentID);
} else {
//ホームへ移動
// ホームへ移動
AVWEB.avwScreenMove("abvw/" + COMMON.ScreenIds.Home);
}
}
}
else if (data.requirePasswordChange == 2) {
} else if (data.requirePasswordChange == 2) {
if (LOGIN.force_pw_change_periodically == 1) { // recommend to change password
if (LOGIN.force_pw_change_periodically == 1) { // recommend to
// change
// password
$('#btnSkip').show();
skipPwdDate = ClientData.userInfo_pwdSkipDt();
if (skipPwdDate == null || skipPwdDate == 'undefined') {
LOGIN.OpenChangePasswordDialog();
$(".ui-dialog-titlebar").hide();
}
else {
} else {
var date = new Date();
var skpPwdDt = new Date(skipPwdDate);
......@@ -298,47 +285,47 @@ LOGIN.processLogin = function() {
if (numDay <= 30) {
ClientData.userInfo_sid(ClientData.userInfo_sid_local());
//OpenUrlでコンテンツ開く場合
if( paramContentID != '' ){
// OpenUrlでコンテンツ開く場合
if (paramContentID != '') {
LOGIN.showContentViewByOpenUrl(paramContentID);
} else {
//ホームへ移動
// ホームへ移動
AVWEB.avwScreenMove("abvw/" + COMMON.ScreenIds.Home);
}
}
else if (numDay > 30) {
} else if (numDay > 30) {
LOGIN.OpenChangePasswordDialog();
$(".ui-dialog-titlebar").hide();
}
}
} else if (LOGIN.force_pw_change_periodically == 2) { // Force to change password
} else if (LOGIN.force_pw_change_periodically == 2) { // Force
// to
// change
// password
LOGIN.OpenChangePasswordDialog();
$('#btnSkip').hide();
$(".ui-dialog-titlebar").hide();
$("#txtPwdRemind").css('visibility', 'hidden');
}
else { // No need to change password
} else { // No need to change password
ClientData.userInfo_sid(ClientData.userInfo_sid_local());
//OpenUrlでコンテンツ開く場合
if( paramContentID != '' ){
// OpenUrlでコンテンツ開く場合
if (paramContentID != '') {
LOGIN.showContentViewByOpenUrl(paramContentID);
} else {
//ホームへ移動
// ホームへ移動
AVWEB.avwScreenMove("abvw/" + COMMON.ScreenIds.Home);
}
}
}
}
else {
} else {
LOGIN.login_errorMessage = data.errorMessage;
$('#main-error-message').html(AVWEB.format(I18N.i18nText('msgLoginErrWrong'), data.errorMessage).toString());
$('#main-error-message').show();
}
}, function (xhr, statusText, errorThrown) {
}, function(xhr, statusText, errorThrown) {
LOGIN.login_error_flag = true;
if (xhr.responseText && xhr.status != 0) {
LOGIN.login_errorMessage = JSON.parse(xhr.responseText).errorMessage;
......@@ -351,8 +338,8 @@ LOGIN.processLogin = function() {
});
};
//Change Password Process
LOGIN.changePasswordProcess = function(){
// Change Password Process
LOGIN.changePasswordProcess = function() {
var accountPath = $('#txtAccPath').val();
var sid = ClientData.userInfo_sid_local();
var loginId = $('#txtAccId').val();
......@@ -360,84 +347,81 @@ LOGIN.changePasswordProcess = function(){
var confirmPass = $('#txtConfirmNew').val();
var params = {
sid: sid,
loginId: loginId,
password: password,
newPassword: confirmPass,
appId: 4
sid : sid,
loginId : loginId,
password : password,
newPassword : confirmPass,
appId : 4
};
AVWEB.avwCmsApiSync(accountPath, 'passwordChange', 'GET', params, function (data) {
AVWEB.avwCmsApiSync(accountPath, 'passwordChange', 'GET', params, function(data) {
var result = data.result;
if (result == 'success') {
$('#dialog-error-message').css('display', 'none');
LOGIN.CloseChangePasswordDialog();
ClientData.userInfo_sid(ClientData.userInfo_sid_local());
AVWEB.avwScreenMove("abvw/" + COMMON.ScreenIds.Home);
}
else {
} else {
$('#dialog-error-message').html(I18N.i18nText('msgPwdOldWrong'));
$('#dialog-error-message').show();
}
},
function (xhr, b, c) {
}, function(xhr, b, c) {
if (xhr.responseText && xhr.status != 0) {
$('#dialog-error-message').html(JSON.parse(xhr.responseText).errorMessage);
$('#dialog-error-message').show();
}
else {
} else {
// Show systemerror
AVWEB.showSystemError();
}
});
};
//Change Language Japanese
LOGIN.changeLanguageJa = function(){
// Change Language Japanese
LOGIN.changeLanguageJa = function() {
I18N.changeLanguage(COMMON.Consts.ConstLanguage_Ja);
document.title = I18N.i18nText('dspLogin') + ' | ' + I18N.i18nText('sysAppTitle');
//ClientData.userInfo_language(COMMON.Consts.ConstLanguage_Ja);
if (LOGIN.login_errorMessage != ""){
// ClientData.userInfo_language(COMMON.Consts.ConstLanguage_Ja);
if (LOGIN.login_errorMessage != "") {
$('#main-error-message').html(AVWEB.format(I18N.i18nText('msgLoginErrWrong'), LOGIN.login_errorMessage).toString());
}
};
//Change Language Korean
LOGIN.changeLanguageKo = function(){
// Change Language Korean
LOGIN.changeLanguageKo = function() {
I18N.changeLanguage(COMMON.Consts.ConstLanguage_Ko);
document.title = I18N.i18nText('dspLogin') + ' | ' + I18N.i18nText('sysAppTitle');
//ClientData.userInfo_language(COMMON.Consts.ConstLanguage_Ko);
if (LOGIN.login_errorMessage != ""){
// ClientData.userInfo_language(COMMON.Consts.ConstLanguage_Ko);
if (LOGIN.login_errorMessage != "") {
$('#main-error-message').html(AVWEB.format(I18N.i18nText('msgLoginErrWrong'), LOGIN.login_errorMessage).toString());
}
};
//Change Language English
LOGIN.changeLanguageEn = function(){
// Change Language English
LOGIN.changeLanguageEn = function() {
I18N.changeLanguage(COMMON.Consts.ConstLanguage_En);
document.title = I18N.i18nText('dspLogin') + ' | ' + I18N.i18nText('sysAppTitle');
//ClientData.userInfo_language(COMMON.Consts.ConstLanguage_En);
if (LOGIN.login_errorMessage != ""){
// ClientData.userInfo_language(COMMON.Consts.ConstLanguage_En);
if (LOGIN.login_errorMessage != "") {
$('#main-error-message').html(AVWEB.format(I18N.i18nText('msgLoginErrWrong'), LOGIN.login_errorMessage).toString());
}
};
//Login click function
// Login click function
LOGIN.loginFunction = function() {
if (LOGIN.checkValidation()) {
LOGIN.processLogin();
}
};
//Change Password function
LOGIN.changePassFunction = function(){
if(LOGIN.checkDialogValidation()){
// Change Password function
LOGIN.changePassFunction = function() {
if (LOGIN.checkDialogValidation()) {
LOGIN.changePasswordProcess();
}
};
//Skip Password function
LOGIN.skipPassFunction = function(){
// Skip Password function
LOGIN.skipPassFunction = function() {
var date = new Date();
ClientData.userInfo_pwdSkipDt(date);
......@@ -446,111 +430,89 @@ LOGIN.skipPassFunction = function(){
};
//Open Change Password Dialog
LOGIN.OpenChangePasswordDialog = function(){
// Open Change Password Dialog
LOGIN.OpenChangePasswordDialog = function() {
// Clear all input values
$("#main-password-change").show();
$("#main-password-change").center();
COMMON.lockLayout();
};
//Close Chnage Password Dialog
LOGIN.CloseChangePasswordDialog = function(){
// Close Chnage Password Dialog
LOGIN.CloseChangePasswordDialog = function() {
$("#main-password-change").dialog('close');
};
//Save Service Option
LOGIN.saveServiceUserOption = function(){
// Save Service Option
LOGIN.saveServiceUserOption = function() {
$.each(LOGIN.optionList, function (i, option) {
$.each(LOGIN.optionList, function(i, option) {
if (option.serviceOptionId == 22) {
ClientData.serviceOpt_force_pw_change_periodically(option.value);
}
else if (option.serviceOptionId == 21) {
} else if (option.serviceOptionId == 21) {
ClientData.serviceOpt_force_pw_change_on_login(option.value);
}
else if (option.serviceOptionId == 33) {
} else if (option.serviceOptionId == 33) {
ClientData.serviceOpt_marking(option.value);
}
else if (option.serviceOptionId == 28) {
} else if (option.serviceOptionId == 28) {
ClientData.serviceOpt_user_data_backup(option.value);
}
else if (option.serviceOptionId == 42) {
} else if (option.serviceOptionId == 42) {
ClientData.serviceOpt_copy_text(option.value);
}
else if (option.serviceOptionId == 60) {
} else if (option.serviceOptionId == 60) {
ClientData.serviceOpt_web_screen_lock(option.value);
}
else if (option.serviceOptionId == 61) {
} else if (option.serviceOptionId == 61) {
ClientData.serviceOpt_web_screen_lock_wait(option.value);
}
else if( option.serviceOptionId == 70) {
} else if (option.serviceOptionId == 70) {
ClientData.serviceOpt_catalog_edition(option.value);
}
else if( option.serviceOptionId == 77) {
} else if (option.serviceOptionId == 77) {
ClientData.serviceOpt_hibiyakadan_catalog(option.value);
}
else if( option.serviceOptionId == 71) {
} else if (option.serviceOptionId == 71) {
ClientData.serviceOpt_usable_readinglog_gps(option.value);
}
else if( option.serviceOptionId == 72) {
} else if (option.serviceOptionId == 72) {
ClientData.serviceOpt_usable_readinglog_object(option.value);
}
else if( option.serviceOptionId == 83) {
} else if (option.serviceOptionId == 83) {
ClientData.serviceOpt_reader_usable_readinglog_gps(option.value);
}
else if( option.serviceOptionId == 84) {
} else if (option.serviceOptionId == 84) {
ClientData.serviceOpt_reader_readinglog_object(option.value);
}
else if( option.serviceOptionId == 87) {
} else if (option.serviceOptionId == 87) {
ClientData.serviceOpt_daihatsu(option.value);
}
else if( option.serviceOptionId == 78) {
} else if (option.serviceOptionId == 78) {
ClientData.serviceOpt_content_share(option.value);
}
else if( option.serviceOptionId == 12) {
} else if (option.serviceOptionId == 12) {
ClientData.serviceOpt_apns(option.value);
}
else if( option.serviceOptionId == 49) {
} else if (option.serviceOptionId == 49) {
ClientData.serviceOpt_usable_push_message(option.value);
}
else if( option.serviceOptionId == 126) {
} else if (option.serviceOptionId == 126) {
ClientData.serviceOpt_encryption(option.value);
}
else if( option.serviceOptionId == 137) {
} else if (option.serviceOptionId == 137) {
ClientData.serviceOpt_html_custom_log(option.value);
}
});
};
//Get Service Option
LOGIN.getServiceOptionList = function(){
// Get Service Option
LOGIN.getServiceOptionList = function() {
$.each(LOGIN.optionList, function(i, option){
$.each(LOGIN.optionList, function(i, option) {
if(option.serviceOptionId == 22){
if (option.serviceOptionId == 22) {
LOGIN.force_pw_change_periodically = option.value;
}
else if(option.serviceOptionId == 21){
} else if (option.serviceOptionId == 21) {
LOGIN.force_pw_change_on_login = option.value;
}
else if(option.serviceOptionId == 23){
} else if (option.serviceOptionId == 23) {
LOGIN.force_login_periodically = option.value;
}
else if(option.serviceOptionId == 33){
} else if (option.serviceOptionId == 33) {
LOGIN.marking = option.value;
}
else if(option.serviceOptionId == 28){
} else if (option.serviceOptionId == 28) {
LOGIN.user_data_backup = option.value;
}
});
};
LOGIN.loginWhenClickEnter = function(e){
LOGIN.loginWhenClickEnter = function(e) {
var code = (e.keyCode ? e.keyCode : e.which);
if(code == 13) { //Enter keycode
if (code == 13) { // Enter keycode
$('#btnLogin').click();
}
};
......@@ -560,19 +522,19 @@ LOGIN.initLoginNormalUser = function() {
document.title = I18N.i18nText('dspLogin') + ' | ' + I18N.i18nText('sysAppTitle');
//Initial Screen
// Initial Screen
LOGIN.initialScreen();
//Change language japanese
// Change language japanese
$('#language-ja').click(LOGIN.changeLanguageJa);
//Change language korean
// Change language korean
$('#language-ko').click(LOGIN.changeLanguageKo);
//Change laguage english
// Change laguage english
$('#language-en').click(LOGIN.changeLanguageEn);
//Button login click event
// Button login click event
$('#btnLogin').click(LOGIN.loginFunction);
//Button Change click event
// Button Change click event
$('#btnChange').click(LOGIN.changePassFunction);
//Button Skip click event
// Button Skip click event
$('#btnSkip').click(LOGIN.skipPassFunction);
$('#txtPassword').keydown(LOGIN.loginWhenClickEnter);
......@@ -587,31 +549,31 @@ LOGIN.initLoginAnonymousUser = function() {
var loginId = sysSettings.anonymousLoginId;
var urlPath = sysSettings.anonymousLoginPath;
if( loginId == "" ){
if (loginId == "") {
loginId = "nologin";
}
if( urlPath == "" ){
//URLからパース
if (urlPath == "") {
// URLからパース
urlPath = LOGIN.getUrlPath();
if( urlPath == null ){
if (urlPath == null) {
urlPath = "dmy";
}
}
var params = {
previousSid: null,
loginId: loginId,
urlpath: urlPath
previousSid : null,
loginId : loginId,
urlpath : urlPath
};
AVWEB.avwCmsApiWithUrl(ClientData.conf_apiLoginUrl(), null, 'webClientAnonymousLogin', 'post', params, function (data) {
AVWEB.avwCmsApiWithUrl(ClientData.conf_apiLoginUrl(), null, 'webClientAnonymousLogin', 'post', params, function(data) {
if (data.result == 'success') {
//clear session of old anonymous user
//SessionStorageUtils.clear();
//警告表示を組み込んだら I18N.i18nText()の値が未定義になるので言語リソース再読み込み
// clear session of old anonymous user
// SessionStorageUtils.clear();
// 警告表示を組み込んだら I18N.i18nText()の値が未定義になるので言語リソース再読み込み
I18N.initi18n();
// set info user anonymous login
......@@ -639,42 +601,39 @@ LOGIN.initLoginAnonymousUser = function() {
LOGIN.saveServiceUserOption();
// hide splash screen then move to home page
$('#anonymous').fadeOut('slow', 'swing', function () {
//カタログエディション対応判定
if( ClientData.serviceOpt_catalog_edition() == 'Y'){
$('#anonymous').fadeOut('slow', 'swing', function() {
// カタログエディション対応判定
if (ClientData.serviceOpt_catalog_edition() == 'Y') {
//引数パラメータがあれば取得
// 引数パラメータがあれば取得
var paramContentID = COMMON.getUrlParam('cid', '');
//カタログ対応
if( paramContentID != '' ){
//OpenUrlでコンテンツ開く
// カタログ対応
if (paramContentID != '') {
// OpenUrlでコンテンツ開く
LOGIN.showContentViewByOpenUrl(paramContentID);
} else {
//ホームへ移動
// ホームへ移動
AVWEB.avwScreenMove("abvw/" + COMMON.ScreenIds.Home);
}
} else {
//ホームへ移動
// ホームへ移動
AVWEB.avwScreenMove("abvw/" + COMMON.ScreenIds.Home);
}
});
}
else {
} else {
if (data.errorMessage != null && data.errorMessage != undefined) {
LOGIN.showMessageErrorLoginAnonymous(AVWEB.format(I18N.i18nText('msgAnonymousLoginErr'), data.errorMessage).toString());
}
else {
} else {
LOGIN.showMessageErrorLoginAnonymous(I18N.i18nText('msgAnonymousLoginErr2'));
}
}
}, function (xhr, statusText, errorThrown) {
}, function(xhr, statusText, errorThrown) {
if (xhr.responseText && xhr.status != 0) {
var errorMessage = JSON.parse(xhr.responseText).errorMessage;
if (errorMessage) {
LOGIN.showMessageErrorLoginAnonymous(AVWEB.format(I18N.i18nText('msgAnonymousLoginErr'), errorMessage).toString());
}
else {
} else {
LOGIN.showMessageErrorLoginAnonymous(I18N.i18nText('msgAnonymousLoginErr2'));
}
} else {
......@@ -686,24 +645,24 @@ LOGIN.initLoginAnonymousUser = function() {
// init login for getits user
LOGIN.initLoginGetitsUser = function() {
//console.log("LOGIN.initLoginGetitsUser");
// console.log("LOGIN.initLoginGetitsUser");
document.title = I18N.i18nText('dspLogin') + ' | ' + I18N.i18nText('sysAppTitle');
var params = {
urlpath: ClientData.userInfo_accountPath()
urlpath : ClientData.userInfo_accountPath()
};
I18N.initi18n();
AVWEB.avwCmsApiWithUrl(ClientData.conf_apiLoginUrl(), ClientData.userInfo_accountPath(), 'webClientGetitsLogin', 'post', params, function (data) {
AVWEB.avwCmsApiWithUrl(ClientData.conf_apiLoginUrl(), ClientData.userInfo_accountPath(), 'webClientGetitsLogin', 'post', params, function(data) {
if (data.result == 'success') {
//clear session of old anonymous user
//SessionStorageUtils.clear();
//警告表示を組み込んだら I18N.i18nText()の値が未定義になるので言語リソース再読み込み
//I18N.initi18n();
// clear session of old anonymous user
// SessionStorageUtils.clear();
// 警告表示を組み込んだら I18N.i18nText()の値が未定義になるので言語リソース再読み込み
// I18N.initi18n();
ClientData.userInfo_userName(data.userName);
......@@ -722,37 +681,34 @@ LOGIN.initLoginGetitsUser = function() {
// save service user option
LOGIN.saveServiceUserOption();
// hide splash screen then move to home page
$('#anonymous').fadeOut('slow', 'swing', function () {
$('#anonymous').fadeOut('slow', 'swing', function() {
//引数パラメータがあれば取得
// 引数パラメータがあれば取得
var paramContentID = COMMON.getUrlParam('cid', '');
//カタログ対応
if( paramContentID != '' ){
//OpenUrlでコンテンツ開く
// カタログ対応
if (paramContentID != '') {
// OpenUrlでコンテンツ開く
LOGIN.showContentViewByOpenUrl(paramContentID);
} else {
//ホームへ移動
//AVWEB.avwScreenMove("abvw/" + COMMON.ScreenIds.Home);
// ホームへ移動
// AVWEB.avwScreenMove("abvw/" + COMMON.ScreenIds.Home);
AVWEB.avwScreenMove("abvw/" + COMMON.ScreenIds.Login);
}
});
}
else {
} else {
if (data.errorMessage != null && data.errorMessage != undefined) {
LOGIN.showMessageErrorLoginAnonymous(AVWEB.format(I18N.i18nText('msgAnonymousLoginErr'), data.errorMessage).toString());
}
else {
} else {
LOGIN.showMessageErrorLoginAnonymous(I18N.i18nText('msgAnonymousLoginErr2'));
}
}
}, function (xhr, statusText, errorThrown) {
}, function(xhr, statusText, errorThrown) {
if (xhr.responseText && xhr.status != 0) {
var errorMessage = JSON.parse(xhr.responseText).errorMessage;
if (errorMessage) {
LOGIN.showMessageErrorLoginAnonymous(AVWEB.format(I18N.i18nText('msgAnonymousLoginErr'), errorMessage).toString());
}
else {
} else {
LOGIN.showMessageErrorLoginAnonymous(I18N.i18nText('msgAnonymousLoginErr2'));
}
} else {
......@@ -762,11 +718,13 @@ LOGIN.initLoginGetitsUser = function() {
};
LOGIN.showMessageErrorLoginAnonymous = function(errorMessage) {
$().toastmessage({ position: 'middle-center' });
$().toastmessage({
position : 'middle-center'
});
$().toastmessage('showToast', {
type: 'error',
sticky: true,
text: errorMessage
type : 'error',
sticky : true,
text : errorMessage
});
$('.toast-position-middle-center').css('width', '400px');
};
......@@ -777,120 +735,148 @@ LOGIN.showContentViewByOpenUrl = function(strContentId) {
var contentType = '';
var result = [];
var params = {
sid: ClientData.userInfo_sid(),
getType: '1',
contentId: strContentId
sid : ClientData.userInfo_sid(),
getType : '1',
contentId : strContentId
};
AVWEB.avwCmsApiSync(ClientData.userInfo_accountPath(), "webGetContent", 'GET', params,
function (data) {
AVWEB.avwCmsApiSync(ClientData.userInfo_accountPath(), "webGetContent", 'GET', params, function(data) {
//コンテンツIDセット
// コンテンツIDセット
ClientData.contentInfo_contentId(strContentId);
//コンテツタイプ判定
// コンテツタイプ判定
contentType = data.contentData.contentType;
if(contentType == COMMON.ContentTypeKeys.Type_Others){
//Download content
if (contentType == COMMON.ContentTypeKeys.Type_Others) {
// Download content
HEADER.downloadResourceById(strContentId);
} else {
//Go to Conten view page
//アラート表示組み込めるか
LIMIT_ACCESS_CONTENT.messageLevel[data.contentData.contentId] = { alertMessageLevel:data.contentData.alertMessageLevel, alertMessage:data.contentData.alertMessage};
// Go to Conten view page
if(ClientData.isGetitsMode()){
if(contentType == COMMON.ContentTypeKeys.Type_Html || contentType == COMMON.ContentTypeKeys.Type_Link){
var apiUrl = AVWEB.getApiUrl(ClientData.userInfo_accountPath());
var htmlUrl = LOGIN.htmlLinkById(strContentId, contentType);
if(htmlUrl){
//TODO 閲覧ログ送信
location.href=htmlUrl + "?sid=" + ClientData.userInfo_sid() + "&apiurl=" + apiUrl + "&cid=" + strContentId;
}
return;
}
}
// アラート表示組み込めるか
LIMIT_ACCESS_CONTENT.messageLevel[data.contentData.contentId] = {
alertMessageLevel : data.contentData.alertMessageLevel,
alertMessage : data.contentData.alertMessage
};
// check limit of content
LIMIT_ACCESS_CONTENT.checkLimitContent(
data.contentData.contentId,
function()
{
LIMIT_ACCESS_CONTENT.checkLimitContent(data.contentData.contentId, function() {
LOGIN.alertMessageOkFunction_callback();
},
function()
{
}, function() {
LOGIN.alertMessageCancelFunction_callback();
}
);
});
}
},
function (xmlHttpRequest, txtStatus, errorThrown) {
//見つからないかエラーなのでホームに移動
if( ClientData.isGetitsMode() == true ){
}, function(xmlHttpRequest, txtStatus, errorThrown) {
// 見つからないかエラーなのでホームに移動
if (ClientData.isGetitsMode() == true) {
AVWEB.avwScreenMove("abvw/" + COMMON.ScreenIds.Login);
} else {
//アラートメッセージ表示
LOGIN.showAlertScreen(I18N.i18nText('msgContentNotExist'),"abvw/" + COMMON.ScreenIds.Home);
}
// アラートメッセージ表示
LOGIN.showAlertScreen(I18N.i18nText('msgContentNotExist'), "abvw/" + COMMON.ScreenIds.Home);
}
);
});
};
//警告表示時のOK処理
LOGIN.alertMessageOkFunction_callback = function(){
if (LOGIN.avwUserEnvObj.isMobile() && ClientData.isGetitsMode() ) {
// 警告表示時のOK処理
LOGIN.alertMessageOkFunction_callback = function() {
if (LOGIN.avwUserEnvObj.isMobile() && ClientData.isGetitsMode()) {
AVWEB.avwScreenMove("abvw/" + COMMON.ScreenIds.ContentViewGetits);
} else {
AVWEB.avwScreenMove("abvw/" + COMMON.ScreenIds.ContentView);
AVWEB.avwScreenMove("abvw/" + COMMON.ScreenIds.ContentViewOpenUri);
}
};
//警告表示時のキャンセル処理
LOGIN.alertMessageCancelFunction_callback = function(){
if( ClientData.isGetitsMode() == true ){
// 警告表示時のキャンセル処理
LOGIN.alertMessageCancelFunction_callback = function() {
if (ClientData.isGetitsMode() == true) {
AVWEB.avwScreenMove("abvw/" + COMMON.ScreenIds.Login);
} else {
AVWEB.avwScreenMove("abvw/" + COMMON.ScreenIds.Home);
}
};
//Get urlPath String
LOGIN.getUrlPath = function(){
//URL文字列から事業者ID部分を抽出
var regex = new RegExp( "/webad/([^&#]*)/" );
var results = regex.exec( window.location.href );
if( results == null ){
return "";
// Get resource Id of content
LOGIN.htmlLinkById = function(contentId,contentType) {
var params = {
sid : ClientData.userInfo_sid(),
contentId : contentId,
getType : '2',
isStreaming : ClientData.isStreamingMode()
};
var resourceUrl = "";
AVWEB.avwCmsApiSync(ClientData.userInfo_accountPath(), "webGetContent", 'GET', params,
function(data) {
if(contentType == COMMON.ContentTypeKeys.Type_Html){
resourceUrl = data.contentDataSub[0].resourceUrl;
} else if(contentType == COMMON.ContentTypeKeys.Type_Link){
resourceUrl = data.contentData.content.url;
}
else{
return results[1];
}
);
if( !resourceUrl ){
resourceUrl = "";
}
return resourceUrl;
};
// Get urlPath String
LOGIN.getUrlPath = function() {
// URL文字列から事業者ID部分を抽出
var regex = new RegExp("/webad/([^&#]*)/");
var results = regex.exec(window.location.href);
if (results == null) {
return "";
} else {
return results[1];
}
};
/* display alert screen*/
/* display alert screen */
LOGIN.showAlertScreen = function(errMes, scrMove) {
// アラートメッセージの表示
if( errMes == undefined || errMes == "" ){
errMes = "message."; //I18N.i18nText('msgPageImgErr');
if (errMes == undefined || errMes == "") {
errMes = "message."; // I18N.i18nText('msgPageImgErr');
}
COMMON.lockLayout();
/* show error messages */
$().toastmessage({ position: 'middle-center' });
$().toastmessage({
position : 'middle-center'
});
$().toastmessage('showToast', {
type: 'error',
sticky: true,
text: errMes,
close: function () {}
type : 'error',
sticky : true,
text : errMes,
close : function() {
}
});
$('.toast-type-error').css('height', '100px');
$('.toast-type-error > p').css('padding-top', '35px');
$('.toast-item-close').live('click',
function () {
$('.toast-item-close').live('click', function() {
COMMON.unlockLayout();
if( scrMove ){
if (scrMove) {
AVWEB.avwScreenMove(scrMove);
}
}
);
});
};
// $(document).ready(function (e) {
LOGIN.ready = function() {
//$(document).ready(function (e) {
LOGIN.ready = function(){
//セッションストレージクリア
// セッションストレージクリア
SessionStorageUtils.clear();
AVWEB.avwUserSessionObj = null;
// create new session
......@@ -899,81 +885,81 @@ LOGIN.ready = function(){
var sysSettings = AVWEB.avwSysSetting(); // get info in conf.json
//モード初期化
// モード初期化
ClientData.isGetitsMode(false);
ClientData.isStreamingMode(false);
ClientData.storeUrl("");
//getitsサーバー設定確認
if( sysSettings.apiUrl == "" ){
// getitsサーバー設定確認
if (sysSettings.apiUrl == "") {
//引数パラメータを取得
// 引数パラメータを取得
var siteUrl = COMMON.getUrlParam('siteUrl', '');
var urlPath = COMMON.getUrlParam('urlPath', '');
var storeUrl = COMMON.getUrlParam('storeUrl', '');
if(siteUrl != "" && urlPath != ""){
if (siteUrl != "" && urlPath != "") {
//getitsモード有効
// getitsモード有効
ClientData.isGetitsMode(true);
//api接続先設定
ClientData.conf_apiUrl( siteUrl + "{0}/abvapi" );
ClientData.conf_apiLoginUrl( siteUrl + "nuabvapi" );
ClientData.conf_apiResourceDlUrl( siteUrl + "{0}/dl" );
//アカウント関連
// api接続先設定
ClientData.conf_apiUrl(siteUrl + "{0}/abvapi");
ClientData.conf_apiLoginUrl(siteUrl + "nuabvapi");
ClientData.conf_apiResourceDlUrl(siteUrl + "{0}/dl");
// アカウント関連
ClientData.userInfo_accountPath(urlPath);
ClientData.userInfo_accountPath_session(urlPath);
ClientData.userInfo_loginId("");
ClientData.userInfo_loginId_session("");
//ストア遷移用のURL
// ストア遷移用のURL
ClientData.storeUrl(storeUrl);
}
} else {
//confのパラメータセット
ClientData.conf_apiUrl( sysSettings.apiUrl );
ClientData.conf_apiLoginUrl( sysSettings.apiLoginUrl );
ClientData.conf_apiResourceDlUrl( sysSettings. apiResourceDlUrl );
// confのパラメータセット
ClientData.conf_apiUrl(sysSettings.apiUrl);
ClientData.conf_apiLoginUrl(sysSettings.apiLoginUrl);
ClientData.conf_apiResourceDlUrl(sysSettings.apiResourceDlUrl);
}
if( ClientData.isGetitsMode() == true ){
if (ClientData.isGetitsMode() == true) {
//念のため前回までの閲覧ログは削除
// 念のため前回までの閲覧ログは削除
ClientData.ContentLogData([]);
$('#anonymous').show();
setTimeout(
function () {
setTimeout(function() {
LOGIN.initLoginGetitsUser();
},
LOGIN.timeWaitSplashScreen
);
}, LOGIN.timeWaitSplashScreen);
} else if (COMMON.isAnonymousLogin()) {
$('#anonymous').show();
setTimeout(
function () {
setTimeout(function() {
LOGIN.initLoginAnonymousUser();
}, LOGIN.timeWaitSplashScreen);
}
else {
} else {
//引数でアカウントパスを受け取ったらセットする
// 引数でアカウントパスを受け取ったらセットする
$('#normalUser').show();
$('#formlogin').hide();
$('#logologin').animate({ "margin-top": 0 }, LOGIN.timeWaitSplashScreen,
function () {
$('#logologin').animate({
"margin-top" : 0
}, LOGIN.timeWaitSplashScreen, function() {
$('#formlogin').show();
$('#menu-language').animate({ opacity: 1 }, LOGIN.timeWaitSplashScreen);
$('#formlogin').animate({ opacity: 1 }, LOGIN.timeWaitSplashScreen);
$('.cnt_footer').animate({ opacity: 1 }, LOGIN.timeWaitSplashScreen);
}
);
$('#menu-language').animate({
opacity : 1
}, LOGIN.timeWaitSplashScreen);
$('#formlogin').animate({
opacity : 1
}, LOGIN.timeWaitSplashScreen);
$('.cnt_footer').animate({
opacity : 1
}, LOGIN.timeWaitSplashScreen);
});
LOGIN.initLoginNormalUser();
}
};
//});
// });
custom/getits/abvw/css/theme/login.css → custom/getits/abvw/css/layout/login_getits.css
......@@ -30,7 +30,7 @@ html,body{
}
body{
background:#088A68;
background:#088A68;
}
/*----------------------------*/
......@@ -59,7 +59,7 @@ background:#088A68;
.wrapper {
}
#main{
#main-ws{
}
a
......@@ -130,7 +130,7 @@ section a.loginbtn:hover {
filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#23486F', endColorstr='#36638B');
background-color:#36638B;
}
#login .wrapper #main article section a.loginbtn:active {
#login .wrapper #main-ws article section a.loginbtn:active {
}
section .loginbtn a:not(:target) {
......@@ -175,11 +175,11 @@ section .loginbtn a:hover:not(:target) {
font-size: 14px;
font-weight: bolder;
}
#login .wrapper #main article section table tr td input {
#login .wrapper #main-ws article section table tr td input {
}
#login article section table tr th,#login article section table tr td {
}
#login .wrapper #main article section table {
#login .wrapper #main-ws article section table {
border-bottom:dotted 1px #BBBBBB;
}
......@@ -187,7 +187,7 @@ section .loginbtn a:hover:not(:target) {
background: url(../../img/login/login_border.jpg) top repeat-x;
opacity:0;
}
#login .wrapper #main article img {
#login .wrapper #main-ws article img {
}
#loader {
}
......@@ -196,13 +196,12 @@ section .loginbtn a:hover:not(:target) {
background-color: #000;
opacity: 0.3;
}
#login .wrapper #main article ul {
#login .wrapper #main-ws article ul {
}
#login .wrapper #main article li {
#login .wrapper #main-ws article li {
}
/* footer */
footer{
background-color: #EDF2F2;
......@@ -215,7 +214,7 @@ footer{
.focus{ color: #969696;}
#user_change footer .border .cnt_footer img { }
#login .wrapper #main article section .error {
#login .wrapper #main-ws article section .error {
font-size: 13px;
color: #FF0000;
font-weight: bolder;
......@@ -236,3 +235,4 @@ footer{
#logologin
{
}
custom/getits/login.html
......@@ -11,27 +11,25 @@
<title></title>
<link rel="stylesheet" type="text/css" href="./abvw/css/layout/common.css?#UPDATEID#" />
<link rel="stylesheet" type="text/css" href="./abvw/css/theme/common.css?#UPDATEID#" />
<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.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/theme/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/theme/login_validation.css?#UPDATEID#" />
<link rel="stylesheet" type="text/css" href="./abvw/css/layout/limit_access.css?#UPDATEID#" />
<link rel="stylesheet" type="text/css" href="./abvw/css/theme/limit_access.css?#UPDATEID#" />
<link rel="stylesheet" type="text/css" href="./abvw/css/layout/common.css?__UPDATEID__" />
<link rel="stylesheet" type="text/css" href="./abvw/css/theme/common.css?__UPDATEID__" />
<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.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/layout/limit_access.css?__UPDATEID__" />
<link rel="stylesheet" type="text/css" href="./abvw/css/layout/login_getits.css?__UPDATEID__" />
<script type="text/javascript" src="./abvw/common/js/jquery-1.8.1.min.js?#UPDATEID#"></script>
<script type="text/javascript" src="./abvw/common/js/thickbox.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/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/js/Limit_Access_Content.js?#UPDATEID#"></script>
<script type="text/javascript" src="./abvw/js/login.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/thickbox.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/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/js/Limit_Access_Content.js?__UPDATEID__"></script>
<script type="text/javascript" src="./abvw/js/login.js?__UPDATEID__"></script>
<!--[if gte IE 9]>
<style type="text/css">
......@@ -58,7 +56,7 @@
<div id="loader"><img src="./abvw/img/login/loading_icon.gif" width="200" height="200"></div>
<div id="fade"></div>
<div class="wrapper">
<div id="main">
<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>
-->
......
login.html
......@@ -38,18 +38,6 @@
<![endif]-->
<script type="text/javascript">
//$('head').append(
// '<style type="text/css">#container { display: none; } #fade, #loader { display: block; }</style>'
//);
//jQuery.event.add(window,"load",function() { // 全ての読み込み完了後に呼ばれる関数
// var pageH = $("#container").height();
// console.log("pageH:" + pageH);
//
// $("#fade").css("height", pageH).delay(900).fadeOut(800);
// $("#loader").delay(600).fadeOut(300);
// $("#container").css("display", "block");
//});
$(document).ready(function(){
LOGIN.ready();
});
......
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