Games/wootook-reloaded
Watch
1
0
Fork
You've already forked wootook-reloaded
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Added building/research-lab/shipyard/defenses MVC controllers

Browse source 
Refactored View & Model base classes
Added database adapter error messages and status utility methods
Fixed login error
Fixed HTTP 404 error on home page
Fixed minor bugs

Signed-off-by: Gregory PLANCHAT <g.planchat@gmail.com>
This commit is contained in:
Gregory PLANCHAT 2012-03-20 21:31:33 +01:00
commit 3dde300c80
65 changed files with 1242 additions and 646 deletions
Download patch file Download diff file Expand all files Collapse all files

57
src/application/design/frontend/base/default/layouts/empire.xml
View file

@ -29,114 +29,111 @@
<param name="name">planet/overview</param>
<param name="label">Overview</param>
<param name="title">Overview</param>
<param name="uri">overview.php</param>
<param name="uri">player/overview</param>
</action>
<action method="addLink">
<param name="name">planet/buildings</param>
<param name="label">Buildings</param>
<param name="title">Buildings</param>
<param name="uri">buildings.php</param>
<param name="uri">empire/buildings</param>
</action>
<action method="addLink">
<param name="name">planet/research-lab</param>
<param name="label">Research Lab</param>
<param name="title">Research Lab</param>
<param name="uri">buildings.php</param>
<param name="params"><mode>research</mode></param>
<param name="uri">legacies-empire/research-lab</param>
</action>
<action method="addLink">
<param name="name">planet/shipyard</param>
<param name="label">Shipyard</param>
<param name="title">Shipyard</param>
<param name="uri">buildings.php</param>
<param name="params"><mode>fleet</mode></param>
<param name="uri">legacies-empire/shipyard</param>
</action>
<action method="addLink">
<param name="name">planet/defenses</param>
<param name="label">Defenses</param>
<param name="title">Defenses</param>
<param name="uri">buildings.php</param>
<param name="params"><mode>defense</mode></param>
<param name="uri">legacies-empire/defense</param>
</action>
<action method="addLink">
<action method="addStaticLink">
<param name="name">universe/galaxy</param>
<param name="label">Check out the Galaxy</param>
<param name="title">Check out the Galaxy</param>
<param name="uri">galaxy.php</param>
</action>
<action method="addLink">
<action method="addStaticLink">
<param name="name">universe/fleet</param>
<param name="label">Send a Fleet</param>
<param name="title">Send a Fleet</param>
<param name="uri">fleet.php</param>
</action>
<action method="addLink">
<action method="addStaticLink">
<param name="name">universe/retailer</param>
<param name="label">Retailer</param>
<param name="title">Retailer</param>
<param name="uri">marchand.php</param>
</action>
<action method="addLink">
<action method="addStaticLink">
<param name="name">universe/records</param>
<param name="label">All Records</param>
<param name="title">All Records</param>
<param name="uri">records.php</param>
</action>
<action method="addLink">
<action method="addStaticLink">
<param name="name">universe/statistics</param>
<param name="label">My Stats</param>
<param name="title">My Stats</param>
<param name="uri">stat.php</param>
</action>
<action method="addLink">
<action method="addStaticLink">
<param name="name">universe/search-player</param>
<param name="label">Search a Player</param>
<param name="title">Search a Player</param>
<param name="uri">search.php</param>
</action>
<action method="addLink">
<action method="addStaticLink">
<param name="name">universe/empire</param>
<param name="label">Empire</param>
<param name="title">Empire</param>
<param name="uri">imperium.php</param>
</action>
<action method="addLink">
<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="addLink">
<action method="addStaticLink">
<param name="name">account/alliance</param>
<param name="label">My Alliance</param>
<param name="title">My Alliance</param>
<param name="uri">alliance.php</param>
</action>
<action method="addLink">
<action method="addStaticLink">
<param name="name">account/messages</param>
<param name="label">My Messages</param>
<param name="title">My Messages</param>
<param name="uri">messages.php</param>
</action>
<action method="addLink">
<action method="addStaticLink">
<param name="name">account/resources</param>
<param name="label">My Resources Production</param>
<param name="title">My Resources Production</param>
<param name="uri">resources.php</param>
</action>
<action method="addLink">
<action method="addStaticLink">
<param name="name">account/tech-tree</param>
<param name="label">Technology Tree</param>
<param name="title">Technology Tree</param>
<param name="uri">techtree.php</param>
</action>
<action method="addLink">
<action method="addStaticLink">
<param name="name">tools/notes</param>
<param name="label">Note Pad</param>
<param name="title">Note Pad</param>
<param name="uri">notes.php</param>
</action>
<action method="addLink">
<action method="addStaticLink">
<param name="name">tools/options</param>
<param name="label">Account Options</param>
<param name="title">Account Options</param>
@ -146,7 +143,7 @@
<param name="name">tools/logout</param>
<param name="label">Log Out</param>
<param name="title">Log Out</param>
<param name="uri">logout.php</param>
<param name="uri">player/account/logout</param>
</action>
<action method="addExternalLink">
<param name="name">community/board</param>
@ -154,37 +151,37 @@
<param name="title">Forum board</param>
<param name="url">http://wootook.org/board/</param>
</action>
<action method="addLink">
<action method="addStaticLink">
<param name="name">community/chat</param>
<param name="label">Chat</param>
<param name="title">Chat</param>
<param name="uri">chat.php</param>
</action>
<action method="addLink">
<action method="addStaticLink">
<param name="name">community/announcement</param>
<param name="label">Announcements</param>
<param name="title">Announcements</param>
<param name="uri">annonce.php</param>
</action>
<action method="addLink">
<action method="addStaticLink">
<param name="name">community/multi</param>
<param name="label">Declare Multi-account</param>
<param name="title">Declare Multi-account</param>
<param name="uri">delclare_multi.php</param>
</action>
<action method="addLink">
<action method="addStaticLink">
<param name="name">community/rules</param>
<param name="label">Rules</param>
<param name="title">Rules</param>
<param name="uri">rules.php</param>
</action>
<action method="addLink">
<action method="addStaticLink">
<param name="name">community/contact</param>
<param name="label">Contact Admin</param>
<param name="title">Contact Admin</param>
<param name="uri">contact.php</param>
</action>
<action method="addLink">
<action method="addStaticLink">
<param name="name">community/banned</param>
<param name="label">Banned Players</param>
<param name="title">Banned Players</param>
@ -307,4 +304,4 @@
</block>
</reference>
</handle>
</layout>
</layout>

