run_hooks(pagetemplate => sub {
shift->(page => "", destpage => "", template => $template);
});
+ templateactions($template, "");
$template->param(
dynamic => 1,
html5 => $config{html5},
@_,
);
-
- templateactions($template, "");
return $template->output;
}
$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 ($$$) {
# 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, '\$');
},
global_sidebars => {
type => "boolean",
- examples => 1,
+ example => 1,
description => "show sidebar page on all pages?",
safe => 1,
rebuild => 1,
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);
-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 <head>:
+ 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 <head>:
<TMPL_IF DYNAMIC>
<TMPL_IF FORCEBASEURL><base href="<TMPL_VAR FORCEBASEURL>" /><TMPL_ELSE>
<TMPL_IF BASEURL><base href="<TMPL_VAR BASEURL>" /></TMPL_IF>
</TMPL_IF>
+ </TMPL_IF>
+
+ Also, the footer should be wrapped in <TMPL_UNLESS DYNAMIC> ... </TMPL_UNLESS>
- 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
-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 <joeyh@debian.org> 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.
* Use xhtml friendly pubdate setting.
* remove, rename: Add guards against XSRF attacks.
- -- Joey Hess <joeyh@debian.org> Wed, 05 May 2010 18:07:29 -0400
+ -- Joey Hess <joeyh@debian.org> Sat, 15 May 2010 21:00:45 -0400
ikiwiki (3.20100504) unstable; urgency=low
-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/*)"]]
>>> 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.
>>>> 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.
--- /dev/null
+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?
--- /dev/null
+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]]
* [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
========================
--- /dev/null
+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 `<head>`:
+
+ <TMPL_IF DYNAMIC>
+ <TMPL_IF FORCEBASEURL><base href="<TMPL_VAR FORCEBASEURL>" /><TMPL_ELSE>
+ <TMPL_IF BASEURL><base href="<TMPL_VAR BASEURL>" /></TMPL_IF>
+ </TMPL_IF>
+ </TMPL_IF>
+
+ Also, the footer should be wrapped in `<TMPL_UNLESS DYNAMIC> ... </TMPL_UNLESS>`
+
+ 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 <http://code.google.com/p/openid-selector/>)
+ * 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."""]]
.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;
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
}
Name: ikiwiki
-Version: 3.20100505
+Version: 3.20100515
Release: 1%{?dist}
Summary: A wiki compiler
sipb-www / ikiwiki.git / commitdiff
