web commit by http://solair.livejournal.com/

[ikiwiki.git] / IkiWiki / CGI.pm

diff --git a/IkiWiki/CGI.pm b/IkiWiki/CGI.pm
index d92bdd3301eccab36b1d2ca8cab4c61db19c3028..9fc65e34a0930fa9c9b6d704a695e87ecb63950c 100644 (file)
--- a/IkiWiki/CGI.pm
+++ b/IkiWiki/CGI.pm
@@ -316,6 +316,7 @@ sub cgi_editpage ($$) { #{{{
                javascript => 0,
                params => $q,
                action => $config{cgiurl},
                javascript => 0,
                params => $q,
                action => $config{cgiurl},

+               header => 0,

                table => 0,
                template => scalar template_params("editpage.tmpl"),
                wikiname => $config{wikiname},
                table => 0,
                template => scalar template_params("editpage.tmpl"),
                wikiname => $config{wikiname},


@@ -401,7 +402,7 @@ sub cgi_editpage ($$) { #{{{
                        htmlize($page, $type,
                        linkify($page, "",
                        preprocess($page, $page,
                        htmlize($page, $type,
                        linkify($page, "",
                        preprocess($page, $page,

-                       filter($page, $form->field('editcontent')), 0, 1))));
+                       filter($page, $page, $form->field('editcontent')), 0, 1))));

        }
        else {
                $form->tmpl_param("page_preview", "");
        }
        else {
                $form->tmpl_param("page_preview", "");


@@ -472,6 +473,7 @@ sub cgi_editpage ($$) { #{{{
                        $form->field(name => "type", type => 'select',
                                options => \@page_types);
                        $form->title(sprintf(gettext("creating %s"), pagetitle($page)));
                        $form->field(name => "type", type => 'select',
                                options => \@page_types);
                        $form->title(sprintf(gettext("creating %s"), pagetitle($page)));

+                       

                }
                elsif ($form->field("do") eq "edit") {
                        check_canedit($page, $q, $session);
                }
                elsif ($form->field("do") eq "edit") {
                        check_canedit($page, $q, $session);


@@ -491,7 +493,8 @@ sub cgi_editpage ($$) { #{{{
                        $form->title(sprintf(gettext("editing %s"), pagetitle($page)));
                }
                
                        $form->title(sprintf(gettext("editing %s"), pagetitle($page)));
                }
                

-               print $form->render(submit => \@buttons);
+               printheader($session);
+               print misctemplate($form->title, $form->render(submit => \@buttons));

        }
        else {
                # save page
        }
        else {
                # save page


@@ -504,7 +507,8 @@ sub cgi_editpage ($$) { #{{{
                        $form->field(name => "page", type => 'hidden');
                        $form->field(name => "type", type => 'hidden');
                        $form->title(sprintf(gettext("editing %s"), $page));
                        $form->field(name => "page", type => 'hidden');
                        $form->field(name => "type", type => 'hidden');
                        $form->title(sprintf(gettext("editing %s"), $page));

-                       print $form->render(submit => \@buttons);
+                       printheader($session);
+                       print misctemplate($form->title, $form->render(submit => \@buttons));

                        return;
                }
                elsif (-e "$config{srcdir}/$file" &&
                        return;
                }
                elsif (-e "$config{srcdir}/$file" &&


@@ -519,7 +523,8 @@ sub cgi_editpage ($$) { #{{{
                                value => readfile("$config{srcdir}/$file").
                                         "\n\n\n".$form->field("editcontent"),
                                force => 1);
                                value => readfile("$config{srcdir}/$file").
                                         "\n\n\n".$form->field("editcontent"),
                                force => 1);

-                       print $form->render(submit => \@buttons);
+                       printheader($session);
+                       print misctemplate($form->title, $form->render(submit => \@buttons));

                        return;
                }
                
                        return;
                }
                


@@ -541,7 +546,8 @@ sub cgi_editpage ($$) { #{{{
                        $form->field(name => "page", type => 'hidden');
                        $form->field(name => "type", type => 'hidden');
                        $form->title(sprintf(gettext("editing %s"), $page));
                        $form->field(name => "page", type => 'hidden');
                        $form->field(name => "type", type => 'hidden');
                        $form->title(sprintf(gettext("editing %s"), $page));

-                       print $form->render(submit => \@buttons);
+                       printheader($session);
+                       print misctemplate($form->title, $form->render(submit => \@buttons));

                        return;
                }
                
                        return;
                }
                


@@ -585,7 +591,8 @@ sub cgi_editpage ($$) { #{{{
                        $form->field(name => "page", type => 'hidden');
                        $form->field(name => "type", type => 'hidden');
                        $form->title(sprintf(gettext("editing %s"), $page));
                        $form->field(name => "page", type => 'hidden');
                        $form->field(name => "type", type => 'hidden');
                        $form->title(sprintf(gettext("editing %s"), $page));

-                       print $form->render(submit => \@buttons);
+                       printheader($session);
+                       print misctemplate($form->title, $form->render(submit => \@buttons));

                        return;
                }
                else {
                        return;
                }
                else {