4
src/application/design/frontend/base/default/layouts/page.xml
View file

@ -118,7 +118,7 @@
</reference>
<reference name="content">
<block name="login" type="core/template" template="page/home.phtml" />
<block name="login" type="core/template" template="page/html/home.phtml" />
</reference>
</handle>
</layout>
</layout>

2
src/application/design/frontend/base/default/scripts/empire/planet/buildings/item.phtml
View file

@ -12,7 +12,7 @@
</div>
<?php else:?>
<div class="buy">
<p><a class="build" href="<?php echo $this->getStaticUrl('buildings.php', array('building' => $this->getItemId()))?>"><?php echo $this->__('Build next level (%s)', $this->renderNumber($this->getNextLevel()))?></a></p>
<p><a class="build" href="<?php echo $this->getUrl('empire/buildings/build', array('id' => $this->getItemId()))?>"><?php echo $this->__('Build next level (%s)', $this->renderNumber($this->getNextLevel()))?></a></p>
</div>
<?php endif?>
<div class="details">

4
src/application/design/frontend/base/default/scripts/empire/planet/buildings/queue/item.phtml
View file

@ -6,6 +6,6 @@
</p>
<p class="time"><?php echo $this->__('Lasts %s', $this->renderTime($this->getBuildingRemainingTime()))?></p>
<div class="cancel">
<p><a class="build" href="<?php echo $this->getStaticUrl('buildings.php', array('cancel' => $this->getItem()->getIndex()))?>"><?php echo $this->__('Cancel')?></a></p>
<p><a class="build" href="<?php echo $this->getUrl('empire/buildings/cancel', array('id' => $this->getItem()->getIndex()))?>"><?php echo $this->__('Cancel')?></a></p>
</div>
</div>
</div>

4
src/application/design/frontend/base/default/scripts/empire/planet/research-lab/item.phtml
View file

@ -7,7 +7,7 @@
<div class="item details">
<a href="<?php echo $this->getItemInfoUrl()?>" class="image"><img src="<?php echo $this->getItemImageUrl()?>" alt="" width="120" height="120" /></a>
<div class="buy">
<p><a class="build" href="<?php echo $this->getStaticUrl('buildings.php', array('research' => $this->getItemId(), 'mode' => 'research'))?>"><?php echo $this->__('Build next level (%s)', $this->renderNumber($this->getNextLevel()))?></a></p>
<p><a class="build" href="<?php echo $this->getUrl('empire/research-lab/build', array('id' => $this->getItemId()))?>"><?php echo $this->__('Build next level (%s)', $this->renderNumber($this->getNextLevel()))?></a></p>
</div>
<div class="details">
<p><?php echo $this->getDescription()?></p>
@ -27,4 +27,4 @@
<p><?php echo $this->__('Building time: %s', $this->renderTime($this->getBuildingTimeForNextLevel(), false))?>
</div>
</div>
</div>
</div>

