Skip to content

C
check
Commit a5867168 by Masaru Abe
Options

戻るボタン対応途中版

parent 8e6bbfc1
Showing with 214 additions and 84 deletions
abvw/css/layout/common.css
......@@ -54,8 +54,3 @@ 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/contentsearch.css
......@@ -235,7 +235,7 @@ a:hover.btn_bott{
right: 20px;
top: 50px;
}
section
#main-ws section
{
}
......
abvw/css/layout/list_shiori.css
......@@ -230,17 +230,17 @@ section#bottom {
margin-top: 10px;
display: block;
}
#list .wrapper #main article section .cnt_section .img .band_horizontal {
#bookmark .wrapper_ws #main-ws article section .cnt_section .img .band_horizontal {
position: absolute;
top: -4px;
left: 1px;
}
#list .wrapper #main article section .cnt_section .img .band_vertical {
#bookmark .wrapper_ws #main-ws article section .cnt_section .img .band_vertical {
position: absolute;
left: 40px;
top: -4px;
}
#list .wrapper #main article section .cnt_section .text .info .pic li .read {
#bookmark .wrapper_ws #main-ws article section .cnt_section .text .info .pic li .read {
position: absolute;
right: 20px;
top: 50px;
......
abvw/css/layout/setting.css
......@@ -56,14 +56,14 @@ body{
/* 5. .section setting */
/*----------------------------*/
#main{
#main-ws{
width: 960px;
padding: 0;
margin-right: auto;
margin-left: auto;
}
article{
#main-ws article{
width: 960px;
/*height: 900px;*/
padding: 0;
......
abvw/css/theme/contentsearch.css
......@@ -190,7 +190,7 @@ a:hover.btn_bott{
.cnt_section_list .text .info .pic li .read {
}
section
#main-ws section
{
border-top: 1px dashed #cccccc;
}
......
abvw/css/theme/header.css
......@@ -106,29 +106,28 @@
.cnt_header .menu_language ul.pushMessage a:hover { text-decoration: none; }
.common_header .cnt_header .menu_language ul li a img { display: inline; }
.common_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;
}
.common_header .cnt_header .menu_language .button .menuIcon img { display: inline; }
.common_header .cnt_header .menu_language ul li a#jQueryPush{
.header_ws .cnt_header .menu_language .button .menuIcon img { display: inline; }
.header_ws .cnt_header .menu_language ul li a#jQueryPush{
text-decoration: none !important;
color:#333;
}
.common_header .cnt_header .menu_language .button {
.header_ws .cnt_header .menu_language .button {
}
.common_header .cnt_header .menu_language #header-searchbox {
.header_ws .cnt_header .menu_language #header-searchbox {
background-color: #FFFFFF;
border: 1px solid #CCCCCC;
}
.common_header .cnt_header .menu_language #header-searchbox span
.header_ws .cnt_header .menu_language #header-searchbox span
{
}
.common_header .cnt_header .menu_language #header-searchbox a#searchbox-search {
.header_ws .cnt_header .menu_language #header-searchbox a#searchbox-search {
-moz-box-shadow: inset 0px 1px 0px 0px #86ACC7;
-webkit-box-shadow: inset 0px 1px 0px 0px #86ACC7;
box-shadow: inset 0px 1px 0px 0px #86ACC7;
......@@ -139,7 +138,7 @@
border: 1px solid #0C274D;
color: #ffffff;
}
.common_header .cnt_header .menu_language #header-searchbox a#searchbox-search:hover {
.header_ws .cnt_header .menu_language #header-searchbox a#searchbox-search:hover {
background:-webkit-gradient( linear, left top, left bottom, color-stop(0.05, #23486F), color-stop(1, #36638B) );
background:-moz-linear-gradient( center top, #23486F 5%, #36638B 100% );
filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#23486F', endColorstr='#36638B');
......@@ -167,8 +166,8 @@ a#searchbox-search:active{
background: url(../../img/common/icon_triangle_d.png) no-repeat right 5px;
}
.tops ul.sort li.current a.ascending_sort{
color:#2d83da;
background:url(../../img/common/icon_triangle_u.png) no-repeat right 5px;
color:#2d83da;
background:url(../../img/common/icon_triangle_u.png) no-repeat right 5px;
}
.tops ul.sort li b{
font-weight: normal;
......@@ -197,7 +196,7 @@ background:url(../../img/common/icon_triangle_u.png) no-repeat right 5px;
background:url(../../img/data_loading.gif) no-repeat center;
}
.common_header .cnt_header .menu_login .username {
.header_ws .cnt_header .menu_login .username {
overflow: hidden;
-o-text-overflow: ellipsis;
-webkit-text-overflow: ellipsis;
......
abvw/css/theme/list_shiori.css
......@@ -211,15 +211,15 @@ a.delete:hover:not(:target) {
section#bottom {
border-top: 1px dashed #cccccc;
}
#list .wrapper #main article section .cnt_section .img .band_horizontal {
#bookmark .wrapper_ws #main-ws article section .cnt_section .img .band_horizontal {
}
#list .wrapper #main article section .cnt_section .img .band_vertical {
#bookmark .wrapper_ws #main-ws article section .cnt_section .img .band_vertical {
}
#list .wrapper #main article section .cnt_section .text .info .pic li .read {
#bookmark .wrapper_ws #main-ws article section .cnt_section .text .info .pic li .read {
}
.shioriNotExist
{
font-size: 16px;
color: #f00;
}
\ No newline at end of file
}
abvw/css/theme/setting.css
......@@ -54,11 +54,11 @@ body{
/* 5. .section setting */
/*----------------------------*/
#main{
#main-ws{
background-color: #EDF2F2;
}
article{
#main-ws article{
}
.sectionSetting{
......
abvw/home.html
......@@ -17,7 +17,7 @@
<link rel="stylesheet" type="text/css" href="common/css/jquery.treeview.css?__UPDATEID__" />
<link rel="stylesheet" type="text/css" href="common/css/screen.css?__UPDATEID__" />
<link rel="stylesheet" type="text/css" href="css/reset.css?#UPDATEID#" />
<link rel="stylesheet" type="text/css" href="css/reset.css?__UPDATEID__" />
<link rel="stylesheet" type="text/css" href="css/layout/common.css?__UPDATEID__" />
<link rel="stylesheet" type="text/css" href="css/theme/common.css?__UPDATEID__" />
......@@ -42,14 +42,14 @@
<link rel="stylesheet" type="text/css" href="css/layout/limit_access.css?__UPDATEID__" />
<link rel="stylesheet" type="text/css" href="css/theme/limit_access.css?__UPDATEID__" />
<!-- ビュー -->
<!-- link rel="stylesheet" type="text/css" href="css/reset.css?#UPDATEID#" / -->
<link rel="stylesheet" type="text/css" href="css/layout/viewer.css?#UPDATEID#" />
<link rel="stylesheet" type="text/css" href="css/theme/viewer.css?#UPDATEID#" />
<link rel="stylesheet" type="text/css" href="common/css/jquery.powertip.css?#UPDATEID#" />
<link rel="stylesheet" type="text/css" href="css/layout/Anket.css?#UPDATEID#" />
<link rel="stylesheet" type="text/css" href="css/theme/Anket.css?#UPDATEID#" />
<link rel="stylesheet" type="text/css" href="css/delete_shiori.css?#UPDATEID#" />
<!-- CSSビュー -->
<!-- link rel="stylesheet" type="text/css" href="css/reset.css?__UPDATEID__" / -->
<link rel="stylesheet" type="text/css" href="css/layout/viewer.css?__UPDATEID__" />
<link rel="stylesheet" type="text/css" href="css/theme/viewer.css?__UPDATEID__" />
<link rel="stylesheet" type="text/css" href="common/css/jquery.powertip.css?__UPDATEID__" />
<link rel="stylesheet" type="text/css" href="css/layout/Anket.css?__UPDATEID__" />
<link rel="stylesheet" type="text/css" href="css/theme/Anket.css?__UPDATEID__" />
<link rel="stylesheet" type="text/css" href="css/delete_shiori.css?__UPDATEID__" />
<script type="text/javascript" src="./common/js/jquery-1.8.1.min.js?__UPDATEID__"></script>
<script type="text/javascript" src="./common/js/jquery-ui-1.8.23.custom.min.js?__UPDATEID__"></script>
......@@ -69,32 +69,32 @@
<script type="text/javascript" src="./common/js/screenLock.js?__UPDATEID__" ></script>
<script type="text/javascript" src="./js/detail.js?__UPDATEID__" ></script>
<!-- ビュー -->
<script type="text/javascript" src="./common/js/jquery.ui.touch-punch.min.js?#UPDATEID#"></script>
<script type="text/javascript" src="./common/js/htmlparser.js?#UPDATEID#"></script>
<script type="text/javascript" src="./common/js/textObject.js?#UPDATEID#"></script>
<script type="text/javascript" src="./js/contentview_CallApi.js?#UPDATEID#" ></script>
<script type="text/javascript" src="./js/contentview_Events.js?#UPDATEID#" ></script>
<script type="text/javascript" src="./js/contentview_GetData.js?#UPDATEID#" ></script>
<script type="text/javascript" src="./js/contentview_InitObjects.js?#UPDATEID#" ></script>
<script type="text/javascript" src="./js/contentview_CreateObjects.js?#UPDATEID#" ></script>
<script type="text/javascript" src="./js/contentview_General.js?#UPDATEID#" ></script>
<script type="text/javascript" src="./js/contentview.js?#UPDATEID#"></script>
<script type="text/javascript" src="./js/contentview_Memo.js?#UPDATEID#"></script>
<script type="text/javascript" src="./js/contentview_Gomu.js?#UPDATEID#"></script>
<script type="text/javascript" src="./js/contentview_Maker.js?#UPDATEID#"></script>
<script type="text/javascript" src="./js/contentview_Pen.js?#UPDATEID#"></script>
<script type="text/javascript" src="./js/contentview_Marking.js?#UPDATEID#"></script>
<script type="text/javascript" src="./js/contentview_PopupText.js?#UPDATEID#"></script>
<script type="text/javascript" src="./js/contentview_Paint.js?#UPDATEID#"></script>
<script type="text/javascript" src="./js/contentview_Anket.js?#UPDATEID#"></script>
<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>
<!-- JSビュー -->
<script type="text/javascript" src="./common/js/jquery.ui.touch-punch.min.js?__UPDATEID__"></script>
<script type="text/javascript" src="./common/js/htmlparser.js?__UPDATEID__"></script>
<script type="text/javascript" src="./common/js/textObject.js?__UPDATEID__"></script>
<script type="text/javascript" src="./js/contentview_CallApi.js?__UPDATEID__" ></script>
<script type="text/javascript" src="./js/contentview_Events.js?__UPDATEID__" ></script>
<script type="text/javascript" src="./js/contentview_GetData.js?__UPDATEID__" ></script>
<script type="text/javascript" src="./js/contentview_InitObjects.js?__UPDATEID__" ></script>
<script type="text/javascript" src="./js/contentview_CreateObjects.js?__UPDATEID__" ></script>
<script type="text/javascript" src="./js/contentview_General.js?__UPDATEID__" ></script>
<script type="text/javascript" src="./js/contentview.js?__UPDATEID__"></script>
<script type="text/javascript" src="./js/contentview_Memo.js?__UPDATEID__"></script>
<script type="text/javascript" src="./js/contentview_Gomu.js?__UPDATEID__"></script>
<script type="text/javascript" src="./js/contentview_Maker.js?__UPDATEID__"></script>
<script type="text/javascript" src="./js/contentview_Pen.js?__UPDATEID__"></script>
<script type="text/javascript" src="./js/contentview_Marking.js?__UPDATEID__"></script>
<script type="text/javascript" src="./js/contentview_PopupText.js?__UPDATEID__"></script>
<script type="text/javascript" src="./js/contentview_Paint.js?__UPDATEID__"></script>
<script type="text/javascript" src="./js/contentview_Anket.js?__UPDATEID__"></script>
<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>
<script type="text/javascript" src="./common/js/jquery.powertip.js?#UPDATEID#"></script>
<script type="text/javascript" src="./common/js/script.js?#UPDATEID#"></script>
<script type="text/javascript" src="./common/js/zoomDetector.js?__UPDATEID__" ></script>
<script type="text/javascript" src="./common/js/jquery.powertip.js?__UPDATEID__"></script>
<script type="text/javascript" src="./common/js/script.js?__UPDATEID__"></script>
<script type="text/javascript">
$(function () {
......@@ -229,7 +229,6 @@ $(function () {
</div>
<!-- ホームエリア TO -->
<div id="inc_detail" ></div>
<!-- Hカスタム -->
......
abvw/js/bookmark.js
......@@ -192,7 +192,11 @@ BOOKMARK.dspRead_Click_callback = function(data) {
ClientData.bookmark_pageNo(data.pageNo);
ClientData.contentInfo_contentType(data.contentType);
ClientData.IsRefresh(false);
AVWEB.avwScreenMove(COMMON.ScreenIds.ContentView);
//AVWEB.avwScreenMove(COMMON.ScreenIds.ContentView);
//表示
BOOKMARK.showContentView();
};
// Cancel dialog of deleting
......@@ -900,3 +904,40 @@ BOOKMARK.IsExistContent = function(strContentId) {
Setting dialog [ end ]
----------------------------------------------------------------------------
*/
BOOKMARK.showContentView = function(){
//試験
$("#header-ws").hide();
$("#ws-body").hide();
$("#topcontrol").hide();
CONTENTVIEW_INITOBJECT.clearViewerComponent();
CONTENTVIEW.cssInit();
$("#viewer").show();
CONTENTVIEW.ready();
};
BOOKMARK.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'
});
};
abvw/js/contentsearch.js
......@@ -825,7 +825,10 @@ CONTENTSEARCH.readSubmenuFunction_callback = function(contentId)
}
else{
//Go to Conten view page
AVWEB.avwScreenMove(COMMON.ScreenIds.ContentView);
//AVWEB.avwScreenMove(COMMON.ScreenIds.ContentView);
CONTENTSEARCH.showContentView();
}
//End Function : No.12 -- Editor : Le Long -- Date : 08/02/2013 -- Summary : Check content type other for download.
};
......@@ -1387,3 +1390,39 @@ CONTENTSEARCH.showContentShareDlgFunction = function(e) {
};
CONTENTSEARCH.showContentView = function(){
//試験
$("#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'
});
};
abvw/js/contentview.js
......@@ -12,13 +12,6 @@ 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()) {
......
abvw/js/contentview_Events.js
......@@ -1424,11 +1424,27 @@ CONTENTVIEW_EVENTS.imgBack_click = function() {
//試験
$("#viewer").hide();
HOME.cssInit();
$("#header-ws").show();
$("#ws-body").show();
$("#topcontrol").show();
if( $('#bookshelf').length || $('#list').length ){
HOME.cssInit();
$("#header-ws").show();
$("#ws-body").show();
$("#topcontrol").show();
} else if( $('#bookmark').length ){
BOOKMARK.cssInit();
$("#header-ws").show();
$("#ws-body").show();
$("#topcontrol").show();
} else if( $('#history').length ){
HISTORY.cssInit();
$("#header-ws").show();
$("#ws-body").show();
$("#topcontrol").show();
} else if( $('#contentsearch').length ){
CONTENTSEARCH.cssInit();
$("#header-ws").show();
$("#ws-body").show();
$("#topcontrol").show();
}
}
} else {
/*check back */
......
abvw/js/detail.js
......@@ -205,11 +205,20 @@ DETAIL.contentdetail_dspRead_Click_callback = function(outputId) {
else {
//AVWEB.avwScreenMove(COMMON.ScreenIds.ContentView);
//試験
//詳細閉じる
DETAIL.contentDetailClose_Click(null);
if( $('#bookshelf').length || $('#list').length ){
//詳細閉じる
DETAIL.contentDetailClose_Click(null);
//ビューア表示
HOME.showContentView();
} else if( $('#bookmark').length ){
//ビューア表示
BOOKMARK.showContentView();
} else if( $('#history').length ){
//ビューア表示
HISTORY.showContentView();
} else if( $('#contentsearch').length ){
//ビューア表示
CONTENTSEARCH.showContentView();
}
}
};
......
abvw/js/history.js
......@@ -679,7 +679,10 @@ HISTORY.readSubmenuFunction_callback = function(contentId){
}
else{
//Go to Conten view page
AVWEB.avwScreenMove(COMMON.ScreenIds.ContentView);
//AVWEB.avwScreenMove(COMMON.ScreenIds.ContentView);
HISTORY.showContentView();
}
//End Function : No.12 -- Editor : Le Long -- Date : 08/02/2013 -- Summary : Check content type other for download.
};
......@@ -1492,3 +1495,40 @@ HISTORY.showContentShareDlgFunction = function(e) {
};
HISTORY.showContentView = function(){
//試験
$("#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'
});
};
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