Skip to content

C
check
Commit 6865932b by Motohisa Nakano
Options

20121217-3

parent 5224d11b
Showing with 77 additions and 38 deletions
abvw/common/js/common.js
...@@ -1857,15 +1857,11 @@ function unlockFunction(inputPass) { ...@@ -1857,15 +1857,11 @@ function unlockFunction(inputPass) {
errorCode = JSON.parse(xhr.responseText); errorCode = JSON.parse(xhr.responseText);
} }
else { else {
// System error errorCode = { errorMessage: "E001" };
showSystemError();
} }
}); });
// Check error
if (avwHasError()) {
return;
}
if (result == true) { if (result == true) {
if (window.onUnlock) { if (window.onUnlock) {
onUnlock(); onUnlock();
......
abvw/common/json/lang/lang-en.json
...@@ -64,7 +64,7 @@ ...@@ -64,7 +64,7 @@
"dspBkCancel":"Logout", "dspBkCancel":"Logout",
"txtSearchResult":"Result", "txtSearchResult":"Result",
"dspHome":"Home", "dspHome":"Home",
"txtLoginUser":"(Ver.20121214-1)User:", "txtLoginUser":"(Ver.20121217-3)User:",
"txtAll":"All", "txtAll":"All",
"txtMkgSize":"Size", "txtMkgSize":"Size",
"txtMkgS":"S", "txtMkgS":"S",
...@@ -119,5 +119,6 @@ ...@@ -119,5 +119,6 @@
"txtMemoNew":"New", "txtMemoNew":"New",
"txtMemoPaste":"Paste", "txtMemoPaste":"Paste",
"txtMemoClear":"Clear", "txtMemoClear":"Clear",
"txtMemo":"Memo" "txtMemo":"Memo",
"msgBGMPlayConfirm":"EN:このコンテンツはBGMが流れるようになっています。BGMを再生してもよろしいですか？"
} }
abvw/common/json/lang/lang-ja.json
...@@ -64,7 +64,7 @@ ...@@ -64,7 +64,7 @@
"dspBkCancel":"バックアップせずにログアウト", "dspBkCancel":"バックアップせずにログアウト",
"txtSearchResult":"検索結果", "txtSearchResult":"検索結果",
"dspHome":"ホーム", "dspHome":"ホーム",
"txtLoginUser":"(Ver.20121214-1)ログイン中：", "txtLoginUser":"(Ver.20121217-3)ログイン中：",
"txtAll":"すべて", "txtAll":"すべて",
"txtMkgSize":"太さ", "txtMkgSize":"太さ",
"txtMkgS":"小", "txtMkgS":"小",
...@@ -119,5 +119,6 @@ ...@@ -119,5 +119,6 @@
"txtMemoNew":"新規", "txtMemoNew":"新規",
"txtMemoPaste":"貼り付け", "txtMemoPaste":"貼り付け",
"txtMemoClear":"クリア", "txtMemoClear":"クリア",
"txtMemo":"メモ" "txtMemo":"メモ",
"msgBGMPlayConfirm":"このコンテンツはBGMが流れるようになっています。BGMを再生してもよろしいですか？"
} }
abvw/common/json/lang/lang-ko.json
...@@ -64,7 +64,7 @@ ...@@ -64,7 +64,7 @@
"dspBkCancel":"로그아웃", "dspBkCancel":"로그아웃",
"txtSearchResult":"검색 결과", "txtSearchResult":"검색 결과",
"dspHome":"홈", "dspHome":"홈",
"txtLoginUser":"(Ver.20121214-1)로그인 중:", "txtLoginUser":"(Ver.20121217-3)로그인 중:",
"txtAll":"전체", "txtAll":"전체",
"txtMkgSize":"두께", "txtMkgSize":"두께",
"txtMkgS":"소", "txtMkgS":"소",
...@@ -119,5 +119,6 @@ ...@@ -119,5 +119,6 @@
"txtMemoNew":"신규", "txtMemoNew":"신규",
"txtMemoPaste":"붙여 넣기", "txtMemoPaste":"붙여 넣기",
"txtMemoClear":"클리어", "txtMemoClear":"클리어",
"txtMemo":"메모" "txtMemo":"메모",
"msgBGMPlayConfirm":"KO:このコンテンツはBGMが流れるようになっています。BGMを再生してもよろしいですか？"
} }
abvw/contentview_textcopy.html 0 → 100644
<!DOCTYPE html>
<html>
<head>
<meta charset="UTF-8" />
<title>テキストコピー　｜ ABook閲覧ウェブ版　（言語対応）</title>
<script src="common/js/jquery-1.8.1.min.js" type="text/javascript"></script>
<script>
$(document).ready(function () {
var data = window.opener.getText();
$('#result').html(data.text);
document.title = data.title;
});
</script>
<style>
#result {
-webkit-box-shadow: 3px 3px 8px rgba(50, 50, 50, 0.4);
-moz-box-shadow: 3px 3px 8px rgba(50, 50, 50, 0.4);
box-shadow: 3px 3px 8px rgba(50, 50, 50, 0.4);
background:#FFFFFF;
border:solid 1px #cfd0d0;
border-top: 1px solid #cfd0d0;
vertical-align:middle;
word-wrap:break-word;
padding: 5px;
line-height: 25px;
margin: 30px 20px 20px 20px;
min-height: 300px;
}
</style>
</head>
<body>
<div id="result"></div>
</body>
</html>
abvw/css/contentview.css
...@@ -418,7 +418,8 @@ div .ui-slider-range, .ui-widget-header, .ui-slider-range-max { ...@@ -418,7 +418,8 @@ div .ui-slider-range, .ui-widget-header, .ui-slider-range-max {
z-index: 102; z-index: 102;
font-family: Verdana; font-family: Verdana;
font-size: 10pt; font-size: 10pt;
border-radius: 10px; border-radius: 10px;
z-index: 101;
} }
.popuptext_arrow { .popuptext_arrow {
......
abvw/css/viewer.css
...@@ -38,6 +38,7 @@ ...@@ -38,6 +38,7 @@
html,body{ html,body{
width:100%; width:100%;
height:100%;
} }
body{ body{
...@@ -51,8 +52,7 @@ body{ ...@@ -51,8 +52,7 @@ body{
#wrapper { #wrapper {
max-width:none; max-width:none;
min-width:1000px; min-width:1000px;
height:100%;
} }
...@@ -74,8 +74,7 @@ header{ ...@@ -74,8 +74,7 @@ header{
max-width:none; max-width:none;
min-width:1000px; min-width:1000px;
height:60px; height:60px;
position:absolute; /*position:absolute;*/
width:100%;
} }
/*ヘッダー左カラム*/ /*ヘッダー左カラム*/
...@@ -944,6 +943,7 @@ aside.bookmarkBox li .imgbox{ ...@@ -944,6 +943,7 @@ aside.bookmarkBox li .imgbox{
border:solid 1px #444; border:solid 1px #444;
background:#ccc; background:#ccc;
margin:0 4px 0 0; margin:0 4px 0 0;
} }
aside.bookmarkBox li .mdltext{ aside.bookmarkBox li .mdltext{
...@@ -1067,15 +1067,15 @@ aside.bookmarkBox .last{ ...@@ -1067,15 +1067,15 @@ aside.bookmarkBox .last{
.transition .last {width:56px;background-position:-174px 0;} .transition .last {width:56px;background-position:-174px 0;}
.transition a:hover.last {background-position:-174px -33px;} .transition a:hover.last {background-position:-174px -33px;}
.transition .begin_device {width:59px;background-position:0 -33px;} .transition .begin_device {width:59px;background-position:0 0;}
.transition .prev_device {width:57px;background-position:-59px -33px;} .transition .prev_device {width:57px;background-position:-59px 0;}
.transition .next_device {width:58px;background-position:-116px -33px;} .transition .next_device {width:58px;background-position:-116px 0;}
.transition .last_device {width:56px;background-position:-174px -33px;} .transition .last_device {width:56px;background-position:-174px 0;}
.transition .begin_off {width:59px;background-position:0 0;} .transition .begin_off {width:59px;background-position:0 -66px;}
.transition .prev_off {width:57px;background-position:-59px 0;} .transition .prev_off {width:57px;background-position:-59px -66px;}
.transition .next_off {width:58px;background-position:-116px 0;} .transition .next_off {width:58px;background-position:-116px -66px;}
.transition .last_off {width:56px;background-position:-174px 0;} .transition .last_off {width:56px;background-position:-174px -66px;}
/*----------------------------*/ /*----------------------------*/
...@@ -1111,13 +1111,13 @@ aside.bookmarkBox .last{ ...@@ -1111,13 +1111,13 @@ aside.bookmarkBox .last{
.sizing .reduction {width:56px;background-position:-117px 0;} .sizing .reduction {width:56px;background-position:-117px 0;}
.sizing a:hover.reduction {background-position:-117px -33px;} .sizing a:hover.reduction {background-position:-117px -33px;}
.sizing .expansion_device {width:59px;background-position:0 -33px;} .sizing .expansion_device {width:59px;background-position:0 0;}
.sizing .fit_device {width:58px;background-position:-59px -33px;} .sizing .fit_device {width:58px;background-position:-59px 0;}
.sizing .reduction_device {width:56px;background-position:-117px -33px;} .sizing .reduction_device {width:56px;background-position:-117px 0;}
.sizing .expansion_off {width:59px;background-position:0 0;} .sizing .expansion_off {width:59px;background-position:0 -66px;}
.sizing .fit_off {width:58px;background-position:-59px 0;} .sizing .fit_off {width:58px;background-position:-59px -66px;}
.sizing .reduction_off {width:56px;background-position:-117px 0;} .sizing .reduction_off {width:56px;background-position:-117px -66px;}
/*----------------------------*/ /*----------------------------*/
/* 14. toolbar setting */ /* 14. toolbar setting */
/*----------------------------*/ /*----------------------------*/
......
abvw/js/bookmark.js
...@@ -842,7 +842,8 @@ function SyncContent() { ...@@ -842,7 +842,8 @@ function SyncContent() {
} }
} }
else { else {
// Skip this case arrBookmarks.splice(nIndex, 1);
ClientData.isChangedBookmark(true);
} }
} }
......
abvw/js/contentview_PopupText.js
...@@ -54,7 +54,7 @@ function OpenPopupText(posX, posY, content, dialogDiv, arrowDiv) { ...@@ -54,7 +54,7 @@ function OpenPopupText(posX, posY, content, dialogDiv, arrowDiv) {
// Ajust direction [ end ] // Ajust direction [ end ]
switch (direction) { switch (direction) {
case 0: left_dialog = left_arrow - dialogDiv.outerWidth(); case 0: left_dialog = left_arrow - dialogDiv.outerWidth();
top_dialog = top_arrow - 20; top_dialog = top_arrow - 20;
arrowDiv.css("border-color", "transparent transparent transparent #ccd"); arrowDiv.css("border-color", "transparent transparent transparent #ccd");
...@@ -62,7 +62,7 @@ function OpenPopupText(posX, posY, content, dialogDiv, arrowDiv) { ...@@ -62,7 +62,7 @@ function OpenPopupText(posX, posY, content, dialogDiv, arrowDiv) {
dialogDiv.css("-webkit-box-shadow", "-3px 3px 3px #777"); dialogDiv.css("-webkit-box-shadow", "-3px 3px 3px #777");
dialogDiv.css("box-shadow", "-3px 3px 3px #777"); dialogDiv.css("box-shadow", "-3px 3px 3px #777");
break; break;
case 1: left_dialog = left_arrow - dialogDiv.outerWidth(); case 1: left_dialog = left_arrow - dialogDiv.outerWidth();
top_dialog = top_arrow - dialogDiv.height() + 30; top_dialog = top_arrow - dialogDiv.height() + 30;
arrowDiv.css("border-color", "transparent transparent transparent #ccd"); arrowDiv.css("border-color", "transparent transparent transparent #ccd");
...@@ -70,7 +70,7 @@ function OpenPopupText(posX, posY, content, dialogDiv, arrowDiv) { ...@@ -70,7 +70,7 @@ function OpenPopupText(posX, posY, content, dialogDiv, arrowDiv) {
dialogDiv.css("-webkit-box-shadow", "-3px 3px 3px #777"); dialogDiv.css("-webkit-box-shadow", "-3px 3px 3px #777");
dialogDiv.css("box-shadow", "-3px 3px 3px #777"); dialogDiv.css("box-shadow", "-3px 3px 3px #777");
break; break;
case 2: left_dialog = left_arrow + 40; case 2: left_dialog = left_arrow + 24;
top_dialog = top_arrow - 20; top_dialog = top_arrow - 20;
arrowDiv.css("border-color", "transparent #ccd transparent transparent"); arrowDiv.css("border-color", "transparent #ccd transparent transparent");
...@@ -78,7 +78,7 @@ function OpenPopupText(posX, posY, content, dialogDiv, arrowDiv) { ...@@ -78,7 +78,7 @@ function OpenPopupText(posX, posY, content, dialogDiv, arrowDiv) {
dialogDiv.css("-webkit-box-shadow", "3px 3px 3px #777"); dialogDiv.css("-webkit-box-shadow", "3px 3px 3px #777");
dialogDiv.css("box-shadow", "3px 3px 3px #777"); dialogDiv.css("box-shadow", "3px 3px 3px #777");
break; break;
case 3: left_dialog = left_arrow + 40; case 3: left_dialog = left_arrow + 24;
top_dialog = top_arrow - dialogDiv.height() + 30; top_dialog = top_arrow - dialogDiv.height() + 30;
arrowDiv.css("border-color", "transparent #ccd transparent transparent"); arrowDiv.css("border-color", "transparent #ccd transparent transparent");
......
abvw/settings.html
...@@ -102,9 +102,9 @@ ...@@ -102,9 +102,9 @@
<label><input type=radio name="firstview" id="rdoOpt001" checked="checked" value="bookshelf" checked><label for="rdoOpt001" id="Label1" lang="txtHondana" class="lang">本棚</label></label>　 <label><input type=radio name="firstview" id="rdoOpt001" checked="checked" value="bookshelf" checked><label for="rdoOpt001" id="Label1" lang="txtHondana" class="lang">本棚</label></label>　
<label><input type=radio name="firstview" id="rdoOpt0011" value="booklist"><label for="rdoOpt0011" id="Label2" lang="txtList" class="lang">リスト</label></label> <label><input type=radio name="firstview" id="rdoOpt0011" value="booklist"><label for="rdoOpt0011" id="Label2" lang="txtList" class="lang">リスト</label></label>
</li> </li>
<li><label><input type=checkbox name="repeat" value="repeat" class="chkbx" id="chkOpt002" checked="checked" /><label for="chk1" id="txtOpt002" lang="txtOpt002" class="lang">動画、音楽繰り返し</label></label></li> <li><label><input type=checkbox name="repeat" value="repeat" class="chkbx" id="chkOpt002" checked="checked" /><label for="chkOpt002" id="txtOpt002" lang="txtOpt002" class="lang">動画、音楽繰り返し</label></label></li>
<li><label><input type=checkbox name="marking" value="marking" class="chkbx" id="chkOpt003" checked="checked" /><label id="lblOpt003" for="chkOpt003" lang="txtOpt003" class="lang">マーキング（コンテンツを開いた時に表示する）</label></label><span class="notice lang" lang="txtOpt004" >※コンテンツを開いた時に表示する</span></li> <li><label><input type=checkbox name="marking" value="marking" class="chkbx" id="chkOpt003" checked="checked" /><label id="lblOpt003" for="chkOpt003" lang="txtOpt003" class="lang">マーキング（コンテンツを開いた時に表示する）</label></label><span class="notice lang" lang="txtOpt004" >※コンテンツを開いた時に表示する</span></li>
<li><label><input type=checkbox name="confirmClose" value="confirmClose" class="chkbx" id="chkOpt005" checked="checked" /><label for="chk1" id="txtOpt005" lang="txtOpt005" class="lang">タブ・ブラウザ終了・F5時のアラートが表示する</label></label></li> <li><label><input type=checkbox name="confirmClose" value="confirmClose" class="chkbx" id="chkOpt005" checked="checked" /><label for="chkOpt005" id="txtOpt005" lang="txtOpt005" class="lang">タブ・ブラウザ終了・F5時のアラートが表示する</label></label></li>
</ul> </ul>
<h3 id="txtBkResCap" lang="txtBkResCap" class="lang">サーバにバックアップ/リストア</h3> <h3 id="txtBkResCap" lang="txtBkResCap" class="lang">サーバにバックアップ/リストア</h3>
<p class="logout_backup"><label><input type=checkbox name="backup" value="backup" id="chkOptBkCfm" checked="checked"><label id="txtOptBkCfm" for="chkOptBkCfm" lang="txtOptBkCfm" class="lang">毎回ログアウトの時、バックアップするかどうかは必ず確認する</label></label></p> <p class="logout_backup"><label><input type=checkbox name="backup" value="backup" id="chkOptBkCfm" checked="checked"><label id="txtOptBkCfm" for="chkOptBkCfm" lang="txtOptBkCfm" class="lang">毎回ログアウトの時、バックアップするかどうかは必ず確認する</label></label></p>
......
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