Merge branch 'SetupNavigationFeature' into BookingAppIntroductionStory

Codeliner · Codeliner · commit ec69fc9dda13 · 2013-11-22T21:47:02.000+01:00
diff --git a/.gitmodules b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "vendor/ZF2"]
+	path = vendor/ZF2
+	url = https://github.com/zendframework/zf2.git
diff --git a/config/application.config.php b/config/application.config.php
@@ -2,6 +2,9 @@
 return array(
     // This should be an array of module namespaces used in the application.
     'modules' => array(
+        'DoctrineModule',
+        'DoctrineORMModule',
+        'ZfcTwitterBootstrap',
         'Application',
     ),
 
diff --git a/module/Application/config/module.config.php b/module/Application/config/module.config.php
@@ -53,6 +53,9 @@
         ),
     ),
     'service_manager' => array(
+        'factories' => array(
+            'main_navigation' => 'Zend\Navigation\Service\DefaultNavigationFactory',
+        ),
         'abstract_factories' => array(
             'Zend\Cache\Service\StorageCacheAbstractServiceFactory',
             'Zend\Log\LoggerAbstractServiceFactory',
@@ -92,6 +95,14 @@
             __DIR__ . '/../view',
         ),
     ),
+    'navigation' => array(
+        'default' => array(
+            'home' => array(
+                'route' => 'home',
+                'label' => 'home'
+            )
+        )
+    ),
     // Placeholder for console routes
     'console' => array(
         'router' => array(
diff --git a/module/Application/view/application/index/index.phtml b/module/Application/view/application/index/index.phtml
@@ -10,7 +10,7 @@
                 <h3 class="panel-title"><?php echo $this->translate('Goal of the Sample Application') ?></h3>
             </div>
             <div class="panel-body">
-                <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 in 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>                
+                <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>                
             </div>
         </div>
     </div>
diff --git a/module/Application/view/layout/layout.phtml b/module/Application/view/layout/layout.phtml
@@ -3,7 +3,7 @@
 <html lang="en">
     <head>
         <meta charset="utf-8">
-        <?php echo $this->headTitle('ZF2 '. $this->translate('Skeleton Application'))->setSeparator(' - ')->setAutoEscape(false) ?>
+        <?php echo $this->headTitle('PHP '. $this->translate('Cargo Shipping Application'))->setSeparator(' - ')->setAutoEscape(false) ?>
 
         <?php echo $this->headMeta()
             ->appendName('viewport', 'width=device-width, initial-scale=1.0')
@@ -28,18 +28,11 @@
     <body>
         <nav class="navbar navbar-inverse navbar-fixed-top" role="navigation">
             <div class="container">
-                <div class="navbar-header">
-                    <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
-                        <span class="icon-bar"></span>
-                        <span class="icon-bar"></span>
-                        <span class="icon-bar"></span>
-                    </button>
-                    <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>
+                <div class="navbar-header">                    
+                    <a class="navbar-brand" href="<?php echo $this->url('home') ?>"><?php echo $this->translate('PHP Cargo Shipping System') ?></a>
                 </div>
                 <div class="collapse navbar-collapse">
-                    <ul class="nav navbar-nav">
-                        <li class="active"><a href="<?php echo $this->url('home') ?>"><?php echo $this->translate('Home') ?></a></li>
-                    </ul>
+                    <?php echo $this->ztbnavigation('main_navigation')->ztbmenu()->setUlClass('nav navbar-nav'); ?>
                 </div><!--/.nav-collapse -->
             </div>
         </nav>

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+[submodule "vendor/ZF2"]`
	`2`	`+ path = vendor/ZF2`
	`3`	`+ url = https://github.com/zendframework/zf2.git`