Skip to content

C
check
Commit 38bf701c by Masaru Abe
Options

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

parent 9b78c046
Showing with 1356 additions and 449 deletions
abvw/common/css/screen.css
/*
html, body {height:100%; margin: 0; padding: 0; } html, body {height:100%; margin: 0; padding: 0; }
html>body { html>body {
font-size: 16px; font-size: 16px;
font-size: 68.75%; font-size: 68.75%;
} /* Reset Base Font Size */ }
body { body {
font-family: Verdana, helvetica, arial, sans-serif; font-family: Verdana, helvetica, arial, sans-serif;
...@@ -11,6 +12,7 @@ body { ...@@ -11,6 +12,7 @@ body {
background: #fff; background: #fff;
color: #333; color: #333;
} }
*/
h1, h2 { font-family: 'trebuchet ms', verdana, arial; padding: 10px; margin: 0 } h1, h2 { font-family: 'trebuchet ms', verdana, arial; padding: 10px; margin: 0 }
h1 { font-size: large } h1 { font-size: large }
...@@ -19,6 +21,6 @@ h1 { font-size: large } ...@@ -19,6 +21,6 @@ h1 { font-size: large }
background: url(bg.gif) repeat-x; text-align: center } background: url(bg.gif) repeat-x; text-align: center }
#banner a { color: white; } #banner a { color: white; }
#main { padding: 1em; } #main-ws { padding: 1em; }
a img { border: none; } 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 ...@@ -451,7 +451,7 @@ AVWEB._callCmsApi = function(url, accountPath, apiName, type, params, async, suc
apiUrl = url; apiUrl = url;
} }
if(accountPath) { if(accountPath) {
apiUrl = AVWEB.format(apiUrl, accountPath) apiUrl = AVWEB.format(apiUrl, accountPath);
} }
apiUrl = apiUrl + '/' + apiName + '/'; apiUrl = apiUrl + '/' + apiName + '/';
...@@ -488,10 +488,60 @@ AVWEB._callCmsApi = function(url, accountPath, apiName, type, params, async, suc ...@@ -488,10 +488,60 @@ AVWEB._callCmsApi = function(url, accountPath, apiName, type, params, async, suc
if(error) { if(error) {
error(xmlHttpRequest, txtStatus, errorThrown); error(xmlHttpRequest, txtStatus, errorThrown);
} else { } else {
AVWEB.showSystemError(); 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) { ...@@ -659,7 +709,7 @@ AVWEB.avwGrabContentPageImage = function(accountPath, params, success, error) {
if (error) { if (error) {
error(xmlHttp, xmlHttp.status, xmlHttp.statusText); error(xmlHttp, xmlHttp.status, xmlHttp.statusText);
} else { } 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) ...@@ -759,7 +809,7 @@ AVWEB.avwUploadBackupFile = function(accountPath, params, async, success, error)
}); });
}; };
/* show system error message */ /* show system error message */
AVWEB.showSystemError = function() { AVWEB.showSystemError = function(textId) {
if(AVWEB.avwHasError()) { if(AVWEB.avwHasError()) {
// すでにエラー状態であればエラーを表示しない // すでにエラー状態であればエラーを表示しない
...@@ -769,8 +819,12 @@ AVWEB.showSystemError = function() { ...@@ -769,8 +819,12 @@ AVWEB.showSystemError = function() {
AVWEB.avwSetErrorState(); AVWEB.avwSetErrorState();
} }
if( !textId ){
textId = 'sysErrorCallApi01';
}
// create DOM element for showing error message // 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>'; var tags = '<div id="avw-sys-error"></div>';
//$('body').prepend(tags); //$('body').prepend(tags);
$('body').append(tags); $('body').append(tags);
......
abvw/common/json/sys/conf.json
{ {
"apiUrl" : "https://web3.agentec.jp/acms/{0}/abvapi", "apiUrl" : "https://abmaker.agentec.jp/acms/{0}/abvapi",
"apiLoginUrl" : "https://web3.agentec.jp/acms/nuabvapi", "apiLoginUrl" : "https://abmaker.agentec.jp/acms/nuabvapi",
"apiResourceDlUrl" : "https://web3.agentec.jp/acms/{0}/dl", "apiResourceDlUrl" : "https://abmaker.agentec.jp/acms/{0}/dl",
"bookShelfCount" : 15, "bookShelfCount" : 15,
"bookListCount" : 15, "bookListCount" : 15,
"screenlockTimeDefault" : 30, "screenlockTimeDefault" : 30,
......
abvw/css/layout/bookshelf.css
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
height: 33px; height: 33px;
display: table-cell; 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; display: inline-block;
vertical-align: middle; vertical-align: middle;
margin-right: 5px; margin-right: 5px;
...@@ -123,22 +123,22 @@ a:hover.btn_bott{ ...@@ -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; 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; position: absolute;
top: 8px; top: 8px;
left: 40px; 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; position: absolute;
top: 46px; top: 46px;
left: 19px; 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; 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; margin-top: 5px;
} }
\ No newline at end of file
abvw/css/layout/common.css
...@@ -15,7 +15,7 @@ form, ul{ margin:0; padding:0;} ...@@ -15,7 +15,7 @@ form, ul{ margin:0; padding:0;}
li{ list-style-type:none;} li{ list-style-type:none;}
img{ display:block; border:none;} img{ display:block; border:none;}
#main{ #main-ws{
width: 960px; width: 960px;
padding-top: 20px; padding-top: 20px;
overflow: hidden; overflow: hidden;
...@@ -54,4 +54,5 @@ p.go_top{ ...@@ -54,4 +54,5 @@ p.go_top{
br.clear { clear: both; margin: 0; padding: 0; font-size: 0; line-height: 0; } br.clear { clear: both; margin: 0; padding: 0; font-size: 0; line-height: 0; }
.floatL { float: left;} .floatL { float: left;}
.floatR { float: right;} .floatR { float: right;}
\ No newline at end of file
abvw/css/layout/contentsearch.css
...@@ -150,7 +150,8 @@ ...@@ -150,7 +150,8 @@
} }
.cnt_section_list .text ul.pic li img { .cnt_section_list .text ul.pic li img {
position: relative; position: relative;
left: -18px; /*left: -18px;*/
left: 1px;
} }
.cnt_section_list .text ul.pic li a.read { .cnt_section_list .text ul.pic li a.read {
margin-top: 42px; margin-top: 42px;
...@@ -235,7 +236,7 @@ a:hover.btn_bott{ ...@@ -235,7 +236,7 @@ a:hover.btn_bott{
right: 20px; right: 20px;
top: 50px; top: 50px;
} }
section #main-ws section
{ {
} }
......
abvw/css/layout/footer.css
@charset "utf-8"; @charset "utf-8";
/* footer */ /* footer */
footer{ #ws-body footer{
display: block; display: block;
height: 58px; height: 58px;
line-height: 60px; line-height: 60px;
......
abvw/css/layout/header.css
@charset "utf-8"; @charset "utf-8";
header{ .header_ws{
height: 100px; height: 100px;
width: 100%; width: 100%;
display: block; display: block;
...@@ -129,21 +129,22 @@ header{ ...@@ -129,21 +129,22 @@ header{
.cnt_header .menu_language ul.pushMessage a:hover { } .cnt_header .menu_language ul.pushMessage a:hover { }
header .cnt_header .menu_language ul li a img { display: inline; } .header_ws .cnt_header .menu_language ul li a img { display: inline; }
header .cnt_header .menu_language ul .language { .header_ws .cnt_header .menu_language ul .language {
padding: 0; padding: 0;
margin-left: 0px; margin-left: 0px;
} }
header .cnt_header .menu_language .button .menuIcon img { display: inline; } .header_ws .cnt_header .menu_language .button .menuIcon img { display: inline; }
header .cnt_header .menu_language ul li a#jQueryPush{ .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: 520px;
/*width: 590px;*/
position: relative; position: relative;
} }
header .cnt_header .menu_language #header-searchbox { .header_ws .cnt_header .menu_language #header-searchbox {
width: 200px; width: 200px;
position: absolute; position: absolute;
top: 25px; top: 25px;
...@@ -152,11 +153,11 @@ header .cnt_header .menu_language #header-searchbox { ...@@ -152,11 +153,11 @@ header .cnt_header .menu_language #header-searchbox {
right: 0px; right: 0px;
padding-top:5px; padding-top:5px;
} }
header .cnt_header .menu_language #header-searchbox span .header_ws .cnt_header .menu_language #header-searchbox span
{ {
cursor:pointer; 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; height: 20px;
line-height:20px; line-height:20px;
/*width: 25px;*/ /*width: 25px;*/
...@@ -170,7 +171,7 @@ header .cnt_header .menu_language #header-searchbox a#searchbox-search { ...@@ -170,7 +171,7 @@ header .cnt_header .menu_language #header-searchbox a#searchbox-search {
display: inline-block; display: inline-block;
margin:0 5px 5px 0; 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{ a#searchbox-search:active{
position:relative; position:relative;
...@@ -196,9 +197,9 @@ a#searchbox-search:active{ ...@@ -196,9 +197,9 @@ a#searchbox-search:active{
margin-right:5px; margin-right:5px;
} }
.tops ul.sort li.current a.ascending_sort{ .tops ul.sort li.current a.ascending_sort{
text-decoration:underline; text-decoration:underline;
padding-right: 15px; padding-right: 15px;
margin-right:5px; margin-right:5px;
} }
.tops ul.sort li b{ .tops ul.sort li b{
} }
......
abvw/css/layout/history.css
...@@ -154,6 +154,11 @@ ...@@ -154,6 +154,11 @@
position: relative; position: relative;
left: -1px; left: -1px;
} }
.cnt_section_list .text ul.pic li img.pen {
margin-left: 15px;
}
.cnt_section_list .text ul.pic li a.read { .cnt_section_list .text ul.pic li a.read {
margin-top: 42px; margin-top: 42px;
-moz-border-radius: 6px; -moz-border-radius: 6px;
......
abvw/css/layout/home.css
...@@ -61,7 +61,7 @@ ...@@ -61,7 +61,7 @@
a:hover{ a:hover{
cursor: pointer; cursor: pointer;
} }
canvas:hover #main-ws canvas:hover
{ {
cursor: pointer; cursor: pointer;
} }
......
abvw/css/layout/list.css
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
display: table-cell; 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; display: inline-block;
vertical-align: middle; vertical-align: middle;
margin-right: 5px; margin-right: 5px;
...@@ -148,34 +148,26 @@ section.sectionhomelist{ ...@@ -148,34 +148,26 @@ section.sectionhomelist{
a:hover.btn_bott{ a:hover.btn_bott{
} }
#list .wrapper #main .hoge-R .tops .floatR { #list .wrapper_ws #main-ws .hoge-R .tops .floatR {
display: inline; 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; position: absolute;
top: 7px; top: 7px;
left: 12px; 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; position: absolute;
top: 7px; top: 7px;
left: 50px; left: 50px;
} }
/* #list .wrapper_ws #main-ws .hoge-R section .cnt_section_list .text .info .pic li .iconList {
#list .wrapper #main .hoge-R section .cnt_section_list .text .info .pic li .read {
position: absolute; position: absolute;
right: -145px; right: -145px;
display: block; display: block;
top: 15px; top: 15px;
} }
*/ #list .wrapper_ws #main-ws article section .cnt_section_list .text .name .listIcon {
#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 {
display: inline; display: inline;
vertical-align: middle; vertical-align: middle;
margin-right: 5px; margin-right: 5px;
......
abvw/css/layout/list_shiori.css
...@@ -27,7 +27,7 @@ a ...@@ -27,7 +27,7 @@ a
font-size: 12px; font-size: 12px;
} }
.button{ float:right; margin-top:20px; margin-right:2px; } .button{ float:right; margin-top:20px; margin-right:2px; }
.delete { #ws-body .delete {
position: absolute; position: absolute;
top: 27px; top: 27px;
left: 20px; left: 20px;
...@@ -36,23 +36,24 @@ a ...@@ -36,23 +36,24 @@ a
padding: 2px 26px; padding: 2px 26px;
margin-left: 5px; margin-left: 5px;
}.delete:hover { }
#ws-body .delete:hover {
} }
.delete:active { #ws-body .delete:active {
/* position:relative; /* position:relative;
top:1px;*/ top:1px;*/
} }
a.delete:not(:target) { #ws-body a.delete:not(:target) {
/* background-image: url(button_back_off.svg);*/ /* 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);*/ /* background-image: url(button_back_on.svg);*/
} }
.delete_hover { #ws-body .delete_hover {
display: inline-block; display: inline-block;
...@@ -60,9 +61,10 @@ a.delete:hover:not(:target) { ...@@ -60,9 +61,10 @@ a.delete:hover:not(:target) {
margin-left: 5px; margin-left: 5px;
background-position: center top; background-position: center top;
} }
.delete:hover:hover { #ws-body .delete:hover:hover {
}.delete:hover:active { }
#ws-body .delete:hover:active {
/* position:relative; /* position:relative;
top:1px;*/ top:1px;*/
} }
...@@ -179,8 +181,17 @@ a.delete:hover:not(:target) { ...@@ -179,8 +181,17 @@ a.delete:hover:not(:target) {
position: relative; position: relative;
left: -18px; 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 { .cnt_section .text ul.pic li a.read {
margin-top: 42px; /*margin-top: 42px;*/
-moz-border-radius: 6px; -moz-border-radius: 6px;
-webkit-border-radius: 6px; -webkit-border-radius: 6px;
border-radius: 6px; border-radius: 6px;
...@@ -230,17 +241,17 @@ section#bottom { ...@@ -230,17 +241,17 @@ section#bottom {
margin-top: 10px; margin-top: 10px;
display: block; 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; position: absolute;
top: -4px; top: -4px;
left: 1px; 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; position: absolute;
left: 40px; left: 40px;
top: -4px; 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; position: absolute;
right: 20px; right: 20px;
top: 50px; top: 50px;
......
abvw/css/layout/list_shirori_detail.css
...@@ -162,7 +162,7 @@ ...@@ -162,7 +162,7 @@
margin-right: auto; margin-right: auto;
margin-left: auto; margin-left: auto;
padding-top: 124px; padding-top: 124px;
width: 180px; width: 200px;
} }
.sectiondetailnopdf #book_data .book_img { .sectiondetailnopdf #book_data .book_img {
height: 145px; height: 145px;
......
abvw/css/layout/login.css
...@@ -28,6 +28,10 @@ html,body{ ...@@ -28,6 +28,10 @@ html,body{
width:100%; width:100%;
} }
html{
overflow-y:auto;
}
body{ body{
} }
...@@ -59,7 +63,7 @@ body{ ...@@ -59,7 +63,7 @@ body{
width: 100%; width: 100%;
} }
#main{ #main-ws{
width:960px; width:960px;
padding:0; padding:0;
} }
...@@ -155,7 +159,7 @@ section a.loginbtn { ...@@ -155,7 +159,7 @@ section a.loginbtn {
} }
section a.loginbtn:hover { section a.loginbtn:hover {
} }
#login .wrapper #main article section a.loginbtn:active { #login .wrapper #main-ws article section a.loginbtn:active {
position:relative; position:relative;
top:1px; top:1px;
} }
...@@ -198,21 +202,21 @@ section .loginbtn a:hover:not(:target) { ...@@ -198,21 +202,21 @@ section .loginbtn a:hover:not(:target) {
text-align: left; text-align: left;
padding-left:30px; padding-left:30px;
} }
#login .wrapper #main article section table tr td input { #login .wrapper #main-ws article section table tr td input {
width: 240px; width: 240px;
height: 28px; height: 28px;
} }
#login article section table tr th,#login article section table tr td { #login article section table tr th,#login article section table tr td {
padding-bottom: 30px; padding-bottom: 30px;
} }
#login .wrapper #main article section table { #login .wrapper #main-ws article section table {
margin:0 30px ; margin:0 30px ;
} }
#login footer .border .cnt_footer { #login footer .border .cnt_footer {
border: none; border: none;
} }
#login .wrapper #main article img { #login .wrapper #main-ws article img {
margin-right: auto; margin-right: auto;
margin-left: auto; margin-left: auto;
} }
...@@ -238,12 +242,12 @@ section .loginbtn a:hover:not(:target) { ...@@ -238,12 +242,12 @@ section .loginbtn a:hover:not(:target) {
left: 0px; left: 0px;
z-index: 50; z-index: 50;
} }
#login .wrapper #main ul #login .wrapper #main-ws ul
{ {
margin-top:15px; margin-top:15px;
} }
#login .wrapper #main li { #login .wrapper #main-ws li {
display: inline-block; display: inline-block;
margin-right:5px; margin-right:5px;
} }
...@@ -267,7 +271,7 @@ footer{ ...@@ -267,7 +271,7 @@ footer{
.focus{ } .focus{ }
#user_change footer .border .cnt_footer img { display: inline;} #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; margin-top: 20px;
text-align: center; text-align: center;
} }
......
abvw/css/layout/setting.css
...@@ -56,14 +56,14 @@ body{ ...@@ -56,14 +56,14 @@ body{
/* 5. .section setting */ /* 5. .section setting */
/*----------------------------*/ /*----------------------------*/
#main{ #main-ws{
width: 960px; width: 960px;
padding: 0; padding: 0;
margin-right: auto; margin-right: auto;
margin-left: auto; margin-left: auto;
} }
article{ #main-ws article{
width: 960px; width: 960px;
/*height: 900px;*/ /*height: 900px;*/
padding: 0; padding: 0;
......
abvw/css/layout/viewer.css
...@@ -33,6 +33,8 @@ ...@@ -33,6 +33,8 @@
/*----------------------------*/ /*----------------------------*/
/* 1. gloval setting */ /* 1. gloval setting */
/*----------------------------*/ /*----------------------------*/
/*
html{ html{
overflow: hidden; overflow: hidden;
} }
...@@ -46,6 +48,18 @@ body{ ...@@ -46,6 +48,18 @@ body{
margin: 0; margin: 0;
padding: 0; padding: 0;
} }
*/
/*
#viewer {
overflow: hidden;
width:100%;
height:100%;
margin: 0;
padding: 0;
}
*/
/*----------------------------*/ /*----------------------------*/
/* 2. wrapper setting */ /* 2. wrapper setting */
...@@ -64,7 +78,7 @@ body{ ...@@ -64,7 +78,7 @@ body{
/* 3. header setting */ /* 3. header setting */
/*----------------------------*/ /*----------------------------*/
header{ #header_toolbar{
max-width: none; max-width: none;
min-width: 1000px; min-width: 1000px;
height: 60px; height: 60px;
...@@ -258,7 +272,7 @@ header{ ...@@ -258,7 +272,7 @@ header{
/* 5. section setting */ /* 5. section setting */
/*----------------------------*/ /*----------------------------*/
article{ #viewer article{
display:table; display:table;
width:100%; width:100%;
min-height:100%; min-height:100%;
...@@ -268,7 +282,7 @@ article{ ...@@ -268,7 +282,7 @@ article{
margin:0 auto 0; margin:0 auto 0;
} }
section{ #viewer section{
} }
...@@ -931,7 +945,7 @@ aside.MemoIndexBox .indexBoxBody_off{ ...@@ -931,7 +945,7 @@ aside.MemoIndexBox .indexBoxBody_off{
display: block; display: block;
} }
.thumbnail #wrapper .thumbnail
{ {
width: 15%; width: 15%;
height: 100%; height: 100%;
...@@ -1316,8 +1330,8 @@ div .ui-slider-range, .ui-widget-header, .ui-slider-range-max { ...@@ -1316,8 +1330,8 @@ div .ui-slider-range, .ui-widget-header, .ui-slider-range-max {
margin-left: auto; margin-left: auto;
margin-top: auto; margin-top: auto;
padding: 15px; padding: 15px;
z-index: 102; /*z-index: 102;*/
z-index: 101; z-index: 101;
} }
.popuptext_arrow { .popuptext_arrow {
......
abvw/css/theme/bookshelf.css
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
background-position: center center; background-position: center center;
border-radius: 3px 0px 0px 3px; 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{ ...@@ -152,18 +152,18 @@ a:hover.btn_bott{
filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#22466D', endColorstr='#37648C',GradientType=0 ); /* IE6-9 */ 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 {
} }
\ No newline at end of file
abvw/css/theme/common.css
...@@ -15,7 +15,7 @@ form, ul{ } ...@@ -15,7 +15,7 @@ form, ul{ }
li{ } li{ }
img{ } img{ }
#main{ #main-ws{
} }
...@@ -49,4 +49,5 @@ br.clear { } ...@@ -49,4 +49,5 @@ br.clear { }
{ {
color: #fff; color: #fff;
background: #ccc; background: #ccc;
} }
\ No newline at end of file
abvw/css/theme/contentsearch.css
...@@ -190,7 +190,7 @@ a:hover.btn_bott{ ...@@ -190,7 +190,7 @@ a:hover.btn_bott{
.cnt_section_list .text .info .pic li .read { .cnt_section_list .text .info .pic li .read {
} }
section #main-ws section
{ {
border-top: 1px dashed #cccccc; border-top: 1px dashed #cccccc;
} }
......
abvw/css/theme/footer.css
@charset "utf-8"; @charset "utf-8";
/* footer */ /* footer */
footer{ #ws-body footer{
background-color: #EDF2F2; background-color: #EDF2F2;
} }
.cnt_footer{ .cnt_footer{
......
abvw/css/theme/header.css
@charset "utf-8"; @charset "utf-8";
header{ .header_ws{
background-image: url(../../img/common/header_border.jpg) ,url(../../img/common/header_bg.jpg); background-image: url(../../img/common/header_border.jpg) ,url(../../img/common/header_bg.jpg);
background-repeat: repeat-x, repeat; background-repeat: repeat-x, repeat;
background-position: bottom, top; background-position: bottom, top;
...@@ -101,29 +101,28 @@ header{ ...@@ -101,29 +101,28 @@ header{
.cnt_header .menu_language ul.pushMessage a:hover { text-decoration: none; } .cnt_header .menu_language ul.pushMessage a:hover { text-decoration: none; }
header .cnt_header .menu_language ul li a img { display: inline; } .header_ws .cnt_header .menu_language ul li a img { display: inline; }
header .cnt_header .menu_language ul .language { .header_ws .cnt_header .menu_language ul .language {
padding: 0; padding: 0;
margin-left: 0px; margin-left: 0px;
} }
header .cnt_header .menu_language .button .menuIcon img { display: inline; } .header_ws .cnt_header .menu_language .button .menuIcon img { display: inline; }
header .cnt_header .menu_language ul li a#jQueryPush{ .header_ws .cnt_header .menu_language ul li a#jQueryPush{
text-decoration: none !important; text-decoration: none !important;
color:#333; color:#333;
} }
header .cnt_header .menu_language .button { .header_ws .cnt_header .menu_language .button {
} }
.header_ws .cnt_header .menu_language #header-searchbox {
header .cnt_header .menu_language #header-searchbox {
background-color: #FFFFFF; background-color: #FFFFFF;
border: 1px solid #CCCCCC; 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; -moz-box-shadow: inset 0px 1px 0px 0px #86ACC7;
-webkit-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; box-shadow: inset 0px 1px 0px 0px #86ACC7;
...@@ -134,7 +133,7 @@ header .cnt_header .menu_language #header-searchbox a#searchbox-search { ...@@ -134,7 +133,7 @@ header .cnt_header .menu_language #header-searchbox a#searchbox-search {
border: 1px solid #0C274D; border: 1px solid #0C274D;
color: #ffffff; 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:-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% ); background:-moz-linear-gradient( center top, #23486F 5%, #36638B 100% );
filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#23486F', endColorstr='#36638B'); filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#23486F', endColorstr='#36638B');
...@@ -162,8 +161,8 @@ a#searchbox-search:active{ ...@@ -162,8 +161,8 @@ a#searchbox-search:active{
background: url(../../img/common/icon_triangle_d.png) no-repeat right 5px; background: url(../../img/common/icon_triangle_d.png) no-repeat right 5px;
} }
.tops ul.sort li.current a.ascending_sort{ .tops ul.sort li.current a.ascending_sort{
color:#2d83da; color:#2d83da;
background:url(../../img/common/icon_triangle_u.png) no-repeat right 5px; background:url(../../img/common/icon_triangle_u.png) no-repeat right 5px;
} }
.tops ul.sort li b{ .tops ul.sort li b{
font-weight: normal; font-weight: normal;
......
abvw/css/theme/home.css
...@@ -42,7 +42,7 @@ ...@@ -42,7 +42,7 @@
a:hover{ a:hover{
} }
canvas:hover{ #main-ws canvas:hover{
} }
......
abvw/css/theme/list.css
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
border-radius: 0px 3px 3px 0px; 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{ ...@@ -187,18 +187,18 @@ a:hover.btn_bott{
background: linear-gradient(to bottom, #22466D 0%,#37648C) 100%); /* W3C */ background: linear-gradient(to bottom, #22466D 0%,#37648C) 100%); /* W3C */
filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#22466D', endColorstr='#37648C',GradientType=0 ); /* IE6-9 */ 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 {
} }
\ No newline at end of file
abvw/css/theme/list_shiori.css
...@@ -20,7 +20,7 @@ a ...@@ -20,7 +20,7 @@ a
font-size:12px; font-size:12px;
} }
.button{ } .button{ }
.delete { #ws-body .delete {
-moz-box-shadow: inset 0px 1px 0px 0px #C66; -moz-box-shadow: inset 0px 1px 0px 0px #C66;
-webkit-box-shadow: inset 0px 1px 0px 0px #C66; -webkit-box-shadow: inset 0px 1px 0px 0px #C66;
...@@ -40,27 +40,28 @@ a ...@@ -40,27 +40,28 @@ a
text-decoration: none; text-decoration: none;
background-position: center top; 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:-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% ); background:-moz-linear-gradient( center top, #CC0000 5%, #F33 100% );
filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#CC0000', endColorstr='#F33'); filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#CC0000', endColorstr='#F33');
background-color:#F33; background-color:#F33;
} }
.delete:active { #ws-body .delete:active {
} }
a.delete:not(:target) { #ws-body a.delete:not(:target) {
filter: none; filter: none;
-ms-filter: none; -ms-filter: none;
/* background-image: url(button_back_off.svg);*/ /* background-image: url(button_back_off.svg);*/
} }
a.delete:hover:not(:target) { #ws-body a.delete:hover:not(:target) {
filter: none; filter: none;
-ms-filter: none; -ms-filter: none;
/* background-image: url(button_back_on.svg);*/ /* background-image: url(button_back_on.svg);*/
} }
.delete_hover { #ws-body .delete_hover {
-moz-box-shadow: inset 0px 1px 0px 0px #C66; -moz-box-shadow: inset 0px 1px 0px 0px #C66;
-webkit-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; box-shadow: inset 0px 1px 0px 0px #C66;
...@@ -81,12 +82,13 @@ a.delete:hover:not(:target) { ...@@ -81,12 +82,13 @@ a.delete:hover:not(:target) {
line-height: 20px; line-height: 20px;
background-position: center top; 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:-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% ); background:-moz-linear-gradient( center top, #CC0000 5%, #F33 100% );
filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#CC0000', endColorstr='#F33'); filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#CC0000', endColorstr='#F33');
background-color:#F33; background-color:#F33;
}.delete:hover:active { }
#ws-body .delete:hover:active {
} }
...@@ -211,15 +213,15 @@ a.delete:hover:not(:target) { ...@@ -211,15 +213,15 @@ a.delete:hover:not(:target) {
section#bottom { section#bottom {
border-top: 1px dashed #cccccc; 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 .shioriNotExist
{ {
font-size: 16px; font-size: 16px;
color: #f00; color: #f00;
} }
\ No newline at end of file
abvw/css/theme/login.css
...@@ -58,7 +58,7 @@ background:#37648C; ...@@ -58,7 +58,7 @@ background:#37648C;
.wrapper { .wrapper {
} }
#main{ #main-ws{
} }
a a
...@@ -129,7 +129,7 @@ section a.loginbtn:hover { ...@@ -129,7 +129,7 @@ section a.loginbtn:hover {
filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#23486F', endColorstr='#36638B'); filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#23486F', endColorstr='#36638B');
background-color:#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) { section .loginbtn a:not(:target) {
...@@ -174,11 +174,11 @@ section .loginbtn a:hover:not(:target) { ...@@ -174,11 +174,11 @@ section .loginbtn a:hover:not(:target) {
font-size: 14px; font-size: 14px;
font-weight: bolder; 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 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; border-bottom:dotted 1px #BBBBBB;
} }
...@@ -186,7 +186,7 @@ section .loginbtn a:hover:not(:target) { ...@@ -186,7 +186,7 @@ section .loginbtn a:hover:not(:target) {
background: url(../../img/login/login_border.jpg) top repeat-x; background: url(../../img/login/login_border.jpg) top repeat-x;
opacity:0; opacity:0;
} }
#login .wrapper #main article img { #login .wrapper #main-ws article img {
} }
#loader { #loader {
} }
...@@ -195,10 +195,10 @@ section .loginbtn a:hover:not(:target) { ...@@ -195,10 +195,10 @@ section .loginbtn a:hover:not(:target) {
background-color: #000; background-color: #000;
opacity: 0.3; 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{ ...@@ -214,7 +214,7 @@ footer{
.focus{ color: #969696;} .focus{ color: #969696;}
#user_change footer .border .cnt_footer img { } #user_change footer .border .cnt_footer img { }
#login .wrapper #main article section .error { #login .wrapper #main-ws article section .error {
font-size: 13px; font-size: 13px;
color: #FF0000; color: #FF0000;
font-weight: bolder; font-weight: bolder;
......
abvw/css/theme/setting.css
...@@ -54,11 +54,11 @@ body{ ...@@ -54,11 +54,11 @@ body{
/* 5. .section setting */ /* 5. .section setting */
/*----------------------------*/ /*----------------------------*/
#main{ #main-ws{
background-color: #EDF2F2; background-color: #EDF2F2;
} }
article{ #main-ws article{
} }
.sectionSetting{ .sectionSetting{
......
abvw/css/theme/viewer.css
...@@ -32,6 +32,8 @@ ...@@ -32,6 +32,8 @@
/*----------------------------*/ /*----------------------------*/
/* 1. gloval setting */ /* 1. gloval setting */
/*----------------------------*/ /*----------------------------*/
/*
html{ html{
} }
...@@ -45,6 +47,13 @@ body{ ...@@ -45,6 +47,13 @@ body{
background:#898989; background:#898989;
background-image: url(../../img/viewer/article_bg.png); 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 */ /* 2. wrapper setting */
...@@ -60,7 +69,7 @@ body{ ...@@ -60,7 +69,7 @@ body{
/* 3. header setting */ /* 3. header setting */
/*----------------------------*/ /*----------------------------*/
header{ #header_toolbar{
background-image: url(../../img/viewer/header_bg.jpg); background-image: url(../../img/viewer/header_bg.jpg);
background-repeat: repeat-x; background-repeat: repeat-x;
box-shadow:0px 2px 10px 2px #333333; box-shadow:0px 2px 10px 2px #333333;
...@@ -199,11 +208,11 @@ header{ ...@@ -199,11 +208,11 @@ header{
/* 5. section setting */ /* 5. section setting */
/*----------------------------*/ /*----------------------------*/
article{ #viewer article{
background:#999999; background:#999999;
} }
section{ #viewer section{
} }
...@@ -772,7 +781,7 @@ aside.MemoIndexBox .indexBoxBody_off{ ...@@ -772,7 +781,7 @@ aside.MemoIndexBox .indexBoxBody_off{
} }
.thumbnail #wrapper .thumbnail
{ {
box-shadow: 0px 2px 8px 0px #ccc; box-shadow: 0px 2px 8px 0px #ccc;
border:3px solid #fff; border:3px solid #fff;
...@@ -1064,7 +1073,9 @@ div .ui-slider-range, .ui-widget-header, .ui-slider-range-max { ...@@ -1064,7 +1073,9 @@ div .ui-slider-range, .ui-widget-header, .ui-slider-range-max {
border-color:#ccd; border-color:#ccd;
font-family: Verdana; font-family: Verdana;
font-size: 10pt; font-size: 10pt;
border-radius: 10px; border-radius: 10px;
/*word-break: break-all;*/
/*word-wrap: break-word;*/
-moz-box-shadow:-3px 3px 3px #777; -moz-box-shadow:-3px 3px 3px #777;
-webkit-box-shadow:-3px 3px 3px #777; -webkit-box-shadow:-3px 3px 3px #777;
......
abvw/inc_backup.html
...@@ -4,15 +4,17 @@ ...@@ -4,15 +4,17 @@
<p class="message"><label lang="txtLogoutBkMsg" class="lang"><!--ログアウトする前にバックアップしますか？--></label></p> <p class="message"><label lang="txtLogoutBkMsg" class="lang"><!--ログアウトする前にバックアップしますか？--></label></p>
<p class="message-options"> <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 /> <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" name="chkBkAllMarking" 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" name="chkBkAllMemo" 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> <input type="checkbox" name="chkBkAllShiori" id="chkBkAllShiori" class="chkbx" checked="checked" /><label for="chkBkAllShiori" lang="txtBkShiori" class="lang"><!--しおり--></label>
</label> </p>
<!--</label>-->
</p> </p>
<p class="notice"> <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>
<p class="backupbtn"> <p class="backupbtn">
<a class="cancel lang" href="#" lang="dspBkCancel" id="dlgConfirmBackup-withoutbackup"><!--バックアップしないでログアウト--></a> <a class="cancel lang" href="#" lang="dspBkCancel" id="dlgConfirmBackup-withoutbackup"><!--バックアップしないでログアウト--></a>
......
abvw/js/Limit_Access_Content.js
...@@ -6,8 +6,14 @@ LIMIT_ACCESS_CONTENT.messageLevel = {}; ...@@ -6,8 +6,14 @@ LIMIT_ACCESS_CONTENT.messageLevel = {};
LIMIT_ACCESS_CONTENT.checkLimitContent = function(contentId, funcOk, funcCancel, isNotUnlockScreen) { 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 (levelContent == 1) {
if ($('#limit_level1').length <= 0) { if ($('#limit_level1').length <= 0) {
var html = '<section class="sectionLimitAccess" id="limit_level1">'; var html = '<section class="sectionLimitAccess" id="limit_level1">';
......
abvw/js/contentsearch.js
...@@ -22,6 +22,9 @@ CONTENTSEARCH.chkSearchTextEmpty = false; ...@@ -22,6 +22,9 @@ CONTENTSEARCH.chkSearchTextEmpty = false;
CONTENTSEARCH.noRecordFlg = false; CONTENTSEARCH.noRecordFlg = false;
CONTENTSEARCH.home_isMove = false; CONTENTSEARCH.home_isMove = false;
//スクロール復帰
CONTENTSEARCH.scrollTop = 0;
$(document).ready(function(){ $(document).ready(function(){
if (!AVWEB.avwCheckLogin(COMMON.ScreenIds.Login)){ if (!AVWEB.avwCheckLogin(COMMON.ScreenIds.Login)){
...@@ -50,10 +53,9 @@ $(document).ready(function(){ ...@@ -50,10 +53,9 @@ $(document).ready(function(){
CONTENTSEARCH.renderGridView(); CONTENTSEARCH.renderGridView();
//Go To Details Page //Go To Details Page
$('canvas').live('click', CONTENTSEARCH.canvasClickFunction); $('#main-ws canvas').live('click', CONTENTSEARCH.canvasClickFunction);
//$('canvas').live('touchstart', CONTENTSEARCH.canvasClickFunction); $('#main-ws canvas').live('touchend', CONTENTSEARCH.canvasClickFunction);
$('canvas').live('touchend', CONTENTSEARCH.canvasClickFunction); $('#main-ws canvas').live('touchmove', function () { CONTENTSEARCH.home_isMove = true; });
$('canvas').live('touchmove', function () { CONTENTSEARCH.home_isMove = true; });
//Open dialog //Open dialog
$('.dialog').live('click', CONTENTSEARCH.titleClickFunction); $('.dialog').live('click', CONTENTSEARCH.titleClickFunction);
...@@ -86,7 +88,7 @@ $(document).ready(function(){ ...@@ -86,7 +88,7 @@ $(document).ready(function(){
$('#main-search').click(CONTENTSEARCH.searchEventButtonFunction); $('#main-search').click(CONTENTSEARCH.searchEventButtonFunction);
$('#txtSearch').keydown(CONTENTSEARCH.mainSearchKeyDownFunction); $('#txtSearchWs').keydown(CONTENTSEARCH.mainSearchKeyDownFunction);
$('#main-search-content').click(CONTENTSEARCH.mainSearchContentClickFunction); $('#main-search-content').click(CONTENTSEARCH.mainSearchContentClickFunction);
...@@ -116,14 +118,20 @@ $(document).ready(function(){ ...@@ -116,14 +118,20 @@ $(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(); I18N.i18nReplaceText();
$('.datepicker').pickadate({ $('.datepicker').pickadate({
format: 'yyyy-mm-dd' format: 'yyyy-mm-dd'
}); });
}); });
//ビューア、共有表示パーツ読み込み
$("#viewer").load("./inc_contentview.html?__UPDATEID__", function (myData, myStatus, xhr){
//読み込み完了時の処理
I18N.i18nReplaceText();
});
}); });
...@@ -163,7 +171,7 @@ CONTENTSEARCH.initialScreen = function(){ ...@@ -163,7 +171,7 @@ CONTENTSEARCH.initialScreen = function(){
var searchText = ClientData.searchCond_searchText(); var searchText = ClientData.searchCond_searchText();
var searchDivision = ClientData.searchCond_searchDivision(); var searchDivision = ClientData.searchCond_searchDivision();
$('#txtSearch').val(searchText); $('#txtSearchWs').val(searchText);
//ClientData.searchCond_searchText(''); //ClientData.searchCond_searchText('');
if(searchDivision == 1){ if(searchDivision == 1){
...@@ -825,7 +833,10 @@ CONTENTSEARCH.readSubmenuFunction_callback = function(contentId) ...@@ -825,7 +833,10 @@ CONTENTSEARCH.readSubmenuFunction_callback = function(contentId)
} }
else{ else{
//Go to Conten view page //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. //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(){ ...@@ -1098,7 +1109,7 @@ CONTENTSEARCH.searchEventButtonFunction = function(){
var toPage = CONTENTSEARCH.returnNumberDispRecordForList(); var toPage = CONTENTSEARCH.returnNumberDispRecordForList();
var sortType = CONTENTSEARCH.DEFAULT_SORT_TYPE; var sortType = CONTENTSEARCH.DEFAULT_SORT_TYPE;
var sortOrder = CONTENTSEARCH.DEFAULT_SORT_ORDER; var sortOrder = CONTENTSEARCH.DEFAULT_SORT_ORDER;
var searchText = $('#txtSearch').val(); var searchText = $('#txtSearchWs').val();
var searchDivision; var searchDivision;
var content = $('#main-content').attr('checked'); var content = $('#main-content').attr('checked');
var tag = $('#main-tag').attr('checked'); var tag = $('#main-tag').attr('checked');
...@@ -1387,3 +1398,73 @@ CONTENTSEARCH.showContentShareDlgFunction = function(e) { ...@@ -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 @@ ...@@ -2,16 +2,6 @@
//名前空間用のオブジェクトを用意する //名前空間用のオブジェクトを用意する
var CONTENTVIEW_3D = {}; 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){ CONTENTVIEW_3D.createMatrixPoints = function(width, height, _v, _h, imgCurrX, imgCurrY){
var deltaX = width/ _h; var deltaX = width/ _h;
...@@ -317,3 +307,20 @@ CONTENTVIEW_3D.get3DAction = function(lastFrame, currFrame){ ...@@ -317,3 +307,20 @@ CONTENTVIEW_3D.get3DAction = function(lastFrame, currFrame){
return nRet; 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() { ...@@ -122,13 +122,8 @@ CONTENTVIEW_ANKET.resizeAnket = function() {
// set height for anket container // set height for anket container
$('#dialog .anket-container').css('height', iframeHeight); $('#dialog .anket-container').css('height', iframeHeight);
// set overflow for container iframe };
//if (avwUserEnvObj.isIos()) {
// $('#dialog .anket-container').css('overflow', 'scroll'); CONTENTVIEW_ANKET.ready = function(){
// $('#dialog .anket-container').css('-webkit-overflow-scrolling', 'touch');
// //$('#dialog .anket-container').css('display', 'inline-block');
// //$('#dialog iframe').css('display', 'block');
//}
}; };
abvw/js/contentview_ContentTypeNone.js
...@@ -2,11 +2,35 @@ ...@@ -2,11 +2,35 @@
//名前空間用のオブジェクトを用意する //名前空間用のオブジェクトを用意する
var CONTENTVIEW_CONTENTTYPENONE = {}; var CONTENTVIEW_CONTENTTYPENONE = {};
CONTENTVIEW_CONTENTTYPENONE.getJsonContentInfoTyeNone = function() { CONTENTVIEW_CONTENTTYPENONE.getJsonContentInfoTyeNone = function(doneFunc) {
//CONTENTVIEW_CALLAPI.webGetContentData();
CONTENTVIEW_CALLAPI.getSearchDataFromJson(); //CONTENTVIEW_CALLAPI.getSearchDataFromJson();
CONTENTVIEW_CALLAPI.getJsonDataPageTitle(); //CONTENTVIEW_CALLAPI.getJsonDataPageTitle();
CONTENTVIEW_CALLAPI.getDataJsonFile(); //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 //Return a string base 64 image has drawn with specify data
...@@ -35,3 +59,6 @@ CONTENTVIEW_CONTENTTYPENONE.returnImageString = function(data){ ...@@ -35,3 +59,6 @@ CONTENTVIEW_CONTENTTYPENONE.returnImageString = function(data){
return imageUrl; return imageUrl;
}; };
CONTENTVIEW_CONTENTTYPENONE.ready = function(){
};
abvw/js/contentview_GetData.js
...@@ -94,7 +94,7 @@ CONTENTVIEW_GETDATA.getMediaType1 = function(iValueObj) { ...@@ -94,7 +94,7 @@ CONTENTVIEW_GETDATA.getMediaType1 = function(iValueObj) {
* Action Type = 10 : content * Action Type = 10 : content
* Action Type = 11 : html * Action Type = 11 : html
*/ */
var pageObject = []; var pageObject = [];
pageObject['mediaType'] = iValueObj.mediaType; pageObject['mediaType'] = iValueObj.mediaType;
...@@ -893,7 +893,18 @@ CONTENTVIEW_GETDATA.getBookmarklist = function(pos) { ...@@ -893,7 +893,18 @@ CONTENTVIEW_GETDATA.getBookmarklist = function(pos) {
//title start //title start
$('#bookmarkBoxHdBM').children().remove(); $('#bookmarkBoxHdBM').children().remove();
$('#bookmarkBoxHdBM').html('<a id="bookmarkClosing" class="delete" > </a>'); $('#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')); $('#bookmarkBoxHdBM').append(I18N.i18nText('txtShioriCtnLs'));
//title end //title end
//COMMON.lockLayout(); //COMMON.lockLayout();
...@@ -927,7 +938,19 @@ CONTENTVIEW_GETDATA.getPageIndexJson = function(pos) { ...@@ -927,7 +938,19 @@ CONTENTVIEW_GETDATA.getPageIndexJson = function(pos) {
//title start //title start
$('#indexBoxHdIndex').children().remove(); $('#indexBoxHdIndex').children().remove();
$('#indexBoxHdIndex').html('<a id="indexClosing" class="delete" > </a>'); $('#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')); $('#indexBoxHdIndex').append(I18N.i18nText('txtIndex'));
//title end //title end
//COMMON.lockLayout(); //COMMON.lockLayout();
...@@ -983,7 +1006,19 @@ CONTENTVIEW_GETDATA.getPageIndexJson = function(pos) { ...@@ -983,7 +1006,19 @@ CONTENTVIEW_GETDATA.getPageIndexJson = function(pos) {
//title start //title start
$('#indexBoxHdIndex').children().remove(); $('#indexBoxHdIndex').children().remove();
$('#indexBoxHdIndex').html('<a id="indexClosing" class="delete" > </a>'); $('#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')); $('#indexBoxHdIndex').append(I18N.i18nText('txtIndex'));
//title end //title end
//COMMON.lockLayout(); //COMMON.lockLayout();
...@@ -1132,7 +1167,7 @@ CONTENTVIEW_GETDATA.getContentInfoTypeImage = function(){ ...@@ -1132,7 +1167,7 @@ CONTENTVIEW_GETDATA.getContentInfoTypeImage = function(){
}; };
//End: TRB00019 - Editor : Long - Date : 28/08/2013 - Summary : Fix for android resize //End: TRB00019 - Editor : Long - Date : 28/08/2013 - Summary : Fix for android resize
CONTENTVIEW_GENERAL.resourceImage.src = resourceUrl; CONTENTVIEW_GENERAL.resourceImage.src = resourceUrl;
}; };
CONTENTVIEW_GETDATA.getContentDataForImageType = function(){ CONTENTVIEW_GETDATA.getContentDataForImageType = function(){
...@@ -1213,20 +1248,22 @@ CONTENTVIEW_GETDATA.renderNextPage = function(){ ...@@ -1213,20 +1248,22 @@ CONTENTVIEW_GETDATA.renderNextPage = function(){
//Get next page background image //Get next page background image
if(CONTENTVIEW_GENERAL.contentType == COMMON.ContentTypeKeys.Type_PDF){ if(CONTENTVIEW_GENERAL.contentType == COMMON.ContentTypeKeys.Type_PDF){
//console.log("CONTENTVIEW_GETDATA.renderNextPage"); //console.log("CONTENTVIEW_GETDATA.renderNextPage");
AVWEB.avwGrabContentPageImage(ClientData.userInfo_accountPath(), 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) { function (data) {
CONTENTVIEW_GENERAL.nextPageImage = data; CONTENTVIEW_GENERAL.nextPageImage = data;
CONTENTVIEW_GENERAL.nextContent.setPageImages(CONTENTVIEW_GENERAL.totalPage, CONTENTVIEW_GENERAL.nextPageImage) CONTENTVIEW_GENERAL.nextContent.setPageImages(CONTENTVIEW_GENERAL.totalPage, CONTENTVIEW_GENERAL.nextPageImage)
.setPageObjects(CONTENTVIEW_GENERAL.nextPageObjects) .setPageObjects(CONTENTVIEW_GENERAL.nextPageObjects)
.nextPage(); .nextPage();
}, },
function (xmlHttpRequest, txtStatus, errorThrown) { function (xmlHttpRequest, txtStatus, errorThrown) {
CONTENTVIEW.showErrorScreen(); CONTENTVIEW.showErrorScreen();
}); }
);
} }
//Start Function : No.12 - Editor : Long - Date : 08/28/2013 - Summary : Render next page content image the same with the current one //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){ else if(CONTENTVIEW_GENERAL.contentType == COMMON.ContentTypeKeys.Type_NoFile){
...@@ -1248,20 +1285,20 @@ CONTENTVIEW_GETDATA.renderPrevPage = function(){ ...@@ -1248,20 +1285,20 @@ CONTENTVIEW_GETDATA.renderPrevPage = function(){
//Get prev page background image //Get prev page background image
if(CONTENTVIEW_GENERAL.contentType == COMMON.ContentTypeKeys.Type_PDF){ if(CONTENTVIEW_GENERAL.contentType == COMMON.ContentTypeKeys.Type_PDF){
//console.log("CONTENTVIEW_GETDATA.renderPrevPage"); //console.log("CONTENTVIEW_GETDATA.renderPrevPage");
AVWEB.avwGrabContentPageImage(ClientData.userInfo_accountPath(), 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) { function (data) {
CONTENTVIEW_GENERAL.prevPageImage = data; CONTENTVIEW_GENERAL.prevPageImage = data;
CONTENTVIEW_GENERAL.prevContent.setPageImages(CONTENTVIEW_GENERAL.totalPage, CONTENTVIEW_GENERAL.prevPageImage)
CONTENTVIEW_GENERAL.prevContent.setPageImages(CONTENTVIEW_GENERAL.totalPage, CONTENTVIEW_GENERAL.prevPageImage)
.setPageObjects(CONTENTVIEW_GENERAL.prevPageObjects) .setPageObjects(CONTENTVIEW_GENERAL.prevPageObjects)
.previousPage(); .previousPage();
},
}, function (xmlHttpRequest, txtStatus, errorThrown) {
function (xmlHttpRequest, txtStatus, errorThrown) { CONTENTVIEW.showErrorScreen();
CONTENTVIEW.showErrorScreen(); }
}); );
} }
else if(CONTENTVIEW_GENERAL.contentType == COMMON.ContentTypeKeys.Type_NoFile){ else if(CONTENTVIEW_GENERAL.contentType == COMMON.ContentTypeKeys.Type_NoFile){
CONTENTVIEW_GENERAL.prevPageImage = CONTENTVIEW_GENERAL.pageImages; CONTENTVIEW_GENERAL.prevPageImage = CONTENTVIEW_GENERAL.pageImages;
...@@ -1584,3 +1621,7 @@ CONTENTVIEW_GETDATA.getPageTransitionConfig = function(){ ...@@ -1584,3 +1621,7 @@ CONTENTVIEW_GETDATA.getPageTransitionConfig = function(){
}; };
//End Function: No.4 - Editor : Long - Summary : Render Next Page Content //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){ ...@@ -206,6 +206,10 @@ CONTENTVIEW_GOMU.touchStart_BtnCancel_Gomu = function(e){
// Setting dialog // Setting dialog
$(function () { $(function () {
//CONTENTVIEW_GOMU.ready();
});
CONTENTVIEW_GOMU.ready = function(){
// --------------------------------- // ---------------------------------
// Setup for easer [start] // Setup for easer [start]
// --------------------------------- // ---------------------------------
...@@ -218,15 +222,80 @@ $(function () { ...@@ -218,15 +222,80 @@ $(function () {
} }
} }
$("#dlgGomu_dspOK").click(CONTENTVIEW_GOMU.dlgGomu_dspOK_click); //$("#dlgGomu_dspOK").click(CONTENTVIEW_GOMU.dlgGomu_dspOK_click);
$("#dlgGomu_dspCancel").click(CONTENTVIEW_GOMU.dlgGomu_dspCancel_click); $("#dlgGomu_dspOK").on({
'click touchend': function(ev){
CONTENTVIEW_GOMU.dlgGomu_dspOK_click(ev);
return false;
},
'touchstart touchmove': function(){
//これを入れないと次にダイアログを開くと表示位置が大きくズレる
return false;
}
});
$("#text_dlgGomu_rdo1").click(CONTENTVIEW_GOMU.dlgGomu_rdo1_text_click); //$("#dlgGomu_dspCancel").click(CONTENTVIEW_GOMU.dlgGomu_dspCancel_click);
$("#text_dlgGomu_rdo2").click(CONTENTVIEW_GOMU.dlgGomu_rdo2_text_click); $("#dlgGomu_dspCancel").on({
$("#text_dlgGomu_rdo3").click(CONTENTVIEW_GOMU.dlgGomu_rdo3_text_click); 'click touchend': function(ev){
$("#text_dlgGomu_rdo4").click(CONTENTVIEW_GOMU.dlgGomu_rdo4_text_click); 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 ] /// Eraser group [ end ]
......
abvw/js/contentview_ImagePreview.js
...@@ -2,21 +2,6 @@ ...@@ -2,21 +2,6 @@
//名前空間用のオブジェクトを用意する //名前空間用のオブジェクトを用意する
var CONTENTVIEW_IMAGEPREVIEW = {}; 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.refreshSlideShowValue = function(){
CONTENTVIEW_IMAGEPREVIEW.slideshowImgFrom = 0; CONTENTVIEW_IMAGEPREVIEW.slideshowImgFrom = 0;
...@@ -471,3 +456,24 @@ CONTENTVIEW_IMAGEPREVIEW.handleDispNextPrevButton = function(){ ...@@ -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_Maker.js
...@@ -6,11 +6,6 @@ ...@@ -6,11 +6,6 @@
//名前空間用のオブジェクトを用意する //名前空間用のオブジェクトを用意する
var CONTENTVIEW_MAKER = {}; 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.ShowMaker = function(targetId){
CONTENTVIEW_MAKER.maker_targetDiv = targetId; CONTENTVIEW_MAKER.maker_targetDiv = targetId;
I18N.i18nReplaceText(); I18N.i18nReplaceText();
...@@ -50,17 +45,93 @@ CONTENTVIEW_MAKER.Maker_handleColorPickerEvent = function (){ ...@@ -50,17 +45,93 @@ CONTENTVIEW_MAKER.Maker_handleColorPickerEvent = function (){
$('#makerColorwrapper').bind('mouseleave', CONTENTVIEW_MAKER.Maker_colorWrapperMouseLeaveFunction); $('#makerColorwrapper').bind('mouseleave', CONTENTVIEW_MAKER.Maker_colorWrapperMouseLeaveFunction);
} }
$('#Maker_btnOk').live('click', CONTENTVIEW_MAKER.Maker_dspOK_click); //$('#Maker_btnOk').live('click', CONTENTVIEW_MAKER.Maker_dspOK_click);
$('#Maker_btnCancel').live('click', CONTENTVIEW_MAKER.Maker_dspCancel_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(); CONTENTVIEW_MAKER.Maker_SetDefaultValue();
$('#marker-small-text').live('click', CONTENTVIEW_MAKER.markerSmallTextClick); //$('#marker-small-text').live('click', CONTENTVIEW_MAKER.markerSmallTextClick);
$('#marker-medium-text').live('click', CONTENTVIEW_MAKER.markerMediumTextClick); $("#marker-small-text").on({
$('#marker-large-text').live('click', CONTENTVIEW_MAKER.markerLargeTextClick); 'click touchend': function(ev){
$('#marker-oversize-text').live('click', CONTENTVIEW_MAKER.markerOversizeTextClick); 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').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(){ CONTENTVIEW_MAKER.markerSmallTextClick = function(){
...@@ -290,6 +361,16 @@ CONTENTVIEW_MAKER.Maker_colorWrapperMouseLeaveFunction = function() { ...@@ -290,6 +361,16 @@ CONTENTVIEW_MAKER.Maker_colorWrapperMouseLeaveFunction = function() {
//END FIXCSS //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 ] /// Maker group [ end ]
/// =============================================================================================== /// ===============================================================================================
abvw/js/contentview_Marking.js
...@@ -250,7 +250,7 @@ CONTENTVIEW_MARKING.dlgMarking_imgMakerOption_click = function() { ...@@ -250,7 +250,7 @@ CONTENTVIEW_MARKING.dlgMarking_imgMakerOption_click = function() {
$('#dlgMarking_imgMakerOption').removeClass(); $('#dlgMarking_imgMakerOption').removeClass();
$('#dlgMarking_imgMakerOption').addClass('maker_option_selected'); $('#dlgMarking_imgMakerOption').addClass('maker_option_selected');
setDefaultImageForMarking(); CONTENTVIEW_MARKING.setDefaultImageForMarking();
}; };
CONTENTVIEW_MARKING.dlgMarking_imgEraser_click = function() { CONTENTVIEW_MARKING.dlgMarking_imgEraser_click = function() {
...@@ -458,21 +458,156 @@ CONTENTVIEW_MARKING.ShowMarking = function() { ...@@ -458,21 +458,156 @@ CONTENTVIEW_MARKING.ShowMarking = function() {
// Setting dialog // Setting dialog
$(function () { $(function () {
//CONTENTVIEW_MARKING.ready();
});
CONTENTVIEW_MARKING.ready = function(){
$("#dlgMarking_dspSave").click(CONTENTVIEW_MARKING.dlgMarking_dspSave_click); //$("#dlgMarking_dspSave").click(CONTENTVIEW_MARKING.dlgMarking_dspSave_click);
$("#dlgMarking_dspCancel").click(CONTENTVIEW_MARKING.dlgMarking_dspCancel_click); $("#dlgMarking_dspSave").on({
$("#dlgMarking_dspPgClear").click(CONTENTVIEW_MARKING.dlgMarking_dspPgClear_click); 'click touchend': function(ev){
CONTENTVIEW_MARKING.dlgMarking_dspSave_click(ev);
return false;
},
'touchstart touchmove': function(){
//これを入れないと次にダイアログを開くと表示位置が大きくズレる
return false;
}
});
//$("#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 // Icons
$("#dlgMarking_imgMin").click(CONTENTVIEW_MARKING.dlgMarking_imgMin_click); //$("#dlgMarking_imgMin").click(CONTENTVIEW_MARKING.dlgMarking_imgMin_click);
$("#dlgMarking_imgMax").click(CONTENTVIEW_MARKING.dlgMarking_imgMax_click); $("#dlgMarking_imgMin").on({
$("#dlgMarking_imgClose").click(CONTENTVIEW_MARKING.dlgMarking_imgClose_click); 'click touchend': function(ev){
$("#dlgMarking_imgPen").click(CONTENTVIEW_MARKING.dlgMarking_imgPen_click); CONTENTVIEW_MARKING.dlgMarking_imgMin_click(ev);
$("#dlgMarking_imgPenOption").click(CONTENTVIEW_MARKING.dlgMarking_imgPenOption_click); return false;
$("#dlgMarking_imgMaker").click(CONTENTVIEW_MARKING.dlgMarking_imgMaker_click); },
$("#dlgMarking_imgMakerOption").click(CONTENTVIEW_MARKING.dlgMarking_imgMakerOption_click); 'touchstart touchmove': function(){
$("#dlgMarking_imgEraser").click(CONTENTVIEW_MARKING.dlgMarking_imgEraser_click); //これを入れないと次にダイアログを開くと表示位置が大きくズレる
$("#dlgMarking_imgEraserOption").click(CONTENTVIEW_MARKING.dlgMarking_imgEraserOption_click); 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({ $('#dlgMarking').dialog({
autoOpen: false, autoOpen: false,
...@@ -486,9 +621,9 @@ $(function () { ...@@ -486,9 +621,9 @@ $(function () {
$('#dlgMarking').draggable({ $('#dlgMarking').draggable({
revert: false revert: false
}); });
};
});
/// =============================================================================================== /// ===============================================================================================
/// Marking group [ end ] /// Marking group [ end ]
/// =============================================================================================== /// ===============================================================================================
......
abvw/js/contentview_Memo.js
...@@ -2,23 +2,13 @@ ...@@ -2,23 +2,13 @@
//名前空間用のオブジェクトを用意する //名前空間用のオブジェクトを用意する
var CONTENTVIEW_MEMO = {}; 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.createMemoDialog = function(){
CONTENTVIEW_MEMO.targetDiv.show(); CONTENTVIEW_MEMO.targetDiv.show();
CONTENTVIEW_MEMO.targetDiv.html(''); CONTENTVIEW_MEMO.targetDiv.html('');
CONTENTVIEW_MEMO.targetDiv.append( CONTENTVIEW_MEMO.targetDiv.append(
'<aside id="memoWrapper" class="MemoIndexBox">' '<aside id="memoWrapper" class="MemoIndexBox">'
+ ' <h1 class="indexBoxHd">' + I18N.i18nText('txtMemo') + ' <h1 class="indexBoxHd">' + I18N.i18nText('txtMemo')
+' <a class="delete"></a>' +' <a id="memoClosing2" class="delete"></a>'
+' </h1>' +' </h1>'
+' <div id="memoArea" class="indexBoxBody_on">' +' <div id="memoArea" class="indexBoxBody_on">'
+' <textarea id="txaMemoContent" style="resize: none; height: 302px; width: 452px; margin-bottom: 10px"></textarea>' +' <textarea id="txaMemoContent" style="resize: none; height: 302px; width: 452px; margin-bottom: 10px"></textarea>'
...@@ -39,7 +29,18 @@ CONTENTVIEW_MEMO.handleMemoEventFunction = function(){ ...@@ -39,7 +29,18 @@ CONTENTVIEW_MEMO.handleMemoEventFunction = function(){
$('#Memo_btnSave').click(CONTENTVIEW_MEMO.buttonSaveFunction); $('#Memo_btnSave').click(CONTENTVIEW_MEMO.buttonSaveFunction);
$('#Memo_btnDel').click(CONTENTVIEW_MEMO.MemoDelFunction); $('#Memo_btnDel').click(CONTENTVIEW_MEMO.MemoDelFunction);
$('#Memo_btnCancel').click(CONTENTVIEW_MEMO.MemoCancelFunction); $('#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(){ CONTENTVIEW_MEMO.memoSaveFunction = function(){
...@@ -92,15 +93,17 @@ CONTENTVIEW_MEMO.MemoDelFunction = function(){ ...@@ -92,15 +93,17 @@ CONTENTVIEW_MEMO.MemoDelFunction = function(){
CONTENTVIEW_GENERAL.isCopyMemo = false; CONTENTVIEW_GENERAL.isCopyMemo = false;
} }
else{ else{
var resultArr = ClientData.MemoData(); var resultArr = ClientData.MemoData();
resultArr.splice(CONTENTVIEW_MEMO.EditIndex, 1); resultArr.splice(CONTENTVIEW_MEMO.EditIndex, 1);
ClientData.MemoData(resultArr); ClientData.MemoData(resultArr);
//CONTENTVIEW_MEMO.targetDiv.dialog('close'); //CONTENTVIEW_MEMO.targetDiv.dialog('close');
if(CONTENTVIEW_MEMO.memoCallbackFunc){ //if(CONTENTVIEW_MEMO.memoCallbackFunc){
CONTENTVIEW_MEMO.memoCallbackFunc(); // CONTENTVIEW_MEMO.memoCallbackFunc();
} //}
} }
$("#overlay").hide(); $("#overlay").hide();
CONTENTVIEW_MEMO.targetDiv.children().remove(); CONTENTVIEW_MEMO.targetDiv.children().remove();
...@@ -115,7 +118,8 @@ CONTENTVIEW_MEMO.MemoDelFunction = function(){ ...@@ -115,7 +118,8 @@ CONTENTVIEW_MEMO.MemoDelFunction = function(){
//END TRB00054 - EDITOR : Long - Date : 09/19/2013 - Summary : Fix for remove loading icon when del memo //END TRB00054 - EDITOR : Long - Date : 09/19/2013 - Summary : Fix for remove loading icon when del memo
/* enable controls after finish copy */ /* enable controls after finish copy */
CONTENTVIEW.enableControlsCopyMemo(); CONTENTVIEW.enableControlsCopyMemo();
}; };
CONTENTVIEW_MEMO.MemoCancelFunction = function(){ CONTENTVIEW_MEMO.MemoCancelFunction = function(){
...@@ -293,3 +297,20 @@ CONTENTVIEW_MEMO.editJqueryUIDialog = function(){ ...@@ -293,3 +297,20 @@ CONTENTVIEW_MEMO.editJqueryUIDialog = function(){
CONTENTVIEW_MEMO.targetDiv.parent().addClass('parentMemoDialogImportantCss'); 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) { ...@@ -445,3 +445,6 @@ CONTENTVIEW_PAINT.drawPoint = function(coors, context_draw) {
} }
}; };
CONTENTVIEW_PAINT.ready = function(){
};
abvw/js/contentview_Pen.js
...@@ -5,11 +5,6 @@ ...@@ -5,11 +5,6 @@
//名前空間用のオブジェクトを用意する //名前空間用のオブジェクトを用意する
var CONTENTVIEW_PEN = {}; 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.ShowPen = function(targetId) {
CONTENTVIEW_PEN.pen_targetDiv = targetId; CONTENTVIEW_PEN.pen_targetDiv = targetId;
I18N.i18nReplaceText(); I18N.i18nReplaceText();
...@@ -54,17 +49,95 @@ CONTENTVIEW_PEN.Pen_handleColorPickerEvent = function() { ...@@ -54,17 +49,95 @@ CONTENTVIEW_PEN.Pen_handleColorPickerEvent = function() {
$('#penColorwrapper').bind('mouseleave', CONTENTVIEW_PEN.Pen_colorWrapperMouseLeaveFunction); $('#penColorwrapper').bind('mouseleave', CONTENTVIEW_PEN.Pen_colorWrapperMouseLeaveFunction);
} }
$('#Pen_btnOk').live('click', CONTENTVIEW_PEN.Pen_dspOK_click); //$('#Pen_btnOk').live('click', CONTENTVIEW_PEN.Pen_dspOK_click);
$('#Pen_btnCancel').live('click', CONTENTVIEW_PEN.Pen_dspCancel_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(); CONTENTVIEW_PEN.Pen_SetDefaultValue();
$('#pen-small-text').live('click', CONTENTVIEW_PEN.penSmallTextClick); //$('#pen-small-text').live('click', CONTENTVIEW_PEN.penSmallTextClick);
$('#pen-medium-text').live('click', CONTENTVIEW_PEN.penMediumTextClick); $("#pen-small-text").on({
$('#pen-large-text').live('click', CONTENTVIEW_PEN.penLargeTextClick); 'click touchend': function(ev){
$('#pen-oversize-text').live('click', CONTENTVIEW_PEN.penOversizeTextClick); 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').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(){ CONTENTVIEW_PEN.penSmallTextClick = function(){
...@@ -293,3 +366,13 @@ CONTENTVIEW_PEN.Pen_colorWrapperMouseLeaveFunction = function() { ...@@ -293,3 +366,13 @@ CONTENTVIEW_PEN.Pen_colorWrapperMouseLeaveFunction = function() {
//END FIXCSS //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 @@ ...@@ -2,9 +2,6 @@
//名前空間用のオブジェクトを用意する //名前空間用のオブジェクトを用意する
var CONTENTVIEW_POPUPTEXT = {}; var CONTENTVIEW_POPUPTEXT = {};
CONTENTVIEW_POPUPTEXT.popuptext_dialogDiv;
CONTENTVIEW_POPUPTEXT.popuptext_arrowDiv;
///ShowDialog ///ShowDialog
///direction: arrow value: 0: top right ///direction: arrow value: 0: top right
/// 1: bottom right /// 1: bottom right
...@@ -116,3 +113,12 @@ CONTENTVIEW_POPUPTEXT.MailTo = function(email, subject) { ...@@ -116,3 +113,12 @@ CONTENTVIEW_POPUPTEXT.MailTo = function(email, subject) {
window.open("mailto:" + email + "?subject=" + subject, '_self'); 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() { ...@@ -49,7 +49,9 @@ DETAIL.openContentDetail = function() {
$("#txtPubDt2_Dsp").text(''); $("#txtPubDt2_Dsp").text('');
$("#txtContentDetail").text(''); $("#txtContentDetail").text('');
$("#contentDetailClose").unbind("click");
$("#contentDetailClose").click(DETAIL.contentDetailClose_Click); $("#contentDetailClose").click(DETAIL.contentDetailClose_Click);
$("#contentdetail_dspRead").unbind("click");
$("#contentdetail_dspRead").click(DETAIL.contentdetail_dspRead_Click); $("#contentdetail_dspRead").click(DETAIL.contentdetail_dspRead_Click);
//if( ClientData.serviceOpt_content_share() != '2'){ //if( ClientData.serviceOpt_content_share() != '2'){
...@@ -70,8 +72,14 @@ DETAIL.openContentDetail = function() { ...@@ -70,8 +72,14 @@ DETAIL.openContentDetail = function() {
DETAIL.displayData.contentID = ClientData.contentInfo_contentId(); DETAIL.displayData.contentID = ClientData.contentInfo_contentId();
DETAIL.displayData.contentThumbnail = ClientData.contentInfo_contentThumbnail(); DETAIL.displayData.contentThumbnail = ClientData.contentInfo_contentThumbnail();
var params = {
sid: ClientData.userInfo_sid(),
getType: '1',
contentId: DETAIL.displayData.contentID
};
// Get content detail // 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) { function (data) {
var contentType = ClientData.contentInfo_contentType(); var contentType = ClientData.contentInfo_contentType();
// Get content detail // Get content detail
...@@ -115,7 +123,9 @@ DETAIL.openContentDetail = function() { ...@@ -115,7 +123,9 @@ DETAIL.openContentDetail = function() {
// Close content detail // Close content detail
DETAIL.contentDetailClose_Click = function(e) { DETAIL.contentDetailClose_Click = function(e) {
e.preventDefault(); if( e != null ){
e.preventDefault();
}
COMMON.unlockLayout(); COMMON.unlockLayout();
$("#contentDetail").hide(); $("#contentDetail").hide();
$("#sectionContentDetail").hide(); $("#sectionContentDetail").hide();
...@@ -201,7 +211,23 @@ DETAIL.contentdetail_dspRead_Click_callback = function(outputId) { ...@@ -201,7 +211,23 @@ DETAIL.contentdetail_dspRead_Click_callback = function(outputId) {
HEADER.viewLinkContentById(ClientData.contentInfo_contentId()); HEADER.viewLinkContentById(ClientData.contentInfo_contentId());
} }
else { 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) { ...@@ -218,6 +244,7 @@ DETAIL.showContentNotPDF = function(displayData) {
SHARE.contentId = displayData.contentID; SHARE.contentId = displayData.contentID;
SHARE.contentTitle = displayData.contentTitle; SHARE.contentTitle = displayData.contentTitle;
$("#contentdetail_dspShare").show(); $("#contentdetail_dspShare").show();
$("#contentdetail_dspShare").unbind("click");
$("#contentdetail_dspShare").click(SHARE.openContentShare); $("#contentdetail_dspShare").click(SHARE.openContentShare);
} }
...@@ -273,6 +300,7 @@ DETAIL.showContent = function(displayData) { ...@@ -273,6 +300,7 @@ DETAIL.showContent = function(displayData) {
SHARE.contentId = displayData.contentID; SHARE.contentId = displayData.contentID;
SHARE.contentTitle = displayData.contentTitle; SHARE.contentTitle = displayData.contentTitle;
$("#contentdetail_dspShare").show(); $("#contentdetail_dspShare").show();
$("#contentdetail_dspShare").unbind("click");
$("#contentdetail_dspShare").click(SHARE.openContentShare); $("#contentdetail_dspShare").click(SHARE.openContentShare);
} }
......
abvw/js/header.js
...@@ -837,11 +837,25 @@ HEADER.getTimeWaitCheckNewPushMessage = function() ...@@ -837,11 +837,25 @@ HEADER.getTimeWaitCheckNewPushMessage = function()
// get message new // get message new
HEADER.getPushMessageNew = function() HEADER.getPushMessageNew = function()
{ {
//$('.notification-pushmessage').hide(); //ロック中かビューア画面ならチェックしない
var params = { "sid": ClientData.userInfo_sid()}; if ($("#viewer").length) {
AVWEB.avwCmsApi(ClientData.userInfo_accountPath(), "webPushMessageNew", "post", params, //表示状態か
HEADER.callbackGetPushMessageNewSuccess, if( $('#viewer').is(':visible')){
function (xhr, b, c) { }); return;
}
}
//$('.notification-pushmessage').hide();
var params = {
"sid": ClientData.userInfo_sid()
};
AVWEB.avwCmsApi(
ClientData.userInfo_accountPath(),
"webPushMessageNew",
"post",
params,
HEADER.callbackGetPushMessageNewSuccess,
function (xhr, b, c) { }
);
}; };
// callback get number new message success // callback get number new message success
...@@ -892,21 +906,27 @@ HEADER.getPushMessageList = function() { ...@@ -892,21 +906,27 @@ HEADER.getPushMessageList = function() {
var from = (HEADER.currentPagePushMessage - 1) * pushPageCount + 1; var from = (HEADER.currentPagePushMessage - 1) * pushPageCount + 1;
var to = HEADER.currentPagePushMessage * pushPageCount; var to = HEADER.currentPagePushMessage * pushPageCount;
var params = { "sid": ClientData.userInfo_sid(), "recordFrom": from, "recordTo": to }; var params = {
AVWEB.avwCmsApiSync(ClientData.userInfo_accountPath(), "webPushMessageList", "post", params, "sid": ClientData.userInfo_sid(),
function (data) { "recordFrom": from,
"recordTo": to
// reset number message };
ClientData.pushInfo_newMsgNumber(0); AVWEB.avwCmsApiSync(
ClientData.userInfo_accountPath(),
// hide number new message "webPushMessageList",
$('#numbermessage').html(''); "post",
params,
HEADER.showListPushMessage(data); function (data) {
}, // reset number message
function (xhr, b, c) { ClientData.pushInfo_newMsgNumber(0);
AVWEB.showSystemError(); // hide number new message
}); $('#numbermessage').html('');
HEADER.showListPushMessage(data);
},
function (xhr, b, c) {
AVWEB.showSystemError();
}
);
}; };
// get string from date crate pushmessage // get string from date crate pushmessage
...@@ -1060,21 +1080,25 @@ HEADER.downloadResourceById = function(contentId){ ...@@ -1060,21 +1080,25 @@ HEADER.downloadResourceById = function(contentId){
getType: '2' getType: '2'
}; };
AVWEB.avwCmsApiSync(ClientData.userInfo_accountPath(), "webGetContent", "get", params, AVWEB.avwCmsApiSync(ClientData.userInfo_accountPath(), "webGetContent", "get", params,
function (data) { function (data) {
//Get resourceurl //Get resourceurl
var resourceUrl = HEADER.getResourceByIdFromAPI(data.contentData.content.resourceId); if( data.contentData.content ){
var resourceUrl = HEADER.getResourceByIdFromAPI(data.contentData.content.resourceId);
// open url to download file // open url to download file
if (HEADER.isSafariNotOnIpad()) { if (HEADER.isSafariNotOnIpad()) {
window.onbeforeunload = null; window.onbeforeunload = null;
window.open(resourceUrl, "_self"); // open url to download file on safari not for ipad window.open(resourceUrl, "_self"); // open url to download file on safari not for ipad
var toogleTime = setTimeout(function () { COMMON.ToogleLogoutNortice() }, 200); var toogleTime = setTimeout(function () { COMMON.ToogleLogoutNortice() }, 200);
} }
else { else {
window.open(resourceUrl); //open url to download file on orther browser window.open(resourceUrl); //open url to download file on orther browser
} }
}, } else {
function (xhr, b, c) { }); alert("ダウンロード出来ません。");
}
},
function (xhr, b, c) { }
);
}; };
//Download resource //Download resource
......
abvw/js/history.js
...@@ -23,6 +23,8 @@ HISTORY.contentViewData = []; ...@@ -23,6 +23,8 @@ HISTORY.contentViewData = [];
HISTORY.noRecordFlg = false; HISTORY.noRecordFlg = false;
HISTORY.home_isMove = false; HISTORY.home_isMove = false;
HISTORY.history_contentTitleKana = []; HISTORY.history_contentTitleKana = [];
//スクロール復帰
HISTORY.scrollTop = 0;
$(document).ready(function(){ $(document).ready(function(){
...@@ -49,10 +51,9 @@ $(document).ready(function(){ ...@@ -49,10 +51,9 @@ $(document).ready(function(){
HISTORY.renderGridView(); HISTORY.renderGridView();
//Go To Details Page //Go To Details Page
$('canvas').live('click', HISTORY.canvasClickFunction); $('#main-ws canvas').live('click', HISTORY.canvasClickFunction);
//$('canvas').live('touchstart', HISTORY.canvasClickFunction); $('#main-ws canvas').live('touchend', HISTORY.canvasClickFunction);
$('canvas').live('touchend', HISTORY.canvasClickFunction); $('#main-ws canvas').live('touchmove', function () { HISTORY.home_isMove = true; });
$('canvas').live('touchmove', function () { HISTORY.home_isMove = true; });
//Open dialog //Open dialog
...@@ -104,7 +105,7 @@ $(document).ready(function(){ ...@@ -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(); I18N.i18nReplaceText();
$('.datepicker').pickadate({ $('.datepicker').pickadate({
...@@ -112,6 +113,12 @@ $(document).ready(function(){ ...@@ -112,6 +113,12 @@ $(document).ready(function(){
}); });
}); });
//ビューア、共有表示パーツ読み込み
$("#viewer").load("./inc_contentview.html?__UPDATEID__", function (myData, myStatus, xhr){
//読み込み完了時の処理
I18N.i18nReplaceText();
});
}); });
//Call API //Call API
...@@ -177,7 +184,8 @@ HISTORY.renderContent = function(id, text, division, type, order, from, to, cate ...@@ -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>'; shareHtml ='<li><a class="read lang button-share" contentid="' + post.contentId + '" lang="txtShare">'+I18N.i18nText("txtShare")+'</a></li>';
} }
htmlTemp = htmlTemp.replace(/\{share\}/g, shareHtml); 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 ...@@ -204,8 +212,9 @@ HISTORY.renderContent = function(id, text, division, type, order, from, to, cate
HISTORY.contentTypeArr.push({ contentId: post.contentId, contentType: post.contentType }); 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. //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. //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 //assign version to array
COMMON.resourceVersionArr.push({ contentid: post.contentId, resourceversion: post.resourceVersion }); COMMON.resourceVersionArr.push({ contentid: post.contentId, resourceversion: post.resourceVersion });
...@@ -216,7 +225,8 @@ HISTORY.renderContent = function(id, text, division, type, order, from, to, cate ...@@ -216,7 +225,8 @@ HISTORY.renderContent = function(id, text, division, type, order, from, to, cate
//Check if content has marking or memo //Check if content has marking or memo
HISTORY.checkContentMarkingMemoOption(post.contentId); 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 ); 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){ ...@@ -679,7 +689,11 @@ HISTORY.readSubmenuFunction_callback = function(contentId){
} }
else{ else{
//Go to Conten view page //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. //End Function : No.12 -- Editor : Le Long -- Date : 08/02/2013 -- Summary : Check content type other for download.
}; };
...@@ -1121,7 +1135,7 @@ HISTORY.addReadContentToArray = function(strContentId, strResourceVersion, strMe ...@@ -1121,7 +1135,7 @@ HISTORY.addReadContentToArray = function(strContentId, strResourceVersion, strMe
if (HISTORY.contentViewData.length > 0) { if (HISTORY.contentViewData.length > 0) {
var flag; var flag;
for(var j = 0; j < HISTORY.contentViewData.length; j++){ for(var j = 0; j < HISTORY.contentViewData.length; j++){
if(HISTORY.contentViewData[j].contentid == strContentId){ if(HISTORY.contentViewData[j].contentid == strContentId){
flag = true; flag = true;
break; break;
} }
...@@ -1188,6 +1202,11 @@ HISTORY.getContentNameKana = function(strContentId) { ...@@ -1188,6 +1202,11 @@ HISTORY.getContentNameKana = function(strContentId) {
Check content whether existed or not Check content whether existed or not
*/ */
HISTORY.IsExistContent = function(strContentId) { HISTORY.IsExistContent = function(strContentId) {
if( strContentId == null || strContentId == "" ){
return false;
}
var isExisted = true; var isExisted = true;
var params = { var params = {
sid: ClientData.userInfo_sid(), sid: ClientData.userInfo_sid(),
...@@ -1492,3 +1511,67 @@ HISTORY.showContentShareDlgFunction = function(e) { ...@@ -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; ...@@ -39,6 +39,9 @@ HOME.timer_subMenu;
HOME.genre_totalcontent = -1; HOME.genre_totalcontent = -1;
HOME.group_totalcontent = -1; HOME.group_totalcontent = -1;
//スクロール復帰
HOME.scrollTop = 0;
//========================================================== //==========================================================
$(document).ready(function () { $(document).ready(function () {
...@@ -92,10 +95,9 @@ $(document).ready(function () { ...@@ -92,10 +95,9 @@ $(document).ready(function () {
$('#control-list-type').click(HOME.changeDispListFunction); $('#control-list-type').click(HOME.changeDispListFunction);
//Go To Details Page //Go To Details Page
$('canvas').live('click', HOME.canvasClickFunction); $('#main-ws canvas').live('click', HOME.canvasClickFunction);
//$('canvas').live('touchstart', HOME.canvasClickFunction); $('#main-ws canvas').live('touchend', HOME.canvasClickFunction);
$('canvas').live('touchend', HOME.canvasClickFunction); $('#main-ws canvas').live('touchmove', function () { HOME.home_isMove = true; });
$('canvas').live('touchmove', function () { HOME.home_isMove = true; });
//Open dialog //Open dialog
$('.dialog').live('click', HOME.openSubMenuDialogFunction); $('.dialog').live('click', HOME.openSubMenuDialogFunction);
...@@ -185,7 +187,7 @@ $(document).ready(function () { ...@@ -185,7 +187,7 @@ $(document).ready(function () {
if( ClientData.serviceOpt_catalog_edition() == 'Y'){ if( ClientData.serviceOpt_catalog_edition() == 'Y'){
$('.tabUnit').hide(); $('.tabUnit').hide();
//センタリングするようサイズ調整 //センタリングするようサイズ調整
$('#main').width(660); $('#bookshelf-main').width(660);
} else { } else {
$('.tabUnit').show(); $('.tabUnit').show();
} }
...@@ -221,7 +223,7 @@ $(document).ready(function () { ...@@ -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(); I18N.i18nReplaceText();
$('.datepicker').pickadate({ $('.datepicker').pickadate({
...@@ -229,6 +231,12 @@ $(document).ready(function () { ...@@ -229,6 +231,12 @@ $(document).ready(function () {
}); });
}); });
//ビューア、共有表示パーツ読み込み
$("#viewer").load("./inc_contentview.html?__UPDATEID__", function (myData, myStatus, xhr){
//読み込み完了時の処理
I18N.i18nReplaceText();
});
}); });
//日比谷カスタム ここから //日比谷カスタム ここから
...@@ -459,14 +467,18 @@ HOME.canvasClickFunction = function(e) { ...@@ -459,14 +467,18 @@ HOME.canvasClickFunction = function(e) {
var contentId = $(this).attr('id'); var contentId = $(this).attr('id');
var outputId = contentId.substring(17); var outputId = contentId.substring(17);
LIMIT_ACCESS_CONTENT.checkLimitContent(outputId,
function(){ if (HOME.isShowBookShelf) {
HOME.canvasClickFunction_callback(outputId); LIMIT_ACCESS_CONTENT.checkLimitContent(outputId,
}, function(){
function(){ HOME.canvasClickFunction_callback(outputId);
} },
); function(){
}
);
} else {
HOME.canvasClickFunction_callback(outputId);
}
}; };
HOME.canvasClickFunction_callback = function(outputId) HOME.canvasClickFunction_callback = function(outputId)
...@@ -595,7 +607,12 @@ HOME.canvasClickFunction_callback = function(outputId) ...@@ -595,7 +607,12 @@ HOME.canvasClickFunction_callback = function(outputId)
} }
else{ else{
//Go to Conten view page //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. //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) { ...@@ -670,23 +687,22 @@ HOME.openSubMenuDialogFunction = function(e) {
DETAIL.openContentDetail(); DETAIL.openContentDetail();
} //}
else if (HOME.isShowBookShelf) { //else if (HOME.isShowBookShelf) {
$('#dialog-read').attr('contentid', contentid); // $('#dialog-read').attr('contentid', contentid);
$('#dialog-detail').attr('contentid', contentid); // $('#dialog-detail').attr('contentid', contentid);
//$("#dlgSubMenu").dialog({position: array, width: 130, height: 90}); // //$("#dlgSubMenu").dialog({position: array, width: 130, height: 90});
$("#dlgSubMenu").show(); // $("#dlgSubMenu").show();
HOME.allowTimerCloseSubMenu = false; // HOME.allowTimerCloseSubMenu = false;
$("#dlgSubMenu").position({ my: "left bottom", // $("#dlgSubMenu").position({ my: "left bottom",
at: "left-10 top", // at: "left-10 top",
of: this, // of: this,
collision: "fit" // collision: "fit"
}); // });
} }
else { else {
$('#dialog-read').attr('contentid', contentid); $('#dialog-read').attr('contentid', contentid);
$('#dialog-detail').attr('contentid', contentid); $('#dialog-detail').attr('contentid', contentid);
//$("#dlgSubMenu").dialog({position: array, width: 130, height: 90});
$("#dlgSubMenu").show(); $("#dlgSubMenu").show();
HOME.allowTimerCloseSubMenu = false; HOME.allowTimerCloseSubMenu = false;
$("#dlgSubMenu").position({ my: "left bottom", $("#dlgSubMenu").position({ my: "left bottom",
...@@ -1328,7 +1344,9 @@ HOME.readSubmenuFunction_callback = function(contentId) ...@@ -1328,7 +1344,9 @@ HOME.readSubmenuFunction_callback = function(contentId)
} }
else{ else{
//Go to Conten view page //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. //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, ...@@ -1659,7 +1677,7 @@ HOME.renderContent = function(id, text, division, type, order, from, to, cateid,
+ ' </a>' + ' </a>'
+ ' <div class="info">' + ' <div class="info">'
+ ' <ul class="date">' + ' <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>' + ' <li><span class="lang" lang="txtViewDt"> </span>：<span id="lblVdate' + post.contentId + '"> </span></li>'
+ ' </ul>' + ' </ul>'
+ ' <ul class="pic">' + ' <ul class="pic">'
...@@ -2313,7 +2331,7 @@ HOME.syncMarkingContent = function() { ...@@ -2313,7 +2331,7 @@ HOME.syncMarkingContent = function() {
HOME.syncContentData = function() { HOME.syncContentData = function() {
if (ClientData.common_contentDataChkFlg() == 'true') { if (ClientData.common_contentDataChkFlg() == 'true') {
HOME.syncReadingContent(); //HOME.syncReadingContent(); //#14290 履歴画面でも取得するので省略
HOME.syncBookmarkContent(); HOME.syncBookmarkContent();
HOME.syncMemoContent(); HOME.syncMemoContent();
HOME.syncMarkingContent(); HOME.syncMarkingContent();
...@@ -2595,3 +2613,83 @@ HOME.showContentShareDlgFunction = function(e) { ...@@ -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() { ...@@ -159,7 +159,7 @@ LOGIN.processLogin = function() {
previousSid: '', previousSid: '',
loginId: loginId, loginId: loginId,
password: password, password: password,
urlpath: accountPath, urlpath: accountPath
}; };
//引数パラメータがあれば取得 //引数パラメータがあれば取得
......
login.html
...@@ -72,7 +72,7 @@ ...@@ -72,7 +72,7 @@
<div id="fade"></div> <div id="fade"></div>
--> -->
<div class="wrapper"> <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> <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> <article>
<img src="./abvw/img/login/logo_login.png" width="200" class="clearboth" id="logologin"> <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