From 3e21cb0298eed920906fe7f7fb9255b7b200593e Mon Sep 17 00:00:00 2001
From: "Florian Aders (EleRas)" <eleras@froxlor.org>
Date: Thu, 16 Jun 2011 18:59:16 +0200
Subject: [PATCH] Moved inline - javascript to external file in preparation of
 X-Content-Security-Policy (also, the code looks cleaner, yay)

Signed-off-by: Florian Aders (EleRas) <eleras@froxlor.org>
---
 .../Classic/admin/configfiles/wizard.tpl      |  6 +-
 templates/Classic/header.tpl                  |  3 +-
 templates/Classic/js/froxlor.js               | 25 ++++++
 templates/Classic/login/login.tpl             |  4 +-
 templates/Classic/misc/question_yesno.tpl     |  2 +-
 .../Classic/misc/question_yesno_checkbox.tpl  |  2 +-
 .../Froxlor/admin/configfiles/wizard.tpl      |  6 +-
 templates/Froxlor/js/froxlor.js               | 80 +++++++++++--------
 templates/Froxlor/misc/question_yesno.tpl     |  2 +-
 .../Froxlor/misc/question_yesno_checkbox.tpl  |  2 +-
 10 files changed, 87 insertions(+), 45 deletions(-)
 create mode 100644 templates/Classic/js/froxlor.js

diff --git a/templates/Classic/admin/configfiles/wizard.tpl b/templates/Classic/admin/configfiles/wizard.tpl
index c083b021..51ddce6b 100644
--- a/templates/Classic/admin/configfiles/wizard.tpl
+++ b/templates/Classic/admin/configfiles/wizard.tpl
@@ -8,15 +8,15 @@ $header
 			</tr>
 			<tr>
 				<td class="main_field_name"><b>{$lng['admin']['configfiles']['distribution']}:</b></td>
-				<td class="main_field_display" nowrap="nowrap"><if $distribution != ''><input type="hidden" name="distribution" value="$distribution"/><a href="{$linker->getLink(array('section' => 'configfiles', 'page' => $page))}">{$configfiles[$distribution]['label']}</a><else><select name="distribution" onchange="javascript: window.location.href='{$linker->getLink(array('section' => 'configfiles', 'page' => $page))}&amp;distribution=' + this.options[ this.selectedIndex ].value;"><option value="choose">{$lng['admin']['configfiles']['choosedistribution']}</option>{$distributions_select}</select></if></td>
+				<td class="main_field_display" nowrap="nowrap"><if $distribution != ''><input type="hidden" name="distribution" value="$distribution"/><a href="{$linker->getLink(array('section' => 'configfiles', 'page' => $page))}">{$configfiles[$distribution]['label']}</a><else><select id="config_distribution" name="distribution"><option value="choose">{$lng['admin']['configfiles']['choosedistribution']}</option>{$distributions_select}</select></if></td>
 			</tr>
 			<tr>
 				<td class="main_field_name"><b>{$lng['admin']['configfiles']['service']}:</b></td>
-				<td class="main_field_display" nowrap="nowrap"><if $service != ''><input type="hidden" name="service" value="$service"/><a href="{$linker->getLink(array('section' => 'configfiles', 'page' => $page, 'distribution' => $distribution))}">{$configfiles[$distribution]['services'][$service]['label']}</a><else><select name="service" onchange="javascript: window.location.href='{$linker->getLink(array('section' => 'configfiles', 'page' => $page, 'distribution' => $distribution))}&amp;service=' + this.options[ this.selectedIndex ].value;"><option value="choose">{$lng['admin']['configfiles']['chooseservice']}</option>{$services_select}</select></if></td>
+				<td class="main_field_display" nowrap="nowrap"><if $service != ''><input type="hidden" name="service" value="$service"/><a href="{$linker->getLink(array('section' => 'configfiles', 'page' => $page, 'distribution' => $distribution))}">{$configfiles[$distribution]['services'][$service]['label']}</a><else><select id="config_service" name="service"><option value="choose">{$lng['admin']['configfiles']['chooseservice']}</option>{$services_select}</select></if></td>
 			</tr>
 			<tr>
 				<td class="main_field_name"><b>{$lng['admin']['configfiles']['daemon']}:</b></td>
