9/18 リリース

0b1b7d46 · Vo Duc Thang · b52fe1ff · 0b1b7d46 · 0b1b7d46 · 0b1b7d46
Commit 0b1b7d46 authored Sep 18, 2013 by Vo Duc Thang
27 changed files
--- a/abvw/bookmark.html
+++ b/abvw/bookmark.html
@@ -89,11 +89,11 @@
            </div>
            <ul class="button">
                <li class="floatL">
-                    <a href="#" id="liPushMessage"><span class="pushMessage"><span class="lang" lang="txtPushAlert">新着 : </span><span id="numbermessage"></span></span></a>
+                    <a href="#" id="liPushMessage"><span class="pushMessage"><span class="icon"></span> <span class="lang" lang="txtPushAlert">新着 : </span><span id="numbermessage"></span><span class="arrow"></span></span></a>
                    <div id="accordion" style="display:none;">
                    <div id="show-push-message"></div>
                        <div class="pagechange clearfix">
-                            <a href="#"class="floatL lang" id='prev-page-message' lang="txtPrevious">＜＜前へ</a><a class="floatR lang" id='next-page-message'  lang="txtNext">次へ＞＞</a></span>
+                            <a class="floatL lang" id='prev-page-message' lang="txtPrevious">＜＜前へ</a><a class="floatR lang" id='next-page-message'  lang="txtNext">次へ＞＞</a>
                        </div>
                    </div>
                </li>  

--- a/abvw/common/json/lang/lang-en.json
+++ b/abvw/common/json/lang/lang-en.json
@@ -64,7 +64,7 @@
 "dspBkCancel":"Logout",
 "txtSearchResult":"Result",
 "dspHome":"Home",
-"txtLoginUser":"(Ver.20130917)User:",
+"txtLoginUser":"(Ver.20130918)User:",
 "txtAll":"All",
 "txtMkgSize":"Size",
 "txtMkgS":"S",

--- a/abvw/common/json/lang/lang-ja.json
+++ b/abvw/common/json/lang/lang-ja.json
@@ -64,7 +64,7 @@
 "dspBkCancel":"バックアップせずにログアウト",
 "txtSearchResult":"検索結果",
 "dspHome":"ホーム",
-"txtLoginUser":"(Ver.20130917)ログイン中：",
+"txtLoginUser":"(Ver.20130918)ログイン中：",
 "txtAll":"すべて",
 "txtMkgSize":"太さ",
 "txtMkgS":"小",

--- a/abvw/common/json/lang/lang-ko.json
+++ b/abvw/common/json/lang/lang-ko.json
@@ -64,7 +64,7 @@
 "dspBkCancel":"로그아웃",
 "txtSearchResult":"검색 결과",
 "dspHome":"홈",
-"txtLoginUser":"(Ver.20130917)로그인 중:",
+"txtLoginUser":"(Ver.20130918)로그인 중:",
 "txtAll":"전체",
 "txtMkgSize":"두께",
 "txtMkgS":"소",

--- a/abvw/contentsearch.html
+++ b/abvw/contentsearch.html
@@ -89,11 +89,11 @@
            </div>
            <ul class="button">
                <li class="floatL">
-                    <a href="#" id="liPushMessage"><span class="pushMessage"><span class="lang" lang="txtPushAlert">新着 : </span><span id="numbermessage"></span></span></a>
+                    <a href="#" id="liPushMessage"><span class="pushMessage"><span class="icon"></span> <span class="lang" lang="txtPushAlert">新着 : </span><span id="numbermessage"></span><span class="arrow"></span></span></a>
                    <div id="accordion" style="display:none;">
                    <div id="show-push-message"></div>
                        <div class="pagechange clearfix">
-                            <a href="#"class="floatL lang" id='prev-page-message' lang="txtPrevious">＜＜前へ</a><a class="floatR lang" id='next-page-message'  lang="txtNext">次へ＞＞</a></span>
+                            <a class="floatL lang" id='prev-page-message' lang="txtPrevious">＜＜前へ</a><a class="floatR lang" id='next-page-message'  lang="txtNext">次へ＞＞</a>
                        </div>
                    </div>
                </li>  
@@ -199,8 +199,8 @@
 </div>
 <article id="contentDetail" style="display:none;">    
-    <div><a class="closebtn" href="#" id="contentDetailClose"> </a>
    <section id='sectionContentDetail' class='sectionContentDetail'>
+    <a class="closebtn" href="#" id="contentDetailClose"> </a>
            <div id="book_data">
                <p class="book_img"><img src="" id="imgContentThumbnail" alt="" height="25px" width="25px" /></p>
                <ul>
@@ -213,7 +213,6 @@
            <div id="book_list"></div>        
        </section>
-    </div>
 </article>
 <footer>

--- a/abvw/contentview.html
+++ b/abvw/contentview.html
@@ -61,7 +61,8 @@
 <link type="text/css" rel="stylesheet" href="css/theme/viewer.css" /> 
 <link type="text/css" rel="stylesheet" href="./common/css/jquery.treeview.css" />
 <link type="text/css" rel="stylesheet" href="./common/css/jquery.powertip.css" />
