From 53e00c6b904953012871bb571266abaccaf8ccfd Mon Sep 17 00:00:00 2001 From: Luzifr Date: Fri, 9 Sep 2011 17:33:23 +0200 Subject: [PATCH] Styling the installation (Part 1) MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit This is a first try and work in progress! Be aware that the installation panels may look very ugly in the next time … ;-) --- wcfsetup/install.php | 64 +-- wcfsetup/setup/template/footer.tpl | 3 +- wcfsetup/setup/template/header.tpl | 431 ++++++++------------ wcfsetup/setup/template/stepConfigureDB.tpl | 18 +- 4 files changed, 223 insertions(+), 293 deletions(-) diff --git a/wcfsetup/install.php b/wcfsetup/install.php index 919f4cfe4a..aaa1d44a50 100644 --- a/wcfsetup/install.php +++ b/wcfsetup/install.php @@ -81,39 +81,41 @@ class SystemException extends \Exception implements IPrintableException { Fatal error: <?php echo htmlspecialchars($this->getMessage()); ?> - +

Fatal error: getMessage()); ?>

@@ -714,7 +716,7 @@ if (isset($_GET['showImage'])) { exit; } -// check whether setup files already unzipped +// check whether setup files are already unzipped if (!file_exists(TMP_DIR . 'install/files/lib/system/WCFSetup.class.php')) { // try to unzip all setup files into temp folder $tar = new Tar(SETUP_FILE); diff --git a/wcfsetup/setup/template/footer.tpl b/wcfsetup/setup/template/footer.tpl index c73018d9d3..671bdf950e 100644 --- a/wcfsetup/setup/template/footer.tpl +++ b/wcfsetup/setup/template/footer.tpl @@ -2,5 +2,6 @@ Copyright © 2001-2011 WoltLab® GmbH
+ - \ No newline at end of file + diff --git a/wcfsetup/setup/template/header.tpl b/wcfsetup/setup/template/header.tpl index 0edb4dbf15..493ed5d3f3 100644 --- a/wcfsetup/setup/template/header.tpl +++ b/wcfsetup/setup/template/header.tpl @@ -1,261 +1,188 @@ - - - - - {lang}wcf.global.progressBar{/lang} - {lang}wcf.global.pageTitle{/lang} - - - - - + .page { + background-image: url({if 'RELATIVE_WCF_DIR'|defined}{@' '|str_replace:'%20':RELATIVE_WCF_DIR}acp/images/setupHeader-{@$__wcf->getLanguage()->getPageDirection()}.jpg{else}install.php?showImage=setupHeader-{@$__wcf->getLanguage()->getPageDirection()}.jpg&tmpFilePrefix={@$tmpFilePrefix}{/if}); + background-repeat: no-repeat; + background-color: #fff; + padding: 153px 40px 20px 40px; + width: 720px; + } + + h1 { + color: #164369; + text-shadow: 0 2px 3px #bbb; + font-size: 1.9em; + font-weight: normal; + margin: 5px 0; + padding: 5px 0; + } + + h2 { + color: #164369; + font-size: 1.4em; + font-weight: bold; + margin: 0; + padding-top: 5px; + } + + .info, .success, .warning, .error, .help { + -webkit-border-radius: 5px; + -moz-border-radius: 5px; + } + + fieldset { + font-size: .82em; + border: 1px solid #8da4b7; + margin-bottom: 10px; + padding: 0; + -webkit-border-radius: 5px; + -moz-border-radius: 5px; + } + + legend { + color: #487397; + font-size: 1em; + margin: 0 10px; + padding: 0 4px; + } + + fieldset p, fieldset div { + margin: 0; + padding: 0 0 5px 0; + } + + fieldset ul { + list-style: none; + margin: 0; + padding: 0; + } + + fieldset ul li { + padding-{if $__wcf->getLanguage()->getPageDirection() == 'ltr'}right{else}left{/if}: 3%; + float: {if $__wcf->getLanguage()->getPageDirection() == 'ltr'}left{else}right{/if}; + width: 30%; + } + + form { + padding: 0; + margin: 0; + } + + textarea, select, input[type="text"], input[type="password"] { + background-color: #fafafa; + border-width: 1px; + border-style: solid; + border-color: #666 #999 #ccc #999; + background-image: url({if 'RELATIVE_WCF_DIR'|defined}{@' '|str_replace:'%20':RELATIVE_WCF_DIR}acp/images/setupInputBackground.png{else}install.php?showImage=setupInputBackground.png&tmpFilePrefix={@$tmpFilePrefix}{/if}); + background-position: left top; + background-repeat: repeat-x; + min-height: 13px; + } + + textarea, input[type="text"], input[type="password"] { + width: 100%; + } + + textarea:focus, select:focus, input[type="text"]:focus, input[type="password"]:focus { + background-color: #fff9f4; + border: 1px solid #fa2; + background-image: url({if 'RELATIVE_WCF_DIR'|defined}{@' '|str_replace:'%20':RELATIVE_WCF_DIR}acp/images/setupInputBackground.png{else}install.php?showImage=setupInputBackground.png&tmpFilePrefix={@$tmpFilePrefix}{/if}); + background-repeat: repeat-x; + outline: 0; + } + + textarea, select, input[type="text"], input[type="password"] { + padding: 2px; + -webkit-border-radius: 3px; + -moz-border-radius: 3px; + } + + label { + padding-bottom: 2px; + display: block; + } + + .setupIcon { + margin-{if $__wcf->getLanguage()->getPageDirection() == 'ltr'}right{else}left{/if}: 30px; + float: {if $__wcf->getLanguage()->getPageDirection() == 'ltr'}left{else}right{/if}; + } + + .nextButton { + float: {if $__wcf->getLanguage()->getPageDirection() == 'ltr'}right{else}left{/if}; + } + + .copyright { + font-size: .8em; + } + + .left { + float: {if $__wcf->getLanguage()->getPageDirection() == 'ltr'}left{else}right{/if}; + } + + .left, .right { + font-weight: bold; + display: block; + } + + .right { + margin-{if $__wcf->getLanguage()->getPageDirection() == 'ltr'}left{else}right{/if}: 48%; + width: 48%; + } + + .disabled { + color: #b2b2b2; + } + + .error { + color: #c00; + border: 1px solid #c00; + background-color: #fee; + padding: 4px 10px; + } + + .errorField { + color: #c00; + } + + .errorField .inputText, .errorField select, .errorField textarea { + border: 1px solid #c00; + background-color: #fee; + } + + /*]]>*/ + + + + +
+

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

{lang}wcf.global.progressBar{/lang}
-
- - \ No newline at end of file + \ No newline at end of file diff --git a/wcfsetup/setup/template/stepConfigureDB.tpl b/wcfsetup/setup/template/stepConfigureDB.tpl index 04d2e40e7d..ac3cc03d77 100644 --- a/wcfsetup/setup/template/stepConfigureDB.tpl +++ b/wcfsetup/setup/template/stepConfigureDB.tpl @@ -18,10 +18,10 @@
{lang}wcf.global.configureDB.accessData{/lang} -
+
- {foreach from=$availableDBClasses key=dbClassName item=availableDBClass} {/foreach} @@ -30,27 +30,27 @@
- +
- +
- +
- +
- +
{if $conflictedTables|isset} @@ -62,7 +62,7 @@
- + @@ -75,4 +75,4 @@
-{include file='footer'} \ No newline at end of file +{include file='footer'} -- 2.20.1