From: Maks Date: Wed, 19 Sep 2012 22:13:39 +0000 (-0700) Subject: Merge pull request #124 from wshafer/master X-Git-Url: http://git.inspyration.org/?a=commitdiff_plain;h=a6cb03ef929b3235f465500df31ed671162c6bb9;hp=9e9e72ab8ef4543085ab5d45bd087a2a0df689e9;p=zf2.biz%2Fapplication_blanche.git Merge pull request #124 from wshafer/master Fix for init_autoloader.php when using composer autoloader --- diff --git a/config/autoload/global.php b/config/autoload/global.php index 1473720..104762e 100644 --- a/config/autoload/global.php +++ b/config/autoload/global.php @@ -2,7 +2,7 @@ /** * Global Configuration Override * - * You can use this file for overridding configuration values from modules, etc. + * You can use this file for overriding configuration values from modules, etc. * You would place values in here that are agnostic to the environment and not * sensitive to security. * diff --git a/config/autoload/local.php.dist b/config/autoload/local.php.dist index 7862eba..33fb696 100644 --- a/config/autoload/local.php.dist +++ b/config/autoload/local.php.dist @@ -8,7 +8,7 @@ * * @NOTE: This file is ignored from Git by default with the .gitignore included * in ZendSkeletonApplication. This is a good practice, as it prevents sensitive - * credentials from accidentally being comitted into version control. + * credentials from accidentally being committed into version control. */ return array( diff --git a/module/Application/view/layout/layout.phtml b/module/Application/view/layout/layout.phtml index d5af45f..52285ec 100644 --- a/module/Application/view/layout/layout.phtml +++ b/module/Application/view/layout/layout.phtml @@ -1,57 +1,47 @@ doctype(); ?> - - - headTitle('ZF2 '. $this->translate('Skeleton Application'))->setSeparator(' - ')->setAutoEscape(false) ?> - - headMeta()->appendName('viewport', 'width=device-width, initial-scale=1.0') ?> - - - headLink(array('rel' => 'shortcut icon', 'type' => 'image/vnd.microsoft.icon', 'href' => $this->basePath() . '/images/favicon.ico')) - ->prependStylesheet($this->basePath() . '/css/bootstrap-responsive.min.css') - ->prependStylesheet($this->basePath() . '/css/style.css') - ->prependStylesheet($this->basePath() . '/css/bootstrap.min.css') ?> - - - headScript()->prependFile($this->basePath() . '/js/html5.js', 'text/javascript', array('conditional' => 'lt IE 9',)) - ->prependFile($this->basePath() . '/js/jquery-1.7.2.min.js') ?> - - - - - -

- - translate('Skeleton Application') ?> -

translate('Home') ?>

+ + + headTitle('ZF2 '. $this->translate('Skeleton Application'))->setSeparator(' - ')->setAutoEscape(false) ?> + + headMeta()->appendName('viewport', 'width=device-width, initial-scale=1.0') ?> + + + headLink(array('rel' => 'shortcut icon', 'type' => 'image/vnd.microsoft.icon', 'href' => $this->basePath() . '/images/favicon.ico')) + ->prependStylesheet($this->basePath() . '/css/bootstrap-responsive.min.css') + ->prependStylesheet($this->basePath() . '/css/style.css') + ->prependStylesheet($this->basePath() . '/css/bootstrap.min.css') ?> + + + headScript()->prependFile($this->basePath() . '/js/html5.js', 'text/javascript', array('conditional' => 'lt IE 9',)) + ->prependFile($this->basePath() . '/js/jquery-1.7.2.min.js') ?> + + + -

- -

- - content; ?> - -

- - - -

- - inlineScript() ?> - +

+ content; ?> +

+ +

+ inlineScript() ?> +