merge from 1.7.3.5(r13153:r13167)

git-svn-id: http://xe-core.googlecode.com/svn/trunk@13168 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
ngleader 2013-09-29 23:32:39 +00:00
parent cc47d2b247
commit 2d3f149b5a
2042 changed files with 129266 additions and 126243 deletions

View file

@ -6,13 +6,12 @@
<action name="dispAdminIndex" type="view" standalone="true" index="true" />
<action name="dispAdminConfigGeneral" type="view" standalone="true" menu_name="adminConfigurationGeneral" menu_index="true" />
<action name="dispAdminConfigFtp" type="view" standalone="true" menu_name="adminConfigurationFtp" menu_index="true" />
<action name="dispAdminTheme" type="view" standalone="true" menu_name="theme" menu_index="true" />
<action name="dispAdminSetup" type="view" standalone="true" menu_name="adminMenuSetup" menu_index="true" />
<action name="procAdminRemoveIcons" type="controller" standalone="true" />
<action name="procAdminRecompileCacheFile" type="controller" standalone="true" />
<action name="procAdminLogout" type="controller" standalone="true" />
<action name="procAdminInsertThemeInfo" type="controller" standalone="true" ruleset="insertThemeInfo" />
<action name="procAdminLogout" type="controller" standalone="true" method="GET|POST" />
<action name="procAdminInsertDefaultDesignInfo" type="controller" />
<action name="procAdminToggleFavorite" type="controller" ruleset="toggleFavorite" />
<action name="procAdminEnviromentGatheringAgreement" type="controller" standalone="true" />
<action name="procAdminUpdateConfig" type="controller" standalone="true" />
@ -20,6 +19,7 @@
<action name="procAdminMenuReset" type="controller" />
<action name="getAdminFTPList" type="model" standalone="true" />
<action name="getAdminFTPPath" type="model" standalone="true" />
<action name="getSiteAllList" type="model" standalone="true" />
</actions>
<menus>
@ -62,18 +62,5 @@
<title xml:lang="mn">FTP Configuration</title>
<title xml:lang="tr">FTP Configuration</title>
</menu>
<menu name="theme" type="site">
<title xml:lang="en">Theme</title>
<title xml:lang="ko">테마</title>
<title xml:lang="zh-CN">主题</title>
<title xml:lang="jp">Theme</title>
<title xml:lang="es">Theme</title>
<title xml:lang="ru">Theme</title>
<title xml:lang="fr">Theme</title>
<title xml:lang="zh-TW">Theme</title>
<title xml:lang="vi">Theme</title>
<title xml:lang="mn">Theme</title>
<title xml:lang="tr">Theme</title>
</menu>
</menus>
</module>