From: Marcel Werk Date: Thu, 28 Jul 2016 20:16:36 +0000 (+0200) Subject: Added mobile page logo; width/height for normal logo X-Git-Tag: 3.0.0_Beta_1~925^2~2 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=4a2922635e12a33501cf570e03dcccd71989dc74;p=GitHub%2FWoltLab%2FWCF.git Added mobile page logo; width/height for normal logo --- diff --git a/com.woltlab.wcf/templates/ampArticle.tpl b/com.woltlab.wcf/templates/ampArticle.tpl index f4bcbdc8b8..32ed4066cc 100644 --- a/com.woltlab.wcf/templates/ampArticle.tpl +++ b/com.woltlab.wcf/templates/ampArticle.tpl @@ -19,9 +19,9 @@ "name": "{PAGE_TITLE|language}", "logo": { "@type": "ImageObject", - "url": "{@$__wcf->getPath()}images/default-logo.png",{* @TODO *} - "width": 288, - "height": 40 + "url": "{$__wcf->getStyleHandler()->getStyle()->getPageLogo()}", + "width": {@$__wcf->getStyleHandler()->getStyle()->getVariable('pageLogoWidth')}, + "height": {@$__wcf->getStyleHandler()->getStyle()->getVariable('pageLogoHeight')} } } {if $articleContent->getImage()} diff --git a/com.woltlab.wcf/templates/ampHeader.tpl b/com.woltlab.wcf/templates/ampHeader.tpl index 6f68c6dbc6..2fe30a5c47 100644 --- a/com.woltlab.wcf/templates/ampHeader.tpl +++ b/com.woltlab.wcf/templates/ampHeader.tpl @@ -222,7 +222,7 @@

{* @TODO *} +

diff --git a/com.woltlab.wcf/templates/article.tpl b/com.woltlab.wcf/templates/article.tpl index bba4912fc4..4a3352a152 100644 --- a/com.woltlab.wcf/templates/article.tpl +++ b/com.woltlab.wcf/templates/article.tpl @@ -44,7 +44,7 @@

- {* @TODO *} +

diff --git a/com.woltlab.wcf/templates/pageHeaderLogo.tpl b/com.woltlab.wcf/templates/pageHeaderLogo.tpl index b247173200..ed85907009 100644 --- a/com.woltlab.wcf/templates/pageHeaderLogo.tpl +++ b/com.woltlab.wcf/templates/pageHeaderLogo.tpl @@ -2,12 +2,9 @@ {if MODULE_WCF_AD && $__disableAds|empty}{@$__wcf->getAdHandler()->getAds('com.woltlab.wcf.logo')}{/if} - {* @TODO *} -

- {*if $__wcf->getStyleHandler()->getStyle()->getPageLogo()} -

- {/if*} +

+ {event name='headerLogo'} \ No newline at end of file diff --git a/com.woltlab.wcf/templates/pageMenuMobile.tpl b/com.woltlab.wcf/templates/pageMenuMobile.tpl index 3a9e446cde..33ea5b0f7d 100644 --- a/com.woltlab.wcf/templates/pageMenuMobile.tpl +++ b/com.woltlab.wcf/templates/pageMenuMobile.tpl @@ -1,5 +1,5 @@ {* main menu / page options / breadcrumbs *} -

{* TODO: use real path *} +

{lang}wcf.menu.page.navigation{/lang}
@@ -72,7 +72,7 @@

{* user menu *} -

