Permalink
Browse files

Camelized templates folder.

  • Loading branch information...
1 parent 192812e commit 21348169faadda484fdc245d6978e4239cd038e7 @jrbasso jrbasso committed May 31, 2011
Showing with 14 additions and 15 deletions.
  1. +5 −5 lib/Cake/Console/Command/Task/ProjectTask.php
  2. +6 −7 lib/Cake/Console/Command/Task/TemplateTask.php
  3. +1 −1 lib/Cake/Console/Command/UpgradeShell.php
  4. +2 −2 lib/Cake/Console/ShellDispatcher.php
  5. 0 lib/Cake/Console/{templates → Templates}/default/actions/controller_actions.ctp
  6. 0 lib/Cake/Console/{templates → Templates}/default/classes/controller.ctp
  7. 0 lib/Cake/Console/{templates → Templates}/default/classes/fixture.ctp
  8. 0 lib/Cake/Console/{templates → Templates}/default/classes/model.ctp
  9. 0 lib/Cake/Console/{templates → Templates}/default/classes/test.ctp
  10. 0 lib/Cake/Console/{templates → Templates}/default/views/form.ctp
  11. 0 lib/Cake/Console/{templates → Templates}/default/views/home.ctp
  12. 0 lib/Cake/Console/{templates → Templates}/default/views/index.ctp
  13. 0 lib/Cake/Console/{templates → Templates}/default/views/view.ctp
  14. 0 lib/Cake/Console/{templates → Templates}/skel/.htaccess
  15. 0 lib/Cake/Console/{templates → Templates}/skel/Config/Schema/db_acl.php
  16. 0 lib/Cake/Console/{templates → Templates}/skel/Config/Schema/db_acl.sql
  17. 0 lib/Cake/Console/{templates → Templates}/skel/Config/Schema/i18n.php
  18. 0 lib/Cake/Console/{templates → Templates}/skel/Config/Schema/i18n.sql
  19. 0 lib/Cake/Console/{templates → Templates}/skel/Config/Schema/sessions.php
  20. 0 lib/Cake/Console/{templates → Templates}/skel/Config/Schema/sessions.sql
  21. 0 lib/Cake/Console/{templates → Templates}/skel/Config/acl.ini.php
  22. 0 lib/Cake/Console/{templates → Templates}/skel/Config/bootstrap.php
  23. 0 lib/Cake/Console/{templates → Templates}/skel/Config/core.php
  24. 0 lib/Cake/Console/{templates → Templates}/skel/Config/database.php.default
  25. 0 lib/Cake/Console/{templates → Templates}/skel/Config/email.php.default
  26. 0 lib/Cake/Console/{templates → Templates}/skel/Config/routes.php
  27. 0 lib/Cake/Console/{templates/skel/webroot/js → Templates/skel/Console/Command/Task}/empty
  28. 0 lib/Cake/Console/{templates → Templates}/skel/Console/cake
  29. 0 lib/Cake/Console/{templates → Templates}/skel/Console/cake.bat
  30. 0 lib/Cake/Console/{templates → Templates}/skel/Console/cake.php
  31. 0 lib/Cake/Console/{templates → Templates}/skel/Controller/AppController.php
  32. 0 lib/Cake/Console/{templates/skel/tmp/tests → Templates/skel/Controller/Component}/empty
  33. 0 lib/Cake/Console/{templates → Templates}/skel/Controller/PagesController.php
  34. 0 lib/Cake/Console/{templates/skel/tmp/sessions → Templates/skel/Lib}/empty
  35. 0 lib/Cake/Console/{templates/skel/tmp/logs → Templates/skel/Locale/eng/LC_MESSAGES}/empty
  36. 0 lib/Cake/Console/{templates → Templates}/skel/Model/AppModel.php
  37. 0 lib/Cake/Console/{templates/skel/tmp/cache/views → Templates/skel/Model/Behavior}/empty
  38. 0 lib/Cake/Console/{templates/skel/tmp/cache/persistent → Templates/skel/Model/Datasource}/empty
  39. 0 lib/Cake/Console/{templates/skel/tmp/cache/models → Templates/skel/Plugin}/empty
  40. 0 ...ake/Console/{templates/skel/View/Scaffolds → Templates/skel/Test/Case/Controller/Component}/empty
  41. 0 lib/Cake/Console/{templates/skel/View/Pages → Templates/skel/Test/Case/Controller}/empty
  42. 0 lib/Cake/Console/{templates/skel/View/Helper → Templates/skel/Test/Case/Model/Behavior}/empty
  43. 0 lib/Cake/Console/{templates/skel/View/Errors → Templates/skel/Test/Case/Model}/empty
  44. 0 lib/Cake/Console/{templates/skel/View/Elements → Templates/skel/Test/Case/View/Helper}/empty
  45. 0 lib/Cake/Console/{templates/skel/Vendor → Templates/skel/Test/Fixture}/empty
  46. 0 lib/Cake/Console/{templates/skel/Test/Fixture → Templates/skel/Vendor}/empty
  47. 0 lib/Cake/Console/{templates/skel/Test/Case/View/Helper → Templates/skel/View/Elements}/empty
  48. 0 lib/Cake/Console/{templates → Templates}/skel/View/Emails/html/default.ctp
  49. 0 lib/Cake/Console/{templates → Templates}/skel/View/Emails/text/default.ctp
  50. 0 lib/Cake/Console/{templates/skel/Test/Case/Model → Templates/skel/View/Errors}/empty
  51. 0 lib/Cake/Console/{templates → Templates}/skel/View/Helper/AppHelper.php
  52. 0 lib/Cake/Console/{templates/skel/Test/Case/Model/Behavior → Templates/skel/View/Helper}/empty
  53. 0 lib/Cake/Console/{templates → Templates}/skel/View/Layouts/Emails/html/default.ctp
  54. 0 lib/Cake/Console/{templates → Templates}/skel/View/Layouts/Emails/text/default.ctp
  55. 0 lib/Cake/Console/{templates → Templates}/skel/View/Layouts/ajax.ctp
  56. 0 lib/Cake/Console/{templates → Templates}/skel/View/Layouts/default.ctp
  57. 0 lib/Cake/Console/{templates → Templates}/skel/View/Layouts/flash.ctp
  58. 0 lib/Cake/Console/{templates → Templates}/skel/View/Layouts/js/default.ctp
  59. 0 lib/Cake/Console/{templates → Templates}/skel/View/Layouts/rss/default.ctp
  60. 0 lib/Cake/Console/{templates → Templates}/skel/View/Layouts/xml/default.ctp
  61. 0 lib/Cake/Console/{templates/skel/Test/Case/Controller → Templates/skel/View/Pages}/empty
  62. 0 ...ake/Console/{templates/skel/Test/Case/Controller/Component → Templates/skel/View/Scaffolds}/empty
  63. 0 lib/Cake/Console/{templates → Templates}/skel/index.php
  64. 0 lib/Cake/Console/{templates/skel/Plugin → Templates/skel/tmp/cache/models}/empty
  65. 0 lib/Cake/Console/{templates/skel/Model/Datasource → Templates/skel/tmp/cache/persistent}/empty
  66. 0 lib/Cake/Console/{templates/skel/Model/Behavior → Templates/skel/tmp/cache/views}/empty
  67. 0 lib/Cake/Console/{templates/skel/Locale/eng/LC_MESSAGES → Templates/skel/tmp/logs}/empty
  68. 0 lib/Cake/Console/{templates/skel/Lib → Templates/skel/tmp/sessions}/empty
  69. 0 lib/Cake/Console/{templates/skel/Controller/Component → Templates/skel/tmp/tests}/empty
  70. 0 lib/Cake/Console/{templates → Templates}/skel/webroot/.htaccess
  71. 0 lib/Cake/Console/{templates → Templates}/skel/webroot/css/cake.generic.css
  72. 0 lib/Cake/Console/{templates → Templates}/skel/webroot/favicon.ico
  73. 0 lib/Cake/Console/{templates → Templates}/skel/webroot/img/cake.icon.png
  74. 0 lib/Cake/Console/{templates → Templates}/skel/webroot/img/cake.power.gif
  75. 0 lib/Cake/Console/{templates → Templates}/skel/webroot/index.php
  76. 0 lib/Cake/Console/{templates/skel/Console/Command/Task → Templates/skel/webroot/js}/empty
  77. 0 lib/Cake/Console/{templates → Templates}/skel/webroot/test.php
