Changeset 98

Timestamp:

11/21/07 18:00:43 (6 years ago)

Author:

d0nut

Message:

updatet tagging to 0.4.3, enhancement #4 - tagging works with deactivated javascript, enhancement #6 - permission-management, fixed bug: specialStyles was overwritten - now it is correctly appended

Location:

taggingreloaded

Files:

• de-informal.xml (modified) (1 diff)
• de.xml (modified) (1 diff)
• en.xml (modified) (1 diff)
• files/lib/page/TaggingPage.class.php (modified) (1 diff)
• files/lib/system/event/listener/TaggingReloadedPageListener.class.php (modified) (1 diff)
• groupoptions.xml (added)
• optionals/de.easy-coding.wbb.taggingreloaded/files/lib/system/event/listener/TaggingReloadedWBBMessageFormListener.class.php (modified) (2 diffs)
• optionals/de.easy-coding.wbb.taggingreloaded/files/lib/system/event/listener/TaggingReloadedWBBPageListener.class.php (modified) (1 diff)
• optionals/de.easy-coding.wbb.taggingreloaded/package.xml (modified) (2 diffs)
• package.xml (modified) (2 diffs)
• templates/messageFormTaggingReloaded.tpl (modified) (3 diffs)

taggingreloaded/de-informal.xml

@@ -31 +31 @@
                 <item name="wcf.header.menu.tagging"><![CDATA[Tagging]]></item>
         </category>
+
+        <category name="wcf.acp.group">
+                <item name="wcf.acp.group.option.user.message.tagging"><![CDATA[Tagging]]></item>
+                <item name="wcf.acp.group.option.user.message.tagging.description"><![CDATA[Dieser Benutzer darf BeitrÀge taggen.]]></item>
+        </category>
 </language>

taggingreloaded/de.xml

@@ -31 +31 @@
                 <item name="wcf.header.menu.tagging"><![CDATA[Tagging]]></item>
         </category>
+
+        <category name="wcf.acp.group">
+                <item name="wcf.acp.group.option.user.message.tagging"><![CDATA[Tagging]]></item>
+                <item name="wcf.acp.group.option.user.message.tagging.description"><![CDATA[Dieser Benutzer darf BeitrÀge taggen.]]></item>
+        </category>
 </language>

taggingreloaded/en.xml

@@ -31 +31 @@
                 <item name="wcf.header.menu.tagging"><![CDATA[Tagging]]></item>
         </category>
+
+        <category name="wcf.acp.group">
+                <item name="wcf.acp.group.option.user.message.tagging"><![CDATA[Tagging]]></item>
+                <item name="wcf.acp.group.option.user.message.tagging.description"><![CDATA[This user is permitted to add tags to posts.]]></item>
+        </category>
 </language>

taggingreloaded/files/lib/page/TaggingPage.class.php

@@ -81 +81 @@
                         'desc' => $desc,
                         'tags' => $this->tags,
-                        'specialStyles' => '<link rel="stylesheet" type="text/css" href="'.RELATIVE_WCF_DIR.'style/taggingreloaded.css" />',
                         'allowSpidersToIndexThisPage' => true
                         ));
                 
                 WCF::getTPL()->append('additionalTaggingContents', WCF::getTPL()->fetch('taggingCloud'));
+                WCF::getTPL()->append('specialStyles', '<link rel="stylesheet" type="text/css" href="'.RELATIVE_WCF_DIR.'style/taggingreloaded.css" />');
         }
         

taggingreloaded/files/lib/system/event/listener/TaggingReloadedPageListener.class.php

@@ -123 +123 @@
                         WCF::getTPL()->assign('tags', $this->tags);
                         $this->assignCategory();
-                        WCF::getTPL()->assign('specialStyles', '<link rel="stylesheet" type="text/css" href="'.RELATIVE_WCF_DIR.'style/taggingreloaded.css" />');
+                        WCF::getTPL()->append('specialStyles', '<link rel="stylesheet" type="text/css" href="'.RELATIVE_WCF_DIR.'style/taggingreloaded.css" />');
                 }
         }

taggingreloaded/optionals/de.easy-coding.wbb.taggingreloaded/files/lib/system/event/listener/TaggingReloadedWBBMessageFormListener.class.php

@@ -25 +25 @@
                 $this->eventObj = $eventObj;
                 $this->className = $className;