').insertAfter(this._button); + } + + return $span; + } +}); + /** * Handles style list management buttons. */ diff --git a/wcfsetup/install/files/acp/style/layout.scss b/wcfsetup/install/files/acp/style/layout.scss index 9462f3579d..85da31e2cd 100644 --- a/wcfsetup/install/files/acp/style/layout.scss +++ b/wcfsetup/install/files/acp/style/layout.scss @@ -297,3 +297,10 @@ $wcfAcpMenuWidth: 150px; } } } + +#styleLogo, +#styleLogoMobile { + background-color: #fff; + background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQAQMAAAAlPW0iAAAABlBMVEX////MzMw46qqDAAAAD0lEQVQI12P4z4Ad4ZAAAH6/D/Hgw85/AAAAAElFTkSuQmCC); + border: 1px solid #ccc; +} diff --git a/wcfsetup/install/files/acp/templates/styleAdd.tpl b/wcfsetup/install/files/acp/templates/styleAdd.tpl index 4ea5bb2abc..8d9710d91c 100644 --- a/wcfsetup/install/files/acp/templates/styleAdd.tpl +++ b/wcfsetup/install/files/acp/templates/styleAdd.tpl @@ -26,6 +26,7 @@ 'wcf.acp.style.image.error.invalidExtension': '{lang}wcf.acp.style.image.error.invalidExtension{/lang}' }); new WCF.ACP.Style.LogoUpload('{$tmpHash}', '{@$__wcf->getPath()}images/'); + new WCF.ACP.Style.LogoUploadMobile('{$tmpHash}', '{@$__wcf->getPath()}images/'); {if $action == 'edit'} new WCF.ACP.Style.CopyStyle({@$style->styleID}); @@ -231,15 +232,6 @@

- {if $errorField == 'image'} - - {if $errorType == 'empty'} - {lang}wcf.global.form.error.empty{/lang} - {else} - {lang}wcf.acp.style.image.error.{$errorType}{/lang} - {/if} - - {/if} {lang}wcf.acp.style.image.description{/lang}

@@ -355,15 +347,6 @@

- {if $errorField == 'image'} - - {if $errorType == 'empty'} - {lang}wcf.global.form.error.empty{/lang} - {else} - {lang}wcf.acp.style.image.error.{$errorType}{/lang} - {/if} - - {/if}

@@ -371,6 +354,31 @@

{lang}wcf.acp.style.globals.pageLogo.width{/lang}: + +

{lang}wcf.acp.style.globals.pageLogo.height{/lang}: + +

+ +

{lang}wcf.acp.style.globals.pageLogoMobile{/lang}: + +
+; + + {lang}wcf.acp.style.globals.pageLogoMobile.description{/lang} +

