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

diff --git a/doc/forum/Calendar:_listing_multiple_entries_per_day.mdwn b/doc/forum/Calendar:_listing_multiple_entries_per_day.mdwn
new file mode 100644 (file)
index 0000000..51c3200
--- /dev/null
+++ b/doc/forum/Calendar:_listing_multiple_entries_per_day.mdwn
@@ -0,0 +1,17 @@
+Hi,
+
+I'd very much like to be able to list my blog posts on a daily basis (used for logging work) - rather than have the Calendar plugin return the first post only.
+
+There was some effort to do this as detailed here.
+
+[[http://ikiwiki.info/todo/Set_arbitrary_date_to_be_used_by_calendar_plugin/]]
+
+I had a quick go at doing something similar on Debian Stable (Ikiwiki 3.0) but alas my Ikiwiki fu is not strong enough.
+
+I'm not sure how I go about swapping the link on the day number to a link to, I guess, a dynamically generated page of links?
+
+    $linkcach{"$year/$mtag/$mday"}{$p} = ${p}
+
+and a suitable whilst loop looks to be all that's needed...
+
+Any pointers appreciated.

diff --git a/doc/forum/Can_I_have_different_favicons_for_each_folder__63__.mdwn b/doc/forum/Can_I_have_different_favicons_for_each_folder__63__.mdwn
new file mode 100644 (file)
index 0000000..0fefb35
--- /dev/null
+++ b/doc/forum/Can_I_have_different_favicons_for_each_folder__63__.mdwn
@@ -0,0 +1 @@
+I would like to have different favicons for different parts (folders) of my Ikiwiki site, like you can have different CSS files via the localstyle plugin. Is this possible? If not, could it be made possible?

diff --git a/doc/forum/Can_I_have_different_favicons_for_each_folder__63__/comment_1_a01112ba235e2f44a7655c36ef680e7e._comment b/doc/forum/Can_I_have_different_favicons_for_each_folder__63__/comment_1_a01112ba235e2f44a7655c36ef680e7e._comment
new file mode 100644 (file)
index 0000000..dee6e61
--- /dev/null
+++ b/doc/forum/Can_I_have_different_favicons_for_each_folder__63__/comment_1_a01112ba235e2f44a7655c36ef680e7e._comment
@@ -0,0 +1,19 @@
+[[!comment format=mdwn
+ username="http://smcv.pseudorandom.co.uk/"
+ nickname="smcv"
+ subject="comment 1"
+ date="2011-11-21T11:37:02Z"
+ content="""
+You could use [[plugins/pagetemplate]] to override all of `page.tmpl`, but
+that's using a sledgehammer to crack a nut.
+
+Another way to do it would be to modify `IkiWiki/Plugins/favicon.pm`
+to use `bestlink` to find the favicon, like [[plugins/localstyle]] does.
+If you made it a config option (`localfavicon => 1` or something)
+it could probably be included in ikiwiki as part of the official
+[[plugins/favicon]] plugin?
+
+Another way would be to have a new `localfavicon` plugin which overrides
+the template variable from [[plugins/favicon]], using `last => 1` to
+make sure it \"wins\".
+"""]]

diff --git a/doc/git.mdwn b/doc/git.mdwn
index e589b757e8bdcd33d04e80fa85f60edf53bdd7ed..2e58c699272c86deff159167f9d5a080767b3a47 100644 (file)
--- a/doc/git.mdwn
+++ b/doc/git.mdwn
@@ -73,7 +73,7 @@ think about merging them. This is recommended. :-)
 * [[sajolida]] `http://un.poivron.org/~sajolida/ikiwiki.git/`
 * nezmer `git://gitorious.org/ikiwiki-nezmer/ikiwiki-nezmer.git`
 * [[yds]] `git://github.com/yds/ikiwiki.git`
-* [[pelle]] `git://gitorious.org/pelle-ikiwiki/patches.git`
+* [[pelle]] `git://github.com/hemmop/ikiwiki.git`
 
 ## branches
 

diff --git a/doc/ikiwikiusers.mdwn b/doc/ikiwikiusers.mdwn
index 72f2c6b8eafe326d33e0164c9943dec6c48d9455..977641b405f54e057732546b9a2c036d10650a84 100644 (file)
--- a/doc/ikiwikiusers.mdwn
+++ b/doc/ikiwikiusers.mdwn
@@ -170,3 +170,4 @@ Personal sites and blogs
 * [Richardson Family Wiki](http://the4richardsons.com) A wiki, blog or some such nonsense for the family home page or something or other... I will eventually move the rest of my sites to ikiwiki. The source of the site is in git.
 * [The personal website of Andrew Back](http://carrierdetect.com)
 * [SolderPad Documentation](http://docs.solderpad.com)
+* various sub-domains at kisikew.org ([example](https://portal.kisikew.org/))

diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn
index 3aaf6d885cd44e0893e015cd661242e1e590af30..06cb4f25cd05a8fdb2947b7931d3ecc4101c95dd 100644 (file)
--- a/doc/sandbox.mdwn
+++ b/doc/sandbox.mdwn
@@ -41,6 +41,15 @@ Testing this sandbox thing.
 >>> ...and different font colors.
 >>>> ...but it's nothing a little CSS can't fix.
 
+# Pointless heading
+
+Let's see a table:
+
+[[!table data="""
+Heading 1|Heading 2|Heading 3
+Item 1| Item 2| Item 3"""]]
+
+
 Numbered list 
 
 1. First item.
@@ -159,3 +168,4 @@ endmodule
 """]]
 
 
+This is simple enough for now [[sandbocen]] no?

diff --git a/doc/sandbox/sandbocen.mdwn b/doc/sandbox/sandbocen.mdwn
new file mode 100644 (file)
index 0000000..8f7e049
--- /dev/null
+++ b/doc/sandbox/sandbocen.mdwn
@@ -0,0 +1,5 @@
+Great!
+
+<code>
+if (sample == test) goto Dijkstra
+</code>

diff --git a/doc/todo/Modern_standard_layout.mdwn b/doc/todo/Modern_standard_layout.mdwn
new file mode 100644 (file)
index 0000000..feb08e8
--- /dev/null
+++ b/doc/todo/Modern_standard_layout.mdwn
@@ -0,0 +1,3 @@
+I think it would be a good idea to think about the standard layout style of ikiwiki, the current layout used in a standard setup and on ikiwiki.info as well looks a bit old-fashioned to me. I guess that a nice modern layout would attract more new ikiwiki users and boost the ikwiki community... 
+
+> FWIW, I agree.  The actiontabs [[theme|themes]] would be a better default, but something which showed what ikiwiki was capable of (or more precicely: that ikiwiki is as capable as other popular wiki softwares) would be better still. — [[Jon]]