Merge remote-tracking branch 'schmonz/fancypodcast'

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 {

diff --git a/debian/changelog b/debian/changelog
index 242460ca3b086ed7bfd68a7bc6e7b435c069537a..bc05aa091e8a97c710fa3c0fd17d3fbc37ca9d2f 100644 (file)
--- 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

diff --git a/doc/todo/fancypodcast.mdwn b/doc/todo/fancypodcast.mdwn
index 31b6c44f9b1b0e9c244d415fac95a9e1a1322c13..79b21404930c8b26b3b9362aa6615802534763f2 100644 (file)
--- a/doc/todo/fancypodcast.mdwn
+++ b/doc/todo/fancypodcast.mdwn
@@ -12,11 +12,8 @@ also have lots more metadata.
 
 In summary, the branch preserves ikiwiki's existing podcast behavior,
 adds more featureful behavior, and has been tested to work well in
-some common podcatchers. I believe it is ready for review and
-possible integration, and I'd like to get feedback to that effect
-(or to the contrary) before making further enhancements. I know
-[[joey]]'s the final arbiter here, but I'd appreciate any qualified,
-critical eyes ([[smcv]]?) raking over my diffs. --[[schmonz]]
+some common podcatchers. I believe it is ready for integration.
+--[[schmonz]]
 
 ## Features
 
@@ -73,6 +70,11 @@ Episode enclosure  |(./)      |(./)       |(./)        |(./)
   display details against a reference podcast.
 * Verify smooth transitions for two common use cases (see testing
   details below).
+* Code review: don't add enclosure divs unless we have enclosures.
+* Code review: genericize download link for more use cases.
+* Code review: don't confuse old readers with Atom names in RSS.
+* Code review: instead of hacking back to `$link`, just provide it.
+* Code review: show author in addition to feedname, if different.
 
 ### Must-have (for [[schmonz]], anyway)
 
@@ -312,10 +314,10 @@ could negatively impact eg, Planet style aggregators using ikiwiki. --[[Joey]]
 >>>> when I generate the same planet as updo and run `r2e` over it,
 >>>> the names I get in `From:` look like so:
 
-    "updo: Junio C Hamano"
-    "updo: Greg Kroah-Hartman"
-    "updo: Eric Raymond: esr"` (article author != feed name, so we get both)
-    "updo: Jannis Pohlman: Jannis Pohlmann"` (oops! I tweaked the real updo)
+*  `"updo: Junio C Hamano"`
+*  `"updo: Greg Kroah-Hartman"`
+*  `"updo: Eric Raymond: esr"` (article author != feed name, so we get both)
+*  `"updo: Jannis Pohlman: Jannis Pohlmann"` (oops! I tweaked the real updo)
 
 >>>> --[[schmonz]]