Merge branch '5.2' into 5.3

[GitHub/WoltLab/com.woltlab.wcf.conversation.git] / templates / conversationMessageInlineEditor.tpl

diff --git a/templates/conversationMessageInlineEditor.tpl b/templates/conversationMessageInlineEditor.tpl
index de9e28a086b434bf66fd16e1fba1455216774643..e28ce1b89ac0bd15925a2297a47f9bac4d45c0d2 100644 (file)
--- a/templates/conversationMessageInlineEditor.tpl
+++ b/templates/conversationMessageInlineEditor.tpl
@@ -1,20 +1,24 @@
+{capture assign='wysiwygSelector'}messageEditor{@$message->messageID}{/capture}
 <div class="messageInlineEditor">
-       <textarea id="messageEditor{@$message->messageID}" rows="20" cols="40" data-autosave="com.woltlab.wcf.conversation.messageEdit-{@$message->messageID}">{$message->message}</textarea>
+       <textarea id="{$wysiwygSelector}" class="wysiwygTextarea"
+                 data-autosave="com.woltlab.wcf.conversation.messageEdit-{@$message->messageID}"
+                 data-support-mention="true"
+       >{$message->message}</textarea>
        {capture assign=wysiwygContainerID}messageEditor{@$message->messageID}{/capture}
        {include file='messageFormTabsInline' inConversationInlineEdit=true wysiwygContainerID=$wysiwygContainerID}
        
        <div class="formSubmit">
-               <button class="buttonPrimary" data-type="save">{lang}wcf.global.button.submit{/lang}</button>
-               <button data-type="extended">{lang}wcf.message.button.extendedEdit{/lang}</button>
+               <button class="buttonPrimary" data-type="save">{lang}wcf.global.button.save{/lang}</button>
+               
+               {include file='messageFormPreviewButton' previewMessageFieldID=$wysiwygSelector previewButtonID=$wysiwygSelector|concat:'_PreviewButton' previewMessageObjectType='com.woltlab.wcf.conversation.message' previewMessageObjectID=$message->messageID}
+               
                <button data-type="cancel">{lang}wcf.global.button.cancel{/lang}</button>
        </div>
        
        {include file='wysiwyg' wysiwygEnableUpload=true}
        <script data-relocate="true">
-               //<![CDATA[
                $(function() {
                        WCF.System.Dependency.Manager.register('Redactor_messageEditor{@$message->messageID}', function() { new WCF.Message.UserMention('messageEditor{@$message->messageID}'); });
                });
-               //]]>
        </script>
 </div>