From 429be9f77417e9e2abb3a62ed794c7cb28b504c9 Mon Sep 17 00:00:00 2001
From: BNoiZe <roman@schmerold.at>
Date: Wed, 4 Dec 2013 21:59:33 +0100
Subject: [PATCH 1/3] changed "discard changes" to a more useful "cancel"
 button
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

„cancel” will take you back to the last view you were in.
---
 templates/Froxlor/misc/form/table_end.tpl     | 2 +-
 templates/Froxlor/misc/form/table_section.tpl | 2 +-
 templates/Sparkle/misc/form/table_end.tpl     | 2 +-
 templates/Sparkle/misc/form/table_section.tpl | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/templates/Froxlor/misc/form/table_end.tpl b/templates/Froxlor/misc/form/table_end.tpl
index 4056f237..2379429a 100644
--- a/templates/Froxlor/misc/form/table_end.tpl
+++ b/templates/Froxlor/misc/form/table_end.tpl
@@ -1,6 +1,6 @@
 <tr>
 	<td colspan="2" style="text-align:right;">
-		<input type="reset" value="{$lng['panel']['reset']}" />
+		<input type="reset" value="{$lng['panel']['cancel']}" id="historyback" />
 		<input type="submit" value="{$lng['panel']['save']}" />
 	</td>
 </tr>
diff --git a/templates/Froxlor/misc/form/table_section.tpl b/templates/Froxlor/misc/form/table_section.tpl
index 1814a62c..56719575 100644
--- a/templates/Froxlor/misc/form/table_section.tpl
+++ b/templates/Froxlor/misc/form/table_section.tpl
@@ -3,7 +3,7 @@
 		<img src="templates/{$theme}/assets/img/{$image}" alt="{$title}" />&nbsp;<strong>{$title}</strong>
 	</td>
 	<td style="text-align:right;">
-		<input type="reset" value="{$lng['panel']['reset']}" />
+		<input type="reset" value="{$lng['panel']['cancel']}" id="historyback" />
 		<input type="submit" value="{$lng['panel']['save']}" />
 	</td>
 </tr>
diff --git a/templates/Sparkle/misc/form/table_end.tpl b/templates/Sparkle/misc/form/table_end.tpl
index 003af593..a6f6dc1e 100644
--- a/templates/Sparkle/misc/form/table_end.tpl
+++ b/templates/Sparkle/misc/form/table_end.tpl
@@ -1,7 +1,7 @@
 <tfoot>
 	<tr>
 		<td colspan="2" style="text-align:right;">
-			<input type="reset" value="{$lng['panel']['reset']}" />
+			<input type="reset" value="{$lng['panel']['cancel']}" id="historyback" />
 			<input type="submit" value="{$lng['panel']['save']}" />
 		</td>
 	</tr>
diff --git a/templates/Sparkle/misc/form/table_section.tpl b/templates/Sparkle/misc/form/table_section.tpl
index 4b7e36c3..44a8cee7 100644
--- a/templates/Sparkle/misc/form/table_section.tpl
+++ b/templates/Sparkle/misc/form/table_section.tpl
@@ -3,7 +3,7 @@
 		{$title}
 	</th>
 	<th style="text-align:right;">
-		<input type="reset" value="{$lng['panel']['reset']}" />
+		<input type="reset" value="{$lng['panel']['cancel']}" id="historyback" />
 		<input type="submit" value="{$lng['panel']['save']}" />
 	</th>
 </tr>

From 56f8ca47dc975a027b963932648571d842e0fedd Mon Sep 17 00:00:00 2001
From: BNoiZe <roman@schmerold.at>
Date: Fri, 6 Dec 2013 18:27:51 +0100
Subject: [PATCH 2/3] Updated config templates