4
src/application/design/frontend/base/default/scripts/empire/planet/research-lab/queue/item.phtml
View file

@ -6,6 +6,6 @@
</p>
<p class="time"><?php echo $this->__('Lasts %s', $this->renderTime($this->getBuildingRemainingTime()))?></p>
<div class="cancel">
<p><a class="build" href="<?php echo $this->getStaticUrl('buildings.php', array('cancel' => $this->getItem()->getIndex()))?>"><?php echo $this->__('Cancel')?></a></p>
<p><a class="build" href="<?php echo $this->getUrl('empire/research-lab/cancel', array('id' => $this->getItem()->getIndex()))?>"><?php echo $this->__('Cancel')?></a></p>
</div>
</div>
</div>

4
src/application/design/frontend/base/default/scripts/empire/planet/shipyard.phtml
View file

@ -1,6 +1,6 @@
<div class="shipyard item-list countable" id="shipyard">
<h1><?php echo $this->__('Shipyard')?></h1>
<form action="<?php echo $this->getStaticUrl('buildings.php', array('mode' => 'fleet'))?>" method="post" id="shipyard-form">
<form action="<?php echo $this->getUrl('empire/shipyard/build')?>" method="post" id="shipyard-form">
<?php echo $this->getPartial('item-list.items')->render()?>
<input type="submit" value="<?php echo $this->__('Build')?>">
</form>
@ -28,4 +28,4 @@ jQuery(document).ready(function(){
});
/*]]>*/
</script>
</div>
</div>

1
src/application/design/frontend/base/default/scripts/page/html/home.phtml Normal file
View file

@ -0,0 +1 @@
<?php echo $this->getLayout()->getMessagesBlock()->renderGroupedHtml()?>

3
src/application/design/frontend/base/default/scripts/player/login.phtml
View file

@ -1,3 +1,4 @@
<?php echo $this->getLayout()->getMessagesBlock()->renderGroupedHtml()?>
<form id="login-form" name="login-form" action="<?php echo $this->getUrl('player/account/login-post')?>" method="post" class="main-form">
<fieldset>
<legend><?php echo $this->__('Login')?></legend>
@ -20,4 +21,4 @@
<p class="form submit">
<input id="login:submit" value="<?php echo $this->__('Log in!')?>" type="submit">
</p>
</form>
</form>

3
src/application/design/frontend/base/default/scripts/player/lost-password.phtml
View file

@ -1,3 +1,4 @@
<?php echo $this->getLayout()->getMessagesBlock()->renderGroupedHtml()?>
<form id="lost-password-form" name="lost-password-form" action="<?php echo $this->getStaticUrl('player/account/lost-password-post')?>" method="post" class="main-form">
<fieldset>
<legend><?php echo $this->__('Lost your password?')?></legend>
@ -13,4 +14,4 @@
<p class="form submit">
<input id="login:submit" value="<?php echo $this->__('Send me a new password!')?>" type="submit">
</p>
</form>
</form>

3
src/application/design/frontend/base/default/scripts/player/overview.phtml
View file

@ -1,3 +1,4 @@
<?php echo $this->getLayout()->getMessagesBlock()->renderGroupedHtml()?>
<div id="overview" class="overview">
<h1><?php echo $this->__('Overview')?></h1>
<div class="left">
@ -7,4 +8,4 @@
<?php echo $this->renderPartial('overview.center')?>
</div>
<div class="clear"></div>
</div>
</div>

3
src/application/design/frontend/base/default/scripts/player/registration.phtml
View file

@ -1,3 +1,4 @@
<?php echo $this->getLayout()->getMessagesBlock()->renderGroupedHtml()?>
<form id="register-form" name="register-form" action="<?php echo $this->getStaticUrl('player/account/register-post')?>" method="post" class="main-form">
<h1><?php echo $this->__('Register')?></h1>
<fieldset>
@ -36,4 +37,4 @@
<p class="form submit">
<input id="register:submit" value="<?php echo $this->__('Register!')?>" type="submit">
</p>
</form>
</form>