Merge branch 'master' into cvs

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

diff --git a/doc/todo/Gallery.mdwn b/doc/todo/Gallery.mdwn
index 6d5ac85f2ab669698ca2da4a6e07919e9f819d13..f41980333fc19d9b0b773eaddf8f1551df7ac555 100644 (file)
--- a/doc/todo/Gallery.mdwn
+++ b/doc/todo/Gallery.mdwn
@@ -1,6 +1,8 @@
+[[!template id=gitbranch branch=origin/gallery author="[[arpitjain]]"]]
+

 New Version of gallery is available now. Few more features have been added like support for multiple pages, sorting and resizing of images etc.
 
 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
+Gallery repo is now available at  <http://github.com/joeyh/ikiwiki/tree/gallery>

 
 --[[arpitjain]]
 
 
 --[[arpitjain]]
 


@@ -28,9 +30,9 @@ That's one way to do it, and it has some nice benefits, like being able to edit
 
 --[[Joey]]
 
 
 --[[Joey]]
 

-[[tag soc]]
+[[!tag soc]]

 
 

-[[tag wishlist]]
+[[!tag wishlist]]

 
 ----
 
 
 ----
 


@@ -39,7 +41,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>
 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>
 
 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>


@@ -59,4 +61,23 @@ 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).
 
 
 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]]
+
+----
+
+See also [[/users/smcv/gallery]] for another implementation of the same sort of
+thing. Unfortunately, none of the implementation ideas
+I have there seem quite right either... --[[smcv]]