---
 templates/Sparkle/admin/configfiles/configfiles.tpl        | 7 +++++--
 .../Sparkle/admin/configfiles/configfiles_commands.tpl     | 6 ++++--
 templates/Sparkle/admin/configfiles/configfiles_file.tpl   | 2 +-
 templates/Sparkle/admin/configfiles/configfiles_files.tpl  | 5 ++++-
 4 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/templates/Sparkle/admin/configfiles/configfiles.tpl b/templates/Sparkle/admin/configfiles/configfiles.tpl
index 671f68f3..d74267f5 100644
--- a/templates/Sparkle/admin/configfiles/configfiles.tpl
+++ b/templates/Sparkle/admin/configfiles/configfiles.tpl
@@ -15,8 +15,11 @@ $header
 				{$configpage}
 				<if $restart != ''>
 				<tr>
-					<td>{$lng['admin']['configfiles']['restart']}<br /><br />
-					<textarea class="textarea_border" rows="3" cols="70" readonly="readonly">$restart</textarea></td>
+					<th>{$lng['admin']['configfiles']['restart']}</th>
+				<tr>
+				<tr>
+					<td>
+					<textarea class="textarea_border" rows="" cols="70" readonly="readonly">$restart</textarea></td>
 				</tr>
 				</if>
 		</table>
diff --git a/templates/Sparkle/admin/configfiles/configfiles_commands.tpl b/templates/Sparkle/admin/configfiles/configfiles_commands.tpl
index 9b87ae62..6791e7ce 100644
--- a/templates/Sparkle/admin/configfiles/configfiles_commands.tpl
+++ b/templates/Sparkle/admin/configfiles/configfiles_commands.tpl
@@ -1,4 +1,6 @@
 <tr>
-	<td>{$lng['admin']['configfiles']['commands']}<br /><br />
-	<textarea rows="6" cols="70" readonly="readonly">{$commands}</textarea></td>
+	<th>{$lng['admin']['configfiles']['commands']}</th>
+</tr>
+<tr>
+	<td><textarea rows="10" cols="70" readonly="readonly">{$commands}</textarea></td>
 </tr>
diff --git a/templates/Sparkle/admin/configfiles/configfiles_file.tpl b/templates/Sparkle/admin/configfiles/configfiles_file.tpl
index d09d8340..7c737366 100644
--- a/templates/Sparkle/admin/configfiles/configfiles_file.tpl
+++ b/templates/Sparkle/admin/configfiles/configfiles_file.tpl
@@ -1,5 +1,5 @@
 <p>
 	<label><b>{$realname}</b></label><br />
-	<textarea rows="<if $numbrows <= 8 >{$numbrows}</if><if 8 < $numbrows >8</if>" cols="70" readonly="readonly">{$file_content}</textarea>
+	<textarea rows="<if $numbrows <= 10 >{$numbrows}</if><if 10 < $numbrows >10</if>" cols="70" readonly="readonly" id="selectall">{$file_content}</textarea>
 </p>
 
diff --git a/templates/Sparkle/admin/configfiles/configfiles_files.tpl b/templates/Sparkle/admin/configfiles/configfiles_files.tpl
index b248385a..054e7cc2 100644
--- a/templates/Sparkle/admin/configfiles/configfiles_files.tpl
+++ b/templates/Sparkle/admin/configfiles/configfiles_files.tpl
@@ -1,3 +1,6 @@
 <tr>
-	<td>{$lng['admin']['configfiles']['files']}<br /><br />{$files}</td>
+	<th>{$lng['admin']['configfiles']['files']}</th>
+</tr>
+<tr>
+	<td>{$files}</td>
 </tr>

From ecb9fe9d5ca0e594a698357c32d86eb3426976de Mon Sep 17 00:00:00 2001
From: BNoiZe <roman@schmerold.at>
Date: Fri, 6 Dec 2013 18:39:55 +0100
Subject: [PATCH 3/3] Changed id to class

---
 templates/Froxlor/assets/js/main.js           | 2 +-
 templates/Froxlor/misc/form/table_end.tpl     | 2 +-
 templates/Froxlor/misc/form/table_section.tpl | 2 +-
 templates/Sparkle/assets/js/main.js           | 2 +-
 templates/Sparkle/misc/form/table_end.tpl     | 2 +-
 templates/Sparkle/misc/form/table_section.tpl | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/templates/Froxlor/assets/js/main.js b/templates/Froxlor/assets/js/main.js
