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

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

master
Joey Hess 2010-12-26 13:55:35 -04:00
parent 171cdb69d3 a6f77ac14b
commit 58e854555a
3 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
doc/bugs/urlto_API_change_breaks_wikis_with_po_plugin.mdwn
View File

@ -92,3 +92,7 @@ investigated this yet.
>>>>> 2-argument `urlto` still have a defined second argument; >>>>> 2-argument `urlto` still have a defined second argument;
>>>>> I've just edited `plugins/write` to clarify why the second >>>>> I've just edited `plugins/write` to clarify why the second
>>>>> argument should be provided whenever possible. --[[smcv]] >>>>> argument should be provided whenever possible. --[[smcv]]
>>>>>> Ok. I am sorry for the burden that arose from my
>>>>>> misunderstanding. No need to keep this bug open then =>
>>>>>> [[done]] --[[intrigeri]]

10
doc/plugins/contrib/album.mdwn
View File

@ -34,10 +34,10 @@ Each page containing an `album` directive is treated as a photo album.
Every image attached to an album or its subpages is considered to be part of Every image attached to an album or its subpages is considered to be part of
the album. A "viewer" page, with the wiki's default page extension, will be the album. A "viewer" page, with the wiki's default page extension, will be
generated to display the image, if there isn't already a page of the same generated in the [[transient underlay|todo/transient_pages]] to display the
name as the image: for instance, if `debconf` is an album and image, if there isn't already a page of the same name as the image: for
`debconf/tuesday/p100.jpg` exists, then `debconf/tuesday/p100.mdwn` might instance, if `debconf` is an album and `debconf/tuesday/p100.jpg` exists,
be created. then `debconf/tuesday/p100.mdwn` might be created.
There's currently a hard-coded list of extensions that are treated as images: There's currently a hard-coded list of extensions that are treated as images:
`png`, `gif`, `jpg`, `jpeg` or `mov` files. More image and video types could `png`, `gif`, `jpg`, `jpeg` or `mov` files. More image and video types could
@ -138,7 +138,7 @@ image viewer.
as a reference implementation of that hook. as a reference implementation of that hook.
* There should be an option to reduce the size of photos and write them into * There should be an option to reduce the size of photos and write them into
an underlay, for this workflow: an underlay (perhaps just the transient underlay), for this workflow:
* your laptop's local ikiwiki has two underlays, `photos` and `webphotos` * your laptop's local ikiwiki has two underlays, `photos` and `webphotos`
* `photos` contains full resolution photos with EXIF tags * `photos` contains full resolution photos with EXIF tags

9
doc/plugins/contrib/transient.mdwn 100644
View File

@ -0,0 +1,9 @@
[[!template id=plugin name=transient author="[[Simon_McVittie|smcv]]"]]
[[!template id=gitbranch branch=smcv/ready/transient author="[[Simon_McVittie|smcv]]"]]
[[!tag type/special-purpose]]
The `transient` plugin is an implementation of [[todo/transient pages]]
in an underlay. It's mostly useful as something other plugins can depend on;
[[plugins/contrib/album]] puts photo-album "viewer" pages there,
and the versions of [[plugins/autoindex]] and [[plugins/tag]] on the
same branch optionally put their auto-generated pages there.