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

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

[Michael Tremer]

[-- Attachment #1: Type: text/plain, Size: 3418 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  2c44da1382dfffb311b15250b9e02784b826dff2 (commit)
       via  0d34a479c878cd775e541601b2a72238eb3f7546 (commit)
      from  d51d3c5b93886a66b75388d029e35eb07d9b06eb (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 2c44da1382dfffb311b15250b9e02784b826dff2
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Thu Apr 11 10:29:56 2019 +0100

    core131: Ship updated setup
    
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

commit 0d34a479c878cd775e541601b2a72238eb3f7546
Author: Stefan Schantl <stefan.schantl(a)ipfire.org>
Date:   Fri Apr 12 18:21:01 2019 +0200

    ids.cgi: Display oinkcode section after page load when neccessary.
    
    Fixes #12048.
    
    Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org>
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

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

Summary of changes:
 .../{oldcore/119 => core/131}/filelists/setup      |  0
 html/cgi-bin/ids.cgi                               | 32 +++++++++++++---------
 2 files changed, 19 insertions(+), 13 deletions(-)
 copy config/rootfiles/{oldcore/119 => core/131}/filelists/setup (100%)

Difference in files:
diff --git a/config/rootfiles/core/131/filelists/setup b/config/rootfiles/core/131/filelists/setup
new file mode 120000
index 000000000..209374bbc
--- /dev/null
+++ b/config/rootfiles/core/131/filelists/setup
@@ -0,0 +1 @@
+../../../common/setup
\ No newline at end of file
diff --git a/html/cgi-bin/ids.cgi b/html/cgi-bin/ids.cgi
index 98c6f57b4..00db6a0c3 100644
--- a/html/cgi-bin/ids.cgi
+++ b/html/cgi-bin/ids.cgi
@@ -689,20 +689,26 @@ print"var show = \"$Lang::tr{'ids show'}\"\;\n";
 print"var hide = \"$Lang::tr{'ids hide'}\"\;\n";
 
 print <<END
-	// JQuery function to show/hide the text input field for
+	// Java Script function to show/hide the text input field for
 	// Oinkcode/Subscription code.
-	\$(function() {
-		\$('#RULES').change(function(){
-			if(\$('#RULES').val() == 'registered') {
-				\$('#code').show();
-			} else if(\$('#RULES').val() == 'subscripted') {
-				\$('#code').show();
-			} else if(\$('#RULES').val() == 'emerging_pro') {
-				\$('#code').show();
-			} else {
-				\$('#code').hide();
-			}
-		});
+	var update_code = function() {
+		if(\$('#RULES').val() == 'registered') {
+			\$('#code').show();
+		} else if(\$('#RULES').val() == 'subscripted') {
+			\$('#code').show();
+		} else if(\$('#RULES').val() == 'emerging_pro') {
+			\$('#code').show();
+		} else {
+			\$('#code').hide();
+		}
+	};
+
+	// JQuery function to call corresponding function when
+	// the ruleset is changed or the page is loaded for showing/hiding
+	// the code area.
+	\$(document).ready(function() {
+		\$('#RULES').change(update_code);
+		update_code();
 	});
 
 	// Tiny java script function to show/hide the rules


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