From 31bb5268973534d5262bf301864f033f60db39c7 Mon Sep 17 00:00:00 2001 From: bremner Date: Tue, 9 Jun 2009 22:54:28 -0400 Subject: feature request/discussion for highlight options. --- doc/plugins/highlight/discussion.mdwn | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 doc/plugins/highlight/discussion.mdwn (limited to 'doc/plugins') diff --git a/doc/plugins/highlight/discussion.mdwn b/doc/plugins/highlight/discussion.mdwn new file mode 100644 index 000000000..612fb0fda --- /dev/null +++ b/doc/plugins/highlight/discussion.mdwn @@ -0,0 +1,3 @@ +It would be nice to be able to set a few options for the highlighter object. In particular, today I noticed my tabs were not being expanded correctly, which could +be fixed the command line with --replace-tabs but programmatically needs a call to setPreformatting. I could probably play with this, but what is your preferred way to support +options? something like 'highlight_options=>{replace_tabs=>8,line_numbers=>0}' ? Of course, if you want to implement it I won't complain :-). [[DavidBremner]] -- cgit v1.2.3 From 0b2e512d3648993ce24717d02be000862fc996c6 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sun, 14 Jun 2009 17:34:05 -0400 Subject: response --- doc/plugins/highlight/discussion.mdwn | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) (limited to 'doc/plugins') diff --git a/doc/plugins/highlight/discussion.mdwn b/doc/plugins/highlight/discussion.mdwn index 612fb0fda..7d3cabea9 100644 --- a/doc/plugins/highlight/discussion.mdwn +++ b/doc/plugins/highlight/discussion.mdwn @@ -1,3 +1,12 @@ -It would be nice to be able to set a few options for the highlighter object. In particular, today I noticed my tabs were not being expanded correctly, which could -be fixed the command line with --replace-tabs but programmatically needs a call to setPreformatting. I could probably play with this, but what is your preferred way to support -options? something like 'highlight_options=>{replace_tabs=>8,line_numbers=>0}' ? Of course, if you want to implement it I won't complain :-). [[DavidBremner]] +It would be nice to be able to set a few options for the highlighter +object. In particular, today I noticed my tabs were not being expanded +correctly, which could be fixed the command line with --replace-tabs but +programmatically needs a call to setPreformatting. I could probably play +with this, but what is your preferred way to support options? something +like 'highlight_options=>{replace_tabs=>8,line_numbers=>0}' ? Of course, +if you want to implement it I won't complain :-). [[DavidBremner]] + +> I don't know about tab replacement, which I can't really see the point +> of, but if there are multiple options, giving each its own nane would +> word better for websetup than would putting all the options in a +> sub-hash. --[[Joey]] -- cgit v1.2.3 From c94dce8afaab602978a2856155c310b8fc3947cd Mon Sep 17 00:00:00 2001 From: "http://smcv.pseudorandom.co.uk/" Date: Tue, 16 Jun 2009 13:07:58 -0400 Subject: --- doc/plugins/contrib/album.mdwn | 100 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 100 insertions(+) create mode 100644 doc/plugins/contrib/album.mdwn (limited to 'doc/plugins') diff --git a/doc/plugins/contrib/album.mdwn b/doc/plugins/contrib/album.mdwn new file mode 100644 index 000000000..94d5789d7 --- /dev/null +++ b/doc/plugins/contrib/album.mdwn @@ -0,0 +1,100 @@ +[[!template id=plugin name=album author="[[Simon_McVittie|smcv]]"]] +[[!tag type/chrome]] + +Available from [[smcv]]'s git repository, in the `album` branch +([[users/smcv/gallery|users/smcv/gallery]] contains some older +thoughts about this plugin). + +This plugin formats a collection of images into a photo album, +in the same way as many websites: good examples include the +PHP application [Gallery](http://gallery.menalto.com/), Flickr, +and Facebook's Photos "application". I've called it `album` +to distinguish it from [[contrib/gallery|plugins/contrib/gallery]], +although `gallery` might well be a better name for this functionality. + +The web UI I'm trying to achieve consists of one +[HTML page of thumbnails](http://www.pseudorandom.co.uk/2008/2008-03-08-panic-cell-gig/) +as an entry point to the album, where each thumbnail links to +[a "viewer" HTML page](http://www.pseudorandom.co.uk/2008/2008-03-08-panic-cell-gig/img_0068/) +with a full size image, next/previous thumbnail links, and +[[plugins/comments]]. + +(The Summer of Code [[plugins/contrib/gallery]] plugin does the +next/previous UI in Javascript using Lightbox, which means that +individual photos can't be bookmarked in a meaningful way, and +the best it can do as a fallback for non-Javascript browsers +is to provide a direct link to the image.) + +## Writing the viewers + + \[[!albumimage image=foo.jpg album=myalbum + title=... + caption=... + copyright=... + size=... + viewertemplate=... + ]] + +Each viewer contains one `\[[!albumimage]]` directive. This +sets the `image` filename, the `album` in which this image appears, +and an optional `caption`, and can override the `size` at which to +display the image and the `viewertemplate` to use to display the +image. + +It can also have `title`, `copyright` and `date` parameters, which +are short-cuts for [[ikiwiki/directive/meta]] directives. + +The viewer can also have any other content, but typically the +directive will be the only thing there. + +Eventually, there will be a specialized CGI user interface to +edit all the photos of an album at once, upload a new photo +(which will attach the photo but also write out a viewer page +for it), or mark an already-uploaded photo as a member of an +album (which is done by writing out a viewer page for it). + +The `\[[!albumimage]]` directive is replaced by an +[[ikiwiki/directive/img]], wrapped in some formatting using a +template (by default `albumviewer.tmpl`). The template can (and +should) also include "next photo", "previous photo" and +"up to gallery" links. + +The next/previous links are themselves implemented by +[[inlining|ikiwiki/directive/inline]] the next or previous +photo, using a special template (by default `albumnext.tmpl` +or `albumprev.tmpl`), in `archive`/`quick` mode. + +## Writing the album + +The album contains one `\[[!album]]` directive. It may also +contain any number of `\[[!albumsection]]` directives, for +example the demo album linked above could look like: + + \[[!album]] + + + ## Gamarra + + \[[!albumsection filter="link(gamarra)"]] + + + ## Smokescreen + + \[[!albumsection filter="link(smokescreen)"]] + + + ... + +The `\[[!album]]` directive is replaced by an +[[ikiwiki/directive/inline]] which automatically includes every +page that has an `\[[!albumimage]]` directive linking it to this +album, except those that will appear in an `\[[!albumsection]]`. + +The `inline` is in `archive`/`quick` mode, but includes some +extra information about the images, including file size and a +thumbnail (again, made using [[ikiwiki/directive/img]]). The +default template is `albumitem.tmpl`, which takes advantage +of these things. + +Each `\[[!albumsection]]` is replaced by a similar inline, which +selects a subset of the photos in the album. -- cgit v1.2.3 From 7ad6541a87bff64c84dcbb02f820c73d55f44845 Mon Sep 17 00:00:00 2001 From: "http://mjr.towers.org.uk/" Date: Mon, 22 Jun 2009 13:57:18 -0400 Subject: Home site is MIA. Where is it? --- doc/plugins/contrib/mediawiki/discussion.mdwn | 1 + 1 file changed, 1 insertion(+) create mode 100644 doc/plugins/contrib/mediawiki/discussion.mdwn (limited to 'doc/plugins') diff --git a/doc/plugins/contrib/mediawiki/discussion.mdwn b/doc/plugins/contrib/mediawiki/discussion.mdwn new file mode 100644 index 000000000..505b0189e --- /dev/null +++ b/doc/plugins/contrib/mediawiki/discussion.mdwn @@ -0,0 +1 @@ +Anyone know a safe place where this plugin can be found? -- mjr at phonecoop.coop -- cgit v1.2.3 From b5edd6d4d8f2e3b50213b91f1696195f8a83e97d Mon Sep 17 00:00:00 2001 From: simonraven Date: Mon, 22 Jun 2009 17:09:26 -0400 Subject: --- doc/plugins/contrib/mediawiki/discussion.mdwn | 2 ++ 1 file changed, 2 insertions(+) (limited to 'doc/plugins') diff --git a/doc/plugins/contrib/mediawiki/discussion.mdwn b/doc/plugins/contrib/mediawiki/discussion.mdwn index 505b0189e..07e6e8cdd 100644 --- a/doc/plugins/contrib/mediawiki/discussion.mdwn +++ b/doc/plugins/contrib/mediawiki/discussion.mdwn @@ -1 +1,3 @@ Anyone know a safe place where this plugin can be found? -- mjr at phonecoop.coop + +> I ended up doing a backassward way of doing it, as described at the [convert discussion page](http://ikiwiki.info/tips/convert_mediawiki_to_ikiwiki/discussion/). -[[simonraven]] -- cgit v1.2.3 From 7aec8e12acb00520259d91280500e1b39e85bdfc Mon Sep 17 00:00:00 2001 From: Jon Dowland Date: Tue, 23 Jun 2009 11:30:47 +0100 Subject: link to mirror of mediawiki.pm --- doc/plugins/contrib/mediawiki.mdwn | 2 ++ doc/plugins/contrib/mediawiki/discussion.mdwn | 2 ++ 2 files changed, 4 insertions(+) (limited to 'doc/plugins') diff --git a/doc/plugins/contrib/mediawiki.mdwn b/doc/plugins/contrib/mediawiki.mdwn index c0a23254f..7bf1ba0df 100644 --- a/doc/plugins/contrib/mediawiki.mdwn +++ b/doc/plugins/contrib/mediawiki.mdwn @@ -3,3 +3,5 @@ [The Mediawiki plugin](http://u32.net/Mediawiki_Plugin/) allows ikiwiki to process pages written using MediaWiki markup. + +Available at diff --git a/doc/plugins/contrib/mediawiki/discussion.mdwn b/doc/plugins/contrib/mediawiki/discussion.mdwn index 07e6e8cdd..5066d9de5 100644 --- a/doc/plugins/contrib/mediawiki/discussion.mdwn +++ b/doc/plugins/contrib/mediawiki/discussion.mdwn @@ -1,3 +1,5 @@ Anyone know a safe place where this plugin can be found? -- mjr at phonecoop.coop > I ended up doing a backassward way of doing it, as described at the [convert discussion page](http://ikiwiki.info/tips/convert_mediawiki_to_ikiwiki/discussion/). -[[simonraven]] + +>> I've mirrored it at . -- [[Jon]] -- cgit v1.2.3 From e96f28a31ef38fd886d35150ba76adffeeaa3838 Mon Sep 17 00:00:00 2001 From: "http://kaizer.se/" Date: Sat, 4 Jul 2009 03:50:50 -0400 Subject: rst support for WikiLinks via native syntax --- doc/plugins/rst/discussion.mdwn | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'doc/plugins') diff --git a/doc/plugins/rst/discussion.mdwn b/doc/plugins/rst/discussion.mdwn index a792b670f..db1ba6fc9 100644 --- a/doc/plugins/rst/discussion.mdwn +++ b/doc/plugins/rst/discussion.mdwn @@ -29,4 +29,12 @@ An exhaustive list of differences between prest and "standard" reST follows: * csv directive doesn't require csv.py * references directive doesn't allow options -There may be a few others; my eyes glazed over. --Ethan \ No newline at end of file +There may be a few others; my eyes glazed over. --Ethan + +rst support for ikiwiki seems to be on hold. rst is much more elegant +than markdown in my opinion, so I tried it out in ikiwiki. I found out +in other places that some directives work just fine, like [[meta]] and +[[tag]], others work fine if you wrap them in `.. raw::`, like [[inline]]. + +But to make a wiki we need [[WikiLinks]]; they can't be escape-inserted or such since they are inline elements in the text.. But images work fine in rst's syntax.. what about using rst syntax for wikilinks as well? +Is it possible to inject something into the parser to turn unmached links ` `WikiLink`_ ` into ikiwiki links? --ulrik -- cgit v1.2.3 From cb151da23313d9591dfdec244ceaae29aa3a1660 Mon Sep 17 00:00:00 2001 From: "http://kaizer.se/" Date: Sat, 4 Jul 2009 03:52:58 -0400 Subject: rst support for WikiLinks via native syntax (syntax tweak) --- doc/plugins/rst/discussion.mdwn | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'doc/plugins') diff --git a/doc/plugins/rst/discussion.mdwn b/doc/plugins/rst/discussion.mdwn index db1ba6fc9..9909784d5 100644 --- a/doc/plugins/rst/discussion.mdwn +++ b/doc/plugins/rst/discussion.mdwn @@ -36,5 +36,8 @@ than markdown in my opinion, so I tried it out in ikiwiki. I found out in other places that some directives work just fine, like [[meta]] and [[tag]], others work fine if you wrap them in `.. raw::`, like [[inline]]. -But to make a wiki we need [[WikiLinks]]; they can't be escape-inserted or such since they are inline elements in the text.. But images work fine in rst's syntax.. what about using rst syntax for wikilinks as well? -Is it possible to inject something into the parser to turn unmached links ` `WikiLink`_ ` into ikiwiki links? --ulrik +But to make a wiki we need [[WikiLinks]]; they can't be escape-inserted or +such since they are inline elements in the text.. But images work fine in +rst's syntax.. what about using rst syntax for wikilinks as well? +Is it possible to inject something into the parser to turn unmached links +``WikiLink`_` into ikiwiki links? --ulrik -- cgit v1.2.3 From 3054f1916e68648a1c483a0e0a1248106d7654b4 Mon Sep 17 00:00:00 2001 From: "http://lj.rossia.org/users/imz/" Date: Thu, 9 Jul 2009 19:41:13 -0400 Subject: minor: fixed a wikilink. --- doc/plugins/anonok.mdwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'doc/plugins') diff --git a/doc/plugins/anonok.mdwn b/doc/plugins/anonok.mdwn index a3fec4d89..497ca07c8 100644 --- a/doc/plugins/anonok.mdwn +++ b/doc/plugins/anonok.mdwn @@ -6,7 +6,7 @@ anonymous web users, who have not signed in, to edit any page in the wiki by default. The plugin also has a configuration setting, `anonok_pagespec`. This -[[PageSpec]] can be used to allow anonymous editing of matching pages. +[[ikiwiki/PageSpec]] can be used to allow anonymous editing of matching pages. If you're using the [[comments]] plugin, you can allow anonymous comments to be posted by setting: -- cgit v1.2.3 From 03d8ee0c61f9e3c46c5e4afe563d4df5faf3946c Mon Sep 17 00:00:00 2001 From: "http://smcv.pseudorandom.co.uk/" Date: Sat, 18 Jul 2009 10:08:19 -0400 Subject: Compare with [[todo/allow_site-wide_meta_definitions]] --- ...t_content_for___42__copyright__42___and___42__license__42__.mdwn | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'doc/plugins') diff --git a/doc/plugins/contrib/default_content_for___42__copyright__42___and___42__license__42__.mdwn b/doc/plugins/contrib/default_content_for___42__copyright__42___and___42__license__42__.mdwn index 5e3db3d7c..b9ad3cc8e 100644 --- a/doc/plugins/contrib/default_content_for___42__copyright__42___and___42__license__42__.mdwn +++ b/doc/plugins/contrib/default_content_for___42__copyright__42___and___42__license__42__.mdwn @@ -39,3 +39,9 @@ I'm missing something terribly obvious? --Peter By the way: these need not be *HTML* files; `copyright.mdwn`, respectively `license.mdwn`, or every other format supported by ikiwiki are likewise fine. --[[tschwinge]] + +> Jon has done something similar in [[todo/allow_site-wide_meta_definitions]]; +> his version has the advantages that it doesn't invent magical page names, +> and can extend beyond just copyright and license, but has the disadvantage +> that it doesn't support setting defaults for a given "subdirectory" +> only. --[[smcv]] -- cgit v1.2.3 From 2f573cf515816f9528b8ed84a97407c74b2367f4 Mon Sep 17 00:00:00 2001 From: "http://smcv.pseudorandom.co.uk/" Date: Sat, 18 Jul 2009 13:46:55 -0400 Subject: New plugin for review --- doc/plugins/contrib/trail.mdwn | 56 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 56 insertions(+) create mode 100644 doc/plugins/contrib/trail.mdwn (limited to 'doc/plugins') diff --git a/doc/plugins/contrib/trail.mdwn b/doc/plugins/contrib/trail.mdwn new file mode 100644 index 000000000..58ee46751 --- /dev/null +++ b/doc/plugins/contrib/trail.mdwn @@ -0,0 +1,56 @@ +[[!tag type/chrome patch]] + +Available from [[smcv]]'s git repository, in the `trail` branch. This +plugin aims to solve [[todo/wikitrails]] in a simpler way. + +Joey: what do you think of this plugin? If you like the general approach +and are likely to include it in ikiwiki, I'll try to modify +[[plugins/contrib/album]] to be based on it, rather than partially +reinventing it. + +---- + +[[!template id=plugin name=trail author="[[Simon_McVittie|smcv]]"]] + +It's sometimes useful to have "trails" of pages in a wiki, as a guided +tour, sequence of chapters etc. In this plugin, a trail is represented +by a page, and the pages in the trail are indicated by specially marked +links within that page. + +If using the default `page.tmpl`, each page automatically displays the +trails that it's a member of (if any), with links to the trail and to +the next and previous members. + +The `traillink` [[ikiwiki/directive]] is used to record which pages +are in a trail, and simultaneously link to them. Alternatively, the +[[ikiwiki/directive/inline]] directive can be used with `trail=yes` +to record the inlined pages as part of the trail, in the order in +which they are inlined. + +## Directives + +(These will go to the appropriate pages in [[ikiwiki/directive]] if this +plugin is included in ikiwiki.) + +### traillink + +The `traillink` directive is supplied by the [[!iki plugins/contrib/trail desc=trail]] +plugin. This directive appears on the page representing a trail. It acts +as a visible [[ikiwiki/WikiLink]], but also records the linked page as +a member of the trail. + +Various syntaxes can be used: + + \[[!traillink Badgers]] + \[[!traillink How_to_find_mushrooms_using_badgers|badgers]] + \[[!traillink badgers text="How to find mushrooms using badgers"]] + +### trailoptions + +The `trailoptions` directive is supplied by the [[!iki plugins/contrib/trail desc=trail]] +plugin. This directive appears on the page representing a trail, and +produces no output. + +Currently, the only option supported is `[[!trailoptions circular=yes]]`, +which adds links between the first and last pages, turning the trail into +a circle. -- cgit v1.2.3 From 398e6eec218fb9854d4c4416737708cdf67e981c Mon Sep 17 00:00:00 2001 From: "http://smcv.pseudorandom.co.uk/" Date: Sat, 18 Jul 2009 13:53:29 -0400 Subject: --- doc/plugins/contrib/trail.mdwn | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'doc/plugins') diff --git a/doc/plugins/contrib/trail.mdwn b/doc/plugins/contrib/trail.mdwn index 58ee46751..d8dc02f47 100644 --- a/doc/plugins/contrib/trail.mdwn +++ b/doc/plugins/contrib/trail.mdwn @@ -8,6 +8,10 @@ and are likely to include it in ikiwiki, I'll try to modify [[plugins/contrib/album]] to be based on it, rather than partially reinventing it. +This plugin can benefit from +[[another_of_my_branches|todo/inline_plugin:_specifying_ordered_page_names]] +but does not require it. + ---- [[!template id=plugin name=trail author="[[Simon_McVittie|smcv]]"]] -- cgit v1.2.3