From: Evan Coury Date: Tue, 3 Jul 2012 22:39:28 +0000 (-0700) Subject: Clean up layout and configs X-Git-Url: http://git.inspyration.org/?a=commitdiff_plain;h=f4fce1b7d7e9578a47a75a0a4facabd2fb8f5c4d;p=zf2.biz%2Fapplication_blanche.git Clean up layout and configs - Layout helpers used inline instead of in code block at the top of the layout. - Removed unnecessary config keys --- diff --git a/config/application.config.php b/config/application.config.php index 6e62784..6504dea 100644 --- a/config/application.config.php +++ b/config/application.config.php @@ -3,20 +3,13 @@ return array( '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( - ), - ), ); diff --git a/config/autoload/global.php b/config/autoload/global.php index b03c0c4..1473720 100644 --- a/config/autoload/global.php +++ b/config/autoload/global.php @@ -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. */ diff --git a/module/Application/view/layout/layout.phtml b/module/Application/view/layout/layout.phtml index 86c6f24..513414e 100644 --- a/module/Application/view/layout/layout.phtml +++ b/module/Application/view/layout/layout.phtml @@ -1,37 +1,20 @@ -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(); -?> +doctype(); ?> - headTitle('ZF2 Skeleton Application') ?> + headTitle('ZF2 Skeleton Application')->setSeparator(' - ')->setAutoEscape(false) ?> headMeta()->appendName('viewport', 'width=device-width, initial-scale=1.0') ?> - headLink() ?> + 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') ?> - headScript() ?> + headScript()->appendFile($this->basePath() . '/js/html5.js', 'text/javascript', array('conditional' => 'lt IE 9',)) ?>