Changed heading dropdown icon + labels

diff --git a/com.woltlab.wcf/templates/wysiwygToolbar.tpl b/com.woltlab.wcf/templates/wysiwygToolbar.tpl
index 74639405450d2478080a125a536016cc9bc44886..0399c8bad080a5999bc6cec055097f0aecfb18a7 100644 (file)
--- a/com.woltlab.wcf/templates/wysiwygToolbar.tpl
+++ b/com.woltlab.wcf/templates/wysiwygToolbar.tpl
@@ -2,7 +2,7 @@ buttonOptions = {
        alignment: { icon: 'fa-align-left', title: '{lang}wcf.editor.button.alignment{/lang}' },
        bold: { icon: 'fa-bold', title: '{lang}wcf.editor.button.bold{/lang}' },
        deleted: { icon: 'fa-strikethrough', title: '{lang}wcf.editor.button.strikethrough{/lang}' },
-       format: { icon: 'fa-paragraph', title: '{lang}wcf.editor.button.format{/lang}' },
+       format: { icon: 'fa-header', title: '{lang}wcf.editor.button.format{/lang}' },
        html: { icon: 'fa-file-code-o', title: '{lang}wcf.editor.button.html{/lang}' },
        italic: { icon: 'fa-italic', title: '{lang}wcf.editor.button.italic{/lang}' },
        link: { icon: 'fa-link', title: '{lang}wcf.editor.button.link{/lang}' },

diff --git a/wcfsetup/install/files/acp/templates/wysiwygToolbar.tpl b/wcfsetup/install/files/acp/templates/wysiwygToolbar.tpl
index 9f24c770ec079117ef2b24dd96f81d7523292ed2..0399c8bad080a5999bc6cec055097f0aecfb18a7 100644 (file)
--- a/wcfsetup/install/files/acp/templates/wysiwygToolbar.tpl
+++ b/wcfsetup/install/files/acp/templates/wysiwygToolbar.tpl
@@ -2,7 +2,7 @@ buttonOptions = {
        alignment: { icon: 'fa-align-left', title: '{lang}wcf.editor.button.alignment{/lang}' },
        bold: { icon: 'fa-bold', title: '{lang}wcf.editor.button.bold{/lang}' },
        deleted: { icon: 'fa-strikethrough', title: '{lang}wcf.editor.button.strikethrough{/lang}' },
-       format: { icon: 'fa-paragraph', title: '{lang}wcf.editor.button.format{/lang}' },
+       format: { icon: 'fa-header', title: '{lang}wcf.editor.button.format{/lang}' },
        html: { icon: 'fa-file-code-o', title: '{lang}wcf.editor.button.html{/lang}' },
        italic: { icon: 'fa-italic', title: '{lang}wcf.editor.button.italic{/lang}' },
        link: { icon: 'fa-link', title: '{lang}wcf.editor.button.link{/lang}' },
@@ -14,6 +14,7 @@ buttonOptions = {
        underline: { icon: 'fa-underline', title: '{lang}wcf.editor.button.underline{/lang}' },
        undo: { icon: 'fa-undo', title: '{lang}wcf.editor.button.undo{/lang}' },
        woltlabColor: { icon: 'fa-paint-brush', title: '{lang}wcf.editor.button.color{/lang}' },
+       woltlabFont: { icon: 'fa-font', title: '{lang}wcf.editor.button.font{/lang}' },
        woltlabImage: { icon: 'fa-picture-o', title: '{lang}wcf.editor.button.image{/lang}' },
        woltlabMedia: { icon: 'fa-file-o', title: '{lang}wcf.editor.button.media{/lang}' },
        woltlabQuote: { icon: 'fa-comment', title: '{lang}wcf.editor.button.quote{/lang}' },
@@ -41,6 +42,9 @@ buttons.push('wcfSeparator');
 
 buttons.push('subscript');
 buttons.push('superscript');
+{if $__wcf->getBBCodeHandler()->isAvailableBBCode('font')}
+       buttons.push('woltlabFont');
+{/if}
 {if $__wcf->getBBCodeHandler()->isAvailableBBCode('size')}
        buttons.push('woltlabSize');
 {/if}

diff --git a/wcfsetup/install/lang/de.xml b/wcfsetup/install/lang/de.xml
index 205bb5ab143400a522aeabf83760f0797b166166..38356870af0b71e5cd0dc13c88ad5ae3d6d74a0b 100644 (file)
--- a/wcfsetup/install/lang/de.xml
+++ b/wcfsetup/install/lang/de.xml
@@ -2369,9 +2369,9 @@ Fehler sind beispielsweise:
                <item name="wcf.editor.code.line.description"><![CDATA[Optional: {if LANGUAGE_USE_INFORMAL_VARIANT}Lege{else}Legen Sie{/if} den Wert fest, ab dem die Zeilennummierung startet.]]></item>
                <item name="wcf.editor.code.title"><![CDATA[{if $highlighter}{$highlighter}{else}Quellcode{/if}{if $file} - {$file}{/if}]]></item>
                
-               <item name="wcf.editor.format.heading2"><![CDATA[Überschrift]]></item>
-               <item name="wcf.editor.format.heading3"><![CDATA[Abschnitt]]></item>
-               <item name="wcf.editor.format.heading4"><![CDATA[Unterabschnitt]]></item>
+               <item name="wcf.editor.format.heading2"><![CDATA[Überschrift 1]]></item>
+               <item name="wcf.editor.format.heading3"><![CDATA[Überschrift 2]]></item>
+               <item name="wcf.editor.format.heading4"><![CDATA[Überschrift 3]]></item>
                <item name="wcf.editor.format.paragraph"><![CDATA[Normaler Text]]></item>
                
                <item name="wcf.editor.image.edit"><![CDATA[Bild bearbeiten]]></item>

diff --git a/wcfsetup/install/lang/en.xml b/wcfsetup/install/lang/en.xml
index 6f1ff9c69cd927bf72420581b8298442dec2122f..304fb265c1ff24d0e606a044c8808d5897d30de1 100644 (file)
--- a/wcfsetup/install/lang/en.xml
+++ b/wcfsetup/install/lang/en.xml
@@ -2335,9 +2335,9 @@ Errors are:
                <item name="wcf.editor.code.line.description"><![CDATA[Optional: Specify the start for line enumeration.]]></item>
                <item name="wcf.editor.code.title"><![CDATA[{if $highlighter}{$highlighter}{else}Code{/if}{if $file} - {$file}{/if}]]></item>
                
-               <item name="wcf.editor.format.heading2"><![CDATA[Headline]]></item>
-               <item name="wcf.editor.format.heading3"><![CDATA[Section]]></item>
-               <item name="wcf.editor.format.heading4"><![CDATA[Subsection]]></item>
+               <item name="wcf.editor.format.heading2"><![CDATA[Heading 1]]></item>
+               <item name="wcf.editor.format.heading3"><![CDATA[Heading 2]]></item>
+               <item name="wcf.editor.format.heading4"><![CDATA[Heading 3]]></item>
                <item name="wcf.editor.format.paragraph"><![CDATA[Normal text]]></item>
                
                <item name="wcf.editor.image.edit"><![CDATA[Edit Image]]></item>