09/17 リリース

b52fe1ff · Vo Duc Thang · 5d6ff27a · b52fe1ff · b52fe1ff · b52fe1ff
Commit b52fe1ff authored Sep 17, 2013 by Vo Duc Thang
19 changed files
--- a/abvw/bookmark.html
+++ b/abvw/bookmark.html
@@ -89,7 +89,7 @@
            </div>
            <ul class="button">
                <li class="floatL">
-                    <a href="#" id="liPushMessage"><span class="pushMessage"><span class="lang" lang="txtPushAlert">新着 : </span><span id="numbermessage">12</span></span></a>
+                    <a href="#" id="liPushMessage"><span class="pushMessage"><span class="lang" lang="txtPushAlert">新着 : </span><span id="numbermessage"></span></span></a>
                    <div id="accordion" style="display:none;">
                    <div id="show-push-message"></div>
                        <div class="pagechange clearfix">

--- 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.20130913)User:",
+"txtLoginUser":"(Ver.20130917)User:",
 "txtAll":"All",
 "txtMkgSize":"Size",
 "txtMkgS":"S",
@@ -123,29 +123,28 @@
 "msgBGMPlayConfirm":"Content BGM will be played automatically.",
 "msgPWDNeedChange":"Change password is required. Please back Setting view.",
 "msgBGMPagePlayConfirm":"Page BGM will be played automatically.",
-"txtBkSelectData":"EN_バックアップするデータを選択してください。",
+"txtBkSelectData":"Please select data to backup.",
-"txtBkMarking":"EN_マーキング",
+"txtBkMarking":"Marking",
-"txtBkMemo":"EN_メモ",
+"txtBkMemo":"Memo",
-"txtBkShiori":"EN_しおり",
+"txtBkShiori":"Bookmark",
-"txtResSelect":"EN_リストアするデータを選択してください。",
+"txtResSelect":"Please select data to restore.",
-"txtBkDefault":"EN_バックアップのデフォルト：",
+"txtBkDefault":"Backup default:",
-"txtOptPageTrans":"EN_ビューのアニメーション種類",
+"txtOptPageTrans":"Animation type in View",
-"txtOptPageTransSlide":"EN_スライド",
+"txtOptPageTransSlide":"Slide",
-"txtOptPageTransFade":"EN_フェード",
+"txtOptPageTransFade":"Fade",
 "txtOptPageTransRev":"EN_リヴェール＆ムーブイン",
-"txtOptPageTransPeriod":"EN_アニメーション時間(Sec)",
+"txtOptPageTransPeriod":"Animation period",
-"msgPushAlert":"EN_新着メッセージがあります！！！",
+"msgPushAlert":"Has new message(s) !",
-"txtPushAlert":"Notice",
+"txtPushAlert":"Alert",
-"txtNext":"EN_次＞",
+"txtNext":"Next >",
-"txtPrevious":"EN_＜前",
+"txtPrevious":"< Previous",
-"msgAnonymousLoginErr":"EN_ログインできません。(エラーコード：{0})",
+"msgAnonymousLoginErr":"Can not login. (Error code: {0})",
-"msgAnonymousLoginErr2":"EN_ログインできません。",
+"msgAnonymousLoginErr2":"Can not login. ",
-"txtEnqueteTitle":"EN_アンケート",
+"txtEnqueteTitle":"Enquete",
-"txtTransparent":"EN_透明",
+"txtTransparent":"Transparent",
-"txtSemiTransparent":"EN_半透明",
+"txtSemiTransparent":"Translucent",
-"txtNoTransparent":"EN_不透明",
+"txtNoTransparent":"Opacity",
-"txtContentPWTitle":"EN_パスワードの確認",
+"txtContentPWTitle":"Password Confirm",
-"txtContentPWMsg":"EN_閲覧するにはパスワードの入力が必要です。",
+"txtContentPWMsg":"Please input password to view this content.",
-"txtContentWarning":"EN_警告"
+"txtContentWarning":"Waring"
 }
--- 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.20130913)ログイン中：",
+"txtLoginUser":"(Ver.20130917)ログイン中：",
 "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.20130913)로그인 중:",
+"txtLoginUser":"(Ver.20130917)로그인 중:",
 "txtAll":"전체",
 "txtMkgSize":"두께",
 "txtMkgS":"소",

--- a/abvw/contentsearch.html
+++ b/abvw/contentsearch.html
@@ -89,7 +89,7 @@
            </div>
            <ul class="button">
                <li class="floatL">
