works, but I'm not entirely happy with it yet

It would be better if it were a formbuilder hook. But the formbuilder hook
is wacked.. I may need to change how that hook works, which would mean
changing the only current user of it, passwordauth).

diff --git a/IkiWiki/Plugin/edittemplate.pm b/IkiWiki/Plugin/edittemplate.pm
index b814c0e6732e6294c95f2ed054148906e47c3d30..20c948eb1af75d30b6913efafce70198b3b604b5 100644 (file)
--- a/IkiWiki/Plugin/edittemplate.pm
+++ b/IkiWiki/Plugin/edittemplate.pm
@@ -4,6 +4,8 @@ package IkiWiki::Plugin::edittemplate;
 use warnings;
 use strict;
 use IkiWiki 2.00;
 use warnings;
 use strict;
 use IkiWiki 2.00;

+use HTML::Template;
+use Encode;

 
 sub import { #{{{
        hook(type => "needsbuild", id => "edittemplate",
 
 sub import { #{{{
        hook(type => "needsbuild", id => "edittemplate",


@@ -47,15 +49,79 @@ sub preprocess (@) { #{{{
                $params{template}, $params{match});
 } # }}}
 
                $params{template}, $params{match});
 } # }}}
 

-sub formbuilder_setup { #{{{
+sub formbuilder_setup (@) { #{{{

        my %params=@_;
        my $form=$params{form};
        my %params=@_;
        my $form=$params{form};

-       my $page=$form->field("page");
-
+       

        return if $form->title ne "editpage"
                  || $form->field("do") ne "create";
        return if $form->title ne "editpage"
                  || $form->field("do") ne "create";

+       
+       my $page=$form->field("page");
+       my $from=$form->field("from");
+       
+       # The tricky bit here is that $page is probably just the base
+       # page name, without any subdir, but the pagespec for a template
+       # probably does include the subdir (ie, "bugs/*"). We don't know
+       # what subdir the user will pick to put the page in. So, generate
+       # an ordered list and the first template to match will be used.
+       #
+       # This code corresponds to the code in editpage() that generates
+       # the list of possible page names, unfortunatly, that code runs
+       # later, so that list can't be simply reused.
+       my @page_locs=$page;
+       if (defined $from) {
+               push @page_locs, "$from/$page";
+               my $dir=$from.="/";
+               while (length $dir) {
+                       $dir=~s![^/]+/+$!!;
+                       push @page_locs, $dir.$page;
+               }
+       }
+
+       foreach my $p (@page_locs) {
+               foreach my $registering_page (keys %pagestate) {
+                       if (exists $pagestate{$registering_page}{edittemplate}) {
+                               foreach my $pagespec (sort keys %{$pagestate{$registering_page}{edittemplate}}) {
+                                       if (pagespec_match($p, $pagespec, location => $registering_page)) {
+                                               $form->field(name => "editcontent",
+                                                        value => filltemplate($pagestate{$registering_page}{edittemplate}{$pagespec}, $page));
+                                               return;
+                                       }
+                               }
+                       }
+               }
+       }
+} #}}}
+
+sub filltemplate ($$) { #{{{
+       my $template_page=shift;
+       my $page=shift;
+
+       my $template_file=$pagesources{$template_page};
+       if (! defined $template_file) {
+               return;
+       }
+
+       my $template;
+       eval {
+               $template=HTML::Template->new(
+                       filter => sub {
+                               my $text_ref = shift;
+                               $$text_ref=&Encode::decode_utf8($$text_ref);
+                               chomp $$text_ref;
+                       },
+                       filename => srcfile($template_file),
+                       die_on_bad_params => 0,
+                       no_includes => 1,
+               );
+       };
+       if ($@) {
+               return "[[pagetemplate ".gettext("failed to process")." $@]]";
+       }
+
+       $template->param(name => $page);

 
 

-       $form->field(name => "editcontent", value => "hi mom!");
+       return $template->output;

 } #}}}
 
 1
 } #}}}
 
 1

diff --git a/debian/changelog b/debian/changelog
index 3ebc0b044e76c36f2cf3726256469acab163edef..2118aeaa04f8c1eb5e2544ace0bbca0faa13a6aa 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -18,6 +18,8 @@ ikiwiki (2.16) UNRELEASED; urgency=low
   * calendar: Work around block html parsing bug in markdown 1.0.1 by
     enclosing the calendar in an extra div.
   * Fix file pruning code to work if ikiwiki is run with "." as the srcdir.
   * calendar: Work around block html parsing bug in markdown 1.0.1 by
     enclosing the calendar in an extra div.
   * Fix file pruning code to work if ikiwiki is run with "." as the srcdir.

+  * Add an edittemplate plugin, allowing registering template pages, that
+    provide default content for new pages created using the web frontend.

 
  -- Joey Hess <joeyh@debian.org>  Mon, 03 Dec 2007 14:47:36 -0500
 
 
  -- Joey Hess <joeyh@debian.org>  Mon, 03 Dec 2007 14:47:36 -0500
 

diff --git a/doc/plugins/edittemplate.mdwn b/doc/plugins/edittemplate.mdwn
index 6d889f5f18b2d09d88ee9494f9c1de2b113cd0e6..6963b71256e8af17d2db54ed510cfd2dc0c86408 100644 (file)
--- a/doc/plugins/edittemplate.mdwn
+++ b/doc/plugins/edittemplate.mdwn
@@ -5,11 +5,6 @@ This plugin allows registering template pages, that provide default
 content for new pages created using the web frontend. To register a
 template, insert a [[PreprocessorDirective]] on some other page.
 
 content for new pages created using the web frontend. To register a
 template, insert a [[PreprocessorDirective]] on some other page.
 

-       \[[edittemplate template="bugtemplate" match="bugs/*"]]
-
-In the above example, the page named "bugtemplate" is registered as a
-template to be used when any page named "bugs/*" is created.
-

 [[template id=note text="""
 Note: It's generally not a good idea to put the `edittemplate` directive in
 the template page itself, since the directive would then be included as
 [[template id=note text="""
 Note: It's generally not a good idea to put the `edittemplate` directive in
 the template page itself, since the directive would then be included as


@@ -18,6 +13,13 @@ as templates. If multiple pages are registered as templates for a new page,
 an arbitrary one is chosen, so that could get confusing.
 """]]
 
 an arbitrary one is chosen, so that could get confusing.
 """]]
 

+       \[[edittemplate template="bugtemplate" match="bugs/*"]]
+
+In the above example, the page named "bugtemplate" is registered as a
+template to be used when any page named "bugs/*" is created.
+
+----
+

 Often the template page contains a simple skeleton for a particular type of
 page. For the bug report pages in the above example, it might look
 something like:
 Often the template page contains a simple skeleton for a particular type of
 page. For the bug report pages in the above example, it might look
 something like: