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

@ -30,17 +30,17 @@
</actions>
<menus>
<menu name="siteMap">
<title xml:lang="en">Site Map</title>
<title xml:lang="en">Menu Management</title>
<title xml:lang="ko">사이트맵</title>
<title xml:lang="jp">サイトマップ</title>
<title xml:lang="zh-CN">Site Map</title>
<title xml:lang="zh-TW">Site Map</title>
<title xml:lang="es">Site Map</title>
<title xml:lang="ru">Site Map</title>
<title xml:lang="fr">Site Map</title>
<title xml:lang="vi">Site Map</title>
<title xml:lang="mn">Site Map</title>
<title xml:lang="tr">Site Map</title>
<title xml:lang="zh-CN">Menu Management</title>
<title xml:lang="zh-TW">Menu Management</title>
<title xml:lang="es">Menu Management</title>
<title xml:lang="ru">Menu Management</title>
<title xml:lang="fr">Menu Management</title>
<title xml:lang="vi">Menu Management</title>
<title xml:lang="mn">Menu Management</title>
<title xml:lang="tr">Menu Management</title>
</menu>
</menus>
</module>

View file

@ -60,7 +60,7 @@
</item>
<item name="add_menu">
<value xml:lang="ko"><![CDATA[메뉴 추가]]></value>
<value xml:lang="en"><![CDATA[Add Menu]]></value>
<value xml:lang="en"><![CDATA[Add Menu Item]]></value>
<value xml:lang="jp"><![CDATA[メニュー追加]]></value>
</item>
<item name="edit_menu">
@ -70,7 +70,7 @@
</item>
<item name="add_new_sitemap">
<value xml:lang="ko"><![CDATA[새 사이트맵 추가]]></value>
<value xml:lang="en"><![CDATA[Add New Site Map]]></value>
<value xml:lang="en"><![CDATA[Add New Menu]]></value>
<value xml:lang="jp"><![CDATA[新しいサイトマップ追加]]></value>
</item>
<item name="module_or_url">

View file

@ -28,7 +28,7 @@ xe.lang.confirm_delete = "{$lang->confirm_delete}";
</block>
</ul>
<p class="btnArea">
<span class="btn"><a href="#editMenu" class="modalAnchor _add">{$lang->add_menu}...</a></span>
<span class="btn"><a href="#editMenu" class="modalAnchor _add">{$lang->add_menu}</a></span>
<span class="btn"><button value="procMenuAdminArrangeItem" name="act" type="submit">{$lang->cmd_save}</button></span>
<span class="etc">
<span class="btn"><button value="procMenuAdminDelete" name="act" type="submit" onclick="return confirmDelete();">{$lang->cmd_delete}</button></span>
@ -44,7 +44,7 @@ xe.lang.confirm_delete = "{$lang->confirm_delete}";
<input type="hidden" name="title" value="{$lang->untitle}" />
<input type="hidden" name="success_return_url" value="{getUrl('', 'module', 'admin', 'act', 'dispMenuAdminSiteMap')}" />
<div class="btnArea">
<span class="btn medium"><button type="submit">{$lang->add_new_sitemap}...</button></span>
<span class="btn medium"><button type="submit">{$lang->add_new_sitemap}</button></span>
</div>
</form>
<div class="modal" id="editMenu">