-                    <a href="#" id="liPushMessage"><span class="pushMessage"><span class="lang" lang="txtPushAlert">新着 : </span><span id="numbermessage">12</span></span></a>
+                    <a href="#" id="liPushMessage"><span class="pushMessage"><span class="lang" lang="txtPushAlert">新着 : </span><span id="numbermessage"></span></span></a>
                    <div id="accordion" style="display:none;">
                    <div id="show-push-message"></div>
                        <div class="pagechange clearfix">

--- a/abvw/css/layout/accordion.css
+++ b/abvw/css/layout/accordion.css
@@ -81,4 +81,10 @@ a#searchbtn:active{
 #numbermessage
 {
    padding-left:5px;
-}	
+    white-space:nowrap;
\ No newline at end of file
+    display:inline-block;
+    min-width:15px;
+}	
+#liPushMessage
+{
+}
\ No newline at end of file
--- a/abvw/css/layout/header.css
+++ b/abvw/css/layout/header.css
@@ -105,10 +105,9 @@ header{
    /*width: 90px;*/
    text-align: center;
    line-height: 25px;
-    display: block;
+    display: inline-block;
-    float: left;
+    /*position: absolute;*/
-    position: absolute;
+    padding:0 20px 0 25px;
-    padding:0 16px 0 25px;
 }
 .cnt_header .menu_language ul.pushMessage a:hover { }
@@ -204,4 +203,10 @@ margin-right:5px;
 .tops ul.sort li.sort a:hover{ text-decoration:underline;}
 .tops ul.sort li b{
+}
+.toast-item-loading
+{
+    text-align:center;
+    height:40px;
 }
\ No newline at end of file
--- a/abvw/css/layout/login.css
+++ b/abvw/css/layout/login.css
@@ -169,14 +169,6 @@ section .loginbtn a:not(:target) {
 section .loginbtn a:hover:not(:target) {
 }
-.alertTxt,.alertTxtDialog {
-	position: absolute;
-	margin: -20px 0 0 90px;
-	display: block;
-	text-align: center;
-	width: 300px;
-}
 /*----------------------------*/
 /*	999. clearfix             */
 /*----------------------------*/

--- a/abvw/css/layout/login_validation.css
+++ b/abvw/css/layout/login_validation.css
@@ -132,4 +132,10 @@ position:relative;
 .sectionchangepassword .loginbtn a:hover:not(:target) {
    filter: none;
    -ms-filter: none;
+}
+.alertTxt,.alertTxtDialog {
+	margin:-20px 0 0 49px;
+	display:block;
+	text-align:center;
+	padding-right:10px;
 }
\ No newline at end of file
--- a/abvw/css/layout/setting.css
+++ b/abvw/css/layout/setting.css
@@ -333,14 +333,6 @@ div#user_option ul li input.chkbx {
 	top:1px;
 }
-.alertTxt,.alertTxtDialog {
-	position:absolute;
-	margin:-20px 0 0 49px;
-	display:block;
-	text-align:center;
-	width:300px;
-}

--- a/abvw/css/theme/header.css
+++ b/abvw/css/theme/header.css
@@ -162,4 +162,10 @@ background:url(../../img/common/icon_triangle_u.png) no-repeat right 5px;
    border:solid 1px #000;
    font-weight:bold;
    font-size:13px;
+}
+.toast-item-loading
+{
+    text-align:center;
+    height:40px;
+    background:url(../../img/data_loading.gif) no-repeat center;    
 }
\ No newline at end of file
--- a/abvw/css/theme/login_validation.css
+++ b/abvw/css/theme/login_validation.css
@@ -102,4 +102,9 @@ html,body {
 }
 .sectionchangepassword .loginbtn a:hover:not(:target) {
    background-image: url(button_back_on.svg);
+}
+.alertTxt,.alertTxtDialog 
+{
+    font-size:13px;
+	color:#e60012;
 }
\ No newline at end of file
--- a/abvw/css/theme/setting.css
+++ b/abvw/css/theme/setting.css
@@ -286,16 +286,6 @@ div#user_option ul li input.chkbx {
 .sectionSetting .loginbtn a:active {
 }
-.alertTxt,.alertTxtDialog 
-{
-    font-size:13px;
-	color:#e60012;
-}
 /*----------------------------*/
 /*	999. clearfix             */
 /*----------------------------*/

--- a/abvw/history.html
+++ b/abvw/history.html
@@ -89,7 +89,7 @@
            </div>
            <ul class="button">
                <li class="floatL">
-                    <a href="#" id="liPushMessage"><span class="pushMessage"><span class="lang" lang="txtPushAlert">新着 : </span><span id="numbermessage">12</span></span></a>
+                    <a href="#" id="liPushMessage"><span class="pushMessage"><span class="lang" lang="txtPushAlert">新着 : </span><span id="numbermessage"></span></span></a>
                    <div id="accordion" style="display:none;">
                    <div id="show-push-message"></div>
                        <div class="pagechange clearfix">

