]> sipb.mit.edu Git - ikiwiki.git/commitdiff
(no commit message)
authorspalax <spalax@web>
Mon, 21 Jan 2013 17:23:59 +0000 (13:23 -0400)
committeradmin <admin@branchable.com>
Mon, 21 Jan 2013 17:23:59 +0000 (13:23 -0400)
doc/todo/Calendar:_listing_multiple_entries_per_day_.mdwn [new file with mode: 0644]

diff --git a/doc/todo/Calendar:_listing_multiple_entries_per_day_.mdwn b/doc/todo/Calendar:_listing_multiple_entries_per_day_.mdwn
new file mode 100644 (file)
index 0000000..707dfa8
--- /dev/null
@@ -0,0 +1,93 @@
+[[!tag patch]]
+
+I am copying stuff discussed in the [[forum|/forum/Calendar:_listing_multiple_entries_per_day]], since the [[patch]] only list pages that are todo or bugs.
+
+If there are several pages created on the same date, the [[calendar directive|/ikiwiki/directive/calendar]] only display the first one.
+Here is a patch that:
+
+- if there is a single entry in one day, does not change anything (compared to the previous version of the calendar plugin);
+- if there are several entries, when mouse passes over the day, displays a popup listing all the entries of that day.
+
+That's all. No new pages for each day, takes as little space as it took before, and only a few lines more in the source.
+
+The only thing I am not totally happy with is the CSS. We have to say that the text is aligned on the left (otherwise, it is aligned on the right, as is each day of the calendar), but I do not know which place is the more sensible to put that line of CSS in.
+
+Regards,    
+-- Louis
+
+
+    diff --git a/IkiWiki/Plugin/calendar.pm b/IkiWiki/Plugin/calendar.pm
+    index d443198..2c9ed79 100644
+    --- a/IkiWiki/Plugin/calendar.pm
+    +++ b/IkiWiki/Plugin/calendar.pm
+    @@ -86,8 +86,11 @@ sub format_month (@) {
+               my $year  = $date[5] + 1900;
+               my $mtag  = sprintf(\"%02d\", $month);
+     
+    -          # Only one posting per day is being linked to.
+    -          $linkcache{\"$year/$mtag/$mday\"} = $p;
+    +          # Several postings per day
+    +          if (! $linkcache{\"$year/$mtag/$mday\"}) {
+    +                  $linkcache{\"$year/$mtag/$mday\"} = [];
+    +          }
+    +          push(@{$linkcache{\"$year/$mtag/$mday\"}}, $p);
+       }
+               
+       my $pmonth = $params{month} - 1;
+    @@ -221,11 +224,36 @@ EOF
+                               $tag='month-calendar-day-link';
+                       }
+                       $calendar.=qq{\t\t<td class=\"$tag $downame{$wday}\">};
+    -                  $calendar.=htmllink($params{page}, $params{destpage}, 
+    -                          $linkcache{$key},
+    -                          noimageinline => 1,
+    -                          linktext => $day,
+    -                          title => pagetitle(IkiWiki::basename($linkcache{$key})));
+    +                  if ( scalar(@{$linkcache{$key}}) == 1) {
+    +                          # Only one posting on this page
+    +                          my $page = $linkcache{$key}[0];
+    +                          $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>};
+    +                  }
+                       $calendar.=qq{</td>\n};
+               }
+               else {
+    diff --git a/doc/style.css b/doc/style.css
+    old mode 100644
+    new mode 100755
+    index 6e2afce..4149229
+    --- a/doc/style.css
+    +++ b/doc/style.css
+    @@ -316,6 +316,7 @@ div.progress-done {
+     .popup .paren,
+     .popup .expand {
+       display: none;
+    +  text-align: left;
+     }
+     .popup:hover .balloon,
+     .popup:focus .balloon {
+