-				<td class="main_field_display" nowrap="nowrap"><select name="daemon" onchange="javascript: window.location.href='{$linker->getLink(array('section' => 'configfiles', 'page' => $page, 'distribution' => $distribution, 'service' => $service))}&amp;daemon=' + this.options[ this.selectedIndex ].value;"><option value="choose">{$lng['admin']['configfiles']['choosedaemon']}</option>{$daemons_select}</select></td>
+				<td class="main_field_display" nowrap="nowrap"><select id="config_daemon" name="daemon"><option value="choose">{$lng['admin']['configfiles']['choosedaemon']}</option>{$daemons_select}</select></td>
 			</tr>
 			<tr>
 				<td class="main_field_confirm" colspan="2"><input class="bottom" type="submit" value="{$lng['panel']['next']}" /></td>
diff --git a/templates/Classic/header.tpl b/templates/Classic/header.tpl
index 7185bbf8..7a1f139d 100644
--- a/templates/Classic/header.tpl
+++ b/templates/Classic/header.tpl
@@ -8,9 +8,10 @@
 	</if>
 	<link rel="stylesheet" href="templates/Classic/main.css" type="text/css" />
 	<script type="text/javascript" src="templates/Classic/js/jquery.min.js"></script>
+	<script type="text/javascript" src="templates/Froxlor/js/froxlor.js"></script>
 	<title><if isset($userinfo['loginname']) && $userinfo['loginname'] != ''>{$userinfo['loginname']} - </if>Froxlor</title>
 </head>
-<body style="margin: 0; padding: 0;"<if !isset($userinfo['loginname']) && !(isset($userinfo['loginname']) && $userinfo['loginname'] == '')> onload="document.loginform.loginname.focus()"</if>>
+<body style="margin: 0; padding: 0;">
 <!--
     We request you retain the full copyright notice below including the link to www.froxlor.org.
     This not only gives respect to the large amount of time given freely by the developers
diff --git a/templates/Classic/js/froxlor.js b/templates/Classic/js/froxlor.js
new file mode 100644
index 00000000..24bdf9ef
--- /dev/null
+++ b/templates/Classic/js/froxlor.js
@@ -0,0 +1,25 @@
+$(document).ready(function() {
+	// make rel="external" links open in a new window
+	$("a[rel='external']").attr('target', '_blank');
+
+	// set focus on username-field if on loginpage
+	if ($(".loginpage").length != 0) {
+		$("#loginname").focus();
+	}
+
+	// Auto-select next field in configfile - wizard
+	$('#config_distribution').change(function (){
+		window.location.href=window.location.href + '&distribution=' + this.options[ this.selectedIndex ].value;
+	});
+	$('#config_service').change(function (){
+		window.location.href=window.location.href + '&service=' + this.options[ this.selectedIndex ].value;
+	});
+	$('#config_daemon').change(function (){
+		window.location.href=window.location.href + '&daemon=' + this.options[ this.selectedIndex ].value;
+	});
+
+	// Back-button
+	$('#yesnobutton').click(function() {
+		history.back();
+	});
+});
\ No newline at end of file
diff --git a/templates/Classic/login/login.tpl b/templates/Classic/login/login.tpl
index 3e0d003d..1d8fa48a 100644
--- a/templates/Classic/login/login.tpl
+++ b/templates/Classic/login/login.tpl
@@ -21,7 +21,7 @@ $header
 			<tr>
 				<td rowspan="3" class="field_name_center"><img src="images/Classic/login.gif" alt="" /></td>
 				<td class="field_name"><font size="-1">{$lng['login']['username']}:</font></td>
