Skip to content

C
check
Commit bcb0622d by Motohisa Nakano
Options

20121211-2

parent d7a9054c
Showing with 525 additions and 208 deletions
abvw/bookmark.html
...@@ -8,6 +8,9 @@ ...@@ -8,6 +8,9 @@
<meta http-equiv="Cache-Control" content="no-cache"> <meta http-equiv="Cache-Control" content="no-cache">
<meta http-equiv="Expires" content="-1"> <meta http-equiv="Expires" content="-1">
<link rel="stylesheet" type="text/css" href="./common/css/jquery-ui.css" />
<link rel="stylesheet" type="text/css" href="./common/css/jquery.toastmessage.css" />
<link type="text/css" rel="stylesheet" href="./common/css/screen.css"/> <link type="text/css" rel="stylesheet" href="./common/css/screen.css"/>
<link type="text/css" rel="stylesheet" href="css/common.css" /> <link type="text/css" rel="stylesheet" href="css/common.css" />
<link type="text/css" rel="stylesheet" href="css/list_shiori.css" /> <link type="text/css" rel="stylesheet" href="css/list_shiori.css" />
...@@ -17,10 +20,7 @@ ...@@ -17,10 +20,7 @@
<link href="css/backup.css" rel="stylesheet" type="text/css" /> <link href="css/backup.css" rel="stylesheet" type="text/css" />
<link type="text/css" rel="stylesheet" href="./common/css/default.css"/> <link type="text/css" rel="stylesheet" href="./common/css/default.css"/>
<link type="text/css" rel="stylesheet" href="./common/css/screenLock.css"/> <link type="text/css" rel="stylesheet" href="./common/css/screenLock.css"/>
<link rel="stylesheet" type="text/css" href="./common/css/jquery-ui.css" />
<link rel="stylesheet" type="text/css" href="./common/css/jquery.toastmessage.css" />
<script src="./common/js/jquery-1.8.1.min.js"></script> <script src="./common/js/jquery-1.8.1.min.js"></script>
<script src="./common/js/jquery-ui-1.8.23.custom.min.js"></script> <script src="./common/js/jquery-ui-1.8.23.custom.min.js"></script>
......
abvw/common/css/screenLock.css
...@@ -17,5 +17,15 @@ ...@@ -17,5 +17,15 @@
margin: 8px auto; margin: 8px auto;
} }
#passwd-txt { #passwd-txt {
font-size: 12pt; font-size: 10pt;
width: 180px;
}
.ime-inactive
{
ime-mode: inactive;
} }
.ime-disabled
{
ime-mode: disabled;
}
\ No newline at end of file
abvw/common/js/screenLock.js
...@@ -143,9 +143,9 @@ function screenLock(options) { ...@@ -143,9 +143,9 @@ function screenLock(options) {
var tags = '<div id="' + elmId + '" class="screenLock">' + var tags = '<div id="' + elmId + '" class="screenLock">' +
'<div style="display:table; width:100%; height:100%;">' + '<div style="display:table; width:100%; height:100%;">' +
'<div style="display:table-cell; text-align:center; vertical-align:middle;">' + '<div style="display:table-cell; text-align:center; vertical-align:middle;">' +
'<p class="screenLock-content">' + html + '</p>' + '<p class="screenLock-content">' + html + i18nText('sysInfoScrLock01') + '</p>' +
'<div id="pw" style="display:none;">' + '<div id="pw" style="display:none;">' +
'<input id="passwd-txt" placeholder="input password" type="password" value="" />&nbsp;' + '<input id="passwd-txt" placeholder="'+i18nText('sysLockScrPwdInput')+'" type="password" value="" />&nbsp;' +
'<button id="unlock-btn">OK</button>' + '<button id="unlock-btn">OK</button>' +
'<div id="screenLockErrMsg" class="screenLock-error" style="display:none;">' + errorMessage + '</div>' + '<div id="screenLockErrMsg" class="screenLock-error" style="display:none;">' + errorMessage + '</div>' +
'</div>' + '</div>' +
......
abvw/common/js/slideshow.js
...@@ -31,41 +31,45 @@ function refreshSlideShowValue(){ ...@@ -31,41 +31,45 @@ function refreshSlideShowValue(){
//Show Image Preview //Show Image Preview
function showImagePreview(targetId, imgList){ function showImagePreview(targetId, imgList) {
refreshSlideShowValue(); refreshSlideShowValue();
//Check if imageList is not null //Check if imageList is not null
if(imgList != null && imgList != 'undefined' && imgList.length > 0){ if (imgList != null && imgList != 'undefined' && imgList.length > 0) {
slideshowImageCollection = setImageSource(imgList); slideshowImageCollection = setImageSource(imgList);
//Check if targetId is not null //Check if targetId is not null
if(targetId != null && targetId != 'undefined'){ if (targetId != null && targetId != 'undefined') {
if(slideshowImageCollection.length == 1){ if (slideshowImageCollection.length == 1) {
targetId.html(''); targetId.html('');
targetId.append('<div id="slideWrapper">' targetId.append('<div id="slideWrapper">'
+'</div>'); + '</div>');
var mainImg = $('#slideWrapper'); var mainImg = $('#slideWrapper');
var cssObj = {'background-image' : 'url('+slideshowImageCollection[0].thumbnail+')', var cssObj = { 'background-image': 'url(' + slideshowImageCollection[0].thumbnail + ')',
'background-repeat': 'no-repeat', 'background-repeat': 'no-repeat',
'background-size': 'contain', 'background-size': 'contain',
'background-position': 'center', 'background-position': 'center',
'background-color': 'black'}; 'background-color': 'black'
};
mainImg.css(cssObj);
mainImg.css(cssObj);
}else{
renderSlideShowBackground(targetId); mainImg.parent().css('padding-top', '0px');
renderSelectImage();
renderMainImage(0); } else {
handleImagePreviewEvent(); renderSlideShowBackground(targetId);
} renderSelectImage();
} renderMainImage(0);
} handleImagePreviewEvent();
else{ }
renderSlideShowBackground(targetId); }
$('.main-control').css('visibility','hidden'); }
$('.slideshow-control').css('visibility','hidden'); else {
} renderSlideShowBackground(targetId);
$('.main-control').css('visibility', 'hidden');
$('.slideshow-control').css('visibility', 'hidden');
}
optimizeSizeImagePreview();
} }
//Set image source for slide show //Set image source for slide show
...@@ -98,9 +102,38 @@ function renderSlideShowBackground(targetId){ ...@@ -98,9 +102,38 @@ function renderSlideShowBackground(targetId){
+' </div>' +' </div>'
+'</div>' +'</div>'
); );
$(window).resize(function () {
optimizeSizeImagePreview();
});
//handleImagePreviewEvent(); //handleImagePreviewEvent();
} }
function optimizeSizeImagePreview() {
var maxW = "798";
var ratio = 1.566;
var maxH = maxW / ratio;
if ($("#dialog").width() < maxW || $("#dialog").height() < maxH) {
if ($("#dialog").width() < maxW) {
$("#dialog").css('width', maxW + 'px');
$("#dialog").css('height', maxH + 'px');
}
if ($("#dialog").height() < maxH) {
$("#dialog").css('height', maxH + 'px');
$("#dialog").css('width', maxW + 'px');
}
}
else {
$("#dialog").css('width', maxW + 'px');
$("#dialog").css('height', maxH + 'px');
}
$("#dialog").center();
}
//render select image //render select image
function renderSelectImage(){ function renderSelectImage(){
...@@ -134,18 +167,42 @@ function handleImagePreviewEvent(){ ...@@ -134,18 +167,42 @@ function handleImagePreviewEvent(){
$('.thumbnail').mouseleave(selectImgMouseLeaveFunction); $('.thumbnail').mouseleave(selectImgMouseLeaveFunction);
$('.main-control').css('opacity','0'); $('.main-control').css('opacity','0');
$('#main-control-next').mouseleave(mainControlNextMouseLeaveFunction);
$('#main-control-prev').mouseleave(mainControlPrevMouseLeaveFunction);
if (isTouchDevice() == false) { if (isTouchDevice() == false) {
$('.main-control').mouseenter(mainControlMouseEnterFunction); //$('.main-control').mouseenter(mainControlMouseEnterFunction);
$('#main-control-next').mouseenter(mainControlNextMouseEnterFunction);
$('#main-control-prev').mouseenter(mainControlPrevMouseEnterFunction);
} }
$('.main-control').mouseleave(mainControlMouseLeaveFunction); //$('.main-control').mouseleave(mainControlMouseLeaveFunction);
$('.thumbnail:first').css('box-shadow','0px 7px 7px #555'); $('.thumbnail:first').css('box-shadow','0px 7px 7px #555');
handleDispNextPrevButton(); handleDispNextPrevButton();
} }
function mainControlNextMouseEnterFunction(){
$(this).css('opacity','0.5');
}
function mainControlNextMouseLeaveFunction(){
$(this).css('opacity','0');
}
function mainControlPrevMouseEnterFunction(){
$(this).css('opacity','0.5');
}
function mainControlPrevMouseLeaveFunction(){
$(this).css('opacity','0');
}
//Image Preview next icon function //Image Preview next icon function
function imageSelectNextFunction(){ function imageSelectNextFunction(){
......
abvw/common/json/lang/lang-en.json
...@@ -48,8 +48,8 @@ ...@@ -48,8 +48,8 @@
"dspTitleNm":"Title", "dspTitleNm":"Title",
"dspTitleNmKn":"Title（Kana）", "dspTitleNmKn":"Title（Kana）",
"txtPubDt":"Released Date", "txtPubDt":"Released Date",
"txtRecordNum":"", "txtRecordNum":" ",
"txtRecordTotal":"", "txtRecordTotal":" ",
"dspViewMore":">> Next {0} contents", "dspViewMore":">> Next {0} contents",
"txtGen":"Genre", "txtGen":"Genre",
"txtGr":"Group", "txtGr":"Group",
...@@ -64,7 +64,7 @@ ...@@ -64,7 +64,7 @@
"dspBkCancel":"Logout", "dspBkCancel":"Logout",
"txtSearchResult":"Result", "txtSearchResult":"Result",
"dspHome":"Home", "dspHome":"Home",
"txtLoginUser":"(Ver.20121207-1)User:", "txtLoginUser":"(Ver.20121211-2)User:",
"txtAll":"All", "txtAll":"All",
"txtMkgSize":"Size", "txtMkgSize":"Size",
"txtMkgS":"S", "txtMkgS":"S",
...@@ -112,5 +112,7 @@ ...@@ -112,5 +112,7 @@
"txtMemoEdit":"Edit memo", "txtMemoEdit":"Edit memo",
"txtMemoCopy":"Copy", "txtMemoCopy":"Copy",
"msgPageImgErr":"Unable to show contents. Maybe it was deleted at server. Back home and choose another content.", "msgPageImgErr":"Unable to show contents. Maybe it was deleted at server. Back home and choose another content.",
"sysAppTitle":"ABook Viewer for Web" "sysAppTitle":"ABook Viewer for Web",
"sysLockScrPwdInput":"Input password",
"txtOpt005":"Show alert when press F5.close tab.broswer."
} }
abvw/common/json/lang/lang-ja.json
...@@ -64,7 +64,7 @@ ...@@ -64,7 +64,7 @@
"dspBkCancel":"バックアップせずにログアウト", "dspBkCancel":"バックアップせずにログアウト",
"txtSearchResult":"検索結果", "txtSearchResult":"検索結果",
"dspHome":"ホーム", "dspHome":"ホーム",
"txtLoginUser":"(Ver.20121207-1)ログイン中：", "txtLoginUser":"(Ver.20121211-2)ログイン中：",
"txtAll":"すべて", "txtAll":"すべて",
"txtMkgSize":"太さ", "txtMkgSize":"太さ",
"txtMkgS":"小", "txtMkgS":"小",
...@@ -112,5 +112,7 @@ ...@@ -112,5 +112,7 @@
"txtMemoEdit":"編集", "txtMemoEdit":"編集",
"txtMemoCopy":"コピー", "txtMemoCopy":"コピー",
"msgPageImgErr":"コンテンツを表示することができません。コンテンツが削除された可能性があります。ホーム画面に戻り、異なるコンテンツを選択してください。", "msgPageImgErr":"コンテンツを表示することができません。コンテンツが削除された可能性があります。ホーム画面に戻り、異なるコンテンツを選択してください。",
"sysAppTitle":"ABook閲覧ウェブ版" "sysAppTitle":"ABook閲覧ウェブ版",
"sysLockScrPwdInput":"パスワードを入力してください",
"txtOpt005":"タブ・ブラウザ終了・F5時のアラートが表示する"
} }
abvw/common/json/lang/lang-ko.json
...@@ -64,7 +64,7 @@ ...@@ -64,7 +64,7 @@
"dspBkCancel":"로그아웃", "dspBkCancel":"로그아웃",
"txtSearchResult":"검색 결과", "txtSearchResult":"검색 결과",
"dspHome":"홈", "dspHome":"홈",
"txtLoginUser":"(Ver.20121207-1)로그인 중:", "txtLoginUser":"(Ver.20121211-2)로그인 중:",
"txtAll":"전체", "txtAll":"전체",
"txtMkgSize":"두께", "txtMkgSize":"두께",
"txtMkgS":"소", "txtMkgS":"소",
...@@ -112,5 +112,7 @@ ...@@ -112,5 +112,7 @@
"txtMemoEdit":"편집", "txtMemoEdit":"편집",
"txtMemoCopy":"복사", "txtMemoCopy":"복사",
"msgPageImgErr":"컨텐츠를 표시할 수 없습니다. 이 컨텐츠는 삭제되었을 가능성이 있습니다.", "msgPageImgErr":"컨텐츠를 표시할 수 없습니다. 이 컨텐츠는 삭제되었을 가능성이 있습니다.",
"sysAppTitle":"ABook : 멀티미디어 컨텐츠 플랫폼" "sysAppTitle":"ABook : 멀티미디어 컨텐츠 플랫폼",
"sysLockScrPwdInput":"입력 암호",
"txtOpt005":"탭 브라우저 종료 · F5 때 경고가 표시"
} }
abvw/css/contentview.css
...@@ -182,7 +182,7 @@ div .ui-slider-range, .ui-widget-header, .ui-slider-range-max { ...@@ -182,7 +182,7 @@ div .ui-slider-range, .ui-widget-header, .ui-slider-range-max {
width:60%; width:60%;
height:80%; height:80%;
left: 20%; left: 20%;
top: 2%; top: 10%;
background-color: black; background-color: black;
/*border: 2px solid #336699;*/ /*border: 2px solid #336699;*/
padding: 0px; padding: 0px;
...@@ -430,7 +430,7 @@ div .ui-slider-range, .ui-widget-header, .ui-slider-range-max { ...@@ -430,7 +430,7 @@ div .ui-slider-range, .ui-widget-header, .ui-slider-range-max {
border-style: solid; border-style: solid;
width: 0; width: 0;
height: 0; height: 0;
border-width: 20px 20px 20px 20px; border-width: 18px 18px 18px 18px;
} }
/* HOVER STYLES */ /* HOVER STYLES */
.pop-up-memo { .pop-up-memo {
...@@ -450,6 +450,13 @@ div .ui-slider-range, .ui-widget-header, .ui-slider-range-max { ...@@ -450,6 +450,13 @@ div .ui-slider-range, .ui-widget-header, .ui-slider-range-max {
text-decoration: underline; text-decoration: underline;
} }
.check_marking{
top:70px;
left:20px;
position:absolute;
background-color: white;
}
/*------------------Control Pen------------------------*/ /*------------------Control Pen------------------------*/
.rayermenu1 .rayermenu1
{ {
......
abvw/css/setting.css
...@@ -65,7 +65,7 @@ body{ ...@@ -65,7 +65,7 @@ body{
article{ article{
width:898px; width:898px;
height:655px; height:680px;
border:1px solid #cccccc; border:1px solid #cccccc;
padding:0; padding:0;
display:block; display:block;
...@@ -166,7 +166,7 @@ section div#user_info .passchgbtn a:hover:not(:target) { ...@@ -166,7 +166,7 @@ section div#user_info .passchgbtn a:hover:not(:target) {
div#user_option{ div#user_option{
width:inherit; width:inherit;
height:370px; height:395px;
background:url(../img/common/back_dot.gif); background:url(../img/common/back_dot.gif);
-moz-border-radius:6px; -moz-border-radius:6px;
-webkit-border-radius:6px; -webkit-border-radius:6px;
......
abvw/css/viewer.css
...@@ -66,8 +66,8 @@ header{ ...@@ -66,8 +66,8 @@ header{
/*overflow:hidden;*/ /*overflow:hidden;*/
width:100%; width:100%;
position:absolute; position:absolute;
top:0; top:0px;
left: 0; left: 0px;
} }
.wrapper_header{ .wrapper_header{
...@@ -134,6 +134,17 @@ header{ ...@@ -134,6 +134,17 @@ header{
.hdLcolumn a.marking{background-position:-368px 0;} .hdLcolumn a.marking{background-position:-368px 0;}
.hdLcolumn a.markingToolbar{background-position:-414px 0;margin:0 0 0 11px;} .hdLcolumn a.markingToolbar{background-position:-414px 0;margin:0 0 0 11px;}
.hdLcolumn a.home_device{background-position:0 0;}
.hdLcolumn a.back_device{background-position:-46px 0;margin:0 0 0 11px;}
.hdLcolumn a.bmList_device{background-position:-92px 0;}
.hdLcolumn a.bmAdd_device{background-position:-138px 0;margin:0 0 0 11px;}
.hdLcolumn a.index_device{background-position:-184px 0;}
.hdLcolumn a.copy_device{background-position:-230px 0;}
.hdLcolumn a.memoDisplay_device{background-position:-276px 0;}
.hdLcolumn a.memoAdd_device{background-position:-322px 0;margin:0 0 0 11px;}
.hdLcolumn a.marking_device{background-position:-368px 0;}
.hdLcolumn a.markingToolbar_device{background-position:-414px 0;margin:0 0 0 11px;}
/*オンマウス時*/ /*オンマウス時*/
.hdLcolumn a:hover.home{background-position:0 -92px;} .hdLcolumn a:hover.home{background-position:0 -92px;}
.hdLcolumn a:hover.back{background-position:-46px -92px;} .hdLcolumn a:hover.back{background-position:-46px -92px;}
...@@ -213,7 +224,7 @@ header{ ...@@ -213,7 +224,7 @@ header{
width:100%; width:100%;
height:60px; height:60px;
position:fixed; position:fixed;
bottom:0; bottom:0%;
} }
...@@ -228,8 +239,8 @@ header{ ...@@ -228,8 +239,8 @@ header{
width:100%; width:100%;
height:60px; height:60px;
position:absolute; position:absolute;
bottom:0; bottom:0%;
left: 0; left: 0%;
} }
.ftinner{ .ftinner{
...@@ -1054,6 +1065,17 @@ aside.bookmarkBox .last{ ...@@ -1054,6 +1065,17 @@ 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 .prev_device {width:57px;background-position:-59px -33px;}
.transition .next_device {width:58px;background-position:-116px -33px;}
.transition .last_device {width:56px;background-position:-174px -33px;}
.transition .begin_off {width:59px;background-position:0 0;}
.transition .prev_off {width:57px;background-position:-59px 0;}
.transition .next_off {width:58px;background-position:-116px 0;}
.transition .last_off {width:56px;background-position:-174px 0;}
/*----------------------------*/ /*----------------------------*/
/* 13. sizing setting */ /* 13. sizing setting */
/*----------------------------*/ /*----------------------------*/
...@@ -1087,8 +1109,12 @@ aside.bookmarkBox .last{ ...@@ -1087,8 +1109,12 @@ 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 .fit_device {width:58px;background-position:-59px -33px;}
.sizing .reduction_device {width:56px;background-position:-117px -33px;}
.sizing .expansion_off {width:59px;background-position:0 0;} .sizing .expansion_off {width:59px;background-position:0 0;}
.sizing .fit_off {width:58px;background-position:-59px 0;}
.sizing .reduction_off {width:56px;background-position:-117px 0;} .sizing .reduction_off {width:56px;background-position:-117px 0;}
/*----------------------------*/ /*----------------------------*/
/* 14. toolbar setting */ /* 14. toolbar setting */
...@@ -1106,6 +1132,17 @@ aside.bookmarkBox .last{ ...@@ -1106,6 +1132,17 @@ aside.bookmarkBox .last{
margin:0 0 0 10px; margin:0 0 0 10px;
} }
.toolbar_device {
background:url(../img/viewer/toolbarbtn.png) 0 -60px no-repeat;
width:60px;
height:0;
padding-top:60px;
display:block;
overflow:hidden;
font-size:0;
margin:0 0 0 10px;
}
.toolbar_off { .toolbar_off {
background:url(../img/viewer/toolbarbtn.png) 0 -120px no-repeat; background:url(../img/viewer/toolbarbtn.png) 0 -120px no-repeat;
width:60px; width:60px;
......
abvw/home.html
...@@ -141,9 +141,9 @@ ...@@ -141,9 +141,9 @@
<ul> <ul>
<li><span class="lang" lang="txtSort">並べ替え</span><span><b>|</b></span></li> <li><span class="lang" lang="txtSort">並べ替え</span><span><b>|</b></span></li>
<li><a class="active_tops lang" id="control-sort-title" lang="dspTitleNm">タイトル名</a><span id="title-sorttype"> </span><span><b>|</b></span></li> <li><a class="lang" id="control-sort-title" lang="dspTitleNm">タイトル名</a><span id="title-sorttype"> </span><span><b>|</b></span></li>
<li><a id="control-sort-titlekana" class="lang" lang="dspTitleNmKn" >タイトル名（かな）</a><span id="titlekana-sorttype"> </span><span id="separate"><b>|</b></span></li> <li><a id="control-sort-titlekana" class="lang" lang="dspTitleNmKn" >タイトル名（かな）</a><span id="titlekana-sorttype"> </span><span id="separate"><b>|</b></span></li>
<li><a id="control-sort-releasedate" class="lang" lang="txtPubDt" >公開日</a><span id="rDate-sorttype"> </span></li> <li><a id="control-sort-releasedate" class="active_tops lang" lang="txtPubDt" >公開日</a><span id="rDate-sorttype"> </span></li>
</ul> </ul>
<p> <p>
<label id="dispPage" class="pageNumControl" style="visibility: hidden"> </label> <label id="dispPage" class="pageNumControl" style="visibility: hidden"> </label>
......
abvw/js/contentsearch.js
...@@ -98,8 +98,15 @@ $(document).ready(function(){ ...@@ -98,8 +98,15 @@ $(document).ready(function(){
$('#main-search-tag').click(mainSearchTagClickFunction); $('#main-search-tag').click(mainSearchTagClickFunction);
$('#main-search-body').click(mainSearchBodyClickFunction); $('#main-search-body').click(mainSearchBodyClickFunction);
$('#control-nextrecord').css('visibility','hidden'); $('#control-nextrecord').css('visibility', 'hidden');
$(window).resize(function () {
if ($("#contentDetail").css("display") != "none") {
// Refresh panel of detail to center.
$("#contentDetail").center();
}
});
}); });
...@@ -387,6 +394,7 @@ function canvasClickFunction(e){ ...@@ -387,6 +394,7 @@ function canvasClickFunction(e){
var contentId = $(this).attr('id'); var contentId = $(this).attr('id');
var outputId = contentId.substring(17); var outputId = contentId.substring(17);
var checkflag = false;
// Set content id for screen: content detail // Set content id for screen: content detail
ClientData.contentInfo_contentId(outputId); ClientData.contentInfo_contentId(outputId);
...@@ -945,8 +953,8 @@ function drawEditImage(id){ ...@@ -945,8 +953,8 @@ function drawEditImage(id){
img.onload = function(){ img.onload = function(){
var resizeImg = resizeResourceThumbnail(img, c.width, c.height); var resizeImg = resizeResourceThumbnail(img, c.width, c.height);
ctx.drawImage(img, c.width / 2 - resizeImg[0] / 2, 0, resizeImg[0], resizeImg[1]); ctx.drawImage(img, c.width / 2 - resizeImg[0] / 2, 0, resizeImg[0], resizeImg[1]);
$("#loadingIcon" + contId).fadeOut('slow', function () { $("#loadingIcon" + id).fadeOut('slow', function () {
$('#content-thumbnail' + contId).fadeIn('slow'); $('#content-thumbnail' + id).fadeIn('slow');
}); });
}; };
} }
...@@ -1211,7 +1219,7 @@ function titleClickFunction(e){ ...@@ -1211,7 +1219,7 @@ function titleClickFunction(e){
home_isMove = false; home_isMove = false;
return; return;
} }
var checkflag = false;
var contentid = $(this).attr('contentid'); var contentid = $(this).attr('contentid');
// Get image of selected image // Get image of selected image
var base64String = returnThumbnail(contentid); var base64String = returnThumbnail(contentid);
......
abvw/js/contentview_Gomu.js
...@@ -25,10 +25,11 @@ function ShowEraser(targetDiv) { ...@@ -25,10 +25,11 @@ function ShowEraser(targetDiv) {
//$('#dlgGomu').dialog("open"); //$('#dlgGomu').dialog("open");
//$(".ui-dialog-titlebar").hide(); //$(".ui-dialog-titlebar").hide();
//lockLayout(); //lockLayout();
$('#dlgGomu').fadeIn('medium', function(){ // $('#dlgGomu').fadeIn('medium', function(){
$('#dlgGomu').draggable(); // $('#dlgGomu').draggable();
}); // });
$('#dlgGomu').show();
$('#dlgGomu').draggable();
Eraser_SetDefaultValue(); Eraser_SetDefaultValue();
} }
// Set default value for easer. // Set default value for easer.
...@@ -192,14 +193,32 @@ Event groups [ end ] ...@@ -192,14 +193,32 @@ Event groups [ end ]
*/ */
function touchStart_BtnOk_Gomu(e){
e.preventDefault();
$('#dlgGomu').draggable("destroy");
dlgGomu_dspOK_click();
}
function touchStart_BtnCancel_Gomu(e){
e.preventDefault();
$('#dlgGomu').draggable("destroy");
dlgGomu_dspCancel_click();
}
// Setting dialog // Setting dialog
$(function () { $(function () {
// --------------------------------- // ---------------------------------
// Setup for easer [start] // Setup for easer [start]
// --------------------------------- // ---------------------------------
if(isTouchDevice() == true){
document.getElementById('dlgGomu_dspOK').addEventListener('touchstart',touchStart_BtnOk_Gomu,false);
document.getElementById('dlgGomu_dspCancel').addEventListener('touchstart',touchStart_BtnCancel_Gomu,false);
}
$("#dlgGomu_dspOK").click(dlgGomu_dspOK_click); $("#dlgGomu_dspOK").click(dlgGomu_dspOK_click);
$("#dlgGomu_dspCancel").click(dlgGomu_dspCancel_click); $("#dlgGomu_dspCancel").click(dlgGomu_dspCancel_click);
...@@ -209,12 +228,12 @@ $(function () { ...@@ -209,12 +228,12 @@ $(function () {
$("#dlgGomu_rdo3").click(dlgGomu_rdo3_click); $("#dlgGomu_rdo3").click(dlgGomu_rdo3_click);
$("#dlgGomu_rdo4").click(dlgGomu_rdo4_click); $("#dlgGomu_rdo4").click(dlgGomu_rdo4_click);
$("#dlgGomu_rdo1_text").click(dlgGomu_rdo1_text_click); // $("#dlgGomu_rdo1_text").click(dlgGomu_rdo1_text_click);
$("#dlgGomu_rdo2_text").click(dlgGomu_rdo2_text_click); // $("#dlgGomu_rdo2_text").click(dlgGomu_rdo2_text_click);
$("#dlgGomu_rdo3_text").click(dlgGomu_rdo3_text_click); // $("#dlgGomu_rdo3_text").click(dlgGomu_rdo3_text_click);
$("#dlgGomu_rdo4_text").click(dlgGomu_rdo4_text_click); // $("#dlgGomu_rdo4_text").click(dlgGomu_rdo4_text_click);
$('#dlgGomu_rdo1_text').click() //$('#dlgGomu_rdo1_text').click()
// --------------------------------- // ---------------------------------
// Setup for easer [ end ] // Setup for easer [ end ]
// --------------------------------- // ---------------------------------
......
abvw/js/contentview_Maker.js
...@@ -54,13 +54,28 @@ function ShowMaker(targetId){ ...@@ -54,13 +54,28 @@ function ShowMaker(targetId){
}); });
i18nReplaceText(); i18nReplaceText();
maker_targetDiv.fadeIn('medium',function(){ // maker_targetDiv.fadeIn('medium',function(){
//lockLayout(); // //lockLayout();
maker_targetDiv.draggable(); // maker_targetDiv.draggable();
}); // }); maker_targetDiv.show();
maker_targetDiv.draggable({ revert: false});
Maker_handleColorPickerEvent(); Maker_handleColorPickerEvent();
} }
function touchStart_BtnOk_Maker(e){
e.preventDefault();
maker_targetDiv.draggable("destroy");
Maker_dspOK_click();
}
function touchStart_BtnCancel_Maker(e){
e.preventDefault();
maker_targetDiv.draggable("destroy");
Maker_dspCancel_click();
}
function Maker_handleColorPickerEvent(){ function Maker_handleColorPickerEvent(){
//$('.colorpicker').live('mouseenter',Maker_colorPickerMouseEnterFunction); //$('.colorpicker').live('mouseenter',Maker_colorPickerMouseEnterFunction);
...@@ -72,6 +87,8 @@ function Maker_handleColorPickerEvent(){ ...@@ -72,6 +87,8 @@ function Maker_handleColorPickerEvent(){
$('.colorpicker').unbind('mouseleave'); $('.colorpicker').unbind('mouseleave');
$('#makerColorwrapper').unbind('mouseleave'); $('#makerColorwrapper').unbind('mouseleave');
document.getElementById('Maker_btnOk').addEventListener('touchstart',touchStart_BtnOk_Maker,false);
document.getElementById('Maker_btnCancel').addEventListener('touchstart',touchStart_BtnCancel_Maker,false);
} }
else{ else{
//alert('here'); //alert('here');
......
abvw/js/contentview_Marking.js
...@@ -140,9 +140,9 @@ function dlgMarking_dspPgClear_click() { ...@@ -140,9 +140,9 @@ function dlgMarking_dspPgClear_click() {
function dlgMarking_imgPen_click() { function dlgMarking_imgPen_click() {
// Choose pen // Choose pen
$("#dlgMarking_imgMaker").removeClass('toolbar_icon_on'); $("#dlgMarking_imgMaker").removeClass();
$("#dlgMarking_imgPen").addClass('toolbar_icon_on'); $("#dlgMarking_imgPen").addClass('toolbar_icon_on');
$("#dlgMarking_imgEraser").removeClass('toolbar_icon_on'); $("#dlgMarking_imgEraser").removeClass();
ClientData.MarkingType("pen"); ClientData.MarkingType("pen");
markingType = "pen"; markingType = "pen";
...@@ -159,8 +159,8 @@ function dlgMarking_imgPenOption_click() { ...@@ -159,8 +159,8 @@ function dlgMarking_imgPenOption_click() {
function dlgMarking_imgMaker_click() { function dlgMarking_imgMaker_click() {
// Choose maker // Choose maker
$("#dlgMarking_imgMaker").addClass('toolbar_icon_on'); $("#dlgMarking_imgMaker").addClass('toolbar_icon_on');
$("#dlgMarking_imgPen").removeClass('toolbar_icon_on'); $("#dlgMarking_imgPen").removeClass();
$("#dlgMarking_imgEraser").removeClass('toolbar_icon_on'); $("#dlgMarking_imgEraser").removeClass();
ClientData.MarkingType("maker"); ClientData.MarkingType("maker");
markingType = "maker"; markingType = "maker";
...@@ -176,8 +176,8 @@ function dlgMarking_imgMakerOption_click() { ...@@ -176,8 +176,8 @@ function dlgMarking_imgMakerOption_click() {
} }
function dlgMarking_imgEraser_click() { function dlgMarking_imgEraser_click() {
// Choose eraser // Choose eraser
$("#dlgMarking_imgMaker").removeClass('toolbar_icon_on'); $("#dlgMarking_imgMaker").removeClass();
$("#dlgMarking_imgPen").removeClass('toolbar_icon_on'); $("#dlgMarking_imgPen").removeClass();
$("#dlgMarking_imgEraser").addClass('toolbar_icon_on'); $("#dlgMarking_imgEraser").addClass('toolbar_icon_on');
ClientData.MarkingType("eraser"); ClientData.MarkingType("eraser");
...@@ -296,10 +296,10 @@ function ShowMarking() { ...@@ -296,10 +296,10 @@ function ShowMarking() {
//$('#dlgMarking').css('height', '300px'); //$('#dlgMarking').css('height', '300px');
//$('#dlgMarking').dialog("open"); //$('#dlgMarking').dialog("open");
$('#dlgMarking').show(); $('#dlgMarking').css('top', '40px');
//$('#dlgMarking').fadeIn('fast');
$('#dlgMarking').css('top', '40px');
$('#dlgMarking').css('left', '10px'); $('#dlgMarking').css('left', '10px');
$('#dlgMarking').show();
//$('#dlgMarking').fadeIn('fast');
// $('#dlgMarking').center(); // $('#dlgMarking').center();
// $('#dlgMarking').top(); // $('#dlgMarking').top();
......
abvw/js/contentview_Memo.js
...@@ -123,6 +123,7 @@ function AddMemo(contentId,pageNo,targetId, posX, posY, callback) { ...@@ -123,6 +123,7 @@ function AddMemo(contentId,pageNo,targetId, posX, posY, callback) {
//targetDiv.dialog({width: 466, height: 390, modal: true, position: [targetX, targetY], resizable: false}); //targetDiv.dialog({width: 466, height: 390, modal: true, position: [targetX, targetY], resizable: false});
//targetDiv.parent().removeClass('ui-draggable'); //targetDiv.parent().removeClass('ui-draggable');
$("#overlay").show(); $("#overlay").show();
disableControlsCopyMemo();
targetDiv.css('z-index','1005'); targetDiv.css('z-index','1005');
targetDiv.css('top',targetY); targetDiv.css('top',targetY);
targetDiv.css('left',targetX - ($('#memoWrapper').width() /2 )); targetDiv.css('left',targetX - ($('#memoWrapper').width() /2 ));
...@@ -147,6 +148,7 @@ function EditMemo(index, posXPlus, posYPlus, targetId, callback){ ...@@ -147,6 +148,7 @@ function EditMemo(index, posXPlus, posYPlus, targetId, callback){
//targetDiv.dialog({width: 466, height: 390, modal: true, position: [targetX, targetY], resizable: false}); //targetDiv.dialog({width: 466, height: 390, modal: true, position: [targetX, targetY], resizable: false});
//targetDiv.parent().removeClass('ui-draggable'); //targetDiv.parent().removeClass('ui-draggable');
$("#overlay").show(); $("#overlay").show();
disableControlsCopyMemo();
targetDiv.css('z-index','1005'); targetDiv.css('z-index','1005');
var pt = imageToScreen(targetX, targetY); var pt = imageToScreen(targetX, targetY);
...@@ -173,6 +175,7 @@ function CopyMemo(index,contentId,pageNo,targetId, posX, posY, callback){ ...@@ -173,6 +175,7 @@ function CopyMemo(index,contentId,pageNo,targetId, posX, posY, callback){
//targetDiv.dialog({width: 466, height: 390, modal: true, position: [targetX, targetY], resizable: false}); //targetDiv.dialog({width: 466, height: 390, modal: true, position: [targetX, targetY], resizable: false});
//targetDiv.parent().removeClass('ui-draggable'); //targetDiv.parent().removeClass('ui-draggable');
$("#overlay").show(); $("#overlay").show();
disableControlsCopyMemo();
targetDiv.css('z-index','1005'); targetDiv.css('z-index','1005');
targetDiv.css('top',targetY); targetDiv.css('top',targetY);
targetDiv.css('left',targetX - ($('#memoWrapper').width() /2 )); targetDiv.css('left',targetX - ($('#memoWrapper').width() /2 ));
......
abvw/js/contentview_Paint.js
...@@ -189,7 +189,7 @@ function drawMove(coors, context_draw) { ...@@ -189,7 +189,7 @@ function drawMove(coors, context_draw) {
context_draw.lineCap = 'butt'; context_draw.lineCap = 'butt';
context_draw.fillStyle = "#" + makerColor; context_draw.fillStyle = "#" + makerColor;
context_draw.fill(); context_draw.fill();
context_draw.globalCompositeOperation = 'source-over'; context_draw.globalCompositeOperation = 'lighter';
context_draw.closePath(); context_draw.closePath();
context_draw.beginPath();*/ context_draw.beginPath();*/
// 左上に描画する場合 // 左上に描画する場合
...@@ -212,7 +212,7 @@ function drawMove(coors, context_draw) { ...@@ -212,7 +212,7 @@ function drawMove(coors, context_draw) {
context_draw.lineCap = 'butt'; context_draw.lineCap = 'butt';
context_draw.fillStyle = "#" + makerColor; context_draw.fillStyle = "#" + makerColor;
context_draw.fill(); context_draw.fill();
context_draw.globalCompositeOperation = 'source-over'; context_draw.globalCompositeOperation = 'lighter';
context_draw.closePath(); context_draw.closePath();
context_draw.beginPath();*/ context_draw.beginPath();*/
...@@ -234,7 +234,7 @@ function drawMove(coors, context_draw) { ...@@ -234,7 +234,7 @@ function drawMove(coors, context_draw) {
context_draw.lineCap = 'butt'; context_draw.lineCap = 'butt';
context_draw.fillStyle = "#" + makerColor; context_draw.fillStyle = "#" + makerColor;
context_draw.fill(); context_draw.fill();
context_draw.globalCompositeOperation = 'source-over'; context_draw.globalCompositeOperation = 'lighter';
context_draw.closePath(); context_draw.closePath();
context_draw.beginPath();*/ context_draw.beginPath();*/
...@@ -258,7 +258,7 @@ function drawMove(coors, context_draw) { ...@@ -258,7 +258,7 @@ function drawMove(coors, context_draw) {
context_draw.lineCap = 'butt'; context_draw.lineCap = 'butt';
context_draw.fillStyle = "#" + makerColor; context_draw.fillStyle = "#" + makerColor;
context_draw.fill(); context_draw.fill();
context_draw.globalCompositeOperation = 'source-over'; context_draw.globalCompositeOperation = 'lighter';
context_draw.closePath(); context_draw.closePath();
context_draw.beginPath();*/ context_draw.beginPath();*/
...@@ -282,7 +282,7 @@ function drawMove(coors, context_draw) { ...@@ -282,7 +282,7 @@ function drawMove(coors, context_draw) {
context_draw.lineCap = 'butt'; context_draw.lineCap = 'butt';
context_draw.fillStyle = "#" + makerColor; context_draw.fillStyle = "#" + makerColor;
context_draw.fill(); context_draw.fill();
context_draw.globalCompositeOperation = 'source-over'; context_draw.globalCompositeOperation = 'lighter';
context_draw.closePath(); context_draw.closePath();
context_draw.beginPath();*/ context_draw.beginPath();*/
...@@ -304,7 +304,7 @@ function drawMove(coors, context_draw) { ...@@ -304,7 +304,7 @@ function drawMove(coors, context_draw) {
context_draw.lineCap = 'butt'; context_draw.lineCap = 'butt';
context_draw.fillStyle = "#" + makerColor; context_draw.fillStyle = "#" + makerColor;
context_draw.fill(); context_draw.fill();
context_draw.globalCompositeOperation = 'source-over'; context_draw.globalCompositeOperation = 'lighter';
context_draw.closePath(); context_draw.closePath();
context_draw.beginPath();*/ context_draw.beginPath();*/
...@@ -317,7 +317,7 @@ function drawMove(coors, context_draw) { ...@@ -317,7 +317,7 @@ function drawMove(coors, context_draw) {
} }
} else { } else {
if (sy > coors.y) { if (sy > coors.y) {
/*context_draw.globalCompositeOperation = 'destination-out'; /* context_draw.globalCompositeOperation = 'destination-out';
context_draw.moveTo(ptStart[2].x, ptStart[2].y); context_draw.moveTo(ptStart[2].x, ptStart[2].y);
context_draw.lineTo(ptStart[3].x, ptStart[3].y); context_draw.lineTo(ptStart[3].x, ptStart[3].y);
context_draw.lineTo(ptEnd[0].x, ptEnd[0].y); context_draw.lineTo(ptEnd[0].x, ptEnd[0].y);
...@@ -326,7 +326,7 @@ function drawMove(coors, context_draw) { ...@@ -326,7 +326,7 @@ function drawMove(coors, context_draw) {
context_draw.lineCap = 'butt'; context_draw.lineCap = 'butt';
context_draw.fillStyle = "#" + makerColor; context_draw.fillStyle = "#" + makerColor;
context_draw.fill(); context_draw.fill();
context_draw.globalCompositeOperation = 'source-over'; context_draw.globalCompositeOperation = 'lighter';
context_draw.closePath(); context_draw.closePath();
context_draw.beginPath();*/ context_draw.beginPath();*/
...@@ -346,7 +346,7 @@ function drawMove(coors, context_draw) { ...@@ -346,7 +346,7 @@ function drawMove(coors, context_draw) {
context_draw.lineCap = 'butt'; context_draw.lineCap = 'butt';
context_draw.fillStyle = "#" + makerColor; context_draw.fillStyle = "#" + makerColor;
context_draw.fill(); context_draw.fill();
context_draw.globalCompositeOperation = 'source-over'; context_draw.globalCompositeOperation = 'lighter';
context_draw.closePath(); context_draw.closePath();
context_draw.beginPath();*/ context_draw.beginPath();*/
...@@ -366,7 +366,7 @@ function drawMove(coors, context_draw) { ...@@ -366,7 +366,7 @@ function drawMove(coors, context_draw) {
context_draw.lineCap = 'butt'; context_draw.lineCap = 'butt';
context_draw.fillStyle = "#" + makerColor; context_draw.fillStyle = "#" + makerColor;
context_draw.fill(); context_draw.fill();
context_draw.globalCompositeOperation = 'source-over'; context_draw.globalCompositeOperation = 'lighter';
context_draw.closePath(); context_draw.closePath();
context_draw.beginPath();*/ context_draw.beginPath();*/
...@@ -441,7 +441,7 @@ function drawPoint(coors, context_draw) { ...@@ -441,7 +441,7 @@ function drawPoint(coors, context_draw) {
context_draw.lineCap = 'square'; context_draw.lineCap = 'square';
context_draw.strokeStyle = "#" + makerColor; context_draw.strokeStyle = "#" + makerColor;
context_draw.stroke(); context_draw.stroke();
context_draw.globalCompositeOperation = 'source-over';*/ context_draw.globalCompositeOperation = 'lighter';*/
context_draw.lineCap = "square"; context_draw.lineCap = "square";
context_draw.lineWidth = makerSize; context_draw.lineWidth = makerSize;
......
abvw/js/contentview_Pen.js
...@@ -25,8 +25,7 @@ var pen_chooseColor; ...@@ -25,8 +25,7 @@ var pen_chooseColor;
function ShowPen(targetId) { function ShowPen(targetId) {
pen_targetDiv = targetId; pen_targetDiv = targetId;
pen_targetDiv.html(''); pen_targetDiv.children().remove();
targetId.append( targetId.append(
'<div id="panel-pen" class="rayermenu1">' '<div id="panel-pen" class="rayermenu1">'
+' <div id="panel-pen-size">' +' <div id="panel-pen-size">'
...@@ -58,13 +57,30 @@ function ShowPen(targetId) { ...@@ -58,13 +57,30 @@ function ShowPen(targetId) {
i18nReplaceText(); i18nReplaceText();
// pen_targetDiv.dialog({ width: 510, height: 390, modal: true }); // pen_targetDiv.dialog({ width: 510, height: 390, modal: true });
pen_targetDiv.fadeIn('medium',function(){ // pen_targetDiv.fadeIn('medium',function(){
//lockLayout(); // //lockLayout();
pen_targetDiv.draggable({ containment: "#containment-wrapper", scroll: false }); // pen_targetDiv.draggable({ containment: "#containment-wrapper", scroll: false });
}); // }); pen_targetDiv.show();
//pen_targetDiv.draggable({ containment: "#Pen_btnOk", scroll: false });
pen_targetDiv.draggable({ revert: false});
Pen_handleColorPickerEvent(); Pen_handleColorPickerEvent();
} }
function touchStart_BtnOk_Pen(e){
e.preventDefault();
pen_targetDiv.draggable("destroy");
Pen_dspOK_click();
}
function touchStart_BtnCancel_Pen(e){
e.preventDefault();
pen_targetDiv.draggable("destroy");
Pen_dspCancel_click();
}
function Pen_handleColorPickerEvent() { function Pen_handleColorPickerEvent() {
...@@ -77,10 +93,11 @@ function Pen_handleColorPickerEvent() { ...@@ -77,10 +93,11 @@ function Pen_handleColorPickerEvent() {
$('.colorpicker').unbind('mouseenter'); $('.colorpicker').unbind('mouseenter');
$('.colorpicker').unbind('mouseleave'); $('.colorpicker').unbind('mouseleave');
$('#penColorwrapper').unbind('mouseleave'); $('#penColorwrapper').unbind('mouseleave');
document.getElementById('Pen_btnOk').addEventListener('touchstart',touchStart_BtnOk_Pen,false);
document.getElementById('Pen_btnCancel').addEventListener('touchstart',touchStart_BtnCancel_Pen,false);
} }
else{ else{
//alert('here');
$('.colorpicker').unbind('mouseenter'); $('.colorpicker').unbind('mouseenter');
$('.colorpicker').unbind('mouseleave'); $('.colorpicker').unbind('mouseleave');
$('#penColorwrapper').unbind('mouseleave'); $('#penColorwrapper').unbind('mouseleave');
...@@ -90,7 +107,7 @@ function Pen_handleColorPickerEvent() { ...@@ -90,7 +107,7 @@ function Pen_handleColorPickerEvent() {
$('#penColorwrapper').bind('mouseleave', Pen_colorWrapperMouseLeaveFunction); $('#penColorwrapper').bind('mouseleave', Pen_colorWrapperMouseLeaveFunction);
} }
$('#Pen_btnOk').live('click', Pen_dspOK_click); $('#Pen_btnOk').live('click', Pen_dspOK_click);
$('#Pen_btnCancel').live('click', Pen_dspCancel_click); $('#Pen_btnCancel').live('click', Pen_dspCancel_click);
Pen_SetDefaultValue(); Pen_SetDefaultValue();
...@@ -108,9 +125,9 @@ function Pen_handleColorPickerEvent() { ...@@ -108,9 +125,9 @@ function Pen_handleColorPickerEvent() {
$('.colorpicker').live('click', Pen_colorPickerClickFunction); $('.colorpicker').live('click', Pen_colorPickerClickFunction);
//$('#penColorwrapper').live('mouseleave', Pen_colorWrapperMouseLeaveFunction); //$('#penColorwrapper').live('mouseleave', Pen_colorWrapperMouseLeaveFunction);
$("#avw-sys-modal").click (function () { $("#avw-sys-modal").click (function () {
pen_targetDiv.fadeOut('medium',function(){ // pen_targetDiv.fadeOut('medium',function(){
//unlockLayout(); // //unlockLayout();
}); // }); pen_targetDiv.show();
}); });
} }
...@@ -265,8 +282,7 @@ function Pen_rdo4_click() { ...@@ -265,8 +282,7 @@ function Pen_rdo4_click() {
} }
// Event of button OK // Event of button OK
function Pen_dspOK_click() { function Pen_dspOK_click() {
// Set selected value to local storage // Set selected value to local storage
var typeValue = undefined; var typeValue = undefined;
......
abvw/js/contentview_PopupText.js
...@@ -88,7 +88,7 @@ function OpenPopupText(posX, posY, content, dialogDiv, arrowDiv) { ...@@ -88,7 +88,7 @@ function OpenPopupText(posX, posY, content, dialogDiv, arrowDiv) {
break; break;
} }
dialogDiv.css("left", left_dialog + "px"); dialogDiv.css("left", left_dialog + "px");
dialogDiv.css("top", top_dialog + "px"); dialogDiv.css("top", (top_dialog + 10) + "px");
} }
/* /*
......
abvw/js/header.js
/// <reference path="../common/js/avweb.js" /> /// <reference path="../common/js/avweb.js" />
/// <reference path="../common/js/common.js" /> /// <reference path="../common/js/common.js" />
/// <reference path="../common/js/i18n.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" />
var isHoverOn = false; var isHoverOn = false;
$(document).ready(function () { $(document).ready(function () {
if (!avwCheckLogin(ScreenIds.Login)) return; if (!avwCheckLogin(ScreenIds.Login)) return;
// Set event to prevent leave // Set event to prevent leave
avwSetLogoutNortice(); //avwSetLogoutNortice();
ToogleLogoutNortice();
//Toggle Searchbox //Toggle Searchbox
$('input#searchbox-key').click(toggleSearchPanel); $('input#searchbox-key').click(toggleSearchPanel);
...@@ -273,13 +277,14 @@ function logoutFunction() { ...@@ -273,13 +277,14 @@ function logoutFunction() {
} }
else { else {
if (ClientData.userOpt_logoutMode() == 0) { // Logout with backup if (ClientData.userOpt_logoutMode() == 0) { // Logout with backup
lockLayout();
DoBackup(); DoBackup();
} }
else if (ClientData.userOpt_logoutMode() == 1) { // Logout without backup else if (ClientData.userOpt_logoutMode() == 1) { // Logout without backup
// Do nothing // Do nothing
} }
// Logout // Logout
webLogoutEvent(); //webLogoutEvent();
} }
} }
} }
...@@ -337,6 +342,9 @@ function confirmWithoutBackupFunction(e) { ...@@ -337,6 +342,9 @@ function confirmWithoutBackupFunction(e) {
function confirmWithBackupFunction(e) { function confirmWithBackupFunction(e) {
e.preventDefault(); e.preventDefault();
var remember = $('#chkRememberBackup').attr('checked'); var remember = $('#chkRememberBackup').attr('checked');
unlockLayout();
$('#dlgConfirmBackup1').css('z-index', '99');
lockLayout();
if(remember == 'checked'){ if(remember == 'checked'){
ClientData.userOpt_bkConfirmFlg(0); // Do not show dialog in next time ClientData.userOpt_bkConfirmFlg(0); // Do not show dialog in next time
...@@ -348,7 +356,7 @@ function confirmWithBackupFunction(e) { ...@@ -348,7 +356,7 @@ function confirmWithBackupFunction(e) {
} }
ClientData.userOpt_logoutMode(0); // In next time, if choose: [do not show dialog], will backup and logout ClientData.userOpt_logoutMode(0); // In next time, if choose: [do not show dialog], will backup and logout
webLogoutEvent(); //webLogoutEvent();
} }
//Confirm Back Up Ok //Confirm Back Up Ok
...@@ -369,35 +377,44 @@ function DoBackup() { ...@@ -369,35 +377,44 @@ function DoBackup() {
ClientData.isChangedBookmark(false); ClientData.isChangedBookmark(false);
ClientData.isChangedMarkingData(false); ClientData.isChangedMarkingData(false);
ClientData.isChangedMemo(false); ClientData.isChangedMemo(false);
alert(i18nText('msgBackupSuccess')); //alert(i18nText('msgBackupSuccess'));
// // Show message: msgBackupSuccess // Show message: msgBackupSuccess
// $().toastmessage({ position: 'middle-center' }); $().toastmessage({ position: 'middle-center' });
// $().toastmessage('showToast', { $().toastmessage('showToast', {
// type: 'success', type: 'success',
// sticky: true, sticky: true,
// text: i18nText('msgBackupSuccess') text: i18nText('msgBackupSuccess'),
// }); });
$('.toast-position-middle-center').css('width', '500px');
$('.toast-position-middle-center').css('margin-left', '-250px');
$('.toast-item-close').live('click', webLogoutEvent);
} }
else { else {
alert(i18nText('msgBackupFailed')); //alert(i18nText('msgBackupFailed'));
// // Show error message: msgBackupFailed // Show error message: msgBackupFailed
// $().toastmessage({ position: 'middle-center' }); $().toastmessage({ position: 'middle-center' });
// $().toastmessage('showToast', { $().toastmessage('showToast', {
// type: 'error', type: 'error',
// sticky: true, sticky: true,
// text: i18nText('msgBackupFailed') text: i18nText('msgBackupFailed')
// }); });
$('.toast-position-middle-center').css('width', '500px');
$('.toast-position-middle-center').css('margin-left', '-250px');
$('.toast-item-close').live('click', webLogoutEvent);
} }
}, },
function (a, b, c) { function (a, b, c) {
alert(i18nText('msgBackupFailed')); //alert(i18nText('msgBackupFailed'));
// // Show error message: msgBackupFailed // Show error message: msgBackupFailed
// $().toastmessage({ position: 'middle-center' }); $().toastmessage({ position: 'middle-center' });
// $().toastmessage('showToast', { $().toastmessage('showToast', {
// type: 'error', type: 'error',
// sticky: true, sticky: true,
// text: i18nText('msgBackupFailed') text: i18nText('msgBackupFailed')
// }); });
$('.toast-position-middle-center').css('width', '500px');
$('.toast-position-middle-center').css('margin-left', '-250px');
$('.toast-item-close').live('click', webLogoutEvent);
}); });
} }
\ No newline at end of file
abvw/js/history.js
...@@ -38,6 +38,7 @@ var totalPage; ...@@ -38,6 +38,7 @@ var totalPage;
var contentViewData = []; var contentViewData = [];
var noRecordFlg = false; var noRecordFlg = false;
var home_isMove = false; var home_isMove = false;
var history_contentTitleKana = [];
$(document).ready(function(){ $(document).ready(function(){
...@@ -88,6 +89,13 @@ $(document).ready(function(){ ...@@ -88,6 +89,13 @@ $(document).ready(function(){
//$('.button-details').live('touchstart', readSubmenuFunction); //$('.button-details').live('touchstart', readSubmenuFunction);
$('.button-details').live('touchend', readSubmenuFunction); $('.button-details').live('touchend', readSubmenuFunction);
$('.button-details').live('touchmove', function () { home_isMove = true; }); $('.button-details').live('touchmove', function () { home_isMove = true; });
$(window).resize(function () {
if ($("#contentDetail").css("display") != "none") {
// Refresh panel of detail to center.
$("#contentDetail").center();
}
});
}); });
//Call API //Call API
...@@ -1122,6 +1130,20 @@ function syncReadingContent(){ ...@@ -1122,6 +1130,20 @@ function syncReadingContent(){
} }
/* /*
Get content title kana if it existed
*/
function getContentNameKana(strContentId) {
var strContentNameKana = null;
for (var nIndex = 0; nIndex < history_contentTitleKana.length; nIndex++) {
if (history_contentTitleKana[nIndex].contentId == strContentId) {
strContentNameKana = history_contentTitleKana[nIndex].contentNameKana;
break;
}
}
return strContentNameKana;
}
/*
Check content whether existed or not Check content whether existed or not
*/ */
function IsExistContent(strContentId) { function IsExistContent(strContentId) {
...@@ -1134,6 +1156,7 @@ function IsExistContent(strContentId) { ...@@ -1134,6 +1156,7 @@ function IsExistContent(strContentId) {
avwCmsApiSync(ClientData.userInfo_accountPath(), "webGetContent", 'GET', params, avwCmsApiSync(ClientData.userInfo_accountPath(), "webGetContent", 'GET', params,
function (data) { function (data) {
isExisted = true; isExisted = true;
history_contentTitleKana.push({ contentId: strContentId, contentNameKana: data.contentData.contentNameKana });
}, },
function (xmlHttpRequest, txtStatus, errorThrown) { function (xmlHttpRequest, txtStatus, errorThrown) {
if (xmlHttpRequest.status == 404) { if (xmlHttpRequest.status == 404) {
...@@ -1341,22 +1364,32 @@ function formatOriginalPublishDate(date){ ...@@ -1341,22 +1364,32 @@ function formatOriginalPublishDate(date){
return resultDate; return resultDate;
} }
function returnContentTitleKana(id){ function returnContentTitleKana(id) {
var params = {
contentId: id,
sid: ClientData.userInfo_sid(),
getType: 1
}
var titleKana; var titleKana;
// Get all pages of content // Get title kana from existed contents
avwCmsApiSync(ClientData.userInfo_accountPath(), "webGetContent", 'GET', params, titleKana = getContentNameKana(id);
if (titleKana != null) {
// Skip this case
}
else {
var params = {
contentId: id,
sid: ClientData.userInfo_sid(),
getType: 1
}
// Get all pages of content
avwCmsApiSync(ClientData.userInfo_accountPath(), "webGetContent", 'GET', params,
function (data) { function (data) {
// Success // Success
titleKana = data.contentData.contentNameKana; titleKana = data.contentData.contentNameKana;
}, null); }, null);
return titleKana; }
return titleKana;
} }
function resizeResourceThumbnail(mg, width, height) { function resizeResourceThumbnail(mg, width, height) {
......
abvw/js/home.js
...@@ -20,8 +20,8 @@ ...@@ -20,8 +20,8 @@
//----Constant-----------// //----Constant-----------//
var DEFAULT_DISP_NUMBER_RECORD_FROM = 1; var DEFAULT_DISP_NUMBER_RECORD_FROM = 1;
var DEFAULT_DISP_NUMBER_RECORD_TO = 15; var DEFAULT_DISP_NUMBER_RECORD_TO = 15;
var DEFAULT_SORT_TYPE = '1'; var DEFAULT_SORT_TYPE = '3';
var DEFAULT_SORT_ORDER = '1'; var DEFAULT_SORT_ORDER = '2';
var DEFAULT_SEARCH_DIVISION = 0; var DEFAULT_SEARCH_DIVISION = 0;
var DEFAULT_IMG_OPTION_MEMO = 'img/list/pic_1.png'; var DEFAULT_IMG_OPTION_MEMO = 'img/list/pic_1.png';
...@@ -49,9 +49,9 @@ $(document).ready(function () { ...@@ -49,9 +49,9 @@ $(document).ready(function () {
if (!avwCheckLogin(ScreenIds.Login)) { if (!avwCheckLogin(ScreenIds.Login)) {
return; return;
} }
document.title = i18nText('dspHome') + ' | ' + i18nText('sysAppTitle'); document.title = i18nText('dspHome') + ' | ' + i18nText('sysAppTitle');
// Set bookmark screen // Set bookmark screen
ClientData.BookmarkScreen(ScreenIds.Home); ClientData.BookmarkScreen(ScreenIds.Home);
...@@ -59,12 +59,12 @@ $(document).ready(function () { ...@@ -59,12 +59,12 @@ $(document).ready(function () {
RegisterLog(); RegisterLog();
//Sync Data //Sync Data
if(ClientData.ReadingContentIds() == null || ClientData.ReadingContentIds() == 'undefined' || ClientData.ReadingContentIds().length == 0){ if (ClientData.ReadingContentIds() == null || ClientData.ReadingContentIds() == 'undefined' || ClientData.ReadingContentIds().length == 0) {
ClientData.common_contentDataChkFlg(false); ClientData.common_contentDataChkFlg(false);
}else{ } else {
syncContentData(); syncContentData();
} }
//Toggle TreeView Disp //Toggle TreeView Disp
handleTreeViewDisp(); handleTreeViewDisp();
...@@ -98,8 +98,8 @@ $(document).ready(function () { ...@@ -98,8 +98,8 @@ $(document).ready(function () {
//$('.dialog').live('touchstart', openSubMenuDialogFunction); //$('.dialog').live('touchstart', openSubMenuDialogFunction);
$('.dialog').live('touchend', openSubMenuDialogFunction); $('.dialog').live('touchend', openSubMenuDialogFunction);
$('.dialog').live('touchmove', function () { home_isMove = true; }); $('.dialog').live('touchmove', function () { home_isMove = true; });
//Render Genre TreeView //Render Genre TreeView
$('#lnkbtnGenre').click(genreSelectFunction); $('#lnkbtnGenre').click(genreSelectFunction);
...@@ -125,15 +125,21 @@ $(document).ready(function () { ...@@ -125,15 +125,21 @@ $(document).ready(function () {
$('#control-sort-releasedate').click(sortByReleaseDateFunction); $('#control-sort-releasedate').click(sortByReleaseDateFunction);
//Go To Details Page //Go To Details Page
$('.button-details').live('click', readSubmenuFunction); $('.button-details').live('click', readSubmenuFunction);
//$('.button-details').live('touchstart', readSubmenuFunction); //$('.button-details').live('touchstart', readSubmenuFunction);
$('.button-details').live('touchend', readSubmenuFunction); $('.button-details').live('touchend', readSubmenuFunction);
$('.button-details').live('touchmove', function () { home_isMove = true; }); $('.button-details').live('touchmove', function () { home_isMove = true; });
$('#dlgSubMenu').hover(subMenuHoverFunction, subMenuHoverOffFunction); $('#dlgSubMenu').hover(subMenuHoverFunction, subMenuHoverOffFunction);
$('body').click(bodyHomeClickFunction); $('body').click(bodyHomeClickFunction);
$(window).resize(function () {
if ($("#contentDetail").css("display") != "none") {
// Refresh panel of detail to center.
$("#contentDetail").center();
}
});
}); });
function subMenuHoverFunction(){ function subMenuHoverFunction(){
...@@ -453,7 +459,9 @@ function genreSelectFunction() { ...@@ -453,7 +459,9 @@ function genreSelectFunction() {
$('.folder').css('font-weight', 'normal'); $('.folder').css('font-weight', 'normal');
$('.folder').css('text-decoration', 'none'); $('.folder').css('text-decoration', 'none');
$('#all').css('font-weight', 'bold');
$('#all').css('text-decoration', 'underline');
var recordFrom = 0; var recordFrom = 0;
var recordTo = 0; var recordTo = 0;
...@@ -498,7 +506,10 @@ function groupSelectFunction() { ...@@ -498,7 +506,10 @@ function groupSelectFunction() {
$('.folder').css('font-weight', 'normal'); $('.folder').css('font-weight', 'normal');
$('.folder').css('text-decoration', 'none'); $('.folder').css('text-decoration', 'none');
var firstNode = $('#list_1').find('a')[0];
$('#list_1').find(firstNode).css('text-decoration', 'underline');
$('#list_1').find(firstNode).css('font-weight', 'bold');
var recordFrom = 0; var recordFrom = 0;
var recordTo = 0; var recordTo = 0;
...@@ -564,12 +575,16 @@ function getDataJsonFileGenre(){ ...@@ -564,12 +575,16 @@ function getDataJsonFileGenre(){
} }
}); });
var tree1 = new TreeView(); var tree1 = new TreeView();
tree1.CategoryTagName = "a";
//tree1.TotalCount = totalCount; //tree1.TotalCount = totalCount;
if (genre_totalcontent != -1) { if (genre_totalcontent != -1) {
tree1.TotalCount = genre_totalcontent; tree1.TotalCount = genre_totalcontent;
} }
tree1.Show("list_0", arrData, "AddGenre_Callback"); tree1.Show("list_0", arrData, "AddGenre_Callback");
$("#list_0").treeview(); $("#list_0").treeview();
$('#all').css('font-weight', 'bold');
$('#all').css('text-decoration', 'underline');
}); });
} }
...@@ -628,7 +643,7 @@ function AddGenre_Callback(selectedNode) { ...@@ -628,7 +643,7 @@ function AddGenre_Callback(selectedNode) {
$('#' + selectedNode.Id).css('font-weight', 'bold'); $('#' + selectedNode.Id).css('font-weight', 'bold');
$('#' + selectedNode.Id).css('text-decoration', 'underline'); $('#' + selectedNode.Id).css('text-decoration', 'underline');
} }
} }
var node = new TreeNode(); var node = new TreeNode();
var recordFrom = 0; var recordFrom = 0;
...@@ -701,15 +716,20 @@ function getDataJsonFileGroup(){ ...@@ -701,15 +716,20 @@ function getDataJsonFileGroup(){
} }
}); });
var tree2 = new TreeView(); var tree2 = new TreeView();
tree2.CategoryTagName = "a";
//tree1.TotalCount = totalCount; //tree1.TotalCount = totalCount;
if (group_totalcontent != -1) { if (group_totalcontent != -1) {
tree2.TotalCount = group_totalcontent; tree2.TotalCount = group_totalcontent;
} }
tree2.Show("list_1", arrData, "AddGroup_Callback"); tree2.Show("list_1", arrData, "AddGroup_Callback");
$("#list_1").treeview(); $("#list_1").treeview();
var firstNode = $('#list_1').find('a')[0];
$('#list_1').find(firstNode).css('text-decoration', 'underline');
$('#list_1').find(firstNode).css('font-weight', 'bold');
// Expand nodes // Expand nodes
for (var nIndex = 0; nIndex < tree2.ExpandNodes.length; nIndex++) { for (var nIndex = 0; nIndex < tree2.ExpandNodes.length; nIndex++) {
if ($("#" + tree2.ExpandNodes[nIndex]).parent()) { if ($("#" + tree2.ExpandNodes[nIndex]).parent()) {
var objParent = $("#" + tree2.ExpandNodes[nIndex]).parent(); var objParent = $("#" + tree2.ExpandNodes[nIndex]).parent();
var objChild = objParent.children()[0]; var objChild = objParent.children()[0];
...@@ -726,7 +746,7 @@ function getDataJsonFileGroup(){ ...@@ -726,7 +746,7 @@ function getDataJsonFileGroup(){
} }
} }
} }
}); });
} }
...@@ -785,7 +805,7 @@ function AddGroup_Callback(selectedNode) { ...@@ -785,7 +805,7 @@ function AddGroup_Callback(selectedNode) {
$('#' + selectedNode.Id).css('font-weight', 'bold'); $('#' + selectedNode.Id).css('font-weight', 'bold');
$('#' + selectedNode.Id).css('text-decoration', 'underline'); $('#' + selectedNode.Id).css('text-decoration', 'underline');
} }
} }
var node = new TreeNode(); var node = new TreeNode();
var recordFrom = 0; var recordFrom = 0;
...@@ -1801,6 +1821,9 @@ function setMetaVersionData(conId){ ...@@ -1801,6 +1821,9 @@ function setMetaVersionData(conId){
//handle display sort direction //handle display sort direction
function handleSortDisp(){ function handleSortDisp(){
$('#control-sort-title').removeClass('active_tops');
$('#control-sort-titlekana').removeClass('active_tops');
$('#control-sort-releasedate').removeClass('active_tops');
var typeSort; var typeSort;
var orderSort; var orderSort;
...@@ -1816,6 +1839,10 @@ function handleSortDisp(){ ...@@ -1816,6 +1839,10 @@ function handleSortDisp(){
orderSort = ClientData.searchCond_sortOrder(); orderSort = ClientData.searchCond_sortOrder();
if(typeSort == 1){ if(typeSort == 1){
$('#control-sort-title').addClass('active_tops');
$('#control-sort-titlekana').removeClass('active_tops');
$('#control-sort-releasedate').removeClass('active_tops');
if(orderSort == Consts.ConstOrderSetting_Asc){ if(orderSort == Consts.ConstOrderSetting_Asc){
$('#title-sorttype').html(''); $('#title-sorttype').html('');
$('#title-sorttype').html('▲'); $('#title-sorttype').html('▲');
...@@ -1832,6 +1859,10 @@ function handleSortDisp(){ ...@@ -1832,6 +1859,10 @@ function handleSortDisp(){
} }
} }
else if(typeSort == 2){ else if(typeSort == 2){
$('#control-sort-title').removeClass('active_tops');
$('#control-sort-titlekana').addClass('active_tops');
$('#control-sort-releasedate').removeClass('active_tops');
if(orderSort == Consts.ConstOrderSetting_Asc){ if(orderSort == Consts.ConstOrderSetting_Asc){
$('#title-sorttype').html(''); $('#title-sorttype').html('');
$('#titlekana-sorttype').html(''); $('#titlekana-sorttype').html('');
...@@ -1848,6 +1879,10 @@ function handleSortDisp(){ ...@@ -1848,6 +1879,10 @@ function handleSortDisp(){
} }
} }
else{ else{
$('#control-sort-title').removeClass('active_tops');
$('#control-sort-titlekana').removeClass('active_tops');
$('#control-sort-releasedate').addClass('active_tops');
if(orderSort == Consts.ConstOrderSetting_Asc){ if(orderSort == Consts.ConstOrderSetting_Asc){
$('#title-sorttype').html(''); $('#title-sorttype').html('');
$('#titlekana-sorttype').html(''); $('#titlekana-sorttype').html('');
......
abvw/js/login.js
...@@ -24,7 +24,8 @@ var force_pw_change_periodically; ...@@ -24,7 +24,8 @@ var force_pw_change_periodically;
var user_data_backup; var user_data_backup;
var marking; var marking;
var force_login_periodically; var force_login_periodically;
var login_errorMessage = "";
//Load login Info //Load login Info
function loadLoginInfo() { function loadLoginInfo() {
...@@ -92,18 +93,23 @@ function checkValidation() { ...@@ -92,18 +93,23 @@ function checkValidation() {
var msgError = $('#main-error-message'); var msgError = $('#main-error-message');
if (!ValidationUtil.CheckRequiredForText(accountPath)) { if (!ValidationUtil.CheckRequiredForText(accountPath)) {
login_errorMessage = "";
msgError.html(i18nText('msgLoginEmpty')); msgError.html(i18nText('msgLoginEmpty'));
msgError.attr('lang', 'msgLoginEmpty');
msgError.show(); msgError.show();
return false; return false;
} }
else if (!ValidationUtil.CheckRequiredForText(loginId)) { else if (!ValidationUtil.CheckRequiredForText(loginId)) {
login_errorMessage = "";
msgError.html(i18nText('msgLoginEmpty')); msgError.html(i18nText('msgLoginEmpty'));
msgError.attr('lang', 'msgLoginEmpty');
msgError.show(); msgError.show();
return false; return false;
} }
else if (!ValidationUtil.CheckRequiredForText(password)) { else if (!ValidationUtil.CheckRequiredForText(password)) {
login_errorMessage = "";
msgError.html(i18nText('msgLoginEmpty')); msgError.html(i18nText('msgLoginEmpty'));
msgError.attr('lang', 'msgLoginEmpty');
msgError.show(); msgError.show();
return false; return false;
} }
...@@ -120,7 +126,9 @@ function checkDialogValidation(){ ...@@ -120,7 +126,9 @@ function checkDialogValidation(){
var msgError = $('#dialog-error-message'); var msgError = $('#dialog-error-message');
if (!ValidationUtil.CheckRequiredForText(currentPass)) { if (!ValidationUtil.CheckRequiredForText(currentPass)) {
login_errorMessage = "";
msgError.html(i18nText('msgPwdEmpty')); msgError.html(i18nText('msgPwdEmpty'));
msgError.attr('lang', 'msgPwdEmpty');
msgError.show(); msgError.show();
/* show error messages */ /* show error messages */
...@@ -134,7 +142,9 @@ function checkDialogValidation(){ ...@@ -134,7 +142,9 @@ function checkDialogValidation(){
return false; return false;
} }
else if (!ValidationUtil.CheckRequiredForText(newPass)) { else if (!ValidationUtil.CheckRequiredForText(newPass)) {
login_errorMessage = "";
msgError.html(i18nText('msgPwdEmpty')); msgError.html(i18nText('msgPwdEmpty'));
msgError.attr('lang', 'msgPwdEmpty');
msgError.show(); msgError.show();
/* show error messages */ /* show error messages */
//$().toastmessage({ position: 'middle-center' }); //$().toastmessage({ position: 'middle-center' });
...@@ -161,7 +171,9 @@ function checkDialogValidation(){ ...@@ -161,7 +171,9 @@ function checkDialogValidation(){
else else
{ {
if(newPass != confirmPass){ if(newPass != confirmPass){
login_errorMessage = "";
msgError.html(i18nText('msgPwdNotMatch')); msgError.html(i18nText('msgPwdNotMatch'));
msgError.attr('lang', 'msgPwdNotMatch');
msgError.show(); msgError.show();
/* show error messages */ /* show error messages */
// $().toastmessage({ position: 'middle-center' }); // $().toastmessage({ position: 'middle-center' });
...@@ -304,6 +316,7 @@ function processLogin() { ...@@ -304,6 +316,7 @@ function processLogin() {
} }
} }
else { else {
login_errorMessage = data.errorMessage;
$('#main-error-message').html(format(i18nText('msgLoginErrWrong'), data.errorMessage).toString()); $('#main-error-message').html(format(i18nText('msgLoginErrWrong'), data.errorMessage).toString());
$('#main-error-message').show(); $('#main-error-message').show();
...@@ -321,6 +334,7 @@ function processLogin() { ...@@ -321,6 +334,7 @@ function processLogin() {
} }
}, function (xhr, statusText, errorThrown) { }, function (xhr, statusText, errorThrown) {
login_errorMessage = JSON.parse(xhr.responseText).errorMessage;
//$('#main-error-message').html(format(i18nText('msgLoginErrWrong'), formatErrorCode(a.status)).toString()); //$('#main-error-message').html(format(i18nText('msgLoginErrWrong'), formatErrorCode(a.status)).toString());
if(xhr.responseText && xhr.status != 0) { if(xhr.responseText && xhr.status != 0) {
$('#main-error-message').html(format(i18nText('msgLoginErrWrong'), JSON.parse(xhr.responseText).errorMessage).toString()); $('#main-error-message').html(format(i18nText('msgLoginErrWrong'), JSON.parse(xhr.responseText).errorMessage).toString());
...@@ -372,21 +386,30 @@ function changePasswordProcess(){ ...@@ -372,21 +386,30 @@ function changePasswordProcess(){
function changeLanguageJa(){ function changeLanguageJa(){
changeLanguage(Consts.ConstLanguage_Ja); changeLanguage(Consts.ConstLanguage_Ja);
document.title = i18nText('dspLogin') + ' | ' + i18nText('sysAppTitle'); document.title = i18nText('dspLogin') + ' | ' + i18nText('sysAppTitle');
//ClientData.userInfo_language(Consts.ConstLanguage_Ja); //ClientData.userInfo_language(Consts.ConstLanguage_Ja);
if (login_errorMessage != ""){
$('#main-error-message').html(format(i18nText('msgLoginErrWrong'), login_errorMessage).toString());
}
} }
//Change Language Korean //Change Language Korean
function changeLanguageKo(){ function changeLanguageKo(){
changeLanguage(Consts.ConstLanguage_Ko); changeLanguage(Consts.ConstLanguage_Ko);
document.title = i18nText('dspLogin') + ' | ' + i18nText('sysAppTitle'); document.title = i18nText('dspLogin') + ' | ' + i18nText('sysAppTitle');
//ClientData.userInfo_language(Consts.ConstLanguage_Ko); //ClientData.userInfo_language(Consts.ConstLanguage_Ko);
if (login_errorMessage != ""){
$('#main-error-message').html(format(i18nText('msgLoginErrWrong'), login_errorMessage).toString());
}
} }
//Change Language English //Change Language English
function changeLanguageEn(){ function changeLanguageEn(){
changeLanguage(Consts.ConstLanguage_En); changeLanguage(Consts.ConstLanguage_En);
document.title = i18nText('dspLogin') + ' | ' + i18nText('sysAppTitle'); document.title = i18nText('dspLogin') + ' | ' + i18nText('sysAppTitle');
//ClientData.userInfo_language(Consts.ConstLanguage_En); //ClientData.userInfo_language(Consts.ConstLanguage_En);
if (login_errorMessage != ""){
$('#main-error-message').html(format(i18nText('msgLoginErrWrong'), login_errorMessage).toString());
}
} }
//Login click function //Login click function
......
abvw/js/settings.js
...@@ -354,10 +354,19 @@ function dspSave_Click(e) { ...@@ -354,10 +354,19 @@ function dspSave_Click(e) {
} }
// マーキング（コンテンツを開いた時に表示する） // マーキング（コンテンツを開いた時に表示する）
if ($("#chkOpt003").attr('checked') == 'checked') { if ($("#chkOpt003").attr('checked') == 'checked') {
ClientData.userOpt_makingDsp(1); ClientData.userOpt_makingDsp(1);
} }
else { else {
ClientData.userOpt_makingDsp(0); ClientData.userOpt_makingDsp(0);
}
// Show/not show alert when press F5.close tab.broswer.
if ($("#chkOpt005").attr('checked') == 'checked') {
ClientData.userOpt_closeOrRefreshAlert(1);
ToogleLogoutNortice();
}
else {
ClientData.userOpt_closeOrRefreshAlert(0);
ToogleLogoutNortice();
} }
// 毎回ログアウトの時、バックアップするかどうかは必ず確認する // 毎回ログアウトの時、バックアップするかどうかは必ず確認する
if ($("#chkOptBkCfm").attr('checked') == 'checked') { if ($("#chkOptBkCfm").attr('checked') == 'checked') {
...@@ -430,6 +439,8 @@ function dspOptReset_Click(e) { ...@@ -430,6 +439,8 @@ function dspOptReset_Click(e) {
$("#chkOpt002").attr('checked', 'checked'); $("#chkOpt002").attr('checked', 'checked');
// マーキング（コンテンツを開いた時に表示する） // マーキング（コンテンツを開いた時に表示する）
$("#chkOpt003").attr('checked', 'checked'); $("#chkOpt003").attr('checked', 'checked');
// Show alert when press F5.close tab.broswer
$("#chkOpt005").attr('checked', 'checked');
// 毎回ログアウトの時、バックアップするかどうかは必ず確認する // 毎回ログアウトの時、バックアップするかどうかは必ず確認する
$("#chkOptBkCfm").attr('checked', 'checked'); $("#chkOptBkCfm").attr('checked', 'checked');
} }
...@@ -737,7 +748,13 @@ function InitScreen() { ...@@ -737,7 +748,13 @@ function InitScreen() {
$("#chkOpt003").attr('checked', 'checked'); $("#chkOpt003").attr('checked', 'checked');
} }
// Show alert when press F5.close tab.broswer
if (ClientData.userOpt_closeOrRefreshAlert() == 0) {
$("#chkOpt005").removeAttr('checked');
}
else {
$("#chkOpt005").attr('checked', 'checked');
}
// 毎回ログアウトの時、バックアップするかどうかは必ず確認する // 毎回ログアウトの時、バックアップするかどうかは必ず確認する
if (ClientData.userOpt_bkConfirmFlg() == 0) { if (ClientData.userOpt_bkConfirmFlg() == 0) {
$("#chkOptBkCfm").removeAttr('checked'); $("#chkOptBkCfm").removeAttr('checked');
......
abvw/settings.html
...@@ -104,6 +104,7 @@ ...@@ -104,6 +104,7 @@
</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="chk1" 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>
</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