fix meta date

[ikiwiki/events.git] / events.pm

diff --git a/events.pm b/events.pm
index e06e2ce..ff3a539 100644 (file)
--- 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 );
@@ -218,10 +219,13 @@ sub event_of_page ($%) {
                { class => "tag tag-$class"
                , link  => $link }
         } @tags;
+       my $base = IkiWiki::dirname($event);
+       $base =~ s/[^a-zA-Z0-9-]/_/g;
        return
         { hour => $hour
         , link => $link
-        , tags => \@tags };
+        , tags => \@tags
+        , base => $base };
  }
 sub events_of_pages ($%) {
        my ($pages, %params) = @_;
@@ -334,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>};
@@ -367,7 +371,7 @@ sub preprocess_day (@) {
                my @tags
                 = map {"<li\n class='".$_->{class}."'>".$_->{link}."</li>"}
                 @{$_->{tags}};
-               "<ul\n class='events'><li class='event'>"
+               "<ul\n class='events'><li class='event event-$_->{base}'>"
                 . "<span class='head'>"
                                 . (defined $_->{hour} ? "<span class='hour'>$_->{hour}</span>" : "")
                         . "<span class='link'>$_->{link}</span>"
@@ -436,7 +440,7 @@ sub preprocess_month (@) {
                        my @tags
                         = map {"<li\n class='".$_->{class}."'>".$_->{link}."</li>"}
                         @{$_->{tags}};
-                       "<li\n class='event'>"
+                       "<li\n class='event event-$_->{base}'>"
                         . "<span class='head'>"
                                 . (defined $_->{hour} ? "<span class='hour'>$_->{hour}</span>" : "")
                                 . "<span class='link'>$_->{link}</span>"
@@ -568,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);
  }