From: git@ipfire.org
To: ipfire-scm@lists.ipfire.org
Subject: [git.ipfire.org] IPFire 2.x development tree branch, next, updated. dc127e0faab368273aca09a57cc79f8186547189
Date: Sun, 19 Apr 2015 01:24:12 +0200 [thread overview]
Message-ID: <20150418232412.5B13421EA6@argus.ipfire.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 6400 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 dc127e0faab368273aca09a57cc79f8186547189 (commit)
via c98b743c09cac78a865ca8ef102dacf69a5004da (commit)
via f51bc66149e561868041407d4e3e447d2c84ea7b (commit)
from fb245d5ec12977d91670dc04590758a4e173dfed (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 dc127e0faab368273aca09a57cc79f8186547189
Author: Stefan Schantl <stefan.schantl(a)ipfire.org>
Date: Sun Apr 19 01:23:18 2015 +0200
Core 90: Add changed css files.
commit c98b743c09cac78a865ca8ef102dacf69a5004da
Author: Stefan Schantl <stefan.schantl(a)ipfire.org>
Date: Sun Apr 19 01:04:14 2015 +0200
firewall.cgi: Dynamically show/hide DNAT and SNAT configure elements.
Fixes #10732.
commit f51bc66149e561868041407d4e3e447d2c84ea7b
Author: Stefan Schantl <stefan.schantl(a)ipfire.org>
Date: Sun Apr 19 01:15:02 2015 +0200
Core 90: Add changed ovpnmain.cgi.
-----------------------------------------------------------------------
Summary of changes:
config/rootfiles/core/90/filelists/files | 5 +++++
html/cgi-bin/firewall.cgi | 23 ++++++++++++++++++-----
html/html/themes/darkdos/include/style.css | 4 ++++
html/html/themes/ipfire-legacy/include/style.css | 4 ++++
html/html/themes/ipfire/include/css/style.css | 4 ++++
html/html/themes/maniac/include/style.css | 4 ++++
6 files changed, 39 insertions(+), 5 deletions(-)
Difference in files:
diff --git a/config/rootfiles/core/90/filelists/files b/config/rootfiles/core/90/filelists/files
index 63e7220..d346264 100644
--- a/config/rootfiles/core/90/filelists/files
+++ b/config/rootfiles/core/90/filelists/files
@@ -7,7 +7,12 @@ etc/rc.d/rcsysinit.d/S90network-trigger
srv/web/ipfire/cgi-bin/firewall.cgi
srv/web/ipfire/cgi-bin/fwhosts.cgi
srv/web/ipfire/cgi-bin/geoip-block.cgi
+srv/web/ipfire/cgi-bin/ovpnmain.cgi
srv/web/ipfire/cgi-bin/vpnmain.cgi
+srv/web/ipfire/html/themes/darkdos/include/style.css
+srv/web/ipfire/html/themes/ipfire-legacy/include/style.css
+srv/web/ipfire/html/themes/ipfire/include/css/style.css
+srv/web/ipfire/html/themes/maniac/include/style.css
usr/lib/firewall/firewall-lib.pl
usr/lib/firewall/rules.pl
usr/local/bin/xt_geoip_build
diff --git a/html/cgi-bin/firewall.cgi b/html/cgi-bin/firewall.cgi
index 3e1b336..c207ec7 100644
--- a/html/cgi-bin/firewall.cgi
+++ b/html/cgi-bin/firewall.cgi
@@ -157,6 +157,19 @@ print<<END;
\$("#actions").toggle();
});
+ // Hide SNAT items when DNAT is selected and vice versa.
+ if (\$('input[name=nat]:checked').val() == 'dnat') {
+ \$('.snat').hide();
+ } else {
+ \$('.dnat').hide();
+ }
+
+ // Show/Hide elements when SNAT/DNAT get changed.
+ \$('input[name=nat]').change(function() {
+ \$('.snat').toggle();
+ \$('.dnat').toggle();
+ });
+
// Time constraints
if(!\$("#USE_TIME_CONSTRAINTS").attr("checked")) {
\$("#TIME_CONSTRAINTS").hide();
@@ -1643,7 +1656,7 @@ END
$Lang::tr{'fwdfw use nat'}
</label>
<div class="NAT">
- <table width='100%' border='0'>
+ <table class='fw-nat' width='100%' border='0'>
<tr>
<td width='5%'></td>
<td width='40%'>
@@ -1655,9 +1668,9 @@ END
END
print <<END;
- <td width='25%' align='right'>$Lang::tr{'dnat address'}:</td>
+ <td width='25%' align='right'><span class='dnat'>$Lang::tr{'dnat address'}:</span></td>
<td width='30%'>
- <select name='dnat' style='width: 100%;'>
+ <select name='dnat' class='dnat' style='width: 100%;'>
<option value='AUTO' $selected{'dnat'}{'AUTO'}>- $Lang::tr{'automatic'} -</option>
<option value='Default IP' $selected{'dnat'}{'Default IP'}>$Lang::tr{'red1'} ($redip)</option>
END
@@ -1688,9 +1701,9 @@ END
$Lang::tr{'fwdfw snat'}
</label>
</td>
- <td width='25%' align='right'>$Lang::tr{'snat new source ip address'}:</td>
+ <td width='25%' align='right'><span class='snat'>$Lang::tr{'snat new source ip address'}:</span></td>
<td width='30%'>
- <select name='snat' style='width: 100%;'>
+ <select name='snat' class='snat' style='width: 100%;'>
END
foreach my $alias (sort keys %aliases) {
diff --git a/html/html/themes/darkdos/include/style.css b/html/html/themes/darkdos/include/style.css
index e7140cd..cc4b3c9 100644
--- a/html/html/themes/darkdos/include/style.css
+++ b/html/html/themes/darkdos/include/style.css
@@ -366,6 +366,10 @@ min-width: 2.0em;
max-width: 2.5em;
}
+table.fw-nat tbody tr td {
+ height: 2.25em;
+}
+
/* LAYOUT - 3 COLUMNS */
/* Primary content */
diff --git a/html/html/themes/ipfire-legacy/include/style.css b/html/html/themes/ipfire-legacy/include/style.css
index d2c458e..288a0fe 100644
--- a/html/html/themes/ipfire-legacy/include/style.css
+++ b/html/html/themes/ipfire-legacy/include/style.css
@@ -343,6 +343,10 @@ min-width: 2.0em;
max-width: 2.5em;
}
+table.fw-nat tbody tr td {
+ height: 2.25em;
+}
+
/* LAYOUT - 3 COLUMNS */
/* Primary content */
diff --git a/html/html/themes/ipfire/include/css/style.css b/html/html/themes/ipfire/include/css/style.css
index 0e990d6..e0ac3cd 100644
--- a/html/html/themes/ipfire/include/css/style.css
+++ b/html/html/themes/ipfire/include/css/style.css
@@ -324,3 +324,7 @@ table {
.tbl tr:last-child td {
border-bottom: 1px solid lightgrey;
}
+
+table.fw-nat tbody tr td {
+ height: 2.25em;
+}
diff --git a/html/html/themes/maniac/include/style.css b/html/html/themes/maniac/include/style.css
index eca34cb..3cb2741 100644
--- a/html/html/themes/maniac/include/style.css
+++ b/html/html/themes/maniac/include/style.css
@@ -372,6 +372,10 @@ min-width: 2.0em;
max-width: 2.5em;
}
+table.fw-nat tbody tr td {
+ height: 2.25em;
+}
+
/* LAYOUT - 3 COLUMNS */
/* Primary content */
hooks/post-receive
--
IPFire 2.x development tree
reply other threads:[~2015-04-18 23:24 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20150418232412.5B13421EA6@argus.ipfire.org \
--to=git@ipfire.org \
--cc=ipfire-scm@lists.ipfire.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox