From 86595ed8cb5cec19585bd65f83b0af1ae489b0cd Mon Sep 17 00:00:00 2001
From: Timothe Litt <litt@acm.org>
Date: Tue, 14 May 2019 17:21:56 -0400
Subject: [PATCH 1/5] Make statistics tables (in HTML view) togglable

The HTML view of the statistics channel creates
pages with many long tables.  These can be difficult
to navigate.

This commit adds a "show/hide" toggle to each
heading, which makes it easy to compress/expand
the view.
---
 bin/named/bind9.xsl | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/bin/named/bind9.xsl b/bin/named/bind9.xsl
index 00bca86137..79a9a76a50 100644
--- a/bin/named/bind9.xsl
+++ b/bin/named/bind9.xsl
@@ -21,6 +21,8 @@
               var wid=0;
               $('table.zones').each(function(i) { if( $(this).width() > wid ) wid = $(this).width(); return true; });
               $('table.zones').css('min-width', wid );
+              $("h2+table,h3+table,h4+table").prev().append(' <a class="tabletoggle" href="#" style="font-size:small">Show/Hide</a>');
+              $(".tabletoggle").click(function(){ $(this).closest("h2,h3,h4").next().toggleClass("hidden"); return false;});
           });
         </script>
 
@@ -90,6 +92,10 @@
       font-size: 10pt;
      }
 
+     .hidden{
+      display: none;
+     }
+
      .odd{
       background-color: #f0f0f0;
      }

From 34ce90565c0dd860e079ea94d524dcefc5f342d4 Mon Sep 17 00:00:00 2001
From: Mark Andrews <marka@isc.org>
Date: Wed, 15 May 2019 16:46:25 +1000
Subject: [PATCH 2/5] toggle graph/counter pairs

---
 bin/named/bind9.xsl | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/bin/named/bind9.xsl b/bin/named/bind9.xsl
index 79a9a76a50..c2effbd4c5 100644
--- a/bin/named/bind9.xsl
+++ b/bin/named/bind9.xsl
@@ -21,8 +21,11 @@
               var wid=0;
               $('table.zones').each(function(i) { if( $(this).width() > wid ) wid = $(this).width(); return true; });
               $('table.zones').css('min-width', wid );
-              $("h2+table,h3+table,h4+table").prev().append(' <a class="tabletoggle" href="#" style="font-size:small">Show/Hide</a>');
-              $(".tabletoggle").click(function(){ $(this).closest("h2,h3,h4").next().toggleClass("hidden"); return false;});
+              $("h2+table,h3+table,h4+table,h2+div,h3+div").prev().append(' <a class="tabletoggle" href="#" style="font-size:small">Show/Hide</a>');
+              $(".tabletoggle").click(function(){
+	         if ($(this).closest("h2,h3").next().is("div")) { $(this).closest("h2,h3").next().next().toggleClass("hidden"); };
+		 $(this).closest("h2,h3,h4").next().toggleClass("hidden");
+		 return false;});
           });
         </script>
 

From e6c13ebb26042c65415890515f51cdc38f32c6d4 Mon Sep 17 00:00:00 2001
From: Mark Andrews <marka@isc.org>
Date: Wed, 15 May 2019 17:36:18 +1000
Subject: [PATCH 3/5] toggle graph/counter pairs

---
 bin/named/bind9.xsl | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/bin/named/bind9.xsl b/bin/named/bind9.xsl
index c2effbd4c5..98ced34829 100644
--- a/bin/named/bind9.xsl
+++ b/bin/named/bind9.xsl
@@ -23,9 +23,12 @@
               $('table.zones').css('min-width', wid );
               $("h2+table,h3+table,h4+table,h2+div,h3+div").prev().append(' <a class="tabletoggle" href="#" style="font-size:small">Show/Hide</a>');
               $(".tabletoggle").click(function(){
-	         if ($(this).closest("h2,h3").next().is("div")) { $(this).closest("h2,h3").next().next().toggleClass("hidden"); };
-		 $(this).closest("h2,h3,h4").next().toggleClass("hidden");
-		 return false;});
+		 var n = $(this).closest("h2,h3,h4").next();
+		 if (n.is("script")) { n = n.next(); }
+	         if (n.is("div")) { n.toggleClass("hidden"); n = n.next(); }
+		 if (n.is("table")) { n.toggleClass("hidden"); }
+		 return false;
+	      });
           });
         </script>
 
@@ -426,7 +429,7 @@
         <xsl:if test="views/view[count(counters[@type=&quot;resqtype&quot;]/counter) &gt; 0]">
           <h2>Outgoing Queries per view</h2>
           <xsl:for-each select="views/view[count(counters[@type=&quot;resqtype&quot;]/counter) &gt; 0]">
