Updated layout file format to XML

Fixed config & install inconstinstencies
Fixed form management updates

Signed-off-by: Gregory PLANCHAT <g.planchat@gmail.com>
This commit is contained in:
Gregory PLANCHAT 2012-01-24 22:27:32 +01:00
commit d40313279a
29 changed files with 692 additions and 918 deletions

View file

@ -1,183 +0,0 @@
<?php return array(
'1column' => array(
'update' => 'default'
),
'2columns-left' => array(
'update' => 'default',
'template' => 'page/2columns-left.phtml',
'reference' => array(
'root' => array(
'children' => array(
'left' => array(
'type' => 'core/concat'
)
)
)
)
),
'2columns-right' => array(
'update' => 'default',
'template' => 'page/2columns-right.phtml',
'reference' => array(
'root' => array(
'children' => array(
'right' => array(
'type' => 'core/concat'
),
)
)
)
),
'3columns' => array(
'update' => 'default',
'template' => 'page/3columns.phtml',
'reference' => array(
'root' => array(
'children' => array(
'left' => array(
'type' => 'core/concat'
),
'right' => array(
'type' => 'core/concat'
),
)
)
)
),
'default' => array(
'type' => 'core/html.page',
'template' => 'page/1column.phtml',
'children' => array(
'head' => array(
'type' => 'core/html.head',
'template' => 'page/html/head.phtml',
'actions' => array(
array(
'method' => 'addCss',
'params' => array(
'stylesheet' => 'css/base.css'
)
),
array(
'method' => 'addJs',
'params' => array(
'script' => 'scripts/jquery/jquery-1.6.4.js'
)
)
)
),
'header' => array(
'type' => 'core/concat'
),
'footer' => array(
'type' => 'core/template',
'template' => 'page/html/footer.phtml'
),
'content' => array(
'type' => 'core/concat'
)
)
),
'ajax' => array(
'type' => 'core/html.page',
'template' => 'page/empty.phtml',
'children' => array(
'content' => array(
'type' => 'core/concat'
)
)
),
'empty' => array(
'type' => 'core/html.page',
'template' => 'page/empty.phtml',
'children' => array(
'head' => array(
'type' => 'core/html.head',
'template' => 'page/html/head.phtml'
),
'content' => array(
'type' => 'core/concat'
)
)
),
'message' => array(
'update' => 'default',
'reference' => array(
'content' => array(
'children' => array(
'message' => array(
'type' => 'core/template',
'template' => 'page/html/message.phtml'
),
)
)
)
),
'login' => array(
'update' => '1column',
'reference' => array(
'content' => array(
'children' => array(
'login' => array(
'type' => 'core/template',
'template' => 'user/login.phtml'
),
)
),
'head' => array(
'actions' => array(
array(
'method' => 'addCss',
'params' => array(
'stylesheet' => 'css/deprecated/styles.css'
)
),
array(
'method' => 'addCss',
'params' => array(
'stylesheet' => 'css/deprecated/about.css'
)
)
)
)
)
),
'registration' => array(
'update' => '1column',
'reference' => array(
'content' => array(
'children' => array(
'registration' => array(
'type' => 'core/template',
'template' => 'user/registration.phtml'
),
)
),
'head' => array(
'actions' => array(
array(
'method' => 'addCss',
'params' => array(
'stylesheet' => 'css/deprecated/styles.css'
)
),
array(
'method' => 'addCss',
'params' => array(
'stylesheet' => 'css/deprecated/about.css'
)
)
)
)
)
)
);

View file

