From: Thinkscape
Date: Wed, 11 Jan 2012 13:03:08 +0000 (+0100)
Subject: Rename "views" and "layouts" to singular form.
X-Git-Url: http://git.inspyration.org/?a=commitdiff_plain;ds=sidebyside;h=c5554b6b41da12c4e98cbffae3ee430a59bc36be;p=zf2.biz%2Fgalerie.git
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
--- a/module/Application/config/module.config.php
+++ b/module/Application/config/module.config.php
@@ -1,6 +1,6 @@
'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
index 0000000..1afb866
--- /dev/null
+++ b/module/Application/view/error/404.phtml
@@ -0,0 +1,22 @@
+A 404 error occurred
+message ?>
+
+display_exceptions) && $this->display_exceptions): ?>
+
+exception) && $this->exception instanceof Exception): ?>
+
+Exception information:
+
+
Message:
+ exception->getMessage() ?>
+ Stack trace:
+ exception->getTraceAsString() ?>
+
+
+
+
+No Exception available
+
+
+
+
\ 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
index 0000000..e62262f
--- /dev/null
+++ b/module/Application/view/error/index.phtml
@@ -0,0 +1,22 @@
+An error occurred
+message ?>
+
+display_exceptions) && $this->display_exceptions): ?>
+
+exception) && $this->exception instanceof Exception): ?>
+
+Exception information:
+
+
Message:
+ exception->getMessage() ?>
+ Stack trace:
+ exception->getTraceAsString() ?>
+
+
+
+
+No Exception available
+
+
+
+
\ 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
index 0000000..2ae05fb
--- /dev/null
+++ b/module/Application/view/index/index.phtml
@@ -0,0 +1,25 @@
+
+
Welcome to Zend Framework
+
Congratulations! You have successfully installed the ZF2 Skeleton Application. You are currently running Zend Framework version . This skeleton can serve as a simple starting point for you to begin building your application on ZF2.
+
Fork Zend Framework 2 on GitHub »
+
+
+
+
+
Follow Development
+
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 wiki, dev blog, issue tracker, and much more. This is a great resource for staying up to date with the latest developments!
+
ZF2 Development Portal »
+
+
+
+
Discover Modules
+
The community is working on developing a community site to serve as a repository and gallery for ZF2 modules. The project is available on GitHub. The site is currently live and currently contains a list of some of the modules already available for ZF2.
+
Explore ZF2 Modules »
+
+
+
+
Help & Support
+
If you need any help or support while developing with ZF2, you may reach us via IRC: #zftalk.2 on Freenode. 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 mailing lists.
+
Ping us on IRC »
+
+
diff --git a/module/Application/view/layout/layout.phtml b/module/Application/view/layout/layout.phtml
new file mode 100644
index 0000000..6685a64
--- /dev/null
+++ b/module/Application/view/layout/layout.phtml
@@ -0,0 +1,57 @@
+doctype() ?>
+
+
+
+
+ headTitle() ?>
+
+ headMeta() ?>
+
+
+
+
+ headScript() ?>
+
+
+ headLink() ?>
+
+
+
+
+ placeholder('favicon') ?>
+
+
+
+
+
+
+
+
+ raw('content'); ?>
+
+
+
+
+
+
+
diff --git a/module/Application/views/error/404.phtml b/module/Application/views/error/404.phtml
deleted file mode 100644
index 1afb866..0000000
--- a/module/Application/views/error/404.phtml
+++ /dev/null
@@ -1,22 +0,0 @@
-A 404 error occurred
-message ?>
-
-display_exceptions) && $this->display_exceptions): ?>
-
-exception) && $this->exception instanceof Exception): ?>
-
-Exception information:
-
-
Message:
- exception->getMessage() ?>
- Stack trace:
- exception->getTraceAsString() ?>
-
-
-
-
-No Exception available
-
-
-
-
\ 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
index e62262f..0000000
--- a/module/Application/views/error/index.phtml
+++ /dev/null
@@ -1,22 +0,0 @@
-An error occurred
-message ?>
-
-display_exceptions) && $this->display_exceptions): ?>
-
-exception) && $this->exception instanceof Exception): ?>
-
-Exception information:
-
-
Message:
- exception->getMessage() ?>
- Stack trace:
- exception->getTraceAsString() ?>
-
-
-
-
-No Exception available
-
-
-
-
\ 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
index 2ae05fb..0000000
--- a/module/Application/views/index/index.phtml
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
Welcome to Zend Framework
-
Congratulations! You have successfully installed the ZF2 Skeleton Application. You are currently running Zend Framework version . This skeleton can serve as a simple starting point for you to begin building your application on ZF2.
-
Fork Zend Framework 2 on GitHub »
-
-
-
-
-
Follow Development
-
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 wiki, dev blog, issue tracker, and much more. This is a great resource for staying up to date with the latest developments!
-
ZF2 Development Portal »
-
-
-
-
Discover Modules
-
The community is working on developing a community site to serve as a repository and gallery for ZF2 modules. The project is available on GitHub. The site is currently live and currently contains a list of some of the modules already available for ZF2.
-
Explore ZF2 Modules »
-
-
-
-
Help & Support
-
If you need any help or support while developing with ZF2, you may reach us via IRC: #zftalk.2 on Freenode. 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 mailing lists.
-
Ping us on IRC »
-
-
diff --git a/module/Application/views/layouts/layout.phtml b/module/Application/views/layouts/layout.phtml
deleted file mode 100644
index 6685a64..0000000
--- a/module/Application/views/layouts/layout.phtml
+++ /dev/null
@@ -1,57 +0,0 @@
-doctype() ?>
-
-
-
-
- headTitle() ?>
-
- headMeta() ?>
-
-
-
-
- headScript() ?>
-
-
- headLink() ?>
-
-
-
-
- placeholder('favicon') ?>
-
-
-
-
-
-
-
-
- raw('content'); ?>
-
-
-
-
-
-
-