Merge pull request #18 from Xerkus/master

[zf2.biz/application_blanche.git] / module / Application / Module.php

diff --git a/module/Application/Module.php b/module/Application/Module.php
index 5bd9a70..0b428d0 100644 (file)
--- a/module/Application/Module.php
+++ b/module/Application/Module.php
@@ -31,9 +31,9 @@ class Module implements AutoloaderProvider
         );
     }
 
-    public function getConfig($env = null)
+    public function getConfig()
     {
-        return include __DIR__ . '/configs/module.config.php';
+        return include __DIR__ . '/config/module.config.php';
     }
     
     public function initializeView($e)
@@ -67,14 +67,26 @@ class Module implements AutoloaderProvider
             return $this->view;
         }
 
-        $di     = $app->getLocator();
-        $view   = $di->get('view');
-        $url    = $view->plugin('url');
+        $locator = $app->getLocator();
+        $view    = $locator->get('view');
+        $url     = $view->plugin('url');
         $url->setRouter($app->getRouter());
 
+        $view->plugin('doctype')->setDoctype('HTML5');
+
         $view->plugin('headTitle')->setSeparator(' - ')
                                   ->setAutoEscape(false)
-                                  ->append('Application');
+                                  ->append('ZF2 Skeleton Application');
+
+        $basePath = $app->getRequest()->getBaseUrl();
+
+        $view->plugin('headLink')->appendStylesheet($basePath . '/css/bootstrap.min.css');
+
+        $html5js = '<script src="' . $basePath . '/js/html5.js"></script>';
+        $view->plugin('placeHolder')->__invoke('html5js')->set($html5js);
+        $favicon = '<link rel="shortcut icon" href="' . $basePath . '/images/favicon.ico">';
+        $view->plugin('placeHolder')->__invoke('favicon')->set($favicon);
+
         $this->view = $view;
         return $view;
     }