@ -0,0 +1,80 @@
<?xml version="1.0" encoding="UTF-8" ?>
<layout version="1.0">
<handle name="1column">
<update name="default" />
</handle>
<handle name="2columns-left">
<update name="default" />
<reference name="root">
<action method="setTemplate">
<params>
<param name="template">page/2columns-left.phtml</param>
</params>
</action>
<block name="left" type="core/concat" />
</reference>
</handle>
<handle name="2columns-right">
<update name="default" />
<reference name="root">
<action method="setTemplate">
<params>
<param name="template">page/2columns-right.phtml</param>
</params>
</action>
<block name="right" type="core/concat" />
</reference>
</handle>
<handle name="3columns">
<update name="default" />
<reference name="root">
<action method="setTemplate">
<params>
<param name="template">page/3columns.phtml</param>
</params>
</action>
<block name="left" type="core/concat" />
<block name="right" type="core/concat" />
</reference>
</handle>
<handle name="default">
<block name="root" type="core/html.page" template="page/1column.phtml">
<block name="head" type="core/html.head" template="page/html/head.phtml">
<action method="addCss">
<params>
<param name="stylesheet">css/base.css</param>
</params>
</action>
<action method="addJs">
<params>
<param name="script">scripts/jquery/jquery-1.6.4.js</param>
</params>
</action>
</block>
<block name="header" type="core/concat" />
<block name="content" type="core/concat" />
<block name="footer" type="core/template" />
</block>
</handle>
<handle name="ajax">
<block name="root" type="core/html.page" template="page/empty.phtml">
<block name="content" type="core/concat" />
</block>
</handle>
<handle name="empty">
<block name="root" type="core/html.page" template="page/empty.phtml">
<block name="head" type="core/html.head" template="page/html/head.phtml" />
<block name="content" type="core/concat" />
</block>
</handle>
<handle name="message">
<update name="default" />
<reference name="content">
<block name="message" type="core/template" template="page/html/message.phtml" />
</reference>
</handle>
</layout>

View file

@ -1,195 +0,0 @@
<?php return array(
'1column' => array(
'update' => 'default'
),
'2columns-left' => array(
'update' => 'default',
'template' => 'page/2columns-left.phtml',
'reference' => array(
'root' => array(
'children' => array(
'left' => array(
'type' => 'core/concat'
)
)
)
)
),
'2columns-right' => array(
'update' => 'default',
'template' => 'page/2columns-right.phtml',
'reference' => array(
'root' => array(
'children' => array(
'right' => array(
'type' => 'core/concat'
),
)
)
)
),
'3columns' => array(
'update' => 'default',
'template' => 'page/3columns.phtml',
'reference' => array(
'root' => array(
'children' => array(
'left' => array(
'type' => 'core/concat'
),
'right' => array(
'type' => 'core/concat'
),
)
)
)
),
'default' => array(
'type' => 'core/html.page',
'template' => 'page/1column.phtml',
'children' => array(
'head' => array(
'type' => 'core/html.head',
'template' => 'page/html/head.phtml',
'actions' => array(
array(
'method' => 'addCss',
'params' => array(
'stylesheet' => 'css/deprecated/default.css'
)
),
array(
'method' => 'addCss',
'params' => array(
'stylesheet' => 'css/deprecated/formate.css'
)
),
array(
'method' => 'addCss',
'params' => array(
'stylesheet' => 'css/base.css'
)
),
array(
'method' => 'addJs',
'params' => array(
'script' => 'scripts/jquery/jquery-1.6.4.js'
)
)
)
),
'header' => array(
'type' => 'core/concat'
),
'footer' => array(
'type' => 'core/template',
'template' => 'page/html/footer.phtml'
),
'content' => array(
'type' => 'core/concat'
)
)
),
'ajax' => array(
'type' => 'core/html.page',
'template' => 'page/empty.phtml',
'children' => array(
'content' => array(
'type' => 'core/concat'
)
)
),
'empty' => array(
'type' => 'core/html.page',
'template' => 'page/empty.phtml',
'children' => array(
'head' => array(
'type' => 'core/html.head',
'template' => 'page/html/head.phtml'
),
'content' => array(
'type' => 'core/concat'
)
)
),
'message' => array(
'update' => 'default',
'reference' => array(
'content' => array(
'children' => array(
'message' => array(
'type' => 'core/template',
'template' => 'page/html/message.phtml'
),
)
)
)
),
'login' => array(
'update' => '1column',
'reference' => array(
'content' => array(
'children' => array(
'login' => array(
'type' => 'core/template',
'template' => 'user/login.phtml'
),
)
),
'head' => array(
'actions' => array(
array(
'method' => 'addCss',
'params' => array(
'stylesheet' => 'css/deprecated/styles.css'
)
),
array(
'method' => 'addCss',
'params' => array(
'stylesheet' => 'css/deprecated/about.css'
)
)
)
)
)
),
'registration' => array(
'update' => '1column',
'reference' => array(
'content' => array(
'children' => array(
'registration' => array(
'type' => 'core/template',
'template' => 'user/registration.phtml'
),
)
),
'head' => array(
'actions' => array(
array(
'method' => 'addCss',
'params' => array(
'stylesheet' => 'css/deprecated/styles.css'
)
),
array(
'method' => 'addCss',
'params' => array(
'stylesheet' => 'css/deprecated/about.css'
)
)
)
)
)
)
);

