From d046ee2fcf7dbdc091b2751799314c50fe9d422e Mon Sep 17 00:00:00 2001 From: Alexander Ebert Date: Fri, 9 Sep 2016 13:17:19 +0200 Subject: [PATCH] Changed heading dropdown icon + labels --- com.woltlab.wcf/templates/wysiwygToolbar.tpl | 2 +- wcfsetup/install/files/acp/templates/wysiwygToolbar.tpl | 6 +++++- wcfsetup/install/lang/de.xml | 6 +++--- wcfsetup/install/lang/en.xml | 6 +++--- 4 files changed, 12 insertions(+), 8 deletions(-) diff --git a/com.woltlab.wcf/templates/wysiwygToolbar.tpl b/com.woltlab.wcf/templates/wysiwygToolbar.tpl index 7463940545..0399c8bad0 100644 --- 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 9f24c770ec..0399c8bad0 100644 --- 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 205bb5ab14..38356870af 100644 --- a/wcfsetup/install/lang/de.xml +++ b/wcfsetup/install/lang/de.xml @@ -2369,9 +2369,9 @@ Fehler sind beispielsweise: - - - + + + diff --git a/wcfsetup/install/lang/en.xml b/wcfsetup/install/lang/en.xml index 6f1ff9c69c..304fb265c1 100644 --- a/wcfsetup/install/lang/en.xml +++ b/wcfsetup/install/lang/en.xml @@ -2335,9 +2335,9 @@ Errors are: - - - + + + -- 2.20.1