Changeset 1492

Timestamp:

08/16/11 22:05:25 (22 months ago)

Author:

Torben Brodt

Message:

template and language updates

Location:

xmpp

Files:

• de.xml (modified) (1 diff)
• en.xml (modified) (1 diff)
• options.xml (modified) (1 diff)
• templates/chat.tpl (modified) (2 diffs)

xmpp/de.xml

@@ -10 +10 @@
         <!-- ACP -->
         <category name="wcf.acp.option">
-                <item name="wcf.acp.option.module_chat"><![CDATA[XMPP Integration]]></item>
-                <item name="wcf.acp.option.module_chat.description"><![CDATA[Aktiviert die XMPP Integration.]]></item>
+                <item name="wcf.acp.option.module_xmpp"><![CDATA[XMPP Integration]]></item>
+                <item name="wcf.acp.option.module_xmpp.description"><![CDATA[Aktiviert die XMPP Integration.]]></item>
                 <item name="wcf.acp.option.category.general.http.chat"><![CDATA[Chat]]></item>
                 <item name="wcf.acp.option.category.general.http.chat.description"><![CDATA[]]></item>

xmpp/en.xml

@@ -10 +10 @@
         <!-- ACP -->
         <category name="wcf.acp.option">
-                <item name="wcf.acp.option.module_chat"><![CDATA[XMPP Integration]]></item>
-                <item name="wcf.acp.option.module_chat.description"><![CDATA[Enables the XMPP Integration.]]></item>
+                <item name="wcf.acp.option.module_xmpp"><![CDATA[XMPP Integration]]></item>
+                <item name="wcf.acp.option.module_xmpp.description"><![CDATA[Enables the XMPP Integration.]]></item>
                 <item name="wcf.acp.option.category.general.http.chat"><![CDATA[Chat]]></item>
                 <item name="wcf.acp.option.category.general.http.chat.description"><![CDATA[]]></item>

xmpp/options.xml

@@ -10 +10 @@
                 
                 <options>
-                        <option name="module_chat">
+                        <option name="module_xmpp">
                                 <categoryname>module.content</categoryname>
                                 <optiontype>boolean</optiontype>

xmpp/templates/chat.tpl

@@ -18 +18 @@
                 </div>
         </div>
-        
-        {if $userMessages|isset}{@$userMessages}{/if}
-        
-        {if $errorField}
-                <p class="error">{lang}wcf.global.form.error{/lang}</p>
-        {/if}
-        
+
         <script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.6.1/jquery.min.js"></script>
+        <script type="text/javascript">jQuery.noConflict();</script>
         <link rel="stylesheet" type="text/css" href="{@RELATIVE_WCF_DIR}images/candy/default.css" />
         <script type="text/javascript" src="{@RELATIVE_WCF_DIR}js/3rdParty/candy.libs.bundle.js"></script>
         <script type="text/javascript" src="{@RELATIVE_WCF_DIR}js/3rdParty/candy.min.js"></script>
         <script type="text/javascript">
-                $(document).ready(function() {
+                onloadEvents.push(function(){
                         Candy.init('http-bind/', {
                                 core: { debug: false },
@@ -39 +34 @@
         </script>
 
+        {if $userMessages|isset}{@$userMessages}{/if}
+        <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>