-<link type="text/css" rel="stylesheet" href="css/Anket.css" />
+<link type="text/css" rel="stylesheet" href="css/layout/Anket.css" />
+<link type="text/css" rel="stylesheet" href="css/theme/Anket.css" />
 <script type="text/javascript" src="common/js/jquery.powertip.js"></script>
 <script type="text/javascript" src="common/js/script.js"></script>

--- a/abvw/css/layout/Anket.css
+++ b/abvw/css/layout/Anket.css
+.anket-dialog
+{
+    position: fixed;
+    z-index:1000;         
+}
+.anket-dialog h1
+{
+    text-align:left;
+    height:25px;
+    line-height:25px;
+    margin:0;
+    padding:0 0 0 5px;  
+}
+.anket-dialog .anket-container
+{
+}
+.anket-dialog .anket-container iframe
+{
+    -webkit-overflow-scrolling: touch !important;
+    overflow: scroll !important;
+}
+.anket-dialog .anket-commands
+{
+    text-align:center;
+    height:60px;
+    line-height:60px;
+    margin:0;
+    padding:0;
+}
+.anket-dialog .anket-commands input[type='button']
+{
+    padding:0 10px;
+    cursor:pointer;
+    margin-right:5px;
+    width:100px;
+    height:30px;
+    line-height:30px;
+}
+.anket-dialog .anket-commands input[type='button']:hover
+{
+}
\ No newline at end of file
--- a/abvw/css/layout/accordion.css
+++ b/abvw/css/layout/accordion.css
@@ -26,7 +26,7 @@
 	left: 24px;
 	top: 28px;
 	text-align: left;
-	z-index: 9999;
+	z-index: 99;
 }
 .cnt_header .menu_language .button #accordion h5{
 	padding: 5px 10px;
@@ -80,7 +80,8 @@ a#searchbtn:active{
 }
 #numbermessage
 {
-    padding-left:5px;
+    /*padding-left:5px;*/
+    padding:0 5px;
    white-space:nowrap;
    display:inline-block;
    min-width:15px;

--- a/abvw/css/layout/header.css
+++ b/abvw/css/layout/header.css
@@ -102,13 +102,28 @@ header{
 }
 .cnt_header .menu_language ul .pushMessage {
-    /*width: 90px;*/
    text-align: center;
    line-height: 25px;
    display: inline-block;
-    /*position: absolute;*/
+    padding:0;
-    padding:0 20px 0 25px;
 }
+.cnt_header .menu_language ul .pushMessage span
+{
+    float:left;
+    display:block;
+    height:25px;
+}
+.cnt_header .menu_language ul .pushMessage .icon
+{
+    width:26px;
+}
+.cnt_header .menu_language ul .pushMessage .arrow
+{
+    width:6px;
+    margin-right:5px;
+}
 .cnt_header .menu_language ul.pushMessage a:hover { }

--- a/abvw/css/layout/list_shirori_detail.css
+++ b/abvw/css/layout/list_shirori_detail.css
@@ -16,12 +16,15 @@
 	-moz-border-radius: 10px 10px 10px 10px;
 	border-radius: 10px 10px 10px 10px;
 	min-height: 505px;
+	/*position:relative;*/
 }
 .closebtn {
 	width: 30px;
 	height: 30px;
 	display: block;
-	margin-left: 660px;
+	margin-left: 656px;
+	margin-top:3px;
+	position:absolute;
 }
 .sectiondetail #book_data {
 	width: 245px;
@@ -97,7 +100,7 @@
 }
 .sectiondetail #book_list {
 	width: 395px;
-	margin-right: 25px;
+	margin-right: 35px;
 	margin-top: 5px;
 	float: right;
 }
@@ -143,7 +146,9 @@
 /* section for detail no pdf */
