X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/4cce29259353223b1091a83e03748ae4b34b0796..73f4a8835876c8cb07808367cd72d9ae972893e8:/IkiWiki/Plugin/calendar.pm?ds=sidebyside
diff --git a/IkiWiki/Plugin/calendar.pm b/IkiWiki/Plugin/calendar.pm
index e3c5e2f2d..2b87451ce 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"))) {
@@ -127,7 +128,8 @@ sub format_month (@) {
$url = htmllink($params{page}, $params{destpage},
"$archivebase/$params{year}/".$params{month},
noimageinline => 1,
- linktext => " $monthname ");
+ linktext => $monthname,
+ title => $monthname);
}
add_depends($params{page}, "$archivebase/$params{year}/$params{month}",
deptype("presence"));
@@ -135,7 +137,8 @@ sub format_month (@) {
$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"));
@@ -143,7 +146,8 @@ sub format_month (@) {
$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"));
@@ -172,7 +176,7 @@ EOF
my $dowabbr = POSIX::strftime("%a", @day);
$downame{$dow % 7}=$downame;
$dowabbr{$dow % 7}=$dowabbr;
- $calendar.= qq{\t\t
$dowabbr | \n};
+ $calendar.= qq{\t\t$dowabbr | \n};
}
$calendar.=< $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) {
@@ -199,7 +203,8 @@ EOF
}
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';
}
@@ -208,9 +213,10 @@ EOF
}
$calendar.=qq{\t\t};
$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{ | \n};
}
else {
@@ -241,14 +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};
@@ -260,21 +281,24 @@ sub format_year (@) {
$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"));
@@ -299,29 +323,26 @@ EOF
$calendar.=qq{\t\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");
+ linktext => $monthabbr,
+ title => $monthname);
$calendar.=qq{\t};
$calendar.=$murl;
$calendar.=qq{\t | \n};
@@ -375,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