$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 +203,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 +213,10 @@ EOF
}
$calendar.=qq{\t\t| };
$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{ | \n};
}
else {
@@ -222,11 +247,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,21 +280,27 @@ 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 => "\←");
+ "$archivebase/$pyear",
+ noimageinline => 1,
+ linktext => "\←",
+ 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 => "\→");
+ "$archivebase/$nyear",
+ noimageinline => 1,
+ linktext => "\→",
+ title => $nyear);
}
- add_depends($params{page}, "$archivebase/$params{nyear}", deptype("presence"));
+ add_depends($params{page}, "$archivebase/$nyear", deptype("presence"));
# Start producing the year calendar
$calendar=<\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};
$calendar.=$murl;
$calendar.=qq{\t | \n};
@@ -349,8 +396,14 @@ sub preprocess (@) {
}
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});
+ if ($thismonth < 12) {
+ $pagestate{$params{destpage}}{calendar}{nextchange}=
+ 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);
+ }
}
elsif ($params{type} eq 'year' && $params{year} > $thisyear) {
# calendar for upcoming year, updates 1st of that year
@@ -364,21 +417,6 @@ sub preprocess (@) {
}
# 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);