-.sectiondetailnopdf{
+.sectiondetailnopdf
+{
+    /*position:relative;*/
 	width: 690px;	
 	display: block;
 	padding: 0;

--- a/abvw/css/layout/setting.css
+++ b/abvw/css/layout/setting.css
@@ -368,6 +368,7 @@ div#user_option ul li input.chkbx {
 #cboAnimation
 {
    margin-left:120px;
+    width:140px;
 }
 .lblOptPageTransPeriod
 {

--- a/abvw/css/layout/viewer.css
+++ b/abvw/css/layout/viewer.css
@@ -70,6 +70,7 @@ header{
    min-width: 1000px;
    height: 60px;
    overflow: hidden;
+    position: relative;
 }
 .wrapper_header{
@@ -280,7 +281,7 @@ section{
 aside.markingBox {
    width:160px;
    display:block;
-    position:absolute;
+    position:fixed;
    left:250px;
    z-index: 1;
 }
@@ -1497,7 +1498,7 @@ div .ui-slider-range, .ui-widget-header, .ui-slider-range-max {
    width:466px;
    height:389px;
    display:none;
-    position: absolute;
+    position: fixed;
 }
 /* Box Memo  dialog [end]*/

--- a/abvw/css/theme/Anket.css
+++ b/abvw/css/theme/Anket.css
+.anket-dialog
+{
+    border:solid 1px #333;
+    background-color:#fff;      
+}
+.anket-dialog h1
+{
+    color:#fff; 
+    background:url(../../img/viewer/article_bg.png) 0 0 repeat;     
+}
+.anket-dialog .anket-container
+{
+}
+.anket-dialog .anket-container iframe
+{
+}
+.anket-dialog .anket-commands
+{
+    border-top:solid 1px #333;
+}
+.anket-dialog .anket-commands input[type='button']
+{
+    border-radius:10px;
+    border:solid 1px #333;
+    background-color:#ccc;
+    cursor:pointer;
+}
+.anket-dialog .anket-commands input[type='button']:hover
+{
+    background-color:#fff;
+}
\ No newline at end of file
--- a/abvw/css/theme/backup.css
+++ b/abvw/css/theme/backup.css
@@ -54,8 +54,23 @@
 .sectionbackup .backupbtn {
 }
-.sectionbackup .backupbtn a.ok {
+.sectionbackup .backupbtn a.ok 
+{
+}
+.sectionbackup .backupbtn a.disabled
+{
+    cursor:default;
+    color:#9e9e9e;
+    pointer-events: none;
+}
+.sectionbackup .backupbtn a.disabled:hover
+{
+    background:-webkit-gradient( linear, left top, left bottom, color-stop(0.05, #36638B), color-stop(1, #23486F) );
+	background:-moz-linear-gradient( center top, #36638B 5%, #83c008 100% );
+	filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#36638B', endColorstr='#23486F');
+	background-color:#23486F;
 }
 .sectionbackup .backupbtn a.cancel {
 }
 .sectionbackup .backupbtn a 
@@ -137,6 +152,19 @@
 }
 .sectionbackup_logout .backupbtn a.ok {
 }
+.sectionbackup_logout .backupbtn a.disabled
+{
+    cursor:default;
+    color:#9e9e9e;
+    pointer-events: none;
+}
+.sectionbackup_logout .backupbtn a.disabled:hover
+{
+    background:-webkit-gradient( linear, left top, left bottom, color-stop(0.05, #36638B), color-stop(1, #23486F) );
+	background:-moz-linear-gradient( center top, #36638B 5%, #83c008 100% );
+	filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#36638B', endColorstr='#23486F');
+	background-color:#23486F;
+}
 .sectionbackup_logout .backupbtn a.cancel {
 }
 .sectionbackup_logout .backupbtn a 

--- a/abvw/css/theme/header.css
+++ b/abvw/css/theme/header.css
@@ -72,11 +72,31 @@ header{
 }
 .cnt_header .menu_language ul .pushMessage {
-    background-image: url(../../img/common/icon_newmessage.png), url(../../img/common/icon_triangle.png), url(../../img/common/box_pushmessage.jpg);
+    /*background-image: url(../../img/common/icon_newmessage.png), url(../../img/common/icon_triangle.png), url(../../img/common/box_pushmessage.jpg);
    background-repeat: no-repeat, no-repeat, repeat-x;
    background-position: 5px center, right 5px center, bottom;
+    border: solid 1px #CCCCCC;*/
+    background: url(../../img/common/box_pushmessage.jpg) repeat-x;
    border: solid 1px #CCCCCC;
 }
+.cnt_header .menu_language ul .pushMessage span
+{
+    float:left;
+    display:block;
+    height:25px;
+}
+.cnt_header .menu_language ul .pushMessage .icon
+{
+    background: url(../../img/common/icon_newmessage.png) no-repeat center;
+    width:26px;
+}
+.cnt_header .menu_language ul .pushMessage .arrow
+{
+    background: url(../../img/common/icon_triangle.png) no-repeat center;
+    width:6px;
+    margin-right:5px;
+}
 .cnt_header .menu_language ul.pushMessage a:hover { text-decoration: none; }
 header .cnt_header .menu_language ul li a img { display: inline; }

--- a/abvw/css/theme/restore.css
+++ b/abvw/css/theme/restore.css
@@ -57,6 +57,19 @@
 .sectionrestore .restorebtn {
 }
+.sectionrestore .restorebtn a.disabled
+{
+    cursor:default;
+    color:#9e9e9e;
+    pointer-events: none;
+}
+.sectionrestore .restorebtn a.disabled:hover
+{
+    background:-webkit-gradient( linear, left top, left bottom, color-stop(0.05, #36638B), color-stop(1, #23486F) );
+	background:-moz-linear-gradient( center top, #36638B 5%, #83c008 100% );
+	filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#36638B', endColorstr='#23486F');
+	background-color:#23486F;
+}
 .sectionrestore .restorebtn a.ok {
 }
 .sectionrestore .restorebtn a.cancel {

--- a/abvw/history.html
+++ b/abvw/history.html
@@ -89,11 +89,11 @@
            </div>
            <ul class="button">
                <li class="floatL">
-                    <a href="#" id="liPushMessage"><span class="pushMessage"><span class="lang" lang="txtPushAlert">新着 : </span><span id="numbermessage"></span></span></a>
+                    <a href="#" id="liPushMessage"><span class="pushMessage"><span class="icon"></span> <span class="lang" lang="txtPushAlert">新着 : </span><span id="numbermessage"></span><span class="arrow"></span></span></a>
                    <div id="accordion" style="display:none;">
                    <div id="show-push-message"></div>
                        <div class="pagechange clearfix">
-                            <a href="#"class="floatL lang" id='prev-page-message' lang="txtPrevious">＜＜前へ</a><a class="floatR lang" id='next-page-message'  lang="txtNext">次へ＞＞</a></span>
+                            <a class="floatL lang" id='prev-page-message' lang="txtPrevious">＜＜前へ</a><a class="floatR lang" id='next-page-message'  lang="txtNext">次へ＞＞</a>
                        </div>
                    </div>
                </li>  
@@ -168,8 +168,8 @@
 </div>
 <article id="contentDetail" style="display:none;">    
-    <div><a class="closebtn" href="#" id="contentDetailClose"> </a>
    <section id='sectionContentDetail' class='sectionContentDetail'>
+        <a class="closebtn" href="#" id="contentDetailClose"> </a>
            <div id="book_data">
                <p class="book_img"><img src="" id="imgContentThumbnail" alt="" height="25px" width="25px" /></p>
                <ul>
@@ -182,7 +182,6 @@
            <div id="book_list"></div>        
        </section>
-    </div>
 </article>
 <footer>

--- a/abvw/home.html
+++ b/abvw/home.html
@@ -100,11 +100,11 @@
            </div>
            <ul class="button">
                <li class="floatL">
-                    <a href="#" id="liPushMessage"><span class="pushMessage"><span class="lang" lang="txtPushAlert">新着 : </span><span id="numbermessage"></span></span></a>
+                    <a href="#" id="liPushMessage"><span class="pushMessage"><span class="icon"></span> <span class="lang" lang="txtPushAlert">新着 : </span><span id="numbermessage"></span><span class="arrow"></span></span></a>
                    <div id="accordion" style="display:none;">
                    <div id="show-push-message"></div>
                        <div class="pagechange clearfix">
-                            <a href="#"class="floatL lang" id='prev-page-message' lang="txtPrevious">＜＜前へ</a><a class="floatR lang" id='next-page-message'  lang="txtNext">次へ＞＞</a></span>
+                            <a class="floatL lang" id='prev-page-message' lang="txtPrevious">＜＜前へ</a><a class="floatR lang" id='next-page-message'  lang="txtNext">次へ＞＞</a>
                        </div>
                    </div>
                </li>  
@@ -214,8 +214,8 @@
 </section>
 <article id="contentDetail" style="display:none;">
-    <div><a class="closebtn" href="#" id="contentDetailClose"> </a>
    <section id='sectionContentDetail' class='sectionContentDetail'>
+        <a class="closebtn" href="#" id="contentDetailClose"> </a>
            <div id="book_data">
                <p class="book_img"><img src="" id="imgContentThumbnail" alt="" height="25px" width="25px" /></p>
                <ul>
@@ -228,7 +228,6 @@
            <div id="book_list"></div>        
        </section>    
-    </div>
 </article>
 <footer>

--- a/abvw/js/contentview.js
+++ b/abvw/js/contentview.js
@@ -434,7 +434,7 @@ function handleAPIWebContentPage(dataJson, pos) {
            if (nIndexBookMark != -1) { /* page exist */
                    $('#divListBookmark').append(
-                        '   <li id="' + 1 + '">' +
+                        '   <li id="' + 0 + '">' +
                        '       <img id="img_bookmark_' + bmList[nIndex].pageNo + '" class="imgbox" src="img/view_loading.gif" />' +
                        '       <span class="mdltext">' +
                                    i18nText('txtPage') + 1 + '<br /> ' +
@@ -1818,15 +1818,15 @@ function handleSliderBar() {
    /* event change txtProcess */
    $('#txtSlider').keydown(function (event) {
        if (event.keyCode == 13) {
-            if ($('#txtSlider').val() <= 0) {
+            if (parseInt($('#txtSlider').val()) <= 0) {
                $('#txtSlider').val('1');
-            } else if ($('#txtSlider').val() > totalPage) {
+            } else if (parseInt($('#txtSlider').val()) > totalPage) {
                $('#txtSlider').val(totalPage);
            } else if (/\D/g.test($('#txtSlider').val())) {
                $('#txtSlider').val('1');
            }
-            if ($('#txtSlider').val() - 1 != getPageIndex()) {
+            if (parseInt($('#txtSlider').val()) - 1 != getPageIndex()) {
                $("#slider_page").slider("value", $('#txtSlider').val());
                changePage($('#txtSlider').val() - 1);
@@ -2038,7 +2038,7 @@ function changePageWithoutSlide(pageMove) {
 /* set position model when resize*/
 function changePosDialog() {
    $("#divDialogMemo").center();
-    $("#divDialogMemo").css('position', 'absolute');
+    /*$("#divDialogMemo").css('position', 'absolute');*/
    $("#boxBookMark").center();
    $("#boxIndex").center();
    $("#boxCopyText").center();
@@ -2356,6 +2356,16 @@ $("document").ready(function () {
    if (!avwCheckLogin(ScreenIds.Login)) return;
    // Set event to prevent leave
    ToogleLogoutNortice();
+    //START TRB00048 - EDITOR : Long - Date : 09/18/2013 - Summary : Fix Jumpcontent              
+    getContentID();     
+    avwCmsApi(ClientData.userInfo_accountPath(),
+         "webGetContent",
+         "GET",
+         { contentId: contentID, sid: ClientData.userInfo_sid(), getType: 1 },
+         function (data) {
+            contentType = data.contentData.contentType;
            if (avwUserEnvObj.os == 'ipad') {
                //Start : TRB00022 - Editor : Long - Date : 08/28/2013 - Summary : For ipad rotate handling.  
@@ -2363,9 +2373,6 @@ $("document").ready(function () {
                //End : TRB00022 - Editor : Long - Date : 08/28/2013 - Summary : For ipad rotate handling.  
                if (ClientData.IsRefresh() == true) {     
-            //Get content Type
-            contentType = ClientData.contentInfo_contentType();                                  
                    //Check if is pdf content
                    if(isMediaAndHTMLContent()){
                        initPageMediaAndHtmlType();
@@ -2380,8 +2387,6 @@ $("document").ready(function () {
                }
            }
            else {
-        //Get content Type
-        contentType = ClientData.contentInfo_contentType();
                //Check if is pdf content
                if(isMediaAndHTMLContent()){
@@ -2391,6 +2396,9 @@ $("document").ready(function () {
                    initPage();
                }     
            }                                                               
+         },
+         null);      
+       //END TRB00048 - EDITOR : Long - Date : 09/18/2013 - Summary : Fix Jumpcontent
 //End Function : No.12
 });
@@ -2815,7 +2823,6 @@ ContentPage.prototype.drawPage = function (context, opt) {
        }
    }
    if(opt == null || opt == 0){
        $("#offscreen").attr('height', heightEachPage);
        $("#offscreen").attr('width', widthEachPage);
@@ -2834,7 +2841,6 @@ ContentPage.prototype.drawPage = function (context, opt) {
    img.onload = function () {
        context.drawImage(img, 0, 0, widthEachPage, heightEachPage);
        flip(opt);
        //Start Function: No.12        
        if(contentType == ContentTypeKeys.Type_PDF){
            /* draw linkList */
@@ -2847,7 +2853,8 @@ ContentPage.prototype.drawPage = function (context, opt) {
            for (var i = 0; i < objPageTemp.length; i++) {
                if (objPageTemp[i].imageUrl != null) {
                    objPageTemp[i].drawPageObject(context, opt);
-                } else {
+                } 
+                else {
                    nCountObjectLoad++;
                    if (nCountObjectLoad == pageObjects.length) {
@@ -2864,7 +2871,6 @@ ContentPage.prototype.drawPage = function (context, opt) {
                            else{
                                isLoadingObject = false;
                            }                         
                       }
                       else{
                           isLoadingObject = false;
@@ -2912,7 +2918,8 @@ ContentPage.prototype.drawPage = function (context, opt) {
                    }
                }
            }
-        } else {
+        } 
+        else {
            /* draw marking */
            drawMarkingOnScreen(opt);
@@ -2934,7 +2941,8 @@ ContentPage.prototype.drawPage = function (context, opt) {
            if (ClientData.IsAddingMarking() == true) {
                disableAllControl();
                enableButtonMarking()
-            } else {
+            } 
+            else {
                //Start Function : No.4 - Summary : make sure next or prev page is loaded 
                if(contentType == ContentTypeKeys.Type_PDF || contentType == ContentTypeKeys.Type_NoFile){
                    if(totalPage > 1){
@@ -2973,6 +2981,7 @@ ContentPage.prototype.drawPage = function (context, opt) {
            /* set pos video */
            zoomVideo();
        }
    };
    img.src = this.image.src;
 };

--- a/abvw/js/contentview_CallApi.js
+++ b/abvw/js/contentview_CallApi.js
@@ -155,7 +155,7 @@ function getDataJsonFile() {
 		             pageDataInfo["alpha"] = JsonFile.backgroundAlpha;
 		             pageDataInfo["color"] = JsonFile.backgroundColor;
-		             totalPage = JsonFile.totalPageNum;
+		             totalPage = parseInt(JsonFile.totalPageNum);
 		             pageImages = returnImageString(pageDataInfo);
 		             widthContentImage = JsonFile.width;

--- a/abvw/js/contentview_ContentTypeNone.js
+++ b/abvw/js/contentview_ContentTypeNone.js
@@ -22,7 +22,7 @@ function returnImageString(data){
    typeNoneContext.clearRect(0, 0, width, height)    
-    typeNoneContext.fillStyle= color;
+    typeNoneContext.fillStyle= "#"+color;
    typeNoneContext.globalAlpha = alpha;
    typeNoneContext.fillRect(0,0,width,height);

--- a/abvw/js/contentview_CreateObjects.js
+++ b/abvw/js/contentview_CreateObjects.js
@@ -222,6 +222,8 @@ PageObject.prototype.drawPageObject = function (context, opt) {
            context.strokeStyle = "black";
            context.lineWidth = "1";
            context.strokeRect(x, y, w, h);
+            flip(opt);
        }
        if (this.imageUrl != '') {
@@ -263,10 +265,15 @@ PageObject.prototype.drawPageObject = function (context, opt) {
                } else if (mediaType == '3') {/* audio */
                    img.width = 50;
                    img.height = 50;
-                    context.drawImage(img, x, y, img.width, img.height);
+                    //START TRB00035 - Editor : Long - Date: 09/17/2013 - Summary : Fix for draw audio object at center
+                    context.drawImage(img, x + (w/2 - img.width/2), y + (h/2 - img.height/ 2), img.width, img.height);                 
+                    //END TRB00035 - Editor : Long - Date: 09/17/2013 - Summary : Fix for draw audio object at center                                      
                } else {
                    context.drawImage(img, x, y, w, h);
                }
                flip(opt);
                if (nCountObjectLoad >= nObjectCnt) {                   	
@@ -309,7 +316,8 @@ PageObject.prototype.drawPageObject = function (context, opt) {
                             enableButtonMarking();
                        }
                        //End Function : No.4 - Summary : make sure all page is loaded                       
-                    } else {
+                    } 
+                    else {
                        //Start Function : No.4 - Summary : make sure all page is loaded
                        if(contentType == ContentTypeKeys.Type_PDF || contentType == ContentTypeKeys.Type_NoFile){
                            if(totalPage > 1){
@@ -679,6 +687,17 @@ var moveToContent = function (mediaType, actionType, id, imageUrl, x, y, w, h, v
                            showContentConfirmDialog(data.contentData.alertMessageLevel);
                     }
+                     else if(data.contentData.alertMessageLevel == alertMessageLevel.None){
+                            ClientData.common_preContentId(contentId);
+                            ClientData.common_prePageNo(pageNo);
+                            /* store old page */   
+                            var oldContent = { oldContentID: contentID, oldPageIndex: getPageIndex() };                                   
+                            var dataJump = ClientData.JumpQueue();                
+                            dataJump.push(oldContent);               
+                            ClientData.JumpQueue(dataJump);                                       
+                            avwScreenMove(ScreenIds.ContentView);
+                     }
                 }
                 //Type 0
                 else{
@@ -847,7 +866,8 @@ var videoType2 = function (mediaType, actionType, id, imageUrl, x, y, w, h, visi
        stopAllAudio();
        if (embed == "1") {
            showVideoObject(x, y, w, h, mediaFile, false);
-        } else {
+        } 
+        else {
            if (media != '') {
                $('#playvideo').children().remove();
@@ -1060,7 +1080,7 @@ Transition.prototype.flipNextPage = function () {
    if(animateType == animateTypeKeys.Type_FadeIn){
        $('#mainNext').css('left', marginX + 'px');
        $('#mainNext').css('display', 'block');
-        $('#main').css('z-index', '2');
+        $('#main').css('z-index', '1');
    }
    else{
        $('#mainNext').css('display', 'block');
@@ -1207,7 +1227,7 @@ Transition.prototype.flipPreviousPage = function () {
    if(animateType == animateTypeKeys.Type_FadeIn){
        $('#mainPre').css('left', marginX + 'px');
        $('#mainPre').css('display', 'block');
-        $('#main').css('z-index', '2');
+        $('#main').css('z-index', '1');
    }
    else{
        $('#mainPre').css('display', 'block');

--- a/abvw/js/contentview_Events.js
+++ b/abvw/js/contentview_Events.js
@@ -133,7 +133,12 @@ function imgmarking_click() {
 /* event for list bookmark: changePageNo */
 function clickBookmark() {
-    changePage($(this).attr('id'));
+    var targetPageIndex = $(this).attr('id');
+    if(targetPageIndex != getPageIndex()){
+        changePage(targetPageIndex);
+    }
    /* close popup */
    // $('#divListBookmark').dialog("close");

--- a/abvw/js/contentview_GetData.js
+++ b/abvw/js/contentview_GetData.js
@@ -503,27 +503,43 @@ function getMediaType6(iValueObj) {
        pageObject['actionType'] = '';
    }
+    if(iValueObj.mediaInfo.resourceId){
        pageObject['id'] = "trigger" + iValueObj.mediaInfo.resourceId;
+    }
+    else if(iValueObj.mediaInfo.resourceThumbnailId){
+        pageObject['id'] = "trigger" + iValueObj.mediaInfo.resourceThumbnailId;
+    }
    /*get mediaInfo */
    if (iValueObj.mediaInfo) {
+        if(iValueObj.mediaInfo.resourceId){
            /* get image from Json */
            pageObject['imageUrl'] = getURL("webResourceDownload") + "/?sid=" + ClientData.userInfo_sid() + "&resourceId=" + iValueObj.mediaInfo.resourceId;
-    } else {
+        }
+        else{
+            pageObject['imageUrl'] = 'img/iPad_video.png';
+        }
+    } 
+    else {
        pageObject['imageUrl'] = null;
    }
    /*get index */
    if (iValueObj.action.index) {
        pageObject['index'] = iValueObj.action.index;
-    } else {
+    } 
+    else {
        pageObject['index'] = '';
    }
    /*get target */
    if (iValueObj.action.target) {
        pageObject['target'] = iValueObj.action.target;
-    } else {
+    } 
+    else {
        pageObject['target'] = '';
    }
@@ -588,8 +604,6 @@ function getMediaType8(iValueObj) {
    pageObject['height'] = iValueObj.location.height;
    pageObject['visible'] = true;
    if(iValueObj.action.actionType == 9){
        pageObject['horizonCount'] = iValueObj.mediaInfo.horizonCount;
@@ -1364,6 +1378,9 @@ function assignCurrentContentPage(nav){
        content.pageImages = nextContent.pageImages;
        content.pageIndex = nextContent.pageIndex;
        content.pageObjects = nextContent.pageObjects;
+        prevPageObjects = pageObjects;
+        pageObjects = nextPageObjects;
    }
    else{
        nextPageImage = pageImages;
@@ -1380,6 +1397,9 @@ function assignCurrentContentPage(nav){
        content.pageImages = prevContent.pageImages;
        content.pageIndex = prevContent.pageIndex;
        content.pageObjects = prevContent.pageObjects;  
+        nextPageObjects = pageObjects;
+        pageObjects = prevPageObjects;
    }
 };
@@ -1397,8 +1417,8 @@ function correctCanvasPosition(){
        $('#mainPre').css("display", 'none');
    }
    else if(animateType == animateTypeKeys.Type_FadeIn){
-       $('#mainNext').css("z-index",'1');
+       $('#mainNext').css("z-index",'0');
-       $('#mainPre').css("z-index",'1'); 
+       $('#mainPre').css("z-index",'0'); 
       $('#mainNext').css("display", 'none');
       $('#mainPre').css("display", 'none');               
    }

--- a/abvw/js/contentview_InitObjects.js
+++ b/abvw/js/contentview_InitObjects.js
@@ -137,7 +137,6 @@ function initPage() {
    // Lock screen
    LockScreen();
-    getContentID();
    StartTimerUpdateLog();
@@ -276,7 +275,7 @@ function initPage() {
        /*Init Page */
        nAjaxLoad++;
-        if (nAjaxLoad == 7) {
+        if (nAjaxLoad == 8) {
            /* handle from bookmark page */
            //handleFromBookMarkPage();	
@@ -404,8 +403,9 @@ function initPage() {
                }
            }
        }     
+        //START TRB00048 - EDITOR : Long - Date : 09/18/2013 - Summary :    
-        else if(nAjaxLoad == 3){
+        else if(nAjaxLoad == 4){
+        //END TRB00048 - EDITOR : Long - Date : 09/18/2013 - Summary :  
           if(contentType == ContentTypeKeys.Type_NoFile){
                /* handle from bookmark page */
                //handleFromBookMarkPage(); 
@@ -591,13 +591,13 @@ function initializeViewerComponent(viewId) {
        '<canvas id="mainPre"></canvas>' +
        '<canvas id="main"></canvas>' +
        '<canvas id="mainNext"></canvas>' +
+        '<div id="playvideo"></div>' +
        '</div>' +
        '<canvas id="offscreenPre"></canvas>' +
        '<canvas id="offscreen"></canvas>' +
        '<canvas id="offscreenNext"></canvas>' +
        '<canvas id="draw_canvas"></canvas>' +
        '<canvas id="marker_canvas"></canvas>' +
-        '<div id="playvideo"></div>' +
        '<div id="playaudio" style="width:0px; height:0px;"></div>' +
        '<div id="playaudiopage" style="width:0px; height:0px;"></div>' +
        '<div id="playaudioallpage" style="width:0px; height:0px;"></div>' +
@@ -634,7 +634,7 @@ function initializeViewerComponent(viewId) {
            'left': marginX + 'px',
            'box-shadow': '3px 3px 14px #333',
            'border-radius': '4px',
-            'z-index' : '1'
+            'z-index' : '0'
        }
    );  
@@ -650,7 +650,7 @@ function initializeViewerComponent(viewId) {
                'box-shadow': '3px 3px 14px #333',
                'border-radius': '4px',
                'display': 'none',
-                'z-index' : '1'
+                'z-index' : '0'
            }
        );
        $('#mainPre').css(
@@ -662,7 +662,7 @@ function initializeViewerComponent(viewId) {
                'box-shadow': '3px 3px 14px #333',
                'border-radius': '4px',
                'display': 'none',
-                'z-index' : '1'
+                'z-index' : '0'
            }
        );
    }
@@ -676,7 +676,7 @@ function initializeViewerComponent(viewId) {
                'box-shadow': '3px 3px 14px #333',
                'border-radius': '4px',
                'display': 'none',
-                'z-index' : '1'
+                'z-index' : '0'
            }
        );
        $('#mainPre').css(
@@ -688,7 +688,7 @@ function initializeViewerComponent(viewId) {
                'box-shadow': '3px 3px 14px #333',
                'border-radius': '4px',
                'display': 'none',
-                'z-index' : '1'
+                'z-index' : '0'
            }
        );
    }
@@ -717,7 +717,7 @@ function initializeViewerComponent(viewId) {
            'display': 'none',
            'position': 'absolute',
            'cursor': 'default',
-            'z-index' : '1'
+            'z-index' : '0'
        }
    );
@@ -727,15 +727,16 @@ function initializeViewerComponent(viewId) {
            'display': 'none',
            'position': 'absolute',
            'cursor': 'default',
-            'z-index' : '1'
+            'z-index' : '0'
        }
    );
    $('#playvideo').css(
        {
-            'position': 'fixed',
+            'position': 'absolute',
            'top': marginY + 'px',
-            'left': marginX + 'px'
+            'left': marginX + 'px',
+            'z-index': 0
        }
    );

--- a/abvw/js/header.js
+++ b/abvw/js/header.js
@@ -162,7 +162,7 @@ function bodyClickFunction(event) {
            else {
                isHoverOn = false;
-                $('#header-searchbox').hide();
+                //$('#header-searchbox').hide();
            }
        }
@@ -898,34 +898,35 @@ function showListPushMessage(data)
            $('#show-push-message').append(message);
    }
-    var isShowButtonNextOrPrevious = false;
+    // hide all detail message
-    if (currentPagePushMessage > 1) {
+    $('#show-push-message .newmsg p').hide();
-        $('#prev-page-message').show();
-        isShowButtonNextOrPrevious = true;
+    // show list title message
+    $('#accordion').slideDown();
+    if (currentPagePushMessage > 1 || data.recordTo < data.totalRecord) {
+        $('#accordion .pagechange').show();
    }
    else {
-        $('#prev-page-message').hide();
+        $('#accordion .pagechange').hide();
    }
+    // check show next button
    if (data.recordTo < data.totalRecord) {
-        isShowButtonNextOrPrevious = true;
        $('#next-page-message').show();
    }
    else {
        $('#next-page-message').hide();
    }
-    // show or hidden pagechange
+    // check show previous button 
-    if (isShowButtonNextOrPrevious) {
+    if (currentPagePushMessage > 1) {        
-        $('#accordion .pagechange').show();
+        $('#prev-page-message').css({ "visibility": "visible" });
    }
    else {
-        $('#accordion .pagechange').hide();
+        $('#prev-page-message').css({ "visibility":"hidden"});
    }
-    // hide all detail message
-    $('#show-push-message .newmsg p').hide();
-    // show list title message
-    $('#accordion').slideDown();
    // show detail message when click at title
    $('#show-push-message .newmsg h5').click(

--- a/abvw/settings.html
+++ b/abvw/settings.html
@@ -97,11 +97,11 @@
            </div>
            <ul class="button">
            <li class="floatL">
-                <a href="#" id="liPushMessage"><span class="pushMessage"><span class="lang" lang="txtPushAlert">新着 : </span><span id="numbermessage"></span></span></a>
+                <a href="#" id="liPushMessage"><span class="pushMessage"><span class="icon"></span> <span class="lang" lang="txtPushAlert">新着 : </span><span id="numbermessage"></span><span class="arrow"></span></span></a>
                <div id="accordion" style="display:none;">
                <div id="show-push-message"></div>
                    <div class="pagechange clearfix">
-                        <a href="#"class="floatL lang" id='prev-page-message' lang="txtPrevious">＜＜前へ</a><a class="floatR lang" id='next-page-message'  lang="txtNext">次へ＞＞</a></span>
+                        <a class="floatL lang" id='prev-page-message' lang="txtPrevious">＜＜前へ</a><a class="floatR lang" id='next-page-message'  lang="txtNext">次へ＞＞</a>
                    </div>
                </div>
            </li>