Added placeholder support for Redactor

diff --git a/com.woltlab.wcf/templates/wysiwyg.tpl b/com.woltlab.wcf/templates/wysiwyg.tpl
index 2ecbda226cf1fbbf0658909a867870de6891ee70..c43230fdea977f55edddcdeadb7ca32aa3e99eaa 100644 (file)
--- a/com.woltlab.wcf/templates/wysiwyg.tpl
+++ b/com.woltlab.wcf/templates/wysiwyg.tpl
@@ -140,12 +140,13 @@
                                                'remove-size': '{lang}wcf.editor.button.size.removeSize{/lang}',
 
                                                // color
-                                               'remove-color': '{lang}wcf.editor.button.color.removeColor{/lang}',
+                                               'remove-color': '{lang}wcf.editor.button.color.removeColor{/lang}'
                                        }
                                },
                                linkify: false,
                                linkSize: 0xBADC0DED, // some random value to disable truncating
                                minHeight: 200,
+                               placeholder: elData(element, 'placeholder') || '',
                                plugins: [
                                        // Imperavi
                                        'alignment',

diff --git a/wcfsetup/install/files/style/ui/redactor.scss b/wcfsetup/install/files/style/ui/redactor.scss
index 43c8cfbd950c05639e75fbb3798356fcbf5ece5a..b0413b5186ba892733b89473e504dd8503953b99 100644 (file)
--- a/wcfsetup/install/files/style/ui/redactor.scss
+++ b/wcfsetup/install/files/style/ui/redactor.scss
@@ -73,6 +73,13 @@
                min-width: auto;
        }
        
+       &.redactor-placeholder::after {
+               color: $wcfContentDimmedText;
+               content: attr(placeholder);
+               display: block;
+               position: absolute;
+       }
+       
        & + textarea {
                border-width: 0;
                box-shadow: none;