View file

@ -0,0 +1,90 @@
<?xml version="1.0" encoding="UTF-8" ?>
<layout version="1.0">
<handle name="1column">
<update name="default" />
</handle>
<handle name="2columns-left">
<update name="default" />
<reference name="root">
<action method="setTemplate">
<params>
<param name="template">page/2columns-left.phtml</param>
</params>
</action>
<block name="left" type="core/concat" />
</reference>
</handle>
<handle name="2columns-right">
<update name="default" />
<reference name="root">
<action method="setTemplate">
<params>
<param name="template">page/2columns-right.phtml</param>
</params>
</action>
<block name="right" type="core/concat" />
</reference>
</handle>
<handle name="3columns">
<update name="default" />
<reference name="root">
<action method="setTemplate">
<params>
<param name="template">page/3columns.phtml</param>
</params>
</action>
<block name="left" type="core/concat" />
<block name="right" type="core/concat" />
</reference>
</handle>
<handle name="default">
<block name="root" type="core/html.page" template="page/1column.phtml">
<block name="head" type="core/html.head" template="page/html/head.phtml">
<action method="addCss">
<params>
<param name="stylesheet">css/deprecated/default.css</param>
</params>
</action>
<action method="addCss">
<params>
<param name="stylesheet">css/deprecated/formate.css</param>
</params>
</action>
<action method="addCss">
<params>
<param name="stylesheet">css/base.css</param>
</params>
</action>
<action method="addJs">
<params>
<param name="script">scripts/jquery/jquery-1.6.4.js</param>
</params>
</action>
</block>
<block name="header" type="core/concat" />
<block name="content" type="core/concat" />
<block name="footer" type="core/template" />
</block>
</handle>
<handle name="ajax">
<block name="root" type="core/html.page" template="page/empty.phtml">
<block name="content" type="core/concat" />
</block>
</handle>
<handle name="empty">
<block name="root" type="core/html.page" template="page/empty.phtml">
<block name="head" type="core/html.head" template="page/html/head.phtml" />
<block name="content" type="core/concat" />
</block>
</handle>
<handle name="message">
<update name="default" />
<reference name="content">
<block name="message" type="core/template" template="page/html/message.phtml" />
</reference>
</handle>
</layout>

View file

@ -0,0 +1,44 @@
<?xml version="1.0" encoding="UTF-8" ?>
<layout version="1.0">
<handle name="login">
<update name="1column" />
<reference name="content">
<block name="login" type="core/template" template="user/login.phtml" />
</reference>
<reference name="head">
<action method="addCss">
<params>
<param name="template">css/deprecated/styles.css</param>
</params>
</action>
<action method="addCss">
<params>
<param name="template">css/deprecated/about.css</param>
</params>
</action>
</reference>
</handle>
<handle name="registration">
<update name="1column" />
<reference name="content">
<block name="registration" type="core/template" template="user/registration.phtml" />
</reference>
<reference name="head">
<action method="addCss">
<params>
<param name="template">css/deprecated/styles.css</param>
</params>
</action>
<action method="addCss">
<params>
<param name="template">css/deprecated/about.css</param>
</params>
</action>
</reference>
</handle>
</layout>

View file

@ -0,0 +1,154 @@
<?php return array(
'install' => array(
'update' => '2columns-left',
'reference' => array(
'content' => array(
'children' => array(
'status' => array(
'type' => 'core/template',
'template' => 'status.phtml'
)
)
)
)
),
'install.intro' => array(
'update' => 'install',
'reference' => array(
'content' => array(
'children' => array(
'overview' => array(
'type' => 'core/template',
'template' => 'intro.phtml'
),
)
),
'status' => array(
'actions' => array(
array(
'method' => 'setData',
'params' => array(
'key' => 'step',
'value' => 0
)
)
)
)
)
),
'install.step.system' => array(
'update' => 'install',
'reference' => array(
'content' => array(
'children' => array(
'overview' => array(
'type' => 'core/template',
'template' => 'step/system.phtml'
),
)
),
'status' => array(
'actions' => array(
array(
'method' => 'setData',
'params' => array(
'key' => 'step',
'value' => 1
)
)
)
)
)
),
'install.step.database' => array(
'update' => 'install',
'reference' => array(
'content' => array(
'children' => array(
'overview' => array(
'type' => 'core/template',
'template' => 'step/database.phtml'
),
)
),
'status' => array(
'actions' => array(
array(
'method' => 'setData',
'params' => array(
'key' => 'step',
'value' => 2
)
)
)
)
)
),
'install.step.universe' => array(
'update' => 'install',
'reference' => array(
'content' => array(
'children' => array(
'overview' => array(
'type' => 'core/template',
'template' => 'step/universe.phtml'
),
)
),
'status' => array(
'actions' => array(
array(
'method' => 'setData',
'params' => array(
'key' => 'step',
'value' => 3
)
)
)
)
)
),
'install.step.profile' => array(
'update' => 'install',
'reference' => array(
'content' => array(
'children' => array(
'overview' => array(
'type' => 'core/template',
'template' => 'step/profile.phtml'
),
)
),
'status' => array(
'actions' => array(
array(
'method' => 'setData',
'params' => array(
'key' => 'step',
'value' => 4
)
)
)
)
)
),
'install.summary' => array(
'update' => 'install',
'reference' => array(
'content' => array(
'children' => array(
'overview' => array(
'type' => 'core/template',
'template' => 'summary.phtml'
),
)
)
)
),
);

