From 0f353b34af6c5ab1f7a5312a49d6764312837845 Mon Sep 17 00:00:00 2001 From: Siora Date: Wed, 9 May 2012 04:54:34 +0200 Subject: [PATCH] some template fixes --- .../files/acp/templates/masterPassword.tpl | 15 +++---- .../acp/templates/masterPasswordInit.tpl | 17 +++----- .../templates/packageInstallationConfirm.tpl | 27 ++++++------ .../acp/templates/packageListDetailed.tpl | 2 +- .../files/acp/templates/packageUpdate.tpl | 16 +++---- .../files/acp/templates/packageUpdateAuth.tpl | 13 +++--- .../templates/packageUpdateSearchResult.tpl | 9 ++-- .../files/acp/templates/packageView.tpl | 43 ++++++++----------- .../files/acp/templates/updateServerList.tpl | 2 +- .../files/acp/templates/userAssignToGroup.tpl | 8 ++-- .../acp/templates/userEmailAddressExport.tpl | 8 ++-- .../install/files/acp/templates/worker.tpl | 2 +- 12 files changed, 71 insertions(+), 91 deletions(-) diff --git a/wcfsetup/install/files/acp/templates/masterPassword.tpl b/wcfsetup/install/files/acp/templates/masterPassword.tpl index f274a00ac9..fd6eb37649 100644 --- a/wcfsetup/install/files/acp/templates/masterPassword.tpl +++ b/wcfsetup/install/files/acp/templates/masterPassword.tpl @@ -8,24 +8,23 @@ //]]> -
- -
+
+

{lang}wcf.acp.masterPassword.enter{/lang}

{if $errorField != ''} -

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

+

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

{/if}
-
+
{lang}wcf.acp.masterPassword.enter{/lang} - +
@@ -48,10 +47,8 @@ {event name='fieldsets'}
-
- +
- {@SID_INPUT_TAG}
diff --git a/wcfsetup/install/files/acp/templates/masterPasswordInit.tpl b/wcfsetup/install/files/acp/templates/masterPasswordInit.tpl index 547b811830..6d9ff35570 100644 --- a/wcfsetup/install/files/acp/templates/masterPasswordInit.tpl +++ b/wcfsetup/install/files/acp/templates/masterPasswordInit.tpl @@ -12,24 +12,23 @@ //]]> -
- -
+
+

{lang}wcf.acp.masterPassword.init{/lang}

{if $errorField != ''} -

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

+

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

{/if}
-
+
{lang}wcf.acp.masterPassword.init{/lang} - +
@@ -46,7 +45,7 @@
- +
@@ -76,10 +75,8 @@ {event name='fieldsets'}
-
- +
- {@SID_INPUT_TAG}
diff --git a/wcfsetup/install/files/acp/templates/packageInstallationConfirm.tpl b/wcfsetup/install/files/acp/templates/packageInstallationConfirm.tpl index 00600eb29a..cf9de6e91e 100644 --- a/wcfsetup/install/files/acp/templates/packageInstallationConfirm.tpl +++ b/wcfsetup/install/files/acp/templates/packageInstallationConfirm.tpl @@ -9,20 +9,19 @@ //]]> -
- -
+
+

{$archive->getLocalizedPackageInfo('packageName')}

{$archive->getLocalizedPackageInfo('packageDescription')}

{if $missingPackages > 0} -

{lang}wcf.acp.package.install.error{/lang}

+

{lang}wcf.acp.package.install.error{/lang}

