add cencel link to edit page

[ikiwiki.git] / ikiwiki

diff --git a/ikiwiki b/ikiwiki
index 0f6f250a0f015e0c70e30d60d509b0538900feb1..a6860f2486dc1bd197ac8a0ea073e30f14819c4e 100755 (executable)
--- a/ikiwiki
+++ b/ikiwiki
@@ -456,7 +456,8 @@ sub rcs_recentchanges ($) { #{{{
                                        $committype="svn";
                                }
                                
                                        $committype="svn";
                                }
                                

-                               push @ret, { rev => $rev, user => $user,
+                               push @ret, { rev => $rev,
+                                       user => htmllink("", $user, 1),

                                        committype => $committype,
                                        when => $when, message => [@message],
                                        pages => [@pages] } if @pages;
                                        committype => $committype,
                                        when => $when, message => [@message],
                                        pages => [@pages] } if @pages;


@@ -720,7 +721,7 @@ sub cgi_recentchanges ($) { #{{{
        print $q->header, $template->output;
 } #}}}
 
        print $q->header, $template->output;
 } #}}}
 

-sub userinfo_get ($$) { #{{
+sub userinfo_get ($$) { #{{{

        my $user=shift;
        my $field=shift;
 
        my $user=shift;
        my $field=shift;
 


@@ -731,9 +732,9 @@ sub userinfo_get ($$) { #{{
                return "";
        }
        return $userdata->{$user}->{$field};
                return "";
        }
        return $userdata->{$user}->{$field};

-} #}}
+} #}}}

 
 

-sub userinfo_set ($$) { #{{
+sub userinfo_set ($$) { #{{{

        my $user=shift;
        my $info=shift;
        
        my $user=shift;
        my $info=shift;
        


@@ -747,7 +748,7 @@ sub userinfo_set ($$) { #{{
        my $ret=Storable::lock_store($userdata, "$srcdir/.ikiwiki/userdb");
        umask($oldmask);
        return $ret;
        my $ret=Storable::lock_store($userdata, "$srcdir/.ikiwiki/userdb");
        umask($oldmask);
        return $ret;

-} #}}
+} #}}}

 
 sub cgi_signin ($$) { #{{{
        my $q=shift;
 
 sub cgi_signin ($$) { #{{{
        my $q=shift;


@@ -916,8 +917,10 @@ sub cgi_editpage ($$) { #{{{
                fields => [qw(do from page content comments)],
                header => 1,
                method => 'POST',
                fields => [qw(do from page content comments)],
                header => 1,
                method => 'POST',

-               validate => {},
-               required => [qw{}],
+               validate => {
+                       content => '/.+/',
+               },
+               required => [qw{content}],

                javascript => 0,
                params => $q,
                action => $q->request_uri,
                javascript => 0,
                params => $q,
                action => $q->request_uri,


@@ -939,6 +942,10 @@ sub cgi_editpage ($$) { #{{{
        $form->field(name => "content", type => "textarea", rows => 20,
                cols => 80);
        
        $form->field(name => "content", type => "textarea", rows => 20,
                cols => 80);
        

+       if ($form->submitted eq "Cancel") {
+               print $q->redirect("$url/".htmlpage($page));
+               return;
+       }

        if (! $form->submitted || ! $form->validate) {
                if ($form->field("do") eq "create") {
                        if (exists $pagesources{lc($page)}) {
        if (! $form->submitted || ! $form->validate) {
                if ($form->field("do") eq "create") {
                        if (exists $pagesources{lc($page)}) {


@@ -986,7 +993,7 @@ sub cgi_editpage ($$) { #{{{
                
                $form->tmpl_param("can_commit", $svn);
                $form->tmpl_param("indexlink", indexlink());
                
                $form->tmpl_param("can_commit", $svn);
                $form->tmpl_param("indexlink", indexlink());

-               print $form->render(submit => ["Save Page"]);
+               print $form->render(submit => ["Save Page", "Cancel"]);

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