-				<td class="field_display"><input type="text" class="text" name="loginname" value="" maxlength="50" /></td>
+				<td class="field_display"><input type="text" class="text" name="loginname" id="loginname" value="" maxlength="50" /></td>
 			</tr>
 			<tr>
 				<td class="field_name"><font size="-1">{$lng['login']['password']}:</font></td>
@@ -43,7 +43,7 @@ $header
 			<tr>
 				<td class="field_name_center" colspan="3">{$update_in_progress}</td>
 			</tr>
-			</if>			
+			</if>
 		</table>
 	</form>
 	<br />
diff --git a/templates/Classic/misc/question_yesno.tpl b/templates/Classic/misc/question_yesno.tpl
index f1fd0254..6ce363bd 100644
--- a/templates/Classic/misc/question_yesno.tpl
+++ b/templates/Classic/misc/question_yesno.tpl
@@ -9,7 +9,7 @@ $header
 			</tr>
 			<tr>
 				<td class="field_name_border_left">$text</td>
-				<td class="field_name" nowrap="nowrap"><input type="submit" class="bottom" name="submitbutton" value="{$lng['panel']['yes']}" />&nbsp;<input type="button" class="bottom" value="{$lng['panel']['no']}" onclick="history.go(-{$back_nr});" /></td>
+				<td class="field_name" nowrap="nowrap"><input type="submit" class="bottom" name="submitbutton" value="{$lng['panel']['yes']}" />&nbsp;<input type="button" class="bottom" value="{$lng['panel']['no']}"  id="yesnobutton" /></td>
 			</tr>
 		</table>
 	</form>
diff --git a/templates/Classic/misc/question_yesno_checkbox.tpl b/templates/Classic/misc/question_yesno_checkbox.tpl
index 9e0241b1..3d7f3f91 100644
--- a/templates/Classic/misc/question_yesno_checkbox.tpl
+++ b/templates/Classic/misc/question_yesno_checkbox.tpl
@@ -12,7 +12,7 @@ $header
 				<td class="field_name">$checkbox</td>
 			</tr>
 			<tr>
-				<td class="field_name_border_left" nowrap="nowrap" style="text-align: center;" colspan="2"><input type="submit" class="bottom" name="submitbutton" value="{$lng['panel']['yes']}" />&nbsp;<input type="button" class="bottom" value="{$lng['panel']['no']}" onclick="history.back();" /></td>
+				<td class="field_name_border_left" nowrap="nowrap" style="text-align: center;" colspan="2"><input type="submit" class="bottom" name="submitbutton" value="{$lng['panel']['yes']}" />&nbsp;<input type="button" class="bottom" value="{$lng['panel']['no']}" id="yesnobutton" /></td>
 			</tr>
 		</table>
 	</form>
diff --git a/templates/Froxlor/admin/configfiles/wizard.tpl b/templates/Froxlor/admin/configfiles/wizard.tpl
index 62c97b13..b876a2c1 100644
--- a/templates/Froxlor/admin/configfiles/wizard.tpl
+++ b/templates/Froxlor/admin/configfiles/wizard.tpl
@@ -18,15 +18,15 @@ $header
 						<table class="formtable">
 							<tr>
 								<td><b>{$lng['admin']['configfiles']['distribution']}:</b></td>
