From 1d319e001ceef13fc97d12b9f49e49917493e8a8 Mon Sep 17 00:00:00 2001
From: "Michael Kaufmann (d00p)" <d00p@froxlor.org>
Date: Mon, 16 Feb 2015 13:29:01 +0100
Subject: [PATCH] group file-relevant commands into the fieldset; enhance
 layout

Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
---
 templates/Sparkle/admin/configfiles/configfiles.tpl   | 11 ++++++-----
 .../Sparkle/admin/configfiles/configfiles_file.tpl    |  2 +-
 .../admin/configfiles/configfiles_subfileblock.tpl    |  9 ++++++---
 templates/Sparkle/assets/css/main.css                 |  5 +----
 4 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/templates/Sparkle/admin/configfiles/configfiles.tpl b/templates/Sparkle/admin/configfiles/configfiles.tpl
index 01002cda..cd017af0 100644
--- a/templates/Sparkle/admin/configfiles/configfiles.tpl
+++ b/templates/Sparkle/admin/configfiles/configfiles.tpl
@@ -14,16 +14,17 @@ $header
 				<p>{$lng['admin']['configfiles']['legend']}</p><br />
 				<p>
 					{$lng['admin']['configfiles']['commands']}<br />
-					<pre class="shell">
+					<textarea class="shell" rows="2" readonly>
 chmod u+x example-script.sh
-./example-script.sh</pre>
+./example-script.sh</textarea>
 				</p><br />
 				<p>
 					{$lng['admin']['configfiles']['files']}<br />
-					<pre class="filecontent">Lorem ipsum dolor sit amet,
+					<textarea class="filecontent" rows="5">Lorem ipsum dolor sit amet,
 consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt
-ut labore et dolore magna aliquyam erat, sed diam voluptua.
-At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet.</pre>
+ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero
+eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren,
+no sea takimata sanctus est Lorem ipsum dolor sit amet.</textarea>
 				</p>
 			</div>
 		</section>
diff --git a/templates/Sparkle/admin/configfiles/configfiles_file.tpl b/templates/Sparkle/admin/configfiles/configfiles_file.tpl
index 8368816b..02d899ca 100644
--- a/templates/Sparkle/admin/configfiles/configfiles_file.tpl
+++ b/templates/Sparkle/admin/configfiles/configfiles_file.tpl
@@ -2,6 +2,6 @@
 	<fieldset class="file">
 		<legend>{$realname}</legend>
         <textarea class="shell" rows="1" readonly>&dollar;EDITOR {$realname}</textarea>
-        <textarea class="filecontent" rows="{$numbrows}" readonly>{$file_content}</textarea>
+        <textarea class="filecontent" rows="<if $numbrows <=20 >{$numbrows}<else>21</if>" readonly>{$file_content}</textarea>
 	</fieldset>
 </div>
diff --git a/templates/Sparkle/admin/configfiles/configfiles_subfileblock.tpl b/templates/Sparkle/admin/configfiles/configfiles_subfileblock.tpl
index 9e886073..7e6a7a8e 100644
--- a/templates/Sparkle/admin/configfiles/configfiles_subfileblock.tpl
+++ b/templates/Sparkle/admin/configfiles/configfiles_subfileblock.tpl
@@ -1,5 +1,8 @@
 <div class="filesub">
-        {$commands_pre}
-        {$commands_file}
-        {$commands_post}
+	<fieldset class="file">
+		<legend>{$realname}</legend>
+		{$commands_pre}
+		{$commands_file}
+		{$commands_post}
+	</fieldset>
 </div>
diff --git a/templates/Sparkle/assets/css/main.css b/templates/Sparkle/assets/css/main.css
index 904643af..3572962c 100644
--- a/templates/Sparkle/assets/css/main.css
+++ b/templates/Sparkle/assets/css/main.css
@@ -1454,10 +1454,6 @@ table thead th.tablesorter-headerDesc {
 	white-space: nowrap;
 }
 
-.pushbot {
-	margin-bottom: 20px;
-}
-
 .info {
 	border-radius: 3px;
 	border: 1px solid #d1d5d8;
@@ -1486,4 +1482,5 @@ fieldset.file {
 	border:1px solid #d1d5d8;
 	border-radius: 3px;
 	padding: 5px;
+	margin-bottom: 10px;
 }