table: Support header=column to make the table header be the first column of the...

[git.ikiwiki.info.git] / IkiWiki / Plugin / edittemplate.pm

diff --git a/IkiWiki/Plugin/edittemplate.pm b/IkiWiki/Plugin/edittemplate.pm
index b7651ce02b3c71ac96b4a561f3ef5e22738a6a5b..98308de135ba42c6efc5d574b261d51cc5f18e29 100644 (file)
--- a/IkiWiki/Plugin/edittemplate.pm
+++ b/IkiWiki/Plugin/edittemplate.pm
@@ -8,6 +8,8 @@ use HTML::Template;
 use Encode;
 
 sub import { #{{{
 use Encode;
 
 sub import { #{{{

+       hook(type => "getsetup", id => "edittemplate",
+               call => \&getsetup);

        hook(type => "needsbuild", id => "edittemplate",
                call => \&needsbuild);
        hook(type => "preprocess", id => "edittemplate",
        hook(type => "needsbuild", id => "edittemplate",
                call => \&needsbuild);
        hook(type => "preprocess", id => "edittemplate",


@@ -16,6 +18,14 @@ sub import { #{{{
                call => \&formbuilder);
 } #}}}
 
                call => \&formbuilder);
 } #}}}
 

+sub getsetup () { #{{{
+       return
+               plugin => {
+                       safe => 1,
+                       rebuild => undef,
+               },
+} #}}}
+

 sub needsbuild (@) { #{{{
        my $needsbuild=shift;
 
 sub needsbuild (@) { #{{{
        my $needsbuild=shift;
 


@@ -38,10 +48,10 @@ sub preprocess (@) { #{{{
        return "" if $params{page} ne $params{destpage};
 
        if (! exists $params{template} || ! length($params{template})) {
        return "" if $params{page} ne $params{destpage};
 
        if (! exists $params{template} || ! length($params{template})) {

-               return return "[[meta ".gettext("template not specified")."]]";
+               error gettext("template not specified")

        }
        if (! exists $params{match} || ! length($params{match})) {
        }
        if (! exists $params{match} || ! length($params{match})) {

-               return return "[[meta ".gettext("match not specified")."]]";
+               error gettext("match not specified")

        }
 
        $pagestate{$params{page}}{edittemplate}{$params{match}}=$params{template};
        }
 
        $pagestate{$params{page}}{edittemplate}{$params{match}}=$params{template};


@@ -54,7 +64,9 @@ sub formbuilder (@) { #{{{
        my %params=@_;
        my $form=$params{form};
 
        my %params=@_;
        my $form=$params{form};
 

-       return if $form->field("do") ne "create";
+       return if $form->field("do") ne "create" ||
+               length $form->field("editcontent");
+       

        my $page=$form->field("page");
        
        # The tricky bit here is that $page is probably just the base
        my $page=$form->field("page");
        
        # The tricky bit here is that $page is probably just the base


@@ -108,7 +120,9 @@ sub filltemplate ($$) { #{{{
                );
        };
        if ($@) {
                );
        };
        if ($@) {

-               return "[[pagetemplate ".gettext("failed to process")." $@]]";
+               # Indicate that the earlier preprocessor directive set 
+               # up a template that doesn't work.
+               return "[[!pagetemplate ".gettext("failed to process")." $@]]";

        }
 
        $template->param(name => $page);
        }
 
        $template->param(name => $page);