X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/188f1931c2a2fec7c5737985d5e6fb7a05f8ed04..ffae58a97865d24796826f4b4ff9da82aef93116:/IkiWiki/CGI.pm?ds=inline

diff --git a/IkiWiki/CGI.pm b/IkiWiki/CGI.pm
index acf1f5969..d92bdd330 100644
--- a/IkiWiki/CGI.pm
+++ b/IkiWiki/CGI.pm
@@ -137,6 +137,7 @@ sub cgi_signin ($$) { #{{{
 	error($@) if $@;
 	my $form = CGI::FormBuilder->new(
 		title => "signin",
+		name => "signin",
 		header => 1,
 		charset => "utf-8",
 		method => 'POST',
@@ -145,7 +146,7 @@ sub cgi_signin ($$) { #{{{
 		params => $q,
 		action => $config{cgiurl},
 		header => 0,
-		template => scalar template_params("signin.tmpl"),
+		template => {type => 'div'},
 		stylesheet => baseurl()."style.css",
 	);
 	my $buttons=["Login"];
@@ -206,6 +207,7 @@ sub cgi_prefs ($$) { #{{{
 	error($@) if $@;
 	my $form = CGI::FormBuilder->new(
 		title => "preferences",
+		name => "preferences",
 		header => 0,
 		charset => "utf-8",
 		method => 'POST',
@@ -216,8 +218,13 @@ sub cgi_prefs ($$) { #{{{
 		javascript => 0,
 		params => $q,
 		action => $config{cgiurl},
-		template => scalar template_params("prefs.tmpl"),
+		template => {type => 'div'},
 		stylesheet => baseurl()."style.css",
+		fieldsets => [
+			[login => gettext("Login")],
+			[preferences => gettext("Preferences")],
+			[admin => gettext("Admin")]
+		],
 	);
 	my $buttons=["Save Preferences", "Logout", "Cancel"];
 
@@ -226,10 +233,12 @@ sub cgi_prefs ($$) { #{{{
 	});
 	
 	$form->field(name => "do", type => "hidden");
-	$form->field(name => "email", size => 50);
+	$form->field(name => "email", size => 50, fieldset => "preferences");
 	$form->field(name => "subscriptions", size => 50,
+		fieldset => "preferences",
 		comment => "(".htmllink("", "", "PageSpec", noimageinline => 1).")");
-	$form->field(name => "banned_users", size => 50);
+	$form->field(name => "banned_users", size => 50,
+		fieldset => "admin");
 	
 	my $user_name=$session->param("name");
 	if (! is_admin($user_name)) {
@@ -309,6 +318,7 @@ sub cgi_editpage ($$) { #{{{
 		action => $config{cgiurl},
 		table => 0,
 		template => scalar template_params("editpage.tmpl"),
+		wikiname => $config{wikiname},
 	);
 	
 	run_hooks(formbuilder_setup => sub {
@@ -497,6 +507,21 @@ sub cgi_editpage ($$) { #{{{
 			print $form->render(submit => \@buttons);
 			return;
 		}
+		elsif (-e "$config{srcdir}/$file" &&
+		       $form->field("do") eq "create") {
+			$form->tmpl_param("creation_conflict", 1);
+			$form->field(name => "do", value => "edit", force => 1);
+			$form->tmpl_param("page_select", 0);
+			$form->field(name => "page", type => 'hidden');
+			$form->field(name => "type", type => 'hidden');
+			$form->title(sprintf(gettext("editing %s"), $page));
+			$form->field("editcontent", 
+				value => readfile("$config{srcdir}/$file").
+				         "\n\n\n".$form->field("editcontent"),
+				force => 1);
+			print $form->render(submit => \@buttons);
+			return;
+		}
 		
 		my $content=$form->field('editcontent');