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 2f20670..0b428d0 100644 (file)
--- a/module/Application/Module.php
+++ b/module/Application/Module.php
@@ -72,17 +72,19 @@ class Module implements AutoloaderProvider
         $url     = $view->plugin('url');
         $url->setRouter($app->getRouter());
 
+        $view->plugin('doctype')->setDoctype('HTML5');
+
         $view->plugin('headTitle')->setSeparator(' - ')
                                   ->setAutoEscape(false)
                                   ->append('ZF2 Skeleton Application');
 
-        $basePath = $app->getRequest()->detectBaseUrl();
+        $basePath = $app->getRequest()->getBaseUrl();
 
-        $view->plugin('headLink')->appendStylesheet($basePath . 'css/bootstrap.min.css');
+        $view->plugin('headLink')->appendStylesheet($basePath . '/css/bootstrap.min.css');
 
-        $html5js = '<script src="' . $basePath . 'js/html5.js"></script>';
+        $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">';
+        $favicon = '<link rel="shortcut icon" href="' . $basePath . '/images/favicon.ico">';
         $view->plugin('placeHolder')->__invoke('favicon')->set($favicon);
 
         $this->view = $view;