[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 43be529d2db475a5e8ffc698c908d778cf8fcdae

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 43be529d2db475a5e8ffc698c908d778cf8fcdae

[Arne Fitzenreiter]

[-- Attachment #1: Type: text/plain, Size: 3187 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  43be529d2db475a5e8ffc698c908d778cf8fcdae (commit)
       via  7f44ec0478285bc16c5ff9336f604a0e45678130 (commit)
      from  ece63aa950fe56591a6b5ee9ffd3d6763bd92350 (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 43be529d2db475a5e8ffc698c908d778cf8fcdae
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date:   Thu Sep 12 10:20:45 2019 +0000

    core136: ship updated zoneconf.cgi
    
    Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>

commit 7f44ec0478285bc16c5ff9336f604a0e45678130
Author: Alex Koch <ipfire(a)starkstromkonsument.de>
Date:   Mon Sep 2 00:47:29 2019 +0200

    zoneconf: reduce the width of inputs for vlanid
    
    The inputs for the vlanids are overlapping the borders of their cells (using a recent Firefox on Linux Mint, Android or Windows 7). This patch fixes this by limiting the width to a fixed value.
    
    Signed-off-by: Alex Koch <ipfire(a)starkstromkonsument.de>
    Signed-off-by: Alex Koch <ipfire(a)starkstromkonsument.de>
    Acked-by: Michael Tremer <michael.tremer(a)ipfire.org>
    Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>

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

Summary of changes:
 config/rootfiles/core/136/filelists/files | 1 +
 html/cgi-bin/zoneconf.cgi                 | 6 +++++-
 2 files changed, 6 insertions(+), 1 deletion(-)

Difference in files:
diff --git a/config/rootfiles/core/136/filelists/files b/config/rootfiles/core/136/filelists/files
index a2947a7da..a9f4fdd4c 100644
--- a/config/rootfiles/core/136/filelists/files
+++ b/config/rootfiles/core/136/filelists/files
@@ -5,3 +5,4 @@ var/ipfire/langs
 etc/rc.d/init.d/firewall
 usr/local/bin/xt_geoip_update
 srv/web/ipfire/cgi-bin/logs.cgi/log.dat
+srv/web/ipfire/cgi-bin/zoneconf.cgi
diff --git a/html/cgi-bin/zoneconf.cgi b/html/cgi-bin/zoneconf.cgi
index 40239c14e..6b8642818 100644
--- a/html/cgi-bin/zoneconf.cgi
+++ b/html/cgi-bin/zoneconf.cgi
@@ -93,6 +93,10 @@ my $css = <<END
 		text-align: center;
 	}
 
+	input.vlanid {
+		width: 4em;
+	}
+
 	#submit-container {
 		width: 100%;
 		padding-top: 20px;
@@ -432,7 +436,7 @@ foreach (@nics) {
 					<option value="NATIVE" $access_selected{"NATIVE"}>$Lang::tr{"zoneconf access native"}</option>
 					<option value="VLAN" $access_selected{"VLAN"} $vlan_disabled>$Lang::tr{"zoneconf access vlan"}</option>
 				</select>
-				<input type="number" id="TAG $uc $mac" name="TAG $uc $mac" min="1" max="4095" value="$zone_vlan_id" $field_disabled>
+				<input type="number" class="vlanid" id="TAG $uc $mac" name="TAG $uc $mac" min="1" max="4095" value="$zone_vlan_id" $field_disabled>
 			</td>
 END
 ;


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