Improved quick reply and inline editor

diff --git a/files/lib/page/ConversationPage.class.php b/files/lib/page/ConversationPage.class.php
index f6deb0cca2f18c477fd73c407e93a31ebc8dc512..71173f5e5a6a7b87ad0ae132ea1d65dc390f87ee 100644 (file)
--- a/files/lib/page/ConversationPage.class.php
+++ b/files/lib/page/ConversationPage.class.php
@@ -8,6 +8,7 @@ use wcf\data\conversation\ConversationParticipantList;
 use wcf\data\conversation\ViewableConversation;
 use wcf\data\modification\log\ConversationLogModificationLogList;
 use wcf\data\smiley\SmileyCache;
+use wcf\system\attachment\AttachmentHandler;
 use wcf\system\bbcode\BBCodeHandler;
 use wcf\system\breadcrumb\Breadcrumb;
 use wcf\system\exception\IllegalLinkException;
@@ -16,6 +17,7 @@ use wcf\system\message\quote\MessageQuoteManager;
 use wcf\system\request\LinkHandler;
 use wcf\system\WCF;
 use wcf\util\HeaderUtil;
+use wcf\util\StringUtil;
 
 /**
  * Shows a conversation.
@@ -222,7 +224,15 @@ class ConversationPage extends MultipleLinkPage {
                
                MessageQuoteManager::getInstance()->assignVariables();
                
+               $tmpHash = StringUtil::getRandomID();
+               $attachmentHandler = new AttachmentHandler('com.woltlab.wcf.conversation.message', 0, $tmpHash, 0);
+               
                WCF::getTPL()->assign(array(
+                       'attachmentHandler' => $attachmentHandler,
+                       'attachmentObjectID' => 0,
+                       'attachmentObjectType' => 'com.woltlab.wcf.conversation.message',
+                       'attachmentParentObjectID' => 0,
+                       'tmpHash' => $tmpHash,
                        'attachmentList' => $this->objectList->getAttachmentList(),
                        'labelList' => $this->labelList,
                        'modificationLogList' => $this->modificationLogList,

diff --git a/templates/conversationAdd.tpl b/templates/conversationAdd.tpl
index dae1edd2b81febfa0012504f583c586a252ecf3a..b3d6d6f8f812e555a60f2e66b979c71592d721d4 100644 (file)
--- a/templates/conversationAdd.tpl
+++ b/templates/conversationAdd.tpl
@@ -146,9 +146,9 @@
                        {event name='messageFields'}
                </fieldset>
                
-               {event name='fieldsets'}
-               
                {include file='messageFormTabs' wysiwygContainerID='text'}
+               
+               {event name='fieldsets'}
        </div>
        
        <div class="formSubmit">

diff --git a/templates/conversationMessageAdd.tpl b/templates/conversationMessageAdd.tpl
index 09ac05dfa9691367ff82a72b72884c013ff0e5c8..6bc9a068d0e7faf1fa96b76080de2d4ad9b5dfb6 100644 (file)
--- a/templates/conversationMessageAdd.tpl
+++ b/templates/conversationMessageAdd.tpl
@@ -66,9 +66,9 @@
                        {event name='messageFields'}
                </fieldset>
                
-               {event name='fieldsets'}
-               
                {include file='messageFormTabs' wysiwygContainerID='text'}
+               
+               {event name='fieldsets'}
        </div>
        
        <div class="formSubmit">

diff --git a/templates/conversationMessageEdit.tpl b/templates/conversationMessageEdit.tpl
index f7f8d90477698bf1bf31b9facd69c45345103827..949057d2f2f0b72504de7bfa41a9d982e6fb573d 100644 (file)
--- a/templates/conversationMessageEdit.tpl
+++ b/templates/conversationMessageEdit.tpl
@@ -144,9 +144,9 @@
                        {event name='messageFields'}
                </fieldset>
                
-               {event name='fieldsets'}
-               
                {include file='messageFormTabs' wysiwygContainerID='text'}
+               
+               {event name='fieldsets'}
        </div>
        
        <div class="formSubmit">

diff --git a/templates/conversationMessageInlineEditor.tpl b/templates/conversationMessageInlineEditor.tpl
index 570997cbd54ac8e4fa9be15c563184bab7aecccb..a66218a144ef0453a6e397eba179afedf6b1929a 100644 (file)
--- a/templates/conversationMessageInlineEditor.tpl
+++ b/templates/conversationMessageInlineEditor.tpl
@@ -1,5 +1,6 @@
 <div class="messageInlineEditor">
        <textarea id="messageEditor{@$message->messageID}" rows="20" cols="40" data-autosave="com.woltlab.wcf.conversation.messageEdit-{@$message->messageID}">{$message->message}</textarea>
+       {include file='messageFormTabsInline' inConversationInlineEdit=true}
        
        <div class="formSubmit">
                <button class="buttonPrimary" data-type="save">{lang}wcf.global.button.submit{/lang}</button>

diff --git a/templates/conversationQuickReply.tpl b/templates/conversationQuickReply.tpl
index 9ac989d51ff5c5a8b2d4d4414fbc5d9ea7d97a50..2f0e4a5e6d578c6b010b6e5b0e81225fb2b8856a 100644 (file)
--- a/templates/conversationQuickReply.tpl
+++ b/templates/conversationQuickReply.tpl
@@ -14,6 +14,7 @@
                                                {/if}
                                                
                                                <textarea id="text" name="text" rows="20" cols="40" data-autosave="com.woltlab.wcf.conversation.messageAdd-{@$conversation->conversationID}" style="width: 100%"></textarea>
+                                               {include file='messageFormTabsInline' inConversationQuickReply=true}
                                        </div>
                                        
                                        <div class="formSubmit">
@@ -29,7 +30,7 @@
        <script data-relocate="true">
                //<![CDATA[
                $(function() {
-                       WCF.System.Dependency.Manager.register('CKEditor', function() { new WCF.Message.UserMention('text'); });
+                       WCF.System.Dependency.Manager.register('Redactor_text', function() { new WCF.Message.UserMention('text'); });
                });
                //]]>
        </script>