--- a/abvw/home.html
+++ b/abvw/home.html
@@ -100,7 +100,7 @@
            </div>
            <ul class="button">
                <li class="floatL">
-                    <a href="#" id="liPushMessage"><span class="pushMessage"><span class="lang" lang="txtPushAlert">新着 : </span><span id="numbermessage">12</span></span></a>
+                    <a href="#" id="liPushMessage"><span class="pushMessage"><span class="lang" lang="txtPushAlert">新着 : </span><span id="numbermessage"></span></span></a>
                    <div id="accordion" style="display:none;">
                    <div id="show-push-message"></div>
                        <div class="pagechange clearfix">
@@ -238,7 +238,6 @@
    </div>
 </div>
 </footer>
 <iframe style="height:0px;width:0px;visibility:hidden;display:none;" src="about:blank">
    this frame prevents back forward cache
 </iframe>

--- a/abvw/js/contentsearch.js
+++ b/abvw/js/contentsearch.js
@@ -446,7 +446,6 @@ function handleLanguage(){
    if (getCurrentLanguage() == Consts.ConstLanguage_En || getCurrentLanguage() == Consts.ConstLanguage_Ko)
 	{
 		$('#control-sort-titlekana').css('display','none');
-		$('#label-sort-titlekana').css('display','none');
 		$('#separate').css('display','none');
 		$("#titlekana-sorttype").html('');
 	}
@@ -470,7 +469,7 @@ function handleLanguage(){
            setStatusSort('#'+$('#menu_sort li.current a').attr('id'),orderSort == Consts.ConstOrderSetting_Asc);
 	    }
 		if(noRecordFlg){
-			$('#label-sort-titlekana').css('display','block');
+			$('#control-sort-titlekana').css('display','block');
 			$('#separate').css('display','block');
 		}else{
 			$('#control-sort-titlekana').css('display','block');
@@ -1762,13 +1761,17 @@ function formatDisplayMoreRecord(){
 function changeLanguageCallBackFunction(){
 	handleLanguage();
 	formatDisplayMoreRecord();
 	if(chkSearchTextEmpty){
 		displayResultNoRecord();
-    } else {
+    } else 
+    {
-		$('#control-nextrecord').css('visibility','visible');
+        if(!noRecordFlg)
+		{
+            $('#control-nextrecord').css('visibility','visible');
+        }
 		enableSort();
 	}
@@ -1787,8 +1790,9 @@ function displayResultNoRecord(){
 	$('.control_sort_on').hide();
 	$('.control_sort_off').show();
 	if(getCurrentLanguage() == Consts.ConstLanguage_En || getCurrentLanguage() == Consts.ConstLanguage_Ko){
-		$('#label-sort-titlekana').hide();
+		/*$('#control-sort-titlekana').hide();*/
 		$('#separate').hide();
+        $('#control-sort-titlekana').hide();
 	}
 };

--- a/abvw/js/contentview_Anket.js
+++ b/abvw/js/contentview_Anket.js
@@ -72,7 +72,7 @@ function showAnket(url, fullscreen) {
        var canvas = document.getElementById('main');
        var height = canvas.height;
-        var top = $('#header_toolbar').height() + 4; // get top position for dialog 4 for space
+        var top = (isFullScreen?0:$('#header_toolbar').height()) + 4; // get top position for dialog 4 for space
        // set top dialog
        $('#dialog').height(height).css('top', top);

--- a/abvw/js/header.js
+++ b/abvw/js/header.js
@@ -765,6 +765,9 @@ function initPushMessage()
        }
    );
+    // set default hide list message
+    $('#liPushMessage').removeClass('show').addClass('hide');
        $('#prev-page-message').click(function (e) {
            previousPushMessageClick();
            e.stopPropagation();

--- a/abvw/settings.html
+++ b/abvw/settings.html
@@ -97,7 +97,7 @@
            </div>
            <ul class="button">
            <li class="floatL">
-                <a href="#" id="liPushMessage"><span class="pushMessage"><span class="lang" lang="txtPushAlert">新着 : </span><span id="numbermessage">12</span></span></a>
+                <a href="#" id="liPushMessage"><span class="pushMessage"><span class="lang" lang="txtPushAlert">新着 : </span><span id="numbermessage"></span></span></a>
                <div id="accordion" style="display:none;">
                <div id="show-push-message"></div>
                    <div class="pagechange clearfix">