Merge commit 'upstream/master' into pub/master

[git.ikiwiki.info.git] / doc / todo / Gallery.mdwn

diff --git a/doc/todo/Gallery.mdwn b/doc/todo/Gallery.mdwn
index 52f1b31957f559bd7f67fe43ebeb0d4c6c22e188..fbf1802fdde7c81051ef4ca73e432f3cb2dbb3c3 100644 (file)
--- a/doc/todo/Gallery.mdwn
+++ b/doc/todo/Gallery.mdwn
@@ -1,8 +1,9 @@
 New Version of gallery is available now. Few more features have been added like support for multiple pages, sorting and resizing of images etc.
 
 SVN repository of plugin is located at http://ned.snow-crash.org:8080/svn/ikiwiki-gallery
+
 --[[arpitjain]]
---[[arpitjain]]
+
 ---- 
 
 creating a gallery of a bunch of images: 
@@ -27,9 +28,9 @@ That's one way to do it, and it has some nice benefits, like being able to edit
 
 --[[Joey]]
 
-[[tag soc]]
+[[!tag soc]]
 
-[[tag wishlist]]
+[[!tag wishlist]]
 
 ----
 
@@ -38,7 +39,7 @@ I have implemented the first version of the Gallery Plugin for Ikiwiki as part o
 Plugin can be downloaded from [here](http://myweb.unomaha.edu/~ajain/gallery.tar). 
 
 It can be used as : <br>
-\[[gallery imagedir="images" thumbnailsize="200x200" cols="3" alt="Can not be displayed" title="My Pictures"]]
+\[[!gallery imagedir="images" thumbnailsize="200x200" cols="3" alt="Can not be displayed" title="My Pictures"]]
 
 where-<br>
 * imagedir  => Directory containing images. It will scan all the files with jpg|png|gif extension from the directory and will put it in the gallery.<br>
@@ -58,4 +59,17 @@ For any feedback or query, feel free to mail me at arpitjain11 [AT] gmail.com
 
 Additional details are available [here](http://myweb.unomaha.edu/~ajain/ikiwikigallery.html).
 
-[[tag patch]]
+[[!tag patch]]
+
+> I'd love to merge this into ikiwiki.
+> 
+> However, lightbox.js is licensed under a non-free (Creative Commons) license. :-(
+> 
+> Since I don't much like the lightbox effects anyway (too much resizing
+> motion, too slow), I wonder if another template could be added, perhaps
+> a free one? 
+> 
+> Now that ikiwiki is in git, I've downloaded the most recenty version of
+> the gallery and put it in a "gallery" branch of my git repository.
+> 
+> --[[Joey]]