merge from 1.5.1.8

git-svn-id: http://xe-core.googlecode.com/svn/trunk@10157 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
devjin 2012-02-21 07:42:16 +00:00
parent 2d3dfe7bc7
commit 90c18a8bb8
42 changed files with 3249 additions and 149 deletions

View file

@ -50,17 +50,17 @@
</actions>
<menus>
<menu name="installedModule">
<title xml:lang="en">Installed Module</title>
<title xml:lang="en">Modules</title>
<title xml:lang="ko">설치된 모듈</title>
<title xml:lang="zh-CN">Installed Module</title>
<title xml:lang="jp">Installed Module</title>
<title xml:lang="es">Installed Module</title>
<title xml:lang="ru">Installed Module</title>
<title xml:lang="fr">Installed Module</title>
<title xml:lang="zh-TW">Installed Module</title>
<title xml:lang="vi">Installed Module</title>
<title xml:lang="mn">Installed Module</title>
<title xml:lang="tr">Installed Module</title>
<title xml:lang="zh-CN">Modules</title>
<title xml:lang="jp">Modules</title>
<title xml:lang="es">Modules</title>
<title xml:lang="ru">Modules</title>
<title xml:lang="fr">Modules</title>
<title xml:lang="zh-TW">Modules</title>
<title xml:lang="vi">Modules</title>
<title xml:lang="mn">Modules</title>
<title xml:lang="tr">Modules</title>
</menu>
<menu name="multilingual">
<title xml:lang="en">Multilingual</title>

View file

@ -969,9 +969,9 @@ Le module [Administration des Modules] montera tous les modules installés et vo
<value xml:lang="en"><![CDATA[Add New Word or Sentence...]]></value>
<value xml:lang="jp"><![CDATA[新しい単語、または文章追加...]]></value>
</item>
<item name="installed_module">
<item name="installed_modules">
<value xml:lang="ko"><![CDATA[설치된 모듈]]></value>
<value xml:lang="en"><![CDATA[Installed Module]]></value>
<value xml:lang="en"><![CDATA[Installed Modules]]></value>
</item>
<item name="cmd_show_hide">
<value xml:lang="ko"><![CDATA[보기/숨김]]></value>

View file

@ -105,6 +105,10 @@
Context::set('selected_module', $selected_module);
Context::set('selected_mids', $mid_list[$selected_module]->list);
Context::set('module_category_exists', $module_category_exists);
$security = new Security();
$security->encodeHTML('id', 'type');
// Set the layout to be pop-up
$this->setLayoutFile('popup_layout');
// Set a template file

View file

@ -5,10 +5,10 @@
xe.lang.favorite_off = '{$lang->favorite}({$lang->off})';
</script>
<h1 class="h1">{$lang->installed_module}</h1>
<h1 class="h1">{$lang->installed_modules}</h1>
<div class="cnb">
<a href="{getUrl('', 'module', 'admin', 'act', 'dispModuleAdminContent')}" class="active"|cond="$act=='dispModuleAdminContent'">{$lang->installed_module}</a>
<a href="{getUrl('', 'module', 'admin', 'act', 'dispModuleAdminContent')}" class="active"|cond="$act=='dispModuleAdminContent'">{$lang->installed_modules}</a>
|
<a href="{getUrl('', 'module', 'admin', 'act', 'dispModuleAdminCategory')}" class="active"|cond="$act=='dispModuleAdminCategory'">{$lang->module_category}</a>
</div>