From: Marcel Werk Date: Sat, 27 Feb 2016 16:22:08 +0000 (+0100) Subject: Style/Template overhaul X-Git-Tag: 3.0.0_Beta_1~2030^2~73 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=95961bdf5bb0e3a6d73eda8da3c0faae71c75940;p=GitHub%2FWoltLab%2FWCF.git Style/Template overhaul * Fixed margins/paddings * Removed/replaced deprecated elements (.container, .boxHeadline, fieldset, .marginTop) * Fixed deprecated icon names (.icon-* -> .fa-*) * Fixed sidebars * Some minor tweaks --- diff --git a/com.woltlab.wcf/templates/accountManagement.tpl b/com.woltlab.wcf/templates/accountManagement.tpl index bcd19e2a43..aa32c75768 100644 --- a/com.woltlab.wcf/templates/accountManagement.tpl +++ b/com.woltlab.wcf/templates/accountManagement.tpl @@ -10,10 +10,10 @@ {include file='userMenuSidebar'} -{include file='header' sidebarOrientation='left'} +{include file='header'} -
-

{lang}wcf.user.accountManagement{/lang}

+
+

{lang}wcf.user.accountManagement{/lang}

{include file='userNotice'} @@ -45,247 +45,245 @@
-
- {if !$__authProvider} -
- - - -
-
- - {if $errorField == 'password'} - - {if $errorType == 'empty'}{lang}wcf.global.form.error.empty{/lang}{/if} - {if $errorType == 'false'}{lang}wcf.user.password.error.false{/lang}{/if} - - {/if} - {lang}wcf.user.accountManagement.password.description{/lang} -
- + {if !$__authProvider} +
+

{lang}wcf.user.password{/lang}

+ + +
+
+ + {if $errorField == 'password'} + + {if $errorType == 'empty'}{lang}wcf.global.form.error.empty{/lang}{/if} + {if $errorType == 'false'}{lang}wcf.user.password.error.false{/lang}{/if} + + {/if} + {lang}wcf.user.accountManagement.password.description{/lang} +
+ + +
+
+
+ +
+
+ + {event name='passwordFields'} +
+ {/if} + + {if $__wcf->getSession()->getPermission('user.profile.canRename')} +
+

{lang}wcf.user.changeUsername{/lang}

+ +
+
+ + + {if $errorField == 'username'} + + {if $errorType == 'empty'}{lang}wcf.global.form.error.empty{/lang}{/if} + {if $errorType == 'notValid'}{lang}wcf.user.username.error.notValid{/lang}{/if} + {if $errorType == 'notUnique'}{lang}wcf.user.username.error.notUnique{/lang}{/if} + {if $errorType == 'alreadyRenamed'}{lang}wcf.user.username.error.alreadyRenamed{/lang}{/if} + + {/if} + {if $renamePeriod > 0} + {lang}wcf.user.changeUsername.description{/lang} + {/if} +
+ + + {event name='changeUsernameFields'} +
+ {/if} + + {if !$__authProvider} +
+

{lang}wcf.user.changePassword{/lang}

+ + +
+
+ + + {if $errorField == 'newPassword'} + + {if $errorType == 'empty'}{lang}wcf.global.form.error.empty{/lang}{/if} + {if $errorType == 'notSecure'}{lang}wcf.user.password.error.notSecure{/lang}{/if} + + {/if} +
+ + + +
+
+ + + {if $errorField == 'confirmNewPassword'} + + {if $errorType == 'empty'}{lang}wcf.global.form.error.empty{/lang}{/if} + {if $errorType == 'notEqual'}{lang}wcf.user.confirmPassword.error.notEqual{/lang}{/if} + + {/if} +
+ + + {event name='changePasswordFields'} +
+ {/if} + + {if $__wcf->getSession()->getPermission('user.profile.canChangeEmail')} +
+

{lang}wcf.user.changeEmail{/lang}

+ + +
+
+ + + {if $errorField == 'email'} + + {if $errorType == 'empty'}{lang}wcf.global.form.error.empty{/lang}{/if} + {if $errorType == 'notValid'}{lang}wcf.user.email.error.notValid{/lang}{/if} + {if $errorType == 'notUnique'}{lang}wcf.user.email.error.notUnique{/lang}{/if} + + {/if} +
+ + + +
+
+ + + {if $errorField == 'confirmEmail'} + + {if $errorType == 'notEqual'}{lang}wcf.user.confirmEmail.error.notEqual{/lang}{/if} + + {/if} +
+ + + {event name='changeEmailFields'} + + {if REGISTER_ACTIVATION_METHOD == 1 && $__wcf->getUser()->reactivationCode != 0}
+ {lang newEmail=$__wcf->user->email}wcf.user.changeEmail.needReactivation{/lang}
- - {event name='passwordFields'} -
- {/if} - - {if $__wcf->getSession()->getPermission('user.profile.canRename')} -
- - - -
-
- - - {if $errorField == 'username'} - - {if $errorType == 'empty'}{lang}wcf.global.form.error.empty{/lang}{/if} - {if $errorType == 'notValid'}{lang}wcf.user.username.error.notValid{/lang}{/if} - {if $errorType == 'notUnique'}{lang}wcf.user.username.error.notUnique{/lang}{/if} - {if $errorType == 'alreadyRenamed'}{lang}wcf.user.username.error.alreadyRenamed{/lang}{/if} - - {/if} - {if $renamePeriod > 0} - {lang}wcf.user.changeUsername.description{/lang} - {/if} -
- - - {event name='changeUsernameFields'} -
- {/if} - - {if !$__authProvider} -
- - - -
-
- - - {if $errorField == 'newPassword'} - - {if $errorType == 'empty'}{lang}wcf.global.form.error.empty{/lang}{/if} - {if $errorType == 'notSecure'}{lang}wcf.user.password.error.notSecure{/lang}{/if} - - {/if} -
- - - -
-
- - - {if $errorField == 'confirmNewPassword'} - - {if $errorType == 'empty'}{lang}wcf.global.form.error.empty{/lang}{/if} - {if $errorType == 'notEqual'}{lang}wcf.user.confirmPassword.error.notEqual{/lang}{/if} - - {/if} -
- - - {event name='changePasswordFields'} -
- {/if} - - {if $__wcf->getSession()->getPermission('user.profile.canChangeEmail')} -
- - - -
+ {/if} + + {/if} + + {if $__wcf->getSession()->getPermission('user.profile.canQuit')} +
+

{lang}wcf.user.quit{/lang}

+ + {if $quitStarted} +
+
- - - {if $errorField == 'email'} - - {if $errorType == 'empty'}{lang}wcf.global.form.error.empty{/lang}{/if} - {if $errorType == 'notValid'}{lang}wcf.user.email.error.notValid{/lang}{/if} - {if $errorType == 'notUnique'}{lang}wcf.user.email.error.notUnique{/lang}{/if} - - {/if} +
- - -
+ {else} +
+
- - - {if $errorField == 'confirmEmail'} - - {if $errorType == 'notEqual'}{lang}wcf.user.confirmEmail.error.notEqual{/lang}{/if} - - {/if} + + {lang}wcf.user.quit.description{/lang}
- - {event name='changeEmailFields'} - - {if REGISTER_ACTIVATION_METHOD == 1 && $__wcf->getUser()->reactivationCode != 0} -
-
-
- - {lang newEmail=$__wcf->user->email}wcf.user.changeEmail.needReactivation{/lang} -
-
- {/if} -
- {/if} - - {if $__wcf->getSession()->getPermission('user.profile.canQuit')} -
- {lang}wcf.user.quit{/lang} - - {if $quitStarted} -
-
-
- -
-
- {else} + {/if} + + {event name='quitFields'} + + {/if} + + {hascontent} +
+

{lang}wcf.user.3rdparty{/lang}

