Merge branch 'hotfix/343'

Close #343

Author: weierophinney

LICENSE.md

@@ -1,4 +1,4 @@
-Copyright (c) 2005-2015, Zend Technologies USA, Inc.
+Copyright (c) 2005-2016, Zend Technologies USA, Inc.
 
 All rights reserved.
 

README.md

@@ -122,9 +122,9 @@ project and you should be ready to go! It should look something like below:
 
 ```apache
 <VirtualHost *:80>
-    ServerName zf2-app.localhost
-    DocumentRoot /path/to/zf2-app/public
-    <Directory /path/to/zf2-app/public>
+    ServerName zfapp.localhost
+    DocumentRoot /path/to/zfapp/public
+    <Directory /path/to/zfapp/public>
         DirectoryIndex index.php
         AllowOverride All
         Order allow,deny
@@ -150,14 +150,14 @@ http {
 ```
 
 
-Create a virtual host configuration file for your project under `/path/to/nginx/sites-enabled/zf2-app.localhost.conf`
+Create a virtual host configuration file for your project under `/path/to/nginx/sites-enabled/zfapp.localhost.conf`
 it should look something like below:
 
 ```nginx
 server {
     listen       80;
-    server_name  zf2-app.localhost;
-    root         /path/to/zf2-app/public;
+    server_name  zfapp.localhost;
+    root         /path/to/zfapp/public;
 
     location / {
         index index.php;
@@ -167,7 +167,7 @@ server {
     location @php {
         # Pass the PHP requests to FastCGI server (php-fpm) on 127.0.0.1:9000
         fastcgi_pass   127.0.0.1:9000;
-        fastcgi_param  SCRIPT_FILENAME /path/to/zf2-app/public/index.php;
+        fastcgi_param  SCRIPT_FILENAME /path/to/zfapp/public/index.php;
         include fastcgi_params;
     }
 }

config/application.config.php

@@ -2,8 +2,8 @@
 /**
  * If you need an environment-specific system or application configuration,
  * there is an example in the documentation
- * @see http://framework.zend.com/manual/current/en/tutorials/config.advanced.html#environment-specific-system-configuration
- * @see http://framework.zend.com/manual/current/en/tutorials/config.advanced.html#environment-specific-application-configuration
+ * @see https://docs.zendframework.com/tutorials/advanced-config/#environment-specific-system-configuration
+ * @see https://docs.zendframework.com/tutorials/advanced-config/#environment-specific-application-configuration
  */
 return [
     // Retrieve list of modules used in this application.
@@ -53,7 +53,7 @@
     ],
 
     // Used to create an own service manager. May contain one or more child arrays.
-    //'service_listener_options' => [
+    // 'service_listener_options' => [
     //     [
     //         'service_manager' => $stringServiceManagerName,
     //         'config_key'      => $stringConfigKey,
@@ -62,7 +62,7 @@
     //     ],
     // ],
 
-   // Initial configuration with which to seed the ServiceManager.
-   // Should be compatible with Zend\ServiceManager\Config.
-   // 'service_manager' => [],
+    // Initial configuration with which to seed the ServiceManager.
+    // Should be compatible with Zend\ServiceManager\Config.
+    // 'service_manager' => [],
 ];

module/Application/config/module.config.php

@@ -29,8 +29,8 @@
                 'options' => [
                     'route'    => '/application[/:action]',
                     'defaults' => [
-                        'controller'    => Controller\IndexController::class,
-                        'action'        => 'index',
+                        'controller' => Controller\IndexController::class,
+                        'action'     => 'index',
                     ],
                 ],
             ],

module/Application/view/application/index/index.phtml

@@ -24,7 +24,7 @@
                     Zend Framework is under active development. If you are
                     interested in following the development of ZF, you can check
                     <a href="http://framework.zend.com/blog/">ZF dev blog</a>,
-                    and <a href="https://github.com/issues?utf8=%E2%9C%93&q=is:issue+org:zendframework">ZF issue tracker</a>
+                    and <a href="https://github.com/issues?utf8=%E2%9C%93&amp;q=is:issue+org:zendframework">ZF issue tracker</a>
                     (link requires a GitHub account). This is a great resource
                     for staying up to date with the latest developments!
                 </p>

module/Application/view/layout/layout.phtml

@@ -12,15 +12,15 @@
 
         <!-- Le styles -->
         <?= $this->headLink(['rel' => 'shortcut icon', 'type' => 'image/vnd.microsoft.icon', 'href' => $this->basePath() . '/img/favicon.ico'])
-                        ->prependStylesheet($this->basePath('css/style.css'))
-                        ->prependStylesheet($this->basePath('css/bootstrap-theme.min.css'))
-                        ->prependStylesheet($this->basePath('css/bootstrap.min.css'))
+            ->prependStylesheet($this->basePath('css/bootstrap.min.css'))
+            ->prependStylesheet($this->basePath('css/bootstrap-theme.min.css'))
+            ->prependStylesheet($this->basePath('css/style.css'))
         ?>
 
         <!-- Scripts -->
         <?= $this->headScript()
-            ->prependFile($this->basePath('js/bootstrap.min.js'))
             ->prependFile($this->basePath('js/jquery-2.2.4.min.js'))
+            ->prependFile($this->basePath('js/bootstrap.min.js'))
         ?>
     </head>
     <body>
@@ -32,8 +32,8 @@
                         <span class="icon-bar"></span>
                         <span class="icon-bar"></span>
                     </button>
-                    <a class="navbar-brand" href="<?php echo $this->url('home') ?>">
-                        <img src="<?= $this->basePath('img/zf-logo.png') ?>" alt="Zend Framework <?= \Application\Module::VERSION ?>"/>&nbsp;Skeleton Application
+                    <a class="navbar-brand" href="<?= $this->url('home') ?>">
+                        <img src="<?= $this->basePath('img/zf-logo-mark.svg') ?>" height="28" alt="Zend Framework <?= \Application\Module::VERSION ?>"/>&nbsp;Skeleton Application
                     </a>
                 </div>
                 <div class="collapse navbar-collapse">
@@ -44,7 +44,7 @@
             </div>
         </nav>
         <div class="container">
-            <?= $this->content; ?>
+            <?= $this->content ?>
             <hr>
             <footer>
                 <p>&copy; 2005 - <?= date('Y') ?> by Zend Technologies Ltd. All rights reserved.</p>

public/css/style.css

@@ -8,29 +8,26 @@ body {
 }
 
 .btn-success {
-  background-color: #57a900;
-  background-image: -moz-linear-gradient(top, #70d900, #57a900);
-  background-image: -ms-linear-gradient(top, #70d900, #57a900);
-  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#70d900), to(#57a900));
-  background-image: -webkit-linear-gradient(top, #70d900, #57a900);
-  background-image: -o-linear-gradient(top, #70d900, #57a900);
-  background-image: linear-gradient(top, #70d900, #57a900);
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#70d900', endColorstr='#57a900', GradientType=0);
+    background-color: #57a900;
+    background-image: -moz-linear-gradient(top, #70d900, #57a900);
+    background-image: -ms-linear-gradient(top, #70d900, #57a900);
+    background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#70d900), to(#57a900));
+    background-image: -webkit-linear-gradient(top, #70d900, #57a900);
+    background-image: -o-linear-gradient(top, #70d900, #57a900);
+    background-image: linear-gradient(top, #70d900, #57a900);
+    filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#70d900', endColorstr='#57a900', GradientType=0);
 }
 
 .btn-success:hover,
 .btn-success:active,
 .btn-success.active,
 .btn-success.disabled,
 .btn-success[disabled] {
-  background-color: #57a900;
-}
-
-.btn-success:active, .btn-success.active {
-  background-color: #57a900;
+    background-color: #57a900;
 }
 
 div.container a.navbar-brand > img {
     display: inline;
     margin-right: 4px;
-}
+    margin-top: -2px;
+}