X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/cf74cf7a37a1fa4e02dffc6f3ac580626d183433..2d1dfab20a6ed69f48c1696e00a97b44eac84062:/IkiWiki/Plugin/calendar.pm

diff --git a/IkiWiki/Plugin/calendar.pm b/IkiWiki/Plugin/calendar.pm
index dcf2b6d64..c9bdf4a17 100644
--- a/IkiWiki/Plugin/calendar.pm
+++ b/IkiWiki/Plugin/calendar.pm
@@ -66,7 +66,8 @@ 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"))) {
@@ -126,6 +127,7 @@ sub format_month (@) {
 	if (exists $pagesources{"$archivebase/$params{year}/$params{month}"}) {
 		$url = htmllink($params{page}, $params{destpage}, 
 			"$archivebase/$params{year}/".$params{month},
+			noimageinline => 1,
 			linktext => " $monthname ");
 	}
 	add_depends($params{page}, "$archivebase/$params{year}/$params{month}",
@@ -133,14 +135,16 @@ sub format_month (@) {
 	if (exists $pagesources{"$archivebase/$pyear/$pmonth"}) {
 		$purl = htmllink($params{page}, $params{destpage}, 
 			"$archivebase/$pyear/$pmonth",
-			linktext => " \&larr ");
+			noimageinline => 1,
+			linktext => "\&larr");
 	}
 	add_depends($params{page}, "$archivebase/$pyear/$pmonth",
 		deptype("presence"));
 	if (exists $pagesources{"$archivebase/$nyear/$nmonth"}) {
 		$nurl = htmllink($params{page}, $params{destpage}, 
 			"$archivebase/$nyear/$nmonth",
-			linktext => " \&rarr ");
+			noimageinline => 1,
+			linktext => "\&rarr");
 	}
 	add_depends($params{page}, "$archivebase/$nyear/$nmonth",
 		deptype("presence"));
@@ -205,8 +209,9 @@ EOF
 			}
 			$calendar.=qq{\t\t<td class="$tag $downame{$wday}">};
 			$calendar.=htmllink($params{page}, $params{destpage}, 
-			                    $linkcache{"$params{year}/$params{month}/$day"},
-			                    "linktext" => "$day");
+				$linkcache{"$params{year}/$params{month}/$day"},
+				noimageinline => 1,
+				"linktext" => "$day");
 			$calendar.=qq{</td>\n};
 		}
 		else {
@@ -237,14 +242,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};
@@ -255,18 +275,21 @@ sub format_year (@) {
 	if (exists $pagesources{"$archivebase/$params{year}"}) {
 		$url = htmllink($params{page}, $params{destpage}, 
 			"$archivebase/$params{year}",
+			noimageinline => 1,
 			linktext => "$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 => "\&larr;");
 	}
 	add_depends($params{page}, "$archivebase/$pyear", deptype("presence"));
 	if (exists $pagesources{"$archivebase/$nyear"}) {
 		$nurl = htmllink($params{page}, $params{destpage}, 
 			"$archivebase/$nyear",
+			noimageinline => 1,
 			linktext => "\&rarr;");
 	}
 	add_depends($params{page}, "$archivebase/$nyear", deptype("presence"));
@@ -292,27 +315,24 @@ 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",
+				noimageinline => 1,
 				linktext => "$monthabbr");
 			$calendar.=qq{\t<td class="$tag">};
 			$calendar.=$murl;