From 52717466fbcc0f25c22c05dbdfaf0aba64a6b5dd Mon Sep 17 00:00:00 2001
From: Meik Sievertsen <acydburn@phpbb.com>
Date: Sun, 26 Nov 2006 12:22:56 +0000
Subject: some tiny changes

git-svn-id: file:///svn/phpbb/trunk@6656 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 phpBB/adm/style/install_update.html | 51 ++++++++++++++++++++++---------------
 1 file changed, 30 insertions(+), 21 deletions(-)

(limited to 'phpBB/adm/style/install_update.html')

diff --git a/phpBB/adm/style/install_update.html b/phpBB/adm/style/install_update.html
index e19c8ca332..5cdf2eeea0 100644
--- a/phpBB/adm/style/install_update.html
+++ b/phpBB/adm/style/install_update.html
@@ -1,5 +1,15 @@
 <!-- INCLUDE install_header.html -->
 
+<script type="text/javascript">
+<!--
+function popup(url, width, height)
+{
+	window.open(url.replace(/&amp;/g, '&'), '_popup', 'height=' + height + ',resizable=yes,scrollbars=yes,width=' + width);
+	return false;
+}
+//-->
+</script>
+
 <!-- IF S_ERROR -->
 	<h1>{L_NOTICE}</h1>
 	<p style="color: red;">{ERROR_MSG}</p>
@@ -110,9 +120,6 @@
 
 				<p>{files.EXPLAIN}</p>
 
-				<!--table cellspacing="1">
-					<col class="row1" /><col class="row2" /><col class="row2" />
-				<tbody -->
 				<fieldset>
 					<legend><img src="{T_IMAGE_PATH}file_{files.STATUS}.gif" alt="{files.L_STATUS}" /></legend>
 			<!-- ELSE -->
@@ -129,7 +136,7 @@
 							<br /><span>{L_NUM_CONFLICTS}: {files.NUM_CONFLICTS}</span>
 							<!-- ENDIF -->
 						</dt>
-						<dd>[ <a href="{files.U_SHOW_DIFF}" onclick="popup({files.UA_SHOW_DIFF}, 700, 500);">{files.L_SHOW_DIFF}</a> ]</dd>
+						<dd>[ <a href="{files.U_SHOW_DIFF}" onclick="popup('{files.U_SHOW_DIFF}', 700, 500); return false;">{files.L_SHOW_DIFF}</a> ]</dd>
 						<!-- IF files.S_CUSTOM -->
 							<dd><input type="checkbox" name="no_update[]" value="{files.FILENAME}" class="radio" />&nbsp; {L_DO_NOT_UPDATE}</dd>
 						<!-- ENDIF -->
@@ -185,6 +192,25 @@
 
 	<p>{L_DOWNLOAD_UPDATE_METHOD_EXPLAIN}</p>
 
+	<form id="install_update" method="post" action="{U_ACTION}">
+
+	<fieldset>
+		<legend>{L_DOWNLOAD_AS}</legend>
+	<dl>
+		<dt><label for="use_method">{L_DOWNLOAD_AS}:</label></dt>
+		<dd>{RADIO_BUTTONS}</dd>
+	</dl>
+	</fieldset>
+
+	<fieldset class="submit-buttons">
+		{S_HIDDEN_FIELDS}
+		<input type="submit" class="button2" value="{L_CHECK_FILES_AGAIN}" name="check_again" />&nbsp; &nbsp;<input type="submit" class="button1" value="{L_DOWNLOAD}" name="download" />
+	</fieldset>
+
+	</form>
+
+	<br /><br />
+
 	<p>{L_MAPPING_FILE_STRUCTURE}</p>
 
 	<table cellspacing="1">
@@ -207,23 +233,6 @@
 	</tbody>
 	</table>
 
-	<form id="install_update" method="post" action="{U_ACTION}">
-
-	<fieldset>
-		<legend>{L_DOWNLOAD_AS}</legend>
-	<dl>
-		<dt><label for="use_method">{L_DOWNLOAD_AS}:</label></dt>
-		<dd>{RADIO_BUTTONS}</dd>
-	</dl>
-	</fieldset>
-
-	<fieldset class="submit-buttons">
-		{S_HIDDEN_FIELDS}
-		<input type="submit" class="button2" value="{L_CHECK_FILES_AGAIN}" name="check_again" />&nbsp; &nbsp;<input type="submit" class="button1" value="{L_DOWNLOAD}" name="download" />
-	</fieldset>
-
-	</form>
-
 <!-- ELSEIF S_FTP_UPLOAD -->
 
 	<h1>{L_SELECT_FTP_SETTINGS}</h1>
-- 
cgit v1.2.1