index 345fb6ef..37a3b2d6 100644
--- a/templates/Froxlor/assets/js/main.js
+++ b/templates/Froxlor/assets/js/main.js
@@ -1,5 +1,5 @@
 $(document).ready(function() {
-	$('#historyback').click(function() {
+	$('#historyback, .historyback').click(function() {
 		parent.history.back();
 		return false;
 	});
diff --git a/templates/Froxlor/misc/form/table_end.tpl b/templates/Froxlor/misc/form/table_end.tpl
index 2379429a..3561c595 100644
--- a/templates/Froxlor/misc/form/table_end.tpl
+++ b/templates/Froxlor/misc/form/table_end.tpl
@@ -1,6 +1,6 @@
 <tr>
 	<td colspan="2" style="text-align:right;">
-		<input type="reset" value="{$lng['panel']['cancel']}" id="historyback" />
+		<input type="reset" value="{$lng['panel']['cancel']}" class="historyback" />
 		<input type="submit" value="{$lng['panel']['save']}" />
 	</td>
 </tr>
diff --git a/templates/Froxlor/misc/form/table_section.tpl b/templates/Froxlor/misc/form/table_section.tpl
index 56719575..052e6186 100644
--- a/templates/Froxlor/misc/form/table_section.tpl
+++ b/templates/Froxlor/misc/form/table_section.tpl
@@ -3,7 +3,7 @@
 		<img src="templates/{$theme}/assets/img/{$image}" alt="{$title}" />&nbsp;<strong>{$title}</strong>
 	</td>
 	<td style="text-align:right;">
-		<input type="reset" value="{$lng['panel']['cancel']}" id="historyback" />
+		<input type="reset" value="{$lng['panel']['cancel']}" class="historyback" />
 		<input type="submit" value="{$lng['panel']['save']}" />
 	</td>
 </tr>
diff --git a/templates/Sparkle/assets/js/main.js b/templates/Sparkle/assets/js/main.js
index be9d05c5..170775f1 100644
--- a/templates/Sparkle/assets/js/main.js
+++ b/templates/Sparkle/assets/js/main.js
@@ -20,7 +20,7 @@ $(document).ready(function() {
 		return false;
 	});
 	
-	$('#historyback').click(function() {
+	$('#historyback, .historyback').click(function() {
 		parent.history.back();
 		return false;
 	});
diff --git a/templates/Sparkle/misc/form/table_end.tpl b/templates/Sparkle/misc/form/table_end.tpl
index a6f6dc1e..cc989b79 100644
--- a/templates/Sparkle/misc/form/table_end.tpl
+++ b/templates/Sparkle/misc/form/table_end.tpl
@@ -1,7 +1,7 @@
 <tfoot>
 	<tr>
 		<td colspan="2" style="text-align:right;">
-			<input type="reset" value="{$lng['panel']['cancel']}" id="historyback" />
+			<input type="reset" value="{$lng['panel']['cancel']}" class="historyback" />
 			<input type="submit" value="{$lng['panel']['save']}" />
 		</td>
 	</tr>
diff --git a/templates/Sparkle/misc/form/table_section.tpl b/templates/Sparkle/misc/form/table_section.tpl
index 44a8cee7..4353a31c 100644
--- a/templates/Sparkle/misc/form/table_section.tpl
+++ b/templates/Sparkle/misc/form/table_section.tpl
@@ -3,7 +3,7 @@
 		{$title}
 	</th>
 	<th style="text-align:right;">
-		<input type="reset" value="{$lng['panel']['cancel']}" id="historyback" />
+		<input type="reset" value="{$lng['panel']['cancel']}" class="historyback" />
 		<input type="submit" value="{$lng['panel']['save']}" />
 	</th>
 </tr>