+ + {content} + {if $__authProvider}
-
+
{lang}wcf.user.3rdparty.{@$__authProvider}{/lang}
- - {lang}wcf.user.quit.description{/lang} +
- {/if} - - {event name='quitFields'} -
- {/if} - - {hascontent} -
- {lang}wcf.user.3rdparty{/lang} - - {content} - {if $__authProvider} + {elseif !$__wcf->getUser()->hasAdministrativeAccess()} + {if GITHUB_PUBLIC_KEY !== '' && GITHUB_PRIVATE_KEY !== ''}
-
{lang}wcf.user.3rdparty.{@$__authProvider}{/lang}
+
{lang}wcf.user.3rdparty.github{/lang}
- + {if $__wcf->getSession()->getVar('__githubToken')} + + {else} + {lang}wcf.user.3rdparty.github.connect{/lang} + {/if}
- {elseif !$__wcf->getUser()->hasAdministrativeAccess()} - {if GITHUB_PUBLIC_KEY !== '' && GITHUB_PRIVATE_KEY !== ''} -
-
{lang}wcf.user.3rdparty.github{/lang}
-
- {if $__wcf->getSession()->getVar('__githubToken')} - - {else} - {lang}wcf.user.3rdparty.github.connect{/lang} - {/if} -
-
- {/if} - - {if TWITTER_PUBLIC_KEY !== '' && TWITTER_PRIVATE_KEY !== ''} -
-
{lang}wcf.user.3rdparty.twitter{/lang}
-
- {if $__wcf->getSession()->getVar('__twitterData')} - - {else} - {lang}wcf.user.3rdparty.twitter.connect{/lang} - {/if} -
-
- {/if} - - {if FACEBOOK_PUBLIC_KEY !== '' && FACEBOOK_PRIVATE_KEY !== ''} -
-
{lang}wcf.user.3rdparty.facebook{/lang}
-
- {if $__wcf->getSession()->getVar('__facebookData')} - - {else} - {lang}wcf.user.3rdparty.facebook.connect{/lang} - {/if} -
-
- {/if} - - {if GOOGLE_PUBLIC_KEY !== '' && GOOGLE_PRIVATE_KEY !== ''} -
-
{lang}wcf.user.3rdparty.google{/lang}
-
- {if $__wcf->getSession()->getVar('__googleData')} - - {else} - {lang}wcf.user.3rdparty.google.connect{/lang} - {/if} -
-
- {/if} - - {event name='3rdpartyFields'} {/if} - {/content} -
- {/hascontent} - - {event name='fieldsets'} -
+ + {if TWITTER_PUBLIC_KEY !== '' && TWITTER_PRIVATE_KEY !== ''} +
+
{lang}wcf.user.3rdparty.twitter{/lang}
+
+ {if $__wcf->getSession()->getVar('__twitterData')} + + {else} + {lang}wcf.user.3rdparty.twitter.connect{/lang} + {/if} +
+
+ {/if} + + {if FACEBOOK_PUBLIC_KEY !== '' && FACEBOOK_PRIVATE_KEY !== ''} +
+
{lang}wcf.user.3rdparty.facebook{/lang}
+
+ {if $__wcf->getSession()->getVar('__facebookData')} + + {else} + {lang}wcf.user.3rdparty.facebook.connect{/lang} + {/if} +
+
+ {/if} + + {if GOOGLE_PUBLIC_KEY !== '' && GOOGLE_PRIVATE_KEY !== ''} +
+
{lang}wcf.user.3rdparty.google{/lang}
+
+ {if $__wcf->getSession()->getVar('__googleData')} + + {else} + {lang}wcf.user.3rdparty.google.connect{/lang} + {/if} +
+
+ {/if} + + {event name='3rdpartyFields'} + {/if} + {/content} + + {/hascontent} + + {event name='sections'}
diff --git a/com.woltlab.wcf/templates/attachments.tpl b/com.woltlab.wcf/templates/attachments.tpl index ca6a12f2ce..0f68496554 100644 --- a/com.woltlab.wcf/templates/attachments.tpl +++ b/com.woltlab.wcf/templates/attachments.tpl @@ -1,55 +1,51 @@ {if $attachmentList && $attachmentList->getGroupedObjects($objectID)|count} {hascontent} -
-
- {lang}wcf.attachment.images{/lang} - -
    - {content} - {foreach from=$attachmentList->getGroupedObjects($objectID) item=attachment} - {if $attachment->showAsImage() && !$attachment->isEmbedded()} -
  • - {if $attachment->hasThumbnail()} - canDownload()} class="jsImageViewer" title="{$attachment->filename}"{/if}> - {else} - - {/if} - -
    -

    {$attachment->filename}

    - {lang}wcf.attachment.image.info{/lang} -
    -
    • - {/if} - {/foreach} - {/content} -
-
-
+
+

{lang}wcf.attachment.images{/lang}

+ +
    + {content} + {foreach from=$attachmentList->getGroupedObjects($objectID) item=attachment} + {if $attachment->showAsImage() && !$attachment->isEmbedded()} +
  • + {if $attachment->hasThumbnail()} + canDownload()} class="jsImageViewer" title="{$attachment->filename}"{/if}> + {else} + + {/if} + +
    +

    {$attachment->filename}

    + {lang}wcf.attachment.image.info{/lang} +
    +
    • + {/if} + {/foreach} + {/content} +
+
{/hascontent} {hascontent} -
-
- {lang}wcf.attachment.files{/lang} +
+

{lang}wcf.attachment.files{/lang}

-
    - {content} - {foreach from=$attachmentList->getGroupedObjects($objectID) item=attachment} - {if $attachment->showAsFile() && !$attachment->isEmbedded()} -
  • - - -
    -

    {$attachment->filename}

    - {lang}wcf.attachment.file.info{/lang} -
    -
    • - {/if} - {/foreach} - {/content} -
-
-
+
    + {content} + {foreach from=$attachmentList->getGroupedObjects($objectID) item=attachment} + {if $attachment->showAsFile() && !$attachment->isEmbedded()} +
  • + + +
    +

    {$attachment->filename}

    + {lang}wcf.attachment.file.info{/lang} +
    +
    • + {/if} + {/foreach} + {/content} +
+ {/hascontent} {/if} diff --git a/com.woltlab.wcf/templates/authorSidebarBox.tpl b/com.woltlab.wcf/templates/authorSidebarBox.tpl index 03f648b464..c40925d5dd 100644 --- a/com.woltlab.wcf/templates/authorSidebarBox.tpl +++ b/com.woltlab.wcf/templates/authorSidebarBox.tpl @@ -1,7 +1,5 @@ -
- - -
+
+
{@$userProfile->getAvatar()->getImageTag(96)}
@@ -24,4 +22,4 @@ {/if}
-
\ No newline at end of file +
\ No newline at end of file diff --git a/com.woltlab.wcf/templates/avatarEdit.tpl b/com.woltlab.wcf/templates/avatarEdit.tpl index bb59360906..a2cd0c127b 100644 --- a/com.woltlab.wcf/templates/avatarEdit.tpl +++ b/com.woltlab.wcf/templates/avatarEdit.tpl @@ -10,10 +10,10 @@ {include file='userMenuSidebar'} -{include file='header' sidebarOrientation='left'} +{include file='header'} -
-

{lang}wcf.user.avatar.edit{/lang}

+
+

{lang}wcf.user.avatar.edit{/lang}

{include file='userNotice'} @@ -41,67 +41,65 @@ -
-
- {lang}wcf.user.avatar{/lang} - -
-
-
- - {lang}wcf.user.avatar.type.none.description{/lang} -
-
+
+

{lang}wcf.user.avatar{/lang}

- {if $__wcf->getSession()->getPermission('user.profile.avatar.canUploadAvatar')} -
-
- {if $avatarType == 'custom'} - {if $__wcf->getUserProfileHandler()->getAvatar()->canCrop()} - {@$__wcf->getUserProfileHandler()->getAvatar()->getCropImageTag(96)} - {else} - {@$__wcf->getUserProfileHandler()->getAvatar()->getImageTag(96)} - {/if} +
+
+
+ + {lang}wcf.user.avatar.type.none.description{/lang} +
+
+ + {if $__wcf->getSession()->getPermission('user.profile.avatar.canUploadAvatar')} +
+
+ {if $avatarType == 'custom'} + {if $__wcf->getUserProfileHandler()->getAvatar()->canCrop()} + {@$__wcf->getUserProfileHandler()->getAvatar()->getCropImageTag(96)} {else} - - {/if} -
-
- - {lang}wcf.user.avatar.type.custom.description{/lang} - - {* placeholder for upload button: *} -
- - {if $errorField == 'custom'} - - {if $errorType == 'empty'}{lang}wcf.global.form.error.empty{/lang}{/if} - + {@$__wcf->getUserProfileHandler()->getAvatar()->getImageTag(96)} {/if} -
-
- {/if} - - {if MODULE_GRAVATAR} - -
-
- - {if $errorField == 'gravatar'} - - {if $errorType == 'notFound'}{lang}wcf.user.avatar.type.gravatar.error.notFound{/lang}{/if} - - {/if} - {lang}wcf.user.avatar.type.gravatar.description{/lang} -
-
- {/if} - - {event name='avatarFields'} -
+ {else} + + {/if} + +
+ + {lang}wcf.user.avatar.type.custom.description{/lang} + + {* placeholder for upload button: *} +
+ + {if $errorField == 'custom'} + + {if $errorType == 'empty'}{lang}wcf.global.form.error.empty{/lang}{/if} + + {/if} +
+ + {/if} + + {if MODULE_GRAVATAR} + +
+
+ + {if $errorField == 'gravatar'} + + {if $errorType == 'notFound'}{lang}wcf.user.avatar.type.gravatar.error.notFound{/lang}{/if} + + {/if} + {lang}wcf.user.avatar.type.gravatar.description{/lang} +
+ + {/if} + + {event name='avatarFields'} + - {event name='fieldsets'} -
+ {event name='sections'} {if !$__wcf->user->disableAvatar}
diff --git a/com.woltlab.wcf/templates/benchmark.tpl b/com.woltlab.wcf/templates/benchmark.tpl index d289c89fd5..1d7be2e7ea 100644 --- a/com.woltlab.wcf/templates/benchmark.tpl +++ b/com.woltlab.wcf/templates/benchmark.tpl @@ -1,6 +1,7 @@ -

