Skip to content

C
check
Commit ea557691 by Motohisa Nakano
Options

Merge branch 'sbb' of gitlab.agentec.jp:abook_web/web-viewer into sbb

parents 1e54e170 66068e8c
Showing with 118 additions and 91 deletions
abvw/bookmark.html
......@@ -36,11 +36,13 @@
<div class="menu_language">
<ul>
<li><label class="lang" lang="txtLoginUser">こんにちは</label><label id="login-username"> </label></li>
<li class="jp" id="language-jp"><a href="#">日本語</a></li>
<li class="eng" id="language-en"><a href="#">English</a></li>
<li class="kor" id="language-kr"><a href="#">한글</a></li>
<li class="th" id="language-th"><a href="#">ภาษาไทย</a></li>
<li class="in" id="language-in"><a href="#">Indonesia</a></li>
<li>
<select id="changeLanguage">
<option value="language-ja">日本語</option>
<option value="language-en">English</option>
<option value="language-ko">한글</option>
</select>
</li>
<li style="padding-left:0;"><input id="searchbox-key" type="text" placeholder="キーワードを入力してください"></li>
</ul>
<div id="header-searchbox">
......
abvw/common/js/i18n.js
......@@ -80,6 +80,12 @@ function loadLanguage(lang) {
var jsonLangData = data;
replaceText(jsonLangData);
// 20130508 change language selector
var languageSelector = $('#changeLanguage');
if ( languageSelector ) {
languageSelector.val('language-' + lang);
}
// 言語設定、言語データをストレージにキャッシュしておく
storeCurrentLanguage(lang, jsonLangData);
},
......
abvw/contentsearch.html
......@@ -33,11 +33,13 @@
<div class="menu_language">
<ul>
<li><label class="lang" lang="txtLoginUser">こんにちは</label><label id="login-username"> </label></li>
<li class="jp" id="language-jp"><a href="#">日本語</a></li>
<li class="eng" id="language-en"><a href="#">English</a></li>
<li class="kor" id="language-kr"><a href="#">한글</a></li>
<li class="th" id="language-th"><a href="#">ภาษาไทย</a></li>
<li class="in" id="language-in"><a href="#">Indonesia</a></li>
<li>
<select id="changeLanguage">
<option value="language-ja">日本語</option>
<option value="language-en">English</option>
<option value="language-ko">한글</option>
</select>
</li>
<li style="padding-left:0;"><input id="searchbox-key" type="text" placeholder="キーワードを入力してください"></li>
</ul>
<div id="header-searchbox">
......
abvw/contentview.html
......@@ -68,8 +68,8 @@
</div>
<header id ="header_toolbar" class="header">
<div class = "wrapper_header" style="min-width:1012px;">
<div id ="top_toolbar" class="hdLcolumn fix" style="min-width:1012px;">
<div class = "wrapper_header" >
<div id ="top_toolbar" class="hdLcolumn fix">
<div style="float:left; width:302px;">
<span class="gloupe" style="border-left:none;"> <a id="imgHome" class="home" title="ホーム" lang="dspHome"> </a> <a id="imgBack" class="back" title="戻る" lang="txtTooltipBack"> </a> </span>
<!-- <img src="img/home.png" height="25" id="imgHome" class="toolbar_icon" />
......@@ -137,7 +137,7 @@
</div>
<div class="hdRcolumn">
<input id="txtSearch" type="text">
<input id="txtSearch" type="text" />
<!--<a id="lblSearch" class="search lang" lang="txtSearch">検索</a>-->
<!-- <div id="divSearchResult" style="display: none; " title="Search Result"> </div> -->
......
abvw/css/common.css
......@@ -82,14 +82,6 @@ header{
background:url(../img/common/icon_kor.png) no-repeat left center;
margin-left:6px;
}
.cnt_header .menu_language ul li.th{
background:url(../img/common/icon_th.png) no-repeat left center;
margin-left:6px;
}
.cnt_header .menu_language ul li.in{
background:url(../img/common/icon_in.png) no-repeat left center;
margin-left:6px;
}
.cnt_header .black, .cnt_header .blue{
display:block;
width:80px;
......@@ -377,3 +369,17 @@ footer{
}
.focus{color: #969696}
select {
-webkit-border-radius:4px 4px 4px 4px;
-moz-border-radius:4px 4px 4px 4px;
border-radius:4px 4px 4px 4px;
padding:2px;
border:1px #000000 solid;
}
option {
}
abvw/css/home.css
......@@ -414,9 +414,9 @@ float:left;
margin-left:90px;
}
.cnt_section_list .text ul.pic li{
height:82px;
height:68px;
float:left;
margin-left:17px;
margin-left:10px;
}
.cnt_section_list .text ul.pic li img {
position:relative;
......
abvw/css/login.css
......@@ -47,6 +47,11 @@ a:hover
/* 3. header setting */
/*----------------------------*/
.cnt_header .menu_language{
margin-top:20px;
margin-right:10px;
}
/*----------------------------*/
/* 4. footer setting */
......
abvw/css/viewer.css
......@@ -71,8 +71,6 @@ header{
}
.wrapper_header{
max-width:none;
min-width:1000px;
height:60px;
/*position:absolute;*/
}
......
abvw/history.html
......@@ -32,11 +32,13 @@
<div class="menu_language">
<ul>
<li><label class="lang" lang="txtLoginUser">こんにちは</label><label id="login-username"> </label></li>
<li class="jp" id="language-jp"><a href="#">日本語</a></li>
<li class="eng" id="language-en"><a href="#">English</a></li>
<li class="kor" id="language-kr"><a href="#">한글</a></li>
<li class="th" id="language-th"><a href="#">ภาษาไทย</a></li>
<li class="in" id="language-in"><a href="#">Indonesia</a></li>
<li>
<select id="changeLanguage">
<option value="language-ja">日本語</option>
<option value="language-en">English</option>
<option value="language-ko">한글</option>
</select>
</li>
<li style="padding-left:0;"><input id="searchbox-key" type="text" placeholder="キーワードを入力してください"></li>
</ul>
<div id="header-searchbox">
......
abvw/home.html
......@@ -37,11 +37,13 @@
<div class="menu_language">
<ul>
<li><label class="lang" lang="txtLoginUser">こんにちは</label><label id="login-username"> </label></li>
<li class="jp" id="language-jp"><a href="#">日本語</a></li>
<li class="eng" id="language-en"><a href="#">English</a></li>
<li class="kor" id="language-kr"><a href="#">한글</a></li>
<li class="th" id="language-th"><a href="#">ภาษาไทย</a></li>
<li class="in" id="language-in"><a href="#">Indonesia</a></li>
<li>
<select id="changeLanguage">
<option value="language-ja">日本語</option>
<option value="language-en">English</option>
<option value="language-ko">한글</option>
</select>
</li>
<li style="padding-left:0;"><input id="searchbox-key" type="text" placeholder="キーワードを入力してください"></li>
</ul>
<div id="header-searchbox">
......
abvw/img/list/pic_1.png
abvw/img/list/pic_1.png

846 Bytes | W: | H:

abvw/img/list/pic_1.png

53.4 KB | W: | H:

abvw/img/list/pic_1.png
abvw/img/list/pic_1.png
abvw/img/list/pic_1.png
abvw/img/list/pic_1.png
  • 2-up
  • Swipe
  • Onion skin
abvw/img/list/pic_2.png
abvw/img/list/pic_2.png

970 Bytes | W: | H:

abvw/img/list/pic_2.png

44.9 KB | W: | H:

abvw/img/list/pic_2.png
abvw/img/list/pic_2.png
abvw/img/list/pic_2.png
abvw/img/list/pic_2.png
  • 2-up
  • Swipe
  • Onion skin
abvw/js/header.js
......@@ -25,6 +25,28 @@ $(document).ready(function () {
//Go to Search Page
$('#searchbox-search').click(searchHeaderButtonFunction);
//Change language
$('#changeLanguage').change(function() {
switch($(this).val()) {
case "language-ja":
changeLanguageJa();
break;
case "language-ko":
changeLanguageKo();
break;
case "language-en":
changeLanguageEn();
break;
default:
changeLanguageJa();
break;
}
});
/*
//Change Language JP
$('#language-jp').click(changeLanguageJa);
......@@ -33,12 +55,7 @@ $(document).ready(function () {
//Change Language EN
$('#language-en').click(changeLanguageEn);
//Change Language TH
$('#language-th').click(changeLanguageTh);
//Change Language IN
$('#language-in').click(changeLanguageIn);
*/
//Go To Bookmark Page
$('#dspShiori').click(bookmarkFunction);
......@@ -254,24 +271,6 @@ function changeLanguageKo(){
$("#searchbox-key").attr('placeholder', i18nText('msgPlaceHolder'));
};
//Change Language Thai function
function changeLanguageTh(){
changeLanguage(Consts.ConstLanguage_Th);
if(window.changeLanguageCallBackFunction){
changeLanguageCallBackFunction();
}
$("#searchbox-key").attr('placeholder', i18nText('msgPlaceHolder'));
};
//Change Language Indonesia function
function changeLanguageIn(){
changeLanguage(Consts.ConstLanguage_In);
if(window.changeLanguageCallBackFunction){
changeLanguageCallBackFunction();
}
$("#searchbox-key").attr('placeholder', i18nText('msgPlaceHolder'));
};
//Shiori function
function bookmarkFunction(){
//window.location = ScreenIds.BookmarkList;
......
abvw/js/login.js
......@@ -411,25 +411,7 @@ function changeLanguageEn(){
$('#main-error-message').html(format(i18nText('msgLoginErrWrong'), login_errorMessage).toString());
}
};
//Change Language Thai
function changeLanguageTh(){
changeLanguage(Consts.ConstLanguage_Th);
document.title = i18nText('dspLogin') + ' | ' + i18nText('sysAppTitle');
//ClientData.userInfo_language(Consts.ConstLanguage_En);
if (login_errorMessage != ""){
$('#main-error-message').html(format(i18nText('msgLoginErrWrong'), login_errorMessage).toString());
}
};
//Change Language Indonesia
function changeLanguageIn(){
changeLanguage(Consts.ConstLanguage_In);
document.title = i18nText('dspLogin') + ' | ' + i18nText('sysAppTitle');
//ClientData.userInfo_language(Consts.ConstLanguage_En);
if (login_errorMessage != ""){
$('#main-error-message').html(format(i18nText('msgLoginErrWrong'), login_errorMessage).toString());
}
};
//Login click function
function loginFunction(){
if (checkValidation()) {
......@@ -534,14 +516,37 @@ $(document).ready(function (e) {
//Initial Screen
initialScreen();
//Change language
$('#changeLanguage').change(function() {
switch($(this).val()) {
case "language-ja":
changeLanguageJa();
break;
case "language-ko":
changeLanguageKo();
break;
case "language-en":
changeLanguageEn();
break;
default:
changeLanguageJa();
break;
}
});
/*
//Change language japanese
$('#language-ja').click(changeLanguageJa);
//Change language korean
$('#language-ko').click(changeLanguageKo);
//Change laguage english
$('#language-en').click(changeLanguageEn);
$('#language-th').click(changeLanguageTh);
$('#language-in').click(changeLanguageIn);
*/
//Button login click event
$('#btnLogin').click(loginFunction);
//Button Change click event
......
abvw/settings.html
......@@ -36,11 +36,13 @@
<div class="menu_language">
<ul>
<li><label class="lang" lang="txtLoginUser">こんにちは</label><label id="login-username"> </label></li>
<li class="jp" id="language-jp"><a href="#">日本語</a></li>
<li class="eng" id="language-en"><a href="#">English</a></li>
<li class="kor" id="language-kr"><a href="#">한글</a></li>
<li class="th" id="language-th"><a href="#">ภาษาไทย</a></li>
<li class="in" id="language-in"><a href="#">Indonesia</a></li>
<li>
<select id="changeLanguage">
<option value="language-ja">日本語</option>
<option value="language-en">English</option>
<option value="language-ko">한글</option>
</select>
</li>
<li style="padding-left:0;"><input id="searchbox-key" type="text" placeholder="キーワードを入力してください"></li>
</ul>
<div id="header-searchbox">
......
login.html
......@@ -37,13 +37,11 @@
<div class="cnt_header">
<a class="logo" href="#"> </a>
<div class="menu_language">
<ul>
<li class="jp"><a id="language-ja">日本語</a></li>
<li class="eng"><a id="language-en">English</a></li>
<li class="kor"><a id="language-ko">한국어</a></li>
<li class="th"><a id="language-th">ภาษาไทย</a></li>
<li class="in"><a id="language-in">Indonesia</a></li>
</ul>
<select id="changeLanguage">
<option value="language-ja">日本語</option>
<option value="language-en">English</option>
<option value="language-ko">한글</option>
</select>
</div>
</div>
</header>
......
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