From 114b53208b61beb3f8c7f3f49e018f3c2a2a803e Mon Sep 17 00:00:00 2001 From: Marcel Werk Date: Mon, 4 Jul 2016 17:09:31 +0200 Subject: [PATCH] Unified html code --- com.woltlab.wcf/templates/captchaQuestion.tpl | 2 +- com.woltlab.wcf/templates/moderationActivation.tpl | 2 +- com.woltlab.wcf/templates/recaptcha.tpl | 2 +- com.woltlab.wcf/templates/register.tpl | 2 +- com.woltlab.wcf/templates/team.tpl | 2 +- wcfsetup/install/files/acp/templates/adAdd.tpl | 8 ++++---- wcfsetup/install/files/acp/templates/applicationEdit.tpl | 2 +- wcfsetup/install/files/acp/templates/bulkProcessing.tpl | 2 +- wcfsetup/install/files/acp/templates/captchaQuestion.tpl | 2 +- wcfsetup/install/files/acp/templates/dataImport.tpl | 2 +- .../files/acp/templates/languageMultilingualism.tpl | 2 +- wcfsetup/install/files/acp/templates/noticeAdd.tpl | 8 ++++---- wcfsetup/install/files/acp/templates/option.tpl | 2 +- wcfsetup/install/files/acp/templates/packageUpdate.tpl | 2 +- .../files/acp/templates/packageUpdateExcludedPackages.tpl | 4 ++-- .../files/acp/templates/pluginStoreAuthorization.tpl | 2 +- wcfsetup/install/files/acp/templates/rebuildData.tpl | 2 +- wcfsetup/install/files/acp/templates/recaptcha.tpl | 2 +- wcfsetup/install/files/acp/templates/rescueMode.tpl | 4 ++-- wcfsetup/install/files/acp/templates/styleExport.tpl | 4 ++-- wcfsetup/install/files/acp/templates/userGroupAdd.tpl | 2 +- .../files/acp/templates/userGroupAssignmentAdd.tpl | 2 +- wcfsetup/install/files/acp/templates/userGroupOption.tpl | 2 +- .../install/files/acp/templates/userOptionsCondition.tpl | 2 +- .../files/js/WoltLab/WCF/Ui/Page/Search/Handler.js | 2 +- 25 files changed, 34 insertions(+), 34 deletions(-) diff --git a/com.woltlab.wcf/templates/captchaQuestion.tpl b/com.woltlab.wcf/templates/captchaQuestion.tpl index f02b985782..92c333d378 100644 --- a/com.woltlab.wcf/templates/captchaQuestion.tpl +++ b/com.woltlab.wcf/templates/captchaQuestion.tpl @@ -4,7 +4,7 @@

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

- {lang}wcf.captcha.question.captcha.description{/lang} +

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

diff --git a/com.woltlab.wcf/templates/moderationActivation.tpl b/com.woltlab.wcf/templates/moderationActivation.tpl index 07d4f2fc65..c177ae1b99 100644 --- a/com.woltlab.wcf/templates/moderationActivation.tpl +++ b/com.woltlab.wcf/templates/moderationActivation.tpl @@ -56,7 +56,7 @@

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

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

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

{@$disabledContent} diff --git a/com.woltlab.wcf/templates/recaptcha.tpl b/com.woltlab.wcf/templates/recaptcha.tpl index fbc9084461..9e335be35e 100644 --- a/com.woltlab.wcf/templates/recaptcha.tpl +++ b/com.woltlab.wcf/templates/recaptcha.tpl @@ -6,7 +6,7 @@

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

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

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

diff --git a/com.woltlab.wcf/templates/register.tpl b/com.woltlab.wcf/templates/register.tpl index d491a68075..88072e2493 100644 --- a/com.woltlab.wcf/templates/register.tpl +++ b/com.woltlab.wcf/templates/register.tpl @@ -39,7 +39,7 @@

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

- {lang}wcf.user.register.honeyPot.description{/lang} +

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

diff --git a/com.woltlab.wcf/templates/team.tpl b/com.woltlab.wcf/templates/team.tpl index 5491624da6..2b912d587d 100644 --- a/com.woltlab.wcf/templates/team.tpl +++ b/com.woltlab.wcf/templates/team.tpl @@ -4,7 +4,7 @@