-								<td><if $distribution != ''><input type="hidden" name="distribution" value="$distribution"/><a href="{$linker->getLink(array('section' => 'configfiles', 'page' => $page))}">{$configfiles[$distribution]['label']}</a><else><select name="distribution" onchange="javascript: window.location.href='{$linker->getLink(array('section' => 'configfiles', 'page' => $page))}&amp;distribution=' + this.options[ this.selectedIndex ].value;"><option value="choose">{$lng['admin']['configfiles']['choosedistribution']}</option>{$distributions_select}</select></if></td>
+								<td><if $distribution != ''><input type="hidden" name="distribution" value="$distribution"/><a href="{$linker->getLink(array('section' => 'configfiles', 'page' => $page))}">{$configfiles[$distribution]['label']}</a><else><select id="config_distribution" name="distribution"><option value="choose">{$lng['admin']['configfiles']['choosedistribution']}</option>{$distributions_select}</select></if></td>
 							</tr>
 							<tr>
 								<td><b>{$lng['admin']['configfiles']['service']}:</b></td>
-								<td><if $service != ''><input type="hidden" name="service" value="$service"/><a href="{$linker->getLink(array('section' => 'configfiles', 'page' => $page, 'distribution' => $distribution))}">{$configfiles[$distribution]['services'][$service]['label']}</a><else><select name="service" onchange="javascript: window.location.href='{$linker->getLink(array('section' => 'configfiles', 'page' => $page, 'distribution' => $distribution))}&amp;service=' + this.options[ this.selectedIndex ].value;"><option value="choose">{$lng['admin']['configfiles']['chooseservice']}</option>{$services_select}</select></if></td>
+								<td><if $service != ''><input type="hidden" name="service" value="$service"/><a href="{$linker->getLink(array('section' => 'configfiles', 'page' => $page, 'distribution' => $distribution))}">{$configfiles[$distribution]['services'][$service]['label']}</a><else><select id="config_service" name="service"><option value="choose">{$lng['admin']['configfiles']['chooseservice']}</option>{$services_select}</select></if></td>
 							</tr>
 							<tr>
 								<td><b>{$lng['admin']['configfiles']['daemon']}:</b></td>
-								<td><select name="daemon" onchange="javascript: window.location.href='{$linker->getLink(array('section' => 'configfiles', 'page' => $page, 'distribution' => $distribution, 'service' => $service))}&amp;daemon=' + this.options[ this.selectedIndex ].value;"><option value="choose">{$lng['admin']['configfiles']['choosedaemon']}</option>{$daemons_select}</select></td>
+								<td><select id="config_daemon" name="daemon"><option value="choose">{$lng['admin']['configfiles']['choosedaemon']}</option>{$daemons_select}</select></td>
 							</tr>
 							<tr>
 								<td><input class="bottom" type="submit" value="{$lng['panel']['next']}" /></td>
