Merge branch 'master' into debian-jessie-backports

[git.ikiwiki.info.git] / doc / users / kjs.mdwn

diff --git a/doc/users/kjs.mdwn b/doc/users/kjs.mdwn
index 7a800727a4d5d8c8deb2f8142ee8cdf94f6cb1af..0519cf926048954554e3b85ebca8e33cd6ebd5d2 100644 (file)
--- a/doc/users/kjs.mdwn
+++ b/doc/users/kjs.mdwn
@@ -7,16 +7,18 @@ Websites using ikiwiki:
 * <http://stockholm.kalleswork.net>
 
 
+[[!template id=gitbranch branch=kjs/kalleswork.net author="[[Kalle Söderman|kjs]]"]]
+
 Mostly using ikiwiki with the [[/plugins/contrib/album/]] and [[plugins/osm]]
 plugins. My git repo with tweaks including the simplebw theme and various
-changes to the [[plugins/contrib/album]] plugin and templates can be cloned at:
+changes to the [[plugins/contrib/album]] plugin and templates can be found in
+my kalleswork.net branch
 
-       git://src.kalleswork.net/ikiwiki.git
+Note that the kalleswork.net branch is all my changes piled into one branch
+that I compile to run my sites. 
 
-Note that the default branch kalleswork.net-current is all my changes piled
-into one branch. **I can't code (clone my repo above if you don't believe me!)
-so noone should run my code without checking it first.** I can't stress this
-enough.
+**I can't code (clone my repo above if you don't believe me!) so noone should
+run my code without checking it first.** I can't stress this enough.
 
 The main changes I've done are the following
 
@@ -34,14 +36,7 @@ link to the album. Useful for visual index of albums.
 * Extract GPS data and populate a [[plugins/osm]] waypoint if available.
 * Add span around osm icon to allow for styling.
 
-For my public websites above the image metadata is "manually" ie shell script
-populated but I'll eventually start using automatic metadata for new images.
-
-A dump of my debug site with relatively low res images can be found at
-<http://src.kalleswork.net/ikidebug/> where the current behavior sans maps can be
-tested. Its full of noise so see my proper sites above for how it should look.
+For my public websites above have been using the tweaked img plugin for many months now. It works well except when deleting images, this seems to require a removal of the indexdb and a rebuild... not very convenient.
 
-* <http://src.kalleswork.net/ikidebug/album01> contains scaled images with
-download link
-* <http://src.kalleswork.net/ikidebug/album02> contains images with album size
-set to "full"
+A simple test wiki with downloadable setup and data can be found at:
+<http://src.kalleswork.net/masterbranch/>