Improved usability of the rewrite rules dialog

diff --git a/wcfsetup/install/files/acp/templates/__optionRewriteRulesOutput.tpl b/wcfsetup/install/files/acp/templates/__optionRewriteRulesOutput.tpl
index 38236b846424ecd73c4c3de5fa1d06e88cde45e6..706bb11e3c219c076f4009cc79546d31412e496e 100644 (file)
--- 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 802eb75e03b602489e1584f8b6add857cf3fa6c7..a56b0f1a41abeb7e0606c79b0ef5e44ffce6f610 100644 (file)
--- 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 2eaa9e48e4bb070260d4bbe828e27766f8dd387c..54622a01fc4a1cdf27671ce12c881d88aef08704 100644 (file)
--- 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>