Rename "views" and "layouts" to singular form.

Directory names should be in singular form whenever possible.

diff --git a/module/Application/config/module.config.php b/module/Application/config/module.config.php
index ef54756..4d5eef9 100644 (file)
--- a/module/Application/config/module.config.php
+++ b/module/Application/config/module.config.php
@@ -1,6 +1,6 @@
 <?php
 return array(
-    'layout'                => 'layouts/layout.phtml',
+    'layout'                => 'layout/layout.phtml',
     'display_exceptions'    => true,
     'di'                    => array(
         'instance' => array(
@@ -14,7 +14,7 @@ return array(
                     'resolver' => 'Zend\View\TemplatePathStack',
                     'options'  => array(
                         'script_paths' => array(
-                            'application' => __DIR__ . '/../views',
+                            'application' => __DIR__ . '/../view',
                         ),
                     ),
                 ),

diff --git a/module/Application/view/error/404.phtml b/module/Application/view/error/404.phtml
new file mode 100644 (file)
index 0000000..1afb866
--- /dev/null
+++ b/module/Application/view/error/404.phtml
@@ -0,0 +1,22 @@
+<h1>A 404 error occurred</h1>
+<h2><?php echo $this->message ?></h2>
+
+<?php if (isset($this->display_exceptions) && $this->display_exceptions): ?>
+
+<?php if(isset($this->exception) && $this->exception instanceof Exception): ?>
+
+<h3>Exception information:</h3>
+<p>
+    <h4>Message:</h4>
+    <pre><?php echo $this->exception->getMessage() ?></pre>
+    <h4>Stack trace:</h4>
+    <pre><?php echo $this->exception->getTraceAsString() ?></pre>
+</p>
+
+<?php else: ?>
+
+<h3>No Exception available</h3>
+
+<?php endif ?>
+
+<?php endif ?>
\ No newline at end of file

diff --git a/module/Application/view/error/index.phtml b/module/Application/view/error/index.phtml
new file mode 100644 (file)
index 0000000..e62262f
--- /dev/null
+++ b/module/Application/view/error/index.phtml
@@ -0,0 +1,22 @@
+<h1>An error occurred</h1>
+<h2><?php echo $this->message ?></h2>
+
+<?php if (isset($this->display_exceptions) && $this->display_exceptions): ?>
+
+<?php if(isset($this->exception) && $this->exception instanceof Exception): ?>
+
+<h3>Exception information:</h3>
+<p>
+    <h4>Message:</h4>
+    <pre><?php echo $this->exception->getMessage() ?></pre>
+    <h4>Stack trace:</h4>
+    <pre><?php echo $this->exception->getTraceAsString() ?></pre>
+</p>
+
+<?php else: ?>
+
+<h3>No Exception available</h3>
+
+<?php endif ?>
+
+<?php endif ?>
\ No newline at end of file

diff --git a/module/Application/view/index/index.phtml b/module/Application/view/index/index.phtml
new file mode 100644 (file)
index 0000000..2ae05fb
--- /dev/null
+++ b/module/Application/view/index/index.phtml
@@ -0,0 +1,25 @@
+  <div class="hero-unit">
+    <h1>Welcome to Zend Framework</h1>
+    <p>Congratulations! You have successfully installed the <a href="https://github.com/zendframework/ZendSkeletonApplication">ZF2 Skeleton Application</a>. You are currently running Zend Framework version <?php echo \Zend\Version::VERSION ?>. This skeleton can serve as a simple starting point for you to begin building your application on ZF2.</p>
+    <p><a class="btn primary large" href="https://github.com/zendframework/zf2">Fork Zend Framework 2 on GitHub &raquo;</a></p>
+  </div>
+
+  <div class="row">
+    <div class="span6">
+      <h2>Follow Development</h2>
+        <p>Zend Framework 2 is under active development. If you are interested in following the development of ZF2, there is a special ZF2 portal on the official Zend Framework webiste which provides links to the ZF2 <a href="http://framework.zend.com/wiki/display/ZFDEV2/Home">wiki</a>, <a href="http://framework.zend.com/zf2/blog">dev blog</a>, <a href="http://framework.zend.com/issues/browse/ZF2">issue tracker</a>, and much more. This is a great resource for staying up to date with the latest developments!</p>
+      <p><a class="btn" href="http://framework.zend.com/zf2">ZF2 Development Portal &raquo;</a></p>
+
+    </div>
+    <div class="span5">
+      <h2>Discover Modules</h2>
+       <p>The community is working on developing a community site to serve as a repository and gallery for ZF2 modules. The project is available <a href="https://github.com/zendframework/modules.zendframework.com">on GitHub</a>. The site is currently live and currently contains a list of some of the modules already available for ZF2.</p>
+      <p><a class="btn" href="http://modules.zendframework.com/">Explore ZF2 Modules &raquo;</a></p>
+   </div>
+   <div class="span5">
+
+     <h2>Help &amp; Support</h2>
+     <p>If you need any help or support while developing with ZF2, you may reach us via IRC: <a href="irc://irc.freenode.net/zftalk.2">#zftalk.2 on Freenode</a>. We'd love to hear any questions or feedback you may have regarding the beta releases. Alternatively, you may subscribe and post questions to the <a href="http://framework.zend.com/wiki/display/ZFDEV/Mailing+Lists">mailing lists</a>.</p>
+     <p><a class="btn" href="http://webchat.freenode.net?channels=zftalk.2">Ping us on IRC &raquo;</a></p>
+   </div>
+  </div>

diff --git a/module/Application/view/layout/layout.phtml b/module/Application/view/layout/layout.phtml
new file mode 100644 (file)
index 0000000..6685a64
--- /dev/null
+++ b/module/Application/view/layout/layout.phtml
@@ -0,0 +1,57 @@
+<?php echo $this->doctype() ?>
+
+<html lang="en">
+  <head>
+    <meta charset="utf-8">
+    <?php echo $this->headTitle() ?>
+
+    <?php echo $this->headMeta() ?>
+
+    <!-- Le HTML5 shim, for IE6-8 support of HTML elements -->
+    <!--[if lt IE 9]>
+      <?php echo $this->placeholder('html5js') ?>
+
+    <![endif]-->
+
+    <?php echo $this->headScript() ?>
+
+    <!-- Le styles -->
+    <?php echo $this->headLink() ?>
+    
+    <style type="text/css">
+      body {
+        padding-top: 60px;
+      }
+    </style>
+
+    <!-- Le fav and touch icons -->
+    <?php echo $this->placeholder('favicon') ?>
+
+  </head>
+
+  <body>
+
+    <div class="topbar">
+      <div class="fill">
+        <div class="container">
+          <a class="brand" href="<?php echo $this->url('home') ?>">ZF2 Skeleton Application</a>
+
+          <ul class="nav">
+            <li class="active"><a href="<?php echo $this->url('home') ?>">Home</a></li>
+          </ul>
+        </div>
+      </div>
+
+    </div>
+
+    <div class="container">
+      <?php echo $this->raw('content'); ?>
+
+      <footer>
+        <p>&copy; 2006 - <?php echo date('Y') ?> by Zend Technologies Ltd. All rights reserved.</p>
+      </footer>
+
+    </div> <!-- /container -->
+
+  </body>
+</html>

diff --git a/module/Application/views/error/404.phtml b/module/Application/views/error/404.phtml
deleted file mode 100644 (file)
index 1afb866..0000000
--- a/module/Application/views/error/404.phtml
+++ /dev/null
@@ -1,22 +0,0 @@
-<h1>A 404 error occurred</h1>
-<h2><?php echo $this->message ?></h2>
-
-<?php if (isset($this->display_exceptions) && $this->display_exceptions): ?>
-
-<?php if(isset($this->exception) && $this->exception instanceof Exception): ?>
-
-<h3>Exception information:</h3>
-<p>
-    <h4>Message:</h4>
-    <pre><?php echo $this->exception->getMessage() ?></pre>
-    <h4>Stack trace:</h4>
-    <pre><?php echo $this->exception->getTraceAsString() ?></pre>
-</p>
-
-<?php else: ?>
-
-<h3>No Exception available</h3>
-
-<?php endif ?>
-
-<?php endif ?>
\ No newline at end of file

diff --git a/module/Application/views/error/index.phtml b/module/Application/views/error/index.phtml
deleted file mode 100644 (file)
index e62262f..0000000
--- a/module/Application/views/error/index.phtml
+++ /dev/null
@@ -1,22 +0,0 @@
-<h1>An error occurred</h1>
-<h2><?php echo $this->message ?></h2>
-
-<?php if (isset($this->display_exceptions) && $this->display_exceptions): ?>
-
-<?php if(isset($this->exception) && $this->exception instanceof Exception): ?>
-
-<h3>Exception information:</h3>
-<p>
-    <h4>Message:</h4>
-    <pre><?php echo $this->exception->getMessage() ?></pre>
-    <h4>Stack trace:</h4>
-    <pre><?php echo $this->exception->getTraceAsString() ?></pre>
-</p>
-
-<?php else: ?>
-
-<h3>No Exception available</h3>
-
-<?php endif ?>
-
-<?php endif ?>
\ No newline at end of file

diff --git a/module/Application/views/index/index.phtml b/module/Application/views/index/index.phtml
deleted file mode 100644 (file)
index 2ae05fb..0000000
--- a/module/Application/views/index/index.phtml
+++ /dev/null
@@ -1,25 +0,0 @@
-  <div class="hero-unit">
-    <h1>Welcome to Zend Framework</h1>
-    <p>Congratulations! You have successfully installed the <a href="https://github.com/zendframework/ZendSkeletonApplication">ZF2 Skeleton Application</a>. You are currently running Zend Framework version <?php echo \Zend\Version::VERSION ?>. This skeleton can serve as a simple starting point for you to begin building your application on ZF2.</p>
-    <p><a class="btn primary large" href="https://github.com/zendframework/zf2">Fork Zend Framework 2 on GitHub &raquo;</a></p>
-  </div>
-
-  <div class="row">
-    <div class="span6">
-      <h2>Follow Development</h2>
-        <p>Zend Framework 2 is under active development. If you are interested in following the development of ZF2, there is a special ZF2 portal on the official Zend Framework webiste which provides links to the ZF2 <a href="http://framework.zend.com/wiki/display/ZFDEV2/Home">wiki</a>, <a href="http://framework.zend.com/zf2/blog">dev blog</a>, <a href="http://framework.zend.com/issues/browse/ZF2">issue tracker</a>, and much more. This is a great resource for staying up to date with the latest developments!</p>
-      <p><a class="btn" href="http://framework.zend.com/zf2">ZF2 Development Portal &raquo;</a></p>
-
-    </div>
-    <div class="span5">
-      <h2>Discover Modules</h2>
-       <p>The community is working on developing a community site to serve as a repository and gallery for ZF2 modules. The project is available <a href="https://github.com/zendframework/modules.zendframework.com">on GitHub</a>. The site is currently live and currently contains a list of some of the modules already available for ZF2.</p>
-      <p><a class="btn" href="http://modules.zendframework.com/">Explore ZF2 Modules &raquo;</a></p>
-   </div>
-   <div class="span5">
-
-     <h2>Help &amp; Support</h2>
-     <p>If you need any help or support while developing with ZF2, you may reach us via IRC: <a href="irc://irc.freenode.net/zftalk.2">#zftalk.2 on Freenode</a>. We'd love to hear any questions or feedback you may have regarding the beta releases. Alternatively, you may subscribe and post questions to the <a href="http://framework.zend.com/wiki/display/ZFDEV/Mailing+Lists">mailing lists</a>.</p>
-     <p><a class="btn" href="http://webchat.freenode.net?channels=zftalk.2">Ping us on IRC &raquo;</a></p>
-   </div>
-  </div>

diff --git a/module/Application/views/layouts/layout.phtml b/module/Application/views/layouts/layout.phtml
deleted file mode 100644 (file)
index 6685a64..0000000
--- a/module/Application/views/layouts/layout.phtml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?php echo $this->doctype() ?>
-
-<html lang="en">
-  <head>
-    <meta charset="utf-8">
-    <?php echo $this->headTitle() ?>
-
-    <?php echo $this->headMeta() ?>
-
-    <!-- Le HTML5 shim, for IE6-8 support of HTML elements -->
-    <!--[if lt IE 9]>
-      <?php echo $this->placeholder('html5js') ?>
-
-    <![endif]-->
-
-    <?php echo $this->headScript() ?>
-
-    <!-- Le styles -->
-    <?php echo $this->headLink() ?>
-    
-    <style type="text/css">
-      body {
-        padding-top: 60px;
-      }
-    </style>
-
-    <!-- Le fav and touch icons -->
-    <?php echo $this->placeholder('favicon') ?>
-
-  </head>
-
-  <body>
-
-    <div class="topbar">
-      <div class="fill">
-        <div class="container">
-          <a class="brand" href="<?php echo $this->url('home') ?>">ZF2 Skeleton Application</a>
-
-          <ul class="nav">
-            <li class="active"><a href="<?php echo $this->url('home') ?>">Home</a></li>
-          </ul>
-        </div>
-      </div>
-
-    </div>
-
-    <div class="container">
-      <?php echo $this->raw('content'); ?>
-
-      <footer>
-        <p>&copy; 2006 - <?php echo date('Y') ?> by Zend Technologies Ltd. All rights reserved.</p>
-      </footer>
-
-    </div> <!-- /container -->
-
-  </body>
-</html>