Skip to content

C
check
Commit 8e6bbfc1 by Masaru Abe
Options

戻るボタン対応途中経過

parent 16256f34
Showing with 884 additions and 438 deletions
abvw/common/css/screen.css
/*
html, body {height:100%; margin: 0; padding: 0; }
html>body {
font-size: 16px;
font-size: 68.75%;
} /* Reset Base Font Size */
}
body {
font-family: Verdana, helvetica, arial, sans-serif;
......@@ -11,6 +12,7 @@ body {
background: #fff;
color: #333;
}
*/
h1, h2 { font-family: 'trebuchet ms', verdana, arial; padding: 10px; margin: 0 }
h1 { font-size: large }
......@@ -19,6 +21,6 @@ h1 { font-size: large }
background: url(bg.gif) repeat-x; text-align: center }
#banner a { color: white; }
#main { padding: 1em; }
#main-ws { padding: 1em; }
a img { border: none; }
\ No newline at end of file
abvw/common/js/avweb.js
......@@ -443,7 +443,7 @@ AVWEB._callCmsApi = function(url, accountPath, apiName, type, params, async, suc
apiUrl = url;
}
if(accountPath) {
apiUrl = AVWEB.format(apiUrl, accountPath)
apiUrl = AVWEB.format(apiUrl, accountPath);
}
apiUrl = apiUrl + '/' + apiName + '/';
......@@ -490,8 +490,55 @@ AVWEB._callCmsApi = function(url, accountPath, apiName, type, params, async, suc
}
}
});
};
/* 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;
};
/*
* Create Image Data Scheme URI
*/
......
abvw/common/json/lang/lang-ja.json
{
"sysErrorCallApi01":"ご迷惑をおかけし申し訳ございません。<br />システムエラーが発生しました。<br />アプリケーションを終了し、管理者に連絡してください。",
"sysErrorCallApi02":"ご迷惑をおかけし申し訳ございません。<br />認証エラーが発生しました。<br />ログイン画面に戻ります。",
"sysInfoScrLock01":"長時間操作されなかったため、画面をロックしています。<br />画面をクリックしてロックを解除してください。",
"sysInfoWithoutLogout":"ログアウトしていませんが、このまま終了してもよろしいですか？\n※【注意】ログアウトしないと次回ログインできない場合がございます。",
......@@ -35,7 +34,7 @@
"txtLoginAccPath":"アカウントパス:",
"txtLoginId":"ログインID:",
"txtLoginPwd":"パスワード:",
"txtLoginPwdRbr":"アカウントパスとログインIDを記憶する",
"txtLoginPwdRbr":"ログインIDを記憶する",
"txtPwdCurr":"現在パスワード",
"txtPwdNew":"変更パスワード",
"txtPwdNewRe":"(再)変更パスワード",
......@@ -65,7 +64,7 @@
"dspBkCancel":"バックアップせずにログアウト",
"txtSearchResult":"検索結果",
"dspHome":"ホーム",
"txtLoginUser":"(v1.5.2.0)ログイン中：",
"txtLoginUser":"(Ver.20140527)ログイン中：",
"txtAll":"すべて",
"txtMkgSize":"太さ",
"txtMkgS":"小",
......@@ -150,11 +149,5 @@
"txtContentWarning":"警告",
"txtMediaAutoPlayWarning":"メディアは自動再生されます。",
"txtPreventLink": "プレビューにはこの機能が利用できません。",
"msgContentNotExist": "コンテンツが存在しません。",
"txtShare": "共有",
"txtDashMark": "～",
"txtUrlValidDate": "URL有効期間",
"txtMaxDownloadCount": "最大DL回数",
"msgShareUrlPassword": "パスワードを設定する場合、以下に入力して下さい。",
"msgStreamingOpenError": "ストリーミングでは閲覧出来ないコンテンツです。"
"msgContentNotExist": "コンテンツが存在しません。"
}
abvw/css/layout/bookshelf.css
......@@ -19,7 +19,7 @@
height: 33px;
display: table-cell;
}
#bookshelf .wrapper #main .hoge-R section.sectionhomebookshelf .name img {
#bookshelf .wrapper_ws #main-ws .hoge-R section.sectionhomebookshelf .name img {
display: inline-block;
vertical-align: middle;
margin-right: 5px;
......@@ -123,22 +123,22 @@ a:hover.btn_bott{
}
#bookshelf .wrapper #main .hoge-R .tops .floatR {
#bookshelf .wrapper_ws #main-ws .hoge-R .tops .floatR {
display: inline;
}
#bookshelf .wrapper #main .hoge-R section .cnt_section_bookshelf .img .band_vertical {
#bookshelf .wrapper_ws #main-ws .hoge-R section .cnt_section_bookshelf .img .band_vertical {
position: absolute;
top: 8px;
left: 40px;
}
#bookshelf .wrapper #main .hoge-R section .cnt_section_bookshelf .img .band_horizontal {
#bookshelf .wrapper_ws #main-ws .hoge-R section .cnt_section_bookshelf .img .band_horizontal {
position: absolute;
top: 46px;
left: 19px;
}
.wrapper #main .hoge-R section .cnt_section_bookshelf .img .book_horizontal {
.wrapper_ws #main-ws .hoge-R section .cnt_section_bookshelf .img .book_horizontal {
margin-top: 44px;
}
.wrapper #main .hoge-R .cnt_section_bookshelf .img .book_vertical {
.wrapper_ws #main-ws .hoge-R .cnt_section_bookshelf .img .book_vertical {
margin-top: 5px;
}
\ No newline at end of file
abvw/css/layout/common.css
@charset "utf-8";
/* Latest Update
2012.11.5 write */
......@@ -15,7 +13,7 @@ form, ul{ margin:0; padding:0;}
li{ list-style-type:none;}
img{ display:block; border:none;}
#main{
#main-ws{
width: 960px;
padding-top: 20px;
overflow: hidden;
......@@ -55,3 +53,9 @@ br.clear { clear: both; margin: 0; padding: 0; font-size: 0; line-height: 0; }
.floatL { float: left;}
.floatR { float: right;}
/*
html{
overflow-y:scroll;
}
*/
abvw/css/layout/footer.css
@charset "utf-8";
/* footer */
footer{
#ws-body footer{
display: block;
height: 58px;
line-height: 60px;
......
abvw/css/layout/header.css
@charset "utf-8";
header{
.header_ws{
height: 100px;
width: 100%;
display: block;
}
.cnt_header{
width: 960px;
width: 1020px; /*960*/
height: 100px;
position: relative;
margin-top: 0;
......@@ -24,11 +22,23 @@ header{
margin-left: 10px;
}
.cnt_header .menu_login{
margin-top: 33px;
float: left;
margin-left: 10px;
width: 330px;
}
.cnt_header .menu_language{
float: right;
/* width: 520px;*/
width: 820px;
width: 570px; /*820*/
}
.cnt_header .menu_language .clearfix{
height: 43px;
}
.cnt_header .menu_language ul{
padding: 0;
text-align: right;
......@@ -55,6 +65,18 @@ header{
vertical-align: text-bottom;
}
/* abe */
.cnt_header .menu_language ul li.menuIcon{
list-style-type: none;
display: inline;
padding-left: 1px;
margin-left: 1px;
}
/* abe */
.cnt_header .menu_language ul li a{
}
......@@ -129,21 +151,22 @@ header{
.cnt_header .menu_language ul.pushMessage a:hover { }
header .cnt_header .menu_language ul li a img { display: inline; }
header .cnt_header .menu_language ul .language {
.header_ws .cnt_header .menu_language ul li a img { display: inline; }
.header_ws .cnt_header .menu_language ul .language {
padding: 0;
margin-left: 0px;
}
header .cnt_header .menu_language .button .menuIcon img { display: inline; }
header .cnt_header .menu_language ul li a#jQueryPush{
.header_ws .cnt_header .menu_language .button .menuIcon img { display: inline; }
.header_ws .cnt_header .menu_language ul li a#jQueryPush{
}
header .cnt_header .menu_language .button {
width: 520px;
.header_ws .cnt_header .menu_language .button {
/*width: 520px;*/
width: 590px;
position: relative;
}
header .cnt_header .menu_language #header-searchbox {
.header_ws .cnt_header .menu_language #header-searchbox {
width: 200px;
position: absolute;
top: 25px;
......@@ -152,11 +175,11 @@ header .cnt_header .menu_language #header-searchbox {
right: 0px;
padding-top:5px;
}
header .cnt_header .menu_language #header-searchbox span
.header_ws .cnt_header .menu_language #header-searchbox span
{
cursor:pointer;
}
header .cnt_header .menu_language #header-searchbox a#searchbox-search {
.header_ws .cnt_header .menu_language #header-searchbox a#searchbox-search {
height: 20px;
line-height:20px;
/*width: 25px;*/
......@@ -170,7 +193,7 @@ header .cnt_header .menu_language #header-searchbox a#searchbox-search {
display: inline-block;
margin:0 5px 5px 0;
}
header .cnt_header .menu_language #header-searchbox a#searchbox-search:hover {
.header_ws .cnt_header .menu_language #header-searchbox a#searchbox-search:hover {
}
a#searchbox-search:active{
position:relative;
......@@ -196,9 +219,9 @@ a#searchbox-search:active{
margin-right:5px;
}
.tops ul.sort li.current a.ascending_sort{
text-decoration:underline;
padding-right: 15px;
margin-right:5px;
text-decoration:underline;
padding-right: 15px;
margin-right:5px;
}
.tops ul.sort li b{
}
......@@ -227,3 +250,8 @@ margin-right:5px;
text-align:center;
height:40px;
}
.header_ws .cnt_header .menu_login .username {
margin-top: 20px;
margin-left: 170px;
}
abvw/css/layout/list.css
......@@ -20,7 +20,7 @@
display: table-cell;
}
#list .wrapper #main .hoge-R section.sectionhomelist .name img {
#list .wrapper_ws #main-ws .hoge-R section.sectionhomelist .name img {
display: inline-block;
vertical-align: middle;
margin-right: 5px;
......@@ -148,34 +148,26 @@ section.sectionhomelist{
a:hover.btn_bott{
}
#list .wrapper #main .hoge-R .tops .floatR {
#list .wrapper_ws #main-ws .hoge-R .tops .floatR {
display: inline;
}
#list .wrapper #main .hoge-R section .cnt_section_list .img .band_horizontal {
#list .wrapper_ws #main-ws .hoge-R section .cnt_section_list .img .band_horizontal {
position: absolute;
top: 7px;
left: 12px;
}
#list .wrapper #main .hoge-R section .cnt_section_list .img .band_vertical {
#list .wrapper_ws #main-ws .hoge-R section .cnt_section_list .img .band_vertical {
position: absolute;
top: 7px;
left: 50px;
}
/*
#list .wrapper #main .hoge-R section .cnt_section_list .text .info .pic li .read {
#list .wrapper_ws #main-ws .hoge-R section .cnt_section_list .text .info .pic li .iconList {
position: absolute;
right: -145px;
display: block;
top: 15px;
}
*/
#list .wrapper #main .hoge-R section .cnt_section_list .text .info .pic li .iconList {
position: absolute;
right: -145px;
display: block;
top: 15px;
}
#list .wrapper #main article section .cnt_section_list .text .name .listIcon {
#list .wrapper_ws #main-ws article section .cnt_section_list .text .name .listIcon {
display: inline;
vertical-align: middle;
margin-right: 5px;
......
abvw/css/layout/login.css
/* CSS Document */
@charset "utf-8";
/* Latest Update
2012.10.31 write */
......@@ -28,6 +30,10 @@ html,body{
width:100%;
}
html{
overflow-y:auto;
}
body{
}
......@@ -59,7 +65,7 @@ body{
width: 100%;
}
#main{
#main-ws{
width:960px;
padding:0;
}
......@@ -155,7 +161,7 @@ section a.loginbtn {
}
section a.loginbtn:hover {
}
#login .wrapper #main article section a.loginbtn:active {
#login .wrapper #main-ws article section a.loginbtn:active {
position:relative;
top:1px;
}
......@@ -198,21 +204,21 @@ section .loginbtn a:hover:not(:target) {
text-align: left;
padding-left:30px;
}
#login .wrapper #main article section table tr td input {
#login .wrapper #main-ws article section table tr td input {
width: 240px;
height: 28px;
}
#login article section table tr th,#login article section table tr td {
padding-bottom: 30px;
}
#login .wrapper #main article section table {
#login .wrapper #main-ws article section table {
margin:0 30px ;
}
#login footer .border .cnt_footer {
border: none;
}
#login .wrapper #main article img {
#login .wrapper #main-ws article img {
margin-right: auto;
margin-left: auto;
}
......@@ -238,12 +244,12 @@ section .loginbtn a:hover:not(:target) {
left: 0px;
z-index: 50;
}
#login .wrapper #main ul
#login .wrapper #main-ws ul
{
margin-top:15px;
}
#login .wrapper #main li {
#login .wrapper #main-ws li {
display: inline-block;
margin-right:5px;
}
......@@ -267,7 +273,7 @@ footer{
.focus{ }
#user_change footer .border .cnt_footer img { display: inline;}
#login .wrapper #main article section .error {
#login .wrapper #main-ws article section .error {
margin-top: 20px;
text-align: center;
}
......
abvw/css/layout/viewer.css
/* CSS Document */
@charset "utf-8";
......@@ -33,6 +34,8 @@
/*----------------------------*/
/* 1. gloval setting */
/*----------------------------*/
/*
html{
overflow: hidden;
}
......@@ -46,6 +49,18 @@ body{
margin: 0;
padding: 0;
}
*/
/*
#viewer {
overflow: hidden;
width:100%;
height:100%;
margin: 0;
padding: 0;
}
*/
/*----------------------------*/
/* 2. wrapper setting */
......@@ -64,7 +79,7 @@ body{
/* 3. header setting */
/*----------------------------*/
header{
#header_toolbar{
max-width: none;
min-width: 1000px;
height: 60px;
......@@ -82,7 +97,7 @@ header{
/*ヘッダー左カラム*/
.hdLcolumn{
display:block;
width:726px;
width:900px; /*726*/
float:left;
position:absolute;
}
......@@ -119,61 +134,61 @@ header{
}
/*アイコン基本設定*/
.hdLcolumn a.home{}
.hdLcolumn a.back{margin:0 0 0 11px;}
.hdLcolumn a.bmList{}
.hdLcolumn a.bmAdd{margin:0 0 0 11px;}
.hdLcolumn a.index{}
.hdLcolumn a.copy{}
.hdLcolumn a.memoDisplay{}
.hdLcolumn a.memoAdd{margin:0 0 0 11px;}
.hdLcolumn a.marking{}
.hdLcolumn a.markingToolbar{margin:0 0 0 11px;}
.hdLcolumn a.home_device{}
.hdLcolumn a.back_device{margin:0 0 0 11px;}
.hdLcolumn a.bmList_device{}
.hdLcolumn a.bmAdd_device{margin:0 0 0 11px;}
.hdLcolumn a.index_device{}
.hdLcolumn a.copy_device{}
.hdLcolumn a.memoDisplay_device{}
.hdLcolumn a.memoAdd_device{margin:0 0 0 11px;}
.hdLcolumn a.marking_device{}
.hdLcolumn a.markingToolbar_device{margin:0 0 0 11px;}
.hdLcolumn a.home{ width:48px; }
.hdLcolumn a.back{margin:0 0 0 11px; width:48px;}
.hdLcolumn a.bmList{ width:48px; }
.hdLcolumn a.bmAdd{margin:0 0 0 11px; width:67px;}
.hdLcolumn a.index{ width:47px; }
.hdLcolumn a.copy{ width:67px; }
.hdLcolumn a.memoDisplay{ width:68px;}
.hdLcolumn a.memoAdd{margin:0 0 0 11px; width:48px;}
.hdLcolumn a.marking{ width:97px; }
.hdLcolumn a.markingToolbar{margin:0 0 0 11px; }
.hdLcolumn a.home_device{ width:48px; }
.hdLcolumn a.back_device{margin:0 0 0 11px; width:48px;}
.hdLcolumn a.bmList_device{ width:48px; }
.hdLcolumn a.bmAdd_device{margin:0 0 0 11px; width:67px;}
.hdLcolumn a.index_device{ width:47px; }
.hdLcolumn a.copy_device{ width:67px; }
.hdLcolumn a.memoDisplay_device{ width:68px;}
.hdLcolumn a.memoAdd_device{margin:0 0 0 11px; width:48px;}
.hdLcolumn a.marking_device{ width:97px; }
.hdLcolumn a.markingToolbar_device{margin:0 0 0 11px; }
/*オンマウス時*/
.hdLcolumn a:hover.home{}
.hdLcolumn a:hover.back{}
.hdLcolumn a:hover.bmList{}
.hdLcolumn a:hover.bmAdd{}
.hdLcolumn a:hover.index{}
.hdLcolumn a:hover.copy{}
.hdLcolumn a:hover.memoDisplay{}
.hdLcolumn a:hover.memoAdd{}
.hdLcolumn a:hover.marking{}
.hdLcolumn a:hover.home{ width:48px; }
.hdLcolumn a:hover.back{ width:48px; }
.hdLcolumn a:hover.bmList{ width:48px; }
.hdLcolumn a:hover.bmAdd{ width:67px; }
.hdLcolumn a:hover.index{ width:47px; }
.hdLcolumn a:hover.copy{ width:67px; }
.hdLcolumn a:hover.memoDisplay{ width:68px; }
.hdLcolumn a:hover.memoAdd{ width:48px; }
.hdLcolumn a:hover.marking{ width:97px; }
.hdLcolumn a:hover.markingToolbar{}
/*リンクオフ時*/
#viewer .hdLcolumn a.home_off{}
#viewer .hdLcolumn a.back_off{margin:0 0 0 11px;}
#viewer .hdLcolumn a.bmList_off{}
#viewer .hdLcolumn a.bmAdd_off{margin:0 0 0 11px;}
#viewer .hdLcolumn a.index_off{}
#viewer .hdLcolumn a.copy_off{}
#viewer .hdLcolumn a.memoDisplay_off{}
#viewer .hdLcolumn a.memoAdd_off{margin:0 0 0 11px;}
#viewer .hdLcolumn a.marking_off{}
#viewer .hdLcolumn a.markingToolbar_off{margin:0 0 0 11px;}
#viewer .hdLcolumn a.home_off{ width:48px; }
#viewer .hdLcolumn a.back_off{margin:0 0 0 11px; width:48px;}
#viewer .hdLcolumn a.bmList_off{ width:48px; }
#viewer .hdLcolumn a.bmAdd_off{margin:0 0 0 11px; width:67px;}
#viewer .hdLcolumn a.index_off{ width:47px;}
#viewer .hdLcolumn a.copy_off{ width:67px;}
#viewer .hdLcolumn a.memoDisplay_off{ width:68px; }
#viewer .hdLcolumn a.memoAdd_off{margin:0 0 0 11px; width:48px; }
#viewer .hdLcolumn a.marking_off{ width:97px; }
#viewer .hdLcolumn a.markingToolbar_off{margin:0 0 0 11px; }
/*リンクオフ時*/
#viewer .hdLcolumn a.bmList_hover{}
#viewer .hdLcolumn a.bmAdd_hover{margin:0 0 0 11px;}
#viewer .hdLcolumn a.index_hover{}
#viewer .hdLcolumn a.copy_hover{}
#viewer .hdLcolumn a.memoDisplay_hover{}
#viewer .hdLcolumn a.memoAdd_hover{margin:0 0 0 11px;}
#viewer .hdLcolumn a.marking_hover{}
#viewer .hdLcolumn a.markingToolbar_hover{margin:0 0 0 11px;}
#viewer .hdLcolumn a.bmList_hover{ width:48px; }
#viewer .hdLcolumn a.bmAdd_hover{margin:0 0 0 11px; width:67px; }
#viewer .hdLcolumn a.index_hover{ width:47px; }
#viewer .hdLcolumn a.copy_hover{ width:67px; }
#viewer .hdLcolumn a.memoDisplay_hover{ width:68px; }
#viewer .hdLcolumn a.memoAdd_hover{margin:0 0 0 11px; width:48px; }
#viewer .hdLcolumn a.marking_hover{ width:97px; }
#viewer .hdLcolumn a.markingToolbar_hover{margin:0 0 0 11px; }
/*ヘッダー右カラム*/
.hdRcolumn{
......@@ -258,7 +273,7 @@ header{
/* 5. section setting */
/*----------------------------*/
article{
#viewer article{
display:table;
width:100%;
min-height:100%;
......@@ -268,7 +283,7 @@ article{
margin:0 auto 0;
}
section{
#viewer section{
}
......@@ -931,7 +946,7 @@ aside.MemoIndexBox .indexBoxBody_off{
display: block;
}
.thumbnail
#wrapper .thumbnail
{
width: 15%;
height: 100%;
......
abvw/css/theme/bookshelf.css
......@@ -23,7 +23,7 @@
background-position: center center;
border-radius: 3px 0px 0px 3px;
}
#bookshelf .wrapper #main .hoge-R section.sectionhomebookshelf .name img {
#bookshelf .wrapper_ws #main-ws .hoge-R section.sectionhomebookshelf .name img {
}
......@@ -152,18 +152,18 @@ a:hover.btn_bott{
filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#22466D', endColorstr='#37648C',GradientType=0 ); /* IE6-9 */
}
#bookshelf .wrapper #main .hoge-R .tops .floatR {
#bookshelf .wrapper_ws #main-ws .hoge-R .tops .floatR {
}
#bookshelf .wrapper #main .hoge-R section .cnt_section_bookshelf .img .band_vertical {
#bookshelf .wrapper_ws #main-ws .hoge-R section .cnt_section_bookshelf .img .band_vertical {
}
#bookshelf .wrapper #main .hoge-R section .cnt_section_bookshelf .img .band_horizontal {
#bookshelf .wrapper_ws #main-ws .hoge-R section .cnt_section_bookshelf .img .band_horizontal {
}
.wrapper #main .hoge-R section .cnt_section_bookshelf .img .book_horizontal {
.wrapper_ws #main-ws .hoge-R section .cnt_section_bookshelf .img .book_horizontal {
}
.wrapper #main .hoge-R .cnt_section_bookshelf .img .book_vertical {
.wrapper_ws #main-ws .hoge-R .cnt_section_bookshelf .img .book_vertical {
}
abvw/css/theme/common.css
@charset "utf-8";
/* Latest Update
2012.11.5 write */
......@@ -15,7 +13,7 @@ form, ul{ }
li{ }
img{ }
#main{
#main-ws{
}
......@@ -50,3 +48,4 @@ br.clear { }
color: #fff;
background: #ccc;
}
abvw/css/theme/footer.css
@charset "utf-8";
/* footer */
footer{
#ws-body footer{
background-color: #EDF2F2;
}
.cnt_footer{
......
abvw/css/theme/header.css
@charset "utf-8";
header{
.header_ws{
background-image: url(../../img/common/header_border.jpg) ,url(../../img/common/header_bg.jpg);
background-repeat: repeat-x, repeat;
background-position: bottom, top;
......@@ -15,6 +13,11 @@ header{
background-repeat: no-repeat;
}
.cnt_header .menu_login{
font-size: 12px;
color: #FFF;
}
.cnt_header .menu_language{
font-size: 12px;
color: #333333;
......@@ -33,6 +36,8 @@ header{
font-size: 12px;
background: url(../../img/common/icon_serch.png) 3px 2px no-repeat;
behavior: url("/PIE.htc");
/* dh */
background-color: #FFF
}
.cnt_header .menu_language ul li a{
......@@ -101,29 +106,29 @@ header{
.cnt_header .menu_language ul.pushMessage a:hover { text-decoration: none; }
header .cnt_header .menu_language ul li a img { display: inline; }
header .cnt_header .menu_language ul .language {
.common_header .cnt_header .menu_language ul li a img { display: inline; }
.common_header .cnt_header .menu_language ul .language {
padding: 0;
margin-left: 0px;
}
header .cnt_header .menu_language .button .menuIcon img { display: inline; }
header .cnt_header .menu_language ul li a#jQueryPush{
.common_header .cnt_header .menu_language .button .menuIcon img { display: inline; }
.common_header .cnt_header .menu_language ul li a#jQueryPush{
text-decoration: none !important;
color:#333;
}
header .cnt_header .menu_language .button {
.common_header .cnt_header .menu_language .button {
}
header .cnt_header .menu_language #header-searchbox {
.common_header .cnt_header .menu_language #header-searchbox {
background-color: #FFFFFF;
border: 1px solid #CCCCCC;
}
header .cnt_header .menu_language #header-searchbox span
.common_header .cnt_header .menu_language #header-searchbox span
{
}
header .cnt_header .menu_language #header-searchbox a#searchbox-search {
.common_header .cnt_header .menu_language #header-searchbox a#searchbox-search {
-moz-box-shadow: inset 0px 1px 0px 0px #86ACC7;
-webkit-box-shadow: inset 0px 1px 0px 0px #86ACC7;
box-shadow: inset 0px 1px 0px 0px #86ACC7;
......@@ -134,7 +139,7 @@ header .cnt_header .menu_language #header-searchbox a#searchbox-search {
border: 1px solid #0C274D;
color: #ffffff;
}
header .cnt_header .menu_language #header-searchbox a#searchbox-search:hover {
.common_header .cnt_header .menu_language #header-searchbox a#searchbox-search:hover {
background:-webkit-gradient( linear, left top, left bottom, color-stop(0.05, #23486F), color-stop(1, #36638B) );
background:-moz-linear-gradient( center top, #23486F 5%, #36638B 100% );
filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#23486F', endColorstr='#36638B');
......@@ -191,3 +196,13 @@ background:url(../../img/common/icon_triangle_u.png) no-repeat right 5px;
height:40px;
background:url(../../img/data_loading.gif) no-repeat center;
}
.common_header .cnt_header .menu_login .username {
overflow: hidden;
-o-text-overflow: ellipsis;
-webkit-text-overflow: ellipsis;
text-overflow: ellipsis;
width: 160px;
white-space: nowrap;
}
abvw/css/theme/list.css
......@@ -24,7 +24,7 @@
border-radius: 0px 3px 3px 0px;
}
#list .wrapper #main .hoge-R section.sectionhomelist .name img {
#list .wrapper_ws #main-ws .hoge-R section.sectionhomelist .name img {
}
......@@ -187,18 +187,18 @@ a:hover.btn_bott{
background: linear-gradient(to bottom, #22466D 0%,#37648C) 100%); /* W3C */
filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#22466D', endColorstr='#37648C',GradientType=0 ); /* IE6-9 */
}
#list .wrapper #main .hoge-R .tops .floatR {
#list .wrapper_ws #main-ws .hoge-R .tops .floatR {
}
#list .wrapper #main .hoge-R section .cnt_section_list .img .band_horizontal {
#list .wrapper_ws #main-ws .hoge-R section .cnt_section_list .img .band_horizontal {
}
#list .wrapper #main .hoge-R section .cnt_section_list .img .band_vertical {
#list .wrapper_ws #main-ws .hoge-R section .cnt_section_list .img .band_vertical {
}
#list .wrapper #main .hoge-R section .cnt_section_list .text .info .pic li .read {
#list .wrapper_ws #main-ws .hoge-R section .cnt_section_list .text .info .pic li .read {
}
#list .wrapper #main article section .cnt_section_list .text .name .listIcon {
#list .wrapper_ws #main-ws article section .cnt_section_list .text .name .listIcon {
}
abvw/css/theme/login.css
/* CSS Document */
@charset "utf-8";
......@@ -29,7 +30,7 @@ html,body{
}
body{
background:#37648C;
background:#FA0014;
}
/*----------------------------*/
......@@ -58,7 +59,7 @@ background:#37648C;
.wrapper {
}
#main{
#main-ws{
}
a
......@@ -82,7 +83,7 @@ section dl,section dl dt,section dl dd{
section dl{
}
section dl dt{
color: #37648C;
color: #FA0014;
font-size: 13px;
font-weight: bolder;
}
......@@ -129,7 +130,7 @@ section a.loginbtn:hover {
filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#23486F', endColorstr='#36638B');
background-color:#36638B;
}
#login .wrapper #main article section a.loginbtn:active {
#login .wrapper #main-ws article section a.loginbtn:active {
}
section .loginbtn a:not(:target) {
......@@ -161,10 +162,10 @@ section .loginbtn a:hover:not(:target) {
/*------------*/
#login .wrapper {
background-color: #37648C;
background-color: #FA0014;
}
#login footer {
background-color: #37648C;
background-color: #FA0014;
}
#login footer .cnt_footer {
color: #FFF;
......@@ -174,11 +175,11 @@ section .loginbtn a:hover:not(:target) {
font-size: 14px;
font-weight: bolder;
}
#login .wrapper #main article section table tr td input {
#login .wrapper #main-ws article section table tr td input {
}
#login article section table tr th,#login article section table tr td {
}
#login .wrapper #main article section table {
#login .wrapper #main-ws article section table {
border-bottom:dotted 1px #BBBBBB;
}
......@@ -186,7 +187,7 @@ section .loginbtn a:hover:not(:target) {
background: url(../../img/login/login_border.jpg) top repeat-x;
opacity:0;
}
#login .wrapper #main article img {
#login .wrapper #main-ws article img {
}
#loader {
}
......@@ -195,10 +196,10 @@ section .loginbtn a:hover:not(:target) {
background-color: #000;
opacity: 0.3;
}
#login .wrapper #main article ul {
#login .wrapper #main-ws article ul {
}
#login .wrapper #main article li {
#login .wrapper #main-ws article li {
}
......@@ -214,7 +215,7 @@ footer{
.focus{ color: #969696;}
#user_change footer .border .cnt_footer img { }
#login .wrapper #main article section .error {
#login .wrapper #main-ws article section .error {
font-size: 13px;
color: #FF0000;
font-weight: bolder;
......
abvw/css/theme/tab.css
@charset "utf-8";
/* CSS Document */
.tabUnit{
background-color: #37648C;
background-color: #FA0014;
border-radius: 3px;
box-shadow: 1px 1px 1px 1px rgba(0,0,0,0.2) inset;
}
......
abvw/css/theme/viewer.css
/* CSS Document */
@charset "utf-8";
/* Latest Update
2012.10.31 write */
......@@ -32,6 +34,8 @@
/*----------------------------*/
/* 1. gloval setting */
/*----------------------------*/
/*
html{
}
......@@ -45,6 +49,13 @@ body{
background:#898989;
background-image: url(../../img/viewer/article_bg.png);
}
*/
#viewer {
font-family: "メイリオ", "Meiryo", "ヒラギノ角ゴ Pro W3", "Hiragino Kaku Gothic Pro", "ＭＳ Ｐゴシック", "MS P Gothic", "Osaka", Verdana, Arial, Helvetica, sans-serif;
background:#898989;
background-image: url(../../img/viewer/article_bg.png);
}
/*----------------------------*/
/* 2. wrapper setting */
......@@ -60,7 +71,7 @@ body{
/* 3. header setting */
/*----------------------------*/
header{
#header_toolbar{
background-image: url(../../img/viewer/header_bg.jpg);
background-repeat: repeat-x;
box-shadow:0px 2px 10px 2px #333333;
......@@ -79,72 +90,82 @@ header{
}
.hdLcolumn .gloupe{
/*
border-left: solid 1px #417298;
border-right: solid 1px #23486F;
*/
border-left: solid 1px #FFF;
border-right: solid 1px #FFF;
}
.hdLcolumn .hgloupe{
/*
border-right: solid 1px #23486F;
*/
border-right: solid 1px #FFF;
}
.hdLcolumn .lgloupe{
/*
border-left: solid 1px #417298;
*/
border-left: solid 1px #FFF;
}
/*アイコン基本設定*/
.hdLcolumn a.home{background-position:0 0;}
.hdLcolumn a.back{background-position:-46px 0;}
.hdLcolumn a.bmList{background-position:-92px 0;}
.hdLcolumn a.bmAdd{background-position:-138px 0;}
.hdLcolumn a.index{background-position:-184px 0;}
.hdLcolumn a.copy{background-position:-230px 0;}
.hdLcolumn a.memoDisplay{background-position:-276px 0;}
.hdLcolumn a.memoAdd{background-position:-322px 0;}
.hdLcolumn a.marking{background-position:-368px 0;}
.hdLcolumn a.markingToolbar{background-position:-414px 0;}
.hdLcolumn a.back{background-position:-48px 0;}
.hdLcolumn a.bmList{background-position:-96px 0;}
.hdLcolumn a.bmAdd{background-position:-145px 0;}
.hdLcolumn a.index{background-position:-213px 0;}
.hdLcolumn a.copy{background-position:-261px 0;}
.hdLcolumn a.memoDisplay{background-position:-328px 0;}
.hdLcolumn a.memoAdd{background-position:-396px 0;}
.hdLcolumn a.marking{background-position:-445px 0;}
.hdLcolumn a.markingToolbar{background-position:-543px 0;}
.hdLcolumn a.home_device{background-position:0 0;}
.hdLcolumn a.back_device{background-position:-46px 0;}
.hdLcolumn a.bmList_device{background-position:-92px 0;}
.hdLcolumn a.bmAdd_device{background-position:-138px 0;}
.hdLcolumn a.index_device{background-position:-184px 0;}
.hdLcolumn a.copy_device{background-position:-230px 0;}
.hdLcolumn a.memoDisplay_device{background-position:-276px 0;}
.hdLcolumn a.memoAdd_device{background-position:-322px 0;}
.hdLcolumn a.marking_device{background-position:-368px 0;}
.hdLcolumn a.markingToolbar_device{background-position:-414px 0;}
.hdLcolumn a.back_device{background-position:-48px 0;}
.hdLcolumn a.bmList_device{background-position:-96px 0;}
.hdLcolumn a.bmAdd_device{background-position:-145px 0;}
.hdLcolumn a.index_device{background-position:-213px 0;}
.hdLcolumn a.copy_device{background-position:-261px 0;}
.hdLcolumn a.memoDisplay_device{background-position:-328px 0;}
.hdLcolumn a.memoAdd_device{background-position:-396px 0;}
.hdLcolumn a.marking_device{background-position:-445px 0;}
.hdLcolumn a.markingToolbar_device{background-position:-543px 0;}
/*オンマウス時*/
.hdLcolumn a:hover.home{background-position:0 -92px;}
.hdLcolumn a:hover.back{background-position:-46px -92px;}
.hdLcolumn a:hover.bmList{background-position:-92px -92px;}
.hdLcolumn a:hover.bmAdd{background-position:-138px -92px;}
.hdLcolumn a:hover.index{background-position:-184px -92px;}
.hdLcolumn a:hover.copy{background-position:-230px -92px;}
.hdLcolumn a:hover.memoDisplay{background-position:-276px -92px;}
.hdLcolumn a:hover.memoAdd{background-position:-322px -92px;}
.hdLcolumn a:hover.marking{background-position:-368px -92px;}
.hdLcolumn a:hover.markingToolbar{background-position:-414px -92px;}
.hdLcolumn a:hover.back{background-position:-48px -92px;}
.hdLcolumn a:hover.bmList{background-position:-96px -92px;}
.hdLcolumn a:hover.bmAdd{background-position:-145px -92px;}
.hdLcolumn a:hover.index{background-position:-213px -92px;}
.hdLcolumn a:hover.copy{background-position:-261px -92px;}
.hdLcolumn a:hover.memoDisplay{background-position:-328px -92px;}
.hdLcolumn a:hover.memoAdd{background-position:-396px -92px;}
.hdLcolumn a:hover.marking{background-position:-445px -92px;}
.hdLcolumn a:hover.markingToolbar{background-position:-543px -92px;}
/*リンクオフ時*/
#viewer .hdLcolumn a.home_off{background-position:0 -46px;cursor:default;}
#viewer .hdLcolumn a.back_off{background-position:-46px -46px;}
#viewer .hdLcolumn a.bmList_off{background-position:-92px -46px;}
#viewer .hdLcolumn a.bmAdd_off{background-position:-138px -46px;}
#viewer .hdLcolumn a.index_off{background-position:-184px -46px;}
#viewer .hdLcolumn a.copy_off{background-position:-230px -46px;}
#viewer .hdLcolumn a.memoDisplay_off{background-position:-276px -46px;}
#viewer .hdLcolumn a.memoAdd_off{background-position:-322px -46px;}
#viewer .hdLcolumn a.marking_off{background-position:-368px -46px;}
#viewer .hdLcolumn a.markingToolbar_off{background-position:-414px -46px;}
#viewer .hdLcolumn a.back_off{background-position:-48px -46px;}
#viewer .hdLcolumn a.bmList_off{background-position:-96px -46px;}
#viewer .hdLcolumn a.bmAdd_off{background-position:-145px -46px;}
#viewer .hdLcolumn a.index_off{background-position:-213px -46px;}
#viewer .hdLcolumn a.copy_off{background-position:-261px -46px;}
#viewer .hdLcolumn a.memoDisplay_off{background-position:-328px -46px;}
#viewer .hdLcolumn a.memoAdd_off{background-position:-396px -46px;}
#viewer .hdLcolumn a.marking_off{background-position:-445px -46px;}
#viewer .hdLcolumn a.markingToolbar_off{background-position:-543px -46px;}
/*リンクオフ時*/
#viewer .hdLcolumn a.bmList_hover{background-position:-92px -92px;}
#viewer .hdLcolumn a.bmAdd_hover{background-position:-138px -92px;}
#viewer .hdLcolumn a.index_hover{background-position:-184px -92px;}
#viewer .hdLcolumn a.copy_hover{background-position:-230px -92px;}
#viewer .hdLcolumn a.memoDisplay_hover{background-position:-276px -92px;}
#viewer .hdLcolumn a.memoAdd_hover{background-position:-322px -92px;}
#viewer .hdLcolumn a.marking_hover{background-position:-368px -92px;}
#viewer .hdLcolumn a.markingToolbar_hover{background-position:-414px -92px;}
#viewer .hdLcolumn a.bmList_hover{background-position:-96px -92px;}
#viewer .hdLcolumn a.bmAdd_hover{background-position:-145px -92px;}
#viewer .hdLcolumn a.index_hover{background-position:-213px -92px;}
#viewer .hdLcolumn a.copy_hover{background-position:-261px -92px;}
#viewer .hdLcolumn a.memoDisplay_hover{background-position:-328px -92px;}
#viewer .hdLcolumn a.memoAdd_hover{background-position:-396px -92px;}
#viewer .hdLcolumn a.marking_hover{background-position:-445px -92px;}
#viewer .hdLcolumn a.markingToolbar_hover{background-position:-543px -92px;}
/*ヘッダー右カラム*/
.hdRcolumn{
......@@ -199,11 +220,11 @@ header{
/* 5. section setting */
/*----------------------------*/
article{
#viewer article{
background:#999999;
}
section{
#viewer section{
}
......@@ -772,7 +793,7 @@ aside.MemoIndexBox .indexBoxBody_off{
}
.thumbnail
#wrapper .thumbnail
{
box-shadow: 0px 2px 8px 0px #ccc;
border:3px solid #fff;
......
abvw/img/common/header_bg.jpg
abvw/img/common/header_bg.jpg

1.89 KB | W: | H:

abvw/img/common/header_bg.jpg

695 Bytes | W: | H:

abvw/img/common/header_bg.jpg
abvw/img/common/header_bg.jpg
abvw/img/common/header_bg.jpg
abvw/img/common/header_bg.jpg
  • 2-up
  • Swipe
  • Onion skin
abvw/img/common/icon_home.png
abvw/img/common/icon_home.png

877 Bytes | W: | H:

abvw/img/common/icon_home.png

1.04 KB | W: | H:

abvw/img/common/icon_home.png
abvw/img/common/icon_home.png
abvw/img/common/icon_home.png
abvw/img/common/icon_home.png
  • 2-up
  • Swipe
  • Onion skin
abvw/img/common/icon_logout.png
abvw/img/common/icon_logout.png

496 Bytes | W: | H:

abvw/img/common/icon_logout.png

1.39 KB | W: | H:

abvw/img/common/icon_logout.png
abvw/img/common/icon_logout.png
abvw/img/common/icon_logout.png
abvw/img/common/icon_logout.png
  • 2-up
  • Swipe
  • Onion skin
abvw/img/common/icon_marker.png
abvw/img/common/icon_marker.png

300 Bytes | W: | H:

abvw/img/common/icon_marker.png

971 Bytes | W: | H:

abvw/img/common/icon_marker.png
abvw/img/common/icon_marker.png
abvw/img/common/icon_marker.png
abvw/img/common/icon_marker.png
  • 2-up
  • Swipe
  • Onion skin
abvw/img/common/icon_setup.png
abvw/img/common/icon_setup.png

1.03 KB | W: | H:

abvw/img/common/icon_setup.png

1.07 KB | W: | H:

abvw/img/common/icon_setup.png
abvw/img/common/icon_setup.png
abvw/img/common/icon_setup.png
abvw/img/common/icon_setup.png
  • 2-up
  • Swipe
  • Onion skin
abvw/img/common/icon_watch.png
abvw/img/common/icon_watch.png

379 Bytes | W: | H:

abvw/img/common/icon_watch.png

1.44 KB | W: | H:

abvw/img/common/icon_watch.png
abvw/img/common/icon_watch.png
abvw/img/common/icon_watch.png
abvw/img/common/icon_watch.png
  • 2-up
  • Swipe
  • Onion skin
abvw/img/common/logo.png
abvw/img/common/logo.png

1.13 KB | W: | H:

abvw/img/common/logo.png

57 KB | W: | H:

abvw/img/common/logo.png
abvw/img/common/logo.png
abvw/img/common/logo.png
abvw/img/common/logo.png
  • 2-up
  • Swipe
  • Onion skin
abvw/img/login/login_border.jpg
abvw/img/login/login_border.jpg

323 Bytes | W: | H:

abvw/img/login/login_border.jpg

631 Bytes | W: | H:

abvw/img/login/login_border.jpg
abvw/img/login/login_border.jpg
abvw/img/login/login_border.jpg
abvw/img/login/login_border.jpg
  • 2-up
  • Swipe
  • Onion skin
abvw/img/login/logo_login.png
abvw/img/login/logo_login.png

7.17 KB | W: | H:

abvw/img/login/logo_login.png

8.67 KB | W: | H:

abvw/img/login/logo_login.png
abvw/img/login/logo_login.png
abvw/img/login/logo_login.png
abvw/img/login/logo_login.png
  • 2-up
  • Swipe
  • Onion skin
abvw/img/viewer/footer_bg.jpg
abvw/img/viewer/footer_bg.jpg

399 Bytes | W: | H:

abvw/img/viewer/footer_bg.jpg

647 Bytes | W: | H:

abvw/img/viewer/footer_bg.jpg
abvw/img/viewer/footer_bg.jpg
abvw/img/viewer/footer_bg.jpg
abvw/img/viewer/footer_bg.jpg
  • 2-up
  • Swipe
  • Onion skin
abvw/img/viewer/hdicon_01.png
abvw/img/viewer/hdicon_01.png

162 KB | W: | H:

abvw/img/viewer/hdicon_01.png

20.2 KB | W: | H:

abvw/img/viewer/hdicon_01.png
abvw/img/viewer/hdicon_01.png
abvw/img/viewer/hdicon_01.png
abvw/img/viewer/hdicon_01.png
  • 2-up
  • Swipe
  • Onion skin
abvw/img/viewer/header_bg.jpg
abvw/img/viewer/header_bg.jpg

409 Bytes | W: | H:

abvw/img/viewer/header_bg.jpg

647 Bytes | W: | H:

abvw/img/viewer/header_bg.jpg
abvw/img/viewer/header_bg.jpg
abvw/img/viewer/header_bg.jpg
abvw/img/viewer/header_bg.jpg
  • 2-up
  • Swipe
  • Onion skin
abvw/js/contentview.js
......@@ -13,6 +13,13 @@ CONTENTVIEW.sizingScreen = function() {
var w = $(window).width();
var h = $(window).height();
console.log("CONTENTVIEW.sizingScreen:w:" + w);
console.log("CONTENTVIEW.sizingScreen:h:" + h);
console.log("viewer:w:" + $('#viewer').width());
console.log("viewer:h:" + $('#viewer').height());
console.log("wrapper:w:" + $('#wrapper').width());
console.log("wrapper:h:" + $('#wrapper').height());
if (COMMON.isTouchDevice() == true) {
if (CONTENTVIEW_GENERAL.avwUserEnvObj.isAndroid()) {
var tempRatio = document.documentElement.clientWidth / window.innerWidth;
......@@ -4271,6 +4278,7 @@ CONTENTVIEW.draw = function(context, opt) {
//Start Function : No.4 - Editor : Long - Date: 08/09/2013 - Summary : Edit function to draw multi canvas
/* display to screen */
CONTENTVIEW.flip = function(opt) {
var canvas;
var offscreen;
......@@ -4823,6 +4831,9 @@ CONTENTVIEW.imageToScreen = function(x, y) {
/* Adjust Component size */
CONTENTVIEW.sizingNotFull = function(width, height) {
console.log("CONTENTVIEW.marginY:" + CONTENTVIEW.marginY);
console.log("CONTENTVIEW.marginX:" + CONTENTVIEW.marginX);
//START TRB
if(CONTENTVIEW.isMediaAndHTMLContent()){
......@@ -5436,8 +5447,60 @@ CONTENTVIEW.deleteMaxPageOverData = function() {
};
$("document").ready(function () {
//CONTENTVIEW.ready = function(){
CONTENTVIEW.cssInit = function(){
//CSS
$('html').css({
'overflow-y':'',
'overflow': 'hidden'
});
$('html,body').css({
'height':'100%',
'width':'100%',
'margin':'',
'padding':''
});
$('html>body').css({
'font-size':''
});
$('body').css({
'font-family': '"メイリオ", "Meiryo", "ヒラギノ角ゴ Pro W3", "Hiragino Kaku Gothic Pro", "ＭＳ Ｐゴシック", "MS P Gothic", "Osaka", Verdana, Arial, Helvetica, sans-serif',
'font-size':'',
'background':'#898989',
'background-image':'url(../../img/viewer/article_bg.png)',
'color':'',
'margin':'0',
'padding':'0'
});
};
CONTENTVIEW.screenMove = function(){
CONTENTVIEW.ready();
;}
$(function () {
//CONTENTVIEW.ready();
});
CONTENTVIEW.ready = function(){
CONTENTVIEW_CALLAPI.ready();
CONTENTVIEW_EVENTS.ready();
CONTENTVIEW_GETDATA.ready();
CONTENTVIEW_INITOBJECT.ready();
CONTENTVIEW_CREATEOBJECT.ready();
CONTENTVIEW_GENERAL.ready();
CONTENTVIEW_MEMO.ready();
CONTENTVIEW_GOMU.ready();
CONTENTVIEW_MAKER.ready();
CONTENTVIEW_PEN.ready();
CONTENTVIEW_MARKING.ready();
CONTENTVIEW_POPUPTEXT.ready();
CONTENTVIEW_PAINT.ready();
CONTENTVIEW_ANKET.ready();
CONTENTVIEW_3D.ready();
CONTENTVIEW_CONTENTTYPENONE.ready();
CONTENTVIEW_IMAGEPREVIEW.ready();
CONTENTVIEW_FILESYSTEM.ready();
CONTENTVIEW.isPendingContentBGM = false;
CONTENTVIEW.isZoomingContent = false;
......@@ -5596,6 +5659,5 @@ $("document").ready(function () {
}
}
);
//};
});
};
abvw/js/contentview_3d.js
......@@ -2,16 +2,6 @@
//名前空間用のオブジェクトを用意する
var CONTENTVIEW_3D = {};
CONTENTVIEW_3D._3dMoveFlag = false;
CONTENTVIEW_3D._3dAction = '';
CONTENTVIEW_3D._curr3dObject;
//CONTENTVIEW_3D._3dTimeToDetect = 1000;
CONTENTVIEW_3D._3dActionType = {
'TouchStart_MouseDown' : 0,
'TouchMove_MouseMove' : 1,
'TouchEnd_MouseUp' : 2
};
CONTENTVIEW_3D.createMatrixPoints = function(width, height, _v, _h, imgCurrX, imgCurrY){
var deltaX = width/ _h;
......@@ -317,3 +307,20 @@ CONTENTVIEW_3D.get3DAction = function(lastFrame, currFrame){
return nRet;
};
$(function () {
CONTENTVIEW_3D.ready();
});
CONTENTVIEW_3D.ready = function(){
CONTENTVIEW_3D._3dMoveFlag = false;
CONTENTVIEW_3D._3dAction = '';
CONTENTVIEW_3D._curr3dObject = undefined;
CONTENTVIEW_3D._3dActionType = {
'TouchStart_MouseDown' : 0,
'TouchMove_MouseMove' : 1,
'TouchEnd_MouseUp' : 2
};
};
abvw/js/contentview_Anket.js
......@@ -6,8 +6,6 @@ var CONTENTVIEW_ANKET = {};
CONTENTVIEW_ANKET.showAnket = function(url, fullscreen, objectId) {
var $container = $('#dialog');
//url = url + "?sid=" + ClientData.userInfo_sid();
$container.html('');
$container.addClass('anket-dialog');
......@@ -122,13 +120,8 @@ CONTENTVIEW_ANKET.resizeAnket = function() {
// set height for anket container
$('#dialog .anket-container').css('height', iframeHeight);
// set overflow for container iframe
//if (avwUserEnvObj.isIos()) {
// $('#dialog .anket-container').css('overflow', 'scroll');
// $('#dialog .anket-container').css('-webkit-overflow-scrolling', 'touch');
// //$('#dialog .anket-container').css('display', 'inline-block');
// //$('#dialog iframe').css('display', 'block');
//}
};
CONTENTVIEW_ANKET.ready = function(){
};
abvw/js/contentview_ContentTypeNone.js
......@@ -2,11 +2,35 @@
//名前空間用のオブジェクトを用意する
var CONTENTVIEW_CONTENTTYPENONE = {};
CONTENTVIEW_CONTENTTYPENONE.getJsonContentInfoTyeNone = function() {
//CONTENTVIEW_CALLAPI.webGetContentData();
CONTENTVIEW_CALLAPI.getSearchDataFromJson();
CONTENTVIEW_CALLAPI.getJsonDataPageTitle();
CONTENTVIEW_CALLAPI.getDataJsonFile();
CONTENTVIEW_CONTENTTYPENONE.getJsonContentInfoTyeNone = function(doneFunc) {
//CONTENTVIEW_CALLAPI.getSearchDataFromJson();
//CONTENTVIEW_CALLAPI.getJsonDataPageTitle();
//CONTENTVIEW_CALLAPI.getDataJsonFile();
var ajax2 = CONTENTVIEW_CALLAPI.getSearchDataFromJsonWhen();
var ajax3 = CONTENTVIEW_CALLAPI.getJsonDataPageTitleWhen();
var ajax6 = CONTENTVIEW_CALLAPI.getDataJsonFileWhen();
$.when(
ajax2,ajax3,ajax6
).done(function(data2, data3, data6) {
console.log("done:data2:" + data2);
console.log("done:data3:" + data3);
console.log("done:data6:" + data6);
if(data2){
CONTENTVIEW_CALLAPI.getSearchDataFromJsonDone(data2[0]);
}
if(data3){
CONTENTVIEW_CALLAPI.getJsonDataPageTitleDone(data3[0]);
}
if(data6){
CONTENTVIEW_CALLAPI.getDataJsonFileDone(data6[0]);
}
if(doneFunc){
doneFunc();
}
});
};
//Return a string base 64 image has drawn with specify data
......@@ -35,3 +59,6 @@ CONTENTVIEW_CONTENTTYPENONE.returnImageString = function(data){
return imageUrl;
};
CONTENTVIEW_CONTENTTYPENONE.ready = function(){
};
abvw/js/contentview_CreateObjects.js
......@@ -2,9 +2,6 @@
//名前空間用のオブジェクトを用意する
var CONTENTVIEW_CREATEOBJECT = {};
//CONTENTVIEW_CREATEOBJECT.check;
//CONTENTVIEW_CREATEOBJECT._isEnableRotate = false;
CONTENTVIEW_CREATEOBJECT.alertMessageLevel = {
ShowAlert : '1',
RequirePassword : '2',
......@@ -12,9 +9,6 @@ CONTENTVIEW_CREATEOBJECT.alertMessageLevel = {
};
/* ----------------------------------- Create memo --------------------------------*/
CONTENTVIEW_CREATEOBJECT.memoObjects = [];
/* constructor */
CONTENTVIEW_CREATEOBJECT.MemoObject = function (id, text, x, y, width, heigth, imageUrl, action) {
......@@ -127,9 +121,6 @@ CONTENTVIEW_CREATEOBJECT.copyMemo = function() {
/* ----------------------------------- Create webGetContentType4 --------------------------------*/
CONTENTVIEW_CREATEOBJECT.webGetContentType4Objects = [];
/* constructor */
CONTENTVIEW_CREATEOBJECT.WebGetContentTyp4Object = function (id, x, y, width, heigth, imageUrl, action) {
......@@ -1153,8 +1144,6 @@ CONTENTVIEW_CREATEOBJECT.openPopUp = function (mediaType, actionType, id, imageU
};
CONTENTVIEW_CREATEOBJECT.openPopUp.prototype = new CONTENTVIEW_CREATEOBJECT.PageObject();
CONTENTVIEW_CREATEOBJECT.moveContentParam = {};
/* mediaType = 1 and actionType = 10 move to Content object*/
CONTENTVIEW_CREATEOBJECT.moveToContent = function (mediaType, actionType, id, imageUrl, x, y, w, h, visible, contentId, pageNo, objectId) {
this.setup(mediaType, actionType, id, imageUrl, x, y, w, h, visible, null, null, objectId);
......@@ -1242,7 +1231,8 @@ CONTENTVIEW_CREATEOBJECT.moveToContent = function (mediaType, actionType, id, im
//ストリーミングのビューアへ移動
AVWEB.avwScreenMove(COMMON.ScreenIds.ContentViewStreaming);
} else {
AVWEB.avwScreenMove(COMMON.ScreenIds.ContentView);
//AVWEB.avwScreenMove(COMMON.ScreenIds.ContentView);
CONTENTVIEW.screenMove();
}
}
}
......@@ -1261,7 +1251,8 @@ CONTENTVIEW_CREATEOBJECT.moveToContent = function (mediaType, actionType, id, im
//ストリーミングのビューアへ移動
AVWEB.avwScreenMove(COMMON.ScreenIds.ContentViewStreaming);
} else {
AVWEB.avwScreenMove(COMMON.ScreenIds.ContentView);
//AVWEB.avwScreenMove(COMMON.ScreenIds.ContentView);
CONTENTVIEW.screenMove();
}
}
......@@ -1333,7 +1324,8 @@ CONTENTVIEW_CREATEOBJECT.createAlertTypeDialog = function(msg){
//ストリーミングのビューアへ移動
AVWEB.avwScreenMove(COMMON.ScreenIds.ContentViewStreaming);
} else {
AVWEB.avwScreenMove(COMMON.ScreenIds.ContentView);
//AVWEB.avwScreenMove(COMMON.ScreenIds.ContentView);
CONTENTVIEW.screenMove();
}
});
......@@ -1404,7 +1396,8 @@ CONTENTVIEW_CREATEOBJECT.createPwdRequiredTypeDialog = function(){
//ストリーミングのビューアへ移動
AVWEB.avwScreenMove(COMMON.ScreenIds.ContentViewStreaming);
} else {
AVWEB.avwScreenMove(COMMON.ScreenIds.ContentView);
//AVWEB.avwScreenMove(COMMON.ScreenIds.ContentView);
CONTENTVIEW.screenMove();
}
}
else {
......@@ -2958,3 +2951,16 @@ CONTENTVIEW_CREATEOBJECT.createPageBGM = function(){
}
};
//END : TRB00028 - Editor: Long - Date: 09/10/2013 - Summary : Fix For Page BGM
$(function () {
CONTENTVIEW_CREATEOBJECT.ready();
});
CONTENTVIEW_CREATEOBJECT.ready = function(){
//初期化用
CONTENTVIEW_CREATEOBJECT.memoObjects = [];
CONTENTVIEW_CREATEOBJECT.webGetContentType4Objects = [];
CONTENTVIEW_CREATEOBJECT.moveContentParam = {};
};
abvw/js/contentview_Events.js
......@@ -2,29 +2,6 @@
//名前空間用のオブジェクトを用意する
var CONTENTVIEW_EVENTS = {};
CONTENTVIEW_EVENTS.altMode = false;
//limit area to detech if it is click(on win8)
CONTENTVIEW_EVENTS.clickLimitArea = 20;
//touch position
CONTENTVIEW_EVENTS.touchDownFirstPosX = 0;
CONTENTVIEW_EVENTS.touchDownFirstPosY = 0;
//position for click event on touch device
CONTENTVIEW_EVENTS._touchPageX = 0;
CONTENTVIEW_EVENTS._touchPageY = 0;
//Detect touch
CONTENTVIEW_EVENTS._isTouching = false;
//Detect click on touch device
CONTENTVIEW_EVENTS._isClick = false;
//Detech if page is being transition
CONTENTVIEW_EVENTS.isPageTransition = false;
//Is 3d animating
CONTENTVIEW_EVENTS._3dAnimate = false;
//Start : TRB00005, TRB00006 - Editor : Long - Date: 08/28/2013
//is prevent click event
CONTENTVIEW_EVENTS.isPreventClick = false;
//End : TRB00005, TRB00006 - Editor : Long - Date: 08/28/2013
/* add memo click */
CONTENTVIEW_EVENTS.handleAddMemo = function(event) {
......@@ -1418,32 +1395,57 @@ CONTENTVIEW_EVENTS.mouseUp_CanvasMain = function(event) {
};
CONTENTVIEW_EVENTS.imgBack_click = function() {
console.log("CONTENTVIEW_EVENTS.imgBack_click");
/* set end log */
COMMON.SetEndLog(CONTENTVIEW_GENERAL.contentID);
COMMON.RegisterLog();
window.onbeforeunload = null;
//画面クリア
CONTENTVIEW_INITOBJECT.clearViewerComponent();
if (ClientData.JumpQueue()) {
var oldDataBack = ClientData.JumpQueue();
if (oldDataBack.length > 0) {
AVWEB.avwScreenMove(COMMON.ScreenIds.ContentView);
//AVWEB.avwScreenMove(COMMON.ScreenIds.ContentView);
CONTENTVIEW.screenMove();
ClientData.IsJumpBack(true);
} else {
/*check back */
if (ClientData.BookmarkScreen()) {
AVWEB.avwScreenMove(ClientData.BookmarkScreen());
} else {
window.history.back();
}
//if (ClientData.BookmarkScreen()) {
// AVWEB.avwScreenMove(ClientData.BookmarkScreen());
//} else {
// window.history.back();
//}
//試験
$("#viewer").hide();
HOME.cssInit();
$("#header-ws").show();
$("#ws-body").show();
$("#topcontrol").show();
}
} else {
/*check back */
if (ClientData.BookmarkScreen()) {
AVWEB.avwScreenMove(ClientData.BookmarkScreen());
} else {
window.history.back();
}
//if (ClientData.BookmarkScreen()) {
// AVWEB.avwScreenMove(ClientData.BookmarkScreen());
//} else {
// window.history.back();
//}
console.log("bbb");
//試験
$("#viewer").hide();
HOME.cssInit();
$("#header-ws").show();
$("#ws-body").show();
$("#topcontrol").show();
}
};
......@@ -2511,4 +2513,33 @@ TransitionObject.prototype.processNaviPage = function (currPos) {
CONTENTVIEW_EVENTS._transitionObject = new TransitionObject();
//End Funcion : No.20 - Editor : Long - Date : 08/13/2013 - Summary : Win 8 touch handle
\ No newline at end of file
$(function () {
CONTENTVIEW_EVENTS.ready();
});
CONTENTVIEW_EVENTS.ready = function(){
CONTENTVIEW_EVENTS.altMode = false;
//limit area to detech if it is click(on win8)
CONTENTVIEW_EVENTS.clickLimitArea = 20;
//touch position
CONTENTVIEW_EVENTS.touchDownFirstPosX = 0;
CONTENTVIEW_EVENTS.touchDownFirstPosY = 0;
//position for click event on touch device
CONTENTVIEW_EVENTS._touchPageX = 0;
CONTENTVIEW_EVENTS._touchPageY = 0;
//Detect touch
CONTENTVIEW_EVENTS._isTouching = false;
//Detect click on touch device
CONTENTVIEW_EVENTS._isClick = false;
//Detech if page is being transition
CONTENTVIEW_EVENTS.isPageTransition = false;
//Is 3d animating
CONTENTVIEW_EVENTS._3dAnimate = false;
//is prevent click event
CONTENTVIEW_EVENTS.isPreventClick = false;
};
abvw/js/contentview_FileSystem.js
......@@ -2,12 +2,6 @@
//名前空間用のオブジェクトを用意する
var CONTENTVIEW_FILESYSTEM = {};
CONTENTVIEW_FILESYSTEM.fs = null;
CONTENTVIEW_FILESYSTEM.isXhrBusy = false;
//$(function () {
//});
CONTENTVIEW_FILESYSTEM.initFS = function( func ) {
CONTENTVIEW_FILESYSTEM.fs = null;
......@@ -118,7 +112,7 @@ CONTENTVIEW_FILESYSTEM.checkUpdate = function(contentId, data, func) {
if (!CONTENTVIEW_FILESYSTEM.fs) {
//AVWEB.avwLog('CONTENTVIEW_FILESYSTEM.fs is null. id=' + contentId);
//おまじない ajaxカウントをインクリする必要有り
//nAjaxLoad++;
//CONTENTVIEW_GENERAL.nAjaxLoad++;
//ファンクションがあれば実行
if( func != null ){
func(data);
......@@ -171,7 +165,7 @@ CONTENTVIEW_FILESYSTEM.checkUpdate = function(contentId, data, func) {
//AVWEB.avwLog('JSON書き込み完了');
//おまじない ajaxカウントをインクリする必要有り
nAjaxLoad++;
CONTENTVIEW_GENERAL.nAjaxLoad++;
//ファンクション実行
if( func != null ){
func(data);
......@@ -203,7 +197,7 @@ CONTENTVIEW_FILESYSTEM.checkUpdate = function(contentId, data, func) {
} else {
//おまじない ajaxカウントをインクリする必要有り
nAjaxLoad++;
CONTENTVIEW_GENERAL.nAjaxLoad++;
//ファンクション実行
if( func != null ){
func(data);
......@@ -236,7 +230,7 @@ CONTENTVIEW_FILESYSTEM.checkUpdate = function(contentId, data, func) {
//AVWEB.avwLog('JSON書き込み完了');
//おまじない ajaxカウントをインクリする必要有り
nAjaxLoad++;
CONTENTVIEW_GENERAL.nAjaxLoad++;
//ファンクション実行
if( func != null ){
func(data);
......@@ -377,3 +371,12 @@ CONTENTVIEW_FILESYSTEM.errorHandler = function(e) {
alert('FileSystemAPI Error: ' + msg);
};
$(function () {
CONTENTVIEW_FILESYSTEM.ready();
});
CONTENTVIEW_FILESYSTEM.ready = function(){
CONTENTVIEW_FILESYSTEM.fs = null;
CONTENTVIEW_FILESYSTEM.isXhrBusy = false;
};
abvw/js/contentview_GetData.js
......@@ -1063,9 +1063,15 @@ CONTENTVIEW_GETDATA.getText = function() {
CONTENTVIEW_GETDATA.getContentID = function() {
/* init contentID */
if (ClientData.common_preContentId()) {
console.log("111");
CONTENTVIEW_GENERAL.contentID = ClientData.common_preContentId();
ClientData.common_preContentId(null);
} else if (ClientData.IsJumpBack() == true) {
console.log("222");
var dataJump = ClientData.JumpQueue();
CONTENTVIEW_GENERAL.contentID = dataJump[dataJump.length - 1].oldContentID;
......@@ -1075,6 +1081,9 @@ CONTENTVIEW_GETDATA.getContentID = function() {
}
} else {
console.log("333");
CONTENTVIEW_GENERAL.contentID = ClientData.contentInfo_contentId();
}
};
......@@ -1701,3 +1710,7 @@ CONTENTVIEW_GETDATA.getPageTransitionConfig = function(){
};
//End Function: No.4 - Editor : Long - Summary : Render Next Page Content
CONTENTVIEW_GETDATA.ready = function(){
};
abvw/js/contentview_Gomu.js
......@@ -206,6 +206,10 @@ CONTENTVIEW_GOMU.touchStart_BtnCancel_Gomu = function(e){
// Setting dialog
$(function () {
CONTENTVIEW_GOMU.ready();
});
CONTENTVIEW_GOMU.ready = function(){
// ---------------------------------
// Setup for easer [start]
// ---------------------------------
......@@ -290,8 +294,8 @@ $(function () {
return false;
}
});
};
});
/// ===============================================================================================
/// Eraser group [ end ]
......
abvw/js/contentview_ImagePreview.js
......@@ -2,21 +2,6 @@
//名前空間用のオブジェクトを用意する
var CONTENTVIEW_IMAGEPREVIEW = {};
/*====Variable====*/
CONTENTVIEW_IMAGEPREVIEW.slideshowImgFrom = 0;
CONTENTVIEW_IMAGEPREVIEW.slideshowImgTo = 4;
CONTENTVIEW_IMAGEPREVIEW.slideshowImageCollection = [];
CONTENTVIEW_IMAGEPREVIEW.slideshowClickFlg = false;
CONTENTVIEW_IMAGEPREVIEW.slideshowInitFlg = true; //未使用
CONTENTVIEW_IMAGEPREVIEW.slideshowSelectedIndex = 0; //未使用
//0: next - 1: prev
CONTENTVIEW_IMAGEPREVIEW.slideshowControlToggleFlg = 0; //未使用
//CONTENTVIEW_IMAGEPREVIEW.totalRecord; //未使用
CONTENTVIEW_IMAGEPREVIEW.slideshowSelectFirstIndex = 0;
CONTENTVIEW_IMAGEPREVIEW.slideshowSelectLastIndex = 4;
CONTENTVIEW_IMAGEPREVIEW.slideshowMainCurrIndex = 0;
CONTENTVIEW_IMAGEPREVIEW.slideshow_isTransaction = false;
/*==========================================*/
CONTENTVIEW_IMAGEPREVIEW.refreshSlideShowValue = function(){
CONTENTVIEW_IMAGEPREVIEW.slideshowImgFrom = 0;
......@@ -471,3 +456,24 @@ CONTENTVIEW_IMAGEPREVIEW.handleDispNextPrevButton = function(){
}
};
$(function () {
CONTENTVIEW_IMAGEPREVIEW.ready();
});
CONTENTVIEW_IMAGEPREVIEW.ready = function(){
/*====Variable====*/
CONTENTVIEW_IMAGEPREVIEW.slideshowImgFrom = 0;
CONTENTVIEW_IMAGEPREVIEW.slideshowImgTo = 4;
CONTENTVIEW_IMAGEPREVIEW.slideshowImageCollection = [];
CONTENTVIEW_IMAGEPREVIEW.slideshowClickFlg = false;
CONTENTVIEW_IMAGEPREVIEW.slideshowInitFlg = true; //未使用
CONTENTVIEW_IMAGEPREVIEW.slideshowSelectedIndex = 0; //未使用
//0: next - 1: prev
CONTENTVIEW_IMAGEPREVIEW.slideshowControlToggleFlg = 0; //未使用
//CONTENTVIEW_IMAGEPREVIEW.totalRecord; //未使用
CONTENTVIEW_IMAGEPREVIEW.slideshowSelectFirstIndex = 0;
CONTENTVIEW_IMAGEPREVIEW.slideshowSelectLastIndex = 4;
CONTENTVIEW_IMAGEPREVIEW.slideshowMainCurrIndex = 0;
CONTENTVIEW_IMAGEPREVIEW.slideshow_isTransaction = false;
};
abvw/js/contentview_InitObjects.js
......@@ -121,6 +121,8 @@ CONTENTVIEW_INITOBJECT.setLoadingSize = function(){
//END : TRB00034 - DATE : 09/11/2013 - Editor : Long - Summary : Fix for center loading image
CONTENTVIEW_INITOBJECT.initPage = function() {
console.log("CONTENTVIEW_INITOBJECT.initPage");
CONTENTVIEW_INITOBJECT.setLoadingSize();
$('#divImageLoading').css('display', 'block');
......@@ -145,10 +147,10 @@ CONTENTVIEW_INITOBJECT.initPage = function() {
}
else if(CONTENTVIEW_GENERAL.contentType == COMMON.ContentTypeKeys.Type_NoFile){
CONTENTVIEW_GETDATA.getPageTransitionConfig();
CONTENTVIEW_CONTENTTYPENONE.getJsonContentInfoTyeNone();
CONTENTVIEW_CONTENTTYPENONE.getJsonContentInfoTyeNone(CONTENTVIEW_INITOBJECT.ajaxComplete4);
}
else{
CONTENTVIEW_CALLAPI.getJsonContentInfo();
CONTENTVIEW_CALLAPI.getJsonContentInfo(CONTENTVIEW_INITOBJECT.ajaxComplete8);
CONTENTVIEW_GETDATA.getPageTransitionConfig();
}
......@@ -265,15 +267,9 @@ CONTENTVIEW_INITOBJECT.initPage = function() {
CONTENTVIEW_INITOBJECT.setLoadingSize();
});
$(document).ajaxComplete(function () {
/*Init Page */
CONTENTVIEW_GENERAL.nAjaxLoad++;
//console.log("nAjaxLoad:" + CONTENTVIEW_GENERAL.nAjaxLoad);
//CONTENTVIEW_STREAMING.debugLog("nAjaxLoad:" + CONTENTVIEW_GENERAL.nAjaxLoad);
};
if (CONTENTVIEW_GENERAL.nAjaxLoad == 8) {
CONTENTVIEW_INITOBJECT.ajaxComplete8 = function(){
/* handle from bookmark page */
//handleFromBookMarkPage();
......@@ -298,6 +294,8 @@ CONTENTVIEW_INITOBJECT.initPage = function() {
CONTENTVIEW.isPendingContentBGM = false;
}
console.log("CONTENTVIEW_GENERAL.isFullScreen:" + CONTENTVIEW_GENERAL.isFullScreen);
CONTENTVIEW_GETDATA.getContent().setPageImages(CONTENTVIEW_GENERAL.totalPage, CONTENTVIEW_GENERAL.pageImages)
.setPageObjects(CONTENTVIEW_GENERAL.pageObjects)
.setUpPage(0);
......@@ -401,9 +399,16 @@ CONTENTVIEW_INITOBJECT.initPage = function() {
CONTENTVIEW.setViewportForWin8();
console.log("ajaxComp8 end");
};
CONTENTVIEW_INITOBJECT.ajaxComplete4 = function(){
if(CONTENTVIEW_GENERAL.contentType != COMMON.ContentTypeKeys.Type_NoFile){
return;
}
else if(CONTENTVIEW_GENERAL.nAjaxLoad == 4){
if(CONTENTVIEW_GENERAL.contentType == COMMON.ContentTypeKeys.Type_NoFile){
/* handle from bookmark page */
//handleFromBookMarkPage();
/* check move content */
......@@ -417,7 +422,6 @@ CONTENTVIEW_INITOBJECT.initPage = function() {
CONTENTVIEW.oldContent_Back();
} else {
if (CONTENTVIEW_GETDATA.getPageIndex() == 0) {
if(CONTENTVIEW_INITOBJECT.isHasPageBGM()){
CONTENTVIEW.isPendingContentBGM = true;
}
......@@ -509,7 +513,6 @@ CONTENTVIEW_INITOBJECT.initPage = function() {
ZOOM_DETECTOR.startDetectZoom({ time: 500,
callbackFunction: function (oldRatio, newRatio, oldW, oldH, newW, newH) {
CONTENTVIEW_GENERAL.currentRatio = newRatio;
}
});
var top = window.innerHeight - $("#footer_toolbar_1").height();
......@@ -522,10 +525,7 @@ CONTENTVIEW_INITOBJECT.initPage = function() {
}
CONTENTVIEW.setViewportForWin8();
}
}
});
};
//START TRB00069
......@@ -687,10 +687,40 @@ CONTENTVIEW_INITOBJECT.initPageMediaAndHtmlType = function(){
COMMON.disable('#txtSearch', '#txtSlider');
};
//ビュアーのキャンバスの表示領域をクリアする
CONTENTVIEW_INITOBJECT.clearViewerComponent = function(){
if ($('#canvasWrapper').length) {
//次回開いた時に残るので消す
var canvas = document.getElementById('main');
var context = canvas.getContext('2d');
context.clearRect(0, 0, canvas.width, canvas.height);
$('#mainPre').html('');
$('#main').html('');
$('#mainNext').html('');
$('#playvideo').html('');
$('#offscreenPre').html('');
$('#offscreen').html('');
$('#offscreenNext').html('');
$('#draw_canvas').html('');
$('#marker_canvas').html('');
$('#playaudio').html('');
$('#playaudiopage').html('');
$('#playaudioallpage').html('');
$('#text').html('');
}
};
//Start: Function: No.4 - Editor : Long - Date : 08/09/2013 - Summary : Create next and previous canvas
/* Initialize PageViewer Component */
CONTENTVIEW_INITOBJECT.initializeViewerComponent = function(viewId) {
if ($('#canvasWrapper').length) {
CONTENTVIEW_INITOBJECT.clearViewerComponent();
} else {
/* add some tags we need.*/
$('#' + viewId).prepend(
'<div id="canvasWrapper">' +
......@@ -709,7 +739,7 @@ CONTENTVIEW_INITOBJECT.initializeViewerComponent = function(viewId) {
'<div id="playaudioallpage" style="width:0px; height:0px;"></div>' +
'<div id="text"></div>'
);
}
/* apply css style */
......@@ -901,3 +931,6 @@ CONTENTVIEW_INITOBJECT.initImageCheckMarking = function() {
}
};
CONTENTVIEW_INITOBJECT.ready = function(){
};
abvw/js/contentview_Maker.js
......@@ -6,11 +6,6 @@
//名前空間用のオブジェクトを用意する
var CONTENTVIEW_MAKER = {};
CONTENTVIEW_MAKER.maker_Size;
//CONTENTVIEW_MAKER.maker_color;
CONTENTVIEW_MAKER.maker_targetDiv;
CONTENTVIEW_MAKER.maker_chooseColor;
CONTENTVIEW_MAKER.ShowMaker = function(targetId){
CONTENTVIEW_MAKER.maker_targetDiv = targetId;
I18N.i18nReplaceText();
......@@ -365,6 +360,16 @@ CONTENTVIEW_MAKER.Maker_colorWrapperMouseLeaveFunction = function() {
//END FIXCSS
};
$(function () {
CONTENTVIEW_MAKER.ready();
});
CONTENTVIEW_MAKER.ready = function(){
CONTENTVIEW_MAKER.maker_Size = undefined;
CONTENTVIEW_MAKER.maker_targetDiv = undefined;
CONTENTVIEW_MAKER.maker_chooseColor = undefined;
};
/// ===============================================================================================
/// Maker group [ end ]
/// ===============================================================================================
abvw/js/contentview_Marking.js
......@@ -419,6 +419,7 @@ CONTENTVIEW_MARKING.enableButtonMarking = function(){
};
CONTENTVIEW_MARKING.ShowMarking = function() {
//$("#dlgMarking_body").show();
//$("#dlgMarking_body").addClass('markingBoxBody_on');
//$("#dlgMarking_body").removeClass('markingBoxBody_on');
......@@ -458,6 +459,10 @@ CONTENTVIEW_MARKING.ShowMarking = function() {
// Setting dialog
$(function () {
CONTENTVIEW_MARKING.ready();
});
CONTENTVIEW_MARKING.ready = function(){
//$("#dlgMarking_dspSave").click(CONTENTVIEW_MARKING.dlgMarking_dspSave_click);
$("#dlgMarking_dspSave").on({
......@@ -618,8 +623,8 @@ $(function () {
revert: false
});
};
});
/// ===============================================================================================
/// Marking group [ end ]
/// ===============================================================================================
......
abvw/js/contentview_Memo.js
......@@ -2,16 +2,6 @@
//名前空間用のオブジェクトを用意する
var CONTENTVIEW_MEMO = {};
CONTENTVIEW_MEMO.targetDiv;
CONTENTVIEW_MEMO.targetX;
CONTENTVIEW_MEMO.targetY;
//CONTENTVIEW_MEMO.targetMemoId;
CONTENTVIEW_MEMO.EditIndex;
CONTENTVIEW_MEMO.saveMode;
CONTENTVIEW_MEMO.memoCallbackFunc;
CONTENTVIEW_MEMO.conid;
CONTENTVIEW_MEMO.pageid;
CONTENTVIEW_MEMO.createMemoDialog = function(){
CONTENTVIEW_MEMO.targetDiv.show();
CONTENTVIEW_MEMO.targetDiv.html('');
......@@ -304,3 +294,20 @@ CONTENTVIEW_MEMO.editJqueryUIDialog = function(){
CONTENTVIEW_MEMO.targetDiv.parent().addClass('parentMemoDialogImportantCss');
};
$(function () {
CONTENTVIEW_MEMO.ready();
});
CONTENTVIEW_MEMO.ready = function(){
CONTENTVIEW_MEMO.targetDiv = undefined;
CONTENTVIEW_MEMO.targetX = undefined;
CONTENTVIEW_MEMO.targetY = undefined;
CONTENTVIEW_MEMO.EditIndex = undefined;
CONTENTVIEW_MEMO.saveMode = undefined;
CONTENTVIEW_MEMO.memoCallbackFunc = undefined;
CONTENTVIEW_MEMO.conid = undefined;
CONTENTVIEW_MEMO.pageid = undefined;
};
abvw/js/contentview_Paint.js
......@@ -445,3 +445,6 @@ CONTENTVIEW_PAINT.drawPoint = function(coors, context_draw) {
}
};
CONTENTVIEW_PAINT.ready = function(){
};
abvw/js/contentview_Pen.js
......@@ -5,11 +5,6 @@
//名前空間用のオブジェクトを用意する
var CONTENTVIEW_PEN = {};
CONTENTVIEW_PEN.pen_Size;
//CONTENTVIEW_PEN.pen_Color;
CONTENTVIEW_PEN.pen_targetDiv;
CONTENTVIEW_PEN.pen_chooseColor;
CONTENTVIEW_PEN.ShowPen = function(targetId) {
CONTENTVIEW_PEN.pen_targetDiv = targetId;
I18N.i18nReplaceText();
......@@ -370,3 +365,13 @@ CONTENTVIEW_PEN.Pen_colorWrapperMouseLeaveFunction = function() {
//END FIXCSS
};
$(function () {
CONTENTVIEW_PEN.ready();
});
CONTENTVIEW_PEN.ready = function(){
CONTENTVIEW_PEN.pen_Size = undefined;
CONTENTVIEW_PEN.pen_targetDiv = undefined;
CONTENTVIEW_PEN.pen_chooseColor = undefined;
};
abvw/js/contentview_PopupText.js
......@@ -2,9 +2,6 @@
//名前空間用のオブジェクトを用意する
var CONTENTVIEW_POPUPTEXT = {};
CONTENTVIEW_POPUPTEXT.popuptext_dialogDiv;
CONTENTVIEW_POPUPTEXT.popuptext_arrowDiv;
///ShowDialog
///direction: arrow value: 0: top right
/// 1: bottom right
......@@ -116,3 +113,12 @@ CONTENTVIEW_POPUPTEXT.MailTo = function(email, subject) {
window.open("mailto:" + email + "?subject=" + subject, '_self');
};
$(function () {
CONTENTVIEW_POPUPTEXT.ready();
});
CONTENTVIEW_POPUPTEXT.ready = function(){
CONTENTVIEW_POPUPTEXT.popuptext_dialogDiv = undefined;
CONTENTVIEW_POPUPTEXT.popuptext_arrowDiv = undefined;
};
abvw/js/contentview_Streaming.js
......@@ -2,13 +2,6 @@
//名前空間用のオブジェクトを用意する
var CONTENTVIEW_STREAMING = {};
CONTENTVIEW_STREAMING.isShowMenu = false;
CONTENTVIEW_STREAMING.ready = function(){
//CONTENTVIEW.handleDisplayToolbar();
};
CONTENTVIEW_STREAMING.movePage = function(pageNo){
......@@ -77,8 +70,15 @@ CONTENTVIEW_STREAMING.handleDisplayToolbar = function(){
};
CONTENTVIEW_STREAMING.debugLog = function(msg){
//$("#debug").html(msg);
};
$(function () {
CONTENTVIEW_STREAMING.ready();
});
CONTENTVIEW_STREAMING.ready = function(){
CONTENTVIEW_STREAMING.isShowMenu = false;
};
abvw/js/detail.js
......@@ -115,7 +115,9 @@ DETAIL.openContentDetail = function() {
// Close content detail
DETAIL.contentDetailClose_Click = function(e) {
if( e != null ){
e.preventDefault();
}
COMMON.unlockLayout();
$("#contentDetail").hide();
$("#sectionContentDetail").hide();
......@@ -201,7 +203,14 @@ DETAIL.contentdetail_dspRead_Click_callback = function(outputId) {
HEADER.viewLinkContentById(ClientData.contentInfo_contentId());
}
else {
AVWEB.avwScreenMove(COMMON.ScreenIds.ContentView);
//AVWEB.avwScreenMove(COMMON.ScreenIds.ContentView);
//試験
if( $('#bookshelf').length || $('#list').length ){
//詳細閉じる
DETAIL.contentDetailClose_Click(null);
//ビューア表示
HOME.showContentView();
}
}
};
......
abvw/js/home.js
......@@ -185,7 +185,7 @@ $(document).ready(function () {
if( ClientData.serviceOpt_catalog_edition() == 'Y'){
$('.tabUnit').hide();
//センタリングするようサイズ調整
$('#main').width(660);
$('#bookshelf-main').width(660);
} else {
$('.tabUnit').show();
}
......@@ -595,7 +595,11 @@ HOME.canvasClickFunction_callback = function(outputId)
}
else{
//Go to Conten view page
AVWEB.avwScreenMove(COMMON.ScreenIds.ContentView);
//AVWEB.avwScreenMove(COMMON.ScreenIds.ContentView);
//試験
HOME.showContentView();
}
//Start Function : No.12 -- Editor : Le Long -- Date : 07/31/2013 -- Summary : check for download content type other.
......@@ -1328,7 +1332,9 @@ HOME.readSubmenuFunction_callback = function(contentId)
}
else{
//Go to Conten view page
AVWEB.avwScreenMove(COMMON.ScreenIds.ContentView);
//AVWEB.avwScreenMove(COMMON.ScreenIds.ContentView);
//試験
HOME.showContentView();
}
//Start Function : No.12 -- Editor : Le Long -- Date : 07/31/2013 -- Summary : Add ContentType to Storage.
};
......@@ -2595,3 +2601,43 @@ 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(){
//試験
$("#header-ws").hide();
$("#ws-body").hide();
$("#topcontrol").hide();
CONTENTVIEW_INITOBJECT.clearViewerComponent();
CONTENTVIEW.cssInit();
$("#viewer").show();
CONTENTVIEW.ready();
};
custom/daihatsu/abvw/contentview.html
......@@ -49,6 +49,7 @@
<script type="text/javascript" src="./js/contentview_3d.js?#UPDATEID#"></script>
<script type="text/javascript" src="./js/contentview_ContentTypeNone.js?#UPDATEID#"></script>
<script type="text/javascript" src="./js/contentview_ImagePreview.js?#UPDATEID#"></script>
<script type="text/javascript" src="./js/contentview_FileSystem.js?__UPDATEID__"></script>
<script type="text/javascript" src="./common/js/zoomDetector.js?#UPDATEID#" ></script>
<link rel="stylesheet" type="text/css" href="css/reset.css?#UPDATEID#" />
......
login.html
......@@ -72,7 +72,7 @@
<div id="fade"></div>
-->
<div class="wrapper">
<div id="main">
<div id="main-ws">
<ul class="floatR" id="menu-language"><li class="language"><a id="language-ja"><img src="./abvw/img/common/flg_jpn.png" width="29" height="20"></a></li><li class="language"><a id="language-en"><img src="./abvw/img/common/flg_usa.png" width="29" height="20"></a></li><li class="language"><a id="language-ko"><img src="./abvw/img/common/flg_kor.png" width="29" height="20"></a></li></ul>
<article>
<img src="./abvw/img/login/logo_login.png" width="200" class="clearboth" id="logologin">
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment