From: Marcel Werk <burntime@woltlab.com>
Date: Sat, 22 Dec 2012 20:49:46 +0000 (+0100)
Subject: Fixed outdated setup templates
X-Git-Tag: 2.0.0_Beta_1~688
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=5d1bf7ee9152f5984660cb0e4a4eb987517d45bb;p=GitHub%2FWoltLab%2FWCF.git

Fixed outdated setup templates
---

diff --git a/wcfsetup/setup/lang/setup_de.xml b/wcfsetup/setup/lang/setup_de.xml
index 8bbc98f25f..bbf2f35f17 100644
--- a/wcfsetup/setup/lang/setup_de.xml
+++ b/wcfsetup/setup/lang/setup_de.xml
@@ -20,8 +20,6 @@
 		<item name="wcf.global.license.description"><![CDATA[Bitte lesen Sie die folgenden Lizenzbestimmungen. Verwenden Sie die Bildlaufleiste, um das gesamte Dokument anzuzeigen.]]></item>
 		<item name="wcf.global.license.accept.description"><![CDATA[Akzeptieren Sie sämtliche Bedingungen der Lizenzbestimmungen? Sie können die Software nur installieren, wenn Sie die Lizenzbestimmungen akzeptieren.]]></item>
 		<item name="wcf.global.license.missingAcception"><![CDATA[Um mit der Installation fortfahren zu können, müssen Sie die Lizenzbestimmungen akzeptieren.]]></item>
-		<item name="wcf.global.systemRequirements"><![CDATA[Überprüfung der Systemvoraussetzungen]]></item>
-		<item name="wcf.global.systemRequirements.description"><![CDATA[Dies sind die Systemvoraussetzungen:]]></item>
 		<item name="wcf.global.systemRequirements.required"><![CDATA[Benötigte Systemvoraussetzungen]]></item>
 		<item name="wcf.global.systemRequirements.recommended"><![CDATA[Empfohlene Systemvoraussetzungen]]></item>
 		<item name="wcf.global.systemRequirements.element.required"><![CDATA[Benötigt:]]></item>
diff --git a/wcfsetup/setup/lang/setup_en.xml b/wcfsetup/setup/lang/setup_en.xml
index 39ea6440f6..3be597a1c0 100644
--- a/wcfsetup/setup/lang/setup_en.xml
+++ b/wcfsetup/setup/lang/setup_en.xml
@@ -20,8 +20,6 @@
 		<item name="wcf.global.license.description"><![CDATA[Please read the following license agreement. Use the scroll bar to view the entire document.]]></item>
 		<item name="wcf.global.license.accept.description"><![CDATA[Do you accept the terms and conditions of the license agreement? You may only install this software upon acceptance of the license agreement.]]></item>
 		<item name="wcf.global.license.missingAcception"><![CDATA[You must accept the license agreement to continue this installation.]]></item>
-		<item name="wcf.global.systemRequirements"><![CDATA[Checking system-requirements]]></item>
-		<item name="wcf.global.systemRequirements.description"><![CDATA[These are the system-requirements:]]></item>
 		<item name="wcf.global.systemRequirements.required"><![CDATA[Required system-component]]></item>
 		<item name="wcf.global.systemRequirements.recommended"><![CDATA[Recommended system-component]]></item>
 		<item name="wcf.global.systemRequirements.element.required"><![CDATA[Required:]]></item>
diff --git a/wcfsetup/setup/template/stepShowLicense.tpl b/wcfsetup/setup/template/stepShowLicense.tpl
index 9391d4d3b1..f526b727fe 100644
--- a/wcfsetup/setup/template/stepShowLicense.tpl
+++ b/wcfsetup/setup/template/stepShowLicense.tpl
@@ -13,8 +13,8 @@
 
 <form method="post" action="install.php">
 	<div class="container containerPadding marginTop">
-		<textarea rows="20" cols="40" readonly="readonly" id="license">{$license}</textarea>
-		<p><label{if $missingAcception|isset} class="formError"{/if}><input type="checkbox" name="accepted" value="1" /> {lang}wcf.global.license.accept.description{/lang}</label></p>
+		<textarea rows="20" cols="40" readonly="readonly" autofocus="autofocus" id="license">{$license}</textarea>
+		<p><label><input type="checkbox" name="accepted" value="1" /> {lang}wcf.global.license.accept.description{/lang}</label></p>
 	</div>
 	
 	<div class="formSubmit">
