diff MoinMoin/config.py @ 734:bf2435e61f97

moved smileys from MoinMoin.config to theme, fixed smiley text_python caching bug
author Thomas Waldmann <tw AT waldmann-edv DOT de>
date Fri, 02 Jun 2006 16:58:56 +0200
parents 8e8130a1f46b
children
line wrap: on
line diff
--- a/MoinMoin/config.py	Wed May 31 12:04:43 2006 +0200
+++ b/MoinMoin/config.py	Fri Jun 02 16:58:56 2006 +0200
@@ -2,7 +2,7 @@
 """
     MoinMoin - site-wide configuration defaults (NOT per single wiki!)
 
-    @copyright: 2005 by Thomas Waldmann (MoinMoin:ThomasWaldmann)
+    @copyright: 2005-2006 by Thomas Waldmann (MoinMoin:ThomasWaldmann)
     @license: GNU GPL, see COPYING for details.
 """
 import re
@@ -13,8 +13,7 @@
 
 # Charset - we support only 'utf-8'. While older encodings might work,
 # we don't have the resources to test them, and there is no real
-# benefit for the user.
-# IMPORTANT: use only lowercase 'utf-8'!
+# benefit for the user. IMPORTANT: use only lowercase 'utf-8'!
 charset = 'utf-8'
 
 # Invalid characters - invisible characters that should not be in page
@@ -37,48 +36,8 @@
 umask = 0770
 url_schemas = []
 
-smileys = {
-    "X-(":  (15, 15, 0, "angry.png"),
-    ":D":   (15, 15, 0, "biggrin.png"),
-    "<:(":  (15, 15, 0, "frown.png"),
-    ":o":   (15, 15, 0, "redface.png"),
-    ":(":   (15, 15, 0, "sad.png"),
-    ":)":   (15, 15, 0, "smile.png"),
-    "B)":   (15, 15, 0, "smile2.png"),
-    ":))":  (15, 15, 0, "smile3.png"),
-    ";)":   (15, 15, 0, "smile4.png"),
-    "/!\\": (15, 15, 0, "alert.png"),
-    "<!>":  (15, 15, 0, "attention.png"),
-    "(!)":  (15, 15, 0, "idea.png"),
-
-    # copied 2001-11-16 from http://pikie.darktech.org/cgi/pikie.py?EmotIcon
-    ":-?":  (15, 15, 0, "tongue.png"),
-    ":\\":  (15, 15, 0, "ohwell.png"),
-    ">:>":  (15, 15, 0, "devil.png"),
-    "|)":   (15, 15, 0, "tired.png"),
-    
-    # some folks use noses in their emoticons
-    ":-(":  (15, 15, 0, "sad.png"),
-    ":-)":  (15, 15, 0, "smile.png"),
-    "B-)":  (15, 15, 0, "smile2.png"),
-    ":-))": (15, 15, 0, "smile3.png"),
-    ";-)":  (15, 15, 0, "smile4.png"),
-    "|-)":  (15, 15, 0, "tired.png"),
-    
-    # version 1.0
-    "(./)":  (20, 15, 0, "checkmark.png"),
-    "{OK}":  (14, 12, 0, "thumbs-up.png"),
-    "{X}":   (16, 16, 0, "icon-error.png"),
-    "{i}":   (16, 16, 0, "icon-info.png"),
-    "{1}":   (15, 13, 0, "prio1.png"),
-    "{2}":   (15, 13, 0, "prio2.png"),
-    "{3}":   (15, 13, 0, "prio3.png"),
-
-    # version 1.3.4 (stars)
-    # try {*}{*}{o}
-    "{*}":   (15, 15, 0, "star_on.png"),
-    "{o}":   (15, 15, 0, "star_off.png"),
-}
+smileys = (r"X-( :D <:( :o :( :) B) :)) ;) /!\ <!> (!) :-? :\ >:> |) " +
+           r":-( :-) B-) :-)) ;-) |-) (./) {OK} {X} {i} {1} {2} {3} {*} {o}").split()
 
 # unicode: set the char types (upper, lower, digits, spaces)
 from MoinMoin.util.chartypes import _chartypes