Skip to content

C
check
Commit b52fe1ff by Vo Duc Thang
Options

09/17 リリース

parent 5d6ff27a
Showing with 81 additions and 69 deletions
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">
......
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_バックアップするデータを選択してください。",
"txtBkMarking":"EN_マーキング",
"txtBkMemo":"EN_メモ",
"txtBkShiori":"EN_しおり",
"txtResSelect":"EN_リストアするデータを選択してください。",
"txtBkDefault":"EN_バックアップのデフォルト：",
"txtOptPageTrans":"EN_ビューのアニメーション種類",
"txtOptPageTransSlide":"EN_スライド",
"txtOptPageTransFade":"EN_フェード",
"txtBkSelectData":"Please select data to backup.",
"txtBkMarking":"Marking",
"txtBkMemo":"Memo",
"txtBkShiori":"Bookmark",
"txtResSelect":"Please select data to restore.",
"txtBkDefault":"Backup default:",
"txtOptPageTrans":"Animation type in View",
"txtOptPageTransSlide":"Slide",
"txtOptPageTransFade":"Fade",
"txtOptPageTransRev":"EN_リヴェール＆ムーブイン",
"txtOptPageTransPeriod":"EN_アニメーション時間(Sec)",
"msgPushAlert":"EN_新着メッセージがあります！！！",
"txtPushAlert":"Notice",
"txtNext":"EN_次＞",
"txtPrevious":"EN_＜前",
"msgAnonymousLoginErr":"EN_ログインできません。(エラーコード：{0})",
"msgAnonymousLoginErr2":"EN_ログインできません。",
"txtEnqueteTitle":"EN_アンケート",
"txtTransparent":"EN_透明",
"txtSemiTransparent":"EN_半透明",
"txtNoTransparent":"EN_不透明",
"txtContentPWTitle":"EN_パスワードの確認",
"txtContentPWMsg":"EN_閲覧するにはパスワードの入力が必要です。",
"txtContentWarning":"EN_警告"
"txtOptPageTransPeriod":"Animation period",
"msgPushAlert":"Has new message(s) !",
"txtPushAlert":"Alert",
"txtNext":"Next >",
"txtPrevious":"< Previous",
"msgAnonymousLoginErr":"Can not login. (Error code: {0})",
"msgAnonymousLoginErr2":"Can not login. ",
"txtEnqueteTitle":"Enquete",
"txtTransparent":"Transparent",
"txtSemiTransparent":"Translucent",
"txtNoTransparent":"Opacity",
"txtContentPWTitle":"Password Confirm",
"txtContentPWMsg":"Please input password to view this content.",
"txtContentWarning":"Waring"
}
abvw/common/json/lang/lang-ja.json
......@@ -64,7 +64,7 @@
"dspBkCancel":"バックアップせずにログアウト",
"txtSearchResult":"検索結果",
"dspHome":"ホーム",
"txtLoginUser":"(Ver.20130913)ログイン中：",
"txtLoginUser":"(Ver.20130917)ログイン中：",
"txtAll":"すべて",
"txtMkgSize":"太さ",
"txtMkgS":"小",
......
abvw/common/json/lang/lang-ko.json
......@@ -64,7 +64,7 @@
"dspBkCancel":"로그아웃",
"txtSearchResult":"검색 결과",
"dspHome":"홈",
"txtLoginUser":"(Ver.20130913)로그인 중:",
"txtLoginUser":"(Ver.20130917)로그인 중:",
"txtAll":"전체",
"txtMkgSize":"두께",
"txtMkgS":"소",
......
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">
......
abvw/css/layout/accordion.css
......@@ -81,4 +81,10 @@ a#searchbtn:active{
#numbermessage
{
padding-left:5px;
white-space:nowrap;
display:inline-block;
min-width:15px;
}
#liPushMessage
{
}
\ No newline at end of file
abvw/css/layout/header.css
......@@ -105,10 +105,9 @@ header{
/*width: 90px;*/
text-align: center;
line-height: 25px;
display: block;
float: left;
position: absolute;
padding:0 16px 0 25px;
display: inline-block;
/*position: absolute;*/
padding:0 20px 0 25px;
}
.cnt_header .menu_language ul.pushMessage a:hover { }
......@@ -205,3 +204,9 @@ margin-right:5px;
.tops ul.sort li b{
}
.toast-item-loading
{
text-align:center;
height:40px;
}
\ No newline at end of file
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 */
/*----------------------------*/
......
abvw/css/layout/login_validation.css
......@@ -133,3 +133,9 @@ position:relative;
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
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;
}
......
abvw/css/theme/header.css
......@@ -163,3 +163,9 @@ background:url(../../img/common/icon_triangle_u.png) no-repeat right 5px;
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
abvw/css/theme/login_validation.css
......@@ -103,3 +103,8 @@ 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
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 */
/*----------------------------*/
......
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">
......
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>
......
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
{
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();
}
};
......
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);
......
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();
......
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">
......
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