Merge branch 'master' of ssh://git.ikiwiki.info

6 files changed, 113 insertions, 1 deletions

diff --git a/doc/forum/Error:_CGI::tmpFileName_failed_to_return_the_uploaded_file_name/comment_2_80296d67c7f1dd75b56b85c14f5efa3b._comment b/doc/forum/Error:_CGI::tmpFileName_failed_to_return_the_uploaded_file_name/comment_2_80296d67c7f1dd75b56b85c14f5efa3b._comment
new file mode 100644
index 000000000..e7659413e
--- /dev/null
+++ b/doc/forum/Error:_CGI::tmpFileName_failed_to_return_the_uploaded_file_name/comment_2_80296d67c7f1dd75b56b85c14f5efa3b._comment
@@ -0,0 +1,12 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawlRjjrKEyPmXnh2qBEGx9PgH5DP32wCMAQ"
+ nickname="Jonathon"
+ subject="figured it out"
+ date="2013-01-19T15:59:09Z"
+ content="""
+It looks like this was just another expression of [the header size limit issue] [1] that has already been reported and addressed.
+
+I got `3.20120629` from `squeeze-backports`, and my issue has been resolved.
+
+[1]: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=638009
+"""]]
diff --git a/doc/news/openid.mdwn b/doc/news/openid.mdwn
index c5af6cd30..b13e82146 100644
--- a/doc/news/openid.mdwn
+++ b/doc/news/openid.mdwn
@@ -10,4 +10,4 @@ log back in, try out the OpenID signup process if you don't already have an
 OpenID, and see how OpenID works for you. And let me know your feelings about
 making such a switch. --[[Joey]]
 
-[[!poll 69 "Accept only OpenID for logins" 21 "Accept only password logins" 43 "Accept both"]]
+[[!poll 69 "Accept only OpenID for logins" 21 "Accept only password logins" 44 "Accept both"]]
diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn
index d3b7e7283..5049a4656 100644
--- a/doc/sandbox.mdwn
+++ b/doc/sandbox.mdwn
@@ -33,6 +33,8 @@ Bulleted list
 
 test _this_ out.
 
+`test this code block`
+
 ----
 
 [[!template id=note text="this is generated by the [[plugins/haiku]] plugin"]]
diff --git a/doc/tips/convert_blogger_blogs_to_ikiwiki.mdwn b/doc/tips/convert_blogger_blogs_to_ikiwiki.mdwn
index 39ffc0404..e71e2132d 100644
--- a/doc/tips/convert_blogger_blogs_to_ikiwiki.mdwn
+++ b/doc/tips/convert_blogger_blogs_to_ikiwiki.mdwn
@@ -1,3 +1,5 @@
 Daniel Burrows
 [explains](http://algebraicthunk.net/~dburrows/blog/entry/howto-convert-your-blogger-or-blogspot-blog-to-ikiwiki/)
 how to convert your Blogger/BlogSpot blog to ikiwiki.
+
+François Marier used a [different approach](http://feeding.cloud.geek.nz/posts/moving-from-blogger-to-ikiwiki-and-branchable/) on a more recent version of Blogger.
diff --git a/doc/tips/dot_cgi.mdwn b/doc/tips/dot_cgi.mdwn
index bb0a4fd97..dc88d9595 100644
--- a/doc/tips/dot_cgi.mdwn
+++ b/doc/tips/dot_cgi.mdwn
@@ -28,6 +28,10 @@ configuration changes should work anywhere.
 
   You may also want to install some dependencies to enable CGI in apache2 setup as: `libcgi-formbuilder-perl` and `libcgi-session-perl`.
 
+* If your wiki is in `~/public_html` and does not appear when you enter the URL given by the installer, check that you have 
+  the userdir mod enabled (there should be simlinks to userdir.load and userdir.conf in /etc/apache2/modes-enabled).  If not,
+  run `a2enmod userdir` and reload apache2.
+  
 * You may also want to enable the [[plugins/404]] plugin.
   To make apache use it, the apache config file will need a further
   modification to make it use ikiwiki's CGI as the apache 404 handler.
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
index 000000000..94a4f1577
--- /dev/null
+++ b/doc/todo/Calendar:_listing_multiple_entries_per_day_.mdwn
@@ -0,0 +1,92 @@
+[[!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 424d438..b52c72b
+    --- a/doc/style.css
+    +++ b/doc/style.css
+    @@ -323,6 +323,7 @@ div.progress-done {
+     .popup .paren,
+     .popup .expand {
+     	display: none;
+    +	text-align: left;
+     }
+     .popup:hover .balloon,
+     .popup:focus .balloon {