Configuration & Layout architecture updates
Fixed production bug Fixed styles Updated Action Controller Signed-off-by: Gregory PLANCHAT <g.planchat@gmail.com>
This commit is contained in:
Gregory PLANCHAT
parent
dfa3dfb086
commit
66805034a6
815 changed files with 4020 additions and 1138 deletions
337
application/design/install/base/default/layouts/page.php
Normal file
337
application/design/install/base/default/layouts/page.php
Normal file
|
|
@ -0,0 +1,337 @@
|
|||
<?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'
|
||||
),
|
||||
)
|
||||
)
|
||||
)
|
||||
),
|
||||
);
|
||||
|
|
@ -0,0 +1,15 @@
|
|||
<html>
|
||||
<head>
|
||||
<?php echo $this->head->render()?>
|
||||
</head>
|
||||
<body<?php if ($classes = $this->getBodyClasses()):?> class="<?php echo $this->escape($classes)?>"<?php endif?>>
|
||||
<div class="global">
|
||||
<div class="content">
|
||||
<?php if (isset($this->topnav)):?>
|
||||
<?php echo $this->topnav->render()?>
|
||||
<?php endif?>
|
||||
<?php echo $this->content->render()?>
|
||||
</div>
|
||||
</div>
|
||||
</body>
|
||||
</html>
|
||||
|
|
@ -0,0 +1,18 @@
|
|||
<html>
|
||||
<head>
|
||||
<?php echo $this->head->render()?>
|
||||
</head>
|
||||
<body<?php if ($classes = $this->getBodyClasses()):?> class="<?php echo $this->escape($classes)?>"<?php endif?>>
|
||||
<div class="global">
|
||||
<div class="left">
|
||||
<?php echo $this->left->render()?>
|
||||
</div>
|
||||
<div class="content">
|
||||
<?php if (isset($this->topnav)):?>
|
||||
<?php echo $this->topnav->render()?>
|
||||
<?php endif?>
|
||||
<?php echo $this->content->render()?>
|
||||
</div>
|
||||
</div>
|
||||
</body>
|
||||
</html>
|
||||
|
|
@ -0,0 +1,18 @@
|
|||
<html>
|
||||
<head>
|
||||
<?php echo $this->head->render()?>
|
||||
</head>
|
||||
<body<?php if ($classes = $this->getBodyClasses()):?> class="<?php echo $this->escape($classes)?>"<?php endif?>>
|
||||
<div class="global">
|
||||
<div class="content">
|
||||
<?php if (isset($this->topnav)):?>
|
||||
<?php echo $this->topnav->render()?>
|
||||
<?php endif?>
|
||||
<?php echo $this->content->render()?>
|
||||
</div>
|
||||
<div class="right">
|
||||
<?php echo $this->left->render()?>
|
||||
</div>
|
||||
</div>
|
||||
</body>
|
||||
</html>
|
||||
|
|
@ -0,0 +1,21 @@
|
|||
<html>
|
||||
<head>
|
||||
<?php echo $this->head->render()?>
|
||||
</head>
|
||||
<body<?php if ($classes = $this->getBodyClasses()):?> class="<?php echo $this->escape($classes)?>"<?php endif?>>
|
||||
<div class="global">
|
||||
<div class="left">
|
||||
<?php echo $this->left->render()?>
|
||||
</div>
|
||||
<div class="content">
|
||||
<?php if (isset($this->topnav)):?>
|
||||
<?php echo $this->topnav->render()?>
|
||||
<?php endif?>
|
||||
<?php echo $this->content->render()?>
|
||||
</div>
|
||||
<div class="right">
|
||||
<?php echo $this->left->render()?>
|
||||
</div>
|
||||
</div>
|
||||
</body>
|
||||
</html>
|
||||
|
|
@ -0,0 +1,26 @@
|
|||
<title><?php echo $this->escape($this->getTitle())?></title>
|
||||
<link rel="shortcut icon" href="<?php echo $this->getUrl('favicon.ico')?>">
|
||||
<?php foreach ($this->getCss() as $css):?>
|
||||
<link rel="stylesheet" type="<?php echo $css['type']?>" href="<?php echo $this->getSkinUrl($css['path'])?>" />
|
||||
<?php endforeach?>
|
||||
<?php foreach ($this->getInlineCss() as $css):?>
|
||||
<style type="<?php echo $css['type']?>">
|
||||
/*<![CDATA[*/
|
||||
<?php echo $css['content']?>
|
||||
/*]]>*/
|
||||
</style>
|
||||
<?php endforeach?>
|
||||
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
|
||||
<?php foreach ($this->getJs() as $js):?>
|
||||
<script type="<?php echo $js['type']?>" src="<?php echo $this->getUrl($js['path'])?>"></script>
|
||||
<?php endforeach?>
|
||||
<?php foreach ($this->getSkinJs() as $js):?>
|
||||
<script type="<?php echo $js['type']?>" src="<?php echo $this->getSkinUrl($js['path'])?>"></script>
|
||||
<?php endforeach?>
|
||||
<?php foreach ($this->getInlineJs() as $js):?>
|
||||
<script type="<?php echo $js['type']?>">
|
||||
/*<![CDATA[*/
|
||||
<?php echo $js['content']?>
|
||||
/*]]>*/
|
||||
</script>
|
||||
<?php endforeach?>
|
||||
|
|
@ -0,0 +1,4 @@
|
|||
<div class="message">
|
||||
<h1><?php echo $this->escape($this->getData('title'))?></h1>
|
||||
<p><?php echo $this->escape($this->getData('message'))?></p>
|
||||
</div>
|
||||
|
|
@ -0,0 +1,18 @@
|
|||
<div class="navigation">
|
||||
<?php foreach ($this->getAllPartials() as $partial):?>
|
||||
<?php echo $partial->render()?>
|
||||
<?php endforeach?>
|
||||
<span class="last"></span>
|
||||
</div>
|
||||
<script type="text/javascript">
|
||||
//<![CDATA[
|
||||
(function($){
|
||||
var navigation = $('.navigation');
|
||||
$('.navigation-node', navigation).hover(function(e){
|
||||
$('.navigation-link,.last', $(this)).show();
|
||||
}, function(e){
|
||||
$('.navigation-link,.last', $(this)).hide();
|
||||
});
|
||||
})(jQuery);
|
||||
//]]>
|
||||
</script>
|
||||
|
|
@ -0,0 +1,3 @@
|
|||
<span class="<?php echo $this->escape($this->renderClasses())?> navigation-link">
|
||||
<a href="<?php echo $this->escape($this->getLinkUrl())?>"<?php foreach ($this->getAttributes() as $attributeName => $attributeValue):?> <?php echo $attributeName?>="<?php echo $attributeValue ?>"<?php endforeach?>><?php echo $this->escape($this->getLabel())?></a>
|
||||
</span>
|
||||
|
|
@ -0,0 +1,7 @@
|
|||
<div class="navigation-node">
|
||||
<p class="title"><?php echo $this->escape($this->getTitle())?></p>
|
||||
<?php foreach ($this->getAllPartials() as $name => $partial):?>
|
||||
<?php echo $partial->render()?>
|
||||
<?php endforeach?>
|
||||
<span class="last"></span>
|
||||
</div>
|
||||
|
|
@ -3,6 +3,7 @@
|
|||
<p class="item intro<?php if ($status == 0):?> active<?php elseif ($status >= 1):?> cleared<?php endif?>"><?php echo $this->__('Welcome')?></p>
|
||||
<p class="item system<?php if ($status == 1):?> active<?php elseif ($status >= 2):?> cleared<?php endif?>"><?php echo $this->__('System')?></p>
|
||||
<p class="item database<?php if ($status == 2):?> active<?php elseif ($status >= 3):?> cleared<?php endif?>"><?php echo $this->__('Database')?></p>
|
||||
<p class="item profile<?php if ($status == 3):?> active<?php elseif ($status >= 4):?> cleared<?php endif?>"><?php echo $this->__('Admin profile')?></p>
|
||||
<p class="item summary<?php if ($status == 4):?> active<?php elseif ($status >= 5):?> cleared<?php endif?>"><?php echo $this->__('Summary')?></p>
|
||||
<p class="item universe<?php if ($status == 3):?> active<?php elseif ($status >= 4):?> cleared<?php endif?>"><?php echo $this->__('Universe')?></p>
|
||||
<p class="item profile<?php if ($status == 4):?> active<?php elseif ($status >= 5):?> cleared<?php endif?>"><?php echo $this->__('Admin profile')?></p>
|
||||
<p class="item summary<?php if ($status > 4):?> active<?php endif?>"><?php echo $this->__('Summary')?></p>
|
||||
</div>
|
||||
|
|
@ -49,13 +49,13 @@
|
|||
type: 'post',
|
||||
success: function(data){
|
||||
if (!data.status) {
|
||||
$('#install_messages').html('<?php echo $this->escapeJs($this->__('Ajax failure.'))?>');
|
||||
$('#install_messages').html('<?php echo $this->escapeJs($this->__('Ajax failure.'))?>').removeClass('success').addClass('failure').fadeIn(500);
|
||||
} else if (data.status == 'success') {
|
||||
$('#install_messages').html('<?php echo $this->escapeJs($this->__('Connection succeeded.'))?>');
|
||||
$('#install_messages').html('<?php echo $this->escapeJs($this->__('Connection succeeded.'))?>').removeClass('failure').addClass('success').fadeIn(500);
|
||||
} else if (data.status == 'error' && data.message) {
|
||||
$('#install_messages').html('<?php echo $this->escapeJs($this->__('Connection error: '))?>' + data.message);
|
||||
$('#install_messages').html('<?php echo $this->escapeJs($this->__('Connection error: '))?>' + data.message).removeClass('success').addClass('failure').fadeIn(500);
|
||||
} else {
|
||||
$('#install_messages').html('<?php echo $this->escapeJs($this->__('Ajax failure.'))?>');
|
||||
$('#install_messages').html('<?php echo $this->escapeJs($this->__('Ajax failure.'))?>').removeClass('success').addClass('failure').fadeIn(500);
|
||||
}
|
||||
}});
|
||||
});
|
||||
|
|
@ -0,0 +1,7 @@
|
|||
<div class="install">
|
||||
<h1><?php echo $this->__('Wootook! was successfully installed.')?></h1>
|
||||
<?php echo $this->getLayout()->getMessagesblock()->renderGroupedHtml()?>
|
||||
<p><?php echo $this->__('You can now play at %s and tell your friends to come and play.', Wootook::getBaseUrl())?></p>
|
||||
<p><?php echo $this->__('Feel free to ask for help at any time at <a href="%s">wootook.org</a>.', 'http://wootook.org/board/')?></p>
|
||||
<p><button onclick="document.location.href='../'"><?php echo $this->__('Play!')?></button></p>
|
||||
</div>
|
||||
|
|
@ -1,154 +0,0 @@
|
|||
<?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'
|
||||
),
|
||||
)
|
||||
)
|
||||
)
|
||||
),
|
||||
);
|
||||
Loading…
Reference in a new issue