diff --git a/templates/Froxlor/js/froxlor.js b/templates/Froxlor/js/froxlor.js
index 043dd94a..03d99fcd 100644
--- a/templates/Froxlor/js/froxlor.js
+++ b/templates/Froxlor/js/froxlor.js
@@ -1,38 +1,54 @@
 $(document).ready(function() {
 	// make rel="external" links open in a new window
-		$("a[rel='external']").attr('target', '_blank');
-		$(".main").css('min-height', $("nav").height() - 34);
-		$(".dboarditem:last").css('min-height', $(".dboarditem:first").height());
+	$("a[rel='external']").attr('target', '_blank');
+	$(".main").css('min-height', $("nav").height() - 34);
+	$(".dboarditem:last").css('min-height', $(".dboarditem:first").height());
 
-		// set focus on username-field if on loginpage
-		if ($(".loginpage").length != 0) {
-			$("#loginname").focus();
-		}
+	// set focus on username-field if on loginpage
+	if ($(".loginpage").length != 0) {
+		$("#loginname").focus();
+	}
 
-		if ($("table.formtable").length != 0) {
-			$("table.formtable tr").hover(function() {
-				$(this).css("background-color", "#fff");
-			}, function() {
-				$(this).css("background-color", "#f5f5f5");
-			});
-		}
-		if ($("table.bradiusodd").leingth != 0) {
-			$("table.bradiusodd tbody tr").not(':last-child').hover(function() {
-				$(this).css("background-color", "#fff");
-			}, function() {
-				$(this).css("background-color", "#f5f5f5");
-			});
-			// last row needs border-radius
-			$("table.bradiusodd tbody tr:last-child").hover(function() {
-				 $(this).children().css("background-color", "#fff");
-				 $(this).children(':first-child').css("-webkit-border-bottom-left-radius", "20px");
-				 $(this).children(':first-child').css("-moz-border-radius-bottomleft", "20px");
-				 $(this).children(':first-child').css("border-bottom-left-radius", "20px");
-			},
-			function() {
-				$(this).children().css("background-color", "#f5f5f5");
-			}
-			);
-		}
+	if ($("table.formtable").length != 0) {
+		$("table.formtable tr").hover(function() {
+			$(this).css("background-color", "#fff");
+		}, function() {
+			$(this).css("background-color", "#f5f5f5");
+		});
+	}
 
+	if ($("table.bradiusodd").length != 0) {
+		$("table.bradiusodd tbody tr").not(':last-child').hover(function() {
+			$(this).css("background-color", "#fff");
+		}, function() {
+			$(this).css("background-color", "#f5f5f5");
+		});
+		// last row needs border-radius
+		$("table.bradiusodd tbody tr:last-child").hover(function() {
+			 $(this).children().css("background-color", "#fff");
+			 $(this).children(':first-child').css("-webkit-border-bottom-left-radius", "20px");
+			 $(this).children(':first-child').css("-moz-border-radius-bottomleft", "20px");
+			 $(this).children(':first-child').css("border-bottom-left-radius", "20px");
+		},
+		function() {
+			$(this).children().css("background-color", "#f5f5f5");
+		}
+		);
+	}
+
+	// Auto-select next field in configfile - wizard
+	$('#config_distribution').change(function (){
+		window.location.href=window.location.href + '&distribution=' + this.options[ this.selectedIndex ].value;
 	});
+	$('#config_service').change(function (){
+		window.location.href=window.location.href + '&service=' + this.options[ this.selectedIndex ].value;
+	});
+	$('#config_daemon').change(function (){
+		window.location.href=window.location.href + '&daemon=' + this.options[ this.selectedIndex ].value;
+	});
+
+	// Back-button
+	$('#yesnobutton').click(function() {
+		history.back();
+	});
+});
diff --git a/templates/Froxlor/misc/question_yesno.tpl b/templates/Froxlor/misc/question_yesno.tpl
index 7b33eee8..74571bd2 100644
--- a/templates/Froxlor/misc/question_yesno.tpl
+++ b/templates/Froxlor/misc/question_yesno.tpl
@@ -10,7 +10,7 @@ $header
 					<input type="hidden" name="send" value="send" />
 					{$hiddenparams}
 					<input type="submit" name="submitbutton" value="{$lng['panel']['yes']}" />&nbsp;
-					<input type="button" class="nobutton" value="{$lng['panel']['no']}" onclick="history.back();" />
+					<input type="button" class="nobutton" value="{$lng['panel']['no']}" id="yesnobutton" />
 				</div>
 			</div>
 		</div>
diff --git a/templates/Froxlor/misc/question_yesno_checkbox.tpl b/templates/Froxlor/misc/question_yesno_checkbox.tpl
index 02ad6c77..1ab0b0b7 100644
--- a/templates/Froxlor/misc/question_yesno_checkbox.tpl
+++ b/templates/Froxlor/misc/question_yesno_checkbox.tpl
@@ -11,7 +11,7 @@ $header
 					<input type="hidden" name="send" value="send" />
 					{$hiddenparams}
 					<input type="submit" name="submitbutton" value="{$lng['panel']['yes']}" />&nbsp;
-					<input type="button" class="nobutton" value="{$lng['panel']['no']}" onclick="history.back();" />
+					<input type="button" class="nobutton" value="{$lng['panel']['no']}" id="yesnobutton" />
 				</div>
 			</div>
 		</div>