Permalink
Browse files

Clean up layout and configs

- Layout helpers used inline instead of in code block at the top of the
  layout.
- Removed unnecessary config keys
  • Loading branch information...
1 parent 4261f12 commit f4fce1b7d7e9578a47a75a0a4facabd2fb8f5c4d @EvanDotPro EvanDotPro committed Jul 3, 2012
Showing with 13 additions and 37 deletions.
  1. +1 −8 config/application.config.php
  2. +5 −5 config/autoload/global.php
  3. +7 −24 module/Application/view/layout/layout.phtml
@@ -3,20 +3,13 @@
'modules' => array(
'Application',
),
- 'module_listener_options' => array(
+ 'module_listener_options' => array(
'config_glob_paths' => array(
'config/autoload/{,*.}{global,local}.php',
),
- 'config_cache_enabled' => false,
- 'cache_dir' => 'data/cache',
'module_paths' => array(
'./module',
'./vendor',
),
),
- 'service_manager' => array(
- 'use_defaults' => true,
- 'factories' => array(
- ),
- ),
);
View
@@ -2,12 +2,12 @@
/**
* Global Configuration Override
*
- * You can use this file for overridding configuration values from modules, etc.
- * You would place values in here that are agnostic to the environment and not
- * sensitive to security.
+ * You can use this file for overridding configuration values from modules, etc.
+ * You would place values in here that are agnostic to the environment and not
+ * sensitive to security.
*
- * @NOTE: In practice, this file will typically be INCLUDED in your source
- * control, so do not include passwords or other sensitive information in this
+ * @NOTE: In practice, this file will typically be INCLUDED in your source
+ * control, so do not include passwords or other sensitive information in this
* file.
*/
@@ -1,37 +1,20 @@
-<?php
-$this->headTitle()->setSeparator(' - ')
- ->setAutoEscape(false);
-
-$basePath = $this->basePath();
-$this->headLink()->appendStylesheet($basePath . '/css/bootstrap.min.css')
- ->appendStylesheet($basePath . '/css/style.css')
- ->appendStylesheet($basePath . '/css/bootstrap-responsive.min.css');
-
-$this->headLink(array(
- 'rel' => 'shortcut icon',
- 'type' => 'image/vnd.microsoft.icon',
- 'href' => $basePath . '/images/favicon.ico',
- ));
-
-// HTML5 shim, for IE6-8 support of HTML elements
-$this->headScript()->appendFile($basePath . '/js/html5.js', 'text/javascript',
- array('conditional' => 'lt IE 9',));
-
-echo $this->doctype();
-?>
+<?php echo $this->doctype(); ?>
<html lang="en">
<head>
<meta charset="utf-8">
- <?php echo $this->headTitle('ZF2 Skeleton Application') ?>
+ <?php echo $this->headTitle('ZF2 Skeleton Application')->setSeparator(' - ')->setAutoEscape(false) ?>
<?php echo $this->headMeta()->appendName('viewport', 'width=device-width, initial-scale=1.0') ?>
<!-- Le styles -->
- <?php echo $this->headLink() ?>
+ <?php echo $this->headLink(array('rel' => 'shortcut icon', 'type' => 'image/vnd.microsoft.icon', 'href' => $this->basePath() . '/images/favicon.ico'))
+ ->appendStylesheet($this->basePath() . '/css/bootstrap.min.css')
+ ->appendStylesheet($this->basePath() . '/css/style.css')
+ ->appendStylesheet($this->basePath() . '/css/bootstrap-responsive.min.css') ?>
<!-- Scripts -->
- <?php echo $this->headScript() ?>
+ <?php echo $this->headScript()->appendFile($this->basePath() . '/js/html5.js', 'text/javascript', array('conditional' => 'lt IE 9',)) ?>
</head>

0 comments on commit f4fce1b

Please sign in to comment.