Skip to content

Commit f93fadc

Browse files
author
Codeliner
committed
Merge branch 'development'
2 parents 56df16d + 1ed28a3 commit f93fadc

File tree

5 files changed

+29
-46
lines changed

5 files changed

+29
-46
lines changed

‎.gitmodules‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
[submodule "vendor/ZF2"]
2+
path = vendor/ZF2
3+
url = https://github.com/zendframework/zf2.git

‎config/application.config.php‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@
22
return array(
33
// This should be an array of module namespaces used in the application.
44
'modules' => array(
5+
'DoctrineModule',
6+
'DoctrineORMModule',
7+
'ZfcTwitterBootstrap',
58
'Application',
69
),
710

‎module/Application/config/module.config.php‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,9 @@
5353
),
5454
),
5555
'service_manager' => array(
56+
'factories' => array(
57+
'main_navigation' => 'Zend\Navigation\Service\DefaultNavigationFactory',
58+
),
5659
'abstract_factories' => array(
5760
'Zend\Cache\Service\StorageCacheAbstractServiceFactory',
5861
'Zend\Log\LoggerAbstractServiceFactory',
@@ -92,6 +95,14 @@
9295
__DIR__ . '/../view',
9396
),
9497
),
98+
'navigation' => array(
99+
'default' => array(
100+
'home' => array(
101+
'route' => 'home',
102+
'label' => 'home'
103+
)
104+
)
105+
),
95106
// Placeholder for console routes
96107
'console' => array(
97108
'router' => array(

‎module/Application/view/application/index/index.phtml‎

Lines changed: 7 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1,44 +1,17 @@
11
<div class="jumbotron">
2-
<h1><?php echo sprintf($this->translate('Welcome to %sZend Framework 2%s'), '<span class="zf-green">', '</span>') ?></h1>
3-
<p><?php echo sprintf($this->translate('Congratulations! You have successfully installed the %sZF2 Skeleton Application%s. You are currently running Zend Framework version %s. This skeleton can serve as a simple starting point for you to begin building your application on ZF2.'), '<a href="https://github.com/zendframework/ZendSkeletonApplication" target="_blank">', '</a>', \Zend\Version\Version::VERSION) ?></p>
4-
<p><a class="btn btn-success btn-lg" href="https://github.com/zendframework/zf2" target="_blank"><?php echo $this->translate('Fork Zend Framework 2 on GitHub') ?> &raquo;</a></p>
2+
<h1><?php echo $this->translate('Welcome to the PHP DDD Cargo Sample') ?></h1>
3+
<p><?php echo $this->translate('Congratulations! You have successfully installed the Container Shipping System. You are currently running the Chaper One Version of the Application.') ?></p>
4+
<p><a class="btn btn-success btn-lg" href="https://github.com/codeliner/php-ddd-cargo-sample" target="_blank"><?php echo $this->translate('Fork PHP DDD Cargo Sample on GitHub') ?> &raquo;</a></p>
55
</div>
6-
76
<div class="row">
8-
9-
<div class="col-md-4">
7+
<div class="col-md-12">
108
<div class="panel panel-default">
119
<div class="panel-heading">
12-
<h3 class="panel-title"><?php echo $this->translate('Follow Development') ?></h3>
10+
<h3 class="panel-title"><?php echo $this->translate('Goal of the Sample Application') ?></h3>
1311
</div>
1412
<div class="panel-body">
15-
<p><?php echo sprintf($this->translate('Zend Framework 2 is under active development. If you are interested in following the development of ZF2, there is a special ZF2 portal on the official Zend Framework website which provides links to the ZF2 %swiki%s, %sdev blog%s, %sissue tracker%s, and much more. This is a great resource for staying up to date with the latest developments!'), '<a href="http://framework.zend.com/wiki/display/ZFDEV2/Home">', '</a>', '<a href="http://framework.zend.com/zf2/blog">', '</a>', '<a href="https://github.com/zendframework/zf2/issues">', '</a>') ?></p>
16-
<p><a class="btn btn-success pull-right" href="http://framework.zend.com/zf2" target="_blank"><?php echo $this->translate('ZF2 Development Portal') ?> &raquo;</a></p>
13+
<p><?php echo sprintf($this->translate('The Cargo Shipping System is based on the example used in Eric Evans book Domain Driven Design: Tackling Complexity in the Heart of Software. It\'s a PHP Version of the Cargo Sample to show how DDD can be applied to a PHP Project. %sZend Framework 2%s is used as a basis for the application layer and %sdoctrine 2%s is used for the infrastructure layer.'), '<a href="http://framework.zend.com/" target="_blank">', '</a>', '<a href="http://www.doctrine-project.org/" target="_blank">', '</a>') ?></p>
1714
</div>
1815
</div>
1916
</div>
20-
21-
<div class="col-md-4">
22-
<div class="panel panel-default">
23-
<div class="panel-heading">
24-
<h3 class="panel-title"><?php echo $this->translate('Discover Modules') ?></h3>
25-
</div>
26-
<div class="panel-body">
27-
<p><?php echo sprintf($this->translate('The community is working on developing a community site to serve as a repository and gallery for ZF2 modules. The project is available %son GitHub%s. The site is currently live and currently contains a list of some of the modules already available for ZF2.'), '<a href="https://github.com/zendframework/modules.zendframework.com">', '</a>') ?></p>
28-
<p><a class="btn btn-success pull-right" href="http://modules.zendframework.com/" target="_blank"><?php echo $this->translate('Explore ZF2 Modules') ?> &raquo;</a></p>
29-
</div>
30-
</div>
31-
</div>
32-
33-
<div class="col-md-4">
34-
<div class="panel panel-default">
35-
<div class="panel-heading">
36-
<h3 class="panel-title"><?php echo $this->translate('Help &amp; Support') ?></h3>
37-
</div>
38-
<div class="panel-body">
39-
<p><?php echo sprintf($this->translate('If you need any help or support while developing with ZF2, you may reach us via IRC: %s#zftalk on Freenode%s. We\'d love to hear any questions or feedback you may have regarding the beta releases. Alternatively, you may subscribe and post questions to the %smailing lists%s.'), '<a href="irc://irc.freenode.net/zftalk">', '</a>', '<a href="http://framework.zend.com/wiki/display/ZFDEV/Mailing+Lists">', '</a>') ?></p>
40-
<p><a class="btn btn-success pull-right" href="http://webchat.freenode.net?channels=zftalk" target="_blank"><?php echo $this->translate('Ping us on IRC') ?> &raquo;</a></p>
41-
</div>
42-
</div>
43-
</div>
44-
</div>
17+
</div>

‎module/Application/view/layout/layout.phtml‎

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<html lang="en">
44
<head>
55
<meta charset="utf-8">
6-
<?php echo $this->headTitle('ZF2 '. $this->translate('Skeleton Application'))->setSeparator(' - ')->setAutoEscape(false) ?>
6+
<?php echo $this->headTitle('PHP '. $this->translate('Cargo Shipping Application'))->setSeparator(' - ')->setAutoEscape(false) ?>
77

88
<?php echo $this->headMeta()
99
->appendName('viewport', 'width=device-width, initial-scale=1.0')
@@ -28,26 +28,19 @@
2828
<body>
2929
<nav class="navbar navbar-inverse navbar-fixed-top" role="navigation">
3030
<div class="container">
31-
<div class="navbar-header">
32-
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
33-
<span class="icon-bar"></span>
34-
<span class="icon-bar"></span>
35-
<span class="icon-bar"></span>
36-
</button>
37-
<a class="navbar-brand" href="<?php echo $this->url('home') ?>"><img src="<?php echo $this->basePath('img/zf2-logo.png') ?>" alt="Zend Framework 2"/>&nbsp;<?php echo $this->translate('Skeleton Application') ?></a>
31+
<div class="navbar-header">
32+
<a class="navbar-brand" href="<?php echo $this->url('home') ?>"><?php echo $this->translate('PHP Cargo Shipping System') ?></a>
3833
</div>
3934
<div class="collapse navbar-collapse">
40-
<ul class="nav navbar-nav">
41-
<li class="active"><a href="<?php echo $this->url('home') ?>"><?php echo $this->translate('Home') ?></a></li>
42-
</ul>
35+
<?php echo $this->ztbnavigation('main_navigation')->ztbmenu()->setUlClass('nav navbar-nav'); ?>
4336
</div><!--/.nav-collapse -->
4437
</div>
4538
</nav>
4639
<div class="container">
4740
<?php echo $this->content; ?>
4841
<hr>
4942
<footer>
50-
<p>&copy; 2005 - <?php echo date('Y') ?> by Zend Technologies Ltd. <?php echo $this->translate('All rights reserved.') ?></p>
43+
<p>&copy; 2013<?php echo (date('Y') > 2013)? ' - ' . date('Y') : ''; ?> by Alexander Miertsch. <?php echo $this->translate('All rights reserved.') ?></p>
5144
</footer>
5245
</div> <!-- /container -->
5346
<?php echo $this->inlineScript() ?>

0 commit comments

Comments
 (0)