From 79aa8d27d124d06bf88b2fc0487ae97563b98936 Mon Sep 17 00:00:00 2001
From: Aaron Trevena <aaron.trevena@gmail.com>
Date: Thu, 10 Aug 2006 13:40:40 +0000
Subject: [PATCH] moved ex to examples, fix to edit template

git-svn-id: http://svn.maypole.perl.org/Maypole/trunk@520 48953598-375a-da11-a14b-00016c27c3ee
---
 Changes                                       |  4 ++-
 MANIFEST                                      | 36 +++++++++----------
 {ex => examples}/BeerDB.pm                    |  0
 {ex => examples}/BeerDB/Base.pm               |  0
 {ex => examples}/BeerDB/Beer.pm               |  0
 {ex => examples}/beerdb.sql                   |  0
 {ex => examples}/fancy_example/BeerDB.pm      |  0
 {ex => examples}/fancy_example/BeerDB/Base.pm |  0
 {ex => examples}/fancy_example/BeerDB/Beer.pm |  0
 .../fancy_example/BeerDB/Brewery.pm           |  0
 .../fancy_example/BeerDB/Drinker.pm           |  0
 {ex => examples}/fancy_example/beerdb.sql     |  0
 .../fancy_example/templates/custom/addnew     |  0
 .../templates/custom/display_inputs           |  0
 .../templates/custom/display_search_inputs    |  0
 .../fancy_example/templates/custom/edit       |  0
 .../fancy_example/templates/custom/header     |  0
 .../templates/custom/maypole.css              |  0
 .../fancy_example/templates/custom/metadata   |  0
 .../templates/custom/search_form              |  0
 .../fancy_example/templates/factory/addnew    |  0
 .../fancy_example/templates/factory/edit      |  0
 .../fancy_example/templates/factory/footer    |  0
 .../fancy_example/templates/factory/frontpage |  0
 .../fancy_example/templates/factory/header    |  0
 .../fancy_example/templates/factory/list      |  0
 .../fancy_example/templates/factory/login     |  0
 .../fancy_example/templates/factory/macros    |  0
 .../fancy_example/templates/factory/maypole   |  0
 .../templates/factory/maypole.css             |  0
 .../fancy_example/templates/factory/navbar    |  0
 .../fancy_example/templates/factory/pager     |  0
 .../templates/factory/search_form             |  0
 .../templates/factory/search_form_recursive   |  0
 .../fancy_example/templates/factory/title     |  0
 .../fancy_example/templates/factory/view      |  0
 lib/Maypole/Manual/About.pod                  |  2 +-
 lib/Maypole/View/TT.pm                        |  2 ++
 lib/Maypole/templates/factory/edit            |  2 +-
 t/01basics.t                                  |  2 +-
 t/crud.t                                      |  2 +-
 t/db_colinfo.t                                |  4 +--
 42 files changed, 29 insertions(+), 25 deletions(-)
 rename {ex => examples}/BeerDB.pm (100%)
 rename {ex => examples}/BeerDB/Base.pm (100%)
 rename {ex => examples}/BeerDB/Beer.pm (100%)
 rename {ex => examples}/beerdb.sql (100%)
 rename {ex => examples}/fancy_example/BeerDB.pm (100%)
 rename {ex => examples}/fancy_example/BeerDB/Base.pm (100%)
 rename {ex => examples}/fancy_example/BeerDB/Beer.pm (100%)
 rename {ex => examples}/fancy_example/BeerDB/Brewery.pm (100%)
 rename {ex => examples}/fancy_example/BeerDB/Drinker.pm (100%)
 rename {ex => examples}/fancy_example/beerdb.sql (100%)
 rename {ex => examples}/fancy_example/templates/custom/addnew (100%)
 rename {ex => examples}/fancy_example/templates/custom/display_inputs (100%)
 rename {ex => examples}/fancy_example/templates/custom/display_search_inputs (100%)
 rename {ex => examples}/fancy_example/templates/custom/edit (100%)
 rename {ex => examples}/fancy_example/templates/custom/header (100%)
 rename {ex => examples}/fancy_example/templates/custom/maypole.css (100%)
 rename {ex => examples}/fancy_example/templates/custom/metadata (100%)
 rename {ex => examples}/fancy_example/templates/custom/search_form (100%)
 rename {ex => examples}/fancy_example/templates/factory/addnew (100%)
 rename {ex => examples}/fancy_example/templates/factory/edit (100%)
 rename {ex => examples}/fancy_example/templates/factory/footer (100%)
 rename {ex => examples}/fancy_example/templates/factory/frontpage (100%)
 rename {ex => examples}/fancy_example/templates/factory/header (100%)
 rename {ex => examples}/fancy_example/templates/factory/list (100%)
 rename {ex => examples}/fancy_example/templates/factory/login (100%)
 rename {ex => examples}/fancy_example/templates/factory/macros (100%)
 rename {ex => examples}/fancy_example/templates/factory/maypole (100%)
 rename {ex => examples}/fancy_example/templates/factory/maypole.css (100%)
 rename {ex => examples}/fancy_example/templates/factory/navbar (100%)
 rename {ex => examples}/fancy_example/templates/factory/pager (100%)
 rename {ex => examples}/fancy_example/templates/factory/search_form (100%)
 rename {ex => examples}/fancy_example/templates/factory/search_form_recursive (100%)
 rename {ex => examples}/fancy_example/templates/factory/title (100%)
 rename {ex => examples}/fancy_example/templates/factory/view (100%)