View file

@ -1,337 +0,0 @@
<?php return array(
'1column' => array(
'update' => 'default'
),
'2columns-left' => array(
'update' => 'default',
'template' => 'page/2columns-left.phtml',
'reference' => array(
'root' => array(
'children' => array(
'left' => array(
'type' => 'core/concat'
)
)
)
)
),
'2columns-right' => array(
'update' => 'default',
'template' => 'page/2columns-right.phtml',
'reference' => array(
'root' => array(
'children' => array(
'right' => array(
'type' => 'core/concat'
),
)
)
)
),
'3columns' => array(
'update' => 'default',
'template' => 'page/3columns.phtml',
'reference' => array(
'root' => array(
'children' => array(
'left' => array(
'type' => 'core/concat'
),
'right' => array(
'type' => 'core/concat'
),
)
)
)
),
'default' => array(
'type' => 'core/html.page',
'template' => 'page/1column.phtml',
'children' => array(
'head' => array(
'type' => 'core/html.head',
'template' => 'page/html/head.phtml',
'actions' => array(
array(
'method' => 'addCss',
'params' => array(
'stylesheet' => 'css/base.css'
)
),
array(
'method' => 'addJs',
'params' => array(
'script' => 'scripts/jquery/jquery-1.6.4.js'
)
)
)
),
'header' => array(
'type' => 'core/template',
'template' => 'page/html/header.phtml'
),
'footer' => array(
'type' => 'core/template',
'template' => 'page/html/footer.phtml'
),
'content' => array(
'type' => 'core/concat'
)
)
),
'ajax' => array(
'type' => 'core/html.page',
'template' => 'page/empty.phtml',
'children' => array(
'content' => array(
'type' => 'core/concat'
)
)
),
'empty' => array(
'type' => 'core/html.page',
'template' => 'page/empty.phtml',
'children' => array(
'head' => array(
'type' => 'core/html.head',
'template' => 'page/html/head.phtml'
),
'content' => array(
'type' => 'core/concat'
)
)
),
'message' => array(
'update' => 'default',
'reference' => array(
'content' => array(
'children' => array(
'message' => array(
'type' => 'core/template',
'template' => 'page/html/message.phtml'
),
)
)
)
),
'login' => array(
'update' => '1column',
'reference' => array(
'content' => array(
'children' => array(
'login' => array(
'type' => 'core/template',
'template' => 'user/login.phtml'
),
)
),
'head' => array(
'actions' => array(
array(
'method' => 'addCss',
'params' => array(
'stylesheet' => 'css/deprecated/styles.css'
)
),
array(
'method' => 'addCss',
'params' => array(
'stylesheet' => 'css/deprecated/about.css'
)
)
)
)
)
),
'registration' => array(
'update' => '1column',
'reference' => array(
'content' => array(
'children' => array(
'registration' => array(
'type' => 'core/template',
'template' => 'user/registration.phtml'
),
)
),
'head' => array(
'actions' => array(
array(
'method' => 'addCss',
'params' => array(
'stylesheet' => 'css/deprecated/styles.css'
)
),
array(
'method' => 'addCss',
'params' => array(
'stylesheet' => 'css/deprecated/about.css'
)
)
)
)
)
),
'install' => array(
'update' => '2columns-left',
'reference' => array(
'content' => array(
'children' => array(
'status' => array(
'type' => 'core/template',
'template' => 'status.phtml'
)
)
)
)
),
'install.intro' => array(
'update' => 'install',
'reference' => array(
'content' => array(
'children' => array(
'overview' => array(
'type' => 'core/template',
'template' => 'intro.phtml'
),
)
),
'status' => array(
'actions' => array(
array(
'method' => 'setData',
'params' => array(
'key' => 'step',
'value' => 0
)
)
)
)
)
),
'install.step.system' => array(
'update' => 'install',
'reference' => array(
'content' => array(
'children' => array(
'overview' => array(
'type' => 'core/template',
'template' => 'step/system.phtml'
),
)
),
'status' => array(
'actions' => array(
array(
'method' => 'setData',
'params' => array(
'key' => 'step',
'value' => 1
)
)
)
)
)
),
'install.step.database' => array(
'update' => 'install',
'reference' => array(
'content' => array(
'children' => array(
'overview' => array(
'type' => 'core/template',
'template' => 'step/database.phtml'
),
)
),
'status' => array(
'actions' => array(
array(
'method' => 'setData',
'params' => array(
'key' => 'step',
'value' => 2
)
)
)
)
)
),
'install.step.universe' => array(
'update' => 'install',
'reference' => array(
'content' => array(
'children' => array(
'overview' => array(
'type' => 'core/template',
'template' => 'step/universe.phtml'
),
)
),
'status' => array(
'actions' => array(
array(
'method' => 'setData',
'params' => array(
'key' => 'step',
'value' => 3
)
)
)
)
)
),
'install.step.profile' => array(
'update' => 'install',
'reference' => array(
'content' => array(
'children' => array(
'overview' => array(
'type' => 'core/template',
'template' => 'step/profile.phtml'
),
)
),
'status' => array(
'actions' => array(
array(
'method' => 'setData',
'params' => array(
'key' => 'step',
'value' => 4
)
)
)
)
)
),
'install.summary' => array(
'update' => 'install',
'reference' => array(
'content' => array(
'children' => array(
'overview' => array(
'type' => 'core/template',
'template' => 'summary.phtml'
),
)
)
)
),
);