{/if} {if $excludingPackages|count > 0} -
{lang}wcf.acp.package.install.error.excludingPackages{/lang} +
{lang}wcf.acp.package.install.error.excludingPackages{/lang}
    {foreach from=$excludingPackages item=excludingPackage}
  • {lang}wcf.acp.package.install.error.excludingPackages.excludingPackage{/lang}
    • @@ -32,7 +31,7 @@ {/if} {if $excludedPackages|count > 0} -
    {lang}wcf.acp.package.install.error.excludedPackages{/lang} +
    {lang}wcf.acp.package.install.error.excludedPackages{/lang}
      {foreach from=$excludedPackages item=excludedPackage}
    • {lang}wcf.acp.package.install.error.excludedPackages.excludedPackage{/lang}
      • @@ -41,7 +40,7 @@
    {/if} -
    +
    {lang}wcf.acp.package.information.properties{/lang}
    @@ -75,15 +74,15 @@
    {if $updatableInstances|count > 0} -

    {lang}wcf.acp.package.install.updatableInstances.warning{/lang}

    +

    {lang}wcf.acp.package.install.updatableInstances.warning{/lang}

    -
    +

    {lang}wcf.acp.package.install.updatableInstances{/lang}

    {lang}wcf.acp.package.install.updatableInstances.description{/lang}

    - +
    @@ -104,12 +103,12 @@ {/if} {if $requiredPackages|count > 0} -
    +
    -

    {lang}wcf.acp.package.dependencies.required{/lang} {#$requiredPackages|count}

    +

    {lang}wcf.acp.package.dependencies.required{/lang} {#$requiredPackages|count}

    -
    {lang}wcf.acp.package.list.name{/lang}
    +
    @@ -129,7 +128,7 @@ {/if} -
    +
    {if $missingPackages == 0 && $excludingPackages|count == 0 && $excludedPackages|count == 0} diff --git a/wcfsetup/install/files/acp/templates/packageListDetailed.tpl b/wcfsetup/install/files/acp/templates/packageListDetailed.tpl index eaf0e08d66..46e6852dd2 100644 --- a/wcfsetup/install/files/acp/templates/packageListDetailed.tpl +++ b/wcfsetup/install/files/acp/templates/packageListDetailed.tpl @@ -37,7 +37,7 @@ {if $objects|count > 0}
    -

    {lang}wcf.acp.package.list{/lang} {#$items}

    +

    {lang}wcf.acp.package.list{/lang} {#$items}

    {lang}wcf.acp.package.name{/lang}
    diff --git a/wcfsetup/install/files/acp/templates/packageUpdate.tpl b/wcfsetup/install/files/acp/templates/packageUpdate.tpl index a5e2dcb119..fca5284326 100644 --- a/wcfsetup/install/files/acp/templates/packageUpdate.tpl +++ b/wcfsetup/install/files/acp/templates/packageUpdate.tpl @@ -1,23 +1,22 @@ {include file='header'} -
    - -
    +
    +

    {lang}wcf.acp.packageUpdate{/lang}

    {if $errorField == 'updates'} {if $errorType === 'empty'} -

    {lang}wcf.acp.packageUpdate.noneSelected{/lang}

    +

    {lang}wcf.acp.packageUpdate.noneSelected{/lang}

    {else} -

    {lang}wcf.acp.packageUpdate.error{/lang} {$errorType->getMessage()} ({@$errorType->getCode()})

    +

    {lang}wcf.acp.packageUpdate.error{/lang} {$errorType->getMessage()} ({@$errorType->getCode()})

    {/if} {/if} {if $errorField == 'excludedPackages'} -
    {lang}wcf.acp.packageUpdate.excludedPackages{/lang} +
    {lang}wcf.acp.packageUpdate.excludedPackages{/lang}
      {foreach from=$excludedPackages item=excludedPackage}
    • {if $excludedPackage.conflict == 'existingPackageExcludesNewPackage'}{lang}wcf.acp.packageUpdate.excludedPackages.existingPackageExcludesNewPackage{/lang}{else}{lang}wcf.acp.packageUpdate.excludedPackages.newPackageExcludesExistingPackage{/lang}{/if}
      • @@ -28,7 +27,7 @@ {if $packageInstallationStack|count}
      -
      +
      {lang}wcf.acp.packageUpdate.updates{/lang} @@ -48,8 +47,7 @@
      -
      - {**} +
      {if !$errorField}{/if} {@SID_INPUT_TAG} diff --git a/wcfsetup/install/files/acp/templates/packageUpdateAuth.tpl b/wcfsetup/install/files/acp/templates/packageUpdateAuth.tpl index 3057bcb2d7..c9023f35c2 100644 --- a/wcfsetup/install/files/acp/templates/packageUpdateAuth.tpl +++ b/wcfsetup/install/files/acp/templates/packageUpdateAuth.tpl @@ -1,18 +1,17 @@ {include file='header'} -
      - -
      +
      +

      {lang}wcf.acp.packageUpdate.auth{/lang}

      {if $errorField != ''} -

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

      +

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

      {/if} -
      +
      {lang}wcf.acp.packageUpdate.auth.data{/lang} @@ -69,11 +68,9 @@
      -
      - +
      - {@SID_INPUT_TAG} {@$postParameters}
      diff --git a/wcfsetup/install/files/acp/templates/packageUpdateSearchResult.tpl b/wcfsetup/install/files/acp/templates/packageUpdateSearchResult.tpl index c8d2b16ce8..4274983061 100644 --- a/wcfsetup/install/files/acp/templates/packageUpdateSearchResult.tpl +++ b/wcfsetup/install/files/acp/templates/packageUpdateSearchResult.tpl @@ -1,8 +1,7 @@ {include file='header'} -
      - -
      +
      +

      {lang}wcf.acp.packageUpdate.search{/lang}

      @@ -100,10 +99,8 @@ {/foreach} -
      - +
      - {@SID_INPUT_TAG}
      diff --git a/wcfsetup/install/files/acp/templates/packageView.tpl b/wcfsetup/install/files/acp/templates/packageView.tpl index 0f91141f50..b3fe7c83a2 100644 --- a/wcfsetup/install/files/acp/templates/packageView.tpl +++ b/wcfsetup/install/files/acp/templates/packageView.tpl @@ -10,16 +10,15 @@ //]]> -
      - -
      +
      +

      {$package->getName()}

      {$package->packageDescription|language}

      -
      -
    +
    @@ -170,13 +165,13 @@ {/hascontent} {hascontent} -
    {lang}wcf.global.objectID{/lang}
    +
    @@ -240,9 +235,9 @@ {/if} {/foreach} -
    +
    {lang}wcf.global.objectID{/lang}
    diff --git a/wcfsetup/install/files/acp/templates/userAssignToGroup.tpl b/wcfsetup/install/files/acp/templates/userAssignToGroup.tpl index 07c0355e21..97bca46a37 100644 --- a/wcfsetup/install/files/acp/templates/userAssignToGroup.tpl +++ b/wcfsetup/install/files/acp/templates/userAssignToGroup.tpl @@ -15,10 +15,10 @@
    {lang}wcf.acp.user.assignToGroup.markedUsers{/lang} -
      - {implode from=$users item=$user}
    • {$user}
      • {/implode} -
    -
    +
    + {implode from=$users item=$user}{$user}{/implode} +
    +
    {lang}wcf.acp.user.groups{/lang} diff --git a/wcfsetup/install/files/acp/templates/userEmailAddressExport.tpl b/wcfsetup/install/files/acp/templates/userEmailAddressExport.tpl index 8362822543..2fd61a0e5b 100644 --- a/wcfsetup/install/files/acp/templates/userEmailAddressExport.tpl +++ b/wcfsetup/install/files/acp/templates/userEmailAddressExport.tpl @@ -19,10 +19,10 @@
    {lang}wcf.acp.user.exportEmailAddress.markedUsers{/lang} -
      - {implode from=$users item=$user}
    • {$user}
      • {/implode} -
    -
    +
    + {implode from=$users item=$user}{$user}{/implode} +
    +
    {lang}wcf.acp.user.exportEmailAddress.format{/lang} diff --git a/wcfsetup/install/files/acp/templates/worker.tpl b/wcfsetup/install/files/acp/templates/worker.tpl index d138aeb215..641bcaa170 100644 --- a/wcfsetup/install/files/acp/templates/worker.tpl +++ b/wcfsetup/install/files/acp/templates/worker.tpl @@ -1,5 +1,5 @@
    -
    +

    Aufgaben werden ausgeführt …

    -- 2.20.1