+                
+                // abort if the user does not have permissions to use tagging
+                if(!WCF::getUser()->getPermission('user.message.tagging')) {
+                        return;
+                }
 
                 switch ($eventName) {
@@ -111 +116 @@
                                 break;
                         case 'PostAddForm':
+                                $postID = $this->eventObj->newPost->getID();
+                                break;
                         case 'PostEditForm':
                                 $postID = $this->eventObj->postID;

taggingreloaded/optionals/de.easy-coding.wbb.taggingreloaded/files/lib/system/event/listener/TaggingReloadedWBBPageListener.class.php

@@ -220 +220 @@
         protected function assignVariables () {
                 WCF::getTPL()->assign('tags', $this->tags);
-                WCF::getTPL()->assign('specialStyles', '<link rel="stylesheet" type="text/css" href="'.RELATIVE_WCF_DIR.'style/taggingreloaded.css" />');
+                WCF::getTPL()->append('specialStyles', '<link rel="stylesheet" type="text/css" href="'.RELATIVE_WCF_DIR.'style/taggingreloaded.css" />');
                 
                 if($this->threadID || $this->postID || count($this->boards)>0) {

taggingreloaded/optionals/de.easy-coding.wbb.taggingreloaded/package.xml

@@ -5 +5 @@
                 <packagename>Tagging Reloaded for WBB</packagename>
                 <packagedescription>Tagging Reloaded does not mean just tagging. It's much more!</packagedescription>
-                <version>0.4.2</version>
+                <version>0.4.3</version>
                 <date>DATE</date>
                 <plugin>com.woltlab.wbb</plugin>
@@ -32 +32 @@
         </instructions>
         
+        <instructions type="update" fromversion="0.4.2">
+                <files>files.tar</files>
+        </instructions>
+        
         <instructions type="update" fromversion="0.4.1">
                 <files>files.tar</files>

taggingreloaded/package.xml

@@ -5 +5 @@
                 <packagename>Tagging Reloaded</packagename>
                 <packagedescription>Tagging Reloaded does not mean just tagging. It's much more!</packagedescription>
-                <version>0.4.2</version>
+                <version>0.4.3</version>
                 <date>DATE</date>
                 <plugin>com.woltlab.wcf</plugin>
@@ -34 +34 @@
                 <languages languagecode="de-informal">de-informal.xml</languages>
                 <languages languagecode="en">en.xml</languages>
+                <groupoptions>groupoptions.xml</groupoptions>
                 <headermenu>headermenu.xml</headermenu>
         </instructions>
         
+        <instructions type="update" fromversion="0.4.2">
+                <files>files.tar</files>
+                <templates>templates.tar</templates>
+                <languages languagecode="de">de.xml</languages>
+                <languages languagecode="de-informal">de-informal.xml</languages>
+                <languages languagecode="en">en.xml</languages>
+                <groupoptions>groupoptions.xml</groupoptions>
+        </instructions>
+        
         <instructions type="update" fromversion="0.4.0">
+                <files>files.tar</files>
+                <templates>templates.tar</templates>
+                <languages languagecode="de">de.xml</languages>
                 <languages languagecode="de-informal">de-informal.xml</languages>
+                <languages languagecode="en">en.xml</languages>
+                <groupoptions>groupoptions.xml</groupoptions>
         </instructions>
 </package>

taggingreloaded/templates/messageFormTaggingReloaded.tpl

@@ -1 @@
-<div class="hidden" id="tagging">
-        <fieldset class="noJavaScript">
-                <legend class="noJavaScript">{lang}wcf.taggingreloaded.tagging{/lang}</legend>
-                <div id="taggingBubble" style="width:100%;height:140px;border:1px solid #afafaf;color:#000"></div>
-        </fieldset>
+<div id="tagging">
+<fieldset class="noJavaScript">
+        <legend class="noJavaScript">{lang}wcf.taggingreloaded.tagging{/lang}</legend>
+        <div id="taggingBubble" style="width:100%;height:140px;border:1px solid #afafaf;color:#000; display:none"></div>
         
         <script type="text/javascript">
         //<!CDATA[[
-                var tagging = new TaggingReloaded(document.getElementById('taggingBubble'));
+                var taggingdom = document.getElementById('taggingBubble');
+                taggingdom.style.display = 'block';
+                var tagging = new TaggingReloaded(taggingdom);
                 tagging.setLimits(30,500);
         //]]>
         </script>
-
-        <!--<input type="button" value="fetch" onclick="tagging.formfetch(this.form.text.value);" />//-->
-
 
         <div class="formElement">
@@ -21 +19 @@
                 <div class="formField">
                         <input type="text" name="inputTagging" id="inputTagging" size="65" />
-                        <input type="button" value="{lang}wcf.taggingreloaded.add{/lang}" onclick="tagging.formadd(this.form.inputTagging);" />
+                        <input type="button" value="{lang}wcf.taggingreloaded.add{/lang}" onclick="tagging.formadd(this.form.inputTagging);" style="display:none" id="inputTaggingSubmit"/>
                         <script type="text/javascript" src="{@RELATIVE_WCF_DIR}js/Suggestion.class.js"></script>
                         <script type="text/javascript">
@@ -31 +29 @@
                         </script>
                 </div>
+                <div id="inputTaggingDiv" style="display:none">
                 <div class="formFieldDesc">
                         <p>{lang}wcf.taggingreloaded.add.description{/lang}</p>
                 </div>
                 <p>{lang}wcf.taggingreloaded.add.instruction{/lang}</p>
+                </div>
         </div>
+        
+</fieldset>
 </div>
 
 <script type="text/javascript">
         //<![CDATA[
+        document.getElementById('inputTaggingDiv').style.display = 'inline';
+        document.getElementById('inputTaggingSubmit').style.display = 'inline';
         tabbedPane.addTab('tagging', false);
         //]]>