This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".

The branch, next has been updated
       via  ad50a299c8717ffdd3a0ec02b0db40888f5d9e73 (commit)
       via  578f23c8e140cb896b5e1e4c36bdecad2c76ffe7 (commit)
      from  d4ee6f08135135d7abac777a63fdadccda156052 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit ad50a299c8717ffdd3a0ec02b0db40888f5d9e73
Merge: 578f23c d4ee6f0
Author: Stefan Schantl <stefan.schantl(a)ipfire.org>
Date:   Sun Apr 12 23:23:40 2015 +0200

    Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next

commit 578f23c8e140cb896b5e1e4c36bdecad2c76ffe7
Author: Stefan Schantl <stefan.schantl(a)ipfire.org>
Date:   Sun Apr 12 23:18:11 2015 +0200

    ovpnmain.cgi: Fix layout of CA related elements.
    
    Those elements where displayed out of the main box in the past.

-----------------------------------------------------------------------

Summary of changes:
 html/cgi-bin/ovpnmain.cgi | 69 ++++++++++++++++++++++++++---------------------
 1 file changed, 38 insertions(+), 31 deletions(-)

Difference in files:
diff --git a/html/cgi-bin/ovpnmain.cgi b/html/cgi-bin/ovpnmain.cgi
index 7ca62de..d36a49e 100644
--- a/html/cgi-bin/ovpnmain.cgi
+++ b/html/cgi-bin/ovpnmain.cgi
@@ -5541,42 +5541,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
 	;
 


hooks/post-receive
--
IPFire 2.x development tree