Skip to content

C
check
Commit 15f984ed by Vo Duc Thang
Options

No.17 異機種間データ互換性（バックアップ・リストア）のリリース

parent 9f7d04ce
Showing with 1260 additions and 110 deletions
abvw/bookmark.html
......@@ -33,18 +33,29 @@
<script src="./js/bookmark.js" type="text/javascript"></script>
<script type="text/javascript" src="./common/js/gotop.js"></script>
<title>Bookmark | ABook Viewer For Web</title>
<title>Bookmark | ABook Viewer For Web</title>
</head>
<body id="list">
<p id="gotop" class="go_top">
<a href="#"> </a>
</p>
<header>
<div class="notification-pushmessage" style="display:none;">
新着メッセージがあります！！！
</div>
<div class="cnt_header">
<a class="logo" href="javascript:void(0);" onclick="avwScreenMove(ScreenIds.Home)"> </a>
<div class="menu_language">
<ul>
<li><label class="lang" lang="txtLoginUser">こんにちは</label><label id="login-username"> </label></li>
<li class="pushmessage hide" id="liPushMessage"><label class="lang" lang="txtPushAlert">新着 : </label><label id="numbermessage"></label><span></span>
<div id="list-push-message">
<div id="show-push-message"></div>
<p><a id='prev-page-message' style="display:none;" class="lang" lang="txtPrevious">＜前</a><a id='next-page-message' style="display:none;" class="lang" lang="txtNext">次k＞</a></p>
</div>
</li>
<li class="jp" id="language-jp"><a href="#">日本語</a></li>
<li class="eng" id="language-en"><a href="#">English</a></li>
<li class="kor" id="language-kr"><a href="#">한글</a></li>
......@@ -58,7 +69,7 @@
</div>
</ul>
<p class="button">
<a style="margin-right:0;" class="blue lang" href="#" id="dspLogout" lang="dspLogout">ログアウト</a>
<a style="margin-right:0;display:none;" class="blue lang" href="#" id="dspLogout" lang="dspLogout">ログアウト</a>
<a class="blue lang" href="#" lang="dspSetting" id="dspSetting">設定変更</a>
<a class="blue lang" href="#" lang="dspViewHistory" id="dspViewHistory">閲覧履歴</a>
<a class="blue lang" href="#" id="dspShiori" lang="dspShiori">しおり</a>
......@@ -68,7 +79,7 @@
</div>
</header>
<section class="sectionbackup1 " id="dlgConfirmBackup1">
<!--<section class="sectionbackup1 " id="dlgConfirmBackup1">
<h1><label class="lang" lang="txtBackupTitle">バックアップ確認</label></h1>
<p class="message"><label lang="txtLogoutBkMsg" class="lang">ログアウトする前にバックアップしますか？</label></p>
......@@ -80,7 +91,28 @@
<a class="cancel lang" href="#" lang="dspBkCancel" id="dlgConfirmBackup-withoutbackup">バックアップしないでログアウト</a>
<a class="ok lang" href="#" id="dlgConfirmBackup-backup" lang="dspBkOK">バックアップしてログアウト</a>
</p>
</section>-->
<section class="sectionbackup1 " id="dlgConfirmBackup1">
<h1><label class="lang" lang="txtBackupTitle">バックアップ確認</label></h1>
<p class="message"><label lang="txtLogoutBkMsg" class="lang">ログアウトする前にバックアップしますか？</label></p>
<p class="message-options">
<label class="option_backup">
<label lang="txtBkSelect" class="lang" class="lang">バックアップするデータを選択してください。</label><br />
<input type="checkbox" id="chkBkAllMarking" class="chkbx" checked="checked" /><label for="chkBkAllMarking" lang="txtBkMarking" class="lang">マーキング</label>
<input type="checkbox" id="chkBkAllMemo" class="chkbx" checked="checked" /><label for="chkBkAllMemo" lang="txtBkMemo" class="lang">メモ</label>
<input type="checkbox" id="chkBkAllShiori" class="chkbx" checked="checked" /><label for="chkBkAllShiori" lang="txtBkShiori" class="lang">しおり</label>
</label>
</p>
<p class="notice">
<input type="checkbox" id="chkRememberBackup" /><label for="chkRememberBackup" class="lang" lang="txtLogoutOptBkCfm">今回の行動を記憶し、次回から確認せずに、同じことをする。</label>
</p>
<p class="backupbtn">
<a class="cancel lang" href="#" lang="dspBkCancel" id="dlgConfirmBackup-withoutbackup">バックアップしないでログアウト</a>
<a class="ok lang" href="#" id="dlgConfirmBackup-backup" lang="dspBkOK">バックアップしてログアウト</a>
</p>
</section>
<div class="wrapper">
<div id="main">
......
abvw/common/css/jquery.toastmessage.css
......@@ -66,6 +66,19 @@
background:url(./images/error.png);
}
/* add for multiline */
.toast-item-message
{
background-position:left center;
padding-left:44px;
height: 32px;
background-repeat:no-repeat;
line-height:32px;
font-size:14px;
margin:5px 10px;
}
/**
* toast types
......
abvw/common/js/screenLock.js
......@@ -91,7 +91,24 @@ function screenLock(options) {
/* ロックするまでのアイドルタイマー */
function setIdleTimer() {
// check time out
if (timeout < 0) { // Remove unlock when timeout < 0 (this case for: after unlock, values from service options: web_screen_lock=N)
// clear timeout
if (idleTimerId) {
clearTimeout(idleTimerId);
idleTimerId = null;
}
bTimeout = false;
// clear lock state
removeLockState();
return;
}
// アイドルタイマーのタイムアウト時間（デフォルト/オプション指定時間）
var idleStateTimeout = timeout;
......@@ -205,6 +222,10 @@ function screenLock(options) {
$('#screenLockErrMsg').text(format(errorMessage, val.errorCode.errorMessage));
$('#screenLockErrMsg').fadeIn();
$('#passwd-txt').focus();
// Set new timeout value
if (val.newTimeout) {
timeout = val.newTimeout;
}
return;
}
/*
......
abvw/common/js/uuid.js 0 → 100644
// uuid.js
//
// Copyright (c) 2010-2012 Robert Kieffer
// MIT License - http://opensource.org/licenses/mit-license.php
(function() {
var _global = this;
// Unique ID creation requires a high quality random # generator. We feature
// detect to determine the best RNG source, normalizing to a function that
// returns 128-bits of randomness, since that's what's usually required
var _rng;
// Node.js crypto-based RNG - http://nodejs.org/docs/v0.6.2/api/crypto.html
//
// Moderately fast, high quality
if (typeof(require) == 'function') {
try {
var _rb = require('crypto').randomBytes;
_rng = _rb && function() {return _rb(16);};
} catch(e) {}
}
if (!_rng && _global.crypto && crypto.getRandomValues) {
// WHATWG crypto-based RNG - http://wiki.whatwg.org/wiki/Crypto
//
// Moderately fast, high quality
var _rnds8 = new Uint8Array(16);
_rng = function whatwgRNG() {
crypto.getRandomValues(_rnds8);
return _rnds8;
};
}
if (!_rng) {
// Math.random()-based (RNG)
//
// If all else fails, use Math.random(). It's fast, but is of unspecified
// quality.
var _rnds = new Array(16);
_rng = function() {
for (var i = 0, r; i < 16; i++) {
if ((i & 0x03) === 0) r = Math.random() * 0x100000000;
_rnds[i] = r >>> ((i & 0x03) << 3) & 0xff;
}
return _rnds;
};
}
// Buffer class to use
var BufferClass = typeof(Buffer) == 'function' ? Buffer : Array;
// Maps for number <-> hex string conversion
var _byteToHex = [];
var _hexToByte = {};
for (var i = 0; i < 256; i++) {
_byteToHex[i] = (i + 0x100).toString(16).substr(1);
_hexToByte[_byteToHex[i]] = i;
}
// **`parse()` - Parse a UUID into it's component bytes**
function parse(s, buf, offset) {
var i = (buf && offset) || 0, ii = 0;
buf = buf || [];
s.toLowerCase().replace(/[0-9a-f]{2}/g, function(oct) {
if (ii < 16) { // Don't overflow!
buf[i + ii++] = _hexToByte[oct];
}
});
// Zero out remaining bytes if string was short
while (ii < 16) {
buf[i + ii++] = 0;
}
return buf;
}
// **`unparse()` - Convert UUID byte array (ala parse()) into a string**
function unparse(buf, offset) {
var i = offset || 0, bth = _byteToHex;
return bth[buf[i++]] + bth[buf[i++]] +
bth[buf[i++]] + bth[buf[i++]] + '-' +
bth[buf[i++]] + bth[buf[i++]] + '-' +
bth[buf[i++]] + bth[buf[i++]] + '-' +
bth[buf[i++]] + bth[buf[i++]] + '-' +
bth[buf[i++]] + bth[buf[i++]] +
bth[buf[i++]] + bth[buf[i++]] +
bth[buf[i++]] + bth[buf[i++]];
}
// **`v1()` - Generate time-based UUID**
//
// Inspired by https://github.com/LiosK/UUID.js
// and http://docs.python.org/library/uuid.html
// random #'s we need to init node and clockseq
var _seedBytes = _rng();
// Per 4.5, create and 48-bit node id, (47 random bits + multicast bit = 1)
var _nodeId = [
_seedBytes[0] | 0x01,
_seedBytes[1], _seedBytes[2], _seedBytes[3], _seedBytes[4], _seedBytes[5]
];
// Per 4.2.2, randomize (14 bit) clockseq
var _clockseq = (_seedBytes[6] << 8 | _seedBytes[7]) & 0x3fff;
// Previous uuid creation time
var _lastMSecs = 0, _lastNSecs = 0;
// See https://github.com/broofa/node-uuid for API details
function v1(options, buf, offset) {
var i = buf && offset || 0;
var b = buf || [];
options = options || {};
var clockseq = options.clockseq != null ? options.clockseq : _clockseq;
// UUID timestamps are 100 nano-second units since the Gregorian epoch,
// (1582-10-15 00:00). JSNumbers aren't precise enough for this, so
// time is handled internally as 'msecs' (integer milliseconds) and 'nsecs'
// (100-nanoseconds offset from msecs) since unix epoch, 1970-01-01 00:00.
var msecs = options.msecs != null ? options.msecs : new Date().getTime();
// Per 4.2.1.2, use count of uuid's generated during the current clock
// cycle to simulate higher resolution clock
var nsecs = options.nsecs != null ? options.nsecs : _lastNSecs + 1;
// Time since last uuid creation (in msecs)
var dt = (msecs - _lastMSecs) + (nsecs - _lastNSecs)/10000;
// Per 4.2.1.2, Bump clockseq on clock regression
if (dt < 0 && options.clockseq == null) {
clockseq = clockseq + 1 & 0x3fff;
}
// Reset nsecs if clock regresses (new clockseq) or we've moved onto a new
// time interval
if ((dt < 0 || msecs > _lastMSecs) && options.nsecs == null) {
nsecs = 0;
}
// Per 4.2.1.2 Throw error if too many uuids are requested
if (nsecs >= 10000) {
throw new Error('uuid.v1(): Can\'t create more than 10M uuids/sec');
}
_lastMSecs = msecs;
_lastNSecs = nsecs;
_clockseq = clockseq;
// Per 4.1.4 - Convert from unix epoch to Gregorian epoch
msecs += 12219292800000;
// `time_low`
var tl = ((msecs & 0xfffffff) * 10000 + nsecs) % 0x100000000;
b[i++] = tl >>> 24 & 0xff;
b[i++] = tl >>> 16 & 0xff;
b[i++] = tl >>> 8 & 0xff;
b[i++] = tl & 0xff;
// `time_mid`
var tmh = (msecs / 0x100000000 * 10000) & 0xfffffff;
b[i++] = tmh >>> 8 & 0xff;
b[i++] = tmh & 0xff;
// `time_high_and_version`
b[i++] = tmh >>> 24 & 0xf | 0x10; // include version
b[i++] = tmh >>> 16 & 0xff;
// `clock_seq_hi_and_reserved` (Per 4.2.2 - include variant)
b[i++] = clockseq >>> 8 | 0x80;
// `clock_seq_low`
b[i++] = clockseq & 0xff;
// `node`
var node = options.node || _nodeId;
for (var n = 0; n < 6; n++) {
b[i + n] = node[n];
}
return buf ? buf : unparse(b);
}
// **`v4()` - Generate random UUID**
// See https://github.com/broofa/node-uuid for API details
function v4(options, buf, offset) {
// Deprecated - 'format' argument, as supported in v1.2
var i = buf && offset || 0;
if (typeof(options) == 'string') {
buf = options == 'binary' ? new BufferClass(16) : null;
options = null;
}
options = options || {};
var rnds = options.random || (options.rng || _rng)();
// Per 4.4, set bits for version and `clock_seq_hi_and_reserved`
rnds[6] = (rnds[6] & 0x0f) | 0x40;
rnds[8] = (rnds[8] & 0x3f) | 0x80;
// Copy bytes to buffer, if provided
if (buf) {
for (var ii = 0; ii < 16; ii++) {
buf[i + ii] = rnds[ii];
}
}
return buf || unparse(rnds);
}
// Export public API
var uuid = v4;
uuid.v1 = v1;
uuid.v4 = v4;
uuid.parse = parse;
uuid.unparse = unparse;
uuid.BufferClass = BufferClass;
if (typeof define === 'function' && define.amd) {
// Publish as AMD module
define(function() {return uuid;});
} else if (typeof(module) != 'undefined' && module.exports) {
// Publish as node.js module
module.exports = uuid;
} else {
// Publish as global (in browsers)
var _previousRoot = _global.uuid;
// **`noConflict()` - (browser only) to reset global 'uuid' var**
uuid.noConflict = function() {
_global.uuid = _previousRoot;
return uuid;
};
_global.uuid = uuid;
}
}).call(this);
\ No newline at end of file
abvw/common/json/lang/lang-en.json
......@@ -43,7 +43,7 @@
"dspShiori":"Bookmark",
"dspSetting":"Setting",
"dspLogout":"Logout",
"txtRead":"Read",
"txtRead":"Open",
"txtSort":"Sort",
"dspTitleNm":"Title",
"dspTitleNmKn":"Title（Kana）",
......@@ -64,7 +64,7 @@
"dspBkCancel":"Logout",
"txtSearchResult":"Result",
"dspHome":"Home",
"txtLoginUser":"(Ver.20121221-3)User:",
"txtLoginUser":"(Ver.20130712)User:",
"txtAll":"All",
"txtMkgSize":"Size",
"txtMkgS":"S",
......@@ -122,6 +122,21 @@
"txtMemo":"Memo",
"msgBGMPlayConfirm":"Content BGM will be played automatically.",
"msgPWDNeedChange":"Change password is required. Please back Setting view.",
"msgBGMPagePlayConfirm":"Page BGM will be played automatically."
"msgBGMPagePlayConfirm":"Page BGM will be played automatically.",
"txtBkSelectData":"EN_バックアップするデータを選択してください。",
"txtBkMarking":"EN_マーキング",
"txtBkMemo":"EN_メモ",
"txtBkShiori":"EN_しおり",
"txtResSelect":"EN_リストアするデータを選択してください。",
"txtBkDefault":"EN_バックアップのデフォルト：",
"txtOptPageTrans":"ビューのアニメーション種類",
"txtOptPageTransSlide":"スライド",
"txtOptPageTransFade":"フェード",
"txtOptPageTransRev":"リヴェール＆ムーブイン",
"txtOptPageTransPeriod":"アニメーション時間(Sec)",
"msgPushAlert":"新着メッセージがあります！！！",
"txtPushAlert":"通知",
"txtNext":"次＞",
"txtPrevious":"＜前",
"msgAnonymousLoginErr":"ログインできません。(エラーコード：)"
}
abvw/common/json/lang/lang-ja.json
......@@ -43,7 +43,7 @@
"dspShiori":"しおり",
"dspSetting":"設定変更",
"dspLogout":"ログアウト",
"txtRead":"読む",
"txtRead":"開く",
"txtSort":"並べ替え",
"dspTitleNm":"タイトル",
"dspTitleNmKn":"タイトル（カナ）",
......@@ -64,7 +64,7 @@
"dspBkCancel":"バックアップせずにログアウト",
"txtSearchResult":"検索結果",
"dspHome":"ホーム",
"txtLoginUser":"(Ver.20121221-3)ログイン中：",
"txtLoginUser":"(Ver.20130712)ログイン中：",
"txtAll":"すべて",
"txtMkgSize":"太さ",
"txtMkgS":"小",
......@@ -102,10 +102,10 @@
"txtResMsgNotice":"※リストアすると、現時点のローカルのデータでサーバのバックアップデータを上書きします。リストア後、元の状態に復元できませんので、ご注意ください",
"dspChange":"変更",
"msgNoIndex":"インデックスがありません",
"msgBackupSuccess":"バックアップが正常に終了しました",
"msgBackupFailed":"バックアップに失敗しました",
"msgRestoreSuccess":"リストアが正常に終了しました",
"msgRestoreFailed":"リストアに失敗しました",
"msgBackupSuccess":"のバックアップに成功しました",
"msgBackupFailed":"のバックアップに失敗しました",
"msgRestoreSuccess":"のリストアに成功しました",
"msgRestoreFailed":"のリストアに失敗しました",
"txtDeleteConfirmTitle":"しおり削除確認",
"msgHistoryNotExist":"閲覧履歴はありません。",
"msgChangePassword":"パスワード変更",
......@@ -122,5 +122,22 @@
"txtMemo":"メモ",
"msgBGMPlayConfirm":"コンテンツBGMが自動再生されます。",
"msgPWDNeedChange":"パスワードの変更が必要です。設定変更画面に戻って変更してください。",
"msgBGMPagePlayConfirm":"ページBGMが自動再生されます。"
"msgBGMPagePlayConfirm":"ページBGMが自動再生されます。",
"txtBkSelectData":"バックアップするデータを選択してください。",
"txtBkMarking":"マーキング",
"txtBkMemo":"メモ",
"txtBkShiori":"しおり",
"txtResSelect":"リストアするデータを選択してください。",
"txtBkDefault":"バックアップのデフォルト：",
"txtOptPageTrans":"ビューのアニメーション種類",
"txtOptPageTransSlide":"スライド",
"txtOptPageTransFade":"フェード",
"txtOptPageTransRev":"リヴェール＆ムーブイン",
"txtOptPageTransPeriod":"アニメーション時間(Sec)",
"msgPushAlert":"新着メッセージがあります！！！",
"txtPushAlert":"通知",
"txtNext":"次＞",
"txtPrevious":"＜前",
"msgAnonymousLoginErr":"ログインできません。(エラーコード：)"
}
abvw/common/json/lang/lang-ko.json
......@@ -43,7 +43,7 @@
"dspShiori":"북마크",
"dspSetting":"환경설정",
"dspLogout":"로그아웃",
"txtRead":"열람",
"txtRead":"열기",
"txtSort":"정렬",
"dspTitleNm":"제목",
"dspTitleNmKn":"제목",
......@@ -64,7 +64,7 @@
"dspBkCancel":"로그아웃",
"txtSearchResult":"검색 결과",
"dspHome":"홈",
"txtLoginUser":"(Ver.20121221-3)로그인 중:",
"txtLoginUser":"(Ver.20130712)로그인 중:",
"txtAll":"전체",
"txtMkgSize":"두께",
"txtMkgS":"소",
......@@ -122,5 +122,21 @@
"txtMemo":"메모",
"msgBGMPlayConfirm":"이 컨텐츠는 BGM을 포함하고 있습니다. 재생을 시작합니다.",
"msgPWDNeedChange":"패스워드를 변경해야 합니다. 환경설정에서 패스워드를 변경해 주십시오.",
"msgBGMPagePlayConfirm":"이 페이지는 BGM을 포함하고 있습니다. 재생을 시작합니다."
"msgBGMPagePlayConfirm":"이 페이지는 BGM을 포함하고 있습니다. 재생을 시작합니다.",
"txtBkSelectData":"KO_バックアップするデータを選択してください。",
"txtBkMarking":"KO_マーキング",
"txtBkMemo":"KO_メモ",
"txtBkShiori":"KO_しおり",
"txtResSelect":"KO_リストアするデータを選択してください。",
"txtBkDefault":"KO_バックアップのデフォルト：",
"txtOptPageTrans":"ビューのアニメーション種類",
"txtOptPageTransSlide":"スライド",
"txtOptPageTransFade":"フェード",
"txtOptPageTransRev":"リヴェール＆ムーブイン",
"txtOptPageTransPeriod":"アニメーション時間(Sec)",
"msgPushAlert":"新着メッセージがあります！！！",
"txtPushAlert":"通知",
"txtNext":"次＞",
"txtPrevious":"＜前",
"msgAnonymousLoginErr":"ログインできません。(エラーコード：)"
}
abvw/common/json/sys/conf.json
{
"apiUrl" : "https://221.111.54.26/sc/{0}/abvapi",
"apiLoginUrl" : "https://221.111.54.26/sc/nuabvapi",
"apiResourceDlUrl" : "https://221.111.54.26/scdl/{0}/dl",
"apiUrl" : "http://web3.agentec.jp/acms/{0}/abvapi",
"apiLoginUrl" : "http://web3.agentec.jp/acms/nuabvapi",
"apiResourceDlUrl" : "http://web3.agentec.jp/acms/{0}/dl",
"bookShelfCount": 15,
"bookListCount" : 15,
"screenlockTimeDefault" : 30,
"pushPageCount" : 10,
"pushTimePeriod" : 60,
"debug" : true,
"loginPage" : "index.html",
"anonymousLoginFlg" : false,
"anonymousLoginPath" : "abetest",
"anonymousLoginId" : "nologin",
"appName" : "ABookWebCL",
"appVersion" : "0.0.1"
......
abvw/contentsearch.html
......@@ -41,11 +41,22 @@
<a> </a>
</p>
<header>
<div class="notification-pushmessage" style="display:none;">
新着メッセージがあります！！！
</div>
<div class="cnt_header">
<a class="logo" href="javascript:void(0);" onclick="avwScreenMove(ScreenIds.Home)"> </a>
<div class="menu_language">
<ul>
<li><label class="lang" lang="txtLoginUser">こんにちは</label><label id="login-username"> </label></li>
<li class="pushmessage hide" id="liPushMessage"><label class="lang" lang="txtPushAlert">新着 : </label><label id="numbermessage"></label><span></span>
<div id="list-push-message">
<div id="show-push-message"></div>
<p><a id='prev-page-message' style="display:none;" class="lang" lang="txtPrevious">＜前</a><a id='next-page-message' style="display:none;" class="lang" lang="txtNext">次k＞</a></p>
</div>
</li>
<li class="jp" id="language-jp"><a href="#">日本語</a></li>
<li class="eng" id="language-en"><a href="#">English</a></li>
<li class="kor" id="language-kr"><a href="#">한글</a></li>
......@@ -59,7 +70,7 @@
</div>
</ul>
<p class="button">
<a style="margin-right:0;" class="blue lang" href="#" id="dspLogout" lang="dspLogout">ログアウト</a>
<a style="margin-right:0;display:none;" class="blue lang" href="#" id="dspLogout" lang="dspLogout">ログアウト</a>
<a class="blue lang" href="#" lang="dspSetting" id="dspSetting">設定変更</a>
<a class="blue lang" href="#" lang="dspViewHistory" id="dspViewHistory">閲覧履歴</a>
<a class="blue lang" href="#" id="dspShiori" lang="dspShiori">しおり</a>
......@@ -68,7 +79,7 @@
</div>
</div>
</header>
<section class="sectionbackup1 " id="dlgConfirmBackup1">
<!--<section class="sectionbackup1 " id="dlgConfirmBackup1">
<h1><label class="lang" lang="txtBackupTitle">バックアップ確認</label></h1>
<p class="message"><label lang="txtLogoutBkMsg" class="lang">ログアウトする前にバックアップしますか？</label></p>
......@@ -80,7 +91,29 @@
<a class="cancel lang" href="#" lang="dspBkCancel" id="dlgConfirmBackup-withoutbackup">バックアップしないでログアウト</a>
<a class="ok lang" href="#" id="dlgConfirmBackup-backup" lang="dspBkOK">バックアップしてログアウト</a>
</p>
</section>-->
<section class="sectionbackup1 " id="dlgConfirmBackup1">
<h1><label class="lang" lang="txtBackupTitle">バックアップ確認</label></h1>
<p class="message"><label lang="txtLogoutBkMsg" class="lang">ログアウトする前にバックアップしますか？</label></p>
<p class="message-options">
<label class="option_backup">
<label lang="txtBkSelect" class="lang" class="lang">バックアップするデータを選択してください。</label><br />
<input type="checkbox" id="chkBkAllMarking" class="chkbx" checked="checked" /><label for="chkBkAllMarking" lang="txtBkMarking" class="lang">マーキング</label>
<input type="checkbox" id="chkBkAllMemo" class="chkbx" checked="checked" /><label for="chkBkAllMemo" lang="txtBkMemo" class="lang">メモ</label>
<input type="checkbox" id="chkBkAllShiori" class="chkbx" checked="checked" /><label for="chkBkAllShiori" lang="txtBkShiori" class="lang">しおり</label>
</label>
</p>
<p class="notice">
<input type="checkbox" id="chkRememberBackup" /><label for="chkRememberBackup" class="lang" lang="txtLogoutOptBkCfm">今回の行動を記憶し、次回から確認せずに、同じことをする。</label>
</p>
<p class="backupbtn">
<a class="cancel lang" href="#" lang="dspBkCancel" id="dlgConfirmBackup-withoutbackup">バックアップしないでログアウト</a>
<a class="ok lang" href="#" id="dlgConfirmBackup-backup" lang="dspBkOK">バックアップしてログアウト</a>
</p>
</section>
<article id="contentDetail" class="contentDetail">
<section id='sectionContentDetail' class='sectionContentDetail'>
<a class="closebtn" href="#" id="contentDetailClose"> </a>
......
abvw/contentview.html
......@@ -2,7 +2,7 @@
<html>
<head>
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=9,chrome=1" />
<!--<meta http-equiv="X-UA-Compatible" content="IE=9,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">
......@@ -33,6 +33,15 @@
<script src="./common/js/common.js"></script>
<script src="./common/js/htmlparser.js"></script>
<script src="./common/js/textObject.js"></script>
<!--Start Function : No.17 - Editor : Long - Date : 07/30/2013 - Summary : Include uuid.js for using createUUID function in common.js -->
<script src="./common/js/uuid.js"></script>
<!--End Function : No.17 - Editor : Long - Date : 07/30/2013 - Summary : Include uuid.js for using createUUID function in common.js -->
<script src="js/contentview_CallApi.js" type="text/javascript"></script>
<script src="js/contentview_Events.js" type="text/javascript"></script>
<script src="js/contentview_GetData.js" type="text/javascript"></script>
<script src="js/contentview_InitObjects.js" type="text/javascript"></script>
<script src="js/contentview_CreateObjects.js" type="text/javascript"></script>
<script src="js/contentview_General.js" type="text/javascript"></script>
<script src="./js/contentview.js"></script>
<script src="./js/contentview_Memo.js"></script>
<script src="./js/contentview_Gomu.js"></script>
......@@ -50,8 +59,13 @@
<script type="text/javascript" src="common/js/jquery.powertip.js"></script>
<script type="text/javascript" src="common/js/script.js"></script>
<style>
html, body{
-ms-touch-action : none !important;
}
</style>
</head>
<body id="viewer">
......@@ -188,6 +202,8 @@
<div id="divDialogMemo" style="width:466px;height:389px;display:none; position: absolute"> </div>
<div id="dialog-contenttype-music" style="width:466px;height:389px;display:none; position: absolute"> </div>
<div id="dialogPopUp" class="popuptext_web_dialog"> </div>
<div id="arrow" class="popuptext_arrow"> </div>
<div id="pop_up_memo" class="pop-up-memo">
......
abvw/css/backup.css
......@@ -108,14 +108,9 @@
background-image: url(../css/button_back_on.svg);
}
.sectionbackup1 {
width:500px;
height: 290px;
height: 310px;
border:1px solid #cccccc;
display: none;
padding:0;
......@@ -132,6 +127,17 @@
z-index: 101;
}
.sectionbackup1 .message-options .option_backup
{
font-size:13px;
margin:0 0 0 24px;
}
.sectionbackup1 .message-options .option_backup input
{
margin:0 5px 0 15px;
}
.sectionbackup1 h1{
margin:0 0 38px 0;
padding:0;
......@@ -152,10 +158,17 @@
font-family: 'trebuchet ms', verdana, arial;
}
.sectionbackup1 p{
.sectionbackup1 p
{
width:360px;
margin:0 50px;
}
.sectionbackup1 p.notice
{
text-align:center;
margin-top:20px;
font-size:13px;
}
.sectionbackup1 p.message{
font-size:15px;
font-weight:bold;
......@@ -223,4 +236,9 @@
filter: none;
-ms-filter: none;
background-image: url(../css/button_back_on.svg);
}
.sectionbackup1 .backupbtn a.disabled,.sectionbackup .backupbtn a.disabled
{
}
\ No newline at end of file
abvw/css/header.css
......@@ -23,3 +23,130 @@
{
cursor: pointer;
}
/* push message */
.menu_language ul li.pushmessage
{
-moz-box-shadow:inset 0px 1px 0px 0px #d6ee23;
-webkit-box-shadow:inset 0px 1px 0px 0px #d6ee23;
box-shadow:inset 0px 1px 0px 0px #d6ee23;
background:-webkit-gradient( linear, left top, left bottom, color-stop(0.05, #a4d815), color-stop(1, #83c008) );
background:-moz-linear-gradient( center top, #a4d815 5%, #83c008 100% );
filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#a4d815', endColorstr='#83c008');
background-color:#a4d815;
border:1px solid #83bd07;
display:inline-block;
color:#ffffff;
font-family:arial;
font-size:14px;
font-weight:bold;
padding:2px 0;
line-height:21px;
text-decoration:none;
text-shadow:1px 1px 0px #a2d613;
margin:0 0 0 0;
text-align:center;
padding:0 10px 0 5px;
text-align:center;
cursor:pointer;
position:relative;
}
.menu_language ul li.pushmessage label
{
cursor:pointer;
}
.menu_language ul li.pushmessage span
{
display:inline-block;
width:10px;
height:10px;
margin-left:5px;
cursor:pointer;
}
.menu_language ul li.hide span
{
background:url(arrow_down.png) no-repeat right center;
}
.menu_language ul li.show span
{
background:url(arrow_up.png) no-repeat right center;
}
.menu_language ul li.pushmessage:hover {
background:-webkit-gradient( linear, left top, left bottom, color-stop(0.05, #83c008), color-stop(1, #a4d815) );
background:-moz-linear-gradient( center top, #83c008 5%, #a4d815 100% );
filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#83c008', endColorstr='#a4d815');
background-color:#83c008;
}
#numbermessage
{
color:#f00;
margin-left:8px;
min-width:20px;
display:inline-block;
}
#list-push-message
{
position:absolute;
top:100%;
left:0;
border:solid 1px #444;
background-color:#fff;
z-index:1;
text-shadow:none;
padding:10px;
font-weight:normal;
width:200px;
text-align:left;
display:none;
}
#list-push-message div
{
margin:0;
padding:0;
list-style-type:none;
background-color:#fff;
}
#list-push-message div
{
color:#000;
font-size:12px;
padding:3px 0;
white-space:nowrap;
line-height:150%;
}
#list-push-message p
{
text-align:right;
margin:0;
padding:0;
}
#list-push-message p a
{
text-decoration:underline;
color:#00f;
padding:0 5px;
}
.notification-pushmessage
{
position:fixed;
height:40px;
line-height:40px;
text-align:center;
background-color:#bde;
opacity:0.8;
border:solid 1px #333;
top:0;
left:0;
right:0;
color:#000;
border:solid 1px #000;
font-weight:bold;
z-index:10000;
font-size:13px;
}
.toast-item-loading
{
text-align:center;
height:40px;
background:url(../img/data_loading.gif) no-repeat center;
}
\ No newline at end of file
abvw/css/list_shirori_detail.css
......@@ -90,7 +90,6 @@ article .contentDetail {
}
.sectionContentDetail #book_data .read_btn a.read {
position:absolute;
-moz-box-shadow:inset 0px 1px 0px 0px #d6ee23;
-webkit-box-shadow:inset 0px 1px 0px 0px #d6ee23;
box-shadow:inset 0px 1px 0px 0px #d6ee23;
......
abvw/css/login.css
......@@ -276,4 +276,18 @@ section h1{
{
font-size: large;
font-family: 'trebuchet ms', verdana, arial;
}
/* splash */
.splash-screen
{
background-color:#244;
text-align:center;
background:url(Abook_splash.jpg) no-repeat center;
position:fixed;
left:0;
top:0;
right:0;
bottom:0;
}
\ No newline at end of file
abvw/css/restore.css
......@@ -42,9 +42,13 @@
width:320px;
margin:0 50px;
}
.sectionrestore p.message{
margin-bottom:20px;
.sectionrestore p.message-options
{
margin-bottom:20px;
}
.sectionrestore p.message
{
/*margin-bottom:20px;*/
font-size:15px;
font-weight:bold;
color:#333;
......@@ -115,4 +119,8 @@
filter: none;
-ms-filter: none;
background-image: url(../css/button_back_on.svg);
}
.sectionrestore .restorebtn a.disabled
{
}
\ No newline at end of file
abvw/css/setting.css
......@@ -166,7 +166,7 @@ section div#user_info .passchgbtn a:hover:not(:target) {
div#user_option{
width:inherit;
height:395px;
height:415px;
background:url(../img/common/back_dot.gif);
-moz-border-radius:6px;
-webkit-border-radius:6px;
......@@ -215,6 +215,15 @@ section div#user_option .logout_backup{
margin:0 0 16px 30px;
font-size:13px;
}
section div#user_option .option_backup
{
font-size:13px;
margin:0 0 0 24px;
}
section div#user_option .option_backup input
{
margin:0 5px 0 15px;
}
section div#user_option input {
display:inline;
......@@ -223,6 +232,13 @@ section div#user_option input {
padding:0;
}
.message-options
{
font-weight:normal;
text-align:center;
font-size:13px;
margin-bottom:20px;
}
section div#user_option .backupbtn {
margin:0 0 35px 30px;
......
abvw/history.html
......@@ -40,11 +40,23 @@
<a> </a>
</p>
<header>
<div class="notification-pushmessage" style="display:none;">
新着メッセージがあります！！！
</div>
<div class="cnt_header">
<a class="logo" href="javascript:void(0);" onclick="avwScreenMove(ScreenIds.Home)"> </a>
<div class="menu_language">
<ul>
<li><label class="lang" lang="txtLoginUser">こんにちは</label><label id="login-username"> </label></li>
<li class="pushmessage hide" id="liPushMessage"><label class="lang" lang="txtPushAlert">新着 : </label><label id="numbermessage"></label><span></span>
<div id="list-push-message">
<div id="show-push-message"></div>
<p><a id='prev-page-message' style="display:none;" class="lang" lang="txtPrevious">＜前</a><a id='next-page-message' style="display:none;" class="lang" lang="txtNext">次k＞</a></p>
</div>
</li>
<li class="jp" id="language-jp"><a href="#">日本語</a></li>
<li class="eng" id="language-en"><a href="#">English</a></li>
<li class="kor" id="language-kr"><a href="#">한글</a></li>
......@@ -58,7 +70,7 @@
</div>
</ul>
<p class="button">
<a style="margin-right:0;" class="blue lang" href="#" id="dspLogout" lang="dspLogout">ログアウト</a>
<a style="margin-right:0;display:none;" class="blue lang" href="#" id="dspLogout" lang="dspLogout">ログアウト</a>
<a class="blue lang" href="#" lang="dspSetting" id="dspSetting">設定変更</a>
<a class="blue lang" href="#" lang="dspViewHistory" id="dspViewHistory">閲覧履歴</a>
<a class="blue lang" href="#" id="dspShiori" lang="dspShiori">しおり</a>
......@@ -67,7 +79,7 @@
</div>
</div>
</header>
<section class="sectionbackup1 " id="dlgConfirmBackup1">
<!-- <section class="sectionbackup1 " id="dlgConfirmBackup1">
<h1><label class="lang" lang="txtBackupTitle">バックアップ確認</label></h1>
<p class="message"><label lang="txtLogoutBkMsg" class="lang">ログアウトする前にバックアップしますか？</label></p>
......@@ -79,7 +91,28 @@
<a class="cancel lang" href="#" lang="dspBkCancel" id="dlgConfirmBackup-withoutbackup">バックアップしないでログアウト</a>
<a class="ok lang" href="#" id="dlgConfirmBackup-backup" lang="dspBkOK">バックアップしてログアウト</a>
</p>
</section>
</section>-->
<section class="sectionbackup1 " id="dlgConfirmBackup1">
<h1><label class="lang" lang="txtBackupTitle">バックアップ確認</label></h1>
<p class="message"><label lang="txtLogoutBkMsg" class="lang">ログアウトする前にバックアップしますか？</label></p>
<p class="message-options">
<label class="option_backup">
<label lang="txtBkSelect" class="lang" class="lang">バックアップするデータを選択してください。</label><br />
<input type="checkbox" id="chkBkAllMarking" class="chkbx" checked="checked" /><label for="chkBkAllMarking" lang="txtBkMarking" class="lang">マーキング</label>
<input type="checkbox" id="chkBkAllMemo" class="chkbx" checked="checked" /><label for="chkBkAllMemo" lang="txtBkMemo" class="lang">メモ</label>
<input type="checkbox" id="chkBkAllShiori" class="chkbx" checked="checked" /><label for="chkBkAllShiori" lang="txtBkShiori" class="lang">しおり</label>
</label>
</p>
<p class="notice">
<input type="checkbox" id="chkRememberBackup" /><label for="chkRememberBackup" class="lang" lang="txtLogoutOptBkCfm">今回の行動を記憶し、次回から確認せずに、同じことをする。</label>
</p>
<p class="backupbtn">
<a class="cancel lang" href="#" lang="dspBkCancel" id="dlgConfirmBackup-withoutbackup">バックアップしないでログアウト</a>
<a class="ok lang" href="#" id="dlgConfirmBackup-backup" lang="dspBkOK">バックアップしてログアウト</a>
</p>
</section>
<article id="contentDetail" class="contentDetail">
<section id='sectionContentDetail' class='sectionContentDetail'>
<a class="closebtn" href="#" id="contentDetailClose"> </a>
......
abvw/home.html
......@@ -32,6 +32,7 @@
<script src="./common/js/avweb.js"></script>
<script src="./common/js/i18n.js"></script>
<script src="./common/js/common.js"></script>
<script src="./common/js/uuid.js"></script>
<script src="./js/home.js"></script>
<script src="./js/header.js"></script>
<script src="./common/js/gotop.js"></script>
......@@ -50,11 +51,22 @@
<a> </a>
</p>
<header>
<div class="notification-pushmessage" style="display:none;">
新着メッセージがあります！！！
</div>
<div class="cnt_header">
<a class="logo" href="javascript:void(0);" onclick="avwScreenMove(ScreenIds.Home)"> </a>
<div class="menu_language">
<ul>
<li><label class="lang" lang="txtLoginUser">こんにちは</label><label id="login-username"> </label></li>
<li class="pushmessage hide" id="liPushMessage"><label class="lang" lang="txtPushAlert">新着 : </label><label id="numbermessage"></label><span></span>
<div id="list-push-message">
<div id="show-push-message"></div>
<p><a id='prev-page-message' style="display:none;" class="lang" lang="txtPrevious">＜前</a><a id='next-page-message' style="display:none;" class="lang" lang="txtNext">次k＞</a></p>
</div>
</li>
<li class="jp" id="language-jp"><a href="#">日本語</a></li>
<li class="eng" id="language-en"><a href="#">English</a></li>
<li class="kor" id="language-kr"><a href="#">한글</a></li>
......@@ -68,7 +80,7 @@
</div>
</ul>
<p class="button">
<a style="margin-right:0;" class="blue lang" href="#" id="dspLogout" lang="dspLogout">ログアウト</a>
<a style="margin-right:0;display:none;" class="blue lang" href="#" id="dspLogout" lang="dspLogout">ログアウト</a>
<a class="blue lang" href="#" lang="dspSetting" id="dspSetting">設定変更</a>
<a class="blue lang" href="#" lang="dspViewHistory" id="dspViewHistory">閲覧履歴</a>
<a class="blue lang" href="#" id="dspShiori" lang="dspShiori">しおり</a>
......@@ -77,7 +89,7 @@
</div>
</div>
</header>
<section class="sectionbackup1 " id="dlgConfirmBackup1">
<!--<section class="sectionbackup1 " id="dlgConfirmBackup1">
<h1><label class="lang" lang="txtBackupTitle">バックアップ確認</label></h1>
<p class="message"><label lang="txtLogoutBkMsg" class="lang">ログアウトする前にバックアップしますか？</label></p>
......@@ -89,6 +101,26 @@
<a class="cancel lang" href="#" lang="dspBkCancel" id="dlgConfirmBackup-withoutbackup">バックアップしないでログアウト</a>
<a class="ok lang" href="#" id="dlgConfirmBackup-backup" lang="dspBkOK">バックアップしてログアウト</a>
</p>
</section>-->
<section class="sectionbackup1 " id="dlgConfirmBackup1">
<h1><label class="lang" lang="txtBackupTitle">バックアップ確認</label></h1>
<p class="message"><label lang="txtLogoutBkMsg" class="lang">ログアウトする前にバックアップしますか？</label></p>
<p class="message-options">
<label class="option_backup">
<label lang="txtBkSelect" class="lang" class="lang">バックアップするデータを選択してください。</label><br />
<input type="checkbox" id="chkBkAllMarking" class="chkbx" checked="checked" /><label for="chkBkAllMarking" lang="txtBkMarking" class="lang">マーキング</label>
<input type="checkbox" id="chkBkAllMemo" class="chkbx" checked="checked" /><label for="chkBkAllMemo" lang="txtBkMemo" class="lang">メモ</label>
<input type="checkbox" id="chkBkAllShiori" class="chkbx" checked="checked" /><label for="chkBkAllShiori" lang="txtBkShiori" class="lang">しおり</label>
</label>
</p>
<p class="notice">
<input type="checkbox" id="chkRememberBackup" /><label for="chkRememberBackup" class="lang" lang="txtLogoutOptBkCfm">今回の行動を記憶し、次回から確認せずに、同じことをする。</label>
</p>
<p class="backupbtn">
<a class="cancel lang" href="#" lang="dspBkCancel" id="dlgConfirmBackup-withoutbackup">バックアップしないでログアウト</a>
<a class="ok lang" href="#" id="dlgConfirmBackup-backup" lang="dspBkOK">バックアップしてログアウト</a>
</p>
</section>
<article id="contentDetail">
<section id='sectionContentDetail' class='sectionContentDetail'>
......@@ -110,9 +142,6 @@
<div class="wrapper">
<div id="main">
<div class="tabUnit">
<ul class="switchingTab">
<li class="colleft" ><a href="#list_0" class="current lang" lang="txtGen" id="lnkbtnGenre">ジャンル</a></li>
......
abvw/js/contentview.js
This source diff could not be displayed because it is too large. You can view the blob instead.
abvw/js/contentview_CallApi.js 0 → 100644

/// <reference path="../common/js/jquery-ui-1.8.23.custom.min.js" />
/// <reference path="../common/js/common.js" />
/// <reference path="contentview_VarDef.js" />
//Call API
function abapi(name, param, method, callback) {
avwCmsApiSync(ClientData.userInfo_accountPath(), name, method, param, callback, null);
};
/* get Json stored content info */
function getJsonContentInfo() {
avwGrabContentPageImage(ClientData.userInfo_accountPath(),
{ contentId: contentID, sid: ClientData.userInfo_sid(), pageNo: 1 },
function (data) {
pageImages = data;
webGetContentData();
getSearchDataFromJson();
getJsonDataPageTitle();
getJsonDataType4();
getJsonDataType5();
getDataJsonFile();
webGetPageImageContentSize();
},
function (xmlHttpRequest, txtStatus, errorThrown) {
showErrorScreen();
});
};
function webGetPageImageContentSize() {
avwCmsApi(ClientData.userInfo_accountPath(),
"webContentPageSize",
"GET",
{ contentId: contentID, sid: ClientData.userInfo_sid() },
function (data) {
widthContentImage = data.width;
heightContentImage = data.height;
},
null);
};
function webGetContentData() {
avwCmsApi(ClientData.userInfo_accountPath(),
"webGetContent",
"GET",
{ contentId: contentID, sid: ClientData.userInfo_sid(), getType: 1 },
function (data) {
totalPage = data.contentData.allPageNum;
},
null);
};
/* get Json stored page title */
function getJsonDataPageTitle() {
avwCmsApi(ClientData.userInfo_accountPath(),
"webGetContent",
"GET",
{ contentId: contentID, sid: ClientData.userInfo_sid(), getType: 3 },
function (data) {
dataPageTitle = [];
for (var nIndex = 0; nIndex < totalPage; nIndex++) {
dataPageTitle.push("");
}
if (data.contentData) {
if (data.contentData.titleInfo) {
dataPageTitle = data.contentData.titleInfo;
}
}
},
null);
};
/* get Json webGetContent4 */
function getJsonDataType4() {
avwCmsApi(ClientData.userInfo_accountPath(),
"webGetContent",
"GET",
{ contentId: contentID, sid: ClientData.userInfo_sid(), getType: 4 },
function (data) {
dataJsonType4 = data.contentData.linkData;
},
null);
};
/* get Json webGetContent5 */
function getJsonDataType5() {
avwCmsApi(ClientData.userInfo_accountPath(),
"webGetContent",
"GET",
{ contentId: contentID, sid: ClientData.userInfo_sid(), getType: 5 },
function (data) {
dataJsonType5 = data.contentData.outlineData;
},
null);
};
/* read file Json -> get page objects */
function getDataJsonFile() {
//get content from JSON
avwCmsApi(ClientData.userInfo_accountPath(),
"webGetContent",
"GET",
{ sid: ClientData.userInfo_sid(), contentId: contentID, getType: 2 },
function (data) {
var JsonFile = data.contentData;
pageObjectsData = [];
if (JsonFile.vertical) {
if (JsonFile.vertical.pages) {
pageObjectsData = JsonFile.vertical.pages;
}
}
else if (JsonFile.horizontal) {
if (JsonFile.horizontal.pages) {
pageObjectsData = JsonFile.horizontal.pages;
}
}
getPageObjectsByPageIndex(pageObjectsData, 0);
},
null);
};
function loadDataBookmark(lstPageNo) {
if (isSendingData == true) {
avwCmsApi(ClientData.userInfo_accountPath(),
"webContentPage",
"GET",
{ sid: ClientData.userInfo_sid(), contentId: contentID, pageNos: lstPageNo[0], thumbnailFlg: 1 },
function (data) {
getDataLoaded(data.pages);
//Resize Image
var imgTemp = new Image();
$('#img_bookmark_' + data.pages[0].pageNo).attr('src', formatStringBase64(data.pages[0].pageThumbnail));
imgTemp.onload = function () {
if (imgTemp.width > imgTemp.height) {
$("img.imgbox").attr('height', '');
$("img.imgbox").removeAttr('height');
$("img.imgbox").attr('width', '43');
}
else {
$("img.imgbox").attr('width', '');
$("img.imgbox").removeAttr('width');
$("img.imgbox").attr('height', '43');
}
};
imgTemp.src = formatStringBase64(data.pages[0].pageThumbnail);
lstPageNo = jQuery.grep(lstPageNo, function (value) {
return value != lstPageNo[0];
});
if (lstPageNo.length > 0) {
loadDataBookmark(lstPageNo);
} else {
isSendingData = false;
}
},
null);
}
};
/* get data using for search */
function getSearchDataFromJson() {
//get data from JSON file
var arrPageNo = '';
for (var nIndex = 0; nIndex < totalPage; nIndex++) {
if (nIndex == 0) {
arrPageNo += (nIndex + 1);
} else {
arrPageNo += "," + (nIndex + 1);
}
}
avwCmsApi(ClientData.userInfo_accountPath(),
"webContentPage",
"GET",
{ sid: ClientData.userInfo_sid(), contentId: contentID, thumbnailFlg: 0 },
function (data) {
contentName = data.contentTitle;
dataWebContentPage = data;
},
null);
};
function loadDataSearch(lstPageNo) {
if (isSendingData == true) {
avwCmsApi(ClientData.userInfo_accountPath(),
"webContentPage",
"GET",
{ sid: ClientData.userInfo_sid(), contentId: contentID, pageNos: lstPageNo[0], thumbnailFlg: 1 },
function (data) {
getDataLoaded(data.pages);
//Resize Image
var imgTemp = new Image();
$('#img_search_' + data.pages[0].pageNo).attr('src', formatStringBase64(data.pages[0].pageThumbnail));
imgTemp.onload = function () {
if (imgTemp.width > imgTemp.height) {
$("img.imgbox").attr('height', '');
$("img.imgbox").removeAttr('height');
$("img.imgbox").attr('width', '43');
}
else {
$("img.imgbox").attr('width', '');
$("img.imgbox").removeAttr('width');
$("img.imgbox").attr('height', '43');
}
};
imgTemp.src = formatStringBase64(data.pages[0].pageThumbnail);
lstPageNo = jQuery.grep(lstPageNo, function (value) {
return value != lstPageNo[0];
});
if (lstPageNo.length > 0) {
loadDataSearch(lstPageNo);
} else {
isSendingData = false;
}
},
null);
}
};
abvw/js/contentview_Marking.js
......@@ -39,10 +39,17 @@ function dlgMarking_dspSave_click() {
/*create new entity marking */
var marking = new MarkingEntity();
marking.contentid = contentID;
marking.pageNo = changePageIndex(getPageIndex());
marking.content = canvas_draw.toDataURL("image/png");
if(contentType == ContentTypeKeys.Type_Image){
marking.pageNo = 1;
}else{
marking.pageNo = changePageIndex(getPageIndex());
}
marking.content = canvas_draw.toDataURL("image/png");
//=== Start Function : No.17 Editor : Long Date: 07/30/2013 Summary : Set UTC time and UUID when create new marking/maker.
marking.markingid = getUUID();
marking.registerDate = new Date();
//=== End Function : No.17 Editor : Long Date: 07/30/2013 Summary : Set UTC time and UUID when create new marking/maker.
/* insert marking */
var arr = ClientData.MarkingData();
var nIndexMarking = -1;
......@@ -64,7 +71,14 @@ function dlgMarking_dspSave_click() {
arr.push(marking);
} else {
/* case exist marking */
arr[nIndexMarking] = marking;
//=== Start Function : No.17 Editor : Long Date: 07/30/2013 Summary : Set UTC time when edit marking/maker.
var editedMarkingEntity = arr[nIndexMarking];
editedMarkingEntity.content = canvas_draw.toDataURL("image/png");
editedMarkingEntity.registerDate = new Date();
arr[nIndexMarking] = editedMarkingEntity;
//arr[nIndexMarking] = marking;
//=== End Function : No.17 Editor : Long Date: 07/30/2013 Summary : Set UTC time when edit marking/maker.
}
}
}
......@@ -86,7 +100,7 @@ function dlgMarking_dspSave_click() {
$('#imgmarking').addClass('marking');*/
/*set flag change marking */
ClientData.isChangedMemo(true);
ClientData.isChangedMarkingData(true);
ClientData.IsHideToolbar(false);
......
abvw/js/contentview_Memo.js
......@@ -49,7 +49,10 @@ function memoSaveFunction(){
var imagePt = screenToImage(targetX, targetY);
memoObj.posX = imagePt.x;
memoObj.posY = imagePt.y;
//=== Start Function : No.17 Editor : Long Date: 07/30/2013 Summary : Set UTC time and UUID when create new memo.
memoObj.memoid = getUUID();
memoObj.registerDate = new Date();
//=== End Function : No.17 Editor : Long Date: 07/30/2013 Summary : Set UTC time and UUID when create new memo.
tempArr = ClientData.MemoData();
tempArr.push(memoObj);
ClientData.MemoData(tempArr);
......@@ -203,7 +206,9 @@ function editMemoFunction(){
var editContent = $('#txaMemoContent').val();
tempEntity.Text = editContent;
//=== Start Function : No.17 Editor : Long Date: 07/30/2013 Summary : Set UTC time when edit memo.
tempEntity.registerDate = new Date();
//=== End Function : No.17 Editor : Long Date: 07/30/2013 Summary : Set UTC time when edit memo.
arrTemp[EditIndex] = tempEntity;
ClientData.MemoData(arrTemp);
......
abvw/js/login.js
......@@ -25,7 +25,10 @@ var user_data_backup;
var marking;
var force_login_periodically;
var login_errorMessage = "";
var login_errorMessage = "";
var timeWaitSplashScreen = 2000;// wait splash screen 2 second
//Load login Info
function loadLoginInfo() {
......@@ -221,6 +224,7 @@ function processLogin() {
userinfo_sid = data.sid;
userInfo_userName = data.userName;
optionList = data.serviceOptionList;
getServiceOptionList();
if (data.result == 'success') {
......@@ -228,6 +232,9 @@ function processLogin() {
// Save retrieved info
saveLoginInfo();
// set number new push message to 0
ClientData.pushInfo_newMsgNumber(0);
$('#main-error-message').css('display', 'none');
if (data.requirePasswordChange == 0) {
......@@ -311,7 +318,7 @@ function processLogin() {
}
}
else {
login_errorMessage = data.errorMessage;
login_errorMessage = data.errorMessage;
$('#main-error-message').html(format(i18nText('msgLoginErrWrong'), data.errorMessage).toString());
$('#main-error-message').show();
......@@ -330,14 +337,14 @@ function processLogin() {
}
}, function (xhr, statusText, errorThrown) {
if (xhr.responseText && xhr.status != 0) {
login_errorMessage = JSON.parse(xhr.responseText).errorMessage;
$('#main-error-message').html(format(i18nText('msgLoginErrWrong'), JSON.parse(xhr.responseText).errorMessage).toString());
login_errorMessage = JSON.parse(xhr.responseText).errorMessage;
$('#main-error-message').html(format(i18nText('msgLoginErrWrong'), JSON.parse(xhr.responseText).errorMessage).toString());
} else {
$('#main-error-message').html(format(i18nText('msgLoginErrWrong'), 'E001'));
$('#main-error-message').html(format(i18nText('msgLoginErrWrong'), 'E001'));
}
$('#main-error-message').show();
});
});
};
//Change Password Process
......@@ -413,7 +420,7 @@ function changeLanguageEn(){
};
//Login click function
function loginFunction(){
function loginFunction() {
if (checkValidation()) {
processLogin();
}
......@@ -454,25 +461,33 @@ function CloseChangePasswordDialog(){
//Save Service Option
function saveServiceUserOption(){
$.each(optionList, function(i, option){
if(option.serviceName == 'force_pw_change_periodically'){
ClientData.serviceOpt_force_pw_change_periodically(option.value);
}
else if(option.serviceName == 'force_pw_change_on_login'){
ClientData.serviceOpt_force_pw_change_on_login(option.value);
}
else if(option.serviceName == 'force_login_periodically'){
ClientData.serviceOpt_force_login_periodically(option.value);
}
else if(option.serviceName == 'marking'){
ClientData.serviceOpt_marking(option.value);
}
else if(option.serviceName == 'user_data_backup'){
ClientData.serviceOpt_user_data_backup(option.value);
}
});
$.each(optionList, function (i, option) {
if (option.serviceName == 'force_pw_change_periodically') {
ClientData.serviceOpt_force_pw_change_periodically(option.value);
}
else if (option.serviceName == 'force_pw_change_on_login') {
ClientData.serviceOpt_force_pw_change_on_login(option.value);
}
// No.8: do not use serviceOpt_force_login_periodically
// else if (option.serviceName == 'force_login_periodically') {
// ClientData.serviceOpt_force_login_periodically(option.value);
// }
else if (option.serviceName == 'marking') {
ClientData.serviceOpt_marking(option.value);
}
else if (option.serviceName == 'user_data_backup') {
ClientData.serviceOpt_user_data_backup(option.value);
}
else if (option.serviceName == 'web_screen_lock') {
ClientData.serviceOpt_web_screen_lock(option.value);
}
else if (option.serviceName == 'web_screen_lock_wait') {
ClientData.serviceOpt_web_screen_lock_wait(option.value);
}
});
};
//Get Service Option
......@@ -511,9 +526,26 @@ function loginWhenClickEnter(e){
};
$(document).ready(function (e) {
setTimeout(function () {
if (isAnonymousLogin()) {
initLoginAnonymousUser();
}
else {
$('#splashscreen').fadeOut(timeWaitSplashScreen, 'swing', function ()
{
$('#login-screen').fadeIn(1000, 'swing');
});
initLoginNormalUser();
}
}, timeWaitSplashScreen);
});
// init login for normal user
function initLoginNormalUser() {
document.title = i18nText('dspLogin') + ' | ' + i18nText('sysAppTitle');
//Initial Screen
initialScreen();
//Change language japanese
......@@ -528,7 +560,65 @@ $(document).ready(function (e) {
$('#btnChange').click(changePassFunction);
//Button Skip click event
$('#btnSkip').click(skipPassFunction);
$('#txtPassword').keydown(loginWhenClickEnter);
};
});
// init login for anonymous user
function initLoginAnonymousUser() {
var sysSettings = avwSysSetting(); // get info in conf.json
var params = {
previousSid: null,
loginId: sysSettings.anonymousLoginId,
urlpath: sysSettings.anonymousLoginPath
};
avwCmsApiWithUrl(sysSettings.apiLoginUrl, null, 'webClientAnonymousLogin', 'post', params, function (data) {
if (data.result == 'success') {
//clear session of old anonymous user
SessionStorageUtils.clear();
avwUserSessionObj = null;
// create new session for anonymous user
avwCreateUserSession();
// set info user anonymous login
ClientData.userInfo_accountPath(sysSettings.anonymousLoginPath);
ClientData.userInfo_accountPath_session(sysSettings.anonymousLoginPath);
ClientData.userInfo_loginId(sysSettings.anonymousLoginId);
ClientData.userInfo_loginId_session(sysSettings.anonymousLoginId);
ClientData.userInfo_userName(data.userName);
ClientData.userInfo_sid(data.sid);
ClientData.userInfo_sid_local(data.sid);
// clear all local storage data of old anonymous
LocalStorageUtils.clear();
// hide splash screen then move to home page
$('#splashscreen').fadeOut('slow', 'swing', function () {
avwScreenMove("abvw/" + ScreenIds.Home);
});
}
else {
showMessageErrorLoginAnonymous();
}
}, function (xhr, statusText, errorThrown) {
showMessageErrorLoginAnonymous();
});
};
function showMessageErrorLoginAnonymous() {
$().toastmessage({ position: 'middle-center' });
$().toastmessage('showToast', {
type: 'error',
sticky: true,
text:i18nText('msgAnonymousLoginErr')
});
$('.toast-position-middle-center').css('width', '400px');
};
index.html
<!DOCTYPE html>
<!DOCTYPE html>
<html>
<head>
<meta charset="UTF-8" />
......
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