View
10 lib/Cake/Console/Command/Task/ProjectTask.php
@@ -140,7 +140,7 @@ public function bake($path, $skel = null, $skip = array('empty')) {
$skel = $this->in(
__d('cake_console', "What is the path to the directory layout you wish to copy?"),
null,
- CAKE . 'Console' . DS . 'templates' . DS . 'skel'
+ CAKE . 'Console' . DS . 'Templates' . DS . 'skel'
);
if (!$skel) {
$this->err(__d('cake_console', 'The directory path you supplied was empty. Please try again.'));
@@ -149,7 +149,7 @@ public function bake($path, $skel = null, $skip = array('empty')) {
$skel = $this->in(
__d('cake_console', 'Directory path does not exist please choose another:'),
null,
- CAKE . 'Console' . DS . 'templates' . DS . 'skel'
+ CAKE . 'Console' . DS . 'Templates' . DS . 'skel'
);
}
}
@@ -203,7 +203,7 @@ public function bake($path, $skel = null, $skip = array('empty')) {
public function createHome($dir) {
$app = basename($dir);
$path = $dir . 'View' . DS . 'Pages' . DS;
- $source = CAKE . 'Console' . DS . 'templates' . DS .'default' . DS . 'views' . DS . 'home.ctp';
+ $source = CAKE . 'Console' . DS . 'Templates' . DS .'default' . DS . 'views' . DS . 'home.ctp';
include($source);
return $this->createFile($path.'home.ctp', $output);
}
@@ -388,8 +388,8 @@ public function getOptionParser() {
))->addOption('empty', array(
'help' => __d('cake_console', 'Create empty files in each of the directories. Good if you are using git')
))->addOption('skel', array(
- 'default' => current(App::core('Console')) . 'templates' . DS . 'skel',
- 'help' => __d('cake_console', 'The directory layout to use for the new application skeleton. Defaults to cake/console/templates/skel of CakePHP used to create the project.')
+ 'default' => current(App::core('Console')) . 'Templates' . DS . 'skel',
+ 'help' => __d('cake_console', 'The directory layout to use for the new application skeleton. Defaults to cake/Console/Templates/skel of CakePHP used to create the project.')
));
}
View
13 lib/Cake/Console/Command/Task/TemplateTask.php
@@ -49,7 +49,7 @@ public function initialize() {
/**
* Find the paths to all the installed shell themes in the app.
*
- * Bake themes are directories not named `skel` inside a `vendors/shells/templates` path.
+ * Bake themes are directories not named `skel` inside a `Console/Templates` path.
*
* @return array Array of bake themes that are installed.
*/
@@ -59,15 +59,14 @@ protected function _findThemes() {
$separator = DS === '/' ? '/' : '\\\\';
$core = preg_replace('#shells' . $separator . '$#', '', $core);
- $Folder = new Folder($core . 'templates' . DS . 'default');
+ $Folder = new Folder($core . 'Templates' . DS . 'default');
$contents = $Folder->read();
$themeFolders = $contents[0];
$plugins = App::objects('plugin');
foreach ($plugins as $plugin) {
- $paths[] = $this->_pluginPath($plugin) . 'console' . DS . 'shells' . DS;
- $paths[] = $this->_pluginPath($plugin) . 'vendors' . DS . 'shells' . DS;
+ $paths[] = $this->_pluginPath($plugin) . 'Console' . DS;
}
$paths[] = $core;
@@ -78,18 +77,18 @@ protected function _findThemes() {
$themes = array();
foreach ($paths as $path) {
- $Folder = new Folder($path . 'templates', false);
+ $Folder = new Folder($path . 'Templates', false);
$contents = $Folder->read();
$subDirs = $contents[0];
foreach ($subDirs as $dir) {
if (empty($dir) || preg_match('@^skel$|_skel$@', $dir)) {
continue;
}
- $Folder = new Folder($path . 'templates' . DS . $dir);
+ $Folder = new Folder($path . 'Templates' . DS . $dir);
$contents = $Folder->read();
$subDirs = $contents[0];
if (array_intersect($contents[0], $themeFolders)) {
- $templateDir = $path . 'templates' . DS . $dir . DS;
+ $templateDir = $path . 'Templates' . DS . $dir . DS;
$themes[$dir] = $templateDir;
}
}
View
2 lib/Cake/Console/Command/UpgradeShell.php
@@ -88,7 +88,7 @@ public function locations() {
$moves = array(
'libs' => 'Lib',
- 'vendors' . DS . 'shells' . DS . 'templates' => 'Console' . DS . 'templates',
+ 'vendors' . DS . 'shells' . DS . 'templates' => 'Console' . DS . 'Templates',
);
foreach($moves as $old => $new) {
if (is_dir($old)) {
View
4 lib/Cake/Console/ShellDispatcher.php
@@ -127,13 +127,13 @@ function __bootstrap() {
define('APP_PATH', $this->params['working'] . DS);
define('WWW_ROOT', APP_PATH . $this->params['webroot'] . DS);
if (!is_dir(ROOT . DS . APP_DIR . DS . 'tmp')) {
- define('TMP', CAKE_CORE_INCLUDE_PATH . DS . 'Cake' . DS . 'Console' . DS . 'templates' . DS . 'skel' . DS . 'tmp' . DS);
+ define('TMP', CAKE_CORE_INCLUDE_PATH . DS . 'Cake' . DS . 'Console' . DS . 'Templates' . DS . 'skel' . DS . 'tmp' . DS);
}
$boot = file_exists(ROOT . DS . APP_DIR . DS . 'Config' . DS . 'bootstrap.php');
require CORE_PATH . 'Cake' . DS . 'bootstrap.php';
if (!file_exists(APP_PATH . 'Config' . DS . 'core.php')) {
- include_once CAKE_CORE_INCLUDE_PATH . DS . 'Cake' . DS . 'Console' . DS . 'templates' . DS . 'skel' . DS . 'Config' . DS . 'core.php';
+ include_once CAKE_CORE_INCLUDE_PATH . DS . 'Cake' . DS . 'Console' . DS . 'Templates' . DS . 'skel' . DS . 'Config' . DS . 'core.php';
App::build();
}
require_once CAKE . 'Console' . DS . 'ConsoleErrorHandler.php';
View
0 ...es/default/actions/controller_actions.ctp → ...es/default/actions/controller_actions.ctp
File renamed without changes.
View
0 .../templates/default/classes/controller.ctp → .../Templates/default/classes/controller.ctp
File renamed without changes.
View
0 ...ole/templates/default/classes/fixture.ctp → ...ole/Templates/default/classes/fixture.ctp
File renamed without changes.
View
0 ...nsole/templates/default/classes/model.ctp → ...nsole/Templates/default/classes/model.ctp
File renamed without changes.
View
0 ...onsole/templates/default/classes/test.ctp → ...onsole/Templates/default/classes/test.ctp
File renamed without changes.
View
0 .../Console/templates/default/views/form.ctp → .../Console/Templates/default/views/form.ctp
File renamed without changes.
View
0 .../Console/templates/default/views/home.ctp → .../Console/Templates/default/views/home.ctp
File renamed without changes.
View
0 ...Console/templates/default/views/index.ctp → ...Console/Templates/default/views/index.ctp
File renamed without changes.
View
0 .../Console/templates/default/views/view.ctp → .../Console/Templates/default/views/view.ctp
File renamed without changes.
View
0 lib/Cake/Console/templates/skel/.htaccess → lib/Cake/Console/Templates/skel/.htaccess
File renamed without changes.
View
0 ...e/templates/skel/Config/Schema/db_acl.php → ...e/Templates/skel/Config/Schema/db_acl.php
File renamed without changes.
View
0 ...e/templates/skel/Config/Schema/db_acl.sql → ...e/Templates/skel/Config/Schema/db_acl.sql
File renamed without changes.
View
0 ...ole/templates/skel/Config/Schema/i18n.php → ...ole/Templates/skel/Config/Schema/i18n.php
File renamed without changes.
View
0 ...ole/templates/skel/Config/Schema/i18n.sql → ...ole/Templates/skel/Config/Schema/i18n.sql
File renamed without changes.
View
0 ...templates/skel/Config/Schema/sessions.php → ...Templates/skel/Config/Schema/sessions.php
File renamed without changes.
View
0 ...templates/skel/Config/Schema/sessions.sql → ...Templates/skel/Config/Schema/sessions.sql
File renamed without changes.
View
0 ...Console/templates/skel/Config/acl.ini.php → ...Console/Templates/skel/Config/acl.ini.php
File renamed without changes.
View
0 ...nsole/templates/skel/Config/bootstrap.php → ...nsole/Templates/skel/Config/bootstrap.php
File renamed without changes.
View
0 ...ke/Console/templates/skel/Config/core.php → ...ke/Console/Templates/skel/Config/core.php
File renamed without changes.
View
0 ...emplates/skel/Config/database.php.default → ...emplates/skel/Config/database.php.default
File renamed without changes.
View
0 ...e/templates/skel/Config/email.php.default → ...e/Templates/skel/Config/email.php.default
File renamed without changes.
View
0 .../Console/templates/skel/Config/routes.php → .../Console/Templates/skel/Config/routes.php
File renamed without changes.
View
0 ...e/Console/templates/skel/webroot/js/empty → ...Templates/skel/Console/Command/Task/empty
File renamed without changes.
View
0 lib/Cake/Console/templates/skel/Console/cake → lib/Cake/Console/Templates/skel/Console/cake
File renamed without changes.
View
0 ...e/Console/templates/skel/Console/cake.bat → ...e/Console/Templates/skel/Console/cake.bat
File renamed without changes.
View
0 ...e/Console/templates/skel/Console/cake.php → ...e/Console/Templates/skel/Console/cake.php
File renamed without changes.
View
0 ...mplates/skel/Controller/AppController.php → ...mplates/skel/Controller/AppController.php
File renamed without changes.
View
0 ...ke/Console/templates/skel/tmp/tests/empty → ...Templates/skel/Controller/Component/empty
File renamed without changes.
View
0 ...lates/skel/Controller/PagesController.php → ...lates/skel/Controller/PagesController.php
File renamed without changes.
View
0 ...Console/templates/skel/tmp/sessions/empty → lib/Cake/Console/Templates/skel/Lib/empty
File renamed without changes.
View
0 ...ake/Console/templates/skel/tmp/logs/empty → ...mplates/skel/Locale/eng/LC_MESSAGES/empty
File renamed without changes.
View
0 ...Console/templates/skel/Model/AppModel.php → ...Console/Templates/skel/Model/AppModel.php
File renamed without changes.
View
0 ...sole/templates/skel/tmp/cache/views/empty → ...nsole/Templates/skel/Model/Behavior/empty
File renamed without changes.
View
0 ...templates/skel/tmp/cache/persistent/empty → ...ole/Templates/skel/Model/Datasource/empty
File renamed without changes.
View
0 ...ole/templates/skel/tmp/cache/models/empty → lib/Cake/Console/Templates/skel/Plugin/empty
File renamed without changes.
View
0 ...nsole/templates/skel/View/Scaffolds/empty → ...skel/Test/Case/Controller/Component/empty
File renamed without changes.
View
0 ...e/Console/templates/skel/View/Pages/empty → ...Templates/skel/Test/Case/Controller/empty
File renamed without changes.
View
0 .../Console/templates/skel/View/Helper/empty → ...lates/skel/Test/Case/Model/Behavior/empty
File renamed without changes.
View
0 .../Console/templates/skel/View/Errors/empty → ...sole/Templates/skel/Test/Case/Model/empty
File renamed without changes.
View
0 ...onsole/templates/skel/View/Elements/empty → ...emplates/skel/Test/Case/View/Helper/empty
File renamed without changes.
View
0 lib/Cake/Console/templates/skel/Vendor/empty → ...Console/Templates/skel/Test/Fixture/empty
File renamed without changes.
View
0 ...Console/templates/skel/Test/Fixture/empty → lib/Cake/Console/Templates/skel/Vendor/empty
File renamed without changes.
View
0 ...emplates/skel/Test/Case/View/Helper/empty → ...onsole/Templates/skel/View/Elements/empty
File renamed without changes.
View
0 ...mplates/skel/View/Emails/html/default.ctp → ...mplates/skel/View/Emails/html/default.ctp
File renamed without changes.
View
0 ...mplates/skel/View/Emails/text/default.ctp → ...mplates/skel/View/Emails/text/default.ctp
File renamed without changes.
View
0 ...sole/templates/skel/Test/Case/Model/empty → .../Console/Templates/skel/View/Errors/empty
File renamed without changes.
View
0 .../templates/skel/View/Helper/AppHelper.php → .../Templates/skel/View/Helper/AppHelper.php
File renamed without changes.
View
0 ...lates/skel/Test/Case/Model/Behavior/empty → .../Console/Templates/skel/View/Helper/empty
File renamed without changes.
View
0 ...skel/View/Layouts/Emails/html/default.ctp → ...skel/View/Layouts/Emails/html/default.ctp
File renamed without changes.
View
0 ...skel/View/Layouts/Emails/text/default.ctp → ...skel/View/Layouts/Emails/text/default.ctp
File renamed without changes.
View
0 ...sole/templates/skel/View/Layouts/ajax.ctp → ...sole/Templates/skel/View/Layouts/ajax.ctp
File renamed without changes.
View
0 ...e/templates/skel/View/Layouts/default.ctp → ...e/Templates/skel/View/Layouts/default.ctp
File renamed without changes.
View
0 ...ole/templates/skel/View/Layouts/flash.ctp → ...ole/Templates/skel/View/Layouts/flash.ctp
File renamed without changes.
View
0 ...emplates/skel/View/Layouts/js/default.ctp → ...emplates/skel/View/Layouts/js/default.ctp
File renamed without changes.
View
0 ...mplates/skel/View/Layouts/rss/default.ctp → ...mplates/skel/View/Layouts/rss/default.ctp
File renamed without changes.
View
0 ...mplates/skel/View/Layouts/xml/default.ctp → ...mplates/skel/View/Layouts/xml/default.ctp
File renamed without changes.
View
0 ...templates/skel/Test/Case/Controller/empty → ...e/Console/Templates/skel/View/Pages/empty
File renamed without changes.
View
0 ...skel/Test/Case/Controller/Component/empty → ...nsole/Templates/skel/View/Scaffolds/empty
File renamed without changes.
View
0 lib/Cake/Console/templates/skel/index.php → lib/Cake/Console/Templates/skel/index.php
File renamed without changes.
View
0 lib/Cake/Console/templates/skel/Plugin/empty → ...ole/Templates/skel/tmp/cache/models/empty
File renamed without changes.
View
0 ...ole/templates/skel/Model/Datasource/empty → ...Templates/skel/tmp/cache/persistent/empty
File renamed without changes.
View
0 ...nsole/templates/skel/Model/Behavior/empty → ...sole/Templates/skel/tmp/cache/views/empty
File renamed without changes.
View
0 ...mplates/skel/Locale/eng/LC_MESSAGES/empty → ...ake/Console/Templates/skel/tmp/logs/empty
File renamed without changes.
View
0 lib/Cake/Console/templates/skel/Lib/empty → ...Console/Templates/skel/tmp/sessions/empty
File renamed without changes.
View
0 ...templates/skel/Controller/Component/empty → ...ke/Console/Templates/skel/tmp/tests/empty
File renamed without changes.
View
0 .../Console/templates/skel/webroot/.htaccess → .../Console/Templates/skel/webroot/.htaccess
File renamed without changes.
View
0 ...mplates/skel/webroot/css/cake.generic.css → ...mplates/skel/webroot/css/cake.generic.css
File renamed without changes.
View
0 ...onsole/templates/skel/webroot/favicon.ico → ...onsole/Templates/skel/webroot/favicon.ico
File renamed without changes.
View
0 .../templates/skel/webroot/img/cake.icon.png → .../Templates/skel/webroot/img/cake.icon.png
File renamed without changes
View
0 ...templates/skel/webroot/img/cake.power.gif → ...Templates/skel/webroot/img/cake.power.gif
File renamed without changes
View
0 .../Console/templates/skel/webroot/index.php → .../Console/Templates/skel/webroot/index.php
File renamed without changes.
View
0 ...templates/skel/Console/Command/Task/empty → ...e/Console/Templates/skel/webroot/js/empty
File renamed without changes.
View
0 ...e/Console/templates/skel/webroot/test.php → ...e/Console/Templates/skel/webroot/test.php
File renamed without changes.

0 comments on commit 2134816

Please sign in to comment.