[Moin-devel] CVS: MoinMoin wikiutil.py,1.103,1.104

[J?rgen Hermann]

Update of /cvsroot/moin/MoinMoin
In directory usw-pr-cvs1:/tmp/cvs-serv22555/MoinMoin

Modified Files:
	wikiutil.py 
Log Message:
Flags


Index: wikiutil.py
===================================================================
RCS file: /cvsroot/moin/MoinMoin/wikiutil.py,v
retrieving revision 1.103
retrieving revision 1.104
diff -C2 -r1.103 -r1.104
*** wikiutil.py	8 Jun 2002 08:08:45 -0000	1.103
--- wikiutil.py	15 Jun 2002 11:36:10 -0000	1.104
***************
*** 38,71 ****
  
  smileys = {
!     "X-(":  (15, 15, "angry.gif"),
!     ":D":   (15, 15, "biggrin.gif"),
!     "<:(":  (15, 15, "frown.gif"),
!     ":o":   (15, 15, "redface.gif"),
!     ":(":   (15, 15, "sad.gif"),
!     ":)":   (15, 15, "smile.gif"),
!     "B)":   (15, 15, "smile2.gif"),
!     ":))":  (15, 15, "smile3.gif"),
!     ";)":   (15, 15, "smile4.gif"),
!     "/!\\": (15, 15, "alert.gif"),
!     "<!>":  (15, 15, "attention.gif"),
!     "(!)":  (15, 15, "idea.gif"),
  
      # copied 2001-11-16 from http://pikie.darktech.org/cgi/pikie.py?EmotIcon
!     ":-?":  (15, 15, "tongue.gif"),
!     ":\\":  (15, 15, "ohwell.gif"),
!     ">:>":  (15, 15, "devil.gif"),
!     "%)":   (15, 15, "eyes.gif"),
!     "@)":   (15, 15, "eek.gif"),
!     "|)":   (15, 15, "tired.gif"),
!     ";))":  (15, 15, "lol.gif"),
  
      # version 1.0
!     "(./)":  (20, 15, "checkmark.gif"),
!     "{OK}":  (14, 12, "thumbs-up.gif"),
!     "{X}":   (16, 16, "icon-error.gif"),
!     "{i}":   (16, 16, "icon-info.gif"),
!     "{1}":   (15, 13, "prio1.gif"),
!     "{2}":   (15, 13, "prio2.gif"),
!     "{3}":   (15, 13, "prio3.gif"),
  }
  
--- 38,86 ----
  
  smileys = {
!     "X-(":  (15, 15, 0, "angry.gif"),
!     ":D":   (15, 15, 0, "biggrin.gif"),
!     "<:(":  (15, 15, 0, "frown.gif"),
!     ":o":   (15, 15, 0, "redface.gif"),
!     ":(":   (15, 15, 0, "sad.gif"),
!     ":)":   (15, 15, 0, "smile.gif"),
!     "B)":   (15, 15, 0, "smile2.gif"),
!     ":))":  (15, 15, 0, "smile3.gif"),
!     ";)":   (15, 15, 0, "smile4.gif"),
!     "/!\\": (15, 15, 0, "alert.gif"),
!     "<!>":  (15, 15, 0, "attention.gif"),
!     "(!)":  (15, 15, 0, "idea.gif"),
  
      # copied 2001-11-16 from http://pikie.darktech.org/cgi/pikie.py?EmotIcon
!     ":-?":  (15, 15, 0, "tongue.gif"),
!     ":\\":  (15, 15, 0, "ohwell.gif"),
!     ">:>":  (15, 15, 0, "devil.gif"),
!     "%)":   (15, 15, 0, "eyes.gif"),
!     "@)":   (15, 15, 0, "eek.gif"),
!     "|)":   (15, 15, 0, "tired.gif"),
!     ";))":  (15, 15, 0, "lol.gif"),
  
      # version 1.0
!     "(./)":  (20, 15, 0, "checkmark.gif"),
!     "{OK}":  (14, 12, 0, "thumbs-up.gif"),
!     "{X}":   (16, 16, 0, "icon-error.gif"),
!     "{i}":   (16, 16, 0, "icon-info.gif"),
!     "{1}":   (15, 13, 0, "prio1.gif"),
!     "{2}":   (15, 13, 0, "prio2.gif"),
!     "{3}":   (15, 13, 0, "prio3.gif"),
! 
!     # version 1.1 (flags)
!     # flags for the languages in MoinMoin.i18n
!     "{de}":  (18, 12, 0, "flag-de.gif"),
!     "{en}":  (24, 12, 0, "flag-en.gif"),
!     "{fi}":  (18, 12, 1, "flag-fi.gif"),
!     "{fr}":  (18, 12, 1, "flag-fr.gif"),
!     "{it}":  (18, 12, 1, "flag-it.gif"),
!     "{ja}":  (18, 12, 1, "flag-ja.gif"),
!     "{ko}":  (18, 12, 1, "flag-ko.gif"),
!     "{nl}":  (18, 12, 1, "flag-nl.gif"),
!     "{pt}":  (18, 12, 0, "flag-pt.gif"),
!     "{sv}":  (18, 12, 0, "flag-sv.gif"),
!     "{us}":  (20, 12, 0, "flag-us.gif"),
!     "{zh}":  (18, 12, 0, "flag-zh.gif"),
  }
  
***************
*** 73,80 ****
  def getSmiley(text, formatter):
      if formatter.request.user.show_emoticons:
!         w, h, img = smileys[string.strip(text)]
          return formatter.image(
              src="%s/img/%s" % (config.url_prefix, img),
!             alt=text, hspace=6, width=w, height=h)
      else:
          return formatter.text(text)
--- 88,95 ----
  def getSmiley(text, formatter):
      if formatter.request.user.show_emoticons:
!         w, h, b, img = smileys[string.strip(text)]
          return formatter.image(
              src="%s/img/%s" % (config.url_prefix, img),
!             alt=text, hspace=6, width=w, height=h, border=b)
      else:
          return formatter.text(text)