diff --git a/Changes b/Changes
index c7efd8a..c4cc7db 100644
--- a/Changes
+++ b/Changes
@@ -2,7 +2,9 @@ This file documents the revision history for Perl extension Maypole.
 For information about current developments and future releases, see:
     http://maypole.perl.org/?TheRoadmap
 
-2.11 
+2.11 Mon 31 July 2006
+
+SVN revision 519
 
 Deprecated:
     Directly accessing the attributes of the request object, or the parameters 
diff --git a/MANIFEST b/MANIFEST
index d5515b9..623a934 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -1,22 +1,22 @@
 Changes
-ex/BeerDB.pm
-ex/BeerDB/Base.pm
-ex/BeerDB/Beer.pm
-ex/beerdb.sql
-ex/fancy_example/BeerDB.pm
-ex/fancy_example/beerdb.sql
-ex/fancy_example/BeerDB/Base.pm
-ex/fancy_example/BeerDB/Beer.pm
-ex/fancy_example/BeerDB/Brewery.pm
-ex/fancy_example/BeerDB/Drinker.pm
-ex/fancy_example/templates/custom/addnew  
-ex/fancy_example/templates/custom/display_inputs  
-ex/fancy_example/templates/custom/display_search_inputs  
-ex/fancy_example/templates/custom/edit  
-ex/fancy_example/templates/custom/header  
-ex/fancy_example/templates/custom/maypole.css  
-ex/fancy_example/templates/custom/metadata  
-ex/fancy_example/templates/custom/search_form
+examples/BeerDB.pm
+examples/BeerDB/Base.pm
+examples/BeerDB/Beer.pm
+examples/beerdb.sql
+examples/fancy_example/BeerDB.pm
+examples/fancy_example/beerdb.sql
+examples/fancy_example/BeerDB/Base.pm
+examples/fancy_example/BeerDB/Beer.pm
+examples/fancy_example/BeerDB/Brewery.pm
+examples/fancy_example/BeerDB/Drinker.pm
+examples/fancy_example/templates/custom/addnew  
+examples/fancy_example/templates/custom/display_inputs  
+examples/fancy_example/templates/custom/display_search_inputs  
+examples/fancy_example/templates/custom/edit  
+examples/fancy_example/templates/custom/header  
+examples/fancy_example/templates/custom/maypole.css  
+examples/fancy_example/templates/custom/metadata  
+examples/fancy_example/templates/custom/search_form
 lib/Apache/MVC.pm
 lib/CGI/Maypole.pm
 lib/CGI/Untaint/Maypole.pm
