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

@ -18,7 +18,12 @@
<action name="dispLayoutAdminEdit" type="view" menu_name="installedLayout" />
<action name="dispLayoutAdminCopyLayout" type="view" />
<action name="getLayoutAdminSetInfoView" type="model" />
<action name="getLayoutAdminSetHTMLCSS" type="model" />
<action name="getLayoutAdminSiteDefaultLayout" type="model" />
<action name="dispLayoutPreview" type="view" />
<action name="dispLayoutPreviewWithModule" type="view" />
<action name="procLayoutAdminUpdate" type="controller" ruleset="updateLayout" />
<action name="procLayoutAdminCodeUpdate" type="controller" ruleset="codeUpdate" />
@ -37,6 +42,8 @@
<action name="procLayoutAdminUserLayoutImport" type="controller" standalone="true" ruleset="userLayoutImport" />
<action name="procLayoutAdminCopyLayout" type="controller" standalone="true" />
<action name="getLayoutInstanceListForJSONP" type="model" />
</actions>
<menus>
<menu name="installedLayout">