* Added smiley plugin, nicely controlled and documented by the smileys page.

* Copied in some smileys from Moin Moin.

24 files changed, 45 insertions, 0 deletions

diff --git a/basewiki/helponformatting.mdwn b/basewiki/helponformatting.mdwn
index 9f7bcd9d1..a34f20144 100644
--- a/basewiki/helponformatting.mdwn
+++ b/basewiki/helponformatting.mdwn
@@ -54,6 +54,9 @@ To link to any other web page, or to an email address, you can just put the url
 Advanced users can use [[PreProcessorDirective]]s to do additional cool
 stuff.
 
+Also, if the smiley plugin is enabled in your wiki, you can insert
+[[smileys]] and some other useful symbols.
+
 ----
 
 This style of text formatting is called [[MarkDown]].
diff --git a/basewiki/smileys.mdwn b/basewiki/smileys.mdwn
new file mode 100644
index 000000000..2b23d2ba2
--- /dev/null
+++ b/basewiki/smileys.mdwn
@@ -0,0 +1,42 @@
+This page is used to control what smileys are supported by the wiki.
+Just write the text of a smiley to display it.
+
+* \:)	[[smileys/smile.png]]
+* \:-)	[[smileys/smile.png]]
+* \:D	[[smileys/biggrin.png]]
+* \B)	[[smileys/smile2.png]]
+* \:))	[[smileys/smile3.png]]
+* \:-))	[[smileys/smile3.png]]
+* \;)	[[smileys/smile4.png]]
+* \;-)	[[smileys/smile4.png]]
+* \:\	[[smileys/ohwell.png]]
+* \:/	[[smileys/ohwell.png]]
+* \>:>	[[smileys/devil.png]]
+* \X-(	[[smileys/angry.png]]
+* \<:(	[[smileys/frown.png]]
+* \:(	[[smileys/sad.png]]
+* \:-(	[[smileys/sad.png]]
+* \:-?	[[smileys/tongue.png]]
+* \:o	[[smileys/redface.png]]
+* \|)	[[smileys/tired.png]]
+* \|-)	[[smileys/tired.png]]
+* \{OK}	[[smileys/thumbs-up.png]]
+* \{X}	[[smileys/icon-error.png]]
+* \(./)	[[smileys/checkmark.png]]
+* \(!)	[[smileys/idea.png]]
+* \[!]	[[smileys/attention.png]]
+* \/!\	[[smileys/alert.png]]
+* \{*}	[[smileys/star_on.png]]
+* \{o}	[[smileys/star_off.png]]
+
+For example: {*} :-) {*}
+
+----
+
+To change the supported smileys, just edit the lists on this page.
+Note that the format is important; each list item should start with the
+text that is turned into the smiley, escaped so that users can see what
+produces it, followed by a [[WikiLink]] to the image to display.
+
+/!\ Bear in mind that the link to the imge needs to be written in a way that
+will work if it's copied to other pages on the wiki.
diff --git a/basewiki/smileys/alert.png b/basewiki/smileys/alert.png
new file mode 100644
index 000000000..5bb87e33f
--- /dev/null
+++ b/basewiki/smileys/alert.png
diff --git a/basewiki/smileys/angry.png b/basewiki/smileys/angry.png
new file mode 100644
index 000000000..05bc69f74
--- /dev/null
+++ b/basewiki/smileys/angry.png
diff --git a/basewiki/smileys/attention.png b/basewiki/smileys/attention.png
new file mode 100644
index 000000000..7e064566d
--- /dev/null
+++ b/basewiki/smileys/attention.png
diff --git a/basewiki/smileys/biggrin.png b/basewiki/smileys/biggrin.png
new file mode 100644
index 000000000..f71b42c11
--- /dev/null
+++ b/basewiki/smileys/biggrin.png
diff --git a/basewiki/smileys/checkmark.png b/basewiki/smileys/checkmark.png
new file mode 100644
index 000000000..8869caa19
--- /dev/null
+++ b/basewiki/smileys/checkmark.png
diff --git a/basewiki/smileys/devil.png b/basewiki/smileys/devil.png
new file mode 100644
index 000000000..8684c3970
--- /dev/null
+++ b/basewiki/smileys/devil.png
diff --git a/basewiki/smileys/frown.png b/basewiki/smileys/frown.png
new file mode 100644
index 000000000..2999b55ea
--- /dev/null
+++ b/basewiki/smileys/frown.png
diff --git a/basewiki/smileys/icon-error.png b/basewiki/smileys/icon-error.png
new file mode 100644
index 000000000..53b1055f6
--- /dev/null
+++ b/basewiki/smileys/icon-error.png
diff --git a/basewiki/smileys/icon-info.png b/basewiki/smileys/icon-info.png
new file mode 100644
index 000000000..c08b08d74
--- /dev/null
+++ b/basewiki/smileys/icon-info.png
diff --git a/basewiki/smileys/idea.png b/basewiki/smileys/idea.png
new file mode 100644
index 000000000..37bc02ddc
--- /dev/null
+++ b/basewiki/smileys/idea.png
diff --git a/basewiki/smileys/ohwell.png b/basewiki/smileys/ohwell.png
new file mode 100644
index 000000000..a83adfbf5
--- /dev/null
+++ b/basewiki/smileys/ohwell.png
diff --git a/basewiki/smileys/redface.png b/basewiki/smileys/redface.png
new file mode 100644
index 000000000..9a8739253
--- /dev/null
+++ b/basewiki/smileys/redface.png
diff --git a/basewiki/smileys/sad.png b/basewiki/smileys/sad.png
new file mode 100644
index 000000000..68d9966cf
--- /dev/null
+++ b/basewiki/smileys/sad.png
diff --git a/basewiki/smileys/smile.png b/basewiki/smileys/smile.png
new file mode 100644
index 000000000..b51b3ff49
--- /dev/null
+++ b/basewiki/smileys/smile.png
diff --git a/basewiki/smileys/smile2.png b/basewiki/smileys/smile2.png
new file mode 100644
index 000000000..43ea05f9d
--- /dev/null
+++ b/basewiki/smileys/smile2.png
diff --git a/basewiki/smileys/smile3.png b/basewiki/smileys/smile3.png
new file mode 100644
index 000000000..c690ccc2f
--- /dev/null
+++ b/basewiki/smileys/smile3.png
diff --git a/basewiki/smileys/smile4.png b/basewiki/smileys/smile4.png
new file mode 100644
index 000000000..f8f5b523d
--- /dev/null
+++ b/basewiki/smileys/smile4.png
diff --git a/basewiki/smileys/star_off.png b/basewiki/smileys/star_off.png
new file mode 100644
index 000000000..c5535c3de
--- /dev/null
+++ b/basewiki/smileys/star_off.png
diff --git a/basewiki/smileys/star_on.png b/basewiki/smileys/star_on.png
new file mode 100644
index 000000000..ec5c03097
--- /dev/null
+++ b/basewiki/smileys/star_on.png
diff --git a/basewiki/smileys/thumbs-up.png b/basewiki/smileys/thumbs-up.png
new file mode 100644
index 000000000..1faabace7
--- /dev/null
+++ b/basewiki/smileys/thumbs-up.png
diff --git a/basewiki/smileys/tired.png b/basewiki/smileys/tired.png
new file mode 100644
index 000000000..a3d5c56fb
--- /dev/null
+++ b/basewiki/smileys/tired.png
diff --git a/basewiki/smileys/tongue.png b/basewiki/smileys/tongue.png
new file mode 100644
index 000000000..65105407c
--- /dev/null
+++ b/basewiki/smileys/tongue.png