+ {event name='logoFields'} diff --git a/wcfsetup/install/files/lib/acp/form/StyleAddForm.class.php b/wcfsetup/install/files/lib/acp/form/StyleAddForm.class.php index 4f2943c77c..66e7dbeb8a 100644 --- a/wcfsetup/install/files/lib/acp/form/StyleAddForm.class.php +++ b/wcfsetup/install/files/lib/acp/form/StyleAddForm.class.php @@ -480,6 +480,9 @@ class StyleAddForm extends AbstractForm { 'individualScss', 'overrideScss', 'pageLogo', + 'pageLogoWidth', + 'pageLogoHeight', + 'pageLogoMobile', 'useFluidLayout', 'useGoogleFont', 'wcfFontFamilyGoogle', @@ -540,7 +543,7 @@ class StyleAddForm extends AbstractForm { $this->saved(); // reset variables - $this->authorName = $this->authorURL = $this->copyright = $this->packageName = $this->image = ''; + $this->authorName = $this->authorURL = $this->copyright = $this->packageName = ''; $this->license = $this->styleDate = $this->styleDescription = $this->styleName = $this->styleVersion = ''; $this->imagePath = 'images/'; diff --git a/wcfsetup/install/files/lib/data/style/ActiveStyle.class.php b/wcfsetup/install/files/lib/data/style/ActiveStyle.class.php index 13031924f2..b85c9f7c11 100644 --- a/wcfsetup/install/files/lib/data/style/ActiveStyle.class.php +++ b/wcfsetup/install/files/lib/data/style/ActiveStyle.class.php @@ -48,6 +48,19 @@ class ActiveStyle extends DatabaseObjectDecorator { return $this->getImage($this->getDecoratedObject()->getVariable('pageLogo')); } - return ''; + return WCF::getPath() . 'images/default-logo.png'; + } + + /** + * Returns mobile page logo. + * + * @return string + */ + public function getPageLogoMobile() { + if ($this->getDecoratedObject()->getVariable('pageLogoMobile')) { + return $this->getImage($this->getDecoratedObject()->getVariable('pageLogoMobile')); + } + + return WCF::getPath() . 'images/default-logo-small.png'; } } diff --git a/wcfsetup/install/files/lib/data/style/StyleAction.class.php b/wcfsetup/install/files/lib/data/style/StyleAction.class.php index 28bffe418f..c14b02bcd4 100644 --- a/wcfsetup/install/files/lib/data/style/StyleAction.class.php +++ b/wcfsetup/install/files/lib/data/style/StyleAction.class.php @@ -54,7 +54,7 @@ class StyleAction extends AbstractDatabaseObjectAction implements IToggleAction, /** * @inheritDoc */ - protected $requireACP = ['copy', 'delete', 'markAsTainted', 'setAsDefault', 'toggle', 'update', 'upload', 'uploadLogo']; + protected $requireACP = ['copy', 'delete', 'markAsTainted', 'setAsDefault', 'toggle', 'update', 'upload', 'uploadLogo', 'uploadLogoMobile']; /** * style object @@ -381,9 +381,62 @@ class StyleAction extends AbstractDatabaseObjectAction implements IToggleAction, // store extension within session variables WCF::getSession()->register('styleLogo-'.$this->parameters['tmpHash'], $file->getFileExtension()); + // get logo size + list($width, $height) = getimagesize(WCF_DIR.'images/styleLogo-'.$this->parameters['tmpHash'].'.'.$file->getFileExtension()); + + // return result + return [ + 'url' => WCF::getPath().'images/styleLogo-'.$this->parameters['tmpHash'].'.'.$file->getFileExtension(), + 'width' => $width, + 'height' => $height + ]; + } + else { + throw new UserInputException('image', 'uploadFailed'); + } + } + } + catch (UserInputException $e) { + $file->setValidationErrorType($e->getType()); + } + + return ['errorType' => $file->getValidationErrorType()]; + } + + /** + * Validates parameters to update a mobile logo. + */ + public function validateUploadLogoMobile() { + $this->validateUpload(); + } + + /** + * Handles mobile logo upload. + * + * @return string[] + */ + public function uploadLogoMobile() { + // save files + /** @noinspection PhpUndefinedMethodInspection */ + /** @var UploadFile[] $files */ + $files = $this->parameters['__files']->getFiles(); + $file = $files[0]; + + try { + if (!$file->getValidationErrorType()) { + // shrink avatar if necessary + $fileLocation = $file->getLocation(); + + // move uploaded file + if (@copy($fileLocation, WCF_DIR.'images/styleLogo-mobile-'.$this->parameters['tmpHash'].'.'.$file->getFileExtension())) { + @unlink($fileLocation); + + // store extension within session variables + WCF::getSession()->register('styleLogo-mobile-'.$this->parameters['tmpHash'], $file->getFileExtension()); + // return result return [ - 'url' => WCF::getPath().'images/styleLogo-'.$this->parameters['tmpHash'].'.'.$file->getFileExtension() + 'url' => WCF::getPath().'images/styleLogo-mobile-'.$this->parameters['tmpHash'].'.'.$file->getFileExtension() ]; } else { diff --git a/wcfsetup/install/files/style/layout/pageHeader.scss b/wcfsetup/install/files/style/layout/pageHeader.scss index 850f5a6c78..f07716dd1f 100644 --- a/wcfsetup/install/files/style/layout/pageHeader.scss +++ b/wcfsetup/install/files/style/layout/pageHeader.scss @@ -45,6 +45,14 @@ display: none; } } + + .pageHeaderLogoLarge { + max-width: 100%; + } + + .pageHeaderLogoSmall { + max-height: 30px; + } } /* MAIN MENU */ diff --git a/wcfsetup/setup/db/install.sql b/wcfsetup/setup/db/install.sql index cd8931573f..494a428c39 100644 --- a/wcfsetup/setup/db/install.sql +++ b/wcfsetup/setup/db/install.sql @@ -1997,6 +1997,9 @@ INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('individual INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('messageSidebarOrientation', 'left'); INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('overrideScss', ''); INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('pageLogo', ''); +INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('pageLogoWidth', '288'); +INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('pageLogoHeight', '40'); +INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('pageLogoMobile', ''); INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('useFluidLayout', '1'); INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('useGoogleFont', '1'); INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('wcfButtonBackground', 'rgba(224, 224, 224, 1)');