From 578f23c8e140cb896b5e1e4c36bdecad2c76ffe7 Mon Sep 17 00:00:00 2001
From: Stefan Schantl <stefan.schantl@ipfire.org>
Date: Sun, 12 Apr 2015 23:18:11 +0200
Subject: [PATCH] ovpnmain.cgi: Fix layout of CA related elements.

Those elements where displayed out of the main box in the past.
---
 html/cgi-bin/ovpnmain.cgi | 69 +++++++++++++++++++++------------------
 1 file changed, 38 insertions(+), 31 deletions(-)

diff --git a/html/cgi-bin/ovpnmain.cgi b/html/cgi-bin/ovpnmain.cgi
index 9550ca6736..3882a77146 100644
--- a/html/cgi-bin/ovpnmain.cgi
+++ b/html/cgi-bin/ovpnmain.cgi
@@ -5549,42 +5549,49 @@ END
     }
 
 	print <<END
-	<hr size='1'>
+
+	<br><hr><br>
+
 	<form method='post' enctype='multipart/form-data'>
-	<table width='100%' border='0'cellspacing='1' cellpadding='0'>
-	<tr>
-		<td class'base'><b>$Lang::tr{'upload ca certificate'}</b></td>
-	</tr>
-	<tr>
-		<td class='base' nowrap='nowrap'>$Lang::tr{'ca name'}:</td>
-		<td nowrap='nowrap'><input type='text' name='CA_NAME' value='$cgiparams{'CA_NAME'}' size='15' align='left'/></td>
-		<td nowrap='nowrap'><input type='file' name='FH' size='25' />
-		<td nowrap='nowrap' align='right'><input type='submit' name='ACTION' value='$Lang::tr{'upload ca certificate'}' /></td>
-	</tr>
+		<table border='0' width='100%'>
+			<tr>
+				<td colspan='4'><b>$Lang::tr{'upload ca certificate'}</b></td>
+			</tr>
 
-	<tr align='right'>
-		<td colspan='4' align='right' width='80%'><input type='submit' name='ACTION' value='$Lang::tr{'show crl'}' /></td>
-	</tr>
+			<tr>
+				<td width='10%'>$Lang::tr{'ca name'}:</td>
+				<td width='30%'><input type='text' name='CA_NAME' value='$cgiparams{'CA_NAME'}' size='15' align='left'></td>
+				<td width='30%'><input type='file' name='FH' size='25'>
+				<td width='30%'align='right'><input type='submit' name='ACTION' value='$Lang::tr{'upload ca certificate'}'></td>
+			</tr>
 
-	<tr><td colspan=4><hr /></td></tr><tr>
-	<tr>
-		<td class'base'><b>$Lang::tr{'ovpn dh parameters'}</b></td>
-	</tr>
+			<tr>
+				<td colspan='3'>&nbsp;</td>
+				<td align='right'><input type='submit' name='ACTION' value='$Lang::tr{'show crl'}' /></td>
+			</tr>
+		</table>
 
-	<tr>
-		<td class='base' nowrap='nowrap'>$Lang::tr{'ovpn dh upload'}:</td>
-		<td nowrap='nowrap'><size='15' align='left'/></td>
-		<td nowrap='nowrap'><input type='file' name='FH' size='25' />
-		<td colspan='4' align='right'><input type='submit' name='ACTION' value='$Lang::tr{'upload dh key'}' /></td>
-	</tr>
-	<tr>
-		<td class='base' nowrap='nowrap'>$Lang::tr{'ovpn dh new key'}:</td>
-		<td nowrap='nowrap'><size='15' align='left'/></td>
-		<td nowrap='nowrap'><input type='submit' name='ACTION' value='$Lang::tr{'generate dh key'}' /></td>
-	</tr>
-	</table>
+		<br>
+
+		<table border='0' width='100%'>
+			<tr>
+				<td colspan='4'><b>$Lang::tr{'ovpn dh parameters'}</b></td>
+			</tr>
+
+			<tr>
+				<td width='40%'>$Lang::tr{'ovpn dh upload'}:</td>
+				<td width='30%'><input type='file' name='FH' size='25'>
+				<td width='30%' align='right'><input type='submit' name='ACTION' value='$Lang::tr{'upload dh key'}'></td>
+			</tr>
+
+			<tr>
+				<td width='40%'>$Lang::tr{'ovpn dh new key'}:</td>
+				<td colspan='2' width='60%' align='right'><input type='submit' name='ACTION' value='$Lang::tr{'generate dh key'}' /></td>
+			</tr>
+		</table>
+	</form>
 	
-	<tr><td colspan=4><hr /></td></tr><tr>
+	<br><hr>
 END
 	;
 
-- 
2.39.5