-            <h3>View <xsl:value-of select="@name"/></h3>
+            <h3>View <xsl:value-of select="@name"/> <a class="tabletoggle" href="#" style="font-size:small">Show/Hide</a></h3>
             <xsl:if test="system-property('xsl:vendor')!='Transformiix'">
               <!-- Non Mozilla specific markup -->
               <script type="text/javascript">
@@ -465,7 +468,7 @@
           </xsl:for-each>
         </xsl:if>
         <xsl:if test="server/counters[@type=&quot;nsstat&quot;]/counter[.&gt;0]">
-          <h2>Server Statistics</h2>
+          <h2>Server Statistics <a class="tabletoggle" href="#" style="font-size:small">Show/Hide</a></h2>
           <xsl:if test="system-property('xsl:vendor')!='Transformiix'">
             <!-- Non Mozilla specific markup -->
             <script type="text/javascript">
@@ -501,7 +504,7 @@
         </xsl:if>
         <xsl:if test="server/counters[@type=&quot;zonestat&quot;]/counter[.&gt;0]">
           <xsl:if test="system-property('xsl:vendor')!='Transformiix'">
-            <h2>Zone Maintenance Statistics</h2>
+            <h2>Zone Maintenance Statistics <a class="tabletoggle" href="#" style="font-size:small">Show/Hide</a></h2>
             <script type="text/javascript">
 		  graphs.push({
 				'title' : "Zone Maintenance Stats",

From 570d1cf0bbe8b554d44acc22dfc38b445a1c6877 Mon Sep 17 00:00:00 2001
From: Mark Andrews <marka@isc.org>
Date: Wed, 15 May 2019 18:17:26 +1000
Subject: [PATCH 4/5] use h?+script selectors

---
 bin/named/bind9.xsl | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/bin/named/bind9.xsl b/bin/named/bind9.xsl
index 98ced34829..f36927794f 100644
--- a/bin/named/bind9.xsl
+++ b/bin/named/bind9.xsl
@@ -21,7 +21,7 @@
               var wid=0;
               $('table.zones').each(function(i) { if( $(this).width() > wid ) wid = $(this).width(); return true; });
               $('table.zones').css('min-width', wid );
-              $("h2+table,h3+table,h4+table,h2+div,h3+div").prev().append(' <a class="tabletoggle" href="#" style="font-size:small">Show/Hide</a>');
+              $("h2+table,h3+table,h4+table,h2+div,h3+div,h2+script,h3+script").prev().append(' <a class="tabletoggle" href="#" style="font-size:small">Show/Hide</a>');
               $(".tabletoggle").click(function(){
 		 var n = $(this).closest("h2,h3,h4").next();
 		 if (n.is("script")) { n = n.next(); }
@@ -429,7 +429,7 @@
         <xsl:if test="views/view[count(counters[@type=&quot;resqtype&quot;]/counter) &gt; 0]">
           <h2>Outgoing Queries per view</h2>
           <xsl:for-each select="views/view[count(counters[@type=&quot;resqtype&quot;]/counter) &gt; 0]">
-            <h3>View <xsl:value-of select="@name"/> <a class="tabletoggle" href="#" style="font-size:small">Show/Hide</a></h3>
+            <h3>View <xsl:value-of select="@name"/></h3>
             <xsl:if test="system-property('xsl:vendor')!='Transformiix'">
               <!-- Non Mozilla specific markup -->
               <script type="text/javascript">
@@ -468,7 +468,7 @@
           </xsl:for-each>
         </xsl:if>
         <xsl:if test="server/counters[@type=&quot;nsstat&quot;]/counter[.&gt;0]">
-          <h2>Server Statistics <a class="tabletoggle" href="#" style="font-size:small">Show/Hide</a></h2>
+          <h2>Server Statistics</h2>
           <xsl:if test="system-property('xsl:vendor')!='Transformiix'">
             <!-- Non Mozilla specific markup -->
             <script type="text/javascript">
@@ -504,7 +504,7 @@
         </xsl:if>
         <xsl:if test="server/counters[@type=&quot;zonestat&quot;]/counter[.&gt;0]">
           <xsl:if test="system-property('xsl:vendor')!='Transformiix'">
-            <h2>Zone Maintenance Statistics <a class="tabletoggle" href="#" style="font-size:small">Show/Hide</a></h2>
+            <h2>Zone Maintenance Statistics</h2>
             <script type="text/javascript">
 		  graphs.push({
 				'title' : "Zone Maintenance Stats",

From b8a96bfa78951c5b0781bed58e83976b75cfce68 Mon Sep 17 00:00:00 2001
From: Mark Andrews <marka@isc.org>
Date: Thu, 16 May 2019 11:06:48 +1000
Subject: [PATCH 5/5] add CHANGES

---
 CHANGES | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/CHANGES b/CHANGES
index f359d7477a..17836cffd8 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+5267.	[func]		Allow statistics groups display to be toggleable.
+			[GL #1030]
+
 5266.	[bug]		named-checkconf failed to report dnstap-output
 			missing from named.conf when dnstap was specified.
 			[GL #1136]