X-Git-Url: http://git.cyclocoop.org/?p=ikiwiki%2Fevents.git;a=blobdiff_plain;f=events.pm;h=ff3a539a80318b0b329d8a54590746faccc0f77a;hp=dd1ed3e66331a253e14b5f43bb7091a59c8b7786;hb=107b4ce19e6d602aeed3e58c28f27908752385de;hpb=3588bbe03f12e52e6f6619a2167742d05b18aa21

diff --git a/events.pm b/events.pm
index dd1ed3e..ff3a539 100644
--- a/events.pm
+++ b/events.pm
@@ -22,6 +22,7 @@ use warnings;
 use IkiWiki 3.00;
 use Time::Local;
 use DateTime;
+use CGI::FormBuilder;
 #use Data::Dumper;
 
 sub import {
@@ -206,7 +207,7 @@ sub event_of_page ($%) {
 		 = htmllink
 		 ( $params{page}
 		 , $params{destpage}
-		 , $tag
+		 , '/'.$tag
 		 , linktext => $title
 		 , noimageinline => 1
 		 , title => $title );
@@ -337,7 +338,7 @@ sub event_html ($$%) {
 					 ?(month => $month):())
 				 , (($date->year() or $date->month() or $date->day())
 					 ?(year => $date->year()):())
-				 , do    => 'events'
+				 , do    => 'newevent'
 				 , page  => $params{destpage}
 				 )
 			 . qq{' rel='nofollow'>+</a>};
@@ -571,7 +572,7 @@ sub preprocess (@) {
 # new
 sub tmpl ($$) {
 	my ($base, $model) = @_;
-	my $page = IkiWiki::dirname($base).'/'.'templates/'.$model;
+	my $page = $base.'/'.'templates/'.$model;
 	my $file = defined srcfile($page, 1) ? '/'.$page : $model;
 	return template($file);
  }