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

master
Joey Hess 2010-09-18 12:58:41 -04:00
commit 4843ec6dd0
3 changed files with 67 additions and 0 deletions

View File

@ -0,0 +1,23 @@
Consider this:
$ wget http://www.thomas.schwinge.homeip.net/tmp/cutpaste_filter.tar.bz2
$ wget http://www.thomas.schwinge.homeip.net/tmp/cutpaste_filter.patch
$ tar -xj < cutpaste_filter.tar.bz2
$ cd cutpaste_filter/
$ ./render_locally
$ find "$PWD".rendered/ -type f -print0 | xargs -0 grep -H -E 'FOO|BAR'
[notice one FOO in there]
$ rm -rf .ikiwiki "$PWD".rendered
$ cp /usr/share/perl5/IkiWiki/Plugin/cutpaste.pm .library/IkiWiki/Plugin/
$ patch -p0 < ../cutpaste_filter.patch
$ ./render_locally
$ find "$PWD".rendered/ -type f -print0 | xargs -0 grep -H -E 'FOO|BAR'
[correct; notice no more FOO]
I guess this needs a general audit -- there are other places where `preprocess`
is being doing without `filter`ing first, for example in the same file, `copy`
function.
--[[tschwinge]]

View File

@ -0,0 +1,13 @@
Dear ikiwiki users, and specially [[users/KathrynAndersen]] ([[users/rubykat]]):
have you considered some way of extending ikiwiki to allow some kind of
on-the-fly generation of web forms to create new pages? these web forms should
offer as many fields as one has defined in some [[page
template|plugins/contrib/ftemplate]], and, once POSTed, should create a page
using that template, with those fields already filled with the values the user
provided.
I see this a a generalization of the `postform` option of the
[[ikiwiki/directive/inline]] directive. That option tells ikiwiki to create a
form with one field already filled (title).
What are your ideas about this?

View File

@ -0,0 +1,31 @@
Here I propose an option (with a [[patch]]) to capitalize the first letter (ucfirst) of default titles : filenames and urls can be lowercase but title are displayed with a capital first character (filename = "foo.mdwn", pagetitle = "Foo"). Note that \[[!meta title]] are unaffected (no automatic capitalization). Comments please :) --[[JeanPrivat]]
<pre><code>
diff --git a/IkiWiki.pm b/IkiWiki.pm
index 6da2819..fd36ec4 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -281,6 +281,13 @@ sub getsetup () {
safe => 0,
rebuild => 1,
},
+ capitalize => {
+ type => "boolean",
+ default => undef,
+ description => "capitalize the first letter of page titles",
+ safe => 1,
+ rebuild => 1,
+ },
userdir => {
type => "string",
default => "",
@@ -989,6 +996,10 @@ sub pagetitle ($;$) {
$page=~s/(__(\d+)__|_)/$1 eq '_' ? ' ' : "&#$2;"/eg;
}
+ if ($config{capitalize}) {
+ $page = ucfirst $page;
+ }
+
return $page;
}
</code></pre>