{$team->groupName|language} {#$team->getMembers()|count}

- {$team->groupDescription|language} +

{$team->groupDescription|language}

    diff --git a/wcfsetup/install/files/acp/templates/adAdd.tpl b/wcfsetup/install/files/acp/templates/adAdd.tpl index 98049900b8..6ea2657172 100644 --- a/wcfsetup/install/files/acp/templates/adAdd.tpl +++ b/wcfsetup/install/files/acp/templates/adAdd.tpl @@ -115,13 +115,13 @@

    {lang}wcf.acp.ad.conditions{/lang}

    - {lang}wcf.acp.ad.conditions.description{/lang} +

    {lang}wcf.acp.ad.conditions.description{/lang}

    {lang}wcf.acp.ad.conditions.page{/lang}

    - {lang}wcf.acp.ad.conditions.page.description{/lang} +

    {lang}wcf.acp.ad.conditions.page.description{/lang}

    {foreach from=$groupedConditionObjectTypes['com.woltlab.wcf.page'] item='pageConditionObjectType'} @@ -132,7 +132,7 @@

    {lang}wcf.acp.ad.conditions.pointInTime{/lang}

    - {lang}wcf.acp.ad.conditions.pointInTime.description{/lang} +

    {lang}wcf.acp.ad.conditions.pointInTime.description{/lang}

    {foreach from=$groupedConditionObjectTypes['com.woltlab.wcf.pointInTime'] item='pointInTimeConditionObjectType'} @@ -146,7 +146,7 @@

    {lang}wcf.acp.ad.conditions.user{/lang}

    - {lang}wcf.acp.ad.conditions.user.description{/lang} +

    {lang}wcf.acp.ad.conditions.user.description{/lang}

    {include file='userConditions' groupedObjectTypes=$groupedConditionObjectTypes['com.woltlab.wcf.user']} diff --git a/wcfsetup/install/files/acp/templates/applicationEdit.tpl b/wcfsetup/install/files/acp/templates/applicationEdit.tpl index 1383e92bd6..964c5669dd 100644 --- a/wcfsetup/install/files/acp/templates/applicationEdit.tpl +++ b/wcfsetup/install/files/acp/templates/applicationEdit.tpl @@ -64,7 +64,7 @@

    {lang}wcf.acp.application.cookie{/lang}

    - {lang}wcf.acp.application.cookie.warning{/lang} +

    {lang}wcf.acp.application.cookie.warning{/lang}

    diff --git a/wcfsetup/install/files/acp/templates/bulkProcessing.tpl b/wcfsetup/install/files/acp/templates/bulkProcessing.tpl index fbd247187d..6d5ac8a8ff 100644 --- a/wcfsetup/install/files/acp/templates/bulkProcessing.tpl +++ b/wcfsetup/install/files/acp/templates/bulkProcessing.tpl @@ -71,7 +71,7 @@

    {lang}{$objectType->getProcessor()->getLanguageItemPrefix()}.conditions{/lang}

    - {hascontent}{content}{lang __optional=true}{$objectType->getProcessor()->getLanguageItemPrefix()}.conditions.descriptions{/lang}{/content}{/hascontent} + {hascontent}

    {content}{lang __optional=true}{$objectType->getProcessor()->getLanguageItemPrefix()}.conditions.descriptions{/lang}{/content}

    {/hascontent}
    {@$objectType->getProcessor()->getConditionHTML()} diff --git a/wcfsetup/install/files/acp/templates/captchaQuestion.tpl b/wcfsetup/install/files/acp/templates/captchaQuestion.tpl index a682bf4e33..38da2a7598 100644 --- a/wcfsetup/install/files/acp/templates/captchaQuestion.tpl +++ b/wcfsetup/install/files/acp/templates/captchaQuestion.tpl @@ -4,7 +4,7 @@

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

    - {lang}wcf.captcha.question.captcha.description{/lang} +

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

    diff --git a/wcfsetup/install/files/acp/templates/dataImport.tpl b/wcfsetup/install/files/acp/templates/dataImport.tpl index 36826fcd67..4fc360f3e2 100644 --- a/wcfsetup/install/files/acp/templates/dataImport.tpl +++ b/wcfsetup/install/files/acp/templates/dataImport.tpl @@ -128,7 +128,7 @@

    {lang}wcf.acp.dataImport.configure.data{/lang}

    - {lang}wcf.acp.dataImport.configure.data.description{/lang} +

    {lang}wcf.acp.dataImport.configure.data.description{/lang}

    {foreach from=$supportedData key=objectTypeName item=objectTypes} diff --git a/wcfsetup/install/files/acp/templates/languageMultilingualism.tpl b/wcfsetup/install/files/acp/templates/languageMultilingualism.tpl index 10eec182a7..9ca3632d93 100644 --- a/wcfsetup/install/files/acp/templates/languageMultilingualism.tpl +++ b/wcfsetup/install/files/acp/templates/languageMultilingualism.tpl @@ -33,7 +33,7 @@

    - {lang}wcf.acp.language.multilingualism.enable.description{/lang} +

    {lang}wcf.acp.language.multilingualism.enable.description{/lang}