response

[git.ikiwiki.info.git] / IkiWiki / CGI.pm

diff --git a/IkiWiki/CGI.pm b/IkiWiki/CGI.pm
index 4c15be0aeecb09221d27863ceb580d55f759d66e..120e2fdee7dad588a027f6ef0264d995714e4a5b 100644 (file)
--- a/IkiWiki/CGI.pm
+++ b/IkiWiki/CGI.pm
@@ -70,8 +70,7 @@ sub cgi_recentchanges ($) { #{{{
                indexlink => indexlink(),
                wikiname => $config{wikiname},
                changelog => [rcs_recentchanges(100)],
                indexlink => indexlink(),
                wikiname => $config{wikiname},
                changelog => [rcs_recentchanges(100)],

-               styleurl => styleurl(),
-               baseurl => "$config{url}/",
+               baseurl => baseurl(),

        );
        print $q->header(-charset=>'utf-8'), $template->output;
 } #}}}
        );
        print $q->header(-charset=>'utf-8'), $template->output;
 } #}}}


@@ -100,7 +99,7 @@ sub cgi_signin ($$) { #{{{
                header => 0,
                template => (-e "$config{templatedir}/signin.tmpl" ?
                             {template_params("signin.tmpl")} : ""),
                header => 0,
                template => (-e "$config{templatedir}/signin.tmpl" ?
                             {template_params("signin.tmpl")} : ""),

-               stylesheet => styleurl(),
+               stylesheet => baseurl()."style.css",

        );
                
        decode_form_utf8($form);
        );
                
        decode_form_utf8($form);


@@ -267,7 +266,7 @@ sub cgi_prefs ($$) { #{{{
                action => $config{cgiurl},
                template => (-e "$config{templatedir}/prefs.tmpl" ?
                             {template_params("prefs.tmpl")} : ""),
                action => $config{cgiurl},
                template => (-e "$config{templatedir}/prefs.tmpl" ?
                             {template_params("prefs.tmpl")} : ""),

-               stylesheet => styleurl(),
+               stylesheet => baseurl()."style.css",

        );
        my @buttons=("Save Preferences", "Logout", "Cancel");
        
        );
        my @buttons=("Save Preferences", "Logout", "Cancel");
        


@@ -394,8 +393,7 @@ sub cgi_editpage ($$) { #{{{
        $form->tmpl_param("indexlink", indexlink());
        $form->tmpl_param("helponformattinglink",
                htmllink("", "", "HelpOnFormatting", 1));
        $form->tmpl_param("indexlink", indexlink());
        $form->tmpl_param("helponformattinglink",
                htmllink("", "", "HelpOnFormatting", 1));

-       $form->tmpl_param("styleurl", styleurl());
-       $form->tmpl_param("baseurl", "$config{url}/");
+       $form->tmpl_param("baseurl", baseurl());

        if (! $form->submitted) {
                $form->field(name => "rcsinfo", value => rcs_prepedit($file),
                        force => 1);
        if (! $form->submitted) {
                $form->field(name => "rcsinfo", value => rcs_prepedit($file),
                        force => 1);


@@ -413,8 +411,12 @@ sub cgi_editpage ($$) { #{{{
                                value => $content, force => 1);
                $form->field(name => "comments",
                                value => $comments, force => 1);
                                value => $content, force => 1);
                $form->field(name => "comments",
                                value => $comments, force => 1);

+               $config{rss}=0; # avoid preview writing an rss feed!

                $form->tmpl_param("page_preview",
                $form->tmpl_param("page_preview",

-                       htmlize($type, linkify($page, $page, filter($page, $content))));
+                       htmlize($type,
+                       linkify($page, "",
+                       preprocess($page, $page,
+                       filter($page, $content)))));

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