@@ -27,10 +27,4 @@
 	</div>
 </form>
 
-<script type="text/javascript">
-	//<![CDATA[
-	document.getElementById('license').focus();
-	//]]>
-</script>
-
 {include file='footer'}
diff --git a/wcfsetup/setup/template/stepShowSystemRequirements.tpl b/wcfsetup/setup/template/stepShowSystemRequirements.tpl
index 7ae8ee3e47..2577a405bd 100644
--- a/wcfsetup/setup/template/stepShowSystemRequirements.tpl
+++ b/wcfsetup/setup/template/stepShowSystemRequirements.tpl
@@ -2,79 +2,77 @@
 
 <header class="boxHeadline boxSubHeadline">
 	<hgroup>
-		<h1>{lang}wcf.global.systemRequirements{/lang}</h1>
-		<h2>{lang}wcf.global.systemRequirements.description{/lang}</h2>
+		<h1>{lang}wcf.global.systemRequirements.required{/lang}</h1>
 	</hgroup>
 </header>
 
-{*todo:*}
-<fieldset>
-	<legend>{lang}wcf.global.systemRequirements.required{/lang}</legend>
+<div class="container containerPadding marginTop">
+	<fieldset>
+		<legend>{lang}wcf.global.systemRequirements.php{/lang}</legend>
+		<dl>
+			<dt>{lang}wcf.global.systemRequirements.element.required{/lang} 5.3.2</dt>
+			<dd>
+				{lang}wcf.global.systemRequirements.element.yours{/lang} <span class="badge {if !$system.phpVersion.result}red{else}green{/if}">{$system.phpVersion.value}</span>
+				{if !$system.phpVersion.result}<small>{lang}wcf.global.systemRequirements.php.description{/lang}</small>{/if}
+			</dd>
+		</dl>
+	</fieldset>
+	
+	<fieldset>
+		<legend>{lang}wcf.global.systemRequirements.sql{/lang}</legend>
+		<dl>
+			<dt>{lang}wcf.global.systemRequirements.element.required{/lang} {lang}wcf.global.systemRequirements.active{/lang}</dt>
+			<dd>
+				{lang}wcf.global.systemRequirements.element.yours{/lang} <span class="badge {if !$system.sql.result}red{else}green{/if}">
+				{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}</span>
+				{if !$system.sql.result}<small>{lang}wcf.global.systemRequirements.sql.description{/lang}</small>{/if}
+			</dd>
+		</dl>
+	</fieldset>
+	
+	<fieldset>
+		<legend>{lang}wcf.global.systemRequirements.mbString{/lang}</legend>
+		<dl>
+			<dt>{lang}wcf.global.systemRequirements.element.required{/lang} {lang}wcf.global.systemRequirements.active{/lang}</dt>
+			<dd>
+				{lang}wcf.global.systemRequirements.element.yours{/lang} <span class="badge {if !$system.mbString.result}red{else}green{/if}">{if !$system.mbString.result}{lang}wcf.global.systemRequirements.notActive{/lang}{else}{lang}wcf.global.systemRequirements.active{/lang}{/if}</span>{if !$system.mbString.result}<small>{lang}wcf.global.systemRequirements.mbString.description{/lang}</small>{/if}
+			</dd>
+		</dl>
 		
