From 4d9daab7a4d0ea8a2278d6b2b361797b9f96727b Mon Sep 17 00:00:00 2001
From: Marcel Werk <burntime@woltlab.com>
Date: Wed, 5 Feb 2020 16:31:22 +0100
Subject: [PATCH] Improved usability of the rewrite rules dialog

---
 .../acp/templates/__optionRewriteRulesOutput.tpl | 16 +++++++++++-----
 wcfsetup/install/lang/de.xml                     |  2 ++
 wcfsetup/install/lang/en.xml                     |  2 ++
 3 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/wcfsetup/install/files/acp/templates/__optionRewriteRulesOutput.tpl b/wcfsetup/install/files/acp/templates/__optionRewriteRulesOutput.tpl
index 38236b8464..706bb11e3c 100644
--- a/wcfsetup/install/files/acp/templates/__optionRewriteRulesOutput.tpl
+++ b/wcfsetup/install/files/acp/templates/__optionRewriteRulesOutput.tpl
@@ -3,11 +3,17 @@
 		<h2 class="sectionTitle">{lang}wcf.acp.rewrite.{$webserver}{/lang}</h2>
 		
 		{foreach from=$rules key=$path item=content}
-			<p>
-				<span class="inlineCode">{$path}</span>
-			</p>
-			<pre>{$content}</pre>
+			<dl>
+				<dt>{lang}wcf.acp.rewrite.filename{/lang}</dt>
+				<dd>
+					<kbd>{$path}</kbd>
+				</dd>
+				
+				<dt>{lang}wcf.acp.rewrite.fileContent{/lang}</dt>
+				<dd>
+					<textarea rows="10" readonly>{$content|trim}</textarea>
+				</dd>
+			</dl>
 		{/foreach}
 	</section>
 {/foreach}
-
diff --git a/wcfsetup/install/lang/de.xml b/wcfsetup/install/lang/de.xml
index 802eb75e03..a56b0f1a41 100644
--- a/wcfsetup/install/lang/de.xml
+++ b/wcfsetup/install/lang/de.xml
@@ -2648,6 +2648,8 @@ Kein Abschnitt darf leer sein und alle Abschnitten dürfen nur folgende Zeichen
 		<item name="wcf.acp.rewrite.apache"><![CDATA[Apache (.htaccess)]]></item>
 		<item name="wcf.acp.rewrite.generate"><![CDATA[Rewrite-Regeln generieren]]></item>
 		<item name="wcf.acp.rewrite.description"><![CDATA[Generiert die Inhalte der benötigten .htaccess-Dateien und gibt sie aus. Beachte{if !LANGUAGE_USE_INFORMAL_VARIANT}n Sie{/if} bitte, dass die benötigten Regeln bei speziellen Server-Konfigurationen abweichen können.]]></item>
+		<item name="wcf.acp.rewrite.filename"><![CDATA[Dateiname]]></item>
+		<item name="wcf.acp.rewrite.fileContent"><![CDATA[Inhalt]]></item>
 	</category>
 	<category name="wcf.acp.search">
 		<item name="wcf.acp.search.noResults"><![CDATA[Keine Treffer]]></item>
diff --git a/wcfsetup/install/lang/en.xml b/wcfsetup/install/lang/en.xml
index 2eaa9e48e4..54622a01fc 100644
--- a/wcfsetup/install/lang/en.xml
+++ b/wcfsetup/install/lang/en.xml
@@ -2576,6 +2576,8 @@ If you have <strong>already bought the licenses for the listed apps</strong>, th
 		<item name="wcf.acp.rewrite.apache"><![CDATA[Apache (.htaccess)]]></item>
 		<item name="wcf.acp.rewrite.generate"><![CDATA[Generate Rewrite-Rules]]></item>
 		<item name="wcf.acp.rewrite.description"><![CDATA[Generates the rewrite rules for necessary .htaccess-files. Please keep in mind, that you might have to provide different rules for special webserver configurations.]]></item>
+		<item name="wcf.acp.rewrite.filename"><![CDATA[Filename]]></item>
+		<item name="wcf.acp.rewrite.fileContent"><![CDATA[File Content]]></item>
 	</category>
 	<category name="wcf.acp.search">
 		<item name="wcf.acp.search.noResults"><![CDATA[No results]]></item>
-- 
2.20.1