Changeset 1493

Timestamp:

08/17/11 23:07:12 (22 months ago)

Author:

Torben Brodt

Message:

xmpp fixes

Location:

xmpp

Files:

• files/images/candy/default.css (modified) (2 diffs)
• files/lib/page/ChatPage.class.php (modified) (1 diff)
• templates/chat.tpl (modified) (2 diffs)

xmpp/files/images/candy/default.css

@@ -6 +6 @@
  * @copyright 2011 Amiado Group AG, All rights reserved.
  */
-html, body {
-        margin: 0;
-        padding: 0;
+#candy {
         font-family: Arial, Helvetica, sans-serif;
 }
@@ -23 +21 @@
 }
 
-a {
+#candy a {
         color: #333;
         text-decoration: none;
 }
 
-ul {
+#candy ul {
         list-style: none;
         padding: 0;

xmpp/files/lib/page/ChatPage.class.php

@@ -16 +16 @@
         public function assignVariables() {
                 parent::assignVariables();
-                
+
                 WCF::getTPL()->assign(array(
-                        'allowSpidersToIndexThisPage' => true
+                        'allowSpidersToIndexThisPage' => true,
+                        'username' => WCF::getUser()->userID ? WCF::getUser()->username : false
                 ));
         }

xmpp/templates/chat.tpl

@@ -25 +25 @@
         <script type="text/javascript" src="{@RELATIVE_WCF_DIR}js/3rdParty/candy.min.js"></script>
         <script type="text/javascript">
+        //<![CDATA[
                 onloadEvents.push(function(){
                         Candy.init('http-bind/', {
-                                core: { debug: false },
-                                view: { resources: '{@RELATIVE_WCF_DIR}images/candy/', language: 'de' }
+                                core: { 
+                                        debug: false,
+                                        autojoin: ['www@conference.talk.easy-coding.de']
+                                },
+                                view: {
+                                        resources: '{@RELATIVE_WCF_DIR}images/candy/', 
+                                        language: 'de' 
+                                }
                         });
-                        Candy.Core.connect();
+                        Candy.Core.connect({if $username}{$username|json_encode}{/if});
                 });
+        //]]>
         </script>
 
@@ -37 +45 @@
         <p class="info">Die Chat Integration in das Forum befindet sich noch im Aufbau. Mit eurem Jabber Client könnt ihr aber schon fleißig mitchatten. Mehr unter : <a href="http://www.easy-coding.de/easy-coding-xmpp-server-talk-easy-coding-de-t7173.html">easy-coding XMPP Server - talk.easy-coding.de</a></p>
 
-        <div id="candy"></div>
+        <div style="position:relative"><div id="candy"></div></div>
 </div>