From ab789774113a0122510810f6e3274c7073899fb2 Mon Sep 17 00:00:00 2001 From: Kris Jordan Date: Thu, 25 Jun 2009 10:22:09 -0400 Subject: [PATCH] Wrapping up new Layouts, Parts, & Blocks system. This is a major commit that is not backwards compatible with the previous GitHub Edge Layouts. Major components of the new view system in place. Still need comments. Added documentation for Part and Buffer as well as regression tests. AssertiveTemplate commented. Layout commented and tested. PartBlock and Buffer documented and tested. Updated WelcomeApp Updated default resource scaffolding. --- apps/welcome/WelcomeApplication.class.php | 2 + .../WelcomeHomeController.class.php | 7 - apps/welcome/views/common/footer.php | 4 - apps/welcome/views/home/index.php | 6 +- .../{common/header.php => master.layout.php} | 21 +- .../tools/RecessToolsApplication.class.php | 3 + .../RecessToolsAppsController.class.php | 5 +- .../tools/templates/Application.template.php | 2 +- .../scaffolding/views/home/index.template.php | 4 +- ...emplate.php => master.layout.template.php} | 26 +- .../views/resource/details.part.template.php | 2 +- .../views/resource/details.template.php | 6 +- .../views/resource/editForm.template.php | 6 +- .../views/resource/form.part.template.php | 4 +- .../views/resource/index.template.php | 6 +- .../views/resource/layout.template.php | 9 - .../resource/resource.layout.template.php | 9 + recess/recess/apps/tools/views/apps/app.php | 27 +- .../apps/tools/views/apps/createModel.php | 8 +- .../tools/views/apps/createModelComplete.php | 2 +- .../apps/tools/views/apps/genController.php | 2 +- .../tools/views/apps/generateScaffolding.php | 2 +- recess/recess/apps/tools/views/apps/home.php | 2 +- .../tools/views/apps/newAppInstructions.php | 2 +- .../apps/tools/views/apps/newAppWizard.php | 2 +- .../tools/views/apps/newAppWizardComplete.php | 2 +- .../tools/views/apps/newAppWizardStep2.php | 2 +- .../tools/views/apps/newModelComplete.php | 2 +- .../apps/tools/views/apps/uninstall.php | 2 +- .../recess/apps/tools/views/code/byClass.php | 2 +- .../apps/tools/views/code/byPackage.php | 2 +- .../apps/tools/views/code/classInfo.php | 2 +- .../apps/tools/views/code/createTable.tpl | 1 - recess/recess/apps/tools/views/code/home.php | 29 +- .../apps/tools/views/code/packageInfo.php | 2 +- .../apps/tools/views/code/table.part.php | 25 ++ .../apps/tools/views/database/dropTable.php | 2 +- .../apps/tools/views/database/emptyTable.php | 2 +- .../recess/apps/tools/views/database/home.php | 2 +- .../apps/tools/views/database/newSource.php | 2 +- .../apps/tools/views/database/row.part.php | 11 + .../apps/tools/views/database/showTable.php | 48 ++-- recess/recess/apps/tools/views/home/home.php | 2 +- .../apps/tools/views/layouts/apps.layout.php | 9 + .../recess/apps/tools/views/layouts/apps.php | 9 - .../apps/tools/views/layouts/code.layout.php | 10 + .../recess/apps/tools/views/layouts/code.php | 9 - .../tools/views/layouts/database.layout.php | 11 + .../apps/tools/views/layouts/database.php | 9 - .../apps/tools/views/layouts/home.layout.php | 8 + .../recess/apps/tools/views/layouts/home.php | 7 - .../layouts/{master.php => master.layout.php} | 16 +- .../views/layouts/navigation-item.part.php | 13 + .../tools/views/layouts/navigation.part.php | 28 +- .../tools/views/layouts/routes.layout.php | 10 + .../apps/tools/views/layouts/routes.php | 9 - .../recess/apps/tools/views/routes/home.php | 10 +- .../apps/tools/views/routes/rows.part.php | 11 +- .../apps/tools/views/routes/table.part.php | 7 +- .../recess/framework/AbstractView.class.php | 2 +- .../recess/framework/DefaultPolicy.class.php | 10 +- .../controllers/Controller.class.php | 15 +- .../helpers/AssertiveTemplate.class.php | 207 ++++++++++++++ .../recess/framework/helpers/Buffer.class.php | 133 +++++++++ .../recess/framework/helpers/Layout.class.php | 264 ++++-------------- .../recess/framework/helpers/Part.class.php | 146 +++++++--- recess/recess/framework/helpers/Url.class.php | 8 +- .../framework/helpers/blocks/Block.class.php | 33 +++ .../helpers/blocks/HtmlBlock.class.php | 59 ++++ .../helpers/blocks/ListBlock.class.php | 128 +++++++++ .../helpers/blocks/PartBlock.class.php | 168 +++++++++++ .../BlockToStringException.class.php | 10 + .../InputDoesNotExistException.class.php | 10 + .../InputTypeCheckException.class.php | 10 + ...ngRequiredDrawArgumentsException.class.php | 10 + .../MissingRequiredInputException.class.php | 10 + .../framework/parts/each-toggle.part.php | 13 + recess/recess/framework/parts/each.part.php | 11 + .../recess/framework/views/JsonView.class.php | 2 +- .../framework/views/LayoutsView.class.php | 16 +- .../framework/views/NativeView.class.php | 15 +- recess/recess/http/Request.class.php | 1 + recess/recess/lang/PathFinder.class.php | 23 ++ recess/test/bootstrap.php | 2 +- .../framework/RecessFrameworkAllTests.php | 2 + .../helpers/AssertiveTemplateTest.php | 77 +++++ .../recess/framework/helpers/BufferTest.php | 80 ++++++ .../recess/framework/helpers/LayoutTest.php | 64 +++++ .../recess/framework/helpers/PartTest.php | 127 +++++++++ .../RecessFrameworkHelpersAllTests.php | 24 ++ .../helpers/blocks/HtmlBlockTest.php | 68 +++++ .../helpers/blocks/ListBlockTest.php | 53 ++++ .../helpers/blocks/PartBlockTest.php | 198 +++++++++++++ .../RecessFrameworkHelpersBlocksAllTests.php | 20 ++ .../recess/framework/helpers/simple.at.php | 10 + .../helpers/test-layouts/context.layout.php | 4 + .../helpers/test-layouts/context.php | 3 + .../helpers/test-layouts/defaults.layout.php | 4 + .../helpers/test-layouts/defaults.php | 3 + .../helpers/test-layouts/middle.layout.php | 6 + .../test-layouts/middle.master.layout.php | 8 + .../framework/helpers/test-layouts/middle.php | 4 + .../helpers/test-layouts/multiple.layout.php | 11 + .../helpers/test-layouts/multiple.php | 10 + .../helpers/test-layouts/simple.layout.php | 4 + .../framework/helpers/test-layouts/simple.php | 4 + .../helpers/test-parts/multi-input.part.php | 9 + .../test-parts/optional-inputs.part.php | 5 + .../helpers/test-parts/single-input.part.php | 4 + .../helpers/test-parts/zero-input.part.php | 3 + 110 files changed, 2086 insertions(+), 510 deletions(-) delete mode 100644 apps/welcome/views/common/footer.php rename apps/welcome/views/{common/header.php => master.layout.php} (71%) rename recess/recess/apps/tools/templates/scaffolding/views/{master.template.php => master.layout.template.php} (57%) delete mode 100644 recess/recess/apps/tools/templates/scaffolding/views/resource/layout.template.php create mode 100644 recess/recess/apps/tools/templates/scaffolding/views/resource/resource.layout.template.php delete mode 100644 recess/recess/apps/tools/views/code/createTable.tpl create mode 100644 recess/recess/apps/tools/views/code/table.part.php create mode 100644 recess/recess/apps/tools/views/database/row.part.php create mode 100644 recess/recess/apps/tools/views/layouts/apps.layout.php delete mode 100644 recess/recess/apps/tools/views/layouts/apps.php create mode 100644 recess/recess/apps/tools/views/layouts/code.layout.php delete mode 100644 recess/recess/apps/tools/views/layouts/code.php create mode 100644 recess/recess/apps/tools/views/layouts/database.layout.php delete mode 100644 recess/recess/apps/tools/views/layouts/database.php create mode 100644 recess/recess/apps/tools/views/layouts/home.layout.php delete mode 100644 recess/recess/apps/tools/views/layouts/home.php rename recess/recess/apps/tools/views/layouts/{master.php => master.layout.php} (85%) create mode 100644 recess/recess/apps/tools/views/layouts/navigation-item.part.php create mode 100644 recess/recess/apps/tools/views/layouts/routes.layout.php delete mode 100644 recess/recess/apps/tools/views/layouts/routes.php create mode 100644 recess/recess/framework/helpers/AssertiveTemplate.class.php create mode 100644 recess/recess/framework/helpers/Buffer.class.php create mode 100644 recess/recess/framework/helpers/blocks/Block.class.php create mode 100644 recess/recess/framework/helpers/blocks/HtmlBlock.class.php create mode 100644 recess/recess/framework/helpers/blocks/ListBlock.class.php create mode 100644 recess/recess/framework/helpers/blocks/PartBlock.class.php create mode 100644 recess/recess/framework/helpers/exceptions/BlockToStringException.class.php create mode 100644 recess/recess/framework/helpers/exceptions/InputDoesNotExistException.class.php create mode 100644 recess/recess/framework/helpers/exceptions/InputTypeCheckException.class.php create mode 100644 recess/recess/framework/helpers/exceptions/MissingRequiredDrawArgumentsException.class.php create mode 100644 recess/recess/framework/helpers/exceptions/MissingRequiredInputException.class.php create mode 100644 recess/recess/framework/parts/each-toggle.part.php create mode 100644 recess/recess/framework/parts/each.part.php create mode 100644 recess/recess/lang/PathFinder.class.php create mode 100644 recess/test/recess/framework/helpers/AssertiveTemplateTest.php create mode 100644 recess/test/recess/framework/helpers/BufferTest.php create mode 100644 recess/test/recess/framework/helpers/LayoutTest.php create mode 100644 recess/test/recess/framework/helpers/PartTest.php create mode 100644 recess/test/recess/framework/helpers/RecessFrameworkHelpersAllTests.php create mode 100644 recess/test/recess/framework/helpers/blocks/HtmlBlockTest.php create mode 100644 recess/test/recess/framework/helpers/blocks/ListBlockTest.php create mode 100644 recess/test/recess/framework/helpers/blocks/PartBlockTest.php create mode 100644 recess/test/recess/framework/helpers/blocks/RecessFrameworkHelpersBlocksAllTests.php create mode 100644 recess/test/recess/framework/helpers/simple.at.php create mode 100644 recess/test/recess/framework/helpers/test-layouts/context.layout.php create mode 100644 recess/test/recess/framework/helpers/test-layouts/context.php create mode 100644 recess/test/recess/framework/helpers/test-layouts/defaults.layout.php create mode 100644 recess/test/recess/framework/helpers/test-layouts/defaults.php create mode 100644 recess/test/recess/framework/helpers/test-layouts/middle.layout.php create mode 100644 recess/test/recess/framework/helpers/test-layouts/middle.master.layout.php create mode 100644 recess/test/recess/framework/helpers/test-layouts/middle.php create mode 100644 recess/test/recess/framework/helpers/test-layouts/multiple.layout.php create mode 100644 recess/test/recess/framework/helpers/test-layouts/multiple.php create mode 100644 recess/test/recess/framework/helpers/test-layouts/simple.layout.php create mode 100644 recess/test/recess/framework/helpers/test-layouts/simple.php create mode 100644 recess/test/recess/framework/helpers/test-parts/multi-input.part.php create mode 100644 recess/test/recess/framework/helpers/test-parts/optional-inputs.part.php create mode 100644 recess/test/recess/framework/helpers/test-parts/single-input.part.php create mode 100644 recess/test/recess/framework/helpers/test-parts/zero-input.part.php diff --git a/apps/welcome/WelcomeApplication.class.php b/apps/welcome/WelcomeApplication.class.php index 00a73e8..f1e7bb2 100644 --- a/apps/welcome/WelcomeApplication.class.php +++ b/apps/welcome/WelcomeApplication.class.php @@ -14,6 +14,8 @@ public function __construct() { $this->routingPrefix = '/'; + $this->assetUrl = 'recess/recess/apps/tools/public/'; + } } ?> \ No newline at end of file diff --git a/apps/welcome/controllers/WelcomeHomeController.class.php b/apps/welcome/controllers/WelcomeHomeController.class.php index d07ec5f..1aa35e8 100644 --- a/apps/welcome/controllers/WelcomeHomeController.class.php +++ b/apps/welcome/controllers/WelcomeHomeController.class.php @@ -12,12 +12,5 @@ class WelcomeHomeController extends Controller { function index() { $this->flash = 'Welcome to your new Recess app!'; } - - /** - * !Route GET, foo - */ - function foo() { - - } } ?> diff --git a/apps/welcome/views/common/footer.php b/apps/welcome/views/common/footer.php deleted file mode 100644 index 5e60d78..0000000 --- a/apps/welcome/views/common/footer.php +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/apps/welcome/views/home/index.php b/apps/welcome/views/home/index.php index 3826f6f..09564e1 100644 --- a/apps/welcome/views/home/index.php +++ b/apps/welcome/views/home/index.php @@ -1,6 +1,6 @@
@@ -16,6 +16,4 @@
-

For more information visit http://www.recessframework.org/

- - \ No newline at end of file +

For more information visit http://www.recessframework.org/

\ No newline at end of file diff --git a/apps/welcome/views/common/header.php b/apps/welcome/views/master.layout.php similarity index 71% rename from apps/welcome/views/common/header.php rename to apps/welcome/views/master.layout.php index 6cf6499..27c561d 100644 --- a/apps/welcome/views/common/header.php +++ b/apps/welcome/views/master.layout.php @@ -1,15 +1,16 @@ + - - + + - - <?php if(isset($title)) echo $title; else echo 'Recess!'; ?> -