diff options
| author | Joey Hess <joey@kitenet.net> | 2013-07-19 18:54:32 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2013-07-19 18:54:32 -0400 |
| commit | 7d938559cb9994211d2917491c503f729d220abb (patch) | |
| tree | 1b7e26783fb78089caa943b8d577160db35a163a | |
| parent | 54cfc8936525f7964e8720dab77fefd84002d57f (diff) | |
| download | ikiwiki-7d938559cb9994211d2917491c503f729d220abb.tar ikiwiki-7d938559cb9994211d2917491c503f729d220abb.tar.gz | |
calendar: Display the popup mouseover when there is only 1 page for a given day, for better UI consistency.
| -rw-r--r-- | IkiWiki/Plugin/calendar.pm | 45 | ||||
| -rw-r--r-- | debian/changelog | 7 |
2 files changed, 24 insertions, 28 deletions
diff --git a/IkiWiki/Plugin/calendar.pm b/IkiWiki/Plugin/calendar.pm index 8ca6dd826..682bfb6fb 100644 --- a/IkiWiki/Plugin/calendar.pm +++ b/IkiWiki/Plugin/calendar.pm @@ -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 { diff --git a/debian/changelog b/debian/changelog index 242460ca3..bc05aa091 100644 --- a/debian/changelog +++ b/debian/changelog @@ -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 |