Changeset 1352 for HelpIM3

Timestamp:

12/21/10 15:50:45 (17 months ago)

Author:

zeank

Message:

make emoticons be a config option
closes #262

Location:

HelpIM3/branches/chatgroups

Files:

• HelpIM/chat/templates/Chat.py (modified) (4 diffs)
• HelpIM/chatgroup/pages/Chat.py (modified) (1 diff)
• HelpIM/web/templateBase.py (modified) (1 diff)
• config/sites/chatgroups.xml (modified) (1 diff)
• htdocs/chat.js (modified) (1 diff)

HelpIM3/branches/chatgroups/HelpIM/chat/templates/Chat.py

@@ -58 +58 @@
     "STARTUPLINES": [],
     "CHATGROUP_CHAT": "false",
+    "EMOTICONS": ":-\\) ;-\\) :-\\(",
     }
 
 class Template(HelpIM.web.templateBase.TemplateBase):
+
     def updateConfigs(self):
         """Class to update config from module globs. Has to be
@@ -84 +86 @@
             if not self.configs.get("NICKNAME", False):
                 self.configs["NICKNAME"] = "Child"
+
+        # read config from config file
+        if self.site and self.site.siteConfig.emoticons:
+            self.configs["EMOTICONS"] = self.site.siteConfig.emoticons
+
         # compose page:
         replacements = self.translations
         replacements.update(self.configs)
+
         # compose startup lines
         seperator = ""
@@ -150 +158 @@
 var STARTUPLINES = %(STARTUPLINES)s;
 var CHATGROUP_CHAT = %(CHATGROUP_CHAT)s;
+var EMOTICONS = "%(EMOTICONS)s";
 
 /************************************************************************
@@ -209 +218 @@
 var VERSION = "HelpIM3 based on Muckl 0.4.3";
 var PLAYSOUNDS = true;
-var EMOTICONS = ":-\\\\) ;-\\\\) :-\\\\(";
 //]]>-->
     </script>

HelpIM3/branches/chatgroups/HelpIM/chatgroup/pages/Chat.py

@@ -81 +81 @@
 
             # write template
-            template = HelpIM.chat.templates.Chat.Template()
+            template = HelpIM.chat.templates.Chat.Template(*pargs, **kwargs)
             return "text/html; charset=utf-8", template.compose(translations, configs)
         except (NoMeetingTodayException, TooLateException):

HelpIM3/branches/chatgroups/HelpIM/web/templateBase.py

@@ -26 +26 @@
 
 class TemplateBase:
-    def __init__(self):
+    def __init__(self, *args, **kwargs):
         """Create a new instance of the template"""
+
+        if kwargs.has_key('him_request'):
+            self.site = kwargs['him_request'].site
+
         self.translations = translations
         self.configs = configs

HelpIM3/branches/chatgroups/config/sites/chatgroups.xml

@@ -29 +29 @@
         mailFromName='helpim'
         mailFromEmail='helpim@localhost'
-  chatGroupStartWindow='10'
+        chatGroupStartWindow='10'
+        emoticons=":-\) ;-\) :-\( :-p"
         >
 

HelpIM3/branches/chatgroups/htdocs/chat.js

@@ -524 +524 @@
     cFrame.dir = DIR;
 
-
     var showEmoticons = EMOTICONS.split(" ")
     if (typeof(emoticons) != 'undefined') {
         var insert = "";
         for (var i=0; i<showEmoticons.length; i++) {
-            var iq = showEmoticons[i].replace(/\\/g, '');
             var emo = new Image();
             emo.src = emoticonpath+emoticons[showEmoticons[i]];
+            var iq = showEmoticons[i].replace(/\\/g, '');
             insert += '&#160;<img src="'+emo.src+'" ';
             if (emo.width > 0 && emo.height > 0) {