]> git.vanrenterghem.biz Git - git.ikiwiki.info.git/blobdiff - IkiWiki/Plugin/calendar.pm
calendar: use left and right arrows for next/prev months
[git.ikiwiki.info.git] / IkiWiki / Plugin / calendar.pm
index fe7ee03611b9cb91952874a842a4858129cfca63..dcf2b6d641abd309428ddd231dfcefe5907faaa3 100644 (file)
@@ -71,7 +71,6 @@ sub format_month (@) {
                                # month calendar when pages are added/removed
                                deptype => deptype("presence"))) {
                my $mtime = $IkiWiki::pagectime{$p};
-               my $src   = $pagesources{$p};
                my @date  = localtime($mtime);
                my $mday  = $date[3];
                my $month = $date[4] + 1;
@@ -79,10 +78,28 @@ sub format_month (@) {
                my $mtag  = sprintf("%02d", $month);
 
                # Only one posting per day is being linked to.
-               $linkcache{"$year/$mtag/$mday"} = "$src";
+               $linkcache{"$year/$mtag/$mday"} = $p;
        }
+               
+       my $pmonth = $params{month} - 1;
+       my $nmonth = $params{month} + 1;
+       my $pyear  = $params{year};
+       my $nyear  = $params{year};
+
+       # Adjust for January and December
+       if ($params{month} == 1) {
+               $pmonth = 12;
+               $pyear--;
+       }
+       if ($params{month} == 12) {
+               $nmonth = 1;
+               $nyear++;
+       }
+
+       # Add padding.
+       $pmonth=sprintf("%02d", $pmonth);
+       $nmonth=sprintf("%02d", $nmonth);
 
-       my @list;
        my $calendar="\n";
 
        # When did this month start?
@@ -97,8 +114,8 @@ sub format_month (@) {
 
        # Find out month names for this, next, and previous months
        my $monthname=POSIX::strftime("%B", @monthstart);
-       my $pmonthname=POSIX::strftime("%B", localtime(timelocal(0,0,0,1,$params{pmonth}-1,$params{pyear}-1900)));
-       my $nmonthname=POSIX::strftime("%B", localtime(timelocal(0,0,0,1,$params{nmonth}-1,$params{nyear}-1900)));
+       my $pmonthname=POSIX::strftime("%B", localtime(timelocal(0,0,0,1,$pmonth-1,$pyear-1900)));
+       my $nmonthname=POSIX::strftime("%B", localtime(timelocal(0,0,0,1,$nmonth-1,$nyear-1900)));
 
        my $archivebase = 'archives';
        $archivebase = $config{archivebase} if defined $config{archivebase};
@@ -108,24 +125,24 @@ sub format_month (@) {
        my ($url, $purl, $nurl)=("$monthname",'','');
        if (exists $pagesources{"$archivebase/$params{year}/$params{month}"}) {
                $url = htmllink($params{page}, $params{destpage}, 
-                       "$archivebase/$params{year}/".sprintf("%02d", $params{month}),
+                       "$archivebase/$params{year}/".$params{month},
                        linktext => " $monthname ");
        }
-       add_depends($params{page}, "$archivebase/$params{year}/".sprintf("%02d", $params{month}),
+       add_depends($params{page}, "$archivebase/$params{year}/$params{month}",
                deptype("presence"));
-       if (exists $pagesources{"$archivebase/$params{pyear}/$params{pmonth}"}) {
+       if (exists $pagesources{"$archivebase/$pyear/$pmonth"}) {
                $purl = htmllink($params{page}, $params{destpage}, 
-                       "$archivebase/$params{pyear}/" . sprintf("%02d", $params{pmonth}),
-                       linktext => " $pmonthname ");
+                       "$archivebase/$pyear/$pmonth",
+                       linktext => " \&larr ");
        }
-       add_depends($params{page}, "$archivebase/$params{pyear}/".sprintf("%02d", $params{pmonth}),
+       add_depends($params{page}, "$archivebase/$pyear/$pmonth",
                deptype("presence"));
-       if (exists $pagesources{"$archivebase/$params{nyear}/$params{nmonth}"}) {
+       if (exists $pagesources{"$archivebase/$nyear/$nmonth"}) {
                $nurl = htmllink($params{page}, $params{destpage}, 
-                       "$archivebase/$params{nyear}/" . sprintf("%02d", $params{nmonth}),
-                       linktext => " $nmonthname ");
+                       "$archivebase/$nyear/$nmonth",
+                       linktext => " \&rarr ");
        }
-       add_depends($params{page}, "$archivebase/$params{nyear}/".sprintf("%02d", $params{nmonth}),
+       add_depends($params{page}, "$archivebase/$nyear/$nmonth",
                deptype("presence"));
 
        # Start producing the month calendar
@@ -179,8 +196,7 @@ EOF
                }
                
                my $tag;
-               my $mtag = sprintf("%02d", $params{month});
-               if (defined $pagesources{"$archivebase/$params{year}/$mtag/$day"}) {
+               if (defined $linkcache{"$params{year}/$params{month}/$day"}) {
                        if ($day == $today) {
                                $tag='month-calendar-day-this-day';
                        }
@@ -189,9 +205,8 @@ EOF
                        }
                        $calendar.=qq{\t\t<td class="$tag $downame{$wday}">};
                        $calendar.=htmllink($params{page}, $params{destpage}, 
-                                           pagename($linkcache{"$params{year}/$mtag/$day"}),
+                                           $linkcache{"$params{year}/$params{month}/$day"},
                                            "linktext" => "$day");
-                       push @list, pagename($linkcache{"$params{year}/$mtag/$day"});
                        $calendar.=qq{</td>\n};
                }
                else {
@@ -222,8 +237,11 @@ EOF
 
 sub format_year (@) {
        my %params=@_;
-
+               
        my $calendar="\n";
+       
+       my $pyear = $params{year}  - 1;
+       my $nyear = $params{year}  + 1;
 
        my $future_month = 0;
        $future_month = $now[4]+1 if ($params{year} == $now[5]+1900);
@@ -240,18 +258,18 @@ sub format_year (@) {
                        linktext => "$params{year}");
        }
        add_depends($params{page}, "$archivebase/$params{year}", deptype("presence"));
-       if (exists $pagesources{"$archivebase/$params{pyear}"}) {
+       if (exists $pagesources{"$archivebase/$pyear"}) {
                $purl = htmllink($params{page}, $params{destpage}, 
-                       "$archivebase/$params{pyear}",
+                       "$archivebase/$pyear",
                        linktext => "\&larr;");
        }
-       add_depends($params{page}, "$archivebase/$params{pyear}", deptype("presence"));
-       if (exists $pagesources{"$archivebase/$params{nyear}"}) {
+       add_depends($params{page}, "$archivebase/$pyear", deptype("presence"));
+       if (exists $pagesources{"$archivebase/$nyear"}) {
                $nurl = htmllink($params{page}, $params{destpage}, 
-                       "$archivebase/$params{nyear}",
+                       "$archivebase/$nyear",
                        linktext => "\&rarr;");
        }
-       add_depends($params{page}, "$archivebase/$params{nyear}", deptype("presence"));
+       add_depends($params{page}, "$archivebase/$nyear", deptype("presence"));
 
        # Start producing the year calendar
        $calendar=<<EOF;
@@ -318,48 +336,57 @@ EOF
 
 sub preprocess (@) {
        my %params=@_;
+
+       my $thisyear=1900 + $now[5];
+       my $thismonth=1 + $now[4];
+
        $params{pages} = "*"            unless defined $params{pages};
        $params{type}  = "month"        unless defined $params{type};
-       $params{month} = sprintf("%02d", $params{month}) if defined  $params{month};
        $params{week_start_day} = 0     unless defined $params{week_start_day};
        $params{months_per_row} = 3     unless defined $params{months_per_row};
-
-       if (! defined $params{year} || ! defined $params{month}) {
-               # Record that the calendar next changes at midnight.
+       $params{year}  = $thisyear      unless defined $params{year};
+       $params{month} = $thismonth     unless defined $params{month};
+
+       $params{month} = sprintf("%02d", $params{month});
+                       
+       if ($params{type} eq 'month' && $params{year} == $thisyear
+           && $params{month} == $thismonth) {
+               # calendar for current month, updates next midnight
                $pagestate{$params{destpage}}{calendar}{nextchange}=($time
                        + (60 - $now[0])                # seconds
                        + (59 - $now[1]) * 60           # minutes
                        + (23 - $now[2]) * 60 * 60      # hours
                );
-               
-               $params{year}  = 1900 + $now[5] unless defined $params{year};
-               $params{month} = 1    + $now[4] unless defined $params{month};
+       }
+       elsif ($params{type} eq 'month' &&
+              (($params{year} == $thisyear && $params{month} > $thismonth) ||
+               $params{year} > $thisyear)) {
+               # calendar for upcoming month, updates 1st of that month
+               $pagestate{$params{destpage}}{calendar}{nextchange}=
+                       timelocal(0, 0, 0, 1, $params{month}-1, $params{year});
+       }
+       elsif ($params{type} eq 'year' && $params{year} == $thisyear) {
+               # calendar for current year, updates 1st of next month
+               $pagestate{$params{destpage}}{calendar}{nextchange}=
+                       timelocal(0, 0, 0, 1, $thismonth+1-1, $params{year});
+       }
+       elsif ($params{type} eq 'year' && $params{year} > $thisyear) {
+               # calendar for upcoming year, updates 1st of that year
+               $pagestate{$params{destpage}}{calendar}{nextchange}=
+                       timelocal(0, 0, 0, 1, 1-1, $params{year});
        }
        else {
+               # calendar for past month or year, does not need
+               # to update any more
                delete $pagestate{$params{destpage}}{calendar};
        }
 
        # Calculate month names for next month, and previous months
-       $params{pmonth} = $params{month} - 1;
-       $params{nmonth} = $params{month} + 1;
-       $params{pyear}  = $params{year}  - 1;
-       $params{nyear}  = $params{year}  + 1;
-
-       # Adjust for January and December
-       if ($params{month} == 1) {
-               $params{pmonth} = 12;
-               $params{pyear}--;
-       }
-       if ($params{month} == 12) {
-               $params{nmonth} = 1;
-               $params{nyear}++;
-       }
-
        my $calendar="";
-       if ($params{type} =~ /month/i) {
+       if ($params{type} eq 'month') {
                $calendar=format_month(%params);
        }
-       elsif ($params{type} =~ /year/i) {
+       elsif ($params{type} eq 'year') {
                $calendar=format_year(%params);
        }