From 6709fbd205d6d52be1f37503b2d56f0af472d869 Mon Sep 17 00:00:00 2001 From: Luzifr Date: Mon, 12 Sep 2011 21:31:58 +0200 Subject: [PATCH] Installation-, Language and Style-Changes Installation is now widely functional again, some pages have been modified; New language-variables and some older modified; Style changes to work around the missing header-link of the installation page; CSS-code format; Proper installation icon (the former was unintentional). --- wcfsetup/install/files/acp/style/testing.css | 18 ++--- wcfsetup/install/files/icon/installation1.svg | 75 +++++++++++++++++++ wcfsetup/install/lang/de-informal.xml | 10 +-- wcfsetup/install/lang/de.xml | 10 +-- wcfsetup/install/lang/en.xml | 48 ++++++------ wcfsetup/setup/lang/setup_de-informal.xml | 4 +- wcfsetup/setup/lang/setup_de.xml | 4 +- wcfsetup/setup/lang/setup_en.xml | 8 +- wcfsetup/setup/template/header.tpl | 11 +-- wcfsetup/setup/template/stepSearchWcfDir.tpl | 3 +- .../template/stepSelectSetupLanguage.tpl | 2 +- .../template/stepShowSystemRequirements.tpl | 12 +-- 12 files changed, 137 insertions(+), 68 deletions(-) create mode 100644 wcfsetup/install/files/icon/installation1.svg diff --git a/wcfsetup/install/files/acp/style/testing.css b/wcfsetup/install/files/acp/style/testing.css index 682ea9909b..4c4cc73dfb 100644 --- a/wcfsetup/install/files/acp/style/testing.css +++ b/wcfsetup/install/files/acp/style/testing.css @@ -67,6 +67,7 @@ q:after { body { font-family: 'Trebuchet MS', Arial, sans-serif; font-size: 80%; + color: #666; line-height: 1; background-color: #29374a; } @@ -75,10 +76,6 @@ img { vertical-align: middle !important; } -p { - color: #666; -} - a { color: #369; text-decoration: none; @@ -191,7 +188,8 @@ header.pageHeader div#logo img { left: 0; } -header.pageHeader div#logo a { +header.pageHeader div#logo > a, +header.pageHeader div#logo > div { text-align: right; display: block; height: 110px; @@ -1540,7 +1538,7 @@ thead th:first-child { thead th:last-child { /* rounded corners for the last table header cell to the left */ - border-top-right-radius: 5px; + border-top-right-radius: 5px; } thead th { @@ -1619,12 +1617,12 @@ tbody tr:last-child { tbody tr:last-child td:first-child { /* rounded corners for the last table cell to the left */ - border-bottom-left-radius: 5px; + border-bottom-left-radius: 5px; } tbody tr:last-child td:last-child { /* rounded corners for the last table cell to the right */ - border-bottom-right-radius: 5px; + border-bottom-right-radius: 5px; } tbody td { @@ -1671,7 +1669,7 @@ tbody tr .columnIcon img:not(.balloonTooltip):hover { } .menu ~ .border thead th:last-child { - border-top-right-radius: 0 !important; + border-top-right-radius: 0 !important; } .menu ~ .border thead th:first-child, @@ -1681,7 +1679,7 @@ tbody tr .columnIcon img:not(.balloonTooltip):hover { .menu ~ .border thead th:last-child, .boxTitle > table thead th:last-child { - border-top-right-radius: 0 !important; + border-top-right-radius: 0 !important; } diff --git a/wcfsetup/install/files/icon/installation1.svg b/wcfsetup/install/files/icon/installation1.svg new file mode 100644 index 0000000000..6b37de79cd --- /dev/null +++ b/wcfsetup/install/files/icon/installation1.svg @@ -0,0 +1,75 @@ + + + + + + Options + Options Icon + + + + + + + + + + + + + + + + + + + + diff --git a/wcfsetup/install/lang/de-informal.xml b/wcfsetup/install/lang/de-informal.xml index 5d9c32765f..d4cda1134d 100644 --- a/wcfsetup/install/lang/de-informal.xml +++ b/wcfsetup/install/lang/de-informal.xml @@ -271,10 +271,7 @@ - -
  • memcached.org
    • -]]>     + memcached.org.]]> @@ -450,8 +447,9 @@ - - + + + diff --git a/wcfsetup/install/lang/de.xml b/wcfsetup/install/lang/de.xml index 5eab2fb0c9..e98e67b19b 100644 --- a/wcfsetup/install/lang/de.xml +++ b/wcfsetup/install/lang/de.xml @@ -271,10 +271,7 @@ - -
  • memcached.org
    • -]]>     + memcached.org.]]> @@ -450,8 +447,9 @@ - - + + + diff --git a/wcfsetup/install/lang/en.xml b/wcfsetup/install/lang/en.xml index cd0370db0e..3a79090ae9 100644 --- a/wcfsetup/install/lang/en.xml +++ b/wcfsetup/install/lang/en.xml @@ -271,10 +271,7 @@ - -
  • memcached.org
    • -]]>     + memcached.org.]]> @@ -374,7 +371,7 @@ - + @@ -416,7 +413,7 @@ 1} (#{@$excludingPackage.instanceNo}){/if} in version {$excludingPackage.packageVersion}]]> - {$package.name} ({if $package.open == 0}Installed{else}{if $package.file|isset}is located within this Package{else}Not available{/if}{/if})]]> + {$package.name} ({if $package.open == 0}Installed{else}{if $package.file|isset}is located in this package{else}Not available{/if}{/if})]]> @@ -426,8 +423,8 @@ - - + + @@ -443,16 +440,17 @@ - - + + - - + + + @@ -461,7 +459,7 @@ getName()}" could not be updated with the supplied archive.]]> - + @@ -533,12 +531,12 @@ - + {foreach from=$failures item=$failure}{$failure.templateName} (Originally patched by: {$failure.packageName})
    {/foreach}The original patch package that was previously applied may no longer function. You should still continue with this update by clicking on the "{lang}wcf.global.button.next{/lang}" button.]]>     - - + + - + @@ -629,7 +627,7 @@ - + @@ -648,8 +646,8 @@ - - + + @@ -690,7 +688,7 @@ - without additional security notification, on all users matching the set conditions. Bulk processing can be very performance intensive, so it should only be executed when the forum is offline. To have a correct display of your content you should update the counters. The processing can not be reversed, so please be attentive when using this function.]]> + without additional security notification, on all users matching the set conditions. Bulk processing can be very performance intensive, so it should only be executed while the forum is set offline. To have a correct display of your content you should update the counters. The processing can not be reversed, so please be attentive when using this function.]]> @@ -885,9 +883,9 @@ - + - + @@ -897,14 +895,14 @@ - + - + diff --git a/wcfsetup/setup/lang/setup_de-informal.xml b/wcfsetup/setup/lang/setup_de-informal.xml index c44f3bbaba..bec79f553c 100644 --- a/wcfsetup/setup/lang/setup_de-informal.xml +++ b/wcfsetup/setup/lang/setup_de-informal.xml @@ -52,7 +52,7 @@ - + @@ -87,7 +87,7 @@ WoltLab Community Framework im Ordner "{$foundDirectory}".
    Überprüfe diese Angabe bzw. definiere ein anderes Installationsverzeichnis, wenn du eine neue Kopie von WoltLab Community Framework installieren möchtest.]]>     WoltLab Community Framework an.]]> - WoltLab Community Framework über folgende Adresse (URL) erreichbar:]]> + WoltLab Community Framework über diese Adresse (URL) erreichbar.]]> diff --git a/wcfsetup/setup/lang/setup_de.xml b/wcfsetup/setup/lang/setup_de.xml index 1afda825bd..ed185c9d41 100644 --- a/wcfsetup/setup/lang/setup_de.xml +++ b/wcfsetup/setup/lang/setup_de.xml @@ -52,7 +52,7 @@ - + @@ -88,7 +88,7 @@ WoltLab Community Framework im Ordner "{$foundDirectory}".
    Bitte überprüfen Sie diese Angabe bzw. definieren Sie ein anderes Installationsverzeichnis, wenn Sie eine neue Kopie von WoltLab Community Framework installieren möchten.]]>     WoltLab Community Framework an.]]> - WoltLab Community Framework über folgende Adresse (URL) erreichbar:]]> + WoltLab Community Framework über diese Adresse (URL) erreichbar.]]> diff --git a/wcfsetup/setup/lang/setup_en.xml b/wcfsetup/setup/lang/setup_en.xml index 903e6ff12a..87dad7ffed 100644 --- a/wcfsetup/setup/lang/setup_en.xml +++ b/wcfsetup/setup/lang/setup_en.xml @@ -50,7 +50,7 @@ - + @@ -83,9 +83,9 @@ WoltLab Community Framework will be extracted into the installation folder.]]> WoltLab Community Framework in the "{$foundDirectory}" folder.
    If you would like to install a new copy of the WoltLab Community Framework, then please enter an alternative installation folder.]]>     - - WoltLab Community Framework.]]> - WoltLab Community Framework through the following URL:]]> + + + WoltLab Community Framework through this adress (URL).]]> diff --git a/wcfsetup/setup/template/header.tpl b/wcfsetup/setup/template/header.tpl index 11470b7fa5..2f348e079e 100644 --- a/wcfsetup/setup/template/header.tpl +++ b/wcfsetup/setup/template/header.tpl @@ -17,8 +17,10 @@ @@ -47,9 +49,7 @@
    - {* ToDo: Installation Icon *} - - {* /Installation Icon *} +

    {lang}wcf.global.title{/lang}

    {lang}wcf.global.title.subtitle{/lang}

    @@ -57,3 +57,4 @@

    0%

    + \ No newline at end of file diff --git a/wcfsetup/setup/template/stepSearchWcfDir.tpl b/wcfsetup/setup/template/stepSearchWcfDir.tpl index 690aa2f060..1bf30e0f3f 100644 --- a/wcfsetup/setup/template/stepSearchWcfDir.tpl +++ b/wcfsetup/setup/template/stepSearchWcfDir.tpl @@ -22,8 +22,9 @@
    -
    +
    {lang}wcf.global.wcfDir.url.description{/lang}
    + {lang}wcf.global.wcfDir.url.description{/lang}
    diff --git a/wcfsetup/setup/template/stepSelectSetupLanguage.tpl b/wcfsetup/setup/template/stepSelectSetupLanguage.tpl index f822801a9f..2614e8fafa 100644 --- a/wcfsetup/setup/template/stepSelectSetupLanguage.tpl +++ b/wcfsetup/setup/template/stepSelectSetupLanguage.tpl @@ -11,7 +11,7 @@ {htmlOptions name="languageCode" id="languageCode" options=$availableLanguages selected=$languageCode disableEncoding=true} - + diff --git a/wcfsetup/setup/template/stepShowSystemRequirements.tpl b/wcfsetup/setup/template/stepShowSystemRequirements.tpl index ee43016cae..c7c3693384 100644 --- a/wcfsetup/setup/template/stepShowSystemRequirements.tpl +++ b/wcfsetup/setup/template/stepShowSystemRequirements.tpl @@ -13,7 +13,7 @@
    {lang}wcf.global.systemRequirements.element.required{/lang} 5.3.0
    - {lang}wcf.global.systemRequirements.element.yours{/lang} {$system.phpVersion.value} + {lang}wcf.global.systemRequirements.element.yours{/lang} {$system.phpVersion.value} {if !$system.phpVersion.result}{lang}wcf.global.systemRequirements.php.description{/lang}{/if}
    @@ -24,7 +24,7 @@
    {lang}wcf.global.systemRequirements.element.required{/lang} {lang}wcf.global.systemRequirements.active{/lang}
    - {lang}wcf.global.systemRequirements.element.yours{/lang} + {lang}wcf.global.systemRequirements.element.yours{/lang} {if !$system.sql.result}{lang}wcf.global.systemRequirements.sql.notFound{/lang}{else} {implode from=$system.sql.value item=$sqlType glue=', '}{lang}wcf.global.configureDB.class.{@$sqlType}{/lang}{/implode} {/if} @@ -38,7 +38,7 @@
    {lang}wcf.global.systemRequirements.element.required{/lang} {lang}wcf.global.systemRequirements.active{/lang}
    - {lang}wcf.global.systemRequirements.element.yours{/lang} {if !$system.mbString.result}{lang}wcf.global.systemRequirements.notActive{/lang}{else}{lang}wcf.global.systemRequirements.active{/lang}{/if}{if !$system.mbString.result}{lang}wcf.global.systemRequirements.mbString.description{/lang}{/if} + {lang}wcf.global.systemRequirements.element.yours{/lang} {if !$system.mbString.result}{lang}wcf.global.systemRequirements.notActive{/lang}{else}{lang}wcf.global.systemRequirements.active{/lang}{/if}{if !$system.mbString.result}{lang}wcf.global.systemRequirements.mbString.description{/lang}{/if}
    @@ -49,7 +49,7 @@
    {lang}wcf.global.systemRequirements.element.required{/lang} {lang}wcf.global.systemRequirements.notActive{/lang}
    - {lang}wcf.global.systemRequirements.element.yours{/lang} {if !$system.safeMode.result}{lang}wcf.global.systemRequirements.active{/lang}{else}{lang}wcf.global.systemRequirements.notActive{/lang}{/if} + {lang}wcf.global.systemRequirements.element.yours{/lang} {if !$system.safeMode.result}{lang}wcf.global.systemRequirements.active{/lang}{else}{lang}wcf.global.systemRequirements.notActive{/lang}{/if} {if !$system.safeMode.result}{lang}wcf.global.systemRequirements.safeMode.description{/lang}{/if}
    @@ -65,7 +65,7 @@
    {lang}wcf.global.systemRequirements.element.recommended{/lang} > 0
    - {lang}wcf.global.systemRequirements.element.yours{/lang} {$system.uploadMaxFilesize.value} + {lang}wcf.global.systemRequirements.element.yours{/lang} {$system.uploadMaxFilesize.value} {if !$system.uploadMaxFilesize.result}{lang}wcf.global.systemRequirements.uploadMaxFilesize.description{/lang}{/if}
    @@ -76,7 +76,7 @@
    {lang}wcf.global.systemRequirements.element.recommended{/lang} 2.0.0
    - {lang}wcf.global.systemRequirements.element.yours{/lang} {$system.gdLib.value} + {lang}wcf.global.systemRequirements.element.yours{/lang} {$system.gdLib.value} {if !$system.gdLib.result}{lang}wcf.global.systemRequirements.gdLib.description{/lang}{/if}
    -- 2.20.1