Merge remote-tracking branch 'refs/remotes/dgit/dgit/sid'

[git.ikiwiki.info.git] / IkiWiki / Plugin / calendar.pm

diff --git a/IkiWiki/Plugin/calendar.pm b/IkiWiki/Plugin/calendar.pm
index 8ca6dd82680171d8ebae5f88ac9053c327e0ad3d..682bfb6fb8f1e2fb789d5735353f609a163930ee 100644 (file)
--- 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 {