From: Anders Kaseorg Date: Fri, 31 Jan 2014 05:47:26 +0000 (-0500) Subject: Merge commit 'ffcd2da8274b44663207bb866007ee3bc8d8a15f' into sipb X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/commitdiff_plain/c0c0068a0308884dc41921157d672c62eef9e83d?hp=7a3d81619c3fb50b7b77932df91edc239d3ee09c Merge commit 'ffcd2da8274b44663207bb866007ee3bc8d8a15f' into sipb Conflicts: templates/page.tmpl --- diff --git a/IkiWiki.pm b/IkiWiki.pm index a42f56bf0..699ad13da 100644 --- a/IkiWiki.pm +++ b/IkiWiki.pm @@ -1745,6 +1745,7 @@ sub misctemplate ($$;@) { run_hooks(pagetemplate => sub { shift->(page => "", destpage => "", template => $template); }); + templateactions($template, ""); $template->param( dynamic => 1, @@ -1755,8 +1756,6 @@ sub misctemplate ($$;@) { html5 => $config{html5}, @_, ); - - templateactions($template, ""); return $template->output; } diff --git a/IkiWiki/CGI.pm b/IkiWiki/CGI.pm index 94600a3c6..11b2f2ce3 100644 --- a/IkiWiki/CGI.pm +++ b/IkiWiki/CGI.pm @@ -255,7 +255,9 @@ sub cgi_prefs ($$) { $form->text(gettext("Preferences saved.")); } - showform($form, $buttons, $session, $q); + showform($form, $buttons, $session, $q, + prefsurl => "", # avoid showing the preferences link + ); } sub cgi_custom_failure ($$$) { diff --git a/IkiWiki/Plugin/search.pm b/IkiWiki/Plugin/search.pm index cc26b7ac1..ff5d0ccbe 100644 --- a/IkiWiki/Plugin/search.pm +++ b/IkiWiki/Plugin/search.pm @@ -228,7 +228,9 @@ sub setupfiles () { # Avoid omega interpreting anything in the misctemplate # as an omegascript command. - my $misctemplate=IkiWiki::misctemplate(gettext("search"), "\0"); + my $misctemplate=IkiWiki::misctemplate(gettext("search"), "\0", + searchform => "", # avoid showing the small search form + ); eval q{use HTML::Entities}; error $@ if $@; $misctemplate=encode_entities($misctemplate, '\$'); diff --git a/IkiWiki/Plugin/sidebar.pm b/IkiWiki/Plugin/sidebar.pm index 0350f2b71..2d495db2c 100644 --- a/IkiWiki/Plugin/sidebar.pm +++ b/IkiWiki/Plugin/sidebar.pm @@ -22,7 +22,7 @@ sub getsetup () { }, global_sidebars => { type => "boolean", - examples => 1, + example => 1, description => "show sidebar page on all pages?", safe => 1, rebuild => 1, diff --git a/IkiWiki/Plugin/websetup.pm b/IkiWiki/Plugin/websetup.pm index 9cb5eb13c..c4b75c4b3 100644 --- a/IkiWiki/Plugin/websetup.pm +++ b/IkiWiki/Plugin/websetup.pm @@ -450,8 +450,8 @@ sub showform ($$) { IkiWiki::unlockwiki(); # Print the top part of a standard misctemplate, - # then show the rebuild or refresh. - my $divider="xxx"; + # then show the rebuild or refresh, live. + my $divider="\0"; my $html=IkiWiki::misctemplate("setup", $divider); IkiWiki::printheader($session); my ($head, $tail)=split($divider, $html, 2); diff --git a/debian/NEWS b/debian/NEWS index 68f0a207b..f73ac9c3d 100644 --- a/debian/NEWS +++ b/debian/NEWS @@ -1,15 +1,18 @@ -ikiwiki (3.20100505) UNRELEASED; urgency=low +ikiwiki (3.20100515) unstable; urgency=low - There is a significant change to the page.tmpl template in this version. - If you have locally modified versions of that template, you will need - to update it to contain the following in the HTML : + There are two significant changes to the page.tmpl template in this version. + If you have a locally modified version of that template, you will need to + update it at least to contain the following in the HTML : + + + Also, the footer should be wrapped in ... - Also, there is a new "comment()" pagespec, that can be used to match a + There is a new "comment()" pagespec, that can be used to match a comment on a page. It is recommended it be used instead of the old method of using a pagespec such as "internal(comment_*)" to match things that looked like comments. The old pagespec will now also match diff --git a/debian/changelog b/debian/changelog index a09c8e228..918970a3c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,11 @@ -ikiwiki (3.20100505) UNRELEASED; urgency=low +ikiwiki (3.20100516) UNRELEASED; urgency=low + + * page.tmpl: Accidentially broke po plugin's otherlanguages list styling + when modifying for html5; now fixed. + + -- Joey Hess Sun, 16 May 2010 00:03:06 -0400 + +ikiwiki (3.20100515) unstable; urgency=low * Removed misc.tmpl. Now to theme ikiwiki, you only need to customise a single template, page.tmpl. @@ -32,7 +39,7 @@ ikiwiki (3.20100505) UNRELEASED; urgency=low * Use xhtml friendly pubdate setting. * remove, rename: Add guards against XSRF attacks. - -- Joey Hess Wed, 05 May 2010 18:07:29 -0400 + -- Joey Hess Sat, 15 May 2010 21:00:45 -0400 ikiwiki (3.20100504) unstable; urgency=low diff --git a/doc/examples/blog/comments.mdwn b/doc/examples/blog/comments.mdwn index 32ffa5537..f59b44390 100644 --- a/doc/examples/blog/comments.mdwn +++ b/doc/examples/blog/comments.mdwn @@ -1,7 +1,9 @@ -This page will show recent comments made to posts in the [[blog|index]]. - -There are [[!pagecount pages="comment_pending(/posts/*)"]] comments -in the moderation queue. -[[!inline pages="comment_pending(/posts/*)" name=pendingmoderation show=-1]] +[[!sidebar content=""" +[[!inline pages="comment_pending(./posts/*)" feedfile=pendingmoderation +description="comments pending moderation" show=-1]] +Comments in the moderation queue: +[[!pagecount pages="comment_pending(./posts/*)"]] +"""]] +Recent comments on posts in the [[blog|index]]: [[!inline pages="./posts/*/Discussion or comment(./posts/*)"]] diff --git a/doc/forum/debian_backports_update_someone_please.mdwn b/doc/forum/debian_backports_update_someone_please.mdwn index f1854762e..66f5eb0c5 100644 --- a/doc/forum/debian_backports_update_someone_please.mdwn +++ b/doc/forum/debian_backports_update_someone_please.mdwn @@ -10,3 +10,5 @@ I'm just in the process of deploying ikiwiki and I'd love to use it in the html5 >>> days. I generally schedule things so a new ikiwiki reaches testing >>> every 2 weeks to month. Getting important new features and bugfixes out >>> can take priority though. --[[Joey]] + +>>>> Great! Thanks. diff --git a/doc/forum/how_do_I_revert_edits_in_the_web_mode__63__.mdwn b/doc/forum/how_do_I_revert_edits_in_the_web_mode__63__.mdwn index 510e93077..7686a7a08 100644 --- a/doc/forum/how_do_I_revert_edits_in_the_web_mode__63__.mdwn +++ b/doc/forum/how_do_I_revert_edits_in_the_web_mode__63__.mdwn @@ -31,3 +31,5 @@ Puzzled a bit :-/ >>>> Web edits are single-file anyway, so I wouldn't expect web reverts >>>> to handle the multi-file case. OTOH, I've sometimes wished ikiwiki >>>> had its own history browser (somewhere down my todo list). --[[schmonz]] + +>>>> Yup, having a possibility to revert a single file would suffice. diff --git a/doc/forum/how_to_load_an_external_page_and_still_have_it_under_ikiwiki_template.mdwn b/doc/forum/how_to_load_an_external_page_and_still_have_it_under_ikiwiki_template.mdwn new file mode 100644 index 000000000..0475d126f --- /dev/null +++ b/doc/forum/how_to_load_an_external_page_and_still_have_it_under_ikiwiki_template.mdwn @@ -0,0 +1 @@ +OK, probably title is bit confusing. Basically I'd like to be able to keep my left hand side menu, which is part of the template, and at the same time load let's say forum on the right hand side, which sits on a separate domain. Is it possible then to construct template that for some special links it runs as lets say in *frameset* mode? diff --git a/doc/forum/what_is_the_easiest_way_to_implement_order:_disallow_all__44___allow_chosen__95__few_page_editing_policy__63__.mdwn b/doc/forum/what_is_the_easiest_way_to_implement_order:_disallow_all__44___allow_chosen__95__few_page_editing_policy__63__.mdwn new file mode 100644 index 000000000..fbc5c58e2 --- /dev/null +++ b/doc/forum/what_is_the_easiest_way_to_implement_order:_disallow_all__44___allow_chosen__95__few_page_editing_policy__63__.mdwn @@ -0,0 +1,3 @@ +As in title, I'd like to allow editing only some pages on my wiki. Rest by default is not editable by users except admin. Thanks + +> See [[plugins/lockedit]]. --[[schmonz]] diff --git a/doc/ikiwikiusers.mdwn b/doc/ikiwikiusers.mdwn index edf36b5c6..94dc00b25 100644 --- a/doc/ikiwikiusers.mdwn +++ b/doc/ikiwikiusers.mdwn @@ -53,7 +53,6 @@ Projects & Organizations * [Debian Costa Rica](http://cr.debian.net/) * [Fvwm Wiki](http://fvwmwiki.xteddy.org) * [Serialist](http://serialist.net/)'s static pages (documentation, blog). We actually have ikiwiki generate its static content as HTML fragments using a modified page.tmpl template, and then the FastCGI powering our site grabs those fragments and embeds them in the standard dynamic site template. -* [Banu](https://www.banu.com/) Personal sites and blogs ======================== diff --git a/doc/news/version_3.20100515.mdwn b/doc/news/version_3.20100515.mdwn new file mode 100644 index 000000000..7eafa0be0 --- /dev/null +++ b/doc/news/version_3.20100515.mdwn @@ -0,0 +1,58 @@ +News for ikiwiki 3.20100515: + + There are two significant changes to the page.tmpl template in this version. + If you have a locally modified version of that template, you will need to + update it at least to contain the following in the HTML ``: + + + + + + + + Also, the footer should be wrapped in ` ... ` + + There is a new "comment()" pagespec, that can be used to match a + comment on a page. It is recommended it be used instead of the old + method of using a pagespec such as "internal(comment\_*)" to match + things that looked like comments. The old pagespec will now also match + comments that are held for moderation; likely not what you want. + + There have also been some changes to the style.css in this version, + particularly to support the new openid selector. If you have a modified + version, of style.css, updating it (or moving it to local.css) is + recommended. + +ikiwiki 3.20100515 released with [[!toggle text="these changes"]] +[[!toggleable text=""" + * Removed misc.tmpl. Now to theme ikiwiki, you only need to customise + a single template, page.tmpl. + * If you have a locally customised page.tmpl, it needs to be updated + to set <base> when BASEURL or FORCEBAREURL is set. + * comments: Comments pending moderation are now stored in the srcdir + alongside accepted comments, but with a `._comment_pending` extension. + This allows easier byhand moderation, as the "\_pending" need + only be stripped off and the comment be committed to version control. + * The `comment_pending()` pagespec can be used to match such unmoderated + comments, which makes it easy to add a feed of them, or a counter + indicating how many there are. + * Belatedly added a `comment()` pagespec. + * Gave comment and page editing forms some CSS and accessability love. + * Renamed postscan hook to indexhtml, to reflect its changed position, + and typical use. + * inline: Call indexhtml when inlining internal pages, so their + text can be indexed for searching. + * Delete hooks are passed deleted internal pages. + * openid: Incorporated a fancy openid-selector signin form. + (Based on ) + * openid: Use "openid\_identifier" as the form field, as required + by OpenID Authentication v2.0 spec. + * Removed the openidsignup option. Instead, my recommendation is to + leave passwordauth enabled and let people who don't have an openid use it. + The openid selector form avoids the UI annoyance of having both openid + and passwordauth on one form. + * calendar: Allow negative month to be specified. -1 is last month, etc. + (And also negative years.) + * calendar: Display year in title of month calendar. + * Use xhtml friendly pubdate setting. + * remove, rename: Add guards against XSRF attacks."""]] diff --git a/doc/style.css b/doc/style.css index 4ea77573a..2cd7a9652 100644 --- a/doc/style.css +++ b/doc/style.css @@ -29,12 +29,13 @@ nav { .actions ul { margin: 0; - padding: 6px; + padding: 6px .4em; + height: 1em; list-style-type: none; } .actions li { display: inline; - padding: .2em .4em; + padding: .2em; } .pageheader .actions ul { border-bottom: 1px solid #000; diff --git a/docwiki.setup b/docwiki.setup index 6bc200066..8b898f619 100644 --- a/docwiki.setup +++ b/docwiki.setup @@ -29,7 +29,8 @@ use IkiWiki::Setup::Standard { usedirs => 0, prefix_directives => 1, add_plugins => [qw{goodstuff version haiku polygen fortune table}], - disable_plugins => [qw{recentchanges}], # not appropriate for doc dir + # not appropriate for doc dir + disable_plugins => [qw{recentchanges openid}], rcs => $rcs, gitorigin_branch => '', # don't pull during build } diff --git a/ikiwiki.spec b/ikiwiki.spec index b2b5af3dc..09f07c6ce 100644 --- a/ikiwiki.spec +++ b/ikiwiki.spec @@ -1,5 +1,5 @@ Name: ikiwiki -Version: 3.20100505 +Version: 3.20100515 Release: 1%{?dist} Summary: A wiki compiler