aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess <joey@gnu.kitenet.net>2009-11-26 14:57:52 -0500
committerJoey Hess <joey@gnu.kitenet.net>2009-11-26 14:58:35 -0500
commit2255a6a0bba10eece24304f64ec8329068e8bf07 (patch)
treed8722f9dc0a261c9b99773ac68321b0b364c76d5
parent268a2dd54cd47d6ec39c22d61baa5f6f9d40b7f5 (diff)
downloadikiwiki-2255a6a0bba10eece24304f64ec8329068e8bf07.tar
ikiwiki-2255a6a0bba10eece24304f64ec8329068e8bf07.tar.gz
calendar: Add title attributes for all links in the calendars.
-rw-r--r--IkiWiki.pm2
-rw-r--r--IkiWiki/Plugin/calendar.pm33
-rw-r--r--debian/changelog1
3 files changed, 23 insertions, 13 deletions
diff --git a/IkiWiki.pm b/IkiWiki.pm
index 611ba6f65..99d5724eb 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -1083,7 +1083,7 @@ sub htmllink ($$$;@) {
my @attrs;
foreach my $attr (qw{rel class title}) {
if (defined $opts{$attr}) {
- push @attrs, " $attr=\"".$opts{attr}.'"';
+ push @attrs, " $attr=\"$opts{$attr}\"";
}
}
diff --git a/IkiWiki/Plugin/calendar.pm b/IkiWiki/Plugin/calendar.pm
index c9bdf4a17..cbbb57e98 100644
--- a/IkiWiki/Plugin/calendar.pm
+++ b/IkiWiki/Plugin/calendar.pm
@@ -128,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"));
@@ -136,7 +137,8 @@ sub format_month (@) {
$purl = htmllink($params{page}, $params{destpage},
"$archivebase/$pyear/$pmonth",
noimageinline => 1,
- linktext => "\&larr");
+ linktext => "\&larr",
+ title => $pmonthname);
}
add_depends($params{page}, "$archivebase/$pyear/$pmonth",
deptype("presence"));
@@ -144,7 +146,8 @@ sub format_month (@) {
$nurl = htmllink($params{page}, $params{destpage},
"$archivebase/$nyear/$nmonth",
noimageinline => 1,
- linktext => "\&rarr");
+ linktext => "\&rarr",
+ title => $nmonthname);
}
add_depends($params{page}, "$archivebase/$nyear/$nmonth",
deptype("presence"));
@@ -173,7 +176,7 @@ EOF
my $dowabbr = POSIX::strftime("%a", @day);
$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;
@@ -191,7 +194,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) {
@@ -200,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';
}
@@ -209,9 +213,10 @@ EOF
}
$calendar.=qq{\t\t<td class="$tag $downame{$wday}">};
$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{</td>\n};
}
else {
@@ -276,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 => "\&larr;");
+ linktext => "\&larr;",
+ 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 => "\&rarr;");
+ linktext => "\&rarr;",
+ title => $nyear);
}
add_depends($params{page}, "$archivebase/$nyear", deptype("presence"));
@@ -333,7 +341,8 @@ EOF
$murl = htmllink($params{page}, $params{destpage},
"$archivebase/$params{year}/$mtag",
noimageinline => 1,
- linktext => "$monthabbr");
+ linktext => $monthabbr,
+ title => $monthname);
$calendar.=qq{\t<td class="$tag">};
$calendar.=$murl;
$calendar.=qq{\t</td>\n};
diff --git a/debian/changelog b/debian/changelog
index e31928223..2b468ca2f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,7 @@ ikiwiki (3.20091114) UNRELEASED; urgency=low
pretty-printed dates, using the same formatting as used for page
modification date display, etc.
* htmllink: Allow a title attribute to be specified.
+ * calendar: Add title attributes for all links in the calendars.
-- Joey Hess <joeyh@debian.org> Mon, 16 Nov 2009 15:46:45 -0500