From: Maks Date: Tue, 18 Sep 2012 18:58:57 +0000 (-0700) Subject: Merge pull request #120 from Goram/master X-Git-Url: http://git.inspyration.org/?a=commitdiff_plain;h=b2dec864819049deb3fc935352fca9d0096c131b;hp=867da89dcee5dff081b541f2d3cf98a854c3f8db;p=zf2.biz%2Fapplication_blanche.git Merge pull request #120 from Goram/master Changed 2 spaces to 4. --- 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() ?> +