Execution time: {@$__wcf->getBenchmark()->getExecutionTime()}s ({#($__wcf->getBenchmark()->getExecutionTime()-$__wcf->getBenchmark()->getQueryExecutionTime())/$__wcf->getBenchmark()->getExecutionTime()*100}% PHP, {#$__wcf->getBenchmark()->getQueryExecutionTime()/$__wcf->getBenchmark()->getExecutionTime()*100}% SQL) | SQL queries: {#$__wcf->getBenchmark()->getQueryCount()} | Memory-Usage: {$__wcf->getBenchmark()->getMemoryUsage()}

+
+ {if ENABLE_DEBUG_MODE}{/if}Execution time: {@$__wcf->getBenchmark()->getExecutionTime()}s ({#($__wcf->getBenchmark()->getExecutionTime()-$__wcf->getBenchmark()->getQueryExecutionTime())/$__wcf->getBenchmark()->getExecutionTime()*100}% PHP, {#$__wcf->getBenchmark()->getQueryExecutionTime()/$__wcf->getBenchmark()->getExecutionTime()*100}% SQL) | SQL queries: {#$__wcf->getBenchmark()->getQueryCount()} | Memory-Usage: {$__wcf->getBenchmark()->getMemoryUsage()}{if ENABLE_DEBUG_MODE}{/if} -{if ENABLE_DEBUG_MODE} +{if ENABLE_DEBUG_MODE} -{/if} \ No newline at end of file +{/if} +
\ No newline at end of file diff --git a/com.woltlab.wcf/templates/captchaQuestion.tpl b/com.woltlab.wcf/templates/captchaQuestion.tpl index 827525057e..9bd84ac69a 100644 --- a/com.woltlab.wcf/templates/captchaQuestion.tpl +++ b/com.woltlab.wcf/templates/captchaQuestion.tpl @@ -1,9 +1,11 @@ {if !$captchaQuestionAnswered} -
- {lang}wcf.captcha.question.captcha{/lang} - {lang}wcf.captcha.question.captcha.description{/lang} +
+
+

{lang}wcf.captcha.question.captcha{/lang}

+ {lang}wcf.captcha.question.captcha.description{/lang} +
@@ -24,7 +26,7 @@ {/if}
-
+ {if !$ajaxCaptcha|empty} -
+
{@SID_INPUT_TAG} diff --git a/com.woltlab.wcf/templates/emailActivation.tpl b/com.woltlab.wcf/templates/emailActivation.tpl index e989e57b74..5e58bad51c 100644 --- a/com.woltlab.wcf/templates/emailActivation.tpl +++ b/com.woltlab.wcf/templates/emailActivation.tpl @@ -10,8 +10,8 @@ {include file='header'} -
-

{lang}wcf.user.emailActivation{/lang}

+
+

{lang}wcf.user.emailActivation{/lang}

{include file='userNotice'} @@ -31,41 +31,37 @@
-
-
- - - -
-
- - {if $errorField == 'u'} - - {if $errorType == 'notValid'}{lang}wcf.user.userID.error.invalid{/lang}{/if} - - {/if} -
- - - -
-
- - {if $errorField == 'a'} - - {if $errorType == 'notValid'}{lang}wcf.user.activationCode.error.notValid{/lang}{/if} - - {/if} - {lang}wcf.user.newActivationCode{/lang} -
- - - {event name='fields'} -
+
+ +
+
+ + {if $errorField == 'u'} + + {if $errorType == 'notValid'}{lang}wcf.user.userID.error.invalid{/lang}{/if} + + {/if} +
+ - {event name='fieldsets'} + +
+
+ + {if $errorField == 'a'} + + {if $errorType == 'notValid'}{lang}wcf.user.activationCode.error.notValid{/lang}{/if} + + {/if} + {lang}wcf.user.newActivationCode{/lang} +
+ + + {event name='fields'}
+ {event name='sections'} +
{@SECURITY_TOKEN_INPUT_TAG} diff --git a/com.woltlab.wcf/templates/emailNewActivationCode.tpl b/com.woltlab.wcf/templates/emailNewActivationCode.tpl index 2e3c4a8ed7..71d1905508 100644 --- a/com.woltlab.wcf/templates/emailNewActivationCode.tpl +++ b/com.woltlab.wcf/templates/emailNewActivationCode.tpl @@ -9,8 +9,8 @@ {include file='header'} -
-

{lang}wcf.user.newActivationCode{/lang}

+
+

{lang}wcf.user.newActivationCode{/lang}

{include file='userNotice'} @@ -30,50 +30,46 @@
-
-
- {lang}wcf.user.newActivationCode{/lang} - - -
-
- - {if $errorField == 'username'} - - {if $errorType == 'empty'} - {lang}wcf.global.form.error.empty{/lang} - {elseif $errorType == 'alreadyEnabled'} - {lang}wcf.user.registerActivation.error.userAlreadyEnabled{/lang} - {else} - {lang}wcf.user.username.error.{@$errorType}{/lang} - {/if} - - {/if} -
- - - -
-
- - {if $errorField == 'password'} - - {if $errorType == 'empty'} - {lang}wcf.global.form.error.empty{/lang} - {else} - {lang}wcf.user.password.error.{@$errorType}{/lang} - {/if} - - {/if} -
- - - {event name='fields'} -
+
+ +
+
+ + {if $errorField == 'username'} + + {if $errorType == 'empty'} + {lang}wcf.global.form.error.empty{/lang} + {elseif $errorType == 'alreadyEnabled'} + {lang}wcf.user.registerActivation.error.userAlreadyEnabled{/lang} + {else} + {lang}wcf.user.username.error.{@$errorType}{/lang} + {/if} + + {/if} +
+ - {event name='fieldsets'} + +
+
+ + {if $errorField == 'password'} + + {if $errorType == 'empty'} + {lang}wcf.global.form.error.empty{/lang} + {else} + {lang}wcf.user.password.error.{@$errorType}{/lang} + {/if} + + {/if} +
+ + + {event name='fields'}
+ {event name='sections'} +
{@SECURITY_TOKEN_INPUT_TAG} diff --git a/com.woltlab.wcf/templates/following.tpl b/com.woltlab.wcf/templates/following.tpl index d3ba17f421..ca88fed791 100644 --- a/com.woltlab.wcf/templates/following.tpl +++ b/com.woltlab.wcf/templates/following.tpl @@ -17,10 +17,10 @@ {include file='userMenuSidebar'} -{include file='header' sidebarOrientation='left'} +{include file='header'} -
-

{lang}wcf.user.following{/lang} {#$items}

+
+

{lang}wcf.user.following{/lang} {#$items}

{include file='userNotice'} @@ -40,12 +40,12 @@
{if $objects|count} -
+
    {foreach from=$objects item=user}
  1. - {@$user->getAvatar()->getImageTag(48)} + {@$user->getAvatar()->getImageTag(48)}
    {include file='userInformationHeadline'} diff --git a/com.woltlab.wcf/templates/groupedUserList.tpl b/com.woltlab.wcf/templates/groupedUserList.tpl index d2c5572904..5832289603 100644 --- a/com.woltlab.wcf/templates/groupedUserList.tpl +++ b/com.woltlab.wcf/templates/groupedUserList.tpl @@ -1,20 +1,21 @@ {foreach from=$groupedUsers item=group} {if $group} -
    -

    {$group}

    -
    +
    +

    {$group}

    {/if} {if $group|count} -
    -
      - {foreach from=$group item=user} - {include file='userListItem'} - {/foreach} -
    -
    +
      + {foreach from=$group item=user} + {include file='userListItem'} + {/foreach} +
    {else} -

    {$group->getNoUsersMessage()}

    +

    {$group->getNoUsersMessage()}

    + {/if} + + {if $group} +
    {/if} {/foreach} diff --git a/com.woltlab.wcf/templates/ignoredUsers.tpl b/com.woltlab.wcf/templates/ignoredUsers.tpl index 82d9d3eee4..272e914ee6 100644 --- a/com.woltlab.wcf/templates/ignoredUsers.tpl +++ b/com.woltlab.wcf/templates/ignoredUsers.tpl @@ -17,10 +17,10 @@ {include file='userMenuSidebar'} -{include file='header' sidebarOrientation='left'} +{include file='header'} -
    -

    {lang}wcf.user.ignoredUsers{/lang} {#$items}

    +
    +

    {lang}wcf.user.ignoredUsers{/lang} {#$items}

    {include file='userNotice'} @@ -40,12 +40,12 @@
    {if $objects|count} -
    +
      {foreach from=$objects item=user}
    1. - {@$user->getAvatar()->getImageTag(48)} + {@$user->getAvatar()->getImageTag(48)}
      {include file='userInformationHeadline'} diff --git a/com.woltlab.wcf/templates/login.tpl b/com.woltlab.wcf/templates/login.tpl index 605daea848..1be04f5c7f 100644 --- a/com.woltlab.wcf/templates/login.tpl +++ b/com.woltlab.wcf/templates/login.tpl @@ -17,8 +17,8 @@ {include file='header' __disableLoginLink=true __disableAds=true} -
      -

      {lang}wcf.user.login{/lang}

      +
      +

      {lang}wcf.user.login{/lang}

      {include file='userNotice'} @@ -42,120 +42,106 @@
      -
      -
      - {lang}wcf.user.login.data{/lang} - - -
      +
      + +
      +
      + + {if $errorField == 'username'} + + {if $errorType == 'empty'} + {lang}wcf.global.form.error.empty{/lang} + {else} + {lang}wcf.user.username.error.{@$errorType}{/lang} + {/if} + + {/if} +
      + + + {if !REGISTER_DISABLED} +
      +
      {lang}wcf.user.login.action{/lang}
      - - {if $errorField == 'username'} - - {if $errorType == 'empty'} - {lang}wcf.global.form.error.empty{/lang} - {else} - {lang}wcf.user.username.error.{@$errorType}{/lang} - {/if} - - {/if} + +
      - - {if !REGISTER_DISABLED} -
      -
      {lang}wcf.user.login.action{/lang}
      -
      - - -
      -
      - {/if} - - -
      + {/if} + + +
      +
      + + {if $errorField == 'password'} + + {if $errorType == 'empty'} + {lang}wcf.global.form.error.empty{/lang} + {else} + {lang}wcf.user.password.error.{@$errorType}{/lang} + {/if} + + {/if} + {lang}wcf.user.lostPassword{/lang} +
      + + + {if $supportsPersistentLogins} +
      +
      - - {if $errorField == 'password'} - - {if $errorType == 'empty'} - {lang}wcf.global.form.error.empty{/lang} - {else} - {lang}wcf.user.password.error.{@$errorType}{/lang} - {/if} - - {/if} +
      - - {if $supportsPersistentLogins} -
      -
      -
      - -
      -
      - {/if} - - {event name='fields'} + {/if} + + {event name='fields'} +
      + + {hascontent} +
      +

      {lang}wcf.user.login.3rdParty{/lang}

      -
      - - {hascontent} -
      - {lang}wcf.user.login.3rdParty{/lang} - -
      -
      -
      - -
      -
      -
      - {/hascontent} - - {event name='fieldsets'} - - {include file='captcha'} -
      + + {/hascontent} + + {event name='sections'} + + {include file='captcha'}
      diff --git a/com.woltlab.wcf/templates/lostPassword.tpl b/com.woltlab.wcf/templates/lostPassword.tpl index 66f87a2908..401549d0f3 100644 --- a/com.woltlab.wcf/templates/lostPassword.tpl +++ b/com.woltlab.wcf/templates/lostPassword.tpl @@ -17,8 +17,8 @@ {include file='header'} -
      -

      {lang}wcf.user.lostPassword{/lang}

      +
      +

      {lang}wcf.user.lostPassword{/lang}

      {include file='userNotice'} @@ -40,49 +40,45 @@
      -
      -
      - {lang}wcf.user.lostPassword{/lang} - -
      -
      - -
      -
      - - {if $errorField == 'username'} - - {if $errorType == 'empty'}{lang}wcf.global.form.error.empty{/lang}{/if} - {if $errorType == 'notFound'}{lang}wcf.user.username.error.notFound{/lang}{/if} - {if $errorType == '3rdParty'}{lang}wcf.user.username.error.3rdParty{/lang}{/if} - - {/if} -
      -
      - -
      -
      - -
      -
      - - {if $errorField == 'email'} - - {if $errorType == 'empty'}{lang}wcf.global.form.error.empty{/lang}{/if} - {if $errorType == 'notFound'}{lang}wcf.user.lostPassword.email.error.notFound{/lang}{/if} - - {/if} -
      -
      - - {event name='fields'} -
      +
      +
      +
      + +
      +
      + + {if $errorField == 'username'} + + {if $errorType == 'empty'}{lang}wcf.global.form.error.empty{/lang}{/if} + {if $errorType == 'notFound'}{lang}wcf.user.username.error.notFound{/lang}{/if} + {if $errorType == '3rdParty'}{lang}wcf.user.username.error.3rdParty{/lang}{/if} + + {/if} +
      +
      - {event name='fieldsets'} +
      +
      + +
      +
      + + {if $errorField == 'email'} + + {if $errorType == 'empty'}{lang}wcf.global.form.error.empty{/lang}{/if} + {if $errorType == 'notFound'}{lang}wcf.user.lostPassword.email.error.notFound{/lang}{/if} + + {/if} +
      +
      - {include file='captcha'} + {event name='fields'}
      + {event name='sections'} + + {include file='captcha'} +
      {@SECURITY_TOKEN_INPUT_TAG} diff --git a/com.woltlab.wcf/templates/mail.tpl b/com.woltlab.wcf/templates/mail.tpl index 1540022535..9806ced792 100644 --- a/com.woltlab.wcf/templates/mail.tpl +++ b/com.woltlab.wcf/templates/mail.tpl @@ -9,8 +9,8 @@ {include file='header'} -
      -

      {lang}wcf.user.mail.title{/lang}

      +
      +

      {lang}wcf.user.mail.title{/lang}

      {include file='userNotice'} @@ -30,79 +30,77 @@
      -
      -
      - {lang}wcf.user.mail.information{/lang} - - -
      -
      - - {if $errorField == 'subject'} - - {if $errorType == 'empty'} - {lang}wcf.global.form.error.empty{/lang} - {else} - {lang}wcf.user.mail.subject.error.{@$errorType}{/lang} - {/if} - - {/if} -
      - - - {if $__wcf->user->userID} -
      -
      -
      -
      - {else} - -
      -
      - - {if $errorField == 'email'} - - {if $errorType == 'empty'} - {lang}wcf.global.form.error.empty{/lang} - {elseif $errorType == 'notValid'} - {lang}wcf.user.email.error.notValid{/lang} - {else} - {lang}wcf.user.mail.senderEmail.error.{@$errorType}{/lang} - {/if} - +
      +

      {lang}wcf.user.mail.information{/lang}

      + + +
      +
      + + {if $errorField == 'subject'} + + {if $errorType == 'empty'} + {lang}wcf.global.form.error.empty{/lang} + {else} + {lang}wcf.user.mail.subject.error.{@$errorType}{/lang} {/if} -
      - - {/if} - - {event name='informationFields'} -
      + + {/if} + + -
      - - -
      + {if $__wcf->user->userID} +
      +
      +
      +
      + {else} + +
      - - {if $errorField == 'message'} + + {if $errorField == 'email'} {if $errorType == 'empty'} {lang}wcf.global.form.error.empty{/lang} + {elseif $errorType == 'notValid'} + {lang}wcf.user.email.error.notValid{/lang} {else} - {lang}wcf.user.mail.message.error.{@$errorType}{/lang} + {lang}wcf.user.mail.senderEmail.error.{@$errorType}{/lang} {/if} {/if}
      - - {event name='messageFields'} -
      + {/if} - {event name='fieldsets'} + {event name='informationFields'} + + +
      +

      {lang}wcf.user.mail.message{/lang}

      - {include file='captcha'} -
      +
      +
      + + {if $errorField == 'message'} + + {if $errorType == 'empty'} + {lang}wcf.global.form.error.empty{/lang} + {else} + {lang}wcf.user.mail.message.error.{@$errorType}{/lang} + {/if} + + {/if} +
      +
      + + {event name='messageFields'} + + + {event name='sections'} + + {include file='captcha'}
      diff --git a/com.woltlab.wcf/templates/manageSubscription.tpl b/com.woltlab.wcf/templates/manageSubscription.tpl index a6523d9824..34aae66d52 100644 --- a/com.woltlab.wcf/templates/manageSubscription.tpl +++ b/com.woltlab.wcf/templates/manageSubscription.tpl @@ -1,4 +1,4 @@ -
      +
      @@ -13,7 +13,7 @@
      {event name='fields'} -
      +
      diff --git a/com.woltlab.wcf/templates/mediaEditor.tpl b/com.woltlab.wcf/templates/mediaEditor.tpl index 65172e57e8..76adbad860 100644 --- a/com.woltlab.wcf/templates/mediaEditor.tpl +++ b/com.woltlab.wcf/templates/mediaEditor.tpl @@ -1,4 +1,4 @@ -
      +
      @@ -18,8 +18,8 @@
      -
      - {lang}wcf.global.form.data{/lang} +
      +

      {lang}wcf.global.form.data{/lang}

      @@ -34,7 +34,7 @@ {include file='languageChooser' label='wcf.media.languageID'}
      -
      {lang}wcf.global.title{/lang}
      +
      @@ -42,7 +42,7 @@ {include file='multipleLanguageInputJavascript' elementIdentifier='title' forceSelection=true}
      -
      {lang}wcf.media.caption{/lang}
      +
      @@ -50,7 +50,7 @@ {include file='multipleLanguageInputJavascript' elementIdentifier='caption' forceSelection=true}
      -
      {lang}wcf.media.altText{/lang}
      +
      @@ -58,7 +58,7 @@ {include file='multipleLanguageInputJavascript' elementIdentifier='altText' forceSelection=true} {event name='dataFields'} -
      +
      diff --git a/com.woltlab.wcf/templates/mediaManager.tpl b/com.woltlab.wcf/templates/mediaManager.tpl index 2c33b79d9d..381a49f65e 100644 --- a/com.woltlab.wcf/templates/mediaManager.tpl +++ b/com.woltlab.wcf/templates/mediaManager.tpl @@ -21,10 +21,10 @@
      {if $__wcf->session->getPermission('admin.content.cms.canManageMedia')} -
      +
      {/if} -
      +
        {include file='mediaListItems'} diff --git a/com.woltlab.wcf/templates/membersList.tpl b/com.woltlab.wcf/templates/membersList.tpl index 15f6ace8b5..235026bd09 100644 --- a/com.woltlab.wcf/templates/membersList.tpl +++ b/com.woltlab.wcf/templates/membersList.tpl @@ -38,13 +38,13 @@ -{capture assign='sidebar'} +{capture assign='sidebarRight'} {assign var=encodedLetter value=$letter|rawurlencode} -
        +
        -
        - - +

        {lang}wcf.user.search{/lang}

        + +
        @@ -52,26 +52,28 @@ {@SECURITY_TOKEN_INPUT_TAG}
        -
        +
        -
      + -
      - {lang}wcf.user.members.sort.letters{/lang} - - -
      +
      +

      {lang}wcf.user.members.sort.letters{/lang}

      -
      +
      + +
      +
      + +
      -
      - - +

      {lang}wcf.user.members.sort{/lang}

      + +
      @@ -89,23 +91,23 @@
      -
      - -
      - - - {@SID_INPUT_TAG} + +
      + + + {@SID_INPUT_TAG} +
      -
      + {@$__boxSidebar} {/capture} -{include file='header' sidebarOrientation='right'} +{include file='header'} -
      -

      {if $searchID}{lang}wcf.user.search.results{/lang}{else}{lang}wcf.user.members{/lang}{/if} {#$items}

      +
      +

      {if $searchID}{lang}wcf.user.search.results{/lang}{else}{lang}wcf.user.members{/lang}{/if} {#$items}

      {include file='userNotice'} @@ -129,7 +131,7 @@
      {if $items} -
      +
        {foreach from=$objects item=user} {include file='userListItem'} diff --git a/com.woltlab.wcf/templates/messageQuoteList.tpl b/com.woltlab.wcf/templates/messageQuoteList.tpl index 3711291c6a..c1be9f9b01 100644 --- a/com.woltlab.wcf/templates/messageQuoteList.tpl +++ b/com.woltlab.wcf/templates/messageQuoteList.tpl @@ -1,13 +1,13 @@ {if !$supportPaste|isset}{assign var=supportPaste value=false}{/if} {foreach from=$messages item=message} -
        +
        {if $userProfiles[$message->getUserID()]|isset} - {@$userProfiles[$message->getUserID()]->getAvatar()->getImageTag(32)} + {@$userProfiles[$message->getUserID()]->getAvatar()->getImageTag(32)} {/if}
        diff --git a/com.woltlab.wcf/templates/messageSidebar.tpl b/com.woltlab.wcf/templates/messageSidebar.tpl index dabd84ca40..82bfe271a3 100644 --- a/com.woltlab.wcf/templates/messageSidebar.tpl +++ b/com.woltlab.wcf/templates/messageSidebar.tpl @@ -11,7 +11,7 @@ {if $userProfile->getAvatar()}
        {capture assign='__userAvatar'}{@$userProfile->getAvatar()->getImageTag(128)}{/capture} - {@' + {@' {if MESSAGE_SIDEBAR_ENABLE_ONLINE_STATUS && $userProfile->isOnline()}{lang}wcf.user.online{/lang}{/if}
        diff --git a/com.woltlab.wcf/templates/moderationActivation.tpl b/com.woltlab.wcf/templates/moderationActivation.tpl index 15067b2e56..73014b29f1 100644 --- a/com.woltlab.wcf/templates/moderationActivation.tpl +++ b/com.woltlab.wcf/templates/moderationActivation.tpl @@ -29,8 +29,8 @@ {include file='header'} -
        -

        {lang}wcf.moderation.activation{/lang}: {$queue->getTitle()}

        +
        +

        {lang}wcf.moderation.activation{/lang}: {$queue->getTitle()}

        {if $queue->lastChangeTime}
        @@ -62,15 +62,15 @@ {include file='formError'} -
        -

        {lang}wcf.moderation.activation.content{/lang}

        -

        {lang}wcf.moderation.type.{@$queue->getObjectTypeName()}{/lang}

        -
        +
        +
        +

        {lang}wcf.moderation.activation.content{/lang}

        + {lang}wcf.moderation.type.{@$queue->getObjectTypeName()}{/lang} +
        -
        {@$disabledContent} -
        - +
        +
        -
        -

        {lang}wcf.moderation.comments{/lang} {#$queue->comments}

        -

        {lang}wcf.moderation.comments.description{/lang}

        -
        - {include file='__commentJavaScript' commentContainerID='moderationQueueCommentList'} -
        +
        +
        +

        {lang}wcf.moderation.comments{/lang} {#$queue->comments}

        + {lang}wcf.moderation.comments.description{/lang} +
        +
          {include file='commentList'}
        -
        +
        {include file='footer'} diff --git a/com.woltlab.wcf/templates/moderationComment.tpl b/com.woltlab.wcf/templates/moderationComment.tpl index becf299de2..bfe0f6de67 100644 --- a/com.woltlab.wcf/templates/moderationComment.tpl +++ b/com.woltlab.wcf/templates/moderationComment.tpl @@ -4,7 +4,7 @@
        - {@$message->getUserProfile()->getAvatar()->getImageTag(32)} + {@$message->getUserProfile()->getAvatar()->getImageTag(32)}

        {$message->getTitle()}

        diff --git a/com.woltlab.wcf/templates/moderationList.tpl b/com.woltlab.wcf/templates/moderationList.tpl index 1251d88cc7..55346a7c18 100644 --- a/com.woltlab.wcf/templates/moderationList.tpl +++ b/com.woltlab.wcf/templates/moderationList.tpl @@ -17,12 +17,12 @@ -{capture assign='sidebar'} +{capture assign='sidebarLeft'} {* moderation type *} -
        - {lang}wcf.moderation.filterByType{/lang} +
        +

        {lang}wcf.moderation.filterByType{/lang}

        -
        + {* assigned user *} -
        - {lang}wcf.moderation.filterByUser{/lang} +
        +

        {lang}wcf.moderation.filterByUser{/lang}

        -
        + {* status *} -
        - {lang}wcf.moderation.status{/lang} +
        +

        {lang}wcf.moderation.status{/lang}

        -
        + {event name='sidebarBoxes'} {/capture} @@ -70,10 +70,10 @@
        2. {/capture} -{include file='header' sidebarOrientation='left'} +{include file='header'} -
        -

        {lang}wcf.moderation.moderation{/lang}

        +
        +

        {if $status == 2}{lang}wcf.moderation.doneItems{/lang}{else}{lang}wcf.moderation.outstandingItems{/lang}{/if} {#$items}

        {include file='userNotice'} @@ -93,11 +93,7 @@
        {if $objects|count} -
        -
        -

        {if $status == 2}{lang}wcf.moderation.doneItems{/lang}{else}{lang}wcf.moderation.outstandingItems{/lang}{/if} {#$items}

        -
        - +
        @@ -115,7 +111,7 @@
        -

        isNew()} title="{lang}wcf.moderation.markAsRead.doubleClick{/lang}"{/if}>{@$entry->getUserProfile()->getAvatar()->getImageTag(32)}

        + isNew()} title="{lang}wcf.moderation.markAsRead.doubleClick{/lang}"{/if}>{@$entry->getUserProfile()->getAvatar()->getImageTag(32)}

        		 diff --git a/com.woltlab.wcf/templates/moderationQueueAssignUser.tpl b/com.woltlab.wcf/templates/moderationQueueAssignUser.tpl index a362ec36c0..73625a8002 100644 --- a/com.woltlab.wcf/templates/moderationQueueAssignUser.tpl +++ b/com.woltlab.wcf/templates/moderationQueueAssignUser.tpl @@ -1,4 +1,4 @@ -
        +
        {lang}wcf.moderation.assignedUser{/lang}
        @@ -30,7 +30,7 @@
        -
        + {/if} -
        +

        {$poll->question} {#$poll->votes}

        diff --git a/com.woltlab.wcf/templates/quoteBBCodeTag.tpl b/com.woltlab.wcf/templates/quoteBBCodeTag.tpl index 0924375572..faf1774149 100644 --- a/com.woltlab.wcf/templates/quoteBBCodeTag.tpl +++ b/com.woltlab.wcf/templates/quoteBBCodeTag.tpl @@ -1,8 +1,8 @@ -
        +
        {if $quoteAuthorObject} - {@$quoteAuthorObject->getAvatar()->getImageTag(32)} + {@$quoteAuthorObject->getAvatar()->getImageTag(32)} {else} {/if} diff --git a/com.woltlab.wcf/templates/quoteMetaCode.tpl b/com.woltlab.wcf/templates/quoteMetaCode.tpl index e934b11ad9..19195cbc59 100644 --- a/com.woltlab.wcf/templates/quoteMetaCode.tpl +++ b/com.woltlab.wcf/templates/quoteMetaCode.tpl @@ -1,8 +1,8 @@ -
        +
        {if $quoteAuthorObject} - {@$quoteAuthorObject->getAvatar()->getImageTag(32)} + {@$quoteAuthorObject->getAvatar()->getImageTag(32)} {else} {/if} diff --git a/com.woltlab.wcf/templates/recaptcha.tpl b/com.woltlab.wcf/templates/recaptcha.tpl index c9e3c2a1b5..b759327136 100644 --- a/com.woltlab.wcf/templates/recaptcha.tpl +++ b/com.woltlab.wcf/templates/recaptcha.tpl @@ -3,8 +3,8 @@ {else} {* 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}
        @@ -22,8 +22,8 @@
        -
        - +
        + {if (($errorType|isset && $errorType|is_array && $errorType[recaptchaString]|isset) || ($errorField|isset && $errorField == 'recaptchaString'))} {if $errorType|is_array && $errorType[recaptchaString]|isset} {assign var='__errorType' value=$errorType[recaptchaString]} @@ -95,10 +95,10 @@ {/if}
        -
        +
        {else} -
        - {lang}wcf.recaptcha.title{/lang} +
        +

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

        {assign var="recaptchaBucketID" value=true|microtime|sha1}
        @@ -173,6 +173,6 @@ if (!window.grecaptcha) $.getScript('https://www.google.com/recaptcha/api.js?render=explicit&onload=recaptchaCallback'); //]]> -
        + {/if} {/if} diff --git a/com.woltlab.wcf/templates/recentActivities.tpl b/com.woltlab.wcf/templates/recentActivities.tpl index 9f54fea14f..6dd2554b52 100644 --- a/com.woltlab.wcf/templates/recentActivities.tpl +++ b/com.woltlab.wcf/templates/recentActivities.tpl @@ -18,7 +18,7 @@ {/content} {hascontentelse} -
        +
        {if $placeholder|isset}{$placeholder}{/if}
        {/hascontent} diff --git a/com.woltlab.wcf/templates/recentActivityList.tpl b/com.woltlab.wcf/templates/recentActivityList.tpl index 4397e8bfc7..799ccd2a2d 100644 --- a/com.woltlab.wcf/templates/recentActivityList.tpl +++ b/com.woltlab.wcf/templates/recentActivityList.tpl @@ -23,14 +23,14 @@ -{capture assign='sidebar'} +{capture assign='sidebarRight'} {@$__boxSidebar} {/capture} -{include file='header' sidebarOrientation='right'} +{include file='header'} -
        -

        {lang}wcf.user.recentActivity{/lang}

        +
        +

        {lang}wcf.user.recentActivity{/lang}

        {include file='userNotice'} @@ -48,7 +48,7 @@
        {if $eventList|count} -
        +
          {include file='recentActivityListItem'}
        diff --git a/com.woltlab.wcf/templates/recentActivityListItem.tpl b/com.woltlab.wcf/templates/recentActivityListItem.tpl index a6be32e527..0e81b44c21 100644 --- a/com.woltlab.wcf/templates/recentActivityListItem.tpl +++ b/com.woltlab.wcf/templates/recentActivityListItem.tpl @@ -1,7 +1,7 @@ {foreach from=$eventList item=event}
      2. - {@$event->getUserProfile()->getAvatar()->getImageTag(48)} + {@$event->getUserProfile()->getAvatar()->getImageTag(48)}
        diff --git a/com.woltlab.wcf/templates/register.tpl b/com.woltlab.wcf/templates/register.tpl index 6223020d11..99fc246fff 100644 --- a/com.woltlab.wcf/templates/register.tpl +++ b/com.woltlab.wcf/templates/register.tpl @@ -38,8 +38,8 @@ {include file='header' __disableLoginLink=true __disableAds=true} -
        -

        {lang}wcf.user.register{/lang}

        +
        +

        {lang}wcf.user.register{/lang}

        {include file='userNotice'} @@ -63,175 +63,174 @@
        -
        -
        - {lang}wcf.user.username{/lang} +
        +

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

        + + +
        + +
        +
        + + {if $errorType.username|isset} + + {if $errorType.username == 'empty'}{lang}wcf.global.form.error.empty{/lang}{/if} + {if $errorType.username == 'notValid'}{lang}wcf.user.username.error.notValid{/lang}{/if} + {if $errorType.username == 'notUnique'}{lang}wcf.user.username.error.notUnique{/lang}{/if} + + {/if} + {lang}wcf.user.username.description{/lang} +
        + + + {event name='usernameFields'} +
        + +
        +
        +

        {lang}wcf.user.register.honeyPot{/lang}

        + {lang}wcf.user.register.honeyPot.description{/lang} +
        + +
        +
        + +
        +
        + +
        +
        + +
        +
        + +
        +
        + +
        +
        + + {event name='honeyPotFields'} +
        + +
        +

        {lang}wcf.user.email{/lang}

        + + +
        + +
        +
        + + {if $errorType.email|isset} + + {if $errorType.email == 'empty'}{lang}wcf.global.form.error.empty{/lang}{/if} + {if $errorType.email == 'notValid'}{lang}wcf.user.email.error.notValid{/lang}{/if} + {if $errorType.email == 'notUnique'}{lang}wcf.user.email.error.notUnique{/lang}{/if} + + {/if} +
        + + + +
        + +
        +
        + + {if $errorType.confirmEmail|isset} + + {if $errorType.confirmEmail == 'notEqual'}{lang}wcf.user.confirmEmail.error.notEqual{/lang}{/if} + + {/if} +
        + + + {event name='emailFields'} +
        + + {if !$isExternalAuthentication} +
        +

        {lang}wcf.user.password{/lang}

        - +
        - +
        - - {if $errorType.username|isset} + + {if $errorType.password|isset} - {if $errorType.username == 'empty'}{lang}wcf.global.form.error.empty{/lang}{/if} - {if $errorType.username == 'notValid'}{lang}wcf.user.username.error.notValid{/lang}{/if} - {if $errorType.username == 'notUnique'}{lang}wcf.user.username.error.notUnique{/lang}{/if} + {if $errorType.password == 'empty'}{lang}wcf.global.form.error.empty{/lang}{/if} + {if $errorType.password == 'notSecure'}{lang}wcf.user.password.error.notSecure{/lang}{/if} {/if} - {lang}wcf.user.username.description{/lang} -
        - - - {event name='usernameFields'} -
        - -
        - {lang}wcf.user.register.honeyPot{/lang} - - {lang}wcf.user.register.honeyPot.description{/lang} - -
        -
        - -
        -
        - + {lang}wcf.user.password.description{/lang}
        -
        +
        - +
        - -
        -
        - - {event name='honeyPotFields'} -
        - -
        - {lang}wcf.user.email{/lang} - - -
        - -
        -
        - - {if $errorType.email|isset} + + {if $errorType.confirmPassword|isset} - {if $errorType.email == 'empty'}{lang}wcf.global.form.error.empty{/lang}{/if} - {if $errorType.email == 'notValid'}{lang}wcf.user.email.error.notValid{/lang}{/if} - {if $errorType.email == 'notUnique'}{lang}wcf.user.email.error.notUnique{/lang}{/if} + {if $errorType.confirmPassword == 'notEqual'}{lang}wcf.user.confirmPassword.error.notEqual{/lang}{/if} {/if}
        - -
        - -
        + {event name='passwordFields'} + + {/if} + + {if $availableLanguages|count > 1} +
        +

        {lang}wcf.user.language{/lang}

        + +
        +
        - - {if $errorType.confirmEmail|isset} - - {if $errorType.confirmEmail == 'notEqual'}{lang}wcf.user.confirmEmail.error.notEqual{/lang}{/if} - - {/if} + + {lang}wcf.user.language.description{/lang}
        - {event name='emailFields'} -
        - - {if !$isExternalAuthentication} -
        - {lang}wcf.user.password{/lang} - - -
        - -
        -
        - - {if $errorType.password|isset} - - {if $errorType.password == 'empty'}{lang}wcf.global.form.error.empty{/lang}{/if} - {if $errorType.password == 'notSecure'}{lang}wcf.user.password.error.notSecure{/lang}{/if} - - {/if} - {lang}wcf.user.password.description{/lang} -
        - - - -
        - -
        -
        - - {if $errorType.confirmPassword|isset} - - {if $errorType.confirmPassword == 'notEqual'}{lang}wcf.user.confirmPassword.error.notEqual{/lang}{/if} - - {/if} -
        - - - {event name='passwordFields'} -
        - {/if} - - {if $availableLanguages|count > 1} -
        - {lang}wcf.user.language{/lang} - + {hascontent}
        -
        -
        - - {lang}wcf.user.language.description{/lang} -
        +
        +
        + {content} + {foreach from=$availableContentLanguages item=language} + + {/foreach} + {/content} + {lang}wcf.user.visibleLanguages.description{/lang}
        - - {hascontent} -
        -
        -
        - {content} - {foreach from=$availableContentLanguages item=language} - - {/foreach} - {/content} - {lang}wcf.user.visibleLanguages.description{/lang}
        -
        - {/hascontent} - - {event name='languageFields'} -
        - {/if} - - {foreach from=$optionTree item=category} -
        - {lang}wcf.user.option.category.{@$category[object]->categoryName}{/lang} - - {include file='userOptionFieldList' options=$category[options] langPrefix='wcf.user.option.'} -
        - {/foreach} - - {event name='fieldsets'} - - {include file='captcha'} -
        + {/hascontent} + + {event name='languageFields'} + + {/if} + + {foreach from=$optionTree item=category} +
        +

        {lang}wcf.user.option.category.{@$category[object]->categoryName}{/lang}

        + + {include file='userOptionFieldList' options=$category[options] langPrefix='wcf.user.option.'} +
        + {/foreach} + + {event name='sections'} + + {include file='captcha'}
        diff --git a/com.woltlab.wcf/templates/registerActivation.tpl b/com.woltlab.wcf/templates/registerActivation.tpl index 11650bc4fe..4ab00ecb49 100644 --- a/com.woltlab.wcf/templates/registerActivation.tpl +++ b/com.woltlab.wcf/templates/registerActivation.tpl @@ -9,8 +9,8 @@ {include file='header'} -
        -

        {lang}wcf.user.registerActivation{/lang}

        +
        +

        {lang}wcf.user.registerActivation{/lang}

        {include file='userNotice'} @@ -32,41 +32,37 @@
        -
        -
        - - - -
        -
        - - {if $errorField == 'username'} - - {if $errorType == 'notFound'}{lang}wcf.user.username.error.notFound{/lang}{/if} - - {/if} -
        - - - -
        -
        - - {if $errorField == 'activationCode'} - - {if $errorType == 'notValid'}{lang}wcf.user.activationCode.error.notValid{/lang}{/if} - - {/if} - {lang}wcf.user.newActivationCode{/lang} -
        - - - {event name='fields'} -
        +
        + +
        +
        + + {if $errorField == 'username'} + + {if $errorType == 'notFound'}{lang}wcf.user.username.error.notFound{/lang}{/if} + + {/if} +
        + - {event name='fieldsets'} + +
        +
        + + {if $errorField == 'activationCode'} + + {if $errorType == 'notValid'}{lang}wcf.user.activationCode.error.notValid{/lang}{/if} + + {/if} + {lang}wcf.user.newActivationCode{/lang} +
        + + + {event name='fields'}
        + {event name='sections'} +
        {@SECURITY_TOKEN_INPUT_TAG} diff --git a/com.woltlab.wcf/templates/registerNewActivationCode.tpl b/com.woltlab.wcf/templates/registerNewActivationCode.tpl index 4b71f4ff8d..ecac56103e 100644 --- a/com.woltlab.wcf/templates/registerNewActivationCode.tpl +++ b/com.woltlab.wcf/templates/registerNewActivationCode.tpl @@ -9,8 +9,8 @@ {include file='header'} -
        -

        {lang}wcf.user.newActivationCode{/lang}

        +
        +

        {lang}wcf.user.newActivationCode{/lang}

        {include file='userNotice'} @@ -30,63 +30,59 @@
        -
        -
        - {lang}wcf.user.newActivationCode{/lang} - - -
        -
        - - {if $errorField == 'username'} - - {if $errorType == 'empty'} - {lang}wcf.global.form.error.empty{/lang} - {elseif $errorType == 'alreadyEnabled'} - {lang}wcf.user.registerActivation.error.userAlreadyEnabled{/lang} - {else} - {lang}wcf.user.username.error.{@$errorType}{/lang} - {/if} - - {/if} -
        - - - -
        -
        - - {if $errorField == 'password'} - - {if $errorType == 'empty'} - {lang}wcf.global.form.error.empty{/lang} - {else} - {lang}wcf.user.password.error.{@$errorType}{/lang} - {/if} - - {/if} -
        - - - -
        -
        - - {if $errorField == 'email'} - - {lang}wcf.user.email.error.{@$errorType}{/lang} - - {/if} - {lang}wcf.user.registerNewActivationCode.email.description{/lang} -
        - - - {event name='fields'} -
        +
        + +
        +
        + + {if $errorField == 'username'} + + {if $errorType == 'empty'} + {lang}wcf.global.form.error.empty{/lang} + {elseif $errorType == 'alreadyEnabled'} + {lang}wcf.user.registerActivation.error.userAlreadyEnabled{/lang} + {else} + {lang}wcf.user.username.error.{@$errorType}{/lang} + {/if} + + {/if} +
        + - {event name='fieldsets'} + +
        +
        + + {if $errorField == 'password'} + + {if $errorType == 'empty'} + {lang}wcf.global.form.error.empty{/lang} + {else} + {lang}wcf.user.password.error.{@$errorType}{/lang} + {/if} + + {/if} +
        + + + +
        +
        + + {if $errorField == 'email'} + + {lang}wcf.user.email.error.{@$errorType}{/lang} + + {/if} + {lang}wcf.user.registerNewActivationCode.email.description{/lang} +
        + + + {event name='fields'}
        + {event name='sections'} +
        {@SECURITY_TOKEN_INPUT_TAG} diff --git a/com.woltlab.wcf/templates/searchResult.tpl b/com.woltlab.wcf/templates/searchResult.tpl index 5ef37ab1a6..e749092b88 100644 --- a/com.woltlab.wcf/templates/searchResult.tpl +++ b/com.woltlab.wcf/templates/searchResult.tpl @@ -10,9 +10,9 @@ {include file='header'} -
        -

        {if $query}{lang}wcf.search.results{/lang}{else}{lang}wcf.search.results{/lang}{/if}

        -

        {lang}wcf.search.results.description{/lang}

        +
        +

        {if $query}{lang}wcf.search.results{/lang}{else}{lang}wcf.search.results{/lang}{/if}

        +

        {lang}wcf.search.results.description{/lang}

        {include file='userNotice'} diff --git a/com.woltlab.wcf/templates/searchResultList.tpl b/com.woltlab.wcf/templates/searchResultList.tpl index 7129b03eda..361db5e946 100644 --- a/com.woltlab.wcf/templates/searchResultList.tpl +++ b/com.woltlab.wcf/templates/searchResultList.tpl @@ -1,16 +1,16 @@ -
        +
        3. diff --git a/com.woltlab.wcf/templates/settings.tpl b/com.woltlab.wcf/templates/settings.tpl index 1db4810084..2dd56dac3d 100644 --- a/com.woltlab.wcf/templates/settings.tpl +++ b/com.woltlab.wcf/templates/settings.tpl @@ -17,10 +17,10 @@ {include file='userMenuSidebar'} -{include file='header' sidebarOrientation='left'} +{include file='header'} -
        -

        {lang}wcf.user.menu.settings{/lang}: {lang}wcf.user.option.category.settings.{$category}{/lang}

        +
        +

        {lang}wcf.user.menu.settings{/lang}: {lang}wcf.user.option.category.settings.{$category}{/lang}

        {include file='userNotice'} @@ -44,92 +44,90 @@
        -
        - {if $category == 'general'} - {if $availableLanguages|count > 1} -
        - {lang}wcf.user.language{/lang} - -
        -
        -
        - - -
        -
        - - {hascontent} -
        -
        -
        - {content} - {foreach from=$availableContentLanguages item=language} - - {/foreach} - {/content} - {lang}wcf.user.visibleLanguages.description{/lang}
        -
        - {/hascontent} - - {event name='languageFields'} -
        - {/if} - - {if $availableStyles|count > 1} -
        - {lang}wcf.user.style{/lang} - -
        -
        -
        - + {foreach from=$availableLanguages item=language} + {/foreach} - {lang}wcf.user.style.description{/lang} -
        + + +
        + + {hascontent} +
        +
        +
        + {content} + {foreach from=$availableContentLanguages item=language} + + {/foreach} + {/content} + {lang}wcf.user.visibleLanguages.description{/lang}
        - - {event name='styleFields'} -
        - {/if} + {/hascontent} + + {event name='languageFields'} + {/if} - {if !$optionTree|empty} - {foreach from=$optionTree[0][categories][0][categories] item=optionCategory} -
        - {lang}wcf.user.option.category.{@$optionCategory[object]->categoryName}{/lang} - - {include file='userProfileOptionFieldList' options=$optionCategory[options] langPrefix='wcf.user.option.'} -
        - {/foreach} + {if $availableStyles|count > 1} +
        +

        {lang}wcf.user.style{/lang}

        + +
        +
        +
        + + {lang}wcf.user.style.description{/lang} +
        +
        + + {event name='styleFields'} +
        {/if} - - {event name='fieldsets'} -
        + {/if} + + {if !$optionTree|empty} + {foreach from=$optionTree[0][categories][0][categories] item=optionCategory} +
        +

        {lang}wcf.user.option.category.{@$optionCategory[object]->categoryName}{/lang}

        + + {include file='userProfileOptionFieldList' options=$optionCategory[options] langPrefix='wcf.user.option.'} +
        + {/foreach} + {/if} + + {event name='sections'}
        diff --git a/com.woltlab.wcf/templates/shareButtonsPrivacySettings.tpl b/com.woltlab.wcf/templates/shareButtonsPrivacySettings.tpl index ae0a0f430f..e1d7d0a824 100644 --- a/com.woltlab.wcf/templates/shareButtonsPrivacySettings.tpl +++ b/com.woltlab.wcf/templates/shareButtonsPrivacySettings.tpl @@ -1,6 +1,6 @@ {lang}wcf.message.share.privacy.description{/lang} -
          +
            • diff --git a/com.woltlab.wcf/templates/signatureEdit.tpl b/com.woltlab.wcf/templates/signatureEdit.tpl index 0d61687c67..36099cca3a 100644 --- a/com.woltlab.wcf/templates/signatureEdit.tpl +++ b/com.woltlab.wcf/templates/signatureEdit.tpl @@ -22,10 +22,10 @@ {include file='userMenuSidebar'} -{include file='header' sidebarOrientation='left'} +{include file='header'} -
            -

            {lang}wcf.user.signature.edit{/lang}

            +
            +

            {lang}wcf.user.signature.edit{/lang}

            {include file='userNotice'} @@ -53,49 +53,47 @@
        -
        - {if $signatureCache} -
        - {lang}wcf.user.signature.current{/lang} - - {@$signatureCache} -
        - {/if} - - {if !$__wcf->user->disableSignature} -
        - {lang}wcf.user.signature{/lang} - -
        -
        -
        - - {if $errorField == 'text'} - - {if $errorType == 'empty'} - {lang}wcf.global.form.error.empty{/lang} - {elseif $errorType == 'tooLong'} - {lang}wcf.message.error.tooLong{/lang} - {elseif $errorType == 'censoredWordsFound'} - {lang}wcf.message.error.censoredWordsFound{/lang} - {elseif $errorType == 'disallowedBBCodes'} - {lang}wcf.message.error.disallowedBBCodes{/lang} - {else} - {lang}wcf.user.signature.error.{@$errorType}{/lang} - {/if} - - {/if} -
        -
        - - {event name='fields'} -
        + {if $signatureCache} +
        +

        {lang}wcf.user.signature.current{/lang}

        - {event name='fieldsets'} + {@$signatureCache} +
        + {/if} + + {if !$__wcf->user->disableSignature} +
        +

        {lang}wcf.user.signature{/lang}

        + +
        +
        +
        + + {if $errorField == 'text'} + + {if $errorType == 'empty'} + {lang}wcf.global.form.error.empty{/lang} + {elseif $errorType == 'tooLong'} + {lang}wcf.message.error.tooLong{/lang} + {elseif $errorType == 'censoredWordsFound'} + {lang}wcf.message.error.censoredWordsFound{/lang} + {elseif $errorType == 'disallowedBBCodes'} + {lang}wcf.message.error.disallowedBBCodes{/lang} + {else} + {lang}wcf.user.signature.error.{@$errorType}{/lang} + {/if} + + {/if} +
        +
        - {include file='messageFormTabs'} - {/if} -
        + {event name='fields'} + + + {event name='sections'} + + {include file='messageFormTabs'} + {/if} {if !$__wcf->user->disableSignature}
        diff --git a/com.woltlab.wcf/templates/sitemap.tpl b/com.woltlab.wcf/templates/sitemap.tpl index cffdc03122..d233f38a00 100644 --- a/com.woltlab.wcf/templates/sitemap.tpl +++ b/com.woltlab.wcf/templates/sitemap.tpl @@ -1,6 +1,6 @@
        {hascontent} -
        +
        {foreach from=$tree item=sitemapName} -