diff --git a/ex/BeerDB.pm b/examples/BeerDB.pm
similarity index 100%
rename from ex/BeerDB.pm
rename to examples/BeerDB.pm
diff --git a/ex/BeerDB/Base.pm b/examples/BeerDB/Base.pm
similarity index 100%
rename from ex/BeerDB/Base.pm
rename to examples/BeerDB/Base.pm
diff --git a/ex/BeerDB/Beer.pm b/examples/BeerDB/Beer.pm
similarity index 100%
rename from ex/BeerDB/Beer.pm
rename to examples/BeerDB/Beer.pm
diff --git a/ex/beerdb.sql b/examples/beerdb.sql
similarity index 100%
rename from ex/beerdb.sql
rename to examples/beerdb.sql
diff --git a/ex/fancy_example/BeerDB.pm b/examples/fancy_example/BeerDB.pm
similarity index 100%
rename from ex/fancy_example/BeerDB.pm
rename to examples/fancy_example/BeerDB.pm
diff --git a/ex/fancy_example/BeerDB/Base.pm b/examples/fancy_example/BeerDB/Base.pm
similarity index 100%
rename from ex/fancy_example/BeerDB/Base.pm
rename to examples/fancy_example/BeerDB/Base.pm
diff --git a/ex/fancy_example/BeerDB/Beer.pm b/examples/fancy_example/BeerDB/Beer.pm
similarity index 100%
rename from ex/fancy_example/BeerDB/Beer.pm
rename to examples/fancy_example/BeerDB/Beer.pm
diff --git a/ex/fancy_example/BeerDB/Brewery.pm b/examples/fancy_example/BeerDB/Brewery.pm
similarity index 100%
rename from ex/fancy_example/BeerDB/Brewery.pm
rename to examples/fancy_example/BeerDB/Brewery.pm
diff --git a/ex/fancy_example/BeerDB/Drinker.pm b/examples/fancy_example/BeerDB/Drinker.pm
similarity index 100%
rename from ex/fancy_example/BeerDB/Drinker.pm
rename to examples/fancy_example/BeerDB/Drinker.pm
diff --git a/ex/fancy_example/beerdb.sql b/examples/fancy_example/beerdb.sql
similarity index 100%
rename from ex/fancy_example/beerdb.sql
rename to examples/fancy_example/beerdb.sql
diff --git a/ex/fancy_example/templates/custom/addnew b/examples/fancy_example/templates/custom/addnew
similarity index 100%
rename from ex/fancy_example/templates/custom/addnew
rename to examples/fancy_example/templates/custom/addnew
diff --git a/ex/fancy_example/templates/custom/display_inputs b/examples/fancy_example/templates/custom/display_inputs
similarity index 100%
rename from ex/fancy_example/templates/custom/display_inputs
rename to examples/fancy_example/templates/custom/display_inputs
diff --git a/ex/fancy_example/templates/custom/display_search_inputs b/examples/fancy_example/templates/custom/display_search_inputs
similarity index 100%
rename from ex/fancy_example/templates/custom/display_search_inputs
rename to examples/fancy_example/templates/custom/display_search_inputs
diff --git a/ex/fancy_example/templates/custom/edit b/examples/fancy_example/templates/custom/edit
similarity index 100%
rename from ex/fancy_example/templates/custom/edit
rename to examples/fancy_example/templates/custom/edit
diff --git a/ex/fancy_example/templates/custom/header b/examples/fancy_example/templates/custom/header
similarity index 100%
rename from ex/fancy_example/templates/custom/header
rename to examples/fancy_example/templates/custom/header
diff --git a/ex/fancy_example/templates/custom/maypole.css b/examples/fancy_example/templates/custom/maypole.css
similarity index 100%
rename from ex/fancy_example/templates/custom/maypole.css
rename to examples/fancy_example/templates/custom/maypole.css
diff --git a/ex/fancy_example/templates/custom/metadata b/examples/fancy_example/templates/custom/metadata
similarity index 100%
rename from ex/fancy_example/templates/custom/metadata
rename to examples/fancy_example/templates/custom/metadata
diff --git a/ex/fancy_example/templates/custom/search_form b/examples/fancy_example/templates/custom/search_form
similarity index 100%
rename from ex/fancy_example/templates/custom/search_form
rename to examples/fancy_example/templates/custom/search_form
diff --git a/ex/fancy_example/templates/factory/addnew b/examples/fancy_example/templates/factory/addnew
similarity index 100%
rename from ex/fancy_example/templates/factory/addnew
rename to examples/fancy_example/templates/factory/addnew
diff --git a/ex/fancy_example/templates/factory/edit b/examples/fancy_example/templates/factory/edit
similarity index 100%
rename from ex/fancy_example/templates/factory/edit
rename to examples/fancy_example/templates/factory/edit
diff --git a/ex/fancy_example/templates/factory/footer b/examples/fancy_example/templates/factory/footer
similarity index 100%
rename from ex/fancy_example/templates/factory/footer
rename to examples/fancy_example/templates/factory/footer
diff --git a/ex/fancy_example/templates/factory/frontpage b/examples/fancy_example/templates/factory/frontpage
similarity index 100%
rename from ex/fancy_example/templates/factory/frontpage
rename to examples/fancy_example/templates/factory/frontpage
diff --git a/ex/fancy_example/templates/factory/header b/examples/fancy_example/templates/factory/header
similarity index 100%
rename from ex/fancy_example/templates/factory/header
rename to examples/fancy_example/templates/factory/header
diff --git a/ex/fancy_example/templates/factory/list b/examples/fancy_example/templates/factory/list
similarity index 100%
rename from ex/fancy_example/templates/factory/list
rename to examples/fancy_example/templates/factory/list
diff --git a/ex/fancy_example/templates/factory/login b/examples/fancy_example/templates/factory/login
similarity index 100%
rename from ex/fancy_example/templates/factory/login
rename to examples/fancy_example/templates/factory/login
diff --git a/ex/fancy_example/templates/factory/macros b/examples/fancy_example/templates/factory/macros
similarity index 100%
rename from ex/fancy_example/templates/factory/macros
rename to examples/fancy_example/templates/factory/macros
diff --git a/ex/fancy_example/templates/factory/maypole b/examples/fancy_example/templates/factory/maypole
similarity index 100%
rename from ex/fancy_example/templates/factory/maypole
rename to examples/fancy_example/templates/factory/maypole
diff --git a/ex/fancy_example/templates/factory/maypole.css b/examples/fancy_example/templates/factory/maypole.css
similarity index 100%
rename from ex/fancy_example/templates/factory/maypole.css
rename to examples/fancy_example/templates/factory/maypole.css
diff --git a/ex/fancy_example/templates/factory/navbar b/examples/fancy_example/templates/factory/navbar
similarity index 100%
rename from ex/fancy_example/templates/factory/navbar
rename to examples/fancy_example/templates/factory/navbar
diff --git a/ex/fancy_example/templates/factory/pager b/examples/fancy_example/templates/factory/pager
similarity index 100%
rename from ex/fancy_example/templates/factory/pager
rename to examples/fancy_example/templates/factory/pager
diff --git a/ex/fancy_example/templates/factory/search_form b/examples/fancy_example/templates/factory/search_form
similarity index 100%
rename from ex/fancy_example/templates/factory/search_form
rename to examples/fancy_example/templates/factory/search_form
diff --git a/ex/fancy_example/templates/factory/search_form_recursive b/examples/fancy_example/templates/factory/search_form_recursive
similarity index 100%
rename from ex/fancy_example/templates/factory/search_form_recursive
rename to examples/fancy_example/templates/factory/search_form_recursive
diff --git a/ex/fancy_example/templates/factory/title b/examples/fancy_example/templates/factory/title
similarity index 100%
rename from ex/fancy_example/templates/factory/title
rename to examples/fancy_example/templates/factory/title
diff --git a/ex/fancy_example/templates/factory/view b/examples/fancy_example/templates/factory/view
similarity index 100%
rename from ex/fancy_example/templates/factory/view
rename to examples/fancy_example/templates/factory/view
diff --git a/lib/Maypole/Manual/About.pod b/lib/Maypole/Manual/About.pod
index 6f48663..e0cdf3b 100644
--- a/lib/Maypole/Manual/About.pod
+++ b/lib/Maypole/Manual/About.pod
@@ -188,7 +188,7 @@ you need to write for a simple database front-end:
         "a pub has beers on handpumps");
     1;
 
