From: Stefan Schantl <stefan.schantl@ipfire.org>
Date: Wed, 30 Jan 2019 09:53:17 +0000 (+0100)
Subject: ids.cgi: Dynamically generate SHOW/HIDE for expanding or collapsing a ruleset category
X-Git-Tag: v2.23-core131~117^2~85
X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=commitdiff_plain;h=e0cec9fe99c957a686182f6002185744edd8254d

ids.cgi: Dynamically generate SHOW/HIDE for expanding or collapsing a ruleset category

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
---

diff --git a/html/cgi-bin/ids.cgi b/html/cgi-bin/ids.cgi
index 604d216c89..ba2136b2f9 100644
--- a/html/cgi-bin/ids.cgi
+++ b/html/cgi-bin/ids.cgi
@@ -644,8 +644,13 @@ $selected{'AUTOUPDATE_INTERVAL'}{$rulessettings{'AUTOUPDATE_INTERVAL'}} = "selec
 &Header::openpage($Lang::tr{'intrusion detection system'}, 1, '');
 
 ### Java Script ###
+print"<script>\n";
+
+# Java script variable declaration for show and hide.
+print"var show = \"$Lang::tr{'ids show'}\"\;\n";
+print"var hide = \"$Lang::tr{'ids hide'}\"\;\n";
+
 print <<END
-<script>
 	// JQuery function to show/hide the text input field for
 	// Oinkcode/Subscription code.
 	\$(function() {
@@ -666,6 +671,15 @@ print <<END
 	// of a given category.
 	function showhide(tblname) {
 		\$("#" + tblname).toggle();
+
+		// Get current content of the span element.
+		var content = document.getElementById("span_" + tblname);
+
+		if (content.innerHTML === show) {
+			content.innerHTML = hide;
+		} else {
+			content.innerHTML = show;
+		}
 	}
 </script>
 END
@@ -1043,7 +1057,7 @@ if (%idsrules) {
 			print"</td>\n";
 			print"<td class='base' width='90%'><b>$rulefile</b></td>\n";
 			print"<td class='base' width='5%' align='right'>\n";
-			print"<a href=\"javascript:showhide('$categoryname')\">SHOW</a>\n";
+			print"<a href=\"javascript:showhide('$categoryname')\"><span id='span_$categoryname'>$Lang::tr{'ids show'}</span></a>\n";
 			print"</td>\n";
 			print"</tr>\n";
 
diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl
index 5a7d3af03d..445473813a 100644
--- a/langs/en/cgi-bin/en.pl
+++ b/langs/en/cgi-bin/en.pl
@@ -1358,6 +1358,7 @@
 'ids automatic rules update' => 'Automatic rules update',
 'ids traffic analyze' => 'Traffic analyzing',
 'ids active on' => 'Active on',
+'ids hide' => 'Hide',
 'ids log viewer' => 'IDS log viewer',
 'ids logs' => 'IDS Logs',
 'ids monitored interfaces' => 'Monitored interfaces',
@@ -1371,6 +1372,7 @@
 'ids rules license2' => 'Acknowledge the license, activate your account by visiting the url you got via mail. Then go to',
 'ids rules license3' => 'press the "Generate code"-button and copy the 40 character Oinkcode into the field below.',
 'ids rules update' => 'IDS rules',
+'ids show' => 'Show',
 'iface' => 'Iface',
 'ignore filter' => 'Ignore filter',
 'ike encryption' => 'IKE Encryption:',