use strict;
use IkiWiki 3.00;
use Time::Local;
-use POSIX;
+use POSIX ();
my $time=time;
my @now=localtime($time);
plugin => {
safe => 1,
rebuild => undef,
+ section => "widget",
},
archivebase => {
type => "string",
safe => 1,
rebuild => 1,
},
+ archive_pagespec => {
+ type => "pagespec",
+ example => "posts/* and !*/Discussion",
+ description => "PageSpec of pages to include in the archives; used by ikiwiki-calendar command",
+ link => 'ikiwiki/PageSpec',
+ safe => 1,
+ rebuild => 0,
+ },
}
sub is_leap_year (@) {
$archivebase = $params{archivebase} if defined $params{archivebase};
# Calculate URL's for monthly archives.
- my ($url, $purl, $nurl)=("$monthname",'','');
+ my ($url, $purl, $nurl)=("$monthname $params{year}",'','');
if (exists $pagesources{"$archivebase/$params{year}/$params{month}"}) {
$url = htmllink($params{page}, $params{destpage},
"$archivebase/$params{year}/".$params{month},
noimageinline => 1,
- linktext => " $monthname ");
+ linktext => "$monthname $params{year}",
+ title => $monthname);
}
add_depends($params{page}, "$archivebase/$params{year}/$params{month}",
deptype("presence"));
$purl = htmllink($params{page}, $params{destpage},
"$archivebase/$pyear/$pmonth",
noimageinline => 1,
- linktext => "\&larr");
+ linktext => "\←",
+ title => $pmonthname);
}
add_depends($params{page}, "$archivebase/$pyear/$pmonth",
deptype("presence"));
$nurl = htmllink($params{page}, $params{destpage},
"$archivebase/$nyear/$nmonth",
noimageinline => 1,
- linktext => "\&rarr");
+ linktext => "\→",
+ title => $nmonthname);
}
add_depends($params{page}, "$archivebase/$nyear/$nmonth",
deptype("presence"));
# Start producing the month calendar
$calendar=<<EOF;
<table class="month-calendar">
- <caption class="month-calendar-head">
- $purl
- $url
- $nurl
- </caption>
+ <tr>
+ <th class="month-calendar-arrow">$purl</th>
+ <th class="month-calendar-head" colspan="5">$url</th>
+ <th class="month-calendar-arrow">$nurl</th>
+ </tr>
<tr>
EOF
my $dowabbr = POSIX::strftime("%a", @day);
$downame{$dow % 7}=$downame;
$dowabbr{$dow % 7}=$dowabbr;
- $calendar.= qq{\t\t<th class="month-calendar-day-head $downame">$dowabbr</th>\n};
+ $calendar.= qq{\t\t<th class="month-calendar-day-head $downame" title="$downame">$dowabbr</th>\n};
}
$calendar.=<<EOF;
# nothing has been printed, or else we are in the middle of a row.
for (my $day = 1; $day <= month_days(year => $params{year}, month => $params{month});
$day++, $wday++, $wday %= 7) {
- # At tihs point, on a week_start_day, we close out a row,
+ # At this point, on a week_start_day, we close out a row,
# and start a new one -- unless it is week_start_day on the
# first, where we do not close a row -- since none was started.
if ($wday == $week_start_day) {
}
my $tag;
- if (defined $linkcache{"$params{year}/$params{month}/$day"}) {
+ my $key="$params{year}/$params{month}/$day";
+ if (defined $linkcache{$key}) {
if ($day == $today) {
$tag='month-calendar-day-this-day';
}
}
$calendar.=qq{\t\t<td class="$tag $downame{$wday}">};
$calendar.=htmllink($params{page}, $params{destpage},
- $linkcache{"$params{year}/$params{month}/$day"},
+ $linkcache{$key},
noimageinline => 1,
- "linktext" => "$day");
+ linktext => $day,
+ title => pagetitle(IkiWiki::basename($linkcache{$key})));
$calendar.=qq{</td>\n};
}
else {
my $pyear = $params{year} - 1;
my $nyear = $params{year} + 1;
+ my $thisyear = $now[5]+1900;
my $future_month = 0;
- $future_month = $now[4]+1 if ($params{year} == $now[5]+1900);
+ $future_month = $now[4]+1 if $params{year} == $thisyear;
my $archivebase = 'archives';
$archivebase = $config{archivebase} if defined $config{archivebase};
$url = htmllink($params{page}, $params{destpage},
"$archivebase/$params{year}",
noimageinline => 1,
- linktext => "$params{year}");
+ linktext => $params{year},
+ title => $params{year});
}
add_depends($params{page}, "$archivebase/$params{year}", deptype("presence"));
if (exists $pagesources{"$archivebase/$pyear"}) {
$purl = htmllink($params{page}, $params{destpage},
"$archivebase/$pyear",
noimageinline => 1,
- linktext => "\←");
+ linktext => "\←",
+ title => $pyear);
}
add_depends($params{page}, "$archivebase/$pyear", deptype("presence"));
if (exists $pagesources{"$archivebase/$nyear"}) {
$nurl = htmllink($params{page}, $params{destpage},
"$archivebase/$nyear",
noimageinline => 1,
- linktext => "\→");
+ linktext => "\→",
+ title => $nyear);
}
add_depends($params{page}, "$archivebase/$nyear", deptype("presence"));
# Start producing the year calendar
+ my $m=$params{months_per_row}-2;
$calendar=<<EOF;
<table class="year-calendar">
- <caption class="year-calendar-head">
- $purl
- $url
- $nurl
- </caption>
+ <tr>
+ <th class="year-calendar-arrow">$purl</th>
+ <th class="year-calendar-head" colspan="$m">$url</th>
+ <th class="year-calendar-arrow">$nurl</th>
+ </tr>
<tr>
<th class="year-calendar-subhead" colspan="$params{months_per_row}">Months</th>
</tr>
$calendar.=qq{\t<tr>\n} if ($month % $params{months_per_row} == 1);
my $tag;
my $mtag=sprintf("%02d", $month);
- if ($month == $params{month}) {
+ if ($month == $params{month} && $thisyear == $params{year}) {
$tag = 'year-calendar-this-month';
}
elsif ($pagesources{"$archivebase/$params{year}/$mtag"}) {
$murl = htmllink($params{page}, $params{destpage},
"$archivebase/$params{year}/$mtag",
noimageinline => 1,
- linktext => "$monthabbr");
+ linktext => $monthabbr,
+ title => $monthname);
$calendar.=qq{\t<td class="$tag">};
$calendar.=$murl;
$calendar.=qq{\t</td>\n};
return $calendar;
}
+sub setnextchange ($$) {
+ my $page=shift;
+ my $timestamp=shift;
+
+ if (! exists $pagestate{$page}{calendar}{nextchange} ||
+ $pagestate{$page}{calendar}{nextchange} > $timestamp) {
+ $pagestate{$page}{calendar}{nextchange}=$timestamp;
+ }
+}
+
sub preprocess (@) {
my %params=@_;
$params{year} = $thisyear unless defined $params{year};
$params{month} = $thismonth unless defined $params{month};
+ my $relativeyear=0;
+ if ($params{year} < 1) {
+ $relativeyear=1;
+ $params{year}=$thisyear+$params{year};
+ }
+ my $relativemonth=0;
+ if ($params{month} < 1) {
+ $relativemonth=1;
+ my $monthoff=$params{month};
+ $params{month}=($thismonth+$monthoff) % 12;
+ $params{month}=12 if $params{month}==0;
+ my $yearoff=POSIX::ceil(($thismonth-$params{month}) / -12)
+ - int($monthoff / 12);
+ $params{year}-=$yearoff;
+ }
+
$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
+ setnextchange($params{destpage}, ($time
+ (60 - $now[0]) # seconds
+ (59 - $now[1]) * 60 # minutes
+ (23 - $now[2]) * 60 * 60 # hours
- );
+ ));
}
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});
+ setnextchange($params{destpage},
+ timelocal(0, 0, 0, 1, $params{month}-1, $params{year}));
+ }
+ elsif (($params{type} eq 'year' && $params{year} == $thisyear) ||
+ $relativemonth) {
+ # Calendar for current year updates 1st of next month.
+ # Any calendar relative to the current month also updates
+ # then.
+ if ($thismonth < 12) {
+ setnextchange($params{destpage},
+ timelocal(0, 0, 0, 1, $thismonth+1-1, $params{year}));
+ }
+ else {
+ setnextchange($params{destpage},
+ timelocal(0, 0, 0, 1, 1-1, $params{year}+1));
+ }
}
- 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 ($relativeyear) {
+ # Any calendar relative to the current year updates 1st
+ # of next year.
+ setnextchange($params{destpage},
+ timelocal(0, 0, 0, 1, 1-1, $thisyear+1));
}
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});
+ setnextchange($params{destpage},
+ timelocal(0, 0, 0, 1, 1-1, $params{year}));
}
else {
# calendar for past month or year, does not need
delete $pagestate{$params{destpage}}{calendar};
}
- # Calculate month names for next month, and previous months
my $calendar="";
if ($params{type} eq 'month') {
$calendar=format_month(%params);