urosm
/
ikiwiki
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

master
Joey Hess 2013-09-17 14:11:19 -04:00
parent 8e6274a2bd 95842fb2b0
commit 1e256b23b3
9 changed files with 95 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
doc/bugs/__91____91____33__inline_postform__61__no__93____93___doesn__39__t_disable_it.mdwn 100644
View File

@ -0,0 +1,12 @@
The [[ikiwiki/directive/inline]] directive generates a form if
it has either rootpage, or postform with a "yes-like" value. This
means that
\[[!inline pages=... rootpage=sandbox postform=no]]
does have a form. I would expect it not to (although
mentioning rootpage there is useless).
See also [[forum/How_to_disable_"Add_a_new_post_titled:"_submission_form?]].
--[[smcv]]

37
doc/bugs/template_creation_error.mdwn
View File

@ -158,3 +158,40 @@ Please, let me know what to do to avoid this kind of error.
>>> the directive?
>>>
>>> --[[chrysn]]
>>>> Thanks for your feedback!
>>>> Looking at its description on this wiki, I agree that `type/web` doesn't
>>>> fit, and core does seem better. I like your `templatebody` suggestion,
>>>> too, particularly if templates remain restricted to `/templates`.
>>>> I'll try to come up with better wording for the documentation to say
>>>> "use `templatebody`, like this", with a note about backwards
>>>> compatibility later.
>>>>
>>>> Rationale for `my %templates`: yes it does seem a bit odd, but
>>>> if I used `$pagestate{$tpage}{template}` instead of a `my` variable,
>>>> I'd sometimes _still_ have to force a `scan`, because
>>>> [[plugins/template]] has to expand the template at scan time so that
>>>> it can contain links etc. - so I have to make sure that if the
>>>> template has changed, it has already been scanned (scanning happens
>>>> in random order, so that can't be guaranteed). This means there's
>>>> no benefit in reading it back from the index, so it might as well
>>>> just be in-memory.
>>>>
>>>> I suppose an alternative way to do it would be to remember what was
>>>> passed to `needsbuild`, and only force a `scan` for templates that
>>>> were in that list - which potentially reduces CPU time and I/O a
>>>> little, in exchange for a bigger index. I could do that if Joey
>>>> wants me to, but I think the current approach is simpler,
>>>> so I'll stick with the current approach if it isn't vetoed.
>>>> --[[smcv]]
>>>>> @name: even outside `/templates`, `\[[!templatebody]]` would be
>>>>> interpreted as "when this page is used as a template, this is what its
>>>>> contents should be", and be suitable.
>>>>>
>>>>> @`%templates`: my surprise wasn't to it not being in `%pagestate`, but
>>>>> rather that the `scan` function was used for it at all, rather than plain
>>>>> directive parsing that ignores everything else -- but i agree that it's
>>>>> the right thing to do in this situation.
>>>>>
>>>>> --[[chrysn]]

5
doc/download.mdwn
View File

@ -35,10 +35,7 @@ own RPM.
## BSD ports
Ikiwiki can be installed [from macports](http://www.macports.org/ports.php?by=name&substr=ikiwiki)
by running `sudo port install ikiwiki`.
NetBSD and many other platforms: pkgsrc has an [ikiwiki package](ftp://ftp.netbsd.org/pub/pkgsrc/current/pkgsrc/www/ikiwiki/README.html).
NetBSD, Mac OS X, Solaris, and many other platforms: [pkgsrc](http://www.pkgsrc.org/) has an [ikiwiki package](http://pkgsrc.se/www/ikiwiki).
FreeBSD has ikiwiki in its
[ports collection](http://www.freshports.org/www/ikiwiki/).

1
doc/forum/How_to_disable___34__Add_a_new_post_titled:__34___submission_form__63__.mdwn 100644
View File

@ -0,0 +1 @@
After setting up a blog subdirectory. It has a input field for inputing title of a new post. How to disable that?

9
doc/forum/How_to_disable___34__Add_a_new_post_titled:__34___submission_form__63__/comment_1_3dfa9ac6473d0d5ebc9d99ec39e96216._comment 100644
View File

@ -0,0 +1,9 @@
[[!comment format=mdwn
username="http://smcv.pseudorandom.co.uk/"
nickname="smcv"
subject="comment 1"
date="2013-09-17T07:46:01Z"
content="""
Remove the `rootpage` parameter, and don't set the `postform` parameter
to `yes` or `1`.
"""]]

16
doc/plugins/toc/discussion.mdwn
View File

@ -8,3 +8,19 @@ rendered content. --[[JasonBlevins]]
Why doesn't the TOC appear in the edit page preview? It only appears when the page is finally rendered. This makes it somewhat difficult to organize headings, saving & re-editing all the time. My user page currently has a toc to play with: --[[sabr]]
> Fixed. --[[Joey]]
Just ran into a side effect of `\[[!toc]]` being a NOP in pages
which are inlined: pages with `\[[!template id=note text="\[[!toc]]"]]`
wound up having the note rendered in feeds as "Use this template
to insert a note into a page". Worked around this by making a local
copy of the template and removing its `<TMPL_UNLESS text>...</TMPL_UNLESS>`
section. Besides needing to generate guaranteed-unique anchor names,
are there other reasons this directive couldn't be made to work on
inlined pages? --[[schmonz]]
> Workaround: `\[[!template id=note text=" \[[!toc]]"]]`
> (with whitespace) should work, because then Perl will consider
> the string to be a true value.
>
> Longer-term, my branch on [[bugs/template_creation_error]]
> aims to fix this sort of thing. --[[smcv]]

2
doc/spam_fighting.mdwn
View File

@ -24,4 +24,6 @@ d1dbd8e | 2013/08/19 | webschen1 | 79.228.8.176
d93a948 | 2013/09/05 | soman81 | 31.17.11.19
568fdb0 | 2013/09/05 | soman81 | 31.17.11.19
d759052 | 2013/09/08 | spain1001 | 80.187.106.2
24a1c62 | 2013/09/15 | spain1001 | 80.187.106.136
cba01c2 | 2013/09/15 | spain1001 | 80.187.106.136
"""]]

30
doc/tips/ikiwiki_on_mac_os_x.mdwn
View File

@ -1,14 +1,26 @@
[[!toc]]
# pkgsrc
The easiest way of installing an up-to-date ikiwiki on any version of Mac OS X is via
[pkgsrc](http://www.pkgsrc.org/).
7. [Bootstrap pkgsrc](http://www.netbsd.org/docs/pkgsrc/platforms.html#bootstrapping-pkgsrc)
7. Run `cd .../pkgsrc/www/ikiwiki && make install clean`
{OK} As of 2013/09/14, the [version of ikiwiki in pkgsrc](http://pkgsrc.se/www/ikiwiki) is 3.20130904.1.
-----
# MacPorts
The easiest way of installing ikiwiki on Mac OS X [Snow] Leopard and Tiger is via MacPorts: <http://www.macports.org/>
Another way to install ikiwiki on Mac OS X [Snow] Leopard and Tiger is via MacPorts: <http://www.macports.org/>
This project ports Open Source software into Mac Os X platform.
It's very easy to intall ikiwiki via MacPorts:
This project ports Open Source software into Mac OS X platform.
It's very easy to install ikiwiki via MacPorts:
1.- Donwnload and install MacPorts port manager from: <http://www.macports.org/install.php> .
Port manager installs via Mac Os X installer. Prerequisite: XCode.
Port manager installs via Mac OS X installer. Prerequisite: XCode.
Se above URL for details
2.- Run
@ -21,15 +33,7 @@ enjoy
Enrique Castilla
-----
# pkgsrc
The other easiest way of installing ikiwiki on Mac OS X is via
[pkgsrc](http://www.pkgsrc.org/).
7. Bootstrap pkgsrc
7. Run `cd .../pkgsrc/www/ikiwiki && make install clean`
[!] As of 2013/09/14, the [version of ikiwiki in MacPorts](http://www.macports.org/ports.php?by=name&substr=Ikiwiki) is 3.20110608.
-----

6
doc/todo/fancypodcast.mdwn
View File

@ -56,12 +56,6 @@ Episode enclosure |(./) |(./) |(./) |(./)
### Other ideas
* Don't render template text (e.g., "Use this template to insert a
note into a page") in feeds.
* [[schmonz]] observes this in a dual-feed (one for enclosures,
another for browsers) scenario, but not in the typical case.
Remaining to be verified: that once migrated to fancypodcast,
this stops being a problem.
* Optionally specify the enclosure's:
* MIME type, in case `File::MimeInfo` guesses wrong.
* Duration, in case `ffprobe` guesses wrong.