[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 9ea9c5354824324fd31be12873c2eb7287d39fea

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 9ea9c5354824324fd31be12873c2eb7287d39fea

[Michael Tremer]

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: text/plain, Size: 5336 bytes --]

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  9ea9c5354824324fd31be12873c2eb7287d39fea (commit)
       via  ab2d665ad11fea6805f7241841b5776ab87b60d5 (commit)
       via  e43ff75dad4863619149c2bdd5d34e6d69b34676 (commit)
       via  50b4c402226cda390832d3124a2a46187cc635c3 (commit)
      from  9802d453f0f9c1d691d775c67abbc3b0952f1e5f (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 9ea9c5354824324fd31be12873c2eb7287d39fea
Author: Michael Tremer <michael.tremer@ipfire.org>
Date:   Wed Mar 12 10:07:40 2025 +0000

    Update contributors
    
    Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

commit ab2d665ad11fea6805f7241841b5776ab87b60d5
Author: Michael Tremer <michael.tremer@ipfire.org>
Date:   Wed Mar 12 10:06:54 2025 +0000

    core193: Actually ship the firmware files
    
    I put the file into the wrong directory.
    
    Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

commit e43ff75dad4863619149c2bdd5d34e6d69b34676
Author: Michael Tremer <michael.tremer@ipfire.org>
Date:   Wed Mar 12 10:06:13 2025 +0000

    core193: Ship fwhosts.cgi
    
    Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

commit 50b4c402226cda390832d3124a2a46187cc635c3
Author: Stephen Cuka <stephen@firemypi.org>
Date:   Thu Feb 27 16:34:16 2025 -0700

    fwhosts.cgi: Add button spacing on 'Firewall/Firewall Groups' page.
    
    Add spacing between showmenu() buttons on Firewall/Firewall Groups page to improve the look of the page.
    
    No changes to the functions of the page.
    
    Signed-off-by: Stephen Cuka <stephen@firemypi.org>
    Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

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

Summary of changes:
 config/rootfiles/core/193/filelists/files          |  1 +
 .../core/193/{ => filelists}/linux-firmware        |  0
 html/cgi-bin/credits.cgi                           |  2 ++
 html/cgi-bin/fwhosts.cgi                           | 27 ++++++++++++++++++----
 4 files changed, 26 insertions(+), 4 deletions(-)
 rename config/rootfiles/core/193/{ => filelists}/linux-firmware (100%)

Difference in files:
diff --git a/config/rootfiles/core/193/filelists/files b/config/rootfiles/core/193/filelists/files
index e3f78329e..ada775c14 100644
--- a/config/rootfiles/core/193/filelists/files
+++ b/config/rootfiles/core/193/filelists/files
@@ -1,3 +1,4 @@
+srv/web/ipfire/cgi-bin/fwhosts.cgi
 srv/web/ipfire/cgi-bin/logs.cgi/firewalllog.dat
 srv/web/ipfire/cgi-bin/vpnmain.cgi
 var/ipfire/backup/exclude
diff --git a/config/rootfiles/core/193/linux-firmware b/config/rootfiles/core/193/filelists/linux-firmware
similarity index 100%
rename from config/rootfiles/core/193/linux-firmware
rename to config/rootfiles/core/193/filelists/linux-firmware
diff --git a/html/cgi-bin/credits.cgi b/html/cgi-bin/credits.cgi
index c28b0557e..b13771fe4 100644
--- a/html/cgi-bin/credits.cgi
+++ b/html/cgi-bin/credits.cgi
@@ -139,6 +139,7 @@ Julian McConnell,
 Kay-Michael Köhler,
 Kim Wölfel,
 Logan Schmidt,
+Luca Trevisani,
 Ludwig Ertl,
 Markus Untersee,
 Nico Prenzel,
@@ -149,6 +150,7 @@ Robert Möker,
 Stefan Ernst,
 Stefan Ferstl,
 Steffen Klammer,
+Stephen Cuka,
 Thomas Cekal,
 Thomas Ebert,
 Timmothy Wilson,
diff --git a/html/cgi-bin/fwhosts.cgi b/html/cgi-bin/fwhosts.cgi
index d6be6c40e..d29940b8d 100644
--- a/html/cgi-bin/fwhosts.cgi
+++ b/html/cgi-bin/fwhosts.cgi
@@ -1320,10 +1320,29 @@ sub showmenu {
 	&Header::openbox('100%', 'left',);
 	print "$Lang::tr{'fwhost welcome'}";
 	print<<END;
-	<br><br><table border='0' width='100%'>
-	<tr><td><form method='post'><input type='submit' name='ACTION' value='$Lang::tr{'fwhost newnet'}' ><input type='submit' name='ACTION' value='$Lang::tr{'fwhost newhost'}' ><input type='submit' name='ACTION' value='$Lang::tr{'fwhost newgrp'}' ><input type='submit' name='ACTION' value='$Lang::tr{'fwhost newlocationgrp'}' ></form></td>
-	<td align='right'><form method='post'><input type='submit' name='ACTION' value='$Lang::tr{'fwhost newservice'}' ><input type='submit' name='ACTION' value='$Lang::tr{'fwhost newservicegrp'}' ></form></td></tr>
-	<tr><td colspan='6'></td></tr></table>
+	<br><br>
+	<table border='0' width='100%'>
+		<tr>
+			<td>
+			<form method='post'>
+			<input type='submit' name='ACTION' value='$Lang::tr{'fwhost newnet'}'>
+			<input type='submit' name='ACTION' value='$Lang::tr{'fwhost newhost'}'>
+			<input type='submit' name='ACTION' value='$Lang::tr{'fwhost newgrp'}'>
+			<input type='submit' name='ACTION' value='$Lang::tr{'fwhost newlocationgrp'}'>
+			</form>
+			</td>
+			<td align='right'>
+			<form method='post'>
+			<input type='submit' name='ACTION' value='$Lang::tr{'fwhost newservice'}'>
+			<input type='submit' name='ACTION' value='$Lang::tr{'fwhost newservicegrp'}'>
+			</form>
+			</td>
+		</tr>
+		<tr>
+			<td colspan='6'>
+			</td>
+		</tr>
+	</table>
 END
 	&Header::closebox();
 


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