Fixed minor bugs

Updated redesign

Signed-off-by: Gregory PLANCHAT <g.planchat@gmail.com>
This commit is contained in:
Gregory PLANCHAT 2012-05-02 23:06:18 +02:00
commit 4b2167c133
67 changed files with 323 additions and 1044 deletions

View file

@ -1,6 +1,6 @@
<?php return array(
'admin' => array(
'update' => '1column',
'update' => array('1column'),
'reference' => array(
'header' => array(
'children' => array(
@ -241,7 +241,7 @@
)
),
'admin.grid' => array(
'update' => 'admin',
'update' => array('admin'),
'reference' => array(
'content' => array(
'children' => array(
@ -264,7 +264,7 @@
)
),
'admin.user.grid' => array(
'update' => 'admin.grid',
'update' => array('admin.grid'),
'reference' => array(
'grid' => array(
'actions' => array(

View file

@ -40,6 +40,12 @@
<action method="addCss">
<param name="stylesheet">css/base.css</param>
</action>
<action method="addCss">
<param name="stylesheet">css/deprecated/default.css</param>
</action>
<action method="addCss">
<param name="stylesheet">css/deprecated/formate.css</param>
</action>
<action method="addJs">
<param name="script">scripts/jquery/jquery-1.6.4.js</param>
</action>
@ -74,4 +80,4 @@
<block name="message" type="core/template" template="page/html/no-route.phtml" />
</reference>
</handle>
</layout>
</layout>

View file

@ -1,35 +1,35 @@
<br><br>
<h2><?php echo $this->getData('adm_ov_title')?></h2>
<h2><?php echo $this->__('Overview')?></h2>
<table width="600">
<tr>
<td class="c" colspan="2"><?php echo $this->getData('adm_ov_infos')?></td>
</tr><tr>
<td class="b" style="color:#FFFFFF"><?php echo $this->getData('adm_ov_yourv')?>: <strong><?php echo $this->getData('adm_ov_data_yourv')?></strong></td>
<td class="b" style="color:#FFFFFF"><?php echo $this->getData('adm_ov_lastv')?>: <b><a style="color:orange;" href="http://wootook.org/"><?php echo $this->getData('adm_ov_here')?></a></b></td>
</tr>
<tr>
<td class="c" colspan="2"><?php echo $this->__('General information')?></td>
</tr>
<tr>
<td class="b"><?php echo $this->__('Your version:')?><span class="version"><?php echo $this->getData('version')?></span></td>
<td class="b"><a class="downloads" href="http://wootook.org/downloads"><?php echo $this->__('Latest version avalaiable at Wootook.org')?></a></td>
</tr>
</table>
<br>
<table width="600">
<tr>
<td class="c" colspan="13"><?php echo $this->getData('adm_ov_onlin')?></td>
</tr>
<tr>
<th><a href="?cmd=sort&type=id"><?php echo $this->getData('adm_ul_id')?></a></th>
<th><a href="?cmd=sort&type=username"><?php echo $this->getData('adm_ul_name')?></a></th>
<th><a href="?cmd=sort&type=user_lastip"><?php echo $this->getData('adm_ul_adip')?></a></th>
<th><a href="?cmd=sort&type=ally_name"><?php echo $this->getData('adm_ov_ally')?></a></th>
<th><?php echo $this->getData('adm_ov_point')?></th>
<th><a href="?cmd=sort&type=onlinetime"><?php echo $this->getData('adm_ov_activ')?></a></th>
<th><?php echo $this->getData('usr_email')?></th>
<th><?php echo $this->getData('xp_raid')?></th>
<th><?php echo $this->getData('xp_min')?></th>
<th><?php echo $this->getData('lang_vacancy')?></th>
<th><?php echo $this->getData('banned_lang')?></th>
<th><?php echo $this->getData('usr_current_planet')?></th>
<th><?php echo $this->getData('usr_current_page')?></th>
</tr>
<?php echo $this->getData('adm_ov_data_table')?>
<tr>
<th class="b" colspan="13"><?php echo $this->getData('adm_ov_count')?>: <?php echo $this->getData('adm_ov_data_count')?></th>
</tr>
</table>
<tr>
<td class="c" colspan="13"><?php echo $this->__('Online players')?></td>
</tr>
<tr>
<th><a href="?cmd=sort&type=id"><?php echo $this->getData('adm_ul_id')?></a></th>
<th><a href="?cmd=sort&type=username"><?php echo $this->getData('adm_ul_name')?></a></th>
<th><a href="?cmd=sort&type=user_lastip"><?php echo $this->getData('adm_ul_adip')?></a></th>
<th><a href="?cmd=sort&type=ally_name"><?php echo $this->getData('adm_ov_ally')?></a></th>
<th><?php echo $this->getData('adm_ov_point')?></th>
<th><a href="?cmd=sort&type=onlinetime"><?php echo $this->getData('adm_ov_activ')?></a></th>
<th><?php echo $this->getData('usr_email')?></th>
<th><?php echo $this->getData('xp_raid')?></th>
<th><?php echo $this->getData('xp_min')?></th>
<th><?php echo $this->getData('lang_vacancy')?></th>
<th><?php echo $this->getData('banned_lang')?></th>
<th><?php echo $this->getData('usr_current_planet')?></th>
<th><?php echo $this->getData('usr_current_page')?></th>
</tr>
<?php echo $this->getData('adm_ov_data_table')?>
<tr>
<th class="b" colspan="13"><?php echo $this->getData('adm_ov_count')?>: <?php echo $this->getData('adm_ov_data_count')?></th>
</tr>
</table>

View file

@ -97,12 +97,6 @@
<param name="title">Empire</param>
<param name="uri">imperium.php</param>
</action>
<action method="addStaticLink">
<param name="name">account/officers</param>
<param name="label">Officers</param>
<param name="title">Officers</param>
<param name="uri">officier.php</param>
</action>
<action method="addStaticLink">
<param name="name">account/alliance</param>
<param name="label">My Alliance</param>
@ -251,6 +245,14 @@
<update name="empire" />
<reference name="content">
<block name="queue" type="legacies-empire/planet.shipyard.queue" template="empire/planet/shipyard/queue.phtml">
<action method="setItemTemplate">
<param name="template">empire/planet/shipyard/queue/item.phtml</param>
</action>
<action method="setItemBlockType">
<param name="blockType">legacies-empire/planet.shipyard.queue.item</param>
</action>
</block>
<block name="item-list" type="legacies-empire/planet.shipyard" template="empire/planet/shipyard.phtml">
<block name="item-list.items" type="core/concat" />
<action method="setItemTemplate">
@ -260,14 +262,6 @@
<param name="blockType">legacies-empire/planet.shipyard.item</param>
</action>
</block>
<block name="queue" type="legacies-empire/planet.shipyard.queue" template="empire/planet/shipyard/queue.phtml">
<action method="setItemTemplate">
<param name="template">empire/planet/shipyard/queue/item.phtml</param>
</action>
<action method="setItemBlockType">
<param name="blockType">legacies-empire/planet.shipyard.queue.item</param>
</action>
</block>
</reference>
</handle>

View file

@ -0,0 +1,7 @@
<div id="overview:stats" class="item-container">
<h2><?php echo $this->escape($this->getPlanetName())?></h2>
<h3><?php echo $this->escape($this->getPlanetCoords())?></h3>
<p class="image">
<img src="<?php echo $this->getSkinUrl($this->getPlanetImage())?>" />
</p>
</div>