View file

@ -0,0 +1,90 @@
<?xml version="1.0" encoding="UTF-8" ?>
<layout version="1.0">
<handle name="1column">
<update name="default" />
</handle>
<handle name="2columns-left">
<update name="default" />
<reference name="root">
<action method="setTemplate">
<params>
<param name="template">page/2columns-left.phtml</param>
</params>
</action>
<block name="left" type="core/concat" />
</reference>
</handle>
<handle name="2columns-right">
<update name="default" />
<reference name="root">
<action method="setTemplate">
<params>
<param name="template">page/2columns-right.phtml</param>
</params>
</action>
<block name="right" type="core/concat" />
</reference>
</handle>
<handle name="3columns">
<update name="default" />
<reference name="root">
<action method="setTemplate">
<params>
<param name="template">page/3columns.phtml</param>
</params>
</action>
<block name="left" type="core/concat" />
<block name="right" type="core/concat" />
</reference>
</handle>
<handle name="default">
<block name="root" type="core/html.page" template="page/1column.phtml">
<block name="head" type="core/html.head" template="page/html/head.phtml">
<action method="addCss">
<params>
<param name="stylesheet">css/deprecated/default.css</param>
</params>
</action>
<action method="addCss">
<params>
<param name="stylesheet">css/deprecated/formate.css</param>
</params>
</action>
<action method="addCss">
<params>
<param name="stylesheet">css/base.css</param>
</params>
</action>
<action method="addJs">
<params>
<param name="script">scripts/jquery/jquery-1.6.4.js</param>
</params>
</action>
</block>
<block name="header" type="core/concat" />
<block name="content" type="core/concat" />
<block name="footer" type="core/template" />
</block>
</handle>
<handle name="ajax">
<block name="root" type="core/html.page" template="page/empty.phtml">
<block name="content" type="core/concat" />
</block>
</handle>
<handle name="empty">
<block name="root" type="core/html.page" template="page/empty.phtml">
<block name="head" type="core/html.head" template="page/html/head.phtml" />
<block name="content" type="core/concat" />
</block>
</handle>
<handle name="message">
<update name="default" />
<reference name="content">
<block name="message" type="core/template" template="page/html/message.phtml" />
</reference>
</handle>
</layout>