Skip to content

C
check
Commit 98db55b3 by Masaru Abe
Options

カタログと日比谷カスタム対応

parent 71ca8284
Showing with 485 additions and 145 deletions
abvw/common/js/common.js
/// <reference path="avweb.js" />
/// <reference path="screenLock.js" />
/// <reference path="common.js" />
/// <reference path="i18n.js" />
/// <reference path="jquery-1.8.1.min.js" />
/// <reference path="jquery-ui-1.8.23.custom.min.js" />
/// <reference path="jquery.toastmessage.js" />
/// <reference path="pageViewer.js" />
/// <reference path="uuid.js" />
// =============================================================================================
// Constants [start]
// =============================================================================================
......@@ -54,7 +45,6 @@ var Consts = {
// Lock screen timer
ConstLockScreenTime: 1800000
};
/*Content Type Keys*/
......@@ -189,6 +179,15 @@ var Keys = {
serviceOpt_web_screen_lock: 'web_screen_lock',
// Session :事業者オプション(serviceOpt)_スクリーンロック待ち時間:Interger
serviceOpt_web_screen_lock_wait: 'web_screen_lock_wait',
// Session :事業者オプション(serviceOpt)_GPS使用可:Char(Y：可能, N：不可)
serviceOpt_catalog_edition: 'usable_readinglog_gps',
// Session :事業者オプション(serviceOpt)_詳細ログ使用可:Char(Y：可能, N：不可)
serviceOpt_catalog_edition: 'usable_readinglog_object',
// Session :事業者オプション(serviceOpt)_カタログエディション:Char(Y：可能, N：不可)
serviceOpt_catalog_edition: 'catalog_edition',
// Session :事業者オプション(serviceOpt)_日比谷カスタム:Char(Y：可能, N：不可)
serviceOpt_catalog_edition: 'hibiyakadan_catalog',
// Session :共通(common)_コンテンツID:Integer
common_contentId: 'common_contentId',
// Local :共通(common)_コンテンツID:Integer
......@@ -322,8 +321,6 @@ var Keys = {
// Local :ユーザオプション(userOpt)_アニメーション時間:Float
userOpt_pageTransitionPeriod: 'userOpt_pageTransitionPeriod'
/* -------------------------------------------------------------------------------- */
};
......@@ -371,8 +368,21 @@ function LogEntity() {
this.readingEndDate = null;
this.readingTime = 0;
this.deviceTypeId = 4;
//ページログ配列
this.pageLogArray = [];
//詳細ログ配列
this.objectLogArray = [];
};
// Entity for PageLog
function PageLogEntity(){
this.contentid = "";
this.pageNo = 1;
this.readingStartDate = new Date();
this.readingEndDate = null;
this.readingTime = 0;
};
// No.17 Phase 2: do not use this function
// Build memo/marking/bookmark to base64string
/*
......@@ -1288,6 +1298,39 @@ var ClientData = {
// }
//},
// Session :事業者オプション(serviceOpt)_GPS使用可:Char(Y：可能, N：不可)
serviceOpt_usable_readinglog_gps: function (data) {
if (arguments.length > 0) {
SessionStorageUtils.set(Keys.serviceOpt_usable_readinglog_gps, data);
} else {
return SessionStorageUtils.get(Keys.serviceOpt_usable_readinglog_gps);
}
},
// Session :事業者オプション(serviceOpt)_詳細ログ使用可:Char(Y：可能, N：不可)
serviceOpt_usable_readinglog_object: function (data) {
if (arguments.length > 0) {
SessionStorageUtils.set(Keys.serviceOpt_usable_readinglog_object, data);
} else {
return SessionStorageUtils.get(Keys.serviceOpt_usable_readinglog_object);
}
},
// Session :事業者オプション(serviceOpt)_カタログエディション:Char(Y：可能, N：不可)
serviceOpt_catalog_edition: function (data) {
if (arguments.length > 0) {
SessionStorageUtils.set(Keys.serviceOpt_catalog_edition, data);
} else {
return SessionStorageUtils.get(Keys.serviceOpt_catalog_edition);
}
},
// Session :事業者オプション(serviceOpt)_日比谷対応:Char(Y：可能, N：不可)
serviceOpt_hibiyakadan_catalog: function (data) {
if (arguments.length > 0) {
SessionStorageUtils.set(Keys.serviceOpt_hibiyakadan_catalog, data);
} else {
return SessionStorageUtils.get(Keys.serviceOpt_hibiyakadan_catalog);
}
},
// Session :共通(common)_コンテンツID:Integer
common_contentId: function (data) {
if (arguments.length > 0) {
......@@ -2241,6 +2284,9 @@ function unlockFunction(inputPass) {
Set starting log for reading content
*/
function SetStartLog(strContentId) {
//abe pageLogもセット
var isFound = false;
var arrContentLogs = ClientData.ContentLogData();
......@@ -2271,6 +2317,11 @@ function SetStartLog(strContentId) {
// Reading time
log.readingTime = log.readingEndDate.subtractBySeconds(log.readingStartDate);
//PageLog 1ページ目セット（１レコードは必須）
var pageLog = new PageLogEntity();
pageLog.contentid = strContentId;
log.pageLogArray.push(pageLog);
// Add to storage
arrContentLogs.push(log);
}
......@@ -2281,7 +2332,10 @@ function SetStartLog(strContentId) {
// Set ending log for reading content
function SetEndLog(strContentId) {
var log = new LogEntity();
//abe pageLogもセット
//var log = new LogEntity(); 無駄?
var arrContentLogs = ClientData.ContentLogData();
for(var nIndex = 0; nIndex < arrContentLogs.length; nIndex++) {
......@@ -2293,11 +2347,31 @@ function SetEndLog(strContentId) {
// Calculate to seconds
arrContentLogs[nIndex].readingTime = dateEnd.subtractBySeconds(dateStart);
}
}
ClientData.ContentLogData(arrContentLogs);
};
function SetPageLog( strContentId, strPageNo ){
var arrContentLogs = ClientData.ContentLogData();
for(var nIndex = 0; nIndex < arrContentLogs.length; nIndex++) {
if(arrContentLogs[nIndex].contentid == strContentId) {
//PageLog追加
var pageLog = new PageLogEntity();
pageLog.contentid = strContentId;
pageLog.pageNo = strPageNo + 1; //0始まりのページ番号
arrContentLogs[nIndex].pageLogArray.push(pageLog);
}
}
ClientData.ContentLogData(arrContentLogs);
}
/*
Register reading log of content to server by calling api
*/
......@@ -2309,16 +2383,72 @@ function RegisterLog() {
var dateEnd = new Date(arrContentLogs[nIndex].readingEndDate);
var dateStart = new Date(arrContentLogs[nIndex].readingStartDate);
//ページログJSONデータの作成
var pageLogArray = arrContentLogs[nIndex].pageLogArray;
var lines = [];
if( pageLogArray.length > 0 ){
//終了時間と閲覧時間の設定
var pageLogStart;
var pageLogEnd;
//２レコード目からチェック
for (var nIndex2 = 1; nIndex2 < pageLogArray.length; nIndex2++) {
//一つ前のログの終了日時を次のレコードの開始日時でセット
if( pageLogArray[nIndex2 -1].readingEndDate == null ){
pageLogArray[nIndex2 -1].readingEndDate = pageLogArray[nIndex2].readingStartDate;
}
pageLogStart = new Date(pageLogArray[nIndex2 -1].readingStartDate);
pageLogEnd = new Date(pageLogArray[nIndex2 -1].readingEndDate);
//時間差から閲覧秒セット
pageLogArray[nIndex2 -1].readingTime = pageLogEnd.subtractBySeconds(pageLogStart);
}
//最終レコードの処理
if( pageLogArray[pageLogArray.length - 1].readingEndDate == null ){
pageLogArray[pageLogArray.length - 1].readingEndDate = new Date();
}
pageLogStart = new Date(pageLogArray[pageLogArray.length - 1].readingStartDate);
pageLogEnd = new Date(pageLogArray[pageLogArray.length - 1].readingEndDate);
//時間差から閲覧秒セット
pageLogArray[pageLogArray.length -1].readingTime = pageLogEnd.subtractBySeconds(pageLogStart);
//JSONデータ作成
for (var nIndex2 = 0; nIndex2 < pageLogArray.length; nIndex2++) {
pageLogStart = new Date(pageLogArray[nIndex2].readingStartDate);
pageLogEnd = new Date(pageLogArray[nIndex2].readingEndDate);
//3秒以上なら記録する
if( pageLogArray[nIndex2].readingTime > 2 ){
var line = [];
line.push(pageLogArray[nIndex2].pageNo);
line.push(pageLogStart.jpDateTimeString1());
line.push(pageLogEnd.jpDateTimeString1());
line.push(pageLogArray[nIndex2].readingTime);
lines.push(line);
//alert("PageLog Line:" + JSON.stringify( line ) );
}
}
//alert("PageLog Lines:" + JSON.stringify( lines ) );
}
var pageLogJson = "";
if( lines.length > 0 ){
pageLogJson = "{ header:[\"pageNo\",\"readingStartDate\",\"readingEndDate\",\"readingTime\"],lines:";
pageLogJson = pageLogJson + JSON.stringify( lines );
pageLogJson = pageLogJson + "}";
//alert("JSON:" + pageLogJson);
}
var params = {
sid: ClientData.userInfo_sid(),
contentId: arrContentLogs[nIndex].contentid,
readingStartDate: dateStart.jpDateTimeString1(),
readingEndDate: dateEnd.jpDateTimeString1(),
readingTime: arrContentLogs[nIndex].readingTime,
deviceTypeId: 4
deviceTypeId: 4,
pageLog: pageLogJson
};
avwCmsApiSync(ClientData.userInfo_accountPath(), "contentReadingLog", 'get', params,
avwCmsApiSync(ClientData.userInfo_accountPath(), "contentReadingLog", 'post', params,
null,
function (xhr, b, c) {
if (xhr.status != 0) {
......
abvw/common/json/lang/lang-ja.json
......@@ -38,7 +38,7 @@
"txtPwdCurr":"現在パスワード",
"txtPwdNew":"変更パスワード",
"txtPwdNewRe":"(再)変更パスワード",
"txtPwdRemind":"※スキップを選択すると、30日以内にこのメッセージが表示されせん",
"txtPwdRemind":"※スキップを選択すると、30日経過するまでこのメッセージが表示されません。",
"txtSearch":"検索",
"dspShiori":"しおり",
"dspSetting":"設定変更",
......
abvw/home.html
......@@ -32,10 +32,6 @@
<link href="css/layout/list.css" rel="stylesheet" type="text/css" />
<link href="css/theme/list.css" rel="stylesheet" type="text/css" />
<!-- <link href="css/backup.css" rel="stylesheet" type="text/css" />
<link href="css/restore.css" rel="stylesheet" type="text/css" />-->
<link href="css/layout/backup.css" rel="stylesheet" type="text/css" />
<link href="css/theme/backup.css" rel="stylesheet" type="text/css" />
......@@ -60,13 +56,13 @@
<script src="./js/home.js"></script>
<script src="./js/header.js"></script>
<script src="./common/js/scrolltopcontrol.js"></script>
<script src="common/js/tab.js"></script>
<script src="./common/js/tab.js"></script>
<script src="./common/js/jquery.cookie.js" type="text/javascript"></script>
<script src="./common/js/jquery.cookie.js" type="text/javascript"></script>
<script src="./common/js/jquery.treeview.edit.js" type="text/javascript"></script>
<script src="./common/js/jquery.treeview.js" type="text/javascript"></script>
<script src="./common/js/screenLock.js" type="text/javascript"></script>
<script src="js/detail.js" type="text/javascript"></script>
<script src="./js/detail.js" type="text/javascript"></script>
</head>
......@@ -99,7 +95,7 @@
</ul>
</div>
<ul class="button">
<li class="floatL">
<li class="floatL" id="dspPushMessage">
<a href="#" id="liPushMessage"><span class="pushMessage"><span class="icon"></span> <span class="lang" lang="txtPushAlert">新着 : </span><span id="numbermessage"></span><span class="arrow"></span></span></a>
<div id="accordion" style="display:none;">
<div id="show-push-message"></div>
......@@ -113,13 +109,15 @@
<li class="menuIcon" id="dspViewHistory"><a href="#"><img src="img/common/icon_watch.png" width="30" height="30"></a></li>
<li class="menuIcon" id="dspSetting" style="display:none;"><a href="#"><img src="img/common/icon_setup.png" width="30" height="30"></a></li>
<li class="menuIcon" id="dspLogout" style="margin-right:0;display:none;"><a href="#"><img src="img/common/icon_logout.png" width="30" height="30"></a></li>
<li class="menuIcon" id="dspHibiya" style="display:none;"><a href="#"><img src="img/common/icon_setup.png" width="30" height="30"></a></li>
</ul>
</div>
</div>
</header>
<div class="wrapper">
<div id="main" class="hoge">
<div class="tabUnit">
<div class="tabUnit" >
<ul class="switchingTab">
<li class="colleft" ><a href="#list_0" class="current" id="lnkbtnGenre"> </a></li>
<li class="colright" style="display:none;"><a href="#list_1" id="lnkbtnGroup"> </a></li>
......@@ -229,6 +227,13 @@
<div id="book_list"></div>
</section>
</article>
<!-- 日比谷カスタム -->
<div id="dlgAddMemberGroup" title="公開コード">
<p>公開コードを入力して下さい。</p>
<p><input type="text" id="txtAddMemberGroupName" value="" /><a class="" href="#" id="btnAddMemberGroupSearch" lang="txtSearch">検索</a></p>
</div>
<footer>
<div class="border">
<div class="cnt_footer">
......
abvw/js/contentview_Events.js
......@@ -302,6 +302,11 @@ function clickSearchDetail() {
function nextPage_click() {
if (getContent().hasNextPage()) {
//abe
alert("nextPage_click:" + contentID );
SetPageLog( contentID, getPageIndex() + 1);
playBGMOfContent();
playBGMOfPage(getPageIndex() + 1);
......@@ -323,6 +328,11 @@ function nextPage_click() {
function prevPage_click() {
if (getContent().hasPreviousPage()) {
//abe
alert("prevPage_click:" + contentID);
SetPageLog( contentID, getPageIndex() - 1);
playBGMOfContent();
playBGMOfPage(getPageIndex() - 1);
......@@ -347,6 +357,11 @@ function firstPage_click() {
prevPage_click();
}
else{
//abe
alert("firstPage_click:" + contentID );
SetPageLog( contentID, 0 );
playBGMOfContent();
playBGMOfPage(0);
......@@ -413,6 +428,11 @@ function lastPage_click() {
nextPage_click();
}
else{
//abe
alert("lastPage_click:" + contentID );
SetPageLog( contentID, totalPage - 1 );
playBGMOfContent();
playBGMOfPage(totalPage - 1);
......
abvw/js/contentview_GetData.js
......@@ -143,6 +143,10 @@ function getMediaType1(iValueObj) {
pageObject['width'] = iValueObj.location.width;
pageObject['height'] = iValueObj.location.height;
pageObject['id'] = "MediaType1_" + iValueObj.action.actionType;
//詳細ログ用
pageObject["objectId"] = iValueObj.action.objectId;
if (iValueObj.action.actionType == 0) {
/*get mediaInfo */
if (iValueObj.mediaInfo) {
......@@ -345,7 +349,7 @@ function getMediaType1(iValueObj) {
pageObject["replyLimit"] = iValueObj.action.replyLimit;
pageObject["fullScreen"] = iValueObj.action.fullScreen;
pageObject["saveAs"] = iValueObj.action.saveAs;
pageObject["objectId"] = iValueObj.action.objectId;
//pageObject["objectId"] = iValueObj.action.objectId;
}
//End Function : No.9 - Editor : Long - Date: 08/16/2013 - Summary :
return pageObject;
......@@ -390,6 +394,9 @@ function getMediaType2(iValueObj) {
pageObject['height'] = iValueObj.location.height;
pageObject['visible'] = true;
//詳細ログ用
pageObject["objectId"] = iValueObj.action.objectId;
return pageObject;
};
......@@ -430,6 +437,9 @@ function getMediaType3(iValueObj) {
pageObject['height'] = iValueObj.location.height;
pageObject['visible'] = true;
//詳細ログ用
pageObject["objectId"] = iValueObj.action.objectId;
return pageObject;
};
......@@ -471,6 +481,9 @@ function getMediaType4(iValueObj) {
pageObject['height'] = iValueObj.location.height;
pageObject['visible'] = true;
//詳細ログ用（使わない）
pageObject["objectId"] = iValueObj.action.objectId;
return pageObject;
};
......@@ -500,6 +513,9 @@ function getMediaType5(iValueObj) {
pageObject['height'] = iValueObj.location.height;
pageObject['visible'] = true;
//詳細ログ用（使わない）
pageObject["objectId"] = iValueObj.action.objectId;
return pageObject;
};
......@@ -562,6 +578,9 @@ function getMediaType6(iValueObj) {
pageObject['height'] = iValueObj.location.height;
pageObject['visible'] = true;
//詳細ログ用
pageObject["objectId"] = iValueObj.action.objectId;
return pageObject;
};
......@@ -597,6 +616,9 @@ function getMediaType7(iValueObj) {
pageObject['height'] = iValueObj.location.height;
pageObject['visible'] = true;
//詳細ログ用（使わない）
pageObject["objectId"] = iValueObj.action.objectId;
return pageObject;
};
......@@ -647,6 +669,9 @@ function getMediaType8(iValueObj) {
pageObject['3dview'] = _3dViewObject;
}
//詳細ログ用
pageObject["objectId"] = iValueObj.action.objectId;
return pageObject;
};
......@@ -665,7 +690,8 @@ function getMediaType9(iValueObj) {
pageObject['height'] = iValueObj.location.height;
pageObject['visible'] = true;
//詳細ログ用
pageObject["objectId"] = iValueObj.action.objectId;
if(iValueObj.action.actionType == 11){
var resourceId = iValueObj.mediaInfo.resourceId;
......@@ -706,7 +732,8 @@ function getMediaType11(iValueObj) {
pageObject['height'] = iValueObj.location.height;
pageObject['visible'] = true;
//詳細ログ用
pageObject["objectId"] = iValueObj.action.objectId;
if(iValueObj.action.actionType == 12){
var resourceId = iValueObj.mediaInfo.resourceId;
......@@ -1457,6 +1484,9 @@ function assignCurrentContentPage(nav){
}
//abe
//alert("assignCurrentContentPage:" + content.currentPage);
};
//Correct Canvas Position
......
abvw/js/contentview_InitObjects.js
......@@ -128,6 +128,10 @@ function setLoadingSize(){
};
//END : TRB00034 - DATE : 09/11/2013 - Editor : Long - Summary : Fix for center loading image
function initPage() {
//abe
//alert("initPage");
//START : TRB00034 - DATE : 09/11/2013 - Editor : Long - Summary : Fix for center loading image
setLoadingSize();
//END : TRB00034 - DATE : 09/11/2013 - Editor : Long - Summary : Fix for center loading image
......
abvw/js/home.js
/// <reference path="../common/js/avweb.js" />
/// <reference path="../common/js/screenLock.js" />
/// <reference path="../common/js/common.js" />
/// <reference path="../common/js/i18n.js" />
/// <reference path="../common/js/jquery-1.8.1.min.js" />
/// <reference path="../common/js/jquery-ui-1.8.23.custom.min.js" />
/// <reference path="../common/js/jquery.toastmessage.js" />
/// <reference path="../common/js/pageViewer.js" />
/// <reference path="header.js" />
//Start Declare Variables
......@@ -60,6 +52,10 @@ var isSubMenuHoverOn = false;
var home_isMove = false;
var isShowBookShelf = null;
var showNextRecordClickNumber = 1;
//名前空間用のオブジェクトを用意する
var home = {};
//==========================================================
$(document).ready(function () {
......@@ -69,7 +65,6 @@ $(document).ready(function () {
document.title = i18nText('dspHome') + ' | ' + i18nText('sysAppTitle');
// Set bookmark screen
ClientData.BookmarkScreen(ScreenIds.Home);
......@@ -197,20 +192,135 @@ $(document).ready(function () {
// hide tab group with user anonymous
if (isAnonymousLogin()) {
//カタログエディション対応判定
if( ClientData.serviceOpt_catalog_edition() == 'Y'){
$('.tabUnit').hide();
} else {
$('.switchingTab .colright').hide();
}
else $('.switchingTab .colright').show();
//日比谷対応判定
if( ClientData.serviceOpt_hibiyakadan_catalog() == 'Y'){
$('#dspHibiya').show();
//日比谷テスト
jQuery( '#dlgAddMemberGroup' ).dialog( {
autoOpen: false,
modal: true,
});
$('#dspHibiya').click(dspHibiyaClickFunction);
$('#btnAddMemberGroupSearch').click(btnAddMemberGroupSearchClickFunction);
} else {
$('#dspHibiya').hide();
}
//プッシュメッセージ隠す
$('#dspPushMessage').hide();
} else {
$('.switchingTab .colright').show();
}
// set scroll for tree view with IE9 on win7
var ua = window.navigator.userAgent.toLowerCase();
if (/msie 9.0/.test(ua) && /windows nt 6.1/.test(ua) && !/tablet/.test(ua)) {
$('.tab_bg_color').css({ "overflow-x": "scroll" });
}
// if (isIE9()) {
// $('.tab_bg_color').css({ "overflow-x": "scroll" });
// }
//if (isIE9()) {
// $('.tab_bg_color').css({ "overflow-x": "scroll" });
//}
//日比谷テスト
$( '#dlgAddMemberGroup' ).dialog( {
autoOpen: false,
modal: true,
});
$('#dspHibiya').click(dspHibiyaClickFunction);
$('#btnAddMemberGroupSearch').click(btnAddMemberGroupSearchClickFunction);
});
//日比谷カスタム ここから
function dspHibiyaClickFunction(){
$( '#dlgAddMemberGroup' ).dialog( 'open' );
}
function btnAddMemberGroupSearchClickFunction(){
var addGroupName = $('#txtAddMemberGroupName').val();
if( addGroupName == "" ){
return;
}
var groupIds = getAddMemberGroupId(addGroupName);
if( groupIds == "" ){
alert("公開コードの判定に失敗しました。");
return;
}
$( '#dlgAddMemberGroup' ).dialog( 'close' );
ClientData.searchCond_groupId(groupIds);
//画面再描画開始
var recordFrom = 0;
var recordTo = 0;
if (isShowBookShelf) {
recordFrom = DEFAULT_DISP_NUMBER_RECORD_FROM;
recordTo = returnNumberDispRecordForBookShelf();
}
else if (!isShowBookShelf) {
recordFrom = DEFAULT_DISP_NUMBER_RECORD_FROM;
recordTo = returnNumberDispRecordForList();
}
else {
recordFrom = DEFAULT_DISP_NUMBER_RECORD_FROM;
recordTo = returnNumberDispRecordForBookShelf();
}
var id = ClientData.userInfo_sid();
var searchText = ClientData.searchCond_searchText();
var searchDivision = ClientData.searchCond_searchDivision();
var sortType = ClientData.searchCond_sortType();
var sortOrder = ClientData.searchCond_sortOrder();
//ClientData.searchCond_groupId('');
ClientData.searchCond_genreId('');
var groupId = ClientData.searchCond_groupId();
var genreId = ClientData.searchCond_genreId();
//refresh gridview
refreshGrid();
resetShowNextRecordCount();
handleSortDisp();
renderContent(id, searchText, searchDivision, sortType, sortOrder, recordFrom, recordTo, genreId, groupId);
}
function getAddMemberGroupId(strGroupName) {
var groupIds = "";
var params = {
sid: ClientData.userInfo_sid(),
groupName: strGroupName
};
avwCmsApiSync(ClientData.userInfo_accountPath(), "addMemberGroup", 'POST', params,
// Success
function (data) {
if (data.groupIds) {
groupIds = data.groupIds;
}
},
function (xmlHttpRequest, txtStatus, errorThrown) {
//
}
);
return groupIds;
};
//--日比谷カスタム ここまで
var allowTimerCloseSubMenu = true;
var timer_subMenu;
function startTimerCloseMenu() {
......
abvw/js/login.js
/// <reference path="../common/js/avweb.js" />
/// <reference path="../common/js/screenLock.js" />
/// <reference path="../common/js/common.js" />
/// <reference path="../common/js/i18n.js" />
/// <reference path="../common/js/jquery-1.8.1.min.js" />
/// <reference path="../common/js/jquery-ui-1.8.23.custom.min.js" />
/// <reference path="../common/js/jquery.toastmessage.js" />
/// <reference path="../common/js/pageViewer.js" />
var requirePasswordChange;
......@@ -29,6 +22,9 @@ var login_errorMessage = "";
var timeWaitSplashScreen = 2000;// wait splash screen 2 second
//名前空間用のオブジェクトを用意する
var login = {};
//Load login Info
function loadLoginInfo() {
......@@ -94,8 +90,6 @@ function saveLoginInfo() {
}
ClientData.userInfo_lastLoginTime(date.jpDateTimeString());
//ClientData.requirePasswordChange(requirePasswordChange);
//ClientData.userInfo_sid(userinfo_sid);
ClientData.userInfo_sid_local(userinfo_sid);
saveServiceUserOption();
......@@ -145,15 +139,6 @@ function checkDialogValidation() {
msgError.html(i18nText('msgPwdEmpty'));
msgError.attr('lang', 'msgPwdEmpty');
msgError.show();
/* show error messages */
//$().toastmessage({ position: 'middle-center' });
//$().toastmessage('showToast', {
// type: 'error',
// sticky: true,
// text: i18nText('msgPwdEmpty')
//});
return false;
}
else if (!ValidationUtil.CheckRequiredForText(newPass)) {
......@@ -161,28 +146,8 @@ function checkDialogValidation() {
msgError.html(i18nText('msgPwdEmpty'));
msgError.attr('lang', 'msgPwdEmpty');
msgError.show();
/* show error messages */
//$().toastmessage({ position: 'middle-center' });
//$().toastmessage('showToast', {
// type: 'error',
// sticky: true,
// text: i18nText('msgPwdEmpty')
//});
return false;
}
// else if (!ValidationUtil.CheckRequiredForText(confirmPass)) {
// //msgError.html(i18nText('msgPwdEmpty'));
// //msgError.show();
// /* show error messages */
// $().toastmessage({ position: 'middle-center' });
// $().toastmessage('showToast', {
// type: 'error',
// sticky: true,
// text: i18nText('msgPwdEmpty')
// });
// return false;
// }
else
{
if(newPass != confirmPass){
......@@ -190,13 +155,6 @@ function checkDialogValidation() {
msgError.html(i18nText('msgPwdNotMatch'));
msgError.attr('lang', 'msgPwdNotMatch');
msgError.show();
/* show error messages */
// $().toastmessage({ position: 'middle-center' });
// $().toastmessage('showToast', {
// type: 'error',
// sticky: true,
// text: i18nText('msgPwdNotMatch')
//});
return false;
}
else{
......@@ -241,17 +199,11 @@ function processLogin() {
// Save retrieved info
saveLoginInfo();
// data.requirePasswordChange = 1;
// force_pw_change_on_login = 2;
// set number new push message to 0
ClientData.pushInfo_newMsgNumber(0);
$('#main-error-message').css('display', 'none');
if (data.requirePasswordChange == 0) {
ClientData.userInfo_sid(ClientData.userInfo_sid_local());
avwScreenMove("abvw/" + ScreenIds.Home);
......@@ -647,11 +599,34 @@ function initLoginAnonymousUser() {
$.each(data.serviceOptionList, function (i, option) {
if (option.serviceName == 'marking') {
ClientData.serviceOpt_marking(option.value);
} else if( option.serviceName == 'catalog_edition' ) {
ClientData.serviceOpt_catalog_edition(option.value);
} else if( option.serviceName == 'hibiyakadan_catalog' ) {
ClientData.serviceOpt_hibiyakadan_catalog(option.value);
}
});
// hide splash screen then move to home page
$('#anonymous').fadeOut('slow', 'swing', function () {
//avwScreenMove("abvw/" + ScreenIds.Home);
//カタログエディション対応判定
if( ClientData.serviceOpt_catalog_edition() == 'Y'){
//引数パラメータがあれば取得
var paramContentID = login.getUrlParams('cid');
//カタログ対応
if( paramContentID != '' ){
//OpenUrlでコンテンツ開く
login.showContentViewByOpenUrl(paramContentID);
} else {
//ホームへ移動
avwScreenMove("abvw/" + ScreenIds.Home);
}
} else {
//ホームへ移動
avwScreenMove("abvw/" + ScreenIds.Home);
}
});
}
else {
......@@ -675,9 +650,9 @@ function initLoginAnonymousUser() {
showMessageErrorLoginAnonymous(i18nText('msgAnonymousLoginErr2'));
}
});
};
};
function showMessageErrorLoginAnonymous(errorMessage) {
function showMessageErrorLoginAnonymous(errorMessage) {
$().toastmessage({ position: 'middle-center' });
$().toastmessage('showToast', {
type: 'error',
......@@ -685,5 +660,54 @@ function initLoginAnonymousUser() {
text: errorMessage
});
$('.toast-position-middle-center').css('width', '400px');
};
login.showContentViewByOpenUrl = function(strContentId) {
var contentType = '';
var result = [];
var params = {
sid: ClientData.userInfo_sid(),
getType: '1',
contentId: strContentId
};
avwCmsApiSync(ClientData.userInfo_accountPath(), "webGetContent", 'GET', params,
function (data) {
//コンテンツIDセット
ClientData.contentInfo_contentId(strContentId);
//コンテツタイプ判定
contentType = data.contentData.contentType;
if(contentType == ContentTypeKeys.Type_Others){
//Download content
downloadResourceById(strContentId);
// redraw content remove new icon
//drawEditImage(contentId); 不要
} else {
//Go to Conten view page
avwScreenMove("abvw/" + ScreenIds.ContentView);
}
},
function (xmlHttpRequest, txtStatus, errorThrown) {
//見つからないかエラーなのでホームに移動
avwScreenMove("abvw/" + ScreenIds.Home);
}
);
};
//Get param url
login.getUrlParams = function(name){
name = name.replace(/[\[]/,"\\\[").replace(/[\]]/,"\\\]");
var regexS = "[\\?&]"+name+"=([^&#]*)";
var regex = new RegExp( regexS );
var results = regex.exec( window.location.href );
if( results == null ){
return "";
}
else{
return results[1];
}
};
index.html
<!DOCTYPE html>
<html>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<meta charset="UTF-8" />
<meta charset="utf-8">
<title></title>
</head>
<body>
<div style="text-align: center">
<a href="login.html">ログイン - login</a><br />
<a href="login.html">ログイン - login</a><br/>
</div>
</body>
</html>
login.html
......@@ -3,9 +3,6 @@
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<!--<script type='text/javascript' src='http://code.jquery.com/jquery-latest.min.js'></script>
<script type="text/javascript" src="js/thickbox.js"></script>-->
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=9,chrome=1" />
<meta http-equiv="Pragma" content="no-cache">
......@@ -18,25 +15,17 @@
<link type="text/css" rel="stylesheet" href="./abvw/css/layout/common.css" />
<link type="text/css" rel="stylesheet" href="./abvw/css/theme/common.css" />
<!-- <link type="text/css" rel="stylesheet" href="./abvw/css/layout/footer.css" />
<link type="text/css" rel="stylesheet" href="./abvw/css/theme/footer.css" />-->
<link rel="stylesheet" type="text/css" href="./abvw/common/css/jquery-ui.css" />
<link rel="stylesheet" type="text/css" href="./abvw/common/css/jquery.toastmessage.css" />
<link rel="stylesheet" type="text/css" href="./abvw/css/layout/login.css" />
<link rel="stylesheet" type="text/css" href="./abvw/css/theme/login.css" />
<!--
<link rel="stylesheet" type="text/css" href="./abvw/css/login.css" />-->
<link rel="stylesheet" type="text/css" href="./abvw/css/layout/login_validation.css" />
<link rel="stylesheet" type="text/css" href="./abvw/css/theme/login_validation.css" />
<script src="./abvw/common/js/jquery-1.8.1.min.js"></script>
<!--<script src="./abvw/common/js/jquery-latest.js"></script>-->
<script src="./abvw/common/js/thickbox.js"></script>
<script src="./abvw/common/js/jquery-ui-1.8.23.custom.min.js"></script>
<script src="./abvw/common/js/jquery.toastmessage.js"></script>
<script src="./abvw/common/js/screenLock.js" type="text/javascript"></script>
......@@ -53,7 +42,8 @@
</style>
<![endif]-->
<!-- <script type="text/javascript">
$('head').append(
$('head').append(
'<style type="text/css">#container { display: none; } #fade, #loader { display: block; }</style>'
);
......@@ -64,6 +54,7 @@ jQuery.event.add(window,"load",function() { // 全ての読み込み完了後に
$("#loader").delay(600).fadeOut(300);
$("#container").css("display", "block");
});
</script>-->
</head>
<body id="login">
......@@ -73,14 +64,14 @@ jQuery.event.add(window,"load",function() { // 全ての読み込み完了後に
</div>
<div id="normalUser">
<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="loader"><img src="./abvw/img/login/loading_icon.gif" width="200" height="200"></div>
<div id="fade"></div>
<div class="wrapper">
<div id="main">
<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>
<article>
<img src="./abvw/img/login/logo_login.png" width="166" height="150" class="clearboth" id="logologin">
<section id="formlogin">
<section id="formlogin">
<table width="440" border="0" cellspacing="0">
<tr>
<th width="33%" class="lang" lang="txtLoginAccPath">アカウントパス</th>
......@@ -94,23 +85,21 @@ jQuery.event.add(window,"load",function() { // 全ての読み込み完了後に
<th class="lang" lang="txtLoginPwd">パスワード</th>
<td><input type="password" id="txtPassword"/></td>
</tr>
</table>
<p class="error lang" id="main-error-message" style="display:none;">パスワードまたはIDに誤りがあります</p>
</table>
<p class="error lang" id="main-error-message" style="display:none;">パスワードまたはIDに誤りがあります</p>
<p class="memory"><input type="checkbox" id="chkRemember" /><label class="lang" lang="txtLoginPwdRbr" for="chkRemember">アカウントパスとログインIDを記憶する</label></p>
<a class="loginbtn lang" id="btnLogin" lang="dspLogin">ログイン</a>
</section>
</article>
</div>
</div>
<footer>
<div class="border">
</div>
</div>
<footer>
<div class="border">
<div class="cnt_footer">
COPYRIGHT &copy; 2013 AGENTEC Co., Ltd. ALL RIGHTS RESERVED.
</div>
</div>
</footer>
</div>
</footer>
</div>
<section id="main-password-change" class="sectionchangepassword">
......
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