-		<fieldset>
-			<legend>{lang}wcf.global.systemRequirements.php{/lang}</legend>
-			<dl>
-				<dt>{lang}wcf.global.systemRequirements.element.required{/lang} 5.3.2</dt>
-				<dd>
-					{lang}wcf.global.systemRequirements.element.yours{/lang} <span class="badge {if !$system.phpVersion.result}red{else}green{/if}">{$system.phpVersion.value}</span>
-					{if !$system.phpVersion.result}<small>{lang}wcf.global.systemRequirements.php.description{/lang}</small>{/if}
-				</dd>
-			</dl>
-		</fieldset>
-		
-		<fieldset>
-			<legend>{lang}wcf.global.systemRequirements.sql{/lang}</legend>
-			<dl>
-				<dt>{lang}wcf.global.systemRequirements.element.required{/lang} {lang}wcf.global.systemRequirements.active{/lang}</dt>
-				<dd>
-					{lang}wcf.global.systemRequirements.element.yours{/lang} <span class="badge {if !$system.sql.result}red{else}green{/if}">
-					{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}</span>
-					{if !$system.sql.result}<small>{lang}wcf.global.systemRequirements.sql.description{/lang}</small>{/if}
-				</dd>
-			</dl>
-		</fieldset>
-		
-		<fieldset>
-			<legend>{lang}wcf.global.systemRequirements.mbString{/lang}</legend>
-			<dl>
-				<dt>{lang}wcf.global.systemRequirements.element.required{/lang} {lang}wcf.global.systemRequirements.active{/lang}</dt>
-				<dd>
-					{lang}wcf.global.systemRequirements.element.yours{/lang} <span class="badge {if !$system.mbString.result}red{else}green{/if}">{if !$system.mbString.result}{lang}wcf.global.systemRequirements.notActive{/lang}{else}{lang}wcf.global.systemRequirements.active{/lang}{/if}</span>{if !$system.mbString.result}<small>{lang}wcf.global.systemRequirements.mbString.description{/lang}</small>{/if}
-				</dd>
-			</dl>
-			
-		</fieldset>
-		
-</fieldset>
+	</fieldset>
+</div>
 
-<fieldset>
-	<legend>{lang}wcf.global.systemRequirements.recommended{/lang}</legend>
-		
-		<fieldset>
-			<legend>{lang}wcf.global.systemRequirements.uploadMaxFilesize{/lang}</legend>
-			<dl>
-				<dt>{lang}wcf.global.systemRequirements.element.recommended{/lang} &gt; 0</dt>
-				<dd>
-					{lang}wcf.global.systemRequirements.element.yours{/lang} <span class="badge {if !$system.uploadMaxFilesize.result}yellow{else}green{/if}">{$system.uploadMaxFilesize.value}</span>
-					{if !$system.uploadMaxFilesize.result}<small>{lang}wcf.global.systemRequirements.uploadMaxFilesize.description{/lang}</small>{/if}
-				</dd>
-			</dl>
-		</fieldset>
-		
-		<fieldset>
-			<legend>{lang}wcf.global.systemRequirements.gdLib{/lang}</legend>
-			<dl>
-				<dt>{lang}wcf.global.systemRequirements.element.recommended{/lang} 2.0.0</dt>
-				<dd>
-					{lang}wcf.global.systemRequirements.element.yours{/lang} <span class="badge {if !$system.gdLib.result}yellow{else}green{/if}">{$system.gdLib.value}</span>
-					{if !$system.gdLib.result}<small>{lang}wcf.global.systemRequirements.gdLib.description{/lang}</small>{/if}
-				</dd>
-			</dl>
-		</fieldset>
-		
-</fieldset>
+<header class="boxHeadline boxSubHeadline">
+	<hgroup>
+		<h1>{lang}wcf.global.systemRequirements.recommended{/lang}</h1>
+	</hgroup>
+</header>
+
+<div class="container containerPadding marginTop">
+	<fieldset>
+		<legend>{lang}wcf.global.systemRequirements.uploadMaxFilesize{/lang}</legend>
+		<dl>
+			<dt>{lang}wcf.global.systemRequirements.element.recommended{/lang} &gt; 0</dt>
+			<dd>
+				{lang}wcf.global.systemRequirements.element.yours{/lang} <span class="badge {if !$system.uploadMaxFilesize.result}yellow{else}green{/if}">{$system.uploadMaxFilesize.value}</span>
+				{if !$system.uploadMaxFilesize.result}<small>{lang}wcf.global.systemRequirements.uploadMaxFilesize.description{/lang}</small>{/if}
+			</dd>
+		</dl>
+	</fieldset>
+	
+	<fieldset>
+		<legend>{lang}wcf.global.systemRequirements.gdLib{/lang}</legend>
+		<dl>
+			<dt>{lang}wcf.global.systemRequirements.element.recommended{/lang} 2.0.0</dt>
+			<dd>
+				{lang}wcf.global.systemRequirements.element.yours{/lang} <span class="badge {if !$system.gdLib.result}yellow{else}green{/if}">{$system.gdLib.value}</span>
+				{if !$system.gdLib.result}<small>{lang}wcf.global.systemRequirements.gdLib.description{/lang}</small>{/if}
+			</dd>
+		</dl>
+	</fieldset>
+</div>
 
 <form method="post" action="install.php">
 	<div class="formSubmit">