X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/dd80be66ee7d9a28e788efcc1b3eb62bbe8611dd..beed6aaaafd716aad06bedb45784c1e015277678:/IkiWiki/Plugin/calendar.pm?ds=sidebyside

diff --git a/IkiWiki/Plugin/calendar.pm b/IkiWiki/Plugin/calendar.pm
index 9cbfd769d..c7d2b7c01 100644
--- a/IkiWiki/Plugin/calendar.pm
+++ b/IkiWiki/Plugin/calendar.pm
@@ -22,7 +22,7 @@ use warnings;
 use strict;
 use IkiWiki 3.00;
 use Time::Local;
-use POSIX;
+use POSIX ();
 
 my $time=time;
 my @now=localtime($time);
@@ -38,6 +38,7 @@ sub getsetup () {
 		plugin => {
 			safe => 1,
 			rebuild => undef,
+			section => "widget",
 		},
 		archivebase => {
 			type => "string",
@@ -46,6 +47,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 (@) {
@@ -66,12 +75,12 @@ sub format_month (@) {
 	my %params=@_;
 
 	my %linkcache;
-	foreach my $p (pagespec_match_list($params{page}, $params{pages},
+	foreach my $p (pagespec_match_list($params{page}, 
+				"creation_year($params{year}) and creation_month($params{month}) and ($params{pages})",
 				# add presence dependencies to update
 				# 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 +88,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?
@@ -96,46 +123,53 @@ sub format_month (@) {
 	}
 
 	# Find out month names for this, next, and previous months
+	my $monthabbrev=POSIX::strftime("%b", @monthstart);
 	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};
 	$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}/".sprintf("%02d", $params{month}),
-			linktext => " $monthname ");
+			"$archivebase/$params{year}/".$params{month},
+			noimageinline => 1,
+			linktext => "$monthabbrev $params{year}",
+			title => $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",
+			noimageinline => 1,
+			linktext => "\←",
+			title => $pmonthname);
 	}
-	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",
+			noimageinline => 1,
+			linktext => "\→",
+			title => $nmonthname);
 	}
-	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
 	$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
 
@@ -149,10 +183,10 @@ EOF
 	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 $dowabbr = substr($downame, 0, 1);
 		$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;
@@ -170,7 +204,7 @@ 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) {
@@ -179,8 +213,8 @@ EOF
 		}
 		
 		my $tag;
-		my $mtag = sprintf("%02d", $params{month});
-		if (defined $pagesources{"$archivebase/$params{year}/$mtag/$day"}) {
+		my $key="$params{year}/$params{month}/$day";
+		if (defined $linkcache{$key}) {
 			if ($day == $today) {
 				$tag='month-calendar-day-this-day';
 			}
@@ -189,9 +223,10 @@ EOF
 			}
 			$calendar.=qq{\t\t<td class="$tag $downame{$wday}">};
 			$calendar.=htmllink($params{page}, $params{destpage}, 
-			                    pagename($linkcache{"$params{year}/$mtag/$day"}),
-			                    "linktext" => "$day");
-			push @list, pagename($linkcache{"$params{year}/$mtag/$day"});
+				$linkcache{$key},
+				noimageinline => 1,
+				linktext => $day,
+				title => pagetitle(IkiWiki::basename($linkcache{$key})));
 			$calendar.=qq{</td>\n};
 		}
 		else {
@@ -222,11 +257,29 @@ EOF
 
 sub format_year (@) {
 	my %params=@_;
+	
+	my @post_months;
+	foreach my $p (pagespec_match_list($params{page}, 
+				"creation_year($params{year}) and ($params{pages})",
+				# add presence dependencies to update
+				# year calendar's links to months when
+				# pages are added/removed
+				deptype => deptype("presence"))) {
+		my $mtime = $IkiWiki::pagectime{$p};
+		my @date  = localtime($mtime);
+		my $month = $date[4] + 1;
 
+		$post_months[$month]++;
+	}
+		
 	my $calendar="\n";
+	
+	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};
@@ -237,30 +290,37 @@ sub format_year (@) {
 	if (exists $pagesources{"$archivebase/$params{year}"}) {
 		$url = htmllink($params{page}, $params{destpage}, 
 			"$archivebase/$params{year}",
-			linktext => "$params{year}");
+			noimageinline => 1,
+			linktext => $params{year},
+			title => $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}",
-			linktext => "\&larr;");
+			"$archivebase/$pyear",
+			noimageinline => 1,
+			linktext => "\&larr;",
+			title => $pyear);
 	}
-	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}",
-			linktext => "\&rarr;");
+			"$archivebase/$nyear",
+			noimageinline => 1,
+			linktext => "\&rarr;",
+			title => $nyear);
 	}
-	add_depends($params{page}, "$archivebase/$params{nyear}", deptype("presence"));
+	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>
@@ -274,28 +334,26 @@ EOF
 		$calendar.=qq{\t<tr>\n}  if ($month % $params{months_per_row} == 1);
 		my $tag;
 		my $mtag=sprintf("%02d", $month);
-		if ($month == $params{month}) {
-			if ($pagesources{"$archivebase/$params{year}/$mtag"}) {
-				$tag = 'this_month_link';
-			}
-			else {
-				$tag = 'this_month_nolink';
-			}
+		if ($month == $params{month} && $thisyear == $params{year}) {
+			$tag = 'year-calendar-this-month';
 		}
 		elsif ($pagesources{"$archivebase/$params{year}/$mtag"}) {
-			$tag = 'month_link';
+			$tag = 'year-calendar-month-link';
 		} 
 		elsif ($future_month && $month >= $future_month) {
-			$tag = 'month_future';
+			$tag = 'year-calendar-month-future';
 		} 
 		else {
-			$tag = 'month_nolink';
+			$tag = 'year-calendar-month-nolink';
 		}
 
-		if ($pagesources{"$archivebase/$params{year}/$mtag"}) {
+		if ($pagesources{"$archivebase/$params{year}/$mtag"} &&
+		    $post_months[$mtag]) {
 			$murl = htmllink($params{page}, $params{destpage}, 
 				"$archivebase/$params{year}/$mtag",
-				linktext => "$monthabbr");
+				noimageinline => 1,
+				linktext => $monthabbr,
+				title => $monthname);
 			$calendar.=qq{\t<td class="$tag">};
 			$calendar.=$murl;
 			$calendar.=qq{\t</td>\n};
@@ -316,6 +374,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=@_;
 
@@ -329,33 +397,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) ||
+	       $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
@@ -363,22 +462,6 @@ sub preprocess (@) {
 		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} eq 'month') {
 		$calendar=format_month(%params);
@@ -408,6 +491,7 @@ sub needsbuild (@) {
 			}
 		}
 	}
+	return $needsbuild;
 }
 
 1