Merge pull request #403 from localheinz/fix/just-one-layout

Fix: Use just one layout and switch header based on view variable

composer.json

@@ -6,7 +6,6 @@
     "require": {
         "bshaffer/oauth2-server-php": "dev-develop",
         "evandotpro/edp-github": "dev-master",
-        "evandotpro/edp-module-layouts": "1.0.*",
         "ezyang/htmlpurifier": "4.6.*",
         "monolog/monolog": "~1.12",
         "php": "~5.5",

config/application.config.php

@@ -11,7 +11,6 @@
         'EdpGithub',
         'Application',
         'User',
-        'EdpModuleLayouts',
         'ZfModule',
     ],
     'module_listener_options' => [

config/autoload/global.php

@@ -1,10 +1,5 @@
 <?php
 return [
-    'module_layouts' => [
-        'User' => 'layout/layout-small-header.phtml',
-        'ZfcUser' => 'layout/layout-small-header.phtml',
-        'ZfModule' => 'layout/layout-small-header.phtml',
-    ],
     'asset_manager' => [
         'caching' => [
             'default' => [

module/Application/config/module.config.php

@@ -121,7 +121,7 @@
             'application/index/index'           => __DIR__ . '/../view/application/index/index.phtml',
             'application/index/pagination'      => __DIR__ . '/../view/application/index/pagination.phtml',
             'application/search/index'          => __DIR__ . '/../view/application/search/index.phtml',
-            'layout/error'                      => __DIR__ . '/../view/layout/layout-small-header.phtml',
+            'layout/error'                      => __DIR__ . '/../view/layout/layout.phtml',
             'layout/layout'                     => __DIR__ . '/../view/layout/layout.phtml',
             'error/404'                         => __DIR__ . '/../view/error/404.phtml',
             'error/index'                       => __DIR__ . '/../view/error/index.phtml',

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

@@ -3,6 +3,8 @@
 <?php $this->inlineScript()->appendFile($this->basePath('js/jquery.livesearch.js')); ?>
 <?php $this->inlineScript()->appendScript('$(\'#live-search input[name="query"]\').liveSearch({url: "' . $this->url('live-search', [], ['query' => ['query' => '']]) . '"});'); ?>
 
+<?php $this->layout()->withLargeHeader = true; ?>
+
 <div class="col-xs-12 col-md-8">
     <div class="well well-sm">
         <form id="live-search">

module/Application/view/layout/layout.phtml

@@ -54,6 +54,7 @@
             </div>
         </div>
 
+    <?php if (true === $this->withLargeHeader): ?>
         <div class="container-fluid landing-intro">
             <div class="container">
                 <div class="row">
@@ -82,6 +83,22 @@
                 </div>
             </div>
         </div>
+    <?php else: ?>
+        <div class="container-fluid landing-intro small-header">
+            <div class="container">
+                <div class="row">
+                    <div class="col-md-8">
+                        <a href="<?php echo $this->url('home'); ?>" style="text-decoration:none">
+                            <img src="<?php echo $this->basePath('img/zend-logo_small.png'); ?>" alt="ZF Modules">
+                            <p class="zf-green">
+                                Modules
+                            </p>
+                        </a>
+                    </div>
+                </div>
+            </div>
+        </div>
+    <?php endif; ?>
 
         <div class="container main-content">
             <div class="container-fluid">