X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/34fff64e7b56f4f8cd99430f9f927d2a5d1e3619..67e778f461ed0f5da0a109573b57d9f1022bcf9e:/IkiWiki/Plugin/calendar.pm

diff --git a/IkiWiki/Plugin/calendar.pm b/IkiWiki/Plugin/calendar.pm
index aaee2c610..682bfb6fb 100644
--- a/IkiWiki/Plugin/calendar.pm
+++ b/IkiWiki/Plugin/calendar.pm
@@ -13,7 +13,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 
 require 5.002;
 package IkiWiki::Plugin::calendar;
@@ -22,7 +22,6 @@ use warnings;
 use strict;
 use IkiWiki 3.00;
 use Time::Local;
-use POSIX;
 
 my $time=time;
 my @now=localtime($time);
@@ -47,6 +46,14 @@ sub getsetup () {
 			safe => 1,
 			rebuild => 1,
 		},
+		archive_pagespec => {
+			type => "pagespec",
+			example => "page(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 (@) {
@@ -79,8 +86,10 @@ sub format_month (@) {
 		my $year  = $date[5] + 1900;
 		my $mtag  = sprintf("%02d", $month);
 
-		# Only one posting per day is being linked to.
-		$linkcache{"$year/$mtag/$mday"} = $p;
+		if (! $linkcache{"$year/$mtag/$mday"}) {
+			$linkcache{"$year/$mtag/$mday"} = [];
+		}
+		push(@{$linkcache{"$year/$mtag/$mday"}}, $p);
 	}
 		
 	my $pmonth = $params{month} - 1;
@@ -115,21 +124,22 @@ 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,$pmonth-1,$pyear-1900)));
-	my $nmonthname=POSIX::strftime("%B", localtime(timelocal(0,0,0,1,$nmonth-1,$nyear-1900)));
+	my $monthabbrev=strftime_utf8("%b", @monthstart);
+	my $monthname=strftime_utf8("%B", @monthstart);
+	my $pmonthname=strftime_utf8("%B", localtime(timelocal(0,0,0,1,$pmonth-1,$pyear-1900)));
+	my $nmonthname=strftime_utf8("%B", localtime(timelocal(0,0,0,1,$nmonth-1,$nyear-1900)));
 
 	my $archivebase = 'archives';
 	$archivebase = $config{archivebase} if defined $config{archivebase};
 	$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 => "$monthabbrev $params{year}",
 			title => $monthname);
 	}
 	add_depends($params{page}, "$archivebase/$params{year}/$params{month}",
@@ -156,11 +166,11 @@ sub format_month (@) {
 	# 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
 
@@ -173,8 +183,8 @@ EOF
 	my %dowabbr;
 	for my $dow ($week_start_day..$week_start_day+6) {
 		my @day=localtime(timelocal(0,0,0,$start_day++,$params{month}-1,$params{year}-1900));
-		my $downame = POSIX::strftime("%A", @day);
-		my $dowabbr = POSIX::strftime("%a", @day);
+		my $downame = strftime_utf8("%A", @day);
+		my $dowabbr = substr($downame, 0, 1);
 		$downame{$dow % 7}=$downame;
 		$dowabbr{$dow % 7}=$dowabbr;
 		$calendar.= qq{\t\t<th class="month-calendar-day-head $downame" title="$downame">$dowabbr</th>\n};
@@ -213,11 +223,27 @@ EOF
 				$tag='month-calendar-day-link';
 			}
 			$calendar.=qq{\t\t<td class="$tag $downame{$wday}">};
-			$calendar.=htmllink($params{page}, $params{destpage}, 
-				$linkcache{$key},
-				noimageinline => 1,
-				linktext => $day,
-				title => pagetitle(IkiWiki::basename($linkcache{$key})));
+			$calendar.=qq{<div class='popup'>$day<div class='balloon'>};
+			# Several postings on this page
+			$calendar.=qq{<ul>};
+			foreach my $page (@{$linkcache{$key}}) {
+				$calendar.= qq{\n\t\t\t<li>};
+				my $title;
+				if (exists $pagestate{$page}{meta}{title}) {
+					$title = "$pagestate{$page}{meta}{title}";
+				}
+				else {
+					$title = pagetitle(IkiWiki::basename($page));
+				}
+				$calendar.=htmllink($params{page}, $params{destpage}, 
+					$page,
+					noimageinline => 1,
+					linktext => $title,
+					title => $title);
+				$calendar.= '</li>';
+			}
+			$calendar.=qq{\n\t\t</ul>};
+			$calendar.=qq{</div></div>};
 			$calendar.=qq{</td>\n};
 		}
 		else {
@@ -304,13 +330,14 @@ sub format_year (@) {
 	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>
@@ -319,8 +346,8 @@ EOF
 	for (my $month = 1; $month <= 12; $month++) {
 		my @day=localtime(timelocal(0,0,0,15,$month-1,$params{year}-1900));
 		my $murl;
-		my $monthname = POSIX::strftime("%B", @day);
-		my $monthabbr = POSIX::strftime("%b", @day);
+		my $monthname = strftime_utf8("%B", @day);
+		my $monthabbr = strftime_utf8("%b", @day);
 		$calendar.=qq{\t<tr>\n}  if ($month % $params{months_per_row} == 1);
 		my $tag;
 		my $mtag=sprintf("%02d", $month);
@@ -364,6 +391,16 @@ EOF
 	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=@_;
 
@@ -377,39 +414,64 @@ sub preprocess (@) {
 	$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) {
-		# calendar for current year, updates 1st of next month
+	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) {
-			$pagestate{$params{destpage}}{calendar}{nextchange}=
-				timelocal(0, 0, 0, 1, $thismonth+1-1, $params{year});
+			setnextchange($params{destpage},
+				timelocal(0, 0, 0, 1, $thismonth+1-1, $params{year}));
 		}
 		else {
-			$pagestate{$params{destpage}}{calendar}{nextchange}=
-				timelocal(0, 0, 0, 1, 1-1, $params{year}+1);
+			setnextchange($params{destpage},
+				timelocal(0, 0, 0, 1, 1-1, $params{year}+1));
 		}
 	}
+	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
@@ -417,7 +479,6 @@ sub preprocess (@) {
 		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);
@@ -447,6 +508,7 @@ sub needsbuild (@) {
 			}
 		}
 	}
+	return $needsbuild;
 }
 
 1