From 6dcb5d0114ec0898bd420680fda1a2bc7cbabe85 Mon Sep 17 00:00:00 2001 From: Luzifr Date: Thu, 15 Sep 2011 16:45:08 +0200 Subject: [PATCH] Some small changes Started styling the installation-overlays; corrected most of the english installation language-file; some small modifications to other files. --- wcfsetup/install/files/acp/style/testing.css | 27 ++--- .../packageInstallationStepPrepare.tpl | 8 +- .../packageUninstallationStepPrepare.tpl | 8 +- .../install/files/acp/templates/userList.tpl | 2 +- wcfsetup/setup/lang/setup_de-informal.xml | 2 +- wcfsetup/setup/lang/setup_de.xml | 2 +- wcfsetup/setup/lang/setup_en.xml | 106 +++++++++--------- 7 files changed, 71 insertions(+), 84 deletions(-) diff --git a/wcfsetup/install/files/acp/style/testing.css b/wcfsetup/install/files/acp/style/testing.css index 02bfb2c997..c6900520c3 100644 --- a/wcfsetup/install/files/acp/style/testing.css +++ b/wcfsetup/install/files/acp/style/testing.css @@ -578,7 +578,7 @@ fieldset { border: 1px solid #ccc; border-radius: 7px; background-color: rgba(0, 0, 0, .015); - margin: 15px 0; + margin: 15px 0 0; padding: 15px; } @@ -1912,14 +1912,7 @@ p.error { /* ToDo: Installation */ div#packageInstallationDialogContainer { - background-color: #fefefe; - background-image: -webkit-linear-gradient(#fefefe, #eee); - background-image: -moz-linear-gradient(#fefefe, #eee); - background-image: -ms-linear-gradient(#fefefe, #eee); - background-image: -o-linear-gradient(#fefefe, #eee); - background-image: linear-gradient(#fefefe, #eee); - - padding: 21px; + padding: 20px; height: 100%; max-width: 600px; } @@ -1931,24 +1924,22 @@ div#ajaxExceptionStacktrace { } div#packageInstallationInnerContentContainer { - border-top: 2px solid #999 !important; - border-radius: 0 !important; - margin-top: 21px; - padding-top: 14px; + margin-top: 20px; + padding-top: 15px; } div#packageInstallationInnerContent p.error { - border: 3px solid #ed1c24; + border: 1px solid #ed1c24; border-radius: 5px; background-color: #fdd; - margin-bottom: 14px; + margin-bottom: 15px; padding: 7px; } div#ajaxExceptionStacktrace { font-family: monospace; font-size: 90%; - line-height: 1.2em; + line-height: 1.2; border: 1px solid #ccc; padding: 3px; } @@ -2079,10 +2070,6 @@ div.ui-widget-overlay { /* Types */ -.badgeNote { - border: 1px solid #ccc; -} - .badgeInfo { color: #68b; border: 1px solid #9be; diff --git a/wcfsetup/install/files/acp/templates/packageInstallationStepPrepare.tpl b/wcfsetup/install/files/acp/templates/packageInstallationStepPrepare.tpl index 94c073b921..17088fcd0d 100644 --- a/wcfsetup/install/files/acp/templates/packageInstallationStepPrepare.tpl +++ b/wcfsetup/install/files/acp/templates/packageInstallationStepPrepare.tpl @@ -1,6 +1,6 @@ -
+
- +

Paket »{$queue->packageName}« wird installiert …

Aktueller Schritt: {lang}wcf.package.installation.step.prepare{/lang}

@@ -8,7 +8,7 @@
- \ No newline at end of file diff --git a/wcfsetup/install/files/acp/templates/packageUninstallationStepPrepare.tpl b/wcfsetup/install/files/acp/templates/packageUninstallationStepPrepare.tpl index 1dc0026f39..1bbfeb942c 100644 --- a/wcfsetup/install/files/acp/templates/packageUninstallationStepPrepare.tpl +++ b/wcfsetup/install/files/acp/templates/packageUninstallationStepPrepare.tpl @@ -1,6 +1,6 @@ -
+
- +

Paket »{$queue->packageName}« wird deinstalliert …

Aktueller Schritt: {lang}wcf.package.uninstallation.step.prepare{/lang}

@@ -8,7 +8,7 @@
- \ No newline at end of file diff --git a/wcfsetup/install/files/acp/templates/userList.tpl b/wcfsetup/install/files/acp/templates/userList.tpl index d23a945e36..2d6f27b474 100644 --- a/wcfsetup/install/files/acp/templates/userList.tpl +++ b/wcfsetup/install/files/acp/templates/userList.tpl @@ -77,7 +77,7 @@ {if $additionalButtons[$user->userID]|isset}{@$additionalButtons[$user->userID]}{/if}

{@$user->userID}

-

{if $user->editable}{$user->username}{else}{$user->username}{/if}

+

{if $user->editable}{$user->username}{else}{$user->username}{/if}

{foreach from=$columnHeads key=column item=columnLanguageVariable}

{if $columnValues[$user->userID][$column]|isset}{@$columnValues[$user->userID][$column]}{/if}

diff --git a/wcfsetup/setup/lang/setup_de-informal.xml b/wcfsetup/setup/lang/setup_de-informal.xml index 86f803299d..2349b14566 100644 --- a/wcfsetup/setup/lang/setup_de-informal.xml +++ b/wcfsetup/setup/lang/setup_de-informal.xml @@ -126,7 +126,7 @@ - + diff --git a/wcfsetup/setup/lang/setup_de.xml b/wcfsetup/setup/lang/setup_de.xml index c3dd6f0d56..3584912596 100644 --- a/wcfsetup/setup/lang/setup_de.xml +++ b/wcfsetup/setup/lang/setup_de.xml @@ -127,7 +127,7 @@ - + diff --git a/wcfsetup/setup/lang/setup_en.xml b/wcfsetup/setup/lang/setup_en.xml index d8e4f046bf..daf0077b89 100644 --- a/wcfsetup/setup/lang/setup_en.xml +++ b/wcfsetup/setup/lang/setup_en.xml @@ -1,7 +1,7 @@ - + @@ -17,7 +17,7 @@ \T\o\d\a\y, g:ia]]> - WoltLab Community Framework{if $setupPackageName != 'WoltLab Community Framework'} and {$setupPackageName}{/if}.]]> + WoltLab Community Framework{if $setupPackageName != 'WoltLab Community Framework'} and {$setupPackageName}{/if}.]]> @@ -50,57 +50,57 @@ - + - - - - - - - - + + + + + + + + - - - - - + + + + + - + - - - - - - - + + + + + + + - - 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 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. If you are unsure, keep the name which the system suggests and run a standard-installation.]]> + WoltLab Community Framework. If you are unsure, keep the name which the system suggests and run the standard-installation.]]> WoltLab Community Framework through this adress (URL).]]> - + - - + + - + - - - + + + @@ -122,39 +122,39 @@ - - - - + + + + - - + {$exception->getMessage()}{if $exception|get_class == 'DatabaseException'}
{$exception->getErrorDesc()}{/if}
Additional information can be found in the WoltLab Error Reference:
http://www.woltlab.com/help/?code={@$exception->getCode()}]]> - 1}s{/if} already exist{if $conflictedTables|count == 1}s{/if} within your "{$dbName}" Database:
{implode from=$conflictedTables item="table"}{$table}{/implode}.

To solve this problem, please do one of the following:
1. Enable the "Overwrite" option below to overwrite {if $conflictedTables|count > 1}these tables{else}this table{/if} and continue the installation with the "Next" Button or
2. You re-enter the Database access information, but to a different Database and continue the installation with the "Next" Button or
3. You enter a new Installations number, not forgetting to continue the installation with the "Next" Button.]]> + 1}s{/if} already exist{if $conflictedTables|count == 1}s{/if} within your "{$dbName}" Database:
{implode from=$conflictedTables item="table"}{$table}{/implode}.

To solve this problem, please do one of the following:
1. Enable the "Overwrite" option below to overwrite {if $conflictedTables|count > 1}these tables{else}this table{/if} and continue the installation with the "Next" button or
2. You re-enter the database access information, but to a different database and continue the installation with the "Next" button or
3. Enter a new installation number, not forgetting to continue the installation with the "Next" Button.]]> 1}s{/if}?]]> - - - - - + + + + + - - + + - - - - + + + + {$exception->getMessage()}
Please make sure that the destination folder exists and can be written to. -- 2.20.1