From d2d216fb2beba0dc96e9994a5a58d3695ed44476 Mon Sep 17 00:00:00 2001 From: Marcel Werk Date: Sat, 23 Apr 2016 20:32:33 +0200 Subject: [PATCH] Small html/style optimizations --- com.woltlab.wcf/templates/accountManagement.tpl | 10 +--------- com.woltlab.wcf/templates/avatarEdit.tpl | 10 +++++----- com.woltlab.wcf/templates/recaptcha.tpl | 6 ++++-- com.woltlab.wcf/templates/register.tpl | 6 ++---- wcfsetup/install/files/js/WCF.User.js | 4 ++-- 5 files changed, 14 insertions(+), 22 deletions(-) diff --git a/com.woltlab.wcf/templates/accountManagement.tpl b/com.woltlab.wcf/templates/accountManagement.tpl index 71d1ace6b1..aa02157a77 100644 --- a/com.woltlab.wcf/templates/accountManagement.tpl +++ b/com.woltlab.wcf/templates/accountManagement.tpl @@ -36,15 +36,7 @@ {/if} {lang}wcf.user.accountManagement.password.description{/lang} - - - -
-
-
- + {lang}wcf.user.lostPassword{/lang}
diff --git a/com.woltlab.wcf/templates/avatarEdit.tpl b/com.woltlab.wcf/templates/avatarEdit.tpl index ac66906b2c..1f4a0fa109 100644 --- a/com.woltlab.wcf/templates/avatarEdit.tpl +++ b/com.woltlab.wcf/templates/avatarEdit.tpl @@ -98,11 +98,11 @@ }); {if !$__wcf->user->disableAvatar} - {if $__wcf->getUserProfileHandler()->getAvatar()->canCrop()} - new WCF.User.Avatar.Upload(0, new WCF.User.Avatar.Crop({@$__wcf->getUserProfileHandler()->getAvatar()->avatarID})); - {else} - new WCF.User.Avatar.Upload(); - {/if} + {if $__wcf->getUserProfileHandler()->getAvatar()->canCrop()} + new WCF.User.Avatar.Upload(0, new WCF.User.Avatar.Crop({@$__wcf->getUserProfileHandler()->getAvatar()->avatarID})); + {else} + new WCF.User.Avatar.Upload(); + {/if} {/if} }); //]]> diff --git a/com.woltlab.wcf/templates/recaptcha.tpl b/com.woltlab.wcf/templates/recaptcha.tpl index ae01797f3d..456b94dca9 100644 --- a/com.woltlab.wcf/templates/recaptcha.tpl +++ b/com.woltlab.wcf/templates/recaptcha.tpl @@ -4,8 +4,10 @@ {* No explicit keys were set, use legacy V1 API and WoltLab's OEM keys *} {if RECAPTCHA_PUBLICKEY === '' || RECAPTCHA_PRIVATEKEY === ''}
-

{lang}wcf.recaptcha.title{/lang}

- {lang}wcf.recaptcha.description{/lang} +
+

{lang}wcf.recaptcha.title{/lang}

+ {lang}wcf.recaptcha.description{/lang} +
{if !$ajaxCaptcha|isset || !$ajaxCaptcha} diff --git a/com.woltlab.wcf/templates/register.tpl b/com.woltlab.wcf/templates/register.tpl index a8ca146dac..822549ea22 100644 --- a/com.woltlab.wcf/templates/register.tpl +++ b/com.woltlab.wcf/templates/register.tpl @@ -19,9 +19,7 @@ {include file='formError'}
-
-

{lang}wcf.user.username{/lang}

- +
@@ -40,7 +38,7 @@
{event name='usernameFields'} -
+
diff --git a/wcfsetup/install/files/js/WCF.User.js b/wcfsetup/install/files/js/WCF.User.js index 987f44e54d..019fcbc6a2 100644 --- a/wcfsetup/install/files/js/WCF.User.js +++ b/wcfsetup/install/files/js/WCF.User.js @@ -2515,7 +2515,7 @@ WCF.User.Avatar.Upload = WCF.Upload.extend({ */ _updateImage: function(url, canCrop) { $('#avatarUpload > dt > img').remove(); - var $image = $('').css({ + var $image = $('').css({ 'height': 'auto', 'max-height': '96px', 'max-width': '96px', @@ -2553,7 +2553,7 @@ WCF.User.Avatar.Upload = WCF.Upload.extend({ return { userID: this._userID }; - }, + } }); /** -- 2.20.1