fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-01-07 10:41:40 +09:00
Code Issues Projects Releases Packages Wiki Activity

added a language selector on multilingual search

Browse source 
git-svn-id: http://xe-core.googlecode.com/svn/branches/maserati@12060 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
flyskyko 2012-11-03 07:58:48 +00:00
parent 9667b29c45
commit e66e10c2c7
7 changed files with 111 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

37
modules/admin/tpl/css/admin.css
View file

@ -320,30 +320,43 @@ body>.x,
#g11n #lang_search .item>fieldset{display:none;padding:0 0 15px 0}
#g11n .item input[type="text"],
#g11n .item textarea{padding-left:25px;width:187px;background-repeat:no-repeat;background-position:4px 8px;overflow-x:hidden}
#g11n .flag{padding-left:18px;background-repeat:no-repeat;background-position:0 50%}
html[lang="en"] .x .g11n.active>[disabled],
#g11n .item .en{background-image:url(../img/flag.en.gif)}
#g11n .item .en,
#g11n .flag.en{background-image:url(../img/flag.en.gif)}
html[lang="ko"] .x .g11n.active>[disabled],
#g11n .item .ko{background-image:url(../img/flag.ko.gif)}
#g11n .item .ko,
#g11n .flag.ko{background-image:url(../img/flag.ko.gif)}
html[lang="jp"] .x .g11n.active>[disabled],
#g11n .item .jp{background-image:url(../img/flag.jp.gif)}
#g11n .item .jp,
#g11n .flag.jp{background-image:url(../img/flag.jp.gif)}
html[lang="zh"] .x .g11n.active>[disabled],
#g11n .item .zh-CN{background-image:url(../img/flag.cn.gif)}
#g11n .item .zh-CN,
#g11n .flag.zh-CN{background-image:url(../img/flag.cn.gif)}
html[lang="zh"] .x .g11n.active>[disabled],
#g11n .item .zh-TW{background-image:url(../img/flag.cn.gif)}
#g11n .item .zh-TW,
#g11n .flag.zh-TW{background-image:url(../img/flag.cn.gif)}
html[lang="fr"] .x .g11n.active>[disabled],
#g11n .item .fr{background-image:url(../img/flag.fr.gif)}
#g11n .item .fr,
#g11n .flag.fr{background-image:url(../img/flag.fr.gif)}
html[lang="de"] .x .g11n.active>[disabled],
#g11n .item .de{background-image:url(../img/flag.de.gif)}
#g11n .item .de,
#g11n .flag.de{background-image:url(../img/flag.de.gif)}
html[lang="ru"] .x .g11n.active>[disabled],
#g11n .item .ru{background-image:url(../img/flag.ru.gif)}
#g11n .item .ru,
#g11n .flag.ru{background-image:url(../img/flag.ru.gif)}
html[lang="es"] .x .g11n.active>[disabled],
#g11n .item .es{background-image:url(../img/flag.es.gif)}
#g11n .item .es,
#g11n .flag.es{background-image:url(../img/flag.es.gif)}
html[lang="tr"] .x .g11n.active>[disabled],
#g11n .item .tr{background-image:url(../img/flag.tr.gif)}
#g11n .item .tr,
#gg1n .flag.tr{background-image:url(../img/flag.tr.gif)}
html[lang="vi"] .x .g11n.active>[disabled],
#g11n .item .vi{background-image:url(../img/flag.vi.gif)}
#g11n .item .vi,
#g11n .flag.vi{background-image:url(../img/flag.vi.gif)}
html[lang="mn"] .x .g11n.active>[disabled],
#g11n .item .mn{background-image:url(../img/flag.mn.gif)}
#g11n .item .mn,
#g11n .flag.mn{background-image:url(../img/flag.mn.gif)}
#g11n #lang_search .cancel,
#g11n #lang_search .save,
#g11n #lang_search .editMode .modify,

2
modules/admin/tpl/css/admin.min.css vendored
View file

File diff suppressed because one or more lines are too long

23
modules/admin/tpl/js/admin.js
View file

