Reports:

 toggle "[+]" to "[-]" and back on expanding/collapsing lists
 make the whole header bar clickable

5 files changed, 20 insertions, 14 deletions

diff --git a/reports/site_media/bcfg2.js b/reports/site_media/bcfg2.js
index 962815c32..31254de80 100644
--- a/reports/site_media/bcfg2.js
+++ b/reports/site_media/bcfg2.js
@@ -9,9 +9,15 @@ function clientdetailload() {
   toggleMe('extra_table');
 }
 function toggleMe(elementId) {
-  element = document.getElementById(elementId);
+  var element = document.getElementById(elementId);
   if (element) {
     element.style.display = (element.style.display != 'none' ? 'none' : '');
+    var plusminus = document.getElementById("plusminus_" + elementId);
+    if (element.style.display == 'none') {
+      plusminus.innerHTML = "[+]"
+    } else {
+      plusminus.innerHTML = "[–]"
+    }
   }
 }
 function pageJump(elementId) {
diff --git a/reports/site_media/bcfg2_base.css b/reports/site_media/bcfg2_base.css
index daa6538f1..d8066277c 100644
--- a/reports/site_media/bcfg2_base.css
+++ b/reports/site_media/bcfg2_base.css
@@ -170,6 +170,9 @@ div.entry_list {
 div.entry_list_head {
         padding: 5px;
 }
+div.entry_list_head:hover {
+        cursor: pointer;
+}
 div.entry_list h3 {
         font-size: 100%;
         font-weight: bold;
@@ -194,9 +197,6 @@ td.entry_list_type {
         float: right;
         margin-top: -2px;
 }
-.entry_expand_tab:hover {
-        cursor: pointer;
-}
 
 div.note-box {
 	margin-left: 20px;
diff --git a/src/lib/Server/Reports/reports/templates/clients/detail.html b/src/lib/Server/Reports/reports/templates/clients/detail.html
index efd5f9e00..dd4295f21 100644
--- a/src/lib/Server/Reports/reports/templates/clients/detail.html
+++ b/src/lib/Server/Reports/reports/templates/clients/detail.html
@@ -62,9 +62,9 @@ span.history_links a {
 
   {% if interaction.bad_entry_count %}
   <div class='entry_list'>
-    <div class='entry_list_head dirty-lineitem'>
-      <div class='entry_expand_tab' onclick='javascript:toggleMe("bad_table");'>[+]</div>
+    <div class='entry_list_head dirty-lineitem' onclick='javascript:toggleMe("bad_table");'>
       <h3>Bad Entries &#8212; {{ interaction.bad_entry_count }}</h3>
+      <div class='entry_expand_tab' id='plusminus_bad_table'>[+]</div>
     </div>
     <table id='bad_table' class='entry_list'>
       {% for e in interaction.bad|sortwell %}
@@ -80,9 +80,9 @@ span.history_links a {
 
   {% if interaction.modified_entry_count %}
   <div class='entry_list'>
-    <div class='entry_list_head modified-lineitem'>
-      <div class='entry_expand_tab' onclick='javascript:toggleMe("modified_table");'>[+]</div>
+    <div class='entry_list_head modified-lineitem' onclick='javascript:toggleMe("modified_table");'>
       <h3>Modified Entries &#8212; {{ interaction.modified_entry_count }}</h3>
+      <div class='entry_expand_tab' id='plusminus_modified_table'>[+]</div>
     </div>
     <table id='modified_table' class='entry_list'>
       {% for e in interaction.modified|sortwell %}
@@ -98,9 +98,9 @@ span.history_links a {
 
   {% if interaction.extra_entry_count %}
   <div class='entry_list'>
-    <div class='entry_list_head extra-lineitem'>
-      <div class='entry_expand_tab' onclick='javascript:toggleMe("extra_table");'>[+]</div>
+    <div class='entry_list_head extra-lineitem' onclick='javascript:toggleMe("extra_table");'>
       <h3>Extra Entries &#8212; {{ interaction.extra_entry_count }}</h3>
+      <div class='entry_expand_tab' id='plusminus_extra_table'>[+]</div>
     </div>
     <table id='extra_table' class='entry_list'>
       {% for e in interaction.extra|sortwell %}
diff --git a/src/lib/Server/Reports/reports/templates/config_items/listing.html b/src/lib/Server/Reports/reports/templates/config_items/listing.html
index 572249470..9b1026a08 100644
--- a/src/lib/Server/Reports/reports/templates/config_items/listing.html
+++ b/src/lib/Server/Reports/reports/templates/config_items/listing.html
@@ -13,9 +13,9 @@
   {% for kind, entries in item_list_dict.items %}
 
     <div class='entry_list'>
-      <div class='entry_list_head element_list_head'>
-        <div class='entry_expand_tab' onclick='javascript:toggleMe("table_{{ kind }}");'>[+]</div>
+      <div class='entry_list_head element_list_head' onclick='javascript:toggleMe("table_{{ kind }}");'>
         <h3>{{ kind }} &#8212; {{ entries|length }}</h3>
+        <div class='entry_expand_tab' id='plusminus_table_{{ kind }}'>[&ndash;]</div>
   </div>
 
       <table id='table_{{ kind }}' class='entry_list'>
diff --git a/src/lib/Server/Reports/reports/templates/displays/summary.html b/src/lib/Server/Reports/reports/templates/displays/summary.html
index 0124f635d..b9847cf96 100644
--- a/src/lib/Server/Reports/reports/templates/displays/summary.html
+++ b/src/lib/Server/Reports/reports/templates/displays/summary.html
@@ -22,9 +22,9 @@ hide_tables[{{ forloop.counter0 }}] = "table_{{ summary.name }}";
 {% if summary_data %}
   {% for summary in summary_data  %}
     <div class='entry_list'>
-      <div class='entry_list_head element_list_head'>
-        <div class='entry_expand_tab' onclick='javascript:toggleMe("table_{{ summary.name }}");'>[+]</div>
+      <div class='entry_list_head element_list_head' onclick='javascript:toggleMe("table_{{ summary.name }}");'>
         <h3>{{ summary.nodes|length }} {{ summary.label }}</h3>
+        <div class='entry_expand_tab' id='plusminus_table_{{ summary.name }}'>[+]</div>
       </div>
 
       <table id='table_{{ summary.name }}' class='entry_list'>