urosm
/
ikiwiki
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

calendar: Display the popup mouseover when there is only 1 page for a given day, for better UI consistency.

master
Joey Hess 2013-07-19 18:54:32 -04:00
parent 54cfc89365
commit 7d938559cb
2 changed files with 24 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
IkiWiki/Plugin/calendar.pm
View File

@ -223,38 +223,27 @@ EOF
$tag='month-calendar-day-link';
}
$calendar.=qq{\t\t<td class="$tag $downame{$wday}">};
if (scalar(@{$linkcache{$key}}) == 1) {
# Only one posting on this page
my $page = $linkcache{$key}[0];
$calendar.=qq{<div class='popup'>$day<div class='balloon'>};
# Several postings on this page
$calendar.=qq{<ul>};
foreach my $page (@{$linkcache{$key}}) {
$calendar.= qq{\n\t\t\t<li>};
my $title;
if (exists $pagestate{$page}{meta}{title}) {
$title = "$pagestate{$page}{meta}{title}";
}
else {
$title = pagetitle(IkiWiki::basename($page));
}
$calendar.=htmllink($params{page}, $params{destpage},
$page,
noimageinline => 1,
linktext => $day,
title => pagetitle(IkiWiki::basename($page)));
}
else {
$calendar.=qq{<div class='popup'>$day<div class='balloon'>};
# Several postings on this page
$calendar.=qq{<ul>};
foreach my $page (@{$linkcache{$key}}) {
$calendar.= qq{\n\t\t\t<li>};
my $title;
if (exists $pagestate{$page}{meta}{title}) {
$title = "$pagestate{$page}{meta}{title}";
}
else {
$title = pagetitle(IkiWiki::basename($page));
}
$calendar.=htmllink($params{page}, $params{destpage},
$page,
noimageinline => 1,
linktext => $title,
title => $title);
$calendar.= '</li>';
}
$calendar.=qq{\n\t\t</ul>};
$calendar.=qq{</div></div>};
linktext => $title,
title => $title);
$calendar.= '</li>';
}
$calendar.=qq{\n\t\t</ul>};
$calendar.=qq{</div></div>};
$calendar.=qq{</td>\n};
}
else {

7
debian/changelog vendored
View File

@ -1,3 +1,10 @@
ikiwiki (3.20130712) UNRELEASED; urgency=low
* calendar: Display the popup mouseover when there is only 1 page for a
given day, for better UI consistency.
-- Joey Hess <joeyh@debian.org> Fri, 19 Jul 2013 18:53:23 -0400
ikiwiki (3.20130711) unstable; urgency=low
* Deal with git behavior change in 1.7.2 and newer that broke support