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

@ -137,7 +137,8 @@ $configRewrites = array(
'package' => 'default',
'theme' => 'default',
'layout' => array(
'page' => 'page.php'
'page' => 'page.xml',
'install' => 'install.php'
),
'storyline' => array(
'universe' => 'legacies',
@ -147,8 +148,11 @@ $configRewrites = array(
);
$config = unserialize($session->getData('config'));
$config = array_merge_recursive($config, $configRewrites);
Wootook::loadConfig($config);
if (is_array($config)) {
Wootook::loadConfig(array_merge_recursive($config, $configRewrites));
} else {
Wootook::loadConfig($configRewrites);
}
$layout = new Wootook_Core_Layout('install');
@ -229,10 +233,6 @@ case 'install':
'allow_spy_drone_attacks' => true
)
),
'layout' => array(
'page' => 'page.php',
'empire' => 'empire.php'
),
'locales' => array(
'fr' => 'fr_FR',
'fr_FR' => 'fr_FR',