@ -1188,9 +1188,9 @@ jQuery(function($){
// before open
function g11n_before_open(code){
if(!code){
g11n_get_list(1, '', '', false);
g11n_get_list(1, xe.current_lang, '', '', false);
}else{
g11n_get_list(1, '', code, false);
g11n_get_list(1, xe.current_lang, '', code, false);
$g11n_get.find('[href="#lang_search"]').trigger('click');
}
}
@ -1212,13 +1212,14 @@ jQuery(function($){
}
// get list
function g11n_get_list(page, search_keyword, name, scroll){
function g11n_get_list(page, lang_code, search_keyword, name, scroll){
if(typeof page == 'undefined') page = 1;
if(typeof lang_code == 'undefined') lang_code = xe.current_lang;
if(typeof search_keyword == 'undefined') search_keyword = '';
if(typeof name == 'undefined') name = '';
if(typeof scroll == 'undefined') scroll = true;
$.exec_json('module.getModuleAdminLangListHtml', {'page': page, 'search_keyword': search_keyword, 'name': name, 'list_count': options.list_count}, function(data){
$.exec_json('module.getModuleAdminLangListHtml', {'page': page, 'lang_code': lang_code, 'search_keyword': search_keyword, 'name': name, 'list_count': options.list_count}, function(data){
if(!data || !data.html) return;
$g11n_search.html(data.html);
@ -1241,20 +1242,22 @@ jQuery(function($){
$g11n_search.find('.x_pagination a').click(function(){
var page = $(this).data('page');
var search_keyword = $(this).data('search_keyword');
var lang_code = $(this).data('current_lang');
if(!page) return;
g11n_get_list(page, search_keyword);
g11n_get_list(page, lang_code, search_keyword);
return false;
});
$g11n_search.find('.x_pagination').submit(function(){
var page = $(this).find('[name="page"]').val();
var search_keyword = $(this).data('search_keyword');
var lang_code = $(this).data('current_lang');
if(!page) return false;
g11n_get_list(page, search_keyword);
g11n_get_list(page, lang_code, search_keyword);
return false;
});
}
@ -1263,13 +1266,14 @@ jQuery(function($){
function g11n_search_search(){
$g11n_search.find('.search').submit(function(){
var search_keyword = $(this).find('[name="search_keyword"]').val();
var lang_code = $(this).find('[name="lang_code"]').val();
g11n_get_list(1, search_keyword);
g11n_get_list(1, lang_code, search_keyword);
return false;
});
$g11n_search.find('#search_cancel').click(function(){
g11n_get_list(1, '');
g11n_get_list(1, xe.current_lang, '');
});
}
@ -1363,10 +1367,11 @@ jQuery(function($){
var $pagination = $g11n_search.find('.x_pagination');
var page = $pagination.data('page');
var search_keyword = $pagination.data('search_keyword');
var lang_code = $pagination.data('lang_code');
if(!page) $page = 1;
g11n_get_list(page, search_keyword);
g11n_get_list(page, lang_code, search_keyword);
});
});

59
modules/admin/tpl/js/admin.min.js vendored
View file

File diff suppressed because one or more lines are too long

4
modules/module/lang/lang.xml
View file

@ -1085,8 +1085,8 @@ Le module [Administration des Modules] montera tous les modules installés et vo
</item>
</item>
<item name="about_multilingual_search_result">
<value xml:lang="ko"><![CDATA[<strong>%d</strong>개의 다국어 세트가 있습니다.]]></value>
<value xml:lang="en"><![CDATA[There are <strong>%d</strong> multilingual sets.]]></value>
<value xml:lang="ko"><![CDATA[<strong>%d</strong>개의 <span class="flag %s">%s</span> 다국어 세트가 있습니다.]]></value>
<value xml:lang="en"><![CDATA[There are <strong>%d</strong> <span class="flag %s">%s</span> multilingual sets.]]></value>
</item>
<item name="msg_confirm_save_and_use_multilingual">
<value xml:lang="ko"><![CDATA[현재 상태를 저장하고 사용할까요?]]></value>

7
modules/module/module.admin.model.php
View file

@ -446,7 +446,7 @@
{
$siteModuleInfo = Context::get('site_module_info');
$args->site_srl = (int)$site_module_info->site_srl;
$args->langCode = Context::get('lang_type');
$args->langCode = Context::get('lang_code');
$args->page = Context::get('page');
$args->sort_index = 'name';
$args->order_type = 'asc';
@ -455,6 +455,11 @@
$args->list_count = Context::get('list_count');
$args->page_count = 5;
if(!$args->langCode)
{
$args->langCode = Context::get('lang_type');
}
$output = $this->getLangListByLangcode($args);
Context::set('total_count', $output->total_count);

7
modules/module/tpl/multilingual_v17_list.html
View file

@ -4,7 +4,7 @@
unset($lang_supported[$lang_type]);
$lang_supported = array_merge($a, $lang_supported);
}
<p cond="!$name">{sprintf($lang->about_multilingual_search_result, $total_count)}</p>
<p cond="!$name">{sprintf($lang->about_multilingual_search_result, $total_count, $lang_code, $lang_supported[$lang_code])}</p>
<fieldset class="list">
<form loop="$lang_code_list => $no, $val" action="" class="item">
<a class="set" href="#lang-{$no}" data-toggle="#lang-{$no}" data-lang_code="{$val->name}"><span>{$val->value}</span></a>
@ -25,7 +25,7 @@
</form>
</fieldset>
<div class="x_clearfix">
<form cond="$page_navigation" action="./" class="x_pagination x_pull-left" data-search_keyword="{htmlspecialchars($search_keyword)}" data-page="{$page}" no-error-return-url="true">
<form cond="$page_navigation" action="./" class="x_pagination x_pull-left" data-search_keyword="{htmlspecialchars($search_keyword)}" data-page="{$page}" data-current_lang="{$lang_code}" no-error-return-url="true">
<ul>
<li class="x_disabled"|cond="!$page || $page == 1"><a href="#" data-page="1" data-search_keyword="{htmlspecialchars($search_keyword)}">&laquo; {$lang->first_page}</a></li>
<block cond="$page_navigation->first_page != 1 && $page_navigation->first_page + $page_navigation->page_count > $page_navigation->last_page - 1 && $page_navigation->page_count != $page_navigation->total_page">
@ -56,6 +56,9 @@
</ul>
</form>
<form action="" class="search center x_input-append x_pull-right">
<select name="lang_code">
<option loop="$lang_supported => $code, $lname" value="{$code}" selected="selected"|cond="$code == $lang_code">{$lname}</option>
</select>
<input type="search" name="search_keyword" required title="Search" value="<!--@if($name)-->{htmlspecialchars($lang_code_list[1]->value)}<!--@else-->{htmlspecialchars($search_keyword)}<!--@end-->">
<button class="x_btn x_btn-inverse" type="submit">{$lang->cmd_search}</button>
<button cond="$search_keyword || $name" id="search_cancel" class="x_btn" type="button">{$lang->cmd_cancel}</button>