-There's a version of this program in the F<ex/> directory in the Maypole
+There's a version of this program in the F<examples/> directory in the Maypole
 files that you downloaded in the F<~root/.cpan/> build area.
 This defines the C<BeerDB> application.
 To set it up as a mod_perl handler, just tell the Apache configuration
diff --git a/lib/Maypole/View/TT.pm b/lib/Maypole/View/TT.pm
index b7a59a2..ac2aceb 100644
--- a/lib/Maypole/View/TT.pm
+++ b/lib/Maypole/View/TT.pm
@@ -7,6 +7,8 @@ use File::Spec::Functions qw(catdir tmpdir);
 our $error_template; 
 { local $/; $error_template = <DATA>; }
 
+our $VERSION = '2.11';
+
 use strict;
 
 sub template {
diff --git a/lib/Maypole/templates/factory/edit b/lib/Maypole/templates/factory/edit
index 2016bb1..4b589ed 100644
--- a/lib/Maypole/templates/factory/edit
+++ b/lib/Maypole/templates/factory/edit
@@ -18,7 +18,7 @@ form similar to L<addnew> but with the current values filled in.
 
 [% IF object %]
 <div id="title">Edit a [% classmetadata.moniker %]</div>
-<form action="[% base %]/[% item.table %]/do_edit/[% item.id %]" method="post">
+<form action="[% base %]/[% item.table %]/do_edit/[% object.id %]" method="post">
 <fieldset>
 <legend>Edit [% object.name %]</legend>
    [% FOR col = classmetadata.columns;
diff --git a/t/01basics.t b/t/01basics.t
index ba7b834..8488985 100644
--- a/t/01basics.t
+++ b/t/01basics.t
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -w
 use Test::More;
-use lib 'ex'; # Where BeerDB should live
+use lib 'examples'; # Where BeerDB should live
 BEGIN {
     $ENV{BEERDB_DEBUG} = 0;
 
diff --git a/t/crud.t b/t/crud.t
index 1efc73c..8afe888 100755
--- a/t/crud.t
+++ b/t/crud.t
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -w
 use Test::More;
-use lib 'ex'; # Where BeerDB should live
+use lib 'examples'; # Where BeerDB should live
 BEGIN {
     $ENV{BEERDB_DEBUG} = 2;
 
diff --git a/t/db_colinfo.t b/t/db_colinfo.t
index 2b341eb..74dea75 100755
--- a/t/db_colinfo.t
+++ b/t/db_colinfo.t
@@ -1,9 +1,9 @@
 #!/usr/bin/perl -w
 use Test::More;
 use Data::Dumper;
-use lib 'ex'; # Where BeerDB should live
+use lib 'examples'; # Where BeerDB should live
 BEGIN {
-   plan tests => 65;
+   plan tests => 45;
 }
 
 $db     	= 'test';
-- 
2.39.5