Skip to content

C
check
Commit 38bf701c by Masaru Abe
Options

ビューアから戻る処理改善対応

parent 9b78c046
Showing with 1667 additions and 629 deletions
abvw/bookmark.html
......@@ -7,11 +7,15 @@
<meta http-equiv="Cache-Control" content="no-store">
<meta http-equiv="Cache-Control" content="no-cache">
<meta http-equiv="Expires" content="-1">
<title></title>
<link rel="stylesheet" type="text/css" href="common/css/jquery-ui.css?__UPDATEID__" />
<link rel="stylesheet" type="text/css" href="common/css/jquery.toastmessage.css?__UPDATEID__" />
<link rel="stylesheet" type="text/css" href="common/css/default.css?__UPDATEID__"/>
<link rel="stylesheet" type="text/css" href="common/css/screenLock.css?__UPDATEID__"/>
<link rel="stylesheet" type="text/css" href="common/css/jquery.treeview.css?__UPDATEID__" />
<link rel="stylesheet" type="text/css" href="css/reset.css?__UPDATEID__" />
<link rel="stylesheet" type="text/css" href="css/layout/common.css?__UPDATEID__" />
<link rel="stylesheet" type="text/css" href="css/theme/common.css?__UPDATEID__" />
......@@ -30,24 +34,34 @@
<link rel="stylesheet" type="text/css" href="css/layout/limit_access.css?__UPDATEID__" />
<link rel="stylesheet" type="text/css" href="css/theme/limit_access.css?__UPDATEID__" />
<!-- CSSビュー -->
<!-- link rel="stylesheet" type="text/css" href="css/reset.css?#UPDATEID#" / -->
<link rel="stylesheet" type="text/css" href="css/layout/viewer.css?#UPDATEID#" />
<link rel="stylesheet" type="text/css" href="css/theme/viewer.css?#UPDATEID#" />
<link rel="stylesheet" type="text/css" href="common/css/jquery.powertip.css?#UPDATEID#" />
<link rel="stylesheet" type="text/css" href="css/layout/Anket.css?#UPDATEID#" />
<link rel="stylesheet" type="text/css" href="css/theme/Anket.css?#UPDATEID#" />
<link rel="stylesheet" type="text/css" href="css/delete_shiori.css?#UPDATEID#" />
<script type="text/javascript" src="./common/js/jquery-1.8.1.min.js?__UPDATEID__"></script>
<script type="text/javascript" src="./common/js/jquery-ui-1.8.23.custom.min.js?__UPDATEID__"></script>
<script type="text/javascript" src="./common/js/jquery.toastmessage.js?__UPDATEID__"></script>
<script type="text/javascript" src="./common/js/avweb.js?__UPDATEID__"></script>
<script type="text/javascript" src="./common/js/i18n.js?__UPDATEID__"></script>
<script type="text/javascript" src="./common/js/common.js?__UPDATEID__"></script>
<script type="text/javascript" src="./common/js/uuid.js?__UPDATEID__"></script>
<script type="text/javascript" src="./common/js/screenLock.js?__UPDATEID__" ></script>
<script type="text/javascript" src="./common/js/jquery.treeview.edit.js?__UPDATEID__" ></script>
<script type="text/javascript" src="./common/js/jquery.treeview.js?__UPDATEID__" ></script>
<script type="text/javascript" src="./js/header.js?__UPDATEID__" ></script>
<script type="text/javascript" src="./js/Limit_Access_Content.js?__UPDATEID__"></script>
<script type="text/javascript" src="./js/bookmark.js?__UPDATEID__" ></script>
<script type="text/javascript" src="./common/js/thickbox.js?__UPDATEID__"></script>
<script type="text/javascript" src="./common/js/scrolltopcontrol.js?__UPDATEID__"></script>
<title></title>
</head>
<body id="list">
<header>
<body id="bookmark" oncontextmenu="return false;">
<header id="header-ws" class="header_ws">
<div class="notification-pushmessage" style="display:none;">
<!--新着メッセージがあります！！！-->
</div>
......@@ -94,11 +108,9 @@
</div>
</header>
<div id="inc_backup"></div>
<div class="wrapper">
<div id="main">
<div id="ws-body" class="wrapper_ws" >
<div id="inc_backup"></div>
<div id="main-ws">
<article id="articleMain" class="articleMain">
<div class="tops" id="sortingDiv">
<span class="lang" lang="txtSort"><!--並び替え--></span>
......@@ -107,7 +119,6 @@
<li><a id="dspTitleNmKn" lang="dspTitleNmKn" class="lang"><!--タイトル名(かな)--></a><b id="dspTitleNmKn_Seperate">|</b></li>
<li><a id="dspPubDt" lang="dspRegDt" class="lang"><!--登録日--></a></li>
</ul>
<a class="delete lang" id="dspDelete" lang="dspDelete"><!--削除--></a>
</div>
<section id="pnlTop" class='top'>
......@@ -119,25 +130,29 @@
<a class="delete lang" id="dspDelete1" lang="dspDelete"><!--削除--></a>
</section>
</article>
</div>
</div>
</div>
<!-- Delete panel [start]-->
<!-- Delete panel [start]-->
<section class="sectionDeleteConfirm" id="delete_shiori">
<h1 class="lang" lang="txtDeleteConfirmTitle"><!--しおり削除確認--></h1>
<p class="message lang" lang="dspShioriDelConf"><!--設定されているしおりを削除しますか？--></p>
<p class="deletebtn"><a id="dspConfirmOK" lang="dspOK" class="ok lang"><!--ＯＫ--></a><a id="dspCancel" lang="dspCancel" class="cancel lang"><!--キャンセル--></a></p>
<h1 class="lang" lang="txtDeleteConfirmTitle">しおり削除確認</h1>
<p class="message lang" lang="dspShioriDelConf">設定されているしおりを削除しますか？</p>
<p class="deletebtn"><a id="dspConfirmOK" lang="dspOK" class="ok lang">ＯＫ</a><a id="dspCancel" lang="dspCancel" class="cancel lang">キャンセル</a></p>
</section>
<!-- Delete panel [end] -->
<footer>
<div class="border">
<footer>
<div class="border">
<div class="cnt_footer">
COPYRIGHT &copy; 2014 AGENTEC Co., Ltd. ALL RIGHTS RESERVED.
</div>
</div>
</footer>
</div>
<div id="viewer" style="display:none;" >
</div>
</footer>
<iframe style="height:0px;width:0px;visibility:hidden;display:none;" src="about:blank">
this frame prevents back forward cache
</iframe>
......
abvw/common/css/screen.css
/*
html, body {height:100%; margin: 0; padding: 0; }
html>body {
font-size: 16px;
font-size: 68.75%;
} /* Reset Base Font Size */
}
body {
font-family: Verdana, helvetica, arial, sans-serif;
......@@ -11,6 +12,7 @@ body {
background: #fff;
color: #333;
}
*/
h1, h2 { font-family: 'trebuchet ms', verdana, arial; padding: 10px; margin: 0 }
h1 { font-size: large }
......@@ -19,6 +21,6 @@ h1 { font-size: large }
background: url(bg.gif) repeat-x; text-align: center }
#banner a { color: white; }
#main { padding: 1em; }
#main-ws { padding: 1em; }
a img { border: none; }
\ No newline at end of file
abvw/common/js/avweb.js
......@@ -451,7 +451,7 @@ AVWEB._callCmsApi = function(url, accountPath, apiName, type, params, async, suc
apiUrl = url;
}
if(accountPath) {
apiUrl = AVWEB.format(apiUrl, accountPath)
apiUrl = AVWEB.format(apiUrl, accountPath);
}
apiUrl = apiUrl + '/' + apiName + '/';
......@@ -488,10 +488,60 @@ AVWEB._callCmsApi = function(url, accountPath, apiName, type, params, async, suc
if(error) {
error(xmlHttpRequest, txtStatus, errorThrown);
} else {
if(xmlHttpRequest.status == 403) {
AVWEB.showSystemError('sysErrorCallApi02');
}
else {
AVWEB.showSystemError();
}
}
}
});
};
/* CMS API Call */
AVWEB._callCmsApiWhen = function(accountPath, apiName, type, params ) {
// アプリケーション設定取得
var sysSettings = AVWEB.avwSysSetting();
// url 構築
var apiUrl = ClientData.conf_apiUrl();
if(accountPath) {
apiUrl = AVWEB.format(apiUrl, accountPath);
}
apiUrl = apiUrl + '/' + apiName + '/';
//----------------------------------------------------------------------------------
// for IE: 暫定的に対応 （これをすることでIE9でもCrossDomainリクエストが可能だがアクセスのたびに警告が出る）
$.support.cors = true;
//----------------------------------------------------------------------------------
// ajax によるAPIの実行（json）
var ajaxObj = $.ajax( {
async: true,
type: (type) ? type : 'get',
url: apiUrl,
cache: false,
dataType: 'json',
data: params,
crossDomain: true,
beforeSend: function(xhr) {
/*
* ABook viewer for WEB 用のリクエストヘッダに、以下のヘッダを付加する
* X-AGT-AppId: ABookWebCL
* X-AGT-AppVersion: 0.0.1
*/
xhr.setRequestHeader('X-AGT-AppId', sysSettings.appName);
xhr.setRequestHeader('X-AGT-AppVersion', sysSettings.appVersion);
}
});
return ajaxObj;
};
/*
......@@ -659,7 +709,7 @@ AVWEB.avwGrabContentPageImage = function(accountPath, params, success, error) {
if (error) {
error(xmlHttp, xmlHttp.status, xmlHttp.statusText);
} else {
//console.log(xmlHttp.status + ' ' + xmlHttp.statusText);
AVWEB.avwLog(xmlHttp.status + ' ' + xmlHttp.statusText);
}
}
}
......@@ -759,7 +809,7 @@ AVWEB.avwUploadBackupFile = function(accountPath, params, async, success, error)
});
};
/* show system error message */
AVWEB.showSystemError = function() {
AVWEB.showSystemError = function(textId) {
if(AVWEB.avwHasError()) {
// すでにエラー状態であればエラーを表示しない
......@@ -769,8 +819,12 @@ AVWEB.showSystemError = function() {
AVWEB.avwSetErrorState();
}
if( !textId ){
textId = 'sysErrorCallApi01';
}
// create DOM element for showing error message
var errMes = I18N.i18nText('sysErrorCallApi01');
var errMes = I18N.i18nText(textId);
var tags = '<div id="avw-sys-error"></div>';
//$('body').prepend(tags);
$('body').append(tags);
......
abvw/common/json/sys/conf.json
{
"apiUrl" : "https://web3.agentec.jp/acms/{0}/abvapi",
"apiLoginUrl" : "https://web3.agentec.jp/acms/nuabvapi",
"apiResourceDlUrl" : "https://web3.agentec.jp/acms/{0}/dl",
"apiUrl" : "https://abmaker.agentec.jp/acms/{0}/abvapi",
"apiLoginUrl" : "https://abmaker.agentec.jp/acms/nuabvapi",
"apiResourceDlUrl" : "https://abmaker.agentec.jp/acms/{0}/dl",
"bookShelfCount" : 15,
"bookListCount" : 15,
"screenlockTimeDefault" : 30,
......
abvw/contentsearch.html
......@@ -7,14 +7,16 @@
<meta http-equiv="Cache-Control" content="no-store">
<meta http-equiv="Cache-Control" content="no-cache">
<meta http-equiv="Expires" content="-1">
<title></title>
<link rel="stylesheet" type="text/css" href="common/css/jquery-ui.css?__UPDATEID__" />
<link rel="stylesheet" type="text/css" href="common/css/jquery.toastmessage.css?__UPDATEID__" />
<link rel="stylesheet" type="text/css" href="common/css/default.css?__UPDATEID__" />
<link rel="stylesheet" type="text/css" href="common/css/screenLock.css?__UPDATEID__" />
<link rel="stylesheet" type="text/css" href="common/css/screen.css?__UPDATEID__" />
<link rel="stylesheet" type="text/css" href="common/css/jquery.treeview.css?__UPDATEID__" />
<link rel="stylesheet" type="text/css" href="css/reset.css?__UPDATEID__" />
<link rel="stylesheet" type="text/css" href="css/layout/common.css?__UPDATEID__" />
<link rel="stylesheet" type="text/css" href="css/theme/common.css?__UPDATEID__" />
<link rel="stylesheet" type="text/css" href="css/layout/header.css?__UPDATEID__" />
......@@ -33,17 +35,39 @@
<link rel="stylesheet" type="text/css" href="css/theme/limit_access.css?__UPDATEID__" />
<link rel="stylesheet" type="text/css" href="css/layout/share.css?__UPDATEID__" />
<link rel="stylesheet" type="text/css" href="css/theme/share.css?__UPDATEID__" />
<!--
<link rel="stylesheet" type="text/css" href="common/js/pickadate/themes/default.css?__UPDATEID__" id="theme_base" />
<link rel="stylesheet" type="text/css" href="common/js/pickadate/themes/default.date.css?__UPDATEID__" id="theme_date" />
-->
<link rel="stylesheet" type="text/css" href="common/js/pickadate/themes/classic.css?__UPDATEID__" id="theme_base" />
<link rel="stylesheet" type="text/css" href="common/js/pickadate/themes/classic.date.css?__UPDATEID__" id="theme_date" />
</head>
<body>
<!-- CSSビュー -->
<!-- link rel="stylesheet" type="text/css" href="css/reset.css?__UPDATEID__" / -->
<link rel="stylesheet" type="text/css" href="css/layout/viewer.css?__UPDATEID__" />
<link rel="stylesheet" type="text/css" href="css/theme/viewer.css?__UPDATEID__" />
<link rel="stylesheet" type="text/css" href="common/css/jquery.powertip.css?__UPDATEID__" />
<link rel="stylesheet" type="text/css" href="css/layout/Anket.css?__UPDATEID__" />
<link rel="stylesheet" type="text/css" href="css/theme/Anket.css?__UPDATEID__" />
<link rel="stylesheet" type="text/css" href="css/delete_shiori.css?__UPDATEID__" />
<header>
<script type="text/javascript" src="./common/js/jquery-1.8.1.min.js?__UPDATEID__"></script>
<script type="text/javascript" src="./common/js/jquery-ui-1.8.23.custom.min.js?__UPDATEID__"></script>
<script type="text/javascript" src="./common/js/jquery.toastmessage.js?__UPDATEID__"></script>
<script type="text/javascript" src="./common/js/i18n.js?__UPDATEID__"></script>
<script type="text/javascript" src="./common/js/avweb.js?__UPDATEID__"></script>
<script type="text/javascript" src="./common/js/common.js?__UPDATEID__"></script>
<script type="text/javascript" src="./common/js/uuid.js?__UPDATEID__"></script>
<script type="text/javascript" src="./js/Limit_Access_Content.js?__UPDATEID__"></script>
<script type="text/javascript" src="./js/contentsearch.js?__UPDATEID__"></script>
<script type="text/javascript" src="./js/header.js?__UPDATEID__"></script>
<script type="text/javascript" src="./common/js/gotop.js?__UPDATEID__"></script>
<script type="text/javascript" src="./common/js/tab.js?__UPDATEID__"></script>
<script type="text/javascript" src="./common/js/screenLock.js?__UPDATEID__" ></script>
<script type="text/javascript" src="./common/js/jquery.treeview.edit.js?__UPDATEID__" ></script>
<script type="text/javascript" src="./common/js/jquery.treeview.js?__UPDATEID__" ></script>
<script type="text/javascript" src="./js/detail.js?__UPDATEID__" ></script>
<script type="text/javascript" src="./common/js/scrolltopcontrol.js?__UPDATEID__"></script>
</head>
<body id="contentsearch" oncontextmenu="return false;">
<header id="header-ws" class="header_ws">
<div class="notification-pushmessage" style="display:none;">
<!--新着メッセージがあります！！！-->
</div>
......@@ -90,15 +114,14 @@
</div>
</header>
<div id="inc_backup"></div>
<div class="wrapper">
<div id="main">
<div id="ws-body" class="wrapper_ws" >
<div id="inc_backup"></div>
<div id="main-ws">
<article class="articlecontentsearch">
<div class="tops">
<div id="main-searchresult">
<span class="lang" lang="txtSearchResult" id="txtSearchResult"><!--検索結果--></span>
<input type="text" id="txtSearch" />
<input type="text" id="txtSearchWs" />
<input type="radio" id="main-content" name="main-searchtype" value="1" checked/><span id="main-search-content" class="lang" lang="txtCtnNm"><!--コンテンツ名--></span>
<input type="radio" id="main-tag" name="main-searchtype" value="2" /><span id="main-search-tag" class="lang" lang="txtTag"><!--タグ--></span>
<input type="radio" id="main-body" name="main-searchtype" value="3" /><span id="main-search-body" class="lang" lang="txtContTxt"><!--本文--></span>
......@@ -131,9 +154,7 @@
</p>
</div>
<div class="clearboth"></div>
<div id="content-grid">
</div>
<div id="content-grid"></div>
<div style="display:none;" id="msgSearchNotExist" class="lang" lang="msgSearchNotExist"> </div>
<br/>
<section style="height:110px; width:100%;">
......@@ -141,35 +162,25 @@
</section>
</article>
</div>
</div>
<div id="inc_detail" ></div>
<div id="inc_detail" ></div>
<footer>
<div class="border">
<footer>
<div class="border">
<div class="cnt_footer">
COPYRIGHT &copy; 2014 AGENTEC Co., Ltd. ALL RIGHTS RESERVED.
</div>
</div>
</footer>
</div>
<div id="viewer" style="display:none;" >
</div>
</footer>
<iframe style="height:0px;width:0px;visibility:hidden;display:none;" src="about:blank">
this frame prevents back forward cache
</iframe>
<script type="text/javascript" src="./common/js/jquery-1.8.1.min.js?__UPDATEID__"></script>
<script type="text/javascript" src="./common/js/jquery-ui-1.8.23.custom.min.js?__UPDATEID__"></script>
<script type="text/javascript" src="./common/js/jquery.toastmessage.js?__UPDATEID__"></script>
<script type="text/javascript" src="./common/js/i18n.js?__UPDATEID__"></script>
<script type="text/javascript" src="./common/js/avweb.js?__UPDATEID__"></script>
<script type="text/javascript" src="./common/js/common.js?__UPDATEID__"></script>
<script type="text/javascript" src="./js/Limit_Access_Content.js?__UPDATEID__"></script>
<script type="text/javascript" src="./js/header.js?__UPDATEID__"></script>
<script type="text/javascript" src="./js/contentsearch.js?__UPDATEID__"></script>
<script type="text/javascript" src="./common/js/gotop.js?__UPDATEID__"></script>
<script type="text/javascript" src="./common/js/tab.js?__UPDATEID__"></script>
<script type="text/javascript" src="./common/js/screenLock.js?__UPDATEID__" ></script>
<script type="text/javascript" src="./common/js/scrolltopcontrol.js?__UPDATEID__"></script>
</body>
</html>
abvw/css/layout/bookshelf.css
......@@ -19,7 +19,7 @@
height: 33px;
display: table-cell;
}
#bookshelf .wrapper #main .hoge-R section.sectionhomebookshelf .name img {
#bookshelf .wrapper_ws #main-ws .hoge-R section.sectionhomebookshelf .name img {
display: inline-block;
vertical-align: middle;
margin-right: 5px;
......@@ -123,22 +123,22 @@ a:hover.btn_bott{
}
#bookshelf .wrapper #main .hoge-R .tops .floatR {
#bookshelf .wrapper_ws #main-ws .hoge-R .tops .floatR {
display: inline;
}
#bookshelf .wrapper #main .hoge-R section .cnt_section_bookshelf .img .band_vertical {
#bookshelf .wrapper_ws #main-ws .hoge-R section .cnt_section_bookshelf .img .band_vertical {
position: absolute;
top: 8px;
left: 40px;
}
#bookshelf .wrapper #main .hoge-R section .cnt_section_bookshelf .img .band_horizontal {
#bookshelf .wrapper_ws #main-ws .hoge-R section .cnt_section_bookshelf .img .band_horizontal {
position: absolute;
top: 46px;
left: 19px;
}
.wrapper #main .hoge-R section .cnt_section_bookshelf .img .book_horizontal {
.wrapper_ws #main-ws .hoge-R section .cnt_section_bookshelf .img .book_horizontal {
margin-top: 44px;
}
.wrapper #main .hoge-R .cnt_section_bookshelf .img .book_vertical {
.wrapper_ws #main-ws .hoge-R .cnt_section_bookshelf .img .book_vertical {
margin-top: 5px;
}
\ No newline at end of file
abvw/css/layout/common.css
......@@ -15,7 +15,7 @@ form, ul{ margin:0; padding:0;}
li{ list-style-type:none;}
img{ display:block; border:none;}
#main{
#main-ws{
width: 960px;
padding-top: 20px;
overflow: hidden;
......@@ -55,3 +55,4 @@ br.clear { clear: both; margin: 0; padding: 0; font-size: 0; line-height: 0; }
.floatL { float: left;}
.floatR { float: right;}
abvw/css/layout/contentsearch.css
......@@ -150,7 +150,8 @@
}
.cnt_section_list .text ul.pic li img {
position: relative;
left: -18px;
/*left: -18px;*/
left: 1px;
}
.cnt_section_list .text ul.pic li a.read {
margin-top: 42px;
......@@ -235,7 +236,7 @@ a:hover.btn_bott{
right: 20px;
top: 50px;
}
section
#main-ws section
{
}
......
abvw/css/layout/footer.css
@charset "utf-8";
/* footer */
footer{
#ws-body footer{
display: block;
height: 58px;
line-height: 60px;
......
abvw/css/layout/header.css
@charset "utf-8";
header{
.header_ws{
height: 100px;
width: 100%;
display: block;
......@@ -129,21 +129,22 @@ header{
.cnt_header .menu_language ul.pushMessage a:hover { }
header .cnt_header .menu_language ul li a img { display: inline; }
header .cnt_header .menu_language ul .language {
.header_ws .cnt_header .menu_language ul li a img { display: inline; }
.header_ws .cnt_header .menu_language ul .language {
padding: 0;
margin-left: 0px;
}
header .cnt_header .menu_language .button .menuIcon img { display: inline; }
header .cnt_header .menu_language ul li a#jQueryPush{
.header_ws .cnt_header .menu_language .button .menuIcon img { display: inline; }
.header_ws .cnt_header .menu_language ul li a#jQueryPush{
}
header .cnt_header .menu_language .button {
.header_ws .cnt_header .menu_language .button {
width: 520px;
/*width: 590px;*/
position: relative;
}
header .cnt_header .menu_language #header-searchbox {
.header_ws .cnt_header .menu_language #header-searchbox {
width: 200px;
position: absolute;
top: 25px;
......@@ -152,11 +153,11 @@ header .cnt_header .menu_language #header-searchbox {
right: 0px;
padding-top:5px;
}
header .cnt_header .menu_language #header-searchbox span
.header_ws .cnt_header .menu_language #header-searchbox span
{
cursor:pointer;
}
header .cnt_header .menu_language #header-searchbox a#searchbox-search {
.header_ws .cnt_header .menu_language #header-searchbox a#searchbox-search {
height: 20px;
line-height:20px;
/*width: 25px;*/
......@@ -170,7 +171,7 @@ header .cnt_header .menu_language #header-searchbox a#searchbox-search {
display: inline-block;
margin:0 5px 5px 0;
}
header .cnt_header .menu_language #header-searchbox a#searchbox-search:hover {
.header_ws .cnt_header .menu_language #header-searchbox a#searchbox-search:hover {
}
a#searchbox-search:active{
position:relative;
......@@ -196,9 +197,9 @@ a#searchbox-search:active{
margin-right:5px;
}
.tops ul.sort li.current a.ascending_sort{
text-decoration:underline;
padding-right: 15px;
margin-right:5px;
text-decoration:underline;
padding-right: 15px;
margin-right:5px;
}
.tops ul.sort li b{
}
......
abvw/css/layout/history.css
......@@ -154,6 +154,11 @@
position: relative;
left: -1px;
}
.cnt_section_list .text ul.pic li img.pen {
margin-left: 15px;
}
.cnt_section_list .text ul.pic li a.read {
margin-top: 42px;
-moz-border-radius: 6px;
......
abvw/css/layout/home.css
......@@ -61,7 +61,7 @@
a:hover{
cursor: pointer;
}
canvas:hover
#main-ws canvas:hover
{
cursor: pointer;
}
......
abvw/css/layout/list.css
......@@ -20,7 +20,7 @@
display: table-cell;
}
#list .wrapper #main .hoge-R section.sectionhomelist .name img {
#list .wrapper_ws #main-ws .hoge-R section.sectionhomelist .name img {
display: inline-block;
vertical-align: middle;
margin-right: 5px;
......@@ -148,34 +148,26 @@ section.sectionhomelist{
a:hover.btn_bott{
}
#list .wrapper #main .hoge-R .tops .floatR {
#list .wrapper_ws #main-ws .hoge-R .tops .floatR {
display: inline;
}
#list .wrapper #main .hoge-R section .cnt_section_list .img .band_horizontal {
#list .wrapper_ws #main-ws .hoge-R section .cnt_section_list .img .band_horizontal {
position: absolute;
top: 7px;
left: 12px;
}
#list .wrapper #main .hoge-R section .cnt_section_list .img .band_vertical {
#list .wrapper_ws #main-ws .hoge-R section .cnt_section_list .img .band_vertical {
position: absolute;
top: 7px;
left: 50px;
}
/*
#list .wrapper #main .hoge-R section .cnt_section_list .text .info .pic li .read {
#list .wrapper_ws #main-ws .hoge-R section .cnt_section_list .text .info .pic li .iconList {
position: absolute;
right: -145px;
display: block;
top: 15px;
}
*/
#list .wrapper #main .hoge-R section .cnt_section_list .text .info .pic li .iconList {
position: absolute;
right: -145px;
display: block;
top: 15px;
}
#list .wrapper #main article section .cnt_section_list .text .name .listIcon {
#list .wrapper_ws #main-ws article section .cnt_section_list .text .name .listIcon {
display: inline;
vertical-align: middle;
margin-right: 5px;
......
abvw/css/layout/list_shiori.css
......@@ -27,7 +27,7 @@ a
font-size: 12px;
}
.button{ float:right; margin-top:20px; margin-right:2px; }
.delete {
#ws-body .delete {
position: absolute;
top: 27px;
left: 20px;
......@@ -36,23 +36,24 @@ a
padding: 2px 26px;
margin-left: 5px;
}.delete:hover {
}
#ws-body .delete:hover {
}
.delete:active {
#ws-body .delete:active {
/* position:relative;
top:1px;*/
}
a.delete:not(:target) {
#ws-body a.delete:not(:target) {
/* background-image: url(button_back_off.svg);*/
}
a.delete:hover:not(:target) {
#ws-body a.delete:hover:not(:target) {
/* background-image: url(button_back_on.svg);*/
}
.delete_hover {
#ws-body .delete_hover {
display: inline-block;
......@@ -60,9 +61,10 @@ a.delete:hover:not(:target) {
margin-left: 5px;
background-position: center top;
}
.delete:hover:hover {
#ws-body .delete:hover:hover {
}.delete:hover:active {
}
#ws-body .delete:hover:active {
/* position:relative;
top:1px;*/
}
......@@ -179,8 +181,17 @@ a.delete:hover:not(:target) {
position: relative;
left: -18px;
}
.cnt_section .text ul.pic li a.read_open {
margin-top: 30px;
}
.cnt_section .text ul.pic li a.read_download {
margin-top: 60px;
}
.cnt_section .text ul.pic li a.read {
margin-top: 42px;
/*margin-top: 42px;*/
-moz-border-radius: 6px;
-webkit-border-radius: 6px;
border-radius: 6px;
......@@ -230,17 +241,17 @@ section#bottom {
margin-top: 10px;
display: block;
}
#list .wrapper #main article section .cnt_section .img .band_horizontal {
#bookmark .wrapper_ws #main-ws article section .cnt_section .img .band_horizontal {
position: absolute;
top: -4px;
left: 1px;
}
#list .wrapper #main article section .cnt_section .img .band_vertical {
#bookmark .wrapper_ws #main-ws article section .cnt_section .img .band_vertical {
position: absolute;
left: 40px;
top: -4px;
}
#list .wrapper #main article section .cnt_section .text .info .pic li .read {
#bookmark .wrapper_ws #main-ws article section .cnt_section .text .info .pic li .read {
position: absolute;
right: 20px;
top: 50px;
......
abvw/css/layout/list_shirori_detail.css
......@@ -162,7 +162,7 @@
margin-right: auto;
margin-left: auto;
padding-top: 124px;
width: 180px;
width: 200px;
}
.sectiondetailnopdf #book_data .book_img {
height: 145px;
......
abvw/css/layout/login.css
......@@ -28,6 +28,10 @@ html,body{
width:100%;
}
html{
overflow-y:auto;
}
body{
}
......@@ -59,7 +63,7 @@ body{
width: 100%;
}
#main{
#main-ws{
width:960px;
padding:0;
}
......@@ -155,7 +159,7 @@ section a.loginbtn {
}
section a.loginbtn:hover {
}
#login .wrapper #main article section a.loginbtn:active {
#login .wrapper #main-ws article section a.loginbtn:active {
position:relative;
top:1px;
}
......@@ -198,21 +202,21 @@ section .loginbtn a:hover:not(:target) {
text-align: left;
padding-left:30px;
}
#login .wrapper #main article section table tr td input {
#login .wrapper #main-ws article section table tr td input {
width: 240px;
height: 28px;
}
#login article section table tr th,#login article section table tr td {
padding-bottom: 30px;
}
#login .wrapper #main article section table {
#login .wrapper #main-ws article section table {
margin:0 30px ;
}
#login footer .border .cnt_footer {
border: none;
}
#login .wrapper #main article img {
#login .wrapper #main-ws article img {
margin-right: auto;
margin-left: auto;
}
......@@ -238,12 +242,12 @@ section .loginbtn a:hover:not(:target) {
left: 0px;
z-index: 50;
}
#login .wrapper #main ul
#login .wrapper #main-ws ul
{
margin-top:15px;
}
#login .wrapper #main li {
#login .wrapper #main-ws li {
display: inline-block;
margin-right:5px;
}
......@@ -267,7 +271,7 @@ footer{
.focus{ }
#user_change footer .border .cnt_footer img { display: inline;}
#login .wrapper #main article section .error {
#login .wrapper #main-ws article section .error {
margin-top: 20px;
text-align: center;
}
......
abvw/css/layout/setting.css
......@@ -56,14 +56,14 @@ body{
/* 5. .section setting */
/*----------------------------*/
#main{
#main-ws{
width: 960px;
padding: 0;
margin-right: auto;
margin-left: auto;
}
article{
#main-ws article{
width: 960px;
/*height: 900px;*/
padding: 0;
......
abvw/css/layout/viewer.css
......@@ -33,6 +33,8 @@
/*----------------------------*/
/* 1. gloval setting */
/*----------------------------*/
/*
html{
overflow: hidden;
}
......@@ -46,6 +48,18 @@ body{
margin: 0;
padding: 0;
}
*/
/*
#viewer {
overflow: hidden;
width:100%;
height:100%;
margin: 0;
padding: 0;
}
*/
/*----------------------------*/
/* 2. wrapper setting */
......@@ -64,7 +78,7 @@ body{
/* 3. header setting */
/*----------------------------*/
header{
#header_toolbar{
max-width: none;
min-width: 1000px;
height: 60px;
......@@ -258,7 +272,7 @@ header{
/* 5. section setting */
/*----------------------------*/
article{
#viewer article{
display:table;
width:100%;
min-height:100%;
......@@ -268,7 +282,7 @@ article{
margin:0 auto 0;
}
section{
#viewer section{
}
......@@ -931,7 +945,7 @@ aside.MemoIndexBox .indexBoxBody_off{
display: block;
}
.thumbnail
#wrapper .thumbnail
{
width: 15%;
height: 100%;
......@@ -1316,7 +1330,7 @@ div .ui-slider-range, .ui-widget-header, .ui-slider-range-max {
margin-left: auto;
margin-top: auto;
padding: 15px;
z-index: 102;
/*z-index: 102;*/
z-index: 101;
}
......
abvw/css/theme/bookshelf.css
......@@ -23,7 +23,7 @@
background-position: center center;
border-radius: 3px 0px 0px 3px;
}
#bookshelf .wrapper #main .hoge-R section.sectionhomebookshelf .name img {
#bookshelf .wrapper_ws #main-ws .hoge-R section.sectionhomebookshelf .name img {
}
......@@ -152,18 +152,18 @@ a:hover.btn_bott{
filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#22466D', endColorstr='#37648C',GradientType=0 ); /* IE6-9 */
}
#bookshelf .wrapper #main .hoge-R .tops .floatR {
#bookshelf .wrapper_ws #main-ws .hoge-R .tops .floatR {
}
#bookshelf .wrapper #main .hoge-R section .cnt_section_bookshelf .img .band_vertical {
#bookshelf .wrapper_ws #main-ws .hoge-R section .cnt_section_bookshelf .img .band_vertical {
}
#bookshelf .wrapper #main .hoge-R section .cnt_section_bookshelf .img .band_horizontal {
#bookshelf .wrapper_ws #main-ws .hoge-R section .cnt_section_bookshelf .img .band_horizontal {
}
.wrapper #main .hoge-R section .cnt_section_bookshelf .img .book_horizontal {
.wrapper_ws #main-ws .hoge-R section .cnt_section_bookshelf .img .book_horizontal {
}
.wrapper #main .hoge-R .cnt_section_bookshelf .img .book_vertical {
.wrapper_ws #main-ws .hoge-R .cnt_section_bookshelf .img .book_vertical {
}
abvw/css/theme/common.css
......@@ -15,7 +15,7 @@ form, ul{ }
li{ }
img{ }
#main{
#main-ws{
}
......@@ -50,3 +50,4 @@ br.clear { }
color: #fff;
background: #ccc;
}
abvw/css/theme/contentsearch.css
......@@ -190,7 +190,7 @@ a:hover.btn_bott{
.cnt_section_list .text .info .pic li .read {
}
section
#main-ws section
{
border-top: 1px dashed #cccccc;
}
......
abvw/css/theme/footer.css
@charset "utf-8";
/* footer */
footer{
#ws-body footer{
background-color: #EDF2F2;
}
.cnt_footer{
......
abvw/css/theme/header.css
@charset "utf-8";
header{
.header_ws{
background-image: url(../../img/common/header_border.jpg) ,url(../../img/common/header_bg.jpg);
background-repeat: repeat-x, repeat;
background-position: bottom, top;
......@@ -101,29 +101,28 @@ header{
.cnt_header .menu_language ul.pushMessage a:hover { text-decoration: none; }
header .cnt_header .menu_language ul li a img { display: inline; }
header .cnt_header .menu_language ul .language {
.header_ws .cnt_header .menu_language ul li a img { display: inline; }
.header_ws .cnt_header .menu_language ul .language {
padding: 0;
margin-left: 0px;
}
header .cnt_header .menu_language .button .menuIcon img { display: inline; }
header .cnt_header .menu_language ul li a#jQueryPush{
.header_ws .cnt_header .menu_language .button .menuIcon img { display: inline; }
.header_ws .cnt_header .menu_language ul li a#jQueryPush{
text-decoration: none !important;
color:#333;
}
header .cnt_header .menu_language .button {
.header_ws .cnt_header .menu_language .button {
}
header .cnt_header .menu_language #header-searchbox {
.header_ws .cnt_header .menu_language #header-searchbox {
background-color: #FFFFFF;
border: 1px solid #CCCCCC;
}
header .cnt_header .menu_language #header-searchbox span
.header_ws .cnt_header .menu_language #header-searchbox span
{
}
header .cnt_header .menu_language #header-searchbox a#searchbox-search {
.header_ws .cnt_header .menu_language #header-searchbox a#searchbox-search {
-moz-box-shadow: inset 0px 1px 0px 0px #86ACC7;
-webkit-box-shadow: inset 0px 1px 0px 0px #86ACC7;
box-shadow: inset 0px 1px 0px 0px #86ACC7;
......@@ -134,7 +133,7 @@ header .cnt_header .menu_language #header-searchbox a#searchbox-search {
border: 1px solid #0C274D;
color: #ffffff;
}
header .cnt_header .menu_language #header-searchbox a#searchbox-search:hover {
.header_ws .cnt_header .menu_language #header-searchbox a#searchbox-search:hover {
background:-webkit-gradient( linear, left top, left bottom, color-stop(0.05, #23486F), color-stop(1, #36638B) );
background:-moz-linear-gradient( center top, #23486F 5%, #36638B 100% );
filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#23486F', endColorstr='#36638B');
......@@ -162,8 +161,8 @@ a#searchbox-search:active{
background: url(../../img/common/icon_triangle_d.png) no-repeat right 5px;
}
.tops ul.sort li.current a.ascending_sort{
color:#2d83da;
background:url(../../img/common/icon_triangle_u.png) no-repeat right 5px;
color:#2d83da;
background:url(../../img/common/icon_triangle_u.png) no-repeat right 5px;
}
.tops ul.sort li b{
font-weight: normal;
......
abvw/css/theme/home.css
......@@ -42,7 +42,7 @@
a:hover{
}
canvas:hover{
#main-ws canvas:hover{
}
......
abvw/css/theme/list.css
......@@ -24,7 +24,7 @@
border-radius: 0px 3px 3px 0px;
}
#list .wrapper #main .hoge-R section.sectionhomelist .name img {
#list .wrapper_ws #main-ws .hoge-R section.sectionhomelist .name img {
}
......@@ -187,18 +187,18 @@ a:hover.btn_bott{
background: linear-gradient(to bottom, #22466D 0%,#37648C) 100%); /* W3C */
filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#22466D', endColorstr='#37648C',GradientType=0 ); /* IE6-9 */
}
#list .wrapper #main .hoge-R .tops .floatR {
#list .wrapper_ws #main-ws .hoge-R .tops .floatR {
}
#list .wrapper #main .hoge-R section .cnt_section_list .img .band_horizontal {
#list .wrapper_ws #main-ws .hoge-R section .cnt_section_list .img .band_horizontal {
}
#list .wrapper #main .hoge-R section .cnt_section_list .img .band_vertical {
#list .wrapper_ws #main-ws .hoge-R section .cnt_section_list .img .band_vertical {
}
#list .wrapper #main .hoge-R section .cnt_section_list .text .info .pic li .read {
#list .wrapper_ws #main-ws .hoge-R section .cnt_section_list .text .info .pic li .read {
}
#list .wrapper #main article section .cnt_section_list .text .name .listIcon {
#list .wrapper_ws #main-ws article section .cnt_section_list .text .name .listIcon {
}
abvw/css/theme/list_shiori.css
......@@ -20,7 +20,7 @@ a
font-size:12px;
}
.button{ }
.delete {
#ws-body .delete {
-moz-box-shadow: inset 0px 1px 0px 0px #C66;
-webkit-box-shadow: inset 0px 1px 0px 0px #C66;
......@@ -40,27 +40,28 @@ a
text-decoration: none;
background-position: center top;
}.delete:hover {
}
#ws-body .delete:hover {
background:-webkit-gradient( linear, left top, left bottom, color-stop(0.05, #CC0000), color-stop(1, #F33) );
background:-moz-linear-gradient( center top, #CC0000 5%, #F33 100% );
filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#CC0000', endColorstr='#F33');
background-color:#F33;
}
.delete:active {
#ws-body .delete:active {
}
a.delete:not(:target) {
#ws-body a.delete:not(:target) {
filter: none;
-ms-filter: none;
/* background-image: url(button_back_off.svg);*/
}
a.delete:hover:not(:target) {
#ws-body a.delete:hover:not(:target) {
filter: none;
-ms-filter: none;
/* background-image: url(button_back_on.svg);*/
}
.delete_hover {
#ws-body .delete_hover {
-moz-box-shadow: inset 0px 1px 0px 0px #C66;
-webkit-box-shadow: inset 0px 1px 0px 0px #C66;
box-shadow: inset 0px 1px 0px 0px #C66;
......@@ -81,12 +82,13 @@ a.delete:hover:not(:target) {
line-height: 20px;
background-position: center top;
}
.delete:hover:hover {
#ws-body .delete:hover:hover {
background:-webkit-gradient( linear, left top, left bottom, color-stop(0.05, #CC0000), color-stop(1, #F33) );
background:-moz-linear-gradient( center top, #CC0000 5%, #F33 100% );
filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#CC0000', endColorstr='#F33');
background-color:#F33;
}.delete:hover:active {
}
#ws-body .delete:hover:active {
}
......@@ -211,11 +213,11 @@ a.delete:hover:not(:target) {
section#bottom {
border-top: 1px dashed #cccccc;
}
#list .wrapper #main article section .cnt_section .img .band_horizontal {
#bookmark .wrapper_ws #main-ws article section .cnt_section .img .band_horizontal {
}
#list .wrapper #main article section .cnt_section .img .band_vertical {
#bookmark .wrapper_ws #main-ws article section .cnt_section .img .band_vertical {
}
#list .wrapper #main article section .cnt_section .text .info .pic li .read {
#bookmark .wrapper_ws #main-ws article section .cnt_section .text .info .pic li .read {
}
.shioriNotExist
......
abvw/css/theme/login.css
......@@ -58,7 +58,7 @@ background:#37648C;
.wrapper {
}
#main{
#main-ws{
}
a
......@@ -129,7 +129,7 @@ section a.loginbtn:hover {
filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#23486F', endColorstr='#36638B');
background-color:#36638B;
}
#login .wrapper #main article section a.loginbtn:active {
#login .wrapper #main-ws article section a.loginbtn:active {
}
section .loginbtn a:not(:target) {
......@@ -174,11 +174,11 @@ section .loginbtn a:hover:not(:target) {
font-size: 14px;
font-weight: bolder;
}
#login .wrapper #main article section table tr td input {
#login .wrapper #main-ws article section table tr td input {
}
#login article section table tr th,#login article section table tr td {
}
#login .wrapper #main article section table {
#login .wrapper #main-ws article section table {
border-bottom:dotted 1px #BBBBBB;
}
......@@ -186,7 +186,7 @@ section .loginbtn a:hover:not(:target) {
background: url(../../img/login/login_border.jpg) top repeat-x;
opacity:0;
}
#login .wrapper #main article img {
#login .wrapper #main-ws article img {
}
#loader {
}
......@@ -195,10 +195,10 @@ section .loginbtn a:hover:not(:target) {
background-color: #000;
opacity: 0.3;
}
#login .wrapper #main article ul {
#login .wrapper #main-ws article ul {
}
#login .wrapper #main article li {
#login .wrapper #main-ws article li {
}
......@@ -214,7 +214,7 @@ footer{
.focus{ color: #969696;}
#user_change footer .border .cnt_footer img { }
#login .wrapper #main article section .error {
#login .wrapper #main-ws article section .error {
font-size: 13px;
color: #FF0000;
font-weight: bolder;
......
abvw/css/theme/setting.css
......@@ -54,11 +54,11 @@ body{
/* 5. .section setting */
/*----------------------------*/
#main{
#main-ws{
background-color: #EDF2F2;
}
article{
#main-ws article{
}
.sectionSetting{
......
abvw/css/theme/viewer.css
......@@ -32,6 +32,8 @@
/*----------------------------*/
/* 1. gloval setting */
/*----------------------------*/
/*
html{
}
......@@ -45,6 +47,13 @@ body{
background:#898989;
background-image: url(../../img/viewer/article_bg.png);
}
*/
#viewer {
font-family: "メイリオ", "Meiryo", "ヒラギノ角ゴ Pro W3", "Hiragino Kaku Gothic Pro", "ＭＳ Ｐゴシック", "MS P Gothic", "Osaka", Verdana, Arial, Helvetica, sans-serif;
background:#898989;
background-image: url(../../img/viewer/article_bg.png);
}
/*----------------------------*/
/* 2. wrapper setting */
......@@ -60,7 +69,7 @@ body{
/* 3. header setting */
/*----------------------------*/
header{
#header_toolbar{
background-image: url(../../img/viewer/header_bg.jpg);
background-repeat: repeat-x;
box-shadow:0px 2px 10px 2px #333333;
......@@ -199,11 +208,11 @@ header{
/* 5. section setting */
/*----------------------------*/
article{
#viewer article{
background:#999999;
}
section{
#viewer section{
}
......@@ -772,7 +781,7 @@ aside.MemoIndexBox .indexBoxBody_off{
}
.thumbnail
#wrapper .thumbnail
{
box-shadow: 0px 2px 8px 0px #ccc;
border:3px solid #fff;
......@@ -1065,6 +1074,8 @@ div .ui-slider-range, .ui-widget-header, .ui-slider-range-max {
font-family: Verdana;
font-size: 10pt;
border-radius: 10px;
/*word-break: break-all;*/
/*word-wrap: break-word;*/
-moz-box-shadow:-3px 3px 3px #777;
-webkit-box-shadow:-3px 3px 3px #777;
......
abvw/history.html
......@@ -13,7 +13,10 @@
<link rel="stylesheet" type="text/css" href="common/css/jquery.toastmessage.css?__UPDATEID__" />
<link rel="stylesheet" type="text/css" href="common/css/default.css?__UPDATEID__" />
<link rel="stylesheet" type="text/css" href="common/css/screenLock.css?__UPDATEID__" />
<link rel="stylesheet" type="text/css" href="common/css/screen.css?__UPDATEID__" />
<link rel="stylesheet" type="text/css" href="common/css/jquery.treeview.css?__UPDATEID__" />
<link rel="stylesheet" type="text/css" href="css/reset.css?__UPDATEID__" />
<link rel="stylesheet" type="text/css" href="css/layout/common.css?__UPDATEID__" />
<link rel="stylesheet" type="text/css" href="css/theme/common.css?__UPDATEID__" />
<link rel="stylesheet" type="text/css" href="css/layout/header.css?__UPDATEID__" />
......@@ -36,16 +39,39 @@
<link rel="stylesheet" type="text/css" href="css/theme/limit_access.css?__UPDATEID__" />
<link rel="stylesheet" type="text/css" href="css/layout/share.css?__UPDATEID__" />
<link rel="stylesheet" type="text/css" href="css/theme/share.css?__UPDATEID__" />
<!--
<link rel="stylesheet" type="text/css" href="common/js/pickadate/themes/default.css?__UPDATEID__" id="theme_base" />
<link rel="stylesheet" type="text/css" href="common/js/pickadate/themes/default.date.css?__UPDATEID__" id="theme_date" />
-->
<link rel="stylesheet" type="text/css" href="common/js/pickadate/themes/classic.css?__UPDATEID__" id="theme_base" />
<link rel="stylesheet" type="text/css" href="common/js/pickadate/themes/classic.date.css?__UPDATEID__" id="theme_date" />
<!-- CSSビュー -->
<!-- link rel="stylesheet" type="text/css" href="css/reset.css?__UPDATEID__" / -->
<link rel="stylesheet" type="text/css" href="css/layout/viewer.css?__UPDATEID__" />
<link rel="stylesheet" type="text/css" href="css/theme/viewer.css?__UPDATEID__" />
<link rel="stylesheet" type="text/css" href="common/css/jquery.powertip.css?__UPDATEID__" />
<link rel="stylesheet" type="text/css" href="css/layout/Anket.css?__UPDATEID__" />
<link rel="stylesheet" type="text/css" href="css/theme/Anket.css?__UPDATEID__" />
<link rel="stylesheet" type="text/css" href="css/delete_shiori.css?__UPDATEID__" />
<script type="text/javascript" src="./common/js/jquery-1.8.1.min.js?__UPDATEID__"></script>
<script type="text/javascript" src="./common/js/jquery-ui-1.8.23.custom.min.js?__UPDATEID__"></script>
<script type="text/javascript" src="./common/js/jquery.toastmessage.js?__UPDATEID__"></script>
<script type="text/javascript" src="./common/js/i18n.js?__UPDATEID__"></script>
<script type="text/javascript" src="./common/js/avweb.js?__UPDATEID__"></script>
<script type="text/javascript" src="./common/js/common.js?__UPDATEID__"></script>
<script type="text/javascript" src="./common/js/uuid.js?__UPDATEID__"></script>
<script type="text/javascript" src="./js/Limit_Access_Content.js?__UPDATEID__"></script>
<script type="text/javascript" src="./js/history.js?__UPDATEID__"></script>
<script type="text/javascript" src="./js/header.js?__UPDATEID__"></script>
<script type="text/javascript" src="./common/js/gotop.js?__UPDATEID__"></script>
<script type="text/javascript" src="./common/js/tab.js?__UPDATEID__"></script>
<script type="text/javascript" src="./common/js/jquery.treeview.edit.js?__UPDATEID__" ></script>
<script type="text/javascript" src="./common/js/jquery.treeview.js?__UPDATEID__" ></script>
<script type="text/javascript" src="./common/js/screenLock.js?__UPDATEID__" ></script>
<script type="text/javascript" src="./js/detail.js?__UPDATEID__" ></script>
</head>
<body>
<body id="history" oncontextmenu="return false;">
<header>
<header id="header-ws" class="header_ws">
<div class="notification-pushmessage" style="display:none;">
<!--新着メッセージがあります！！！-->
</div>
......@@ -92,10 +118,9 @@
</div>
</header>
<div id="inc_backup"></div>
<div class="wrapper">
<div id="main">
<div id="ws-body" class="wrapper_ws" >
<div id="inc_backup"></div>
<div id="main-ws">
<article class="articlehistory">
<span class="lang sort-title" lang="txtSort"><!--並び替え--></span>
<div class="tops">
......@@ -105,7 +130,7 @@
<a class="lang control_sort_off" lang="dspTitleNm" style="display:none"><!--タイトル名--></a>
<b>|</b>
</li>
<li >
<li>
<a id="control-sort-titlekana" class="lang nottouchdevice control_sort_on" lang="dspTitleNmKn"><!--タイトル名(かな)--></a>
<a id="control-sort-titlekana-off" class="lang control_sort_off" lang="dspTitleNmKn" style="display:none"><!--タイトル名(かな)--></a>
<b id="separate">|</b>
......@@ -125,40 +150,29 @@
</p>
</div>
<div class="clearboth"> </div>
<div id="content-grid">
</div>
<div id="content-grid"> </div>
<br/>
</article>
</div>
</div>
</div>
<div id="inc_detail" ></div>
<div id="inc_detail" ></div>
<footer>
<div class="border">
<footer>
<div class="border">
<div class="cnt_footer">
COPYRIGHT &copy; 2014 AGENTEC Co., Ltd. ALL RIGHTS RESERVED.
</div>
</div>
</footer>
</div>
<div id="viewer" style="display:none;" >
</div>
</footer>
<iframe style="height:0px;width:0px;visibility:hidden;display:none;" src="about:blank">
this frame prevents back forward cache
</iframe>
<script type="text/javascript" src="./common/js/jquery-1.8.1.min.js?__UPDATEID__"></script>
<script type="text/javascript" src="./common/js/jquery-ui-1.8.23.custom.min.js?__UPDATEID__"></script>
<script type="text/javascript" src="./common/js/jquery.toastmessage.js?__UPDATEID__"></script>
<script type="text/javascript" src="./common/js/i18n.js?__UPDATEID__"></script>
<script type="text/javascript" src="./common/js/avweb.js?__UPDATEID__"></script>
<script type="text/javascript" src="./common/js/common.js?__UPDATEID__"></script>
<script type="text/javascript" src="./js/Limit_Access_Content.js?__UPDATEID__"></script>
<script type="text/javascript" src="./js/header.js?__UPDATEID__"></script>
<script type="text/javascript" src="./js/history.js?__UPDATEID__"></script>
<script type="text/javascript" src="./common/js/gotop.js?__UPDATEID__"></script>
<script type="text/javascript" src="./common/js/tab.js?__UPDATEID__"></script>
<script type="text/javascript" src="./common/js/screenLock.js?__UPDATEID__" ></script>
</body>
</html>
abvw/home.html
......@@ -7,6 +7,7 @@
<meta http-equiv="Cache-Control" content="no-store">
<meta http-equiv="Cache-Control" content="no-cache">
<meta http-equiv="Expires" content="-1">
<meta name="viewport" content="">
<title></title>
<link rel="stylesheet" type="text/css" href="common/css/jquery-ui.css?__UPDATEID__" />
......@@ -14,7 +15,9 @@
<link rel="stylesheet" type="text/css" href="common/css/default.css?__UPDATEID__" />
<link rel="stylesheet" type="text/css" href="common/css/screenLock.css?__UPDATEID__" />
<link rel="stylesheet" type="text/css" href="common/css/jquery.treeview.css?__UPDATEID__" />
<link rel="stylesheet" type="text/css" href="common/css/screen.css?__UPDATEID__" />
<link rel="stylesheet" type="text/css" href="css/reset.css?__UPDATEID__" />
<link rel="stylesheet" type="text/css" href="css/layout/common.css?__UPDATEID__" />
<link rel="stylesheet" type="text/css" href="css/theme/common.css?__UPDATEID__" />
<link rel="stylesheet" type="text/css" href="css/layout/header.css?__UPDATEID__" />
......@@ -39,16 +42,40 @@
<link rel="stylesheet" type="text/css" href="css/theme/limit_access.css?__UPDATEID__" />
<link rel="stylesheet" type="text/css" href="css/layout/share.css?__UPDATEID__" />
<link rel="stylesheet" type="text/css" href="css/theme/share.css?__UPDATEID__" />
<!--
<link rel="stylesheet" type="text/css" href="common/js/pickadate/themes/default.css?__UPDATEID__" id="theme_base" />
<link rel="stylesheet" type="text/css" href="common/js/pickadate/themes/default.date.css?__UPDATEID__" id="theme_date" />
-->
<link rel="stylesheet" type="text/css" href="common/js/pickadate/themes/classic.css?__UPDATEID__" id="theme_base" />
<link rel="stylesheet" type="text/css" href="common/js/pickadate/themes/classic.date.css?__UPDATEID__" id="theme_date" />
<!-- CSSビュー -->
<!-- link rel="stylesheet" type="text/css" href="css/reset.css?__UPDATEID__" / -->
<link rel="stylesheet" type="text/css" href="css/layout/viewer.css?__UPDATEID__" />
<link rel="stylesheet" type="text/css" href="css/theme/viewer.css?__UPDATEID__" />
<link rel="stylesheet" type="text/css" href="common/css/jquery.powertip.css?__UPDATEID__" />
<link rel="stylesheet" type="text/css" href="css/layout/Anket.css?__UPDATEID__" />
<link rel="stylesheet" type="text/css" href="css/theme/Anket.css?__UPDATEID__" />
<link rel="stylesheet" type="text/css" href="css/delete_shiori.css?__UPDATEID__" />
<script type="text/javascript" src="./common/js/jquery-1.8.1.min.js?__UPDATEID__"></script>
<script type="text/javascript" src="./common/js/jquery-ui-1.8.23.custom.min.js?__UPDATEID__"></script>
<script type="text/javascript" src="./common/js/jquery.toastmessage.js?__UPDATEID__"></script>
<script type="text/javascript" src="./common/js/avweb.js?__UPDATEID__"></script>
<script type="text/javascript" src="./common/js/i18n.js?__UPDATEID__"></script>
<script type="text/javascript" src="./common/js/common.js?__UPDATEID__"></script>
<script type="text/javascript" src="./common/js/uuid.js?__UPDATEID__"></script>
<script type="text/javascript" src="./js/Limit_Access_Content.js?__UPDATEID__"></script>
<script type="text/javascript" src="./js/home.js?__UPDATEID__"></script>
<script type="text/javascript" src="./js/header.js?__UPDATEID__"></script>
<script type="text/javascript" src="./common/js/scrolltopcontrol.js?__UPDATEID__"></script>
<script type="text/javascript" src="./common/js/tab.js?__UPDATEID__"></script>
<script type="text/javascript" src="./common/js/jquery.cookie.js?__UPDATEID__" ></script>
<script type="text/javascript" src="./common/js/jquery.treeview.edit.js?__UPDATEID__" ></script>
<script type="text/javascript" src="./common/js/jquery.treeview.js?__UPDATEID__" ></script>
<script type="text/javascript" src="./common/js/screenLock.js?__UPDATEID__" ></script>
<script type="text/javascript" src="./js/detail.js?__UPDATEID__" ></script>
</head>
<body id="bookshelf">
<header>
<body id="bookshelf" oncontextmenu="return false;">
<header id="header-ws" class="header_ws">
<div class="notification-pushmessage" style="display:none;">
<!--新着メッセージがあります！！！-->
</div>
......@@ -91,16 +118,14 @@
<li class="menuIcon" id="dspSetting" style="display:none;"><a href="#"><img src="img/common/icon_setup.png" width="30" height="30"></a></li>
<li class="menuIcon" id="dspLogout" style="margin-right:0;display:none;"><a href="#"><img src="img/common/icon_logout.png" width="30" height="30"></a></li>
<li class="menuIcon" id="dspHibiya" style="display:none;"><a href="#"><img src="img/common/icon_setup.png" width="30" height="30"></a></li>
</ul>
</div>
</div>
</header>
<div id="inc_backup"></div>
<div class="wrapper">
<div id="main" class="hoge">
<div id="ws-body" class="wrapper_ws" >
<div id="inc_backup"></div>
<div id="main-ws" class="hoge">
<div class="tabUnit" style="display:none;" >
<ul class="switchingTab">
<li class="colleft" ><a href="#list_0" class="current" id="lnkbtnGenre"> </a></li>
......@@ -109,17 +134,13 @@
<div class="tabUnitList" id="list_0" style="display: block;">
<img src="img/common/parts_sankaku.png" width="15" height="10" class="sankaku_left">
<div class="tab_bg_color">
<ul id="branch1" class="treeview">
</ul>
<ul id="branch1" class="treeview"></ul>
</div>
</div>
<div class="tabUnitList" id="list_1" style="display: none;">
<img src="img/common/parts_sankaku.png" width="15" height="10" class="sankaku_right">
<div class="tab_bg_color">
<ul id="branch2" class="treeview">
</ul>
<ul id="branch2" class="treeview"></ul>
</div>
</div>
</div>
......@@ -130,7 +151,6 @@
<li class="thumbnail_select first_area"> <a href="#" id="control-bookshelf-type"> </a></li>
<li class="list last_area"><a href="#" id="control-list-type"> </a></li>
</ul>
<div class="sort_area" >
<span class="lang" lang="txtSort"><!--並び替え--></span>
<ul class="sort" id="menu_sort">
......@@ -139,7 +159,7 @@
<!--<label id="title-sorttype"> </label>-->
<b>|</b>
</li>
<li >
<li>
<a id="control-sort-titlekana" class="lang nottouchdevice" lang="dspTitleNmKn"><!--タイトル名(かな)--></a>
<!-- <label id="titlekana-sorttype"> </label>-->
<b id="separate">|</b>
......@@ -158,9 +178,7 @@
<label class="lang pageNumControl" lang="txtRecordTotal" style="visibility: hidden"><!--件 表示--></label>
</p>
</div>
<div id="content-grid">
</div>
<div id="content-grid"></div>
<section class="sectionhomebookshelf" style="height:110px; width:100%;">
<a class="btn_bott" id="control-nextrecord" style="display: none"><!--次の15件を表示する --></a>
</section>
......@@ -172,45 +190,33 @@
</section>
<div id="dlgOverlay"> </div>
</div>
</div>
<div id="inc_detail" ></div>
<div id="inc_detail" ></div>
<!-- Hカスタム -->
<div id="dlgAddMemberGroup" title="コード入力" style="display: none;" >
<!-- Hカスタム -->
<div id="dlgAddMemberGroup" title="コード入力" style="display: none;" >
<p>コードを入力してください</p>
<p class="addMemberGroup">
<input type="text" id="txtAddMemberGroupName" value="" /><a class="ok" href="#" id="btnAddMemberGroupSearch" lang="txtSearch">検索</a>
</p>
</div>
</div>
<footer>
<div class="border">
<footer>
<div class="border">
<div class="cnt_footer">
COPYRIGHT &copy; 2014 AGENTEC Co., Ltd. ALL RIGHTS RESERVED.
</div>
</div>
</footer>
</div>
<div id="viewer" style="display:none;" >
</div>
</footer>
<iframe style="height:0px;width:0px;visibility:hidden;display:none;" src="about:blank">
this frame prevents back forward cache
</iframe>
<script type="text/javascript" src="./common/js/jquery-1.8.1.min.js?__UPDATEID__"></script>
<script type="text/javascript" src="./common/js/jquery-ui-1.8.23.custom.min.js?__UPDATEID__"></script>
<script type="text/javascript" src="./common/js/jquery.toastmessage.js?__UPDATEID__"></script>
<script type="text/javascript" src="./common/js/avweb.js?__UPDATEID__"></script>
<script type="text/javascript" src="./common/js/i18n.js?__UPDATEID__"></script>
<script type="text/javascript" src="./common/js/common.js?__UPDATEID__"></script>
<script type="text/javascript" src="./common/js/uuid.js?__UPDATEID__"></script>
<script type="text/javascript" src="./js/Limit_Access_Content.js?__UPDATEID__"></script>
<script type="text/javascript" src="./js/header.js?__UPDATEID__"></script>
<script type="text/javascript" src="./js/home.js?__UPDATEID__"></script>
<script type="text/javascript" src="./common/js/scrolltopcontrol.js?__UPDATEID__"></script>
<script type="text/javascript" src="./common/js/tab.js?__UPDATEID__"></script>
<script type="text/javascript" src="./common/js/jquery.cookie.js?__UPDATEID__" ></script>
<script type="text/javascript" src="./common/js/jquery.treeview.edit.js?__UPDATEID__" ></script>
<script type="text/javascript" src="./common/js/jquery.treeview.js?__UPDATEID__" ></script>
<script type="text/javascript" src="./common/js/screenLock.js?__UPDATEID__" ></script>
</body>
</html>
\ No newline at end of file
abvw/inc_backup.html
......@@ -4,15 +4,17 @@
<p class="message"><label lang="txtLogoutBkMsg" class="lang"><!--ログアウトする前にバックアップしますか？--></label></p>
<p class="message-options">
<label class="option_backup">
<!--<label class="option_backup">-->
<p class="option_backup" style="font-size: 13px;margin-left:50px">
<label lang="txtBkSelectData" 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>
<input type="checkbox" name="chkBkAllMarking" id="chkBkAllMarking" class="chkbx" checked="checked" /><label for="chkBkAllMarking" lang="txtBkMarking" class="lang"><!--マーキング--></label>
<input type="checkbox" name="chkBkAllMemo" id="chkBkAllMemo" class="chkbx" checked="checked" /><label for="chkBkAllMemo" lang="txtBkMemo" class="lang"><!--メモ--></label>
<input type="checkbox" name="chkBkAllShiori" id="chkBkAllShiori" class="chkbx" checked="checked" /><label for="chkBkAllShiori" lang="txtBkShiori" class="lang"><!--しおり--></label>
</p>
<!--</label>-->
</p>
<p class="notice">
<input type="checkbox" id="chkRememberBackup" /><label for="chkRememberBackup" class="lang" lang="txtLogoutOptBkCfm"><!--今回の行動を記憶し、次回から確認せずに、同じことをする。--></label>
<input type="checkbox" name="chkRememberBackup" 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>
......
abvw/js/Limit_Access_Content.js
......@@ -6,7 +6,13 @@ LIMIT_ACCESS_CONTENT.messageLevel = {};
LIMIT_ACCESS_CONTENT.checkLimitContent = function(contentId, funcOk, funcCancel, isNotUnlockScreen) {
var levelContent = parseInt(LIMIT_ACCESS_CONTENT.messageLevel[contentId].alertMessageLevel);
var levelContent = 0;
try {
levelContent = parseInt(LIMIT_ACCESS_CONTENT.messageLevel[contentId].alertMessageLevel);
} catch(e){
//取得できない場合OKにする
levelContent = 0;
}
if (levelContent == 1) {
if ($('#limit_level1').length <= 0) {
......
abvw/js/contentsearch.js
......@@ -22,6 +22,9 @@ CONTENTSEARCH.chkSearchTextEmpty = false;
CONTENTSEARCH.noRecordFlg = false;
CONTENTSEARCH.home_isMove = false;
//スクロール復帰
CONTENTSEARCH.scrollTop = 0;
$(document).ready(function(){
if (!AVWEB.avwCheckLogin(COMMON.ScreenIds.Login)){
......@@ -50,10 +53,9 @@ $(document).ready(function(){
CONTENTSEARCH.renderGridView();
//Go To Details Page
$('canvas').live('click', CONTENTSEARCH.canvasClickFunction);
//$('canvas').live('touchstart', CONTENTSEARCH.canvasClickFunction);
$('canvas').live('touchend', CONTENTSEARCH.canvasClickFunction);
$('canvas').live('touchmove', function () { CONTENTSEARCH.home_isMove = true; });
$('#main-ws canvas').live('click', CONTENTSEARCH.canvasClickFunction);
$('#main-ws canvas').live('touchend', CONTENTSEARCH.canvasClickFunction);
$('#main-ws canvas').live('touchmove', function () { CONTENTSEARCH.home_isMove = true; });
//Open dialog
$('.dialog').live('click', CONTENTSEARCH.titleClickFunction);
......@@ -86,7 +88,7 @@ $(document).ready(function(){
$('#main-search').click(CONTENTSEARCH.searchEventButtonFunction);
$('#txtSearch').keydown(CONTENTSEARCH.mainSearchKeyDownFunction);
$('#txtSearchWs').keydown(CONTENTSEARCH.mainSearchKeyDownFunction);
$('#main-search-content').click(CONTENTSEARCH.mainSearchContentClickFunction);
......@@ -116,7 +118,7 @@ $(document).ready(function(){
}
//詳細、共有表示パーツ読み込み
$("#inc_detail").load("./inc_detail.html", function (myData, myStatus, xhr){
$("#inc_detail").load("./inc_detail.html?__UPDATEID__", function (myData, myStatus, xhr){
//読み込み完了時の処理
I18N.i18nReplaceText();
$('.datepicker').pickadate({
......@@ -124,6 +126,12 @@ $(document).ready(function(){
});
});
//ビューア、共有表示パーツ読み込み
$("#viewer").load("./inc_contentview.html?__UPDATEID__", function (myData, myStatus, xhr){
//読み込み完了時の処理
I18N.i18nReplaceText();
});
});
......@@ -163,7 +171,7 @@ CONTENTSEARCH.initialScreen = function(){
var searchText = ClientData.searchCond_searchText();
var searchDivision = ClientData.searchCond_searchDivision();
$('#txtSearch').val(searchText);
$('#txtSearchWs').val(searchText);
//ClientData.searchCond_searchText('');
if(searchDivision == 1){
......@@ -825,7 +833,10 @@ CONTENTSEARCH.readSubmenuFunction_callback = function(contentId)
}
else{
//Go to Conten view page
AVWEB.avwScreenMove(COMMON.ScreenIds.ContentView);
//AVWEB.avwScreenMove(COMMON.ScreenIds.ContentView);
CONTENTSEARCH.drawEditImage(contentId);
CONTENTSEARCH.showContentView();
}
//End Function : No.12 -- Editor : Le Long -- Date : 08/02/2013 -- Summary : Check content type other for download.
};
......@@ -1098,7 +1109,7 @@ CONTENTSEARCH.searchEventButtonFunction = function(){
var toPage = CONTENTSEARCH.returnNumberDispRecordForList();
var sortType = CONTENTSEARCH.DEFAULT_SORT_TYPE;
var sortOrder = CONTENTSEARCH.DEFAULT_SORT_ORDER;
var searchText = $('#txtSearch').val();
var searchText = $('#txtSearchWs').val();
var searchDivision;
var content = $('#main-content').attr('checked');
var tag = $('#main-tag').attr('checked');
......@@ -1387,3 +1398,73 @@ CONTENTSEARCH.showContentShareDlgFunction = function(e) {
};
CONTENTSEARCH.showContentView = function(){
//TOPに戻す
var y = 0;
if( document.documentElement.scrollTop ){
y = document.documentElement.scrollTop;
}
if( document.body.scrollTop ){
if( y == undefined || y == 0){
y = document.body.scrollTop;
}
}
if( y == undefined || y == null){
y = 0;
}
CONTENTSEARCH.scrollTop = y;
window.scrollTo(0,0);
//試験
$("#header-ws").hide();
$("#ws-body").hide();
$("#topcontrol").hide();
CONTENTVIEW_INITOBJECT.clearViewerComponent();
CONTENTVIEW.cssInit();
$("#viewer").show();
CONTENTVIEW.ready();
};
CONTENTSEARCH.cssInit = function(){
$('html').css({
'overflow-y':'scroll'
});
$('html,body').css({
'height':'100%',
'margin': '0',
'padding': '0'
});
$('html>body').css({
'font-size':'16px',
'font-size':'68.75%'
});
$('body').css({
'font-family':'Verdana, helvetica, arial, sans-serif',
'font-size':'68.75%',
'background':'#fff',
'color':'#333'
});
};
//ダウンロードButton CLick
CONTENTSEARCH.downloadSubmenuFunction = function(e) {
if (e) {
e.preventDefault();
}
if (CONTENTSEARCH.home_isMove == true) {
CONTENTSEARCH.home_isMove = false;
return;
}
var contentId = $(this).attr('contentid');
//Download content
HEADER.downloadResourceById(contentId);
};
abvw/js/contentview_3d.js
......@@ -2,16 +2,6 @@
//名前空間用のオブジェクトを用意する
var CONTENTVIEW_3D = {};
CONTENTVIEW_3D._3dMoveFlag = false;
CONTENTVIEW_3D._3dAction = '';
CONTENTVIEW_3D._curr3dObject;
//CONTENTVIEW_3D._3dTimeToDetect = 1000;
CONTENTVIEW_3D._3dActionType = {
'TouchStart_MouseDown' : 0,
'TouchMove_MouseMove' : 1,
'TouchEnd_MouseUp' : 2
};
CONTENTVIEW_3D.createMatrixPoints = function(width, height, _v, _h, imgCurrX, imgCurrY){
var deltaX = width/ _h;
......@@ -317,3 +307,20 @@ CONTENTVIEW_3D.get3DAction = function(lastFrame, currFrame){
return nRet;
};
$(function () {
//CONTENTVIEW_3D.ready();
});
CONTENTVIEW_3D.ready = function(){
CONTENTVIEW_3D._3dMoveFlag = false;
CONTENTVIEW_3D._3dAction = '';
CONTENTVIEW_3D._curr3dObject = undefined;
CONTENTVIEW_3D._3dActionType = {
'TouchStart_MouseDown' : 0,
'TouchMove_MouseMove' : 1,
'TouchEnd_MouseUp' : 2
};
};
abvw/js/contentview_Anket.js
......@@ -122,13 +122,8 @@ CONTENTVIEW_ANKET.resizeAnket = function() {
// set height for anket container
$('#dialog .anket-container').css('height', iframeHeight);
// set overflow for container iframe
//if (avwUserEnvObj.isIos()) {
// $('#dialog .anket-container').css('overflow', 'scroll');
// $('#dialog .anket-container').css('-webkit-overflow-scrolling', 'touch');
// //$('#dialog .anket-container').css('display', 'inline-block');
// //$('#dialog iframe').css('display', 'block');
//}
};
CONTENTVIEW_ANKET.ready = function(){
};
abvw/js/contentview_CallApi.js
......@@ -7,28 +7,67 @@ CONTENTVIEW_CALLAPI.abapi = function(name, param, method, callback) {
AVWEB.avwCmsApiSync(ClientData.userInfo_accountPath(), name, method, param, callback, null);
};
//START TRB00097 - Editor: Long - Date: 09/30/2013 - Summary : Get All Page size of content
/* get Json stored content info */
CONTENTVIEW_CALLAPI.getJsonContentInfo = function() {
CONTENTVIEW_CALLAPI.getJsonContentInfo = function( doneFunc ) {
//console.log("CONTENTVIEW_CALLAPI.getJsonContentInfo");
AVWEB.avwGrabContentPageImage(ClientData.userInfo_accountPath(),
{ contentId: CONTENTVIEW_GENERAL.contentID, sid: CONTENTVIEW.getSessionId(), pageNo: 1 },
{ contentId: CONTENTVIEW_GENERAL.contentID, sid: ClientData.userInfo_sid(), pageNo: 1 },
function (data) {
CONTENTVIEW_GENERAL.pageImages = data;
CONTENTVIEW_CALLAPI.webGetContentData();
CONTENTVIEW_CALLAPI.getSearchDataFromJson();
CONTENTVIEW_CALLAPI.getJsonDataPageTitle();
CONTENTVIEW_CALLAPI.getJsonDataType4();
CONTENTVIEW_CALLAPI.getJsonDataType5();
CONTENTVIEW_CALLAPI.getDataJsonFile();
//CONTENTVIEW_CALLAPI.webGetPageImageContentSize();
CONTENTVIEW_CALLAPI.webGetContentPageSize();
CONTENTVIEW_CALLAPI.getJsonContentInfoDone(doneFunc);
},
function (xmlHttpRequest, txtStatus, errorThrown) {
CONTENTVIEW.showErrorScreen();
}
);
};
CONTENTVIEW_CALLAPI.getJsonContentInfoDone = function(doneFunc){
var ajax1 = CONTENTVIEW_CALLAPI.webGetContentDataWhen();
var ajax2 = CONTENTVIEW_CALLAPI.getSearchDataFromJsonWhen();
var ajax3 = CONTENTVIEW_CALLAPI.getJsonDataPageTitleWhen();
var ajax4 = CONTENTVIEW_CALLAPI.getJsonDataType4When();
var ajax5 = CONTENTVIEW_CALLAPI.getJsonDataType5When();
var ajax6 = CONTENTVIEW_CALLAPI.getDataJsonFileWhen();
var ajax7 = CONTENTVIEW_CALLAPI.webGetContentPageSizeWhen();
$.when(
ajax1,ajax2,ajax3,ajax4,ajax5,ajax6,ajax7
).done(function(data1, data2, data3, data4, data5, data6, data7) {
//console.log("done:data1:" + data1);
//console.log("done:data2:" + data2);
//console.log("done:data3:" + data3);
//console.log("done:data4:" + data4);
//console.log("done:data5:" + data5);
//console.log("done:data6:" + data6);
//console.log("done:data7:" + data7);
if(data1){
CONTENTVIEW_CALLAPI.webGetContentDataDone(data1[0]);
}
if(data2){
CONTENTVIEW_CALLAPI.getSearchDataFromJsonDone(data2[0]);
}
if(data3){
CONTENTVIEW_CALLAPI.getJsonDataPageTitleDone(data3[0]);
}
if(data4){
CONTENTVIEW_CALLAPI.getJsonDataType4Done(data4[0]);
}
if(data5){
CONTENTVIEW_CALLAPI.getJsonDataType5Done(data5[0]);
}
if(data6){
CONTENTVIEW_CALLAPI.getDataJsonFileDone(data6[0]);
}
if(data7){
CONTENTVIEW_CALLAPI.webGetContentPageSizeDone(data7[0]);
}
if(doneFunc){
doneFunc();
}
});
};
//END TRB00097 - Editor: Long - Date: 09/30/2013 - Summary : Get All Page size of content
......@@ -52,8 +91,7 @@ CONTENTVIEW_CALLAPI.webGetPageImageContentSize = function() {
null);
};
//START TRB00097 - Editor: Long - Date: 09/30/2013 - Summary : Get All Page size of content
CONTENTVIEW_CALLAPI.webGetContentPageSize = function(){
CONTENTVIEW_CALLAPI.webGetContentPageSizeWhen = function(){
var params = {
contentId: CONTENTVIEW_GENERAL.contentID,
......@@ -62,11 +100,16 @@ CONTENTVIEW_CALLAPI.webGetContentPageSize = function(){
isStreaming: ClientData.isStreamingMode()
};
AVWEB.avwCmsApi(ClientData.userInfo_accountPath(),
return AVWEB._callCmsApiWhen(
ClientData.userInfo_accountPath(),
"webGetContent",
"GET",
params,
function (data) {
params
);
};
CONTENTVIEW_CALLAPI.webGetContentPageSizeDone = function(data){
if( data.contentData.pageInfoData.pagesInfo ){
$.each(data.contentData.pageInfoData.pagesInfo, function(i, n){
CONTENTVIEW_GENERAL.contentPageSizeArr.push(n);
......@@ -77,8 +120,6 @@ CONTENTVIEW_CALLAPI.webGetContentPageSize = function(){
} else {
CONTENTVIEW.showErrorScreen();
}
},
null);
};
//Get Pagesize by pageNo
......@@ -92,9 +133,8 @@ CONTENTVIEW_CALLAPI.getPageSizeByPageNo = function(pageNo){
}
}
};
//END TRB00097 - Editor: Long - Date: 09/30/2013 - Summary : Get All Page size of content
CONTENTVIEW_CALLAPI.webGetContentData = function() {
CONTENTVIEW_CALLAPI.webGetContentDataWhen = function() {
var params = {
contentId: CONTENTVIEW_GENERAL.contentID,
......@@ -103,18 +143,21 @@ CONTENTVIEW_CALLAPI.webGetContentData = function() {
isStreaming: ClientData.isStreamingMode()
};
AVWEB.avwCmsApi(ClientData.userInfo_accountPath(),
return AVWEB._callCmsApiWhen(
ClientData.userInfo_accountPath(),
"webGetContent",
"GET",
params,
function (data) {
params
);
};
CONTENTVIEW_CALLAPI.webGetContentDataDone = function(data) {
CONTENTVIEW_GENERAL.totalPage = data.contentData.allPageNum;
},
null);
};
/* get Json stored page title */
CONTENTVIEW_CALLAPI.getJsonDataPageTitle = function() {
CONTENTVIEW_CALLAPI.getJsonDataPageTitleWhen = function() {
var params = {
contentId: CONTENTVIEW_GENERAL.contentID,
......@@ -123,11 +166,16 @@ CONTENTVIEW_CALLAPI.getJsonDataPageTitle = function() {
isStreaming: ClientData.isStreamingMode()
};
AVWEB.avwCmsApi(ClientData.userInfo_accountPath(),
return AVWEB._callCmsApiWhen(
ClientData.userInfo_accountPath(),
"webGetContent",
"GET",
params,
function (data) {
params
);
};
CONTENTVIEW_CALLAPI.getJsonDataPageTitleDone = function(data) {
CONTENTVIEW_GENERAL.dataPageTitle = [];
for (var nIndex = 0; nIndex < CONTENTVIEW_GENERAL.totalPage; nIndex++) {
CONTENTVIEW_GENERAL.dataPageTitle.push("");
......@@ -138,12 +186,10 @@ CONTENTVIEW_CALLAPI.getJsonDataPageTitle = function() {
CONTENTVIEW_GENERAL.dataPageTitle = data.contentData.titleInfo;
}
}
},
null);
};
/* get Json webGetContent4 */
CONTENTVIEW_CALLAPI.getJsonDataType4 = function() {
CONTENTVIEW_CALLAPI.getJsonDataType4When = function() {
var params = {
contentId: CONTENTVIEW_GENERAL.contentID,
......@@ -152,18 +198,21 @@ CONTENTVIEW_CALLAPI.getJsonDataType4 = function() {
isStreaming: ClientData.isStreamingMode()
};
AVWEB.avwCmsApi(ClientData.userInfo_accountPath(),
return AVWEB._callCmsApiWhen(
ClientData.userInfo_accountPath(),
"webGetContent",
"GET",
params,
function (data) {
params
);
};
CONTENTVIEW_CALLAPI.getJsonDataType4Done = function(data) {
CONTENTVIEW_GENERAL.dataJsonType4 = data.contentData.linkData;
},
null);
};
/* get Json webGetContent5 */
CONTENTVIEW_CALLAPI.getJsonDataType5 = function() {
CONTENTVIEW_CALLAPI.getJsonDataType5When = function() {
var params = {
contentId: CONTENTVIEW_GENERAL.contentID,
......@@ -172,18 +221,21 @@ CONTENTVIEW_CALLAPI.getJsonDataType5 = function() {
isStreaming: ClientData.isStreamingMode()
};
AVWEB.avwCmsApi(ClientData.userInfo_accountPath(),
return AVWEB._callCmsApiWhen(
ClientData.userInfo_accountPath(),
"webGetContent",
"GET",
params,
function (data) {
params
);
};
CONTENTVIEW_CALLAPI.getJsonDataType5Done = function(data) {
CONTENTVIEW_GENERAL.dataJsonType5 = data.contentData.outlineData;
},
null);
};
/* read file Json -> get page objects */
CONTENTVIEW_CALLAPI.getDataJsonFile = function() {
CONTENTVIEW_CALLAPI.getDataJsonFileWhen = function() {
var params = {
contentId: CONTENTVIEW_GENERAL.contentID,
......@@ -192,12 +244,17 @@ CONTENTVIEW_CALLAPI.getDataJsonFile = function() {
isStreaming: ClientData.isStreamingMode()
};
//get content from JSON
AVWEB.avwCmsApi(ClientData.userInfo_accountPath(),
return AVWEB._callCmsApiWhen(
ClientData.userInfo_accountPath(),
"webGetContent",
"GET",
params,
function (data) {
params
);
};
CONTENTVIEW_CALLAPI.getDataJsonFileDone = function(data) {
var JsonFile = data.contentData;
CONTENTVIEW_GENERAL.pageObjectsData = [];
if (JsonFile.vertical) {
......@@ -258,8 +315,7 @@ CONTENTVIEW_CALLAPI.getDataJsonFile = function() {
//End : Function : No.12 - Editor : Long - Date: 08/27/2013 - Summary : Get Page Object for content type none
CONTENTVIEW_GETDATA.getPageObjectsByPageIndex(CONTENTVIEW_GENERAL.pageObjectsData, 0);
},
null);
};
CONTENTVIEW_CALLAPI.loadDataBookmark = function(lstPageNo) {
......@@ -316,7 +372,7 @@ CONTENTVIEW_CALLAPI.loadDataBookmark = function(lstPageNo) {
};
/* get data using for search */
CONTENTVIEW_CALLAPI.getSearchDataFromJson = function() {
CONTENTVIEW_CALLAPI.getSearchDataFromJsonWhen = function() {
//get data from JSON file
var arrPageNo = '';
......@@ -335,17 +391,18 @@ CONTENTVIEW_CALLAPI.getSearchDataFromJson = function() {
isStreaming: ClientData.isStreamingMode()
};
AVWEB.avwCmsApi(ClientData.userInfo_accountPath(),
return AVWEB._callCmsApiWhen(
ClientData.userInfo_accountPath(),
"webContentPage",
"GET",
params,
function (data) {
CONTENTVIEW_GENERAL.contentName = data.contentTitle;
CONTENTVIEW_GENERAL.dataWebContentPage = data;
params
);
},
null);
};
CONTENTVIEW_CALLAPI.getSearchDataFromJsonDone = function(data) {
CONTENTVIEW_GENERAL.contentName = data.contentTitle;
CONTENTVIEW_GENERAL.dataWebContentPage = data;
};
CONTENTVIEW_CALLAPI.loadDataSearch = function(lstPageNo) {
......@@ -401,3 +458,6 @@ CONTENTVIEW_CALLAPI.loadDataSearch = function(lstPageNo) {
}
};
CONTENTVIEW_CALLAPI.ready = function(){
};
abvw/js/contentview_ContentTypeNone.js
......@@ -2,11 +2,35 @@
//名前空間用のオブジェクトを用意する
var CONTENTVIEW_CONTENTTYPENONE = {};
CONTENTVIEW_CONTENTTYPENONE.getJsonContentInfoTyeNone = function() {
//CONTENTVIEW_CALLAPI.webGetContentData();
CONTENTVIEW_CALLAPI.getSearchDataFromJson();
CONTENTVIEW_CALLAPI.getJsonDataPageTitle();
CONTENTVIEW_CALLAPI.getDataJsonFile();
CONTENTVIEW_CONTENTTYPENONE.getJsonContentInfoTyeNone = function(doneFunc) {
//CONTENTVIEW_CALLAPI.getSearchDataFromJson();
//CONTENTVIEW_CALLAPI.getJsonDataPageTitle();
//CONTENTVIEW_CALLAPI.getDataJsonFile();
var ajax2 = CONTENTVIEW_CALLAPI.getSearchDataFromJsonWhen();
var ajax3 = CONTENTVIEW_CALLAPI.getJsonDataPageTitleWhen();
var ajax6 = CONTENTVIEW_CALLAPI.getDataJsonFileWhen();
$.when(
ajax2,ajax3,ajax6
).done(function(data2, data3, data6) {
//console.log("done:data2:" + data2);
//console.log("done:data3:" + data3);
//console.log("done:data6:" + data6);
if(data2){
CONTENTVIEW_CALLAPI.getSearchDataFromJsonDone(data2[0]);
}
if(data3){
CONTENTVIEW_CALLAPI.getJsonDataPageTitleDone(data3[0]);
}
if(data6){
CONTENTVIEW_CALLAPI.getDataJsonFileDone(data6[0]);
}
if(doneFunc){
doneFunc();
}
});
};
//Return a string base 64 image has drawn with specify data
......@@ -35,3 +59,6 @@ CONTENTVIEW_CONTENTTYPENONE.returnImageString = function(data){
return imageUrl;
};
CONTENTVIEW_CONTENTTYPENONE.ready = function(){
};
abvw/js/contentview_Events.js
......@@ -2,29 +2,6 @@
//名前空間用のオブジェクトを用意する
var CONTENTVIEW_EVENTS = {};
CONTENTVIEW_EVENTS.altMode = false;
//limit area to detech if it is click(on win8)
CONTENTVIEW_EVENTS.clickLimitArea = 20;
//touch position
CONTENTVIEW_EVENTS.touchDownFirstPosX = 0;
CONTENTVIEW_EVENTS.touchDownFirstPosY = 0;
//position for click event on touch device
CONTENTVIEW_EVENTS._touchPageX = 0;
CONTENTVIEW_EVENTS._touchPageY = 0;
//Detect touch
CONTENTVIEW_EVENTS._isTouching = false;
//Detect click on touch device
CONTENTVIEW_EVENTS._isClick = false;
//Detech if page is being transition
CONTENTVIEW_EVENTS.isPageTransition = false;
//Is 3d animating
CONTENTVIEW_EVENTS._3dAnimate = false;
//Start : TRB00005, TRB00006 - Editor : Long - Date: 08/28/2013
//is prevent click event
CONTENTVIEW_EVENTS.isPreventClick = false;
//End : TRB00005, TRB00006 - Editor : Long - Date: 08/28/2013
/* add memo click */
CONTENTVIEW_EVENTS.handleAddMemo = function(event) {
......@@ -387,9 +364,8 @@ CONTENTVIEW_EVENTS.firstPage_click = function() {
if(CONTENTVIEW_GENERAL.contentType == COMMON.ContentTypeKeys.Type_PDF){
//console.log("CONTENTVIEW_EVENTS.firstPage_click");
AVWEB.avwGrabContentPageImage(ClientData.userInfo_accountPath(),
{ contentId: CONTENTVIEW_GENERAL.contentID, sid: CONTENTVIEW.getSessionId(), pageNo: 1 },
{ contentId: CONTENTVIEW_GENERAL.contentID, sid: ClientData.userInfo_sid(), pageNo: 1 },
function (data) {
CONTENTVIEW_GENERAL.pageImages = data;
......@@ -399,11 +375,6 @@ CONTENTVIEW_EVENTS.firstPage_click = function() {
$('#divImageLoading').css('display', 'none');
//START TRB00097
//CONTENTVIEW.userScale = 1;
//CONTENTVIEW.changeScale(CONTENTVIEW.userScale);
//END TRB00097
CONTENTVIEW.checkDisableButtonZoom();
var tran = new CONTENTVIEW_CREATEOBJECT.Transition();
tran.flipToPage(0);
......@@ -411,7 +382,9 @@ CONTENTVIEW_EVENTS.firstPage_click = function() {
},
function (xmlHttpRequest, txtStatus, errorThrown) {
CONTENTVIEW.showErrorScreen();
});
}
);
}
//START : TRB00032 - Editor : Long - Date: 09/10/2013 - Summary : type none process
else if(CONTENTVIEW_GENERAL.contentType == COMMON.ContentTypeKeys.Type_NoFile){
......@@ -460,16 +433,14 @@ CONTENTVIEW_EVENTS.lastPage_click = function() {
if(CONTENTVIEW_GENERAL.contentType == COMMON.ContentTypeKeys.Type_PDF){
//console.log("CONTENTVIEW_EVENTS.lastPage_click");
AVWEB.avwGrabContentPageImage(ClientData.userInfo_accountPath(),
{ contentId: CONTENTVIEW_GENERAL.contentID, sid: CONTENTVIEW.getSessionId(), pageNo: CONTENTVIEW_GENERAL.totalPage },
AVWEB.avwGrabContentPageImage(
ClientData.userInfo_accountPath(),
{ contentId: CONTENTVIEW_GENERAL.contentID, sid: ClientData.userInfo_sid(), pageNo: CONTENTVIEW_GENERAL.totalPage },
function (data) {
CONTENTVIEW_GENERAL.pageImages = data;
/* get page Objects */
CONTENTVIEW_GETDATA.getPageObjectsByPageIndex(CONTENTVIEW_GENERAL.pageObjectsData, CONTENTVIEW_GENERAL.totalPage - 1);
CONTENTVIEW_GETDATA.getContent().setPageImages(CONTENTVIEW_GENERAL.totalPage, CONTENTVIEW_GENERAL.pageImages).setPageObjects(CONTENTVIEW_GENERAL.pageObjects);
$('#divImageLoading').css('display', 'none');
CONTENTVIEW.checkDisableButtonZoom();
......@@ -479,7 +450,9 @@ CONTENTVIEW_EVENTS.lastPage_click = function() {
},
function (xmlHttpRequest, txtStatus, errorThrown) {
CONTENTVIEW.showErrorScreen();
});
}
);
}
//START : TRB00032 - Editor : Long - Date: 09/10/2013 - Summary : type none process
else if(CONTENTVIEW_GENERAL.contentType == COMMON.ContentTypeKeys.Type_NoFile){
......@@ -1312,28 +1285,40 @@ CONTENTVIEW_EVENTS.imgBack_click = function() {
COMMON.SetEndLog(CONTENTVIEW_GENERAL.contentID);
COMMON.RegisterLog();
window.onbeforeunload = null;
//window.onbeforeunload = null;
//画面クリア
CONTENTVIEW_INITOBJECT.clearViewerComponent();
if (ClientData.JumpQueue()) {
var oldDataBack = ClientData.JumpQueue();
if (oldDataBack.length > 0) {
AVWEB.avwScreenMove(COMMON.ScreenIds.ContentView);
//AVWEB.avwScreenMove(COMMON.ScreenIds.ContentView);
CONTENTVIEW.screenMove();
ClientData.IsJumpBack(true);
} else {
/*check back */
if (ClientData.BookmarkScreen()) {
AVWEB.avwScreenMove(ClientData.BookmarkScreen());
} else {
window.history.back();
}
//if (ClientData.BookmarkScreen()) {
// AVWEB.avwScreenMove(ClientData.BookmarkScreen());
//} else {
// window.history.back();
//}
//元の画面に戻って画面復帰
CONTENTVIEW.screenBack();
}
} else {
/*check back */
if (ClientData.BookmarkScreen()) {
AVWEB.avwScreenMove(ClientData.BookmarkScreen());
} else {
window.history.back();
}
//if (ClientData.BookmarkScreen()) {
// AVWEB.avwScreenMove(ClientData.BookmarkScreen());
//} else {
// window.history.back();
//}
//元の画面に戻って画面復帰
CONTENTVIEW.screenBack();
}
};
......@@ -1843,11 +1828,15 @@ CONTENTVIEW_EVENTS.onTouchmove = function(evt){
}
}
else{
CONTENTVIEW_EVENTS._isClick = false;
//CONTENTVIEW_EVENTS._isClick = false;
// for android or ipad
touch1 = evt.touches[0];
touch2 = evt.touches[1];
if( touch2 != null ){
CONTENTVIEW_EVENTS._isClick = false;
}
if(CONTENTVIEW_EVENTS._3dAnimate){
var imagePt = CONTENTVIEW.screenToImage(touch1.pageX, touch1.pageY);
......@@ -2418,4 +2407,32 @@ TransitionObject.prototype.processNaviPage = function (currPos) {
CONTENTVIEW_EVENTS._transitionObject = new TransitionObject();
//End Funcion : No.20 - Editor : Long - Date : 08/13/2013 - Summary : Win 8 touch handle
\ No newline at end of file
$(function () {
//CONTENTVIEW_EVENTS.ready();
});
CONTENTVIEW_EVENTS.ready = function(){
CONTENTVIEW_EVENTS.altMode = false;
//limit area to detech if it is click(on win8)
CONTENTVIEW_EVENTS.clickLimitArea = 20;
//touch position
CONTENTVIEW_EVENTS.touchDownFirstPosX = 0;
CONTENTVIEW_EVENTS.touchDownFirstPosY = 0;
//position for click event on touch device
CONTENTVIEW_EVENTS._touchPageX = 0;
CONTENTVIEW_EVENTS._touchPageY = 0;
//Detect touch
CONTENTVIEW_EVENTS._isTouching = false;
//Detect click on touch device
CONTENTVIEW_EVENTS._isClick = false;
//Detech if page is being transition
CONTENTVIEW_EVENTS.isPageTransition = false;
//Is 3d animating
CONTENTVIEW_EVENTS._3dAnimate = false;
//is prevent click event
CONTENTVIEW_EVENTS.isPreventClick = false;
};
abvw/js/contentview_GetData.js
......@@ -893,7 +893,18 @@ CONTENTVIEW_GETDATA.getBookmarklist = function(pos) {
//title start
$('#bookmarkBoxHdBM').children().remove();
$('#bookmarkBoxHdBM').html('<a id="bookmarkClosing" class="delete" > </a>');
$("#bookmarkClosing").click(CONTENTVIEW_EVENTS.closeBookmarkBox);
//$("#bookmarkClosing").click(CONTENTVIEW_EVENTS.closeBookmarkBox);
$("#bookmarkClosing").on({
'click touchend': function(ev){
CONTENTVIEW_EVENTS.closeBookmarkBox(ev);
return false;
},
'touchstart touchmove': function(){
//これを入れないと次にダイアログを開くと表示位置が大きくズレる
return false;
}
});
$('#bookmarkBoxHdBM').append(I18N.i18nText('txtShioriCtnLs'));
//title end
//COMMON.lockLayout();
......@@ -927,7 +938,19 @@ CONTENTVIEW_GETDATA.getPageIndexJson = function(pos) {
//title start
$('#indexBoxHdIndex').children().remove();
$('#indexBoxHdIndex').html('<a id="indexClosing" class="delete" > </a>');
$("#indexClosing").click(CONTENTVIEW_EVENTS.closeIndexBox);
//$("#indexClosing").click(CONTENTVIEW_EVENTS.closeIndexBox);
$("#indexClosing").on({
'click touchend': function(ev){
CONTENTVIEW_EVENTS.closeIndexBox(ev);
return false;
},
'touchstart touchmove': function(){
//これを入れないと次にダイアログを開くと表示位置が大きくズレる
return false;
}
});
$('#indexBoxHdIndex').append(I18N.i18nText('txtIndex'));
//title end
//COMMON.lockLayout();
......@@ -983,7 +1006,19 @@ CONTENTVIEW_GETDATA.getPageIndexJson = function(pos) {
//title start
$('#indexBoxHdIndex').children().remove();
$('#indexBoxHdIndex').html('<a id="indexClosing" class="delete" > </a>');
$("#indexClosing").click(CONTENTVIEW_EVENTS.closeIndexBox);
//$("#indexClosing").click(CONTENTVIEW_EVENTS.closeIndexBox);
$("#indexClosing").on({
'click touchend': function(ev){
CONTENTVIEW_EVENTS.closeIndexBox(ev);
return false;
},
'touchstart touchmove': function(){
//これを入れないと次にダイアログを開くと表示位置が大きくズレる
return false;
}
});
$('#indexBoxHdIndex').append(I18N.i18nText('txtIndex'));
//title end
//COMMON.lockLayout();
......@@ -1215,7 +1250,7 @@ CONTENTVIEW_GETDATA.renderNextPage = function(){
//console.log("CONTENTVIEW_GETDATA.renderNextPage");
AVWEB.avwGrabContentPageImage(ClientData.userInfo_accountPath(),
{ contentId: CONTENTVIEW_GENERAL.contentID, sid: CONTENTVIEW.getSessionId(), pageNo: pageNo },
{ contentId: CONTENTVIEW_GENERAL.contentID, sid: ClientData.userInfo_sid(), pageNo: pageNo },
function (data) {
CONTENTVIEW_GENERAL.nextPageImage = data;
......@@ -1226,7 +1261,9 @@ CONTENTVIEW_GETDATA.renderNextPage = function(){
},
function (xmlHttpRequest, txtStatus, errorThrown) {
CONTENTVIEW.showErrorScreen();
});
}
);
}
//Start Function : No.12 - Editor : Long - Date : 08/28/2013 - Summary : Render next page content image the same with the current one
else if(CONTENTVIEW_GENERAL.contentType == COMMON.ContentTypeKeys.Type_NoFile){
......@@ -1250,18 +1287,18 @@ CONTENTVIEW_GETDATA.renderPrevPage = function(){
//console.log("CONTENTVIEW_GETDATA.renderPrevPage");
AVWEB.avwGrabContentPageImage(ClientData.userInfo_accountPath(),
{ contentId: CONTENTVIEW_GENERAL.contentID, sid: CONTENTVIEW.getSessionId(), pageNo: pageNo },
{ contentId: CONTENTVIEW_GENERAL.contentID, sid: ClientData.userInfo_sid(), pageNo: pageNo },
function (data) {
CONTENTVIEW_GENERAL.prevPageImage = data;
CONTENTVIEW_GENERAL.prevContent.setPageImages(CONTENTVIEW_GENERAL.totalPage, CONTENTVIEW_GENERAL.prevPageImage)
.setPageObjects(CONTENTVIEW_GENERAL.prevPageObjects)
.previousPage();
},
function (xmlHttpRequest, txtStatus, errorThrown) {
CONTENTVIEW.showErrorScreen();
});
}
);
}
else if(CONTENTVIEW_GENERAL.contentType == COMMON.ContentTypeKeys.Type_NoFile){
CONTENTVIEW_GENERAL.prevPageImage = CONTENTVIEW_GENERAL.pageImages;
......@@ -1584,3 +1621,7 @@ CONTENTVIEW_GETDATA.getPageTransitionConfig = function(){
};
//End Function: No.4 - Editor : Long - Summary : Render Next Page Content
CONTENTVIEW_GETDATA.ready = function(){
};
abvw/js/contentview_Gomu.js
......@@ -206,6 +206,10 @@ CONTENTVIEW_GOMU.touchStart_BtnCancel_Gomu = function(e){
// Setting dialog
$(function () {
//CONTENTVIEW_GOMU.ready();
});
CONTENTVIEW_GOMU.ready = function(){
// ---------------------------------
// Setup for easer [start]
// ---------------------------------
......@@ -218,15 +222,80 @@ $(function () {
}
}
$("#dlgGomu_dspOK").click(CONTENTVIEW_GOMU.dlgGomu_dspOK_click);
$("#dlgGomu_dspCancel").click(CONTENTVIEW_GOMU.dlgGomu_dspCancel_click);
$("#text_dlgGomu_rdo1").click(CONTENTVIEW_GOMU.dlgGomu_rdo1_text_click);
$("#text_dlgGomu_rdo2").click(CONTENTVIEW_GOMU.dlgGomu_rdo2_text_click);
$("#text_dlgGomu_rdo3").click(CONTENTVIEW_GOMU.dlgGomu_rdo3_text_click);
$("#text_dlgGomu_rdo4").click(CONTENTVIEW_GOMU.dlgGomu_rdo4_text_click);
//$("#dlgGomu_dspOK").click(CONTENTVIEW_GOMU.dlgGomu_dspOK_click);
$("#dlgGomu_dspOK").on({
'click touchend': function(ev){
CONTENTVIEW_GOMU.dlgGomu_dspOK_click(ev);
return false;
},
'touchstart touchmove': function(){
//これを入れないと次にダイアログを開くと表示位置が大きくズレる
return false;
}
});
//$("#dlgGomu_dspCancel").click(CONTENTVIEW_GOMU.dlgGomu_dspCancel_click);
$("#dlgGomu_dspCancel").on({
'click touchend': function(ev){
CONTENTVIEW_GOMU.dlgGomu_dspCancel_click(ev);
return false;
},
'touchstart touchmove': function(){
//これを入れないと次にダイアログを開くと表示位置が大きくズレる
return false;
}
});
//$("#text_dlgGomu_rdo1").click(CONTENTVIEW_GOMU.dlgGomu_rdo1_text_click);
$("#text_dlgGomu_rdo1").on({
'click touchend': function(ev){
CONTENTVIEW_GOMU.dlgGomu_rdo1_text_click(ev);
return false;
},
'touchstart touchmove': function(){
//これを入れないと次にダイアログを開くと表示位置が大きくズレる
return false;
}
});
//$("#text_dlgGomu_rdo2").click(CONTENTVIEW_GOMU.dlgGomu_rdo2_text_click);
$("#text_dlgGomu_rdo2").on({
'click touchend': function(ev){
CONTENTVIEW_GOMU.dlgGomu_rdo2_text_click(ev);
return false;
},
'touchstart touchmove': function(){
//これを入れないと次にダイアログを開くと表示位置が大きくズレる
return false;
}
});
//$("#text_dlgGomu_rdo3").click(CONTENTVIEW_GOMU.dlgGomu_rdo3_text_click);
$("#text_dlgGomu_rdo3").on({
'click touchend': function(ev){
CONTENTVIEW_GOMU.dlgGomu_rdo3_text_click(ev);
return false;
},
'touchstart touchmove': function(){
//これを入れないと次にダイアログを開くと表示位置が大きくズレる
return false;
}
});
//$("#text_dlgGomu_rdo4").click(CONTENTVIEW_GOMU.dlgGomu_rdo4_text_click);
$("#text_dlgGomu_rdo4").on({
'click touchend': function(ev){
CONTENTVIEW_GOMU.dlgGomu_rdo4_text_click(ev);
return false;
},
'touchstart touchmove': function(){
//これを入れないと次にダイアログを開くと表示位置が大きくズレる
return false;
}
});
};
});
/// ===============================================================================================
/// Eraser group [ end ]
......
abvw/js/contentview_ImagePreview.js
......@@ -2,21 +2,6 @@
//名前空間用のオブジェクトを用意する
var CONTENTVIEW_IMAGEPREVIEW = {};
/*====Variable====*/
CONTENTVIEW_IMAGEPREVIEW.slideshowImgFrom = 0;
CONTENTVIEW_IMAGEPREVIEW.slideshowImgTo = 4;
CONTENTVIEW_IMAGEPREVIEW.slideshowImageCollection = [];
CONTENTVIEW_IMAGEPREVIEW.slideshowClickFlg = false;
CONTENTVIEW_IMAGEPREVIEW.slideshowInitFlg = true; //未使用
CONTENTVIEW_IMAGEPREVIEW.slideshowSelectedIndex = 0; //未使用
//0: next - 1: prev
CONTENTVIEW_IMAGEPREVIEW.slideshowControlToggleFlg = 0; //未使用
//CONTENTVIEW_IMAGEPREVIEW.totalRecord; //未使用
CONTENTVIEW_IMAGEPREVIEW.slideshowSelectFirstIndex = 0;
CONTENTVIEW_IMAGEPREVIEW.slideshowSelectLastIndex = 4;
CONTENTVIEW_IMAGEPREVIEW.slideshowMainCurrIndex = 0;
CONTENTVIEW_IMAGEPREVIEW.slideshow_isTransaction = false;
/*==========================================*/
CONTENTVIEW_IMAGEPREVIEW.refreshSlideShowValue = function(){
CONTENTVIEW_IMAGEPREVIEW.slideshowImgFrom = 0;
......@@ -471,3 +456,24 @@ CONTENTVIEW_IMAGEPREVIEW.handleDispNextPrevButton = function(){
}
};
$(function () {
//CONTENTVIEW_IMAGEPREVIEW.ready();
});
CONTENTVIEW_IMAGEPREVIEW.ready = function(){
/*====Variable====*/
CONTENTVIEW_IMAGEPREVIEW.slideshowImgFrom = 0;
CONTENTVIEW_IMAGEPREVIEW.slideshowImgTo = 4;
CONTENTVIEW_IMAGEPREVIEW.slideshowImageCollection = [];
CONTENTVIEW_IMAGEPREVIEW.slideshowClickFlg = false;
CONTENTVIEW_IMAGEPREVIEW.slideshowInitFlg = true; //未使用
CONTENTVIEW_IMAGEPREVIEW.slideshowSelectedIndex = 0; //未使用
//0: next - 1: prev
CONTENTVIEW_IMAGEPREVIEW.slideshowControlToggleFlg = 0; //未使用
//CONTENTVIEW_IMAGEPREVIEW.totalRecord; //未使用
CONTENTVIEW_IMAGEPREVIEW.slideshowSelectFirstIndex = 0;
CONTENTVIEW_IMAGEPREVIEW.slideshowSelectLastIndex = 4;
CONTENTVIEW_IMAGEPREVIEW.slideshowMainCurrIndex = 0;
CONTENTVIEW_IMAGEPREVIEW.slideshow_isTransaction = false;
};
abvw/js/contentview_InitObjects.js
......@@ -145,10 +145,10 @@ CONTENTVIEW_INITOBJECT.initPage = function() {
}
else if(CONTENTVIEW_GENERAL.contentType == COMMON.ContentTypeKeys.Type_NoFile){
CONTENTVIEW_GETDATA.getPageTransitionConfig();
CONTENTVIEW_CONTENTTYPENONE.getJsonContentInfoTyeNone();
CONTENTVIEW_CONTENTTYPENONE.getJsonContentInfoTyeNone(CONTENTVIEW_INITOBJECT.ajaxComplete4);
}
else{
CONTENTVIEW_CALLAPI.getJsonContentInfo();
CONTENTVIEW_CALLAPI.getJsonContentInfo(CONTENTVIEW_INITOBJECT.ajaxComplete8);
CONTENTVIEW_GETDATA.getPageTransitionConfig();
}
......@@ -167,16 +167,29 @@ CONTENTVIEW_INITOBJECT.initPage = function() {
/* bookmark Page */
$('#imgbookmark').click(CONTENTVIEW.bookmarkPage);
$('#listbookmark').click(CONTENTVIEW_EVENTS.showListBookMark);
$('#divListBookmark li').die();
$('#divListBookmark li').live('click', CONTENTVIEW_EVENTS.clickBookmark);
if(CONTENTVIEW_GENERAL.contentType == COMMON.ContentTypeKeys.Type_PDF){
/* page index */
$('#listindex').click(CONTENTVIEW_EVENTS.showListPageIndex);
$('#divSearchResult li').die();
$('#divSearchResult li').live('click', CONTENTVIEW_EVENTS.clickSearchDetail);
/* copy text */
$('#copytext').click(CONTENTVIEW_EVENTS.showCopyText);
/* close copy text dialog */
$("#copyTextClosing").click(CONTENTVIEW_EVENTS.closeCopyTextBox);
//$("#copyTextClosing").click(CONTENTVIEW_EVENTS.closeCopyTextBox);
$("#copyTextClosing").on({
'click touchend': function(ev){
CONTENTVIEW_EVENTS.closeCopyTextBox(ev);
return false;
},
'touchstart touchmove': function(){
//これを入れないと次にダイアログを開くと表示位置が大きくズレる
return false;
}
});
}
/*event click next page button */
......@@ -194,7 +207,18 @@ CONTENTVIEW_INITOBJECT.initPage = function() {
$("#imgHome").click(CONTENTVIEW_EVENTS.imgHome_click);
$("#btn_show_memo").click(CONTENTVIEW_CREATEOBJECT.showEditMemo);
$("#btn_copy_memo").click(CONTENTVIEW_CREATEOBJECT.copyMemo);
$('#memoClosing').click(CONTENTVIEW_EVENTS.closePopUpCopyMemo);
//$('#memoClosing').click(CONTENTVIEW_EVENTS.closePopUpCopyMemo);
$("#memoClosing").on({
'click touchend': function(ev){
CONTENTVIEW_EVENTS.closePopUpCopyMemo(ev);
return false;
},
'touchstart touchmove': function(){
//これを入れないと次にダイアログを開くと表示位置が大きくズレる
return false;
}
});
$('#liAddMemo').click(CONTENTVIEW_EVENTS.click_liAddMemo);
$('#liCopyMemo').click(CONTENTVIEW_EVENTS.click_liCopyMemo);
$('#liDeleteMemo').click(CONTENTVIEW_EVENTS.click_liDeleteMemo);
......@@ -243,15 +267,9 @@ CONTENTVIEW_INITOBJECT.initPage = function() {
CONTENTVIEW_INITOBJECT.setLoadingSize();
});
$(document).ajaxComplete(function () {
/*Init Page */
CONTENTVIEW_GENERAL.nAjaxLoad++;
//console.log("nAjaxLoad:" + CONTENTVIEW_GENERAL.nAjaxLoad);
//CONTENTVIEW_STREAMING.debugLog("nAjaxLoad:" + CONTENTVIEW_GENERAL.nAjaxLoad);
};
if (CONTENTVIEW_GENERAL.nAjaxLoad == 8) {
CONTENTVIEW_INITOBJECT.ajaxComplete8 = function(){
/* handle from bookmark page */
//handleFromBookMarkPage();
......@@ -276,6 +294,8 @@ CONTENTVIEW_INITOBJECT.initPage = function() {
CONTENTVIEW.isPendingContentBGM = false;
}
//console.log("CONTENTVIEW_GENERAL.isFullScreen:" + CONTENTVIEW_GENERAL.isFullScreen);
CONTENTVIEW_GETDATA.getContent().setPageImages(CONTENTVIEW_GENERAL.totalPage, CONTENTVIEW_GENERAL.pageImages)
.setPageObjects(CONTENTVIEW_GENERAL.pageObjects)
.setUpPage(0);
......@@ -376,12 +396,17 @@ CONTENTVIEW_INITOBJECT.initPage = function() {
CONTENTVIEW.sizingScreen();
}
}
CONTENTVIEW.setViewportForWin8();
//console.log("ajaxComp8 end");
};
CONTENTVIEW_INITOBJECT.ajaxComplete4 = function(){
if(CONTENTVIEW_GENERAL.contentType != COMMON.ContentTypeKeys.Type_NoFile){
return;
}
else if(CONTENTVIEW_GENERAL.nAjaxLoad == 4){
if(CONTENTVIEW_GENERAL.contentType == COMMON.ContentTypeKeys.Type_NoFile){
/* handle from bookmark page */
//handleFromBookMarkPage();
/* check move content */
......@@ -395,7 +420,6 @@ CONTENTVIEW_INITOBJECT.initPage = function() {
CONTENTVIEW.oldContent_Back();
} else {
if (CONTENTVIEW_GETDATA.getPageIndex() == 0) {
if(CONTENTVIEW_INITOBJECT.isHasPageBGM()){
CONTENTVIEW.isPendingContentBGM = true;
}
......@@ -487,7 +511,6 @@ CONTENTVIEW_INITOBJECT.initPage = function() {
ZOOM_DETECTOR.startDetectZoom({ time: 500,
callbackFunction: function (oldRatio, newRatio, oldW, oldH, newW, newH) {
CONTENTVIEW_GENERAL.currentRatio = newRatio;
}
});
var top = window.innerHeight - $("#footer_toolbar_1").height();
......@@ -500,10 +523,7 @@ CONTENTVIEW_INITOBJECT.initPage = function() {
}
CONTENTVIEW.setViewportForWin8();
}
}
});
};
//START TRB00069
......@@ -574,10 +594,40 @@ CONTENTVIEW_INITOBJECT.initPageMediaAndHtmlType = function(){
COMMON.disable('#txtSearch', '#txtSlider');
};
//ビュアーのキャンバスの表示領域をクリアする
CONTENTVIEW_INITOBJECT.clearViewerComponent = function(){
if ($('#canvasWrapper').length) {
//次回開いた時に残るので消す
var canvas = document.getElementById('main');
var context = canvas.getContext('2d');
context.clearRect(0, 0, canvas.width, canvas.height);
$('#mainPre').html('');
$('#main').html('');
$('#mainNext').html('');
$('#playvideo').html('');
$('#offscreenPre').html('');
$('#offscreen').html('');
$('#offscreenNext').html('');
$('#draw_canvas').html('');
$('#marker_canvas').html('');
$('#playaudio').html('');
$('#playaudiopage').html('');
$('#playaudioallpage').html('');
$('#text').html('');
}
};
//Start: Function: No.4 - Editor : Long - Date : 08/09/2013 - Summary : Create next and previous canvas
/* Initialize PageViewer Component */
CONTENTVIEW_INITOBJECT.initializeViewerComponent = function(viewId) {
if ($('#canvasWrapper').length) {
CONTENTVIEW_INITOBJECT.clearViewerComponent();
} else {
/* add some tags we need.*/
$('#' + viewId).prepend(
'<div id="canvasWrapper">' +
......@@ -596,7 +646,7 @@ CONTENTVIEW_INITOBJECT.initializeViewerComponent = function(viewId) {
'<div id="playaudioallpage" style="width:0px; height:0px;"></div>' +
'<div id="text"></div>'
);
}
/* apply css style */
......@@ -788,3 +838,6 @@ CONTENTVIEW_INITOBJECT.initImageCheckMarking = function() {
}
};
CONTENTVIEW_INITOBJECT.ready = function(){
};
abvw/js/contentview_Maker.js
......@@ -6,11 +6,6 @@
//名前空間用のオブジェクトを用意する
var CONTENTVIEW_MAKER = {};
CONTENTVIEW_MAKER.maker_Size;
//CONTENTVIEW_MAKER.maker_color;
CONTENTVIEW_MAKER.maker_targetDiv;
CONTENTVIEW_MAKER.maker_chooseColor;
CONTENTVIEW_MAKER.ShowMaker = function(targetId){
CONTENTVIEW_MAKER.maker_targetDiv = targetId;
I18N.i18nReplaceText();
......@@ -50,17 +45,93 @@ CONTENTVIEW_MAKER.Maker_handleColorPickerEvent = function (){
$('#makerColorwrapper').bind('mouseleave', CONTENTVIEW_MAKER.Maker_colorWrapperMouseLeaveFunction);
}
$('#Maker_btnOk').live('click', CONTENTVIEW_MAKER.Maker_dspOK_click);
$('#Maker_btnCancel').live('click', CONTENTVIEW_MAKER.Maker_dspCancel_click);
//$('#Maker_btnOk').live('click', CONTENTVIEW_MAKER.Maker_dspOK_click);
$("#Maker_btnOk").on({
'click touchend': function(ev){
CONTENTVIEW_MAKER.Maker_dspOK_click(ev);
return false;
},
'touchstart touchmove': function(){
//これを入れないと次にダイアログを開くと表示位置が大きくズレる
return false;
}
});
//$('#Maker_btnCancel').live('click', CONTENTVIEW_MAKER.Maker_dspCancel_click);
$("#Maker_btnCancel").on({
'click touchend': function(ev){
CONTENTVIEW_MAKER.Maker_dspCancel_click(ev);
return false;
},
'touchstart touchmove': function(){
//これを入れないと次にダイアログを開くと表示位置が大きくズレる
return false;
}
});
CONTENTVIEW_MAKER.Maker_SetDefaultValue();
$('#marker-small-text').live('click', CONTENTVIEW_MAKER.markerSmallTextClick);
$('#marker-medium-text').live('click', CONTENTVIEW_MAKER.markerMediumTextClick);
$('#marker-large-text').live('click', CONTENTVIEW_MAKER.markerLargeTextClick);
$('#marker-oversize-text').live('click', CONTENTVIEW_MAKER.markerOversizeTextClick);
//$('#marker-small-text').live('click', CONTENTVIEW_MAKER.markerSmallTextClick);
$("#marker-small-text").on({
'click touchend': function(ev){
CONTENTVIEW_MAKER.markerSmallTextClick(ev);
return false;
},
'touchstart touchmove': function(){
//これを入れないと次にダイアログを開くと表示位置が大きくズレる
return false;
}
});
//$('#marker-medium-text').live('click', CONTENTVIEW_MAKER.markerMediumTextClick);
$("#marker-medium-text").on({
'click touchend': function(ev){
CONTENTVIEW_MAKER.markerMediumTextClick(ev);
return false;
},
'touchstart touchmove': function(){
//これを入れないと次にダイアログを開くと表示位置が大きくズレる
return false;
}
});
//$('#marker-large-text').live('click', CONTENTVIEW_MAKER.markerLargeTextClick);
$("#marker-large-text").on({
'click touchend': function(ev){
CONTENTVIEW_MAKER.markerLargeTextClick(ev);
return false;
},
'touchstart touchmove': function(){
//これを入れないと次にダイアログを開くと表示位置が大きくズレる
return false;
}
});
//$('#marker-oversize-text').live('click', CONTENTVIEW_MAKER.markerOversizeTextClick);
$("#marker-oversize-text").on({
'click touchend': function(ev){
CONTENTVIEW_MAKER.markerOversizeTextClick(ev);
return false;
},
'touchstart touchmove': function(){
//これを入れないと次にダイアログを開くと表示位置が大きくズレる
return false;
}
});
$('#dlgMaker .colorpicker').die();
$('#dlgMaker .colorpicker').live('click', CONTENTVIEW_MAKER.Maker_colorPickerClickFunction);
//$("#dlgMaker .colorpicker").on({
// 'click touchend': function(ev){
// CONTENTVIEW_MAKER.Maker_colorPickerClickFunction(ev);
// return false;
// },
// 'touchstart touchmove': function(){
// //これを入れないと次にダイアログを開くと表示位置が大きくズレる
// return false;
// }
//});
};
CONTENTVIEW_MAKER.markerSmallTextClick = function(){
......@@ -290,6 +361,16 @@ CONTENTVIEW_MAKER.Maker_colorWrapperMouseLeaveFunction = function() {
//END FIXCSS
};
$(function () {
//CONTENTVIEW_MAKER.ready();
});
CONTENTVIEW_MAKER.ready = function(){
CONTENTVIEW_MAKER.maker_Size = undefined;
CONTENTVIEW_MAKER.maker_targetDiv = undefined;
CONTENTVIEW_MAKER.maker_chooseColor = undefined;
};
/// ===============================================================================================
/// Maker group [ end ]
/// ===============================================================================================
abvw/js/contentview_Marking.js
......@@ -250,7 +250,7 @@ CONTENTVIEW_MARKING.dlgMarking_imgMakerOption_click = function() {
$('#dlgMarking_imgMakerOption').removeClass();
$('#dlgMarking_imgMakerOption').addClass('maker_option_selected');
setDefaultImageForMarking();
CONTENTVIEW_MARKING.setDefaultImageForMarking();
};
CONTENTVIEW_MARKING.dlgMarking_imgEraser_click = function() {
......@@ -458,21 +458,156 @@ CONTENTVIEW_MARKING.ShowMarking = function() {
// Setting dialog
$(function () {
//CONTENTVIEW_MARKING.ready();
});
CONTENTVIEW_MARKING.ready = function(){
//$("#dlgMarking_dspSave").click(CONTENTVIEW_MARKING.dlgMarking_dspSave_click);
$("#dlgMarking_dspSave").on({
'click touchend': function(ev){
CONTENTVIEW_MARKING.dlgMarking_dspSave_click(ev);
return false;
},
'touchstart touchmove': function(){
//これを入れないと次にダイアログを開くと表示位置が大きくズレる
return false;
}
});
$("#dlgMarking_dspSave").click(CONTENTVIEW_MARKING.dlgMarking_dspSave_click);
$("#dlgMarking_dspCancel").click(CONTENTVIEW_MARKING.dlgMarking_dspCancel_click);
$("#dlgMarking_dspPgClear").click(CONTENTVIEW_MARKING.dlgMarking_dspPgClear_click);
//$("#dlgMarking_dspCancel").click(CONTENTVIEW_MARKING.dlgMarking_dspCancel_click);
$("#dlgMarking_dspCancel").on({
'click touchend': function(ev){
CONTENTVIEW_MARKING.dlgMarking_dspCancel_click(ev);
return false;
},
'touchstart touchmove': function(){
//これを入れないと次にダイアログを開くと表示位置が大きくズレる
return false;
}
});
//$("#dlgMarking_dspPgClear").click(CONTENTVIEW_MARKING.dlgMarking_dspPgClear_click);
$("#dlgMarking_dspPgClear").on({
'click touchend': function(ev){
CONTENTVIEW_MARKING.dlgMarking_dspPgClear_click(ev);
return false;
},
'touchstart touchmove': function(){
//これを入れないと次にダイアログを開くと表示位置が大きくズレる
return false;
}
});
// Icons
$("#dlgMarking_imgMin").click(CONTENTVIEW_MARKING.dlgMarking_imgMin_click);
$("#dlgMarking_imgMax").click(CONTENTVIEW_MARKING.dlgMarking_imgMax_click);
$("#dlgMarking_imgClose").click(CONTENTVIEW_MARKING.dlgMarking_imgClose_click);
$("#dlgMarking_imgPen").click(CONTENTVIEW_MARKING.dlgMarking_imgPen_click);
$("#dlgMarking_imgPenOption").click(CONTENTVIEW_MARKING.dlgMarking_imgPenOption_click);
$("#dlgMarking_imgMaker").click(CONTENTVIEW_MARKING.dlgMarking_imgMaker_click);
$("#dlgMarking_imgMakerOption").click(CONTENTVIEW_MARKING.dlgMarking_imgMakerOption_click);
$("#dlgMarking_imgEraser").click(CONTENTVIEW_MARKING.dlgMarking_imgEraser_click);
$("#dlgMarking_imgEraserOption").click(CONTENTVIEW_MARKING.dlgMarking_imgEraserOption_click);
//$("#dlgMarking_imgMin").click(CONTENTVIEW_MARKING.dlgMarking_imgMin_click);
$("#dlgMarking_imgMin").on({
'click touchend': function(ev){
CONTENTVIEW_MARKING.dlgMarking_imgMin_click(ev);
return false;
},
'touchstart touchmove': function(){
//これを入れないと次にダイアログを開くと表示位置が大きくズレる
return false;
}
});
//$("#dlgMarking_imgMax").click(CONTENTVIEW_MARKING.dlgMarking_imgMax_click);
$("#dlgMarking_imgMax").on({
'click touchend': function(ev){
CONTENTVIEW_MARKING.dlgMarking_imgMax_click(ev);
return false;
},
'touchstart touchmove': function(){
//これを入れないと次にダイアログを開くと表示位置が大きくズレる
return false;
}
});
//$("#dlgMarking_imgClose").click(CONTENTVIEW_MARKING.dlgMarking_imgClose_click);
$("#dlgMarking_imgClose").on({
'click touchend': function(ev){
CONTENTVIEW_MARKING.dlgMarking_imgClose_click(ev);
return false;
},
'touchstart touchmove': function(){
//これを入れないと次にダイアログを開くと表示位置が大きくズレる
return false;
}
});
//$("#dlgMarking_imgPen").click(CONTENTVIEW_MARKING.dlgMarking_imgPen_click);
$("#dlgMarking_imgPen").on({
'click touchend': function(ev){
CONTENTVIEW_MARKING.dlgMarking_imgPen_click(ev);
return false;
},
'touchstart touchmove': function(){
//これを入れないと次にダイアログを開くと表示位置が大きくズレる
return false;
}
});
//$("#dlgMarking_imgPenOption").click(CONTENTVIEW_MARKING.dlgMarking_imgPenOption_click);
$("#dlgMarking_imgPenOption").on({
'click touchend': function(ev){
CONTENTVIEW_MARKING.dlgMarking_imgPenOption_click(ev);
return false;
},
'touchstart touchmove': function(){
//これを入れないと次にダイアログを開くと表示位置が大きくズレる
return false;
}
});
//$("#dlgMarking_imgMaker").click(CONTENTVIEW_MARKING.dlgMarking_imgMaker_click);
$("#dlgMarking_imgMaker").on({
'click touchend': function(ev){
CONTENTVIEW_MARKING.dlgMarking_imgMaker_click(ev);
return false;
},
'touchstart touchmove': function(){
//これを入れないと次にダイアログを開くと表示位置が大きくズレる
return false;
}
});
//$("#dlgMarking_imgMakerOption").click(CONTENTVIEW_MARKING.dlgMarking_imgMakerOption_click);
$("#dlgMarking_imgMakerOption").on({
'click touchend': function(ev){
CONTENTVIEW_MARKING.dlgMarking_imgMakerOption_click(ev);
return false;
},
'touchstart touchmove': function(){
//これを入れないと次にダイアログを開くと表示位置が大きくズレる
return false;
}
});
//$("#dlgMarking_imgEraser").click(CONTENTVIEW_MARKING.dlgMarking_imgEraser_click);
$("#dlgMarking_imgEraser").on({
'click touchend': function(ev){
CONTENTVIEW_MARKING.dlgMarking_imgEraser_click(ev);
return false;
},
'touchstart touchmove': function(){
//これを入れないと次にダイアログを開くと表示位置が大きくズレる
return false;
}
});
//$("#dlgMarking_imgEraserOption").click(CONTENTVIEW_MARKING.dlgMarking_imgEraserOption_click);
$("#dlgMarking_imgEraserOption").on({
'click touchend': function(ev){
CONTENTVIEW_MARKING.dlgMarking_imgEraserOption_click(ev);
return false;
},
'touchstart touchmove': function(){
//これを入れないと次にダイアログを開くと表示位置が大きくズレる
return false;
}
});
/*
$('#dlgMarking').dialog({
autoOpen: false,
......@@ -487,8 +622,8 @@ $(function () {
revert: false
});
};
});
/// ===============================================================================================
/// Marking group [ end ]
/// ===============================================================================================
......
abvw/js/contentview_Memo.js
......@@ -2,23 +2,13 @@
//名前空間用のオブジェクトを用意する
var CONTENTVIEW_MEMO = {};
CONTENTVIEW_MEMO.targetDiv;
CONTENTVIEW_MEMO.targetX;
CONTENTVIEW_MEMO.targetY;
//CONTENTVIEW_MEMO.targetMemoId;
CONTENTVIEW_MEMO.EditIndex;
CONTENTVIEW_MEMO.saveMode;
CONTENTVIEW_MEMO.memoCallbackFunc;
CONTENTVIEW_MEMO.conid;
CONTENTVIEW_MEMO.pageid;
CONTENTVIEW_MEMO.createMemoDialog = function(){
CONTENTVIEW_MEMO.targetDiv.show();
CONTENTVIEW_MEMO.targetDiv.html('');
CONTENTVIEW_MEMO.targetDiv.append(
'<aside id="memoWrapper" class="MemoIndexBox">'
+ ' <h1 class="indexBoxHd">' + I18N.i18nText('txtMemo')
+' <a class="delete"></a>'
+' <a id="memoClosing2" class="delete"></a>'
+' </h1>'
+' <div id="memoArea" class="indexBoxBody_on">'
+' <textarea id="txaMemoContent" style="resize: none; height: 302px; width: 452px; margin-bottom: 10px"></textarea>'
......@@ -39,7 +29,18 @@ CONTENTVIEW_MEMO.handleMemoEventFunction = function(){
$('#Memo_btnSave').click(CONTENTVIEW_MEMO.buttonSaveFunction);
$('#Memo_btnDel').click(CONTENTVIEW_MEMO.MemoDelFunction);
$('#Memo_btnCancel').click(CONTENTVIEW_MEMO.MemoCancelFunction);
$('.delete').click(CONTENTVIEW_MEMO.MemoCancelFunction);
//$('.delete').click(CONTENTVIEW_MEMO.MemoCancelFunction);
$("#memoClosing2").on({
'click touchend': function(ev){
CONTENTVIEW_MEMO.MemoCancelFunction(ev);
return false;
},
'touchstart touchmove': function(){
//これを入れないと次にダイアログを開くと表示位置が大きくズレる
return false;
}
});
};
CONTENTVIEW_MEMO.memoSaveFunction = function(){
......@@ -92,15 +93,17 @@ CONTENTVIEW_MEMO.MemoDelFunction = function(){
CONTENTVIEW_GENERAL.isCopyMemo = false;
}
else{
var resultArr = ClientData.MemoData();
resultArr.splice(CONTENTVIEW_MEMO.EditIndex, 1);
ClientData.MemoData(resultArr);
//CONTENTVIEW_MEMO.targetDiv.dialog('close');
if(CONTENTVIEW_MEMO.memoCallbackFunc){
CONTENTVIEW_MEMO.memoCallbackFunc();
}
//if(CONTENTVIEW_MEMO.memoCallbackFunc){
// CONTENTVIEW_MEMO.memoCallbackFunc();
//}
}
$("#overlay").hide();
CONTENTVIEW_MEMO.targetDiv.children().remove();
......@@ -116,6 +119,7 @@ CONTENTVIEW_MEMO.MemoDelFunction = function(){
/* enable controls after finish copy */
CONTENTVIEW.enableControlsCopyMemo();
};
CONTENTVIEW_MEMO.MemoCancelFunction = function(){
......@@ -293,3 +297,20 @@ CONTENTVIEW_MEMO.editJqueryUIDialog = function(){
CONTENTVIEW_MEMO.targetDiv.parent().addClass('parentMemoDialogImportantCss');
};
$(function () {
//CONTENTVIEW_MEMO.ready();
});
CONTENTVIEW_MEMO.ready = function(){
CONTENTVIEW_MEMO.targetDiv = undefined;
CONTENTVIEW_MEMO.targetX = undefined;
CONTENTVIEW_MEMO.targetY = undefined;
CONTENTVIEW_MEMO.EditIndex = undefined;
CONTENTVIEW_MEMO.saveMode = undefined;
CONTENTVIEW_MEMO.memoCallbackFunc = undefined;
CONTENTVIEW_MEMO.conid = undefined;
CONTENTVIEW_MEMO.pageid = undefined;
};
abvw/js/contentview_Paint.js
......@@ -445,3 +445,6 @@ CONTENTVIEW_PAINT.drawPoint = function(coors, context_draw) {
}
};
CONTENTVIEW_PAINT.ready = function(){
};
abvw/js/contentview_Pen.js
......@@ -5,11 +5,6 @@
//名前空間用のオブジェクトを用意する
var CONTENTVIEW_PEN = {};
CONTENTVIEW_PEN.pen_Size;
//CONTENTVIEW_PEN.pen_Color;
CONTENTVIEW_PEN.pen_targetDiv;
CONTENTVIEW_PEN.pen_chooseColor;
CONTENTVIEW_PEN.ShowPen = function(targetId) {
CONTENTVIEW_PEN.pen_targetDiv = targetId;
I18N.i18nReplaceText();
......@@ -54,17 +49,95 @@ CONTENTVIEW_PEN.Pen_handleColorPickerEvent = function() {
$('#penColorwrapper').bind('mouseleave', CONTENTVIEW_PEN.Pen_colorWrapperMouseLeaveFunction);
}
$('#Pen_btnOk').live('click', CONTENTVIEW_PEN.Pen_dspOK_click);
$('#Pen_btnCancel').live('click', CONTENTVIEW_PEN.Pen_dspCancel_click);
//$('#Pen_btnOk').live('click', CONTENTVIEW_PEN.Pen_dspOK_click);
$("#Pen_btnOk").on({
'click touchend': function(ev){
CONTENTVIEW_PEN.Pen_dspOK_click(ev);
return false;
},
'touchstart touchmove': function(){
//これを入れないと次にダイアログを開くと表示位置が大きくズレる
return false;
}
});
//$('#Pen_btnCancel').live('click', CONTENTVIEW_PEN.Pen_dspCancel_click);
$("#Pen_btnCancel").on({
'click touchend': function(ev){
CONTENTVIEW_PEN.Pen_dspCancel_click(ev);
return false;
},
'touchstart touchmove': function(){
//これを入れないと次にダイアログを開くと表示位置が大きくズレる
return false;
}
});
CONTENTVIEW_PEN.Pen_SetDefaultValue();
$('#pen-small-text').live('click', CONTENTVIEW_PEN.penSmallTextClick);
$('#pen-medium-text').live('click', CONTENTVIEW_PEN.penMediumTextClick);
$('#pen-large-text').live('click', CONTENTVIEW_PEN.penLargeTextClick);
$('#pen-oversize-text').live('click', CONTENTVIEW_PEN.penOversizeTextClick);
//$('#pen-small-text').live('click', CONTENTVIEW_PEN.penSmallTextClick);
$("#pen-small-text").on({
'click touchend': function(ev){
CONTENTVIEW_PEN.penSmallTextClick(ev);
return false;
},
'touchstart touchmove': function(){
//これを入れないと次にダイアログを開くと表示位置が大きくズレる
return false;
}
});
//$('#pen-medium-text').live('click', CONTENTVIEW_PEN.penMediumTextClick);
$("#pen-medium-text").on({
'click touchend': function(ev){
CONTENTVIEW_PEN.penMediumTextClick(ev);
return false;
},
'touchstart touchmove': function(){
//これを入れないと次にダイアログを開くと表示位置が大きくズレる
return false;
}
});
//$('#pen-large-text').live('click', CONTENTVIEW_PEN.penLargeTextClick);
$("#pen-large-text").on({
'click touchend': function(ev){
CONTENTVIEW_PEN.penLargeTextClick(ev);
return false;
},
'touchstart touchmove': function(){
//これを入れないと次にダイアログを開くと表示位置が大きくズレる
return false;
}
});
//$('#pen-oversize-text').live('click', CONTENTVIEW_PEN.penOversizeTextClick);
$("#pen-oversize-text").on({
'click touchend': function(ev){
CONTENTVIEW_PEN.penOversizeTextClick(ev);
return false;
},
'touchstart touchmove': function(){
//これを入れないと次にダイアログを開くと表示位置が大きくズレる
return false;
}
});
$('#dlgPen .colorpicker').die();
$('#dlgPen .colorpicker').live('click', CONTENTVIEW_PEN.Pen_colorPickerClickFunction);
//$("#dlgPen .colorpicker").on({
// 'click touchend': function(ev){
// CONTENTVIEW_PEN.Pen_colorPickerClickFunction(ev);
// return false;
// },
// 'touchstart touchmove': function(){
// //これを入れないと次にダイアログを開くと表示位置が大きくズレる
// return false;
// }
//});
};
CONTENTVIEW_PEN.penSmallTextClick = function(){
......@@ -293,3 +366,13 @@ CONTENTVIEW_PEN.Pen_colorWrapperMouseLeaveFunction = function() {
//END FIXCSS
};
$(function () {
//CONTENTVIEW_PEN.ready();
});
CONTENTVIEW_PEN.ready = function(){
CONTENTVIEW_PEN.pen_Size = undefined;
CONTENTVIEW_PEN.pen_targetDiv = undefined;
CONTENTVIEW_PEN.pen_chooseColor = undefined;
};
abvw/js/contentview_PopupText.js
......@@ -2,9 +2,6 @@
//名前空間用のオブジェクトを用意する
var CONTENTVIEW_POPUPTEXT = {};
CONTENTVIEW_POPUPTEXT.popuptext_dialogDiv;
CONTENTVIEW_POPUPTEXT.popuptext_arrowDiv;
///ShowDialog
///direction: arrow value: 0: top right
/// 1: bottom right
......@@ -116,3 +113,12 @@ CONTENTVIEW_POPUPTEXT.MailTo = function(email, subject) {
window.open("mailto:" + email + "?subject=" + subject, '_self');
};
$(function () {
//CONTENTVIEW_POPUPTEXT.ready();
});
CONTENTVIEW_POPUPTEXT.ready = function(){
CONTENTVIEW_POPUPTEXT.popuptext_dialogDiv = undefined;
CONTENTVIEW_POPUPTEXT.popuptext_arrowDiv = undefined;
};
abvw/js/detail.js
......@@ -49,7 +49,9 @@ DETAIL.openContentDetail = function() {
$("#txtPubDt2_Dsp").text('');
$("#txtContentDetail").text('');
$("#contentDetailClose").unbind("click");
$("#contentDetailClose").click(DETAIL.contentDetailClose_Click);
$("#contentdetail_dspRead").unbind("click");
$("#contentdetail_dspRead").click(DETAIL.contentdetail_dspRead_Click);
//if( ClientData.serviceOpt_content_share() != '2'){
......@@ -70,8 +72,14 @@ DETAIL.openContentDetail = function() {
DETAIL.displayData.contentID = ClientData.contentInfo_contentId();
DETAIL.displayData.contentThumbnail = ClientData.contentInfo_contentThumbnail();
var params = {
sid: ClientData.userInfo_sid(),
getType: '1',
contentId: DETAIL.displayData.contentID
};
// Get content detail
AVWEB.avwCmsApi(ClientData.userInfo_accountPath(), "webGetContent", "GET", { contentId: DETAIL.displayData.contentID, sid: ClientData.userInfo_sid(), getType: 1 },
AVWEB.avwCmsApi(ClientData.userInfo_accountPath(), "webGetContent", "GET", params,
function (data) {
var contentType = ClientData.contentInfo_contentType();
// Get content detail
......@@ -115,7 +123,9 @@ DETAIL.openContentDetail = function() {
// Close content detail
DETAIL.contentDetailClose_Click = function(e) {
if( e != null ){
e.preventDefault();
}
COMMON.unlockLayout();
$("#contentDetail").hide();
$("#sectionContentDetail").hide();
......@@ -201,7 +211,23 @@ DETAIL.contentdetail_dspRead_Click_callback = function(outputId) {
HEADER.viewLinkContentById(ClientData.contentInfo_contentId());
}
else {
AVWEB.avwScreenMove(COMMON.ScreenIds.ContentView);
//AVWEB.avwScreenMove(COMMON.ScreenIds.ContentView);
//試験
//詳細閉じる
DETAIL.contentDetailClose_Click(null);
if( $('#bookshelf').length || $('#list').length ){
//ビューア表示
HOME.showContentView();
} else if( $('#bookmark').length ){
//ビューア表示
BOOKMARK.showContentView();
} else if( $('#history').length ){
//ビューア表示
HISTORY.showContentView();
} else if( $('#contentsearch').length ){
//ビューア表示
CONTENTSEARCH.showContentView();
}
}
};
......@@ -218,6 +244,7 @@ DETAIL.showContentNotPDF = function(displayData) {
SHARE.contentId = displayData.contentID;
SHARE.contentTitle = displayData.contentTitle;
$("#contentdetail_dspShare").show();
$("#contentdetail_dspShare").unbind("click");
$("#contentdetail_dspShare").click(SHARE.openContentShare);
}
......@@ -273,6 +300,7 @@ DETAIL.showContent = function(displayData) {
SHARE.contentId = displayData.contentID;
SHARE.contentTitle = displayData.contentTitle;
$("#contentdetail_dspShare").show();
$("#contentdetail_dspShare").unbind("click");
$("#contentdetail_dspShare").click(SHARE.openContentShare);
}
......
abvw/js/header.js
......@@ -837,11 +837,25 @@ HEADER.getTimeWaitCheckNewPushMessage = function()
// get message new
HEADER.getPushMessageNew = function()
{
//ロック中かビューア画面ならチェックしない
if ($("#viewer").length) {
//表示状態か
if( $('#viewer').is(':visible')){
return;
}
}
//$('.notification-pushmessage').hide();
var params = { "sid": ClientData.userInfo_sid()};
AVWEB.avwCmsApi(ClientData.userInfo_accountPath(), "webPushMessageNew", "post", params,
var params = {
"sid": ClientData.userInfo_sid()
};
AVWEB.avwCmsApi(
ClientData.userInfo_accountPath(),
"webPushMessageNew",
"post",
params,
HEADER.callbackGetPushMessageNewSuccess,
function (xhr, b, c) { });
function (xhr, b, c) { }
);
};
// callback get number new message success
......@@ -892,21 +906,27 @@ HEADER.getPushMessageList = function() {
var from = (HEADER.currentPagePushMessage - 1) * pushPageCount + 1;
var to = HEADER.currentPagePushMessage * pushPageCount;
var params = { "sid": ClientData.userInfo_sid(), "recordFrom": from, "recordTo": to };
AVWEB.avwCmsApiSync(ClientData.userInfo_accountPath(), "webPushMessageList", "post", params,
var params = {
"sid": ClientData.userInfo_sid(),
"recordFrom": from,
"recordTo": to
};
AVWEB.avwCmsApiSync(
ClientData.userInfo_accountPath(),
"webPushMessageList",
"post",
params,
function (data) {
// reset number message
ClientData.pushInfo_newMsgNumber(0);
// hide number new message
$('#numbermessage').html('');
HEADER.showListPushMessage(data);
},
function (xhr, b, c) {
AVWEB.showSystemError();
});
}
);
};
// get string from date crate pushmessage
......@@ -1062,8 +1082,8 @@ HEADER.downloadResourceById = function(contentId){
AVWEB.avwCmsApiSync(ClientData.userInfo_accountPath(), "webGetContent", "get", params,
function (data) {
//Get resourceurl
if( data.contentData.content ){
var resourceUrl = HEADER.getResourceByIdFromAPI(data.contentData.content.resourceId);
// open url to download file
if (HEADER.isSafariNotOnIpad()) {
window.onbeforeunload = null;
......@@ -1073,8 +1093,12 @@ HEADER.downloadResourceById = function(contentId){
else {
window.open(resourceUrl); //open url to download file on orther browser
}
} else {
alert("ダウンロード出来ません。");
}
},
function (xhr, b, c) { });
function (xhr, b, c) { }
);
};
//Download resource
......
abvw/js/history.js
......@@ -23,6 +23,8 @@ HISTORY.contentViewData = [];
HISTORY.noRecordFlg = false;
HISTORY.home_isMove = false;
HISTORY.history_contentTitleKana = [];
//スクロール復帰
HISTORY.scrollTop = 0;
$(document).ready(function(){
......@@ -49,10 +51,9 @@ $(document).ready(function(){
HISTORY.renderGridView();
//Go To Details Page
$('canvas').live('click', HISTORY.canvasClickFunction);
//$('canvas').live('touchstart', HISTORY.canvasClickFunction);
$('canvas').live('touchend', HISTORY.canvasClickFunction);
$('canvas').live('touchmove', function () { HISTORY.home_isMove = true; });
$('#main-ws canvas').live('click', HISTORY.canvasClickFunction);
$('#main-ws canvas').live('touchend', HISTORY.canvasClickFunction);
$('#main-ws canvas').live('touchmove', function () { HISTORY.home_isMove = true; });
//Open dialog
......@@ -104,7 +105,7 @@ $(document).ready(function(){
}
//詳細、共有表示パーツ読み込み
$("#inc_detail").load("./inc_detail.html", function (myData, myStatus, xhr){
$("#inc_detail").load("./inc_detail.html?__UPDATEID__", function (myData, myStatus, xhr){
//読み込み完了時の処理
I18N.i18nReplaceText();
$('.datepicker').pickadate({
......@@ -112,6 +113,12 @@ $(document).ready(function(){
});
});
//ビューア、共有表示パーツ読み込み
$("#viewer").load("./inc_contentview.html?__UPDATEID__", function (myData, myStatus, xhr){
//読み込み完了時の処理
I18N.i18nReplaceText();
});
});
//Call API
......@@ -177,7 +184,8 @@ HISTORY.renderContent = function(id, text, division, type, order, from, to, cate
shareHtml ='<li><a class="read lang button-share" contentid="' + post.contentId + '" lang="txtShare">'+I18N.i18nText("txtShare")+'</a></li>';
}
htmlTemp = htmlTemp.replace(/\{share\}/g, shareHtml);
$('#content-grid').append(htmlTemp);
//効率化
//$('#content-grid').append(htmlTemp);
}
}
......@@ -204,8 +212,9 @@ HISTORY.renderContent = function(id, text, division, type, order, from, to, cate
HISTORY.contentTypeArr.push({ contentId: post.contentId, contentType: post.contentType });
//End Function : No.12 -- Editor : Le Long -- Date : 07/31/2013 -- Summary : Assign content type to array to manage.
//効率化
//Check if user has read this content or not.
HISTORY.checkUserHasReadContent(post.contentId, post.resourceVersion, post.metaVersion);
//HISTORY.checkUserHasReadContent(post.contentId, post.resourceVersion, post.metaVersion);
//assign version to array
COMMON.resourceVersionArr.push({ contentid: post.contentId, resourceversion: post.resourceVersion });
......@@ -216,7 +225,8 @@ HISTORY.renderContent = function(id, text, division, type, order, from, to, cate
//Check if content has marking or memo
HISTORY.checkContentMarkingMemoOption(post.contentId);
$('#lblVdate' + post.contentId).html(viewdate);
//効率化
//$('#lblVdate' + post.contentId).html(viewdate);
HISTORY.addReadContentToArray(post.contentId, post.resourceVersion, post.metaVersion, post.contentThumbnail, post.contentTitle, HISTORY.returnContentTitleKana(post.contentId), post.contentDeliveryDate,post.contentType, post.readerShare );
......@@ -679,7 +689,11 @@ HISTORY.readSubmenuFunction_callback = function(contentId){
}
else{
//Go to Conten view page
AVWEB.avwScreenMove(COMMON.ScreenIds.ContentView);
//AVWEB.avwScreenMove(COMMON.ScreenIds.ContentView);
HISTORY.drawEditImage(contentId);
HISTORY.showContentView();
}
//End Function : No.12 -- Editor : Le Long -- Date : 08/02/2013 -- Summary : Check content type other for download.
};
......@@ -1188,6 +1202,11 @@ HISTORY.getContentNameKana = function(strContentId) {
Check content whether existed or not
*/
HISTORY.IsExistContent = function(strContentId) {
if( strContentId == null || strContentId == "" ){
return false;
}
var isExisted = true;
var params = {
sid: ClientData.userInfo_sid(),
......@@ -1492,3 +1511,67 @@ HISTORY.showContentShareDlgFunction = function(e) {
};
HISTORY.showContentView = function(){
var y = 0;
if( document.documentElement.scrollTop ){
y = document.documentElement.scrollTop;
}
if( document.body.scrollTop ){
if( y == undefined || y == 0){
y = document.body.scrollTop;
}
}
if( y == undefined || y == null){
y = 0;
}
//console.log("scrollTop:" + y);
HISTORY.scrollTop = y;
window.scrollTo(0,0);
$("#header-ws").hide();
$("#ws-body").hide();
$("#topcontrol").hide();
CONTENTVIEW_INITOBJECT.clearViewerComponent();
CONTENTVIEW.cssInit();
$("#viewer").show();
CONTENTVIEW.ready();
};
HISTORY.cssInit = function(){
$('html').css({
'overflow-y':'scroll'
});
$('html,body').css({
'height':'100%',
'margin': '0',
'padding': '0'
});
$('html>body').css({
'font-size':'16px',
'font-size':'68.75%'
});
$('body').css({
'font-family':'Verdana, helvetica, arial, sans-serif',
'font-size':'68.75%',
'background':'#fff',
'color':'#333'
});
};
HISTORY.downloadFunction = function(e) {
if (e) {
e.preventDefault();
}
var contentId = $(this).attr('contentid');
//Download content
HEADER.downloadResourceById(contentId);
};
abvw/js/home.js
......@@ -39,6 +39,9 @@ HOME.timer_subMenu;
HOME.genre_totalcontent = -1;
HOME.group_totalcontent = -1;
//スクロール復帰
HOME.scrollTop = 0;
//==========================================================
$(document).ready(function () {
......@@ -92,10 +95,9 @@ $(document).ready(function () {
$('#control-list-type').click(HOME.changeDispListFunction);
//Go To Details Page
$('canvas').live('click', HOME.canvasClickFunction);
//$('canvas').live('touchstart', HOME.canvasClickFunction);
$('canvas').live('touchend', HOME.canvasClickFunction);
$('canvas').live('touchmove', function () { HOME.home_isMove = true; });
$('#main-ws canvas').live('click', HOME.canvasClickFunction);
$('#main-ws canvas').live('touchend', HOME.canvasClickFunction);
$('#main-ws canvas').live('touchmove', function () { HOME.home_isMove = true; });
//Open dialog
$('.dialog').live('click', HOME.openSubMenuDialogFunction);
......@@ -185,7 +187,7 @@ $(document).ready(function () {
if( ClientData.serviceOpt_catalog_edition() == 'Y'){
$('.tabUnit').hide();
//センタリングするようサイズ調整
$('#main').width(660);
$('#bookshelf-main').width(660);
} else {
$('.tabUnit').show();
}
......@@ -221,7 +223,7 @@ $(document).ready(function () {
}
//詳細、共有表示パーツ読み込み
$("#inc_detail").load("./inc_detail.html", function (myData, myStatus, xhr){
$("#inc_detail").load("./inc_detail.html?__UPDATEID__", function (myData, myStatus, xhr){
//読み込み完了時の処理
I18N.i18nReplaceText();
$('.datepicker').pickadate({
......@@ -229,6 +231,12 @@ $(document).ready(function () {
});
});
//ビューア、共有表示パーツ読み込み
$("#viewer").load("./inc_contentview.html?__UPDATEID__", function (myData, myStatus, xhr){
//読み込み完了時の処理
I18N.i18nReplaceText();
});
});
//日比谷カスタム ここから
......@@ -459,6 +467,8 @@ HOME.canvasClickFunction = function(e) {
var contentId = $(this).attr('id');
var outputId = contentId.substring(17);
if (HOME.isShowBookShelf) {
LIMIT_ACCESS_CONTENT.checkLimitContent(outputId,
function(){
HOME.canvasClickFunction_callback(outputId);
......@@ -466,7 +476,9 @@ HOME.canvasClickFunction = function(e) {
function(){
}
);
} else {
HOME.canvasClickFunction_callback(outputId);
}
};
HOME.canvasClickFunction_callback = function(outputId)
......@@ -595,7 +607,12 @@ HOME.canvasClickFunction_callback = function(outputId)
}
else{
//Go to Conten view page
AVWEB.avwScreenMove(COMMON.ScreenIds.ContentView);
//AVWEB.avwScreenMove(COMMON.ScreenIds.ContentView);
HOME.drawEditImage(outputId);
//ビュアーに切り替え
HOME.showContentView();
}
//Start Function : No.12 -- Editor : Le Long -- Date : 07/31/2013 -- Summary : check for download content type other.
......@@ -670,23 +687,22 @@ HOME.openSubMenuDialogFunction = function(e) {
DETAIL.openContentDetail();
}
else if (HOME.isShowBookShelf) {
$('#dialog-read').attr('contentid', contentid);
$('#dialog-detail').attr('contentid', contentid);
//$("#dlgSubMenu").dialog({position: array, width: 130, height: 90});
$("#dlgSubMenu").show();
HOME.allowTimerCloseSubMenu = false;
$("#dlgSubMenu").position({ my: "left bottom",
at: "left-10 top",
of: this,
collision: "fit"
});
//}
//else if (HOME.isShowBookShelf) {
// $('#dialog-read').attr('contentid', contentid);
// $('#dialog-detail').attr('contentid', contentid);
// //$("#dlgSubMenu").dialog({position: array, width: 130, height: 90});
// $("#dlgSubMenu").show();
// HOME.allowTimerCloseSubMenu = false;
// $("#dlgSubMenu").position({ my: "left bottom",
// at: "left-10 top",
// of: this,
// collision: "fit"
// });
}
else {
$('#dialog-read').attr('contentid', contentid);
$('#dialog-detail').attr('contentid', contentid);
//$("#dlgSubMenu").dialog({position: array, width: 130, height: 90});
$("#dlgSubMenu").show();
HOME.allowTimerCloseSubMenu = false;
$("#dlgSubMenu").position({ my: "left bottom",
......@@ -1328,7 +1344,9 @@ HOME.readSubmenuFunction_callback = function(contentId)
}
else{
//Go to Conten view page
AVWEB.avwScreenMove(COMMON.ScreenIds.ContentView);
//AVWEB.avwScreenMove(COMMON.ScreenIds.ContentView);
HOME.drawEditImage(contentId);
HOME.showContentView();
}
//Start Function : No.12 -- Editor : Le Long -- Date : 07/31/2013 -- Summary : Add ContentType to Storage.
};
......@@ -1659,7 +1677,7 @@ HOME.renderContent = function(id, text, division, type, order, from, to, cateid,
+ ' </a>'
+ ' <div class="info">'
+ ' <ul class="date">'
+ ' <li><span class="lang" lang="txtPubDt"> </span> : ' + outputDate + '</li>'
+ ' <li><span class="lang" lang="txtPubDt"> </span>：' + outputDate + '</li>'
+ ' <li><span class="lang" lang="txtViewDt"> </span>：<span id="lblVdate' + post.contentId + '"> </span></li>'
+ ' </ul>'
+ ' <ul class="pic">'
......@@ -2313,7 +2331,7 @@ HOME.syncMarkingContent = function() {
HOME.syncContentData = function() {
if (ClientData.common_contentDataChkFlg() == 'true') {
HOME.syncReadingContent();
//HOME.syncReadingContent(); //#14290 履歴画面でも取得するので省略
HOME.syncBookmarkContent();
HOME.syncMemoContent();
HOME.syncMarkingContent();
......@@ -2595,3 +2613,83 @@ HOME.showContentShareDlgFunction = function(e) {
};
$(function () {
HOME.cssInit();
});
HOME.cssInit = function(){
$('html').css({
'overflow-y':'scroll'
});
$('html,body').css({
'height':'100%',
'margin': '0',
'padding': '0'
});
$('html>body').css({
'font-size':'16px',
'font-size':'68.75%'
});
$('body').css({
'font-family':'Verdana, helvetica, arial, sans-serif',
'font-size':'68.75%',
'background':'#fff',
'color':'#333'
});
};
HOME.showContentView = function(){
var y = 0;
if( document.documentElement.scrollTop ){
y = document.documentElement.scrollTop;
}
if( document.body.scrollTop ){
if( y == undefined || y == 0){
y = document.body.scrollTop;
}
}
if( y == undefined || y == null){
y = 0;
}
HOME.scrollTop = y;
window.scrollTo(0,0);
//試験
$("#header-ws").hide();
$("#ws-body").hide();
$("#topcontrol").hide();
CONTENTVIEW_INITOBJECT.clearViewerComponent();
CONTENTVIEW.cssInit();
$("#viewer").show();
//CONTENTVIEW_FILESYSTEM.initFS(CONTENTVIEW.ready);
CONTENTVIEW.ready();
};
//Dialog Read Button CLick
HOME.downloadSubmenuFunction = function(e) {
if (e) {
e.preventDefault();
}
HOME.allowTimerCloseSubMenu = false;
if (HOME.home_isMove == true) {
HOME.home_isMove = false;
return;
}
// hide dialog sub menu
$('#dlgSubMenu').hide();
var contentId = $(this).attr('contentid');
//Download content
HEADER.downloadResourceById(contentId);
};
abvw/js/login.js
......@@ -159,7 +159,7 @@ LOGIN.processLogin = function() {
previousSid: '',
loginId: loginId,
password: password,
urlpath: accountPath,
urlpath: accountPath
};
//引数パラメータがあれば取得
......
abvw/settings.html
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<!DOCTYPE html>
<html>
<head>
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
......@@ -59,8 +58,7 @@
<![endif]-->
</head>
<body id="user_change">
<header>
<header id="header-ws" class="header_ws">
<div class="notification-pushmessage" style="display:none;">
<!--新着メッセージがあります！！！-->
</div>
......@@ -97,7 +95,6 @@
</div>
</div>
</li>
<li class="menuIcon" id="dspHome"><a href="#"><img src="img/common/icon_home.png" width="30" height="30"></a></li>
<li class="menuIcon" id="dspShiori"><a href="#"><img src="img/common/icon_marker.png" width="30" height="30"></a></li>
<li class="menuIcon" id="dspViewHistory"><a href="#"><img src="img/common/icon_watch.png" width="30" height="30"></a></li>
......@@ -106,23 +103,10 @@
</ul>
</div>
</div>
<!--<script>
$(function(){
// 「id="jQueryPush"」がクリックされた場合
$("#jQueryPush").click(function () {
// 「id="accordion"」の表示、非表示を切り替える
$("#accordion").toggle();
});
});
</script>-->
</header>
<div id="inc_backup"></div>
<div class="wrapper">
<div id="main">
<div id="ws-body" class="wrapper_ws" >
<div id="main-ws">
<article>
<section class="sectionSetting">
<div id="user_info">
......@@ -137,7 +121,6 @@
</dl>
<p class="passchgbtn"><a href="#" class="lang" id="dspPwdUpd" lang="dspPwdUpd"><!--パスワード変更--></a> </p>
</div>
<div id="user_option">
<h3 class="lang" lang="txtOpt"><!--オプション--></h3>
<ul>
......@@ -149,7 +132,6 @@
<li><label><input type=checkbox name="repeat" value="repeat" class="chkbx" id="chkOpt002" checked="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" 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="chkOpt005" id="txtOpt005" lang="txtOpt005" class="lang"><!--タブ・ブラウザ終了・F5時のアラートが表示する--></label></label></li>
<li>
<label lang="txtOptPageTrans" class="lang"><!--ビューのアニメーション種類--></label>
<select id="cboAnimation">
......@@ -163,11 +145,13 @@
<input type="text" id="txtValueAnimation" value="1.0" />
<span id="slidebar-container"><span id="slidebar-from">0.1</span><span id="slidebar-animation"></span><span id="slidebar-to">9.9</span></span>
</li>
</ul>
<h3 style="margin-top:50px" id="txtBkResCap" lang="txtBkResCap" class="lang"><!--サーバーにバックアップ／リストア--></h3>
<p class="logout_backup" id="regionOptionBackup">
<label><input type="checkbox" name="backup" value="backup" id="chkOptBkCfm" checked="checked"><label id="txtOptBkCfm" for="chkOptBkCfm" lang="txtOptBkCfm" class="lang"><!--毎回ログアウトの時、バックアップするかどうかは必ず確認する--></label></label>
<label>
<input type="checkbox" name="backup" value="backup" id="chkOptBkCfm" checked="checked">
<label id="txtOptBkCfm" for="chkOptBkCfm" lang="txtOptBkCfm" class="lang"><!--毎回ログアウトの時、バックアップするかどうかは必ず確認する--></label>
</label>
<br />
<label class="option_backup">
<label id="txtBkDefault" lang="txtBkDefault" class="lang"><!--バックアップのデフォルト : --></label>
......@@ -179,11 +163,9 @@
<p class="backupbtn"><a class="backup lang" lang="dspOptBk" id="dspOptBk" href="#" style="display:none;"><!--バックアップ--></a><a href="#" id="dspOptRes" lang="dspOptRes" class="lang" style="visibility:hidden;"><!--リストア--></a></p>
<p class="savebtn"><a class="save lang" href="#" id="dspSave" lang="dspSave"><!--保存する--></a><a class="default lang" href="#" id="dspOptReset" lang="dspOptReset"><!--初期設定に戻る--></a><div style="clear:both;"></div></p>
</div>
</section>
</article>
</div>
</div>
</div>
<section id="dlgChangePassword" class="sectionchangepassword">
......@@ -209,52 +191,38 @@
</p>
</section>
<section class="sectionbackup" id="dlgConfirmBackup">
<h1><label class="title lang" lang="txtBackupTitle"><!--バックアップ確認--></label></h1>
<!--<p class="message"><label id="txtBkMsg" lang="txtBkMsg" class="lang"><!--サーバにバックアップしますか？--></label></p>-->
<p class="message">
<label lang="txtBkSelectData" class="lang"><!--バックアップするデータを選択してください。--></label>
</p>
<p class="message-options">
<label class="option_backup">
<input type="checkbox" id="chkopBkMarking" class="chkopbx" checked="checked" /><label for="chkopBkMarking" lang="txtBkMarking" class="lang"><!--マーキング--></label>
<input type="checkbox" id="chkopBkMemo" class="chkopbx" checked="checked" /><label for="chkopBkMemo" lang="txtBkMemo" class="lang"><!--メモ--></label>
<input type="checkbox" id="chkopBkShiori" class="chkopbx" checked="checked" /><label for="chkopBkShiori" lang="txtBkShiori" class="lang"><!--しおり--></label>
</label>
</p>
<p class="backupbtn"><a class="ok lang" href="#" id="dspOptBk_OK" lang="dspOK"><!--ＯＫ--></a><a class="cancel lang" href="#" lang="dspCancel" id="dspOptBk_Cancel"><!--キャンセル--></a></p>
</section>
<div id="inc_backup"></div>
<section class="sectionrestore" id="dlgConfirmRestore">
<section class="sectionrestore" id="dlgConfirmRestore">
<h1 class="title lang" lang="txtRestoreTitle"><!--リストア確認--></h1>
<p class="message">
<!--<label id="txtResMsg" class="lang" lang="txtResMsg"></label>-->
<label id="txtResSelect" class="lang" lang="txtResSelect"><!--リストアするデータを選択してください。--></label>
</p>
<p class="message-options">
<label class="option_backup">
<input type="checkbox" id="chkopResMarking" class="chkopbx" checked="checked" /><label for="chkopResMarking" lang="txtBkMarking" class="lang"><!--マーキング--></label>
<input type="checkbox" id="chkopResMemo" class="chkopbx" checked="checked" /><label for="chkopResMemo" lang="txtBkMemo" class="lang"><!--メモ--></label>
<input type="checkbox" id="chkopResShiori" class="chkopbx" checked="checked" /><label for="chkopResShiori" lang="txtBkShiori" class="lang"><!--しおり--></label>
</label>
<!--<label class="option_backup">-->
<p class="option_backup" style="font-size: 13px;margin-left:50px">
<input type="checkbox" name="chkopBkMarking" id="chkopBkMarking" class="chkopbx" checked="checked" /><label for="chkopBkMarking" lang="txtBkMarking" class="lang">マーキング</label>
<input type="checkbox" name="chkopBkMemo" id="chkopBkMemo" class="chkopbx" checked="checked" /><label for="chkopBkMemo" lang="txtBkMemo" class="lang">メモ</label>
<input type="checkbox" name="chkopBkShiori" id="chkopBkShiori" class="chkopbx" checked="checked" /><label for="chkopBkShiori" lang="txtBkShiori" class="lang">しおり</label>
</P>
<!--</label>-->
</p>
<p class="notice"><label class="lang" lang="txtResMsgNotice"></label></p>
<p class="restorebtn"><a class="ok lang" href="#" id="dspOptRes_OK" lang="dspOK"><!--ＯＫ--></a><a class="cancel lang" href="#" id="dspOptRes_Cancel" lang="dspCancel"><!--キャンセル--></a></p>
</section>
</section>
<footer>
<div class="border">
<div class="border">
<div class="cnt_footer">
COPYRIGHT &copy; 2014 AGENTEC Co., Ltd. ALL RIGHTS RESERVED.
</div>
</div>
</div>
</footer>
<iframe style="height:0px;width:0px;visibility:hidden;display:none;" src="about:blank">
this frame prevents back forward cache
</iframe>
</body>
</html>
login.html
......@@ -72,7 +72,7 @@
<div id="fade"></div>
-->
<div class="wrapper">
<div id="main">
<div id="main-ws">
<ul class="floatR" id="menu-language"><li class="language"><a id="language-ja"><img src="./abvw/img/common/flg_jpn.png" width="29" height="20"></a></li><li class="language"><a id="language-en"><img src="./abvw/img/common/flg_usa.png" width="29" height="20"></a></li><li class="language"><a id="language-ko"><img src="./abvw/img/common/flg_kor.png" width="29" height="20"></a></li></ul>
<article>
<img src="./abvw/img/login/logo_login.png" width="200" class="clearboth" id="logologin">
......
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