From bdda1b950d1a9e059d01ff1fba3ac294af0a328a Mon Sep 17 00:00:00 2001
From: cdtank <cdtank@43c2fc9b-1942-4403-87b2-35b4218f7473>
Date: Mon, 24 Jan 2011 16:32:32 +0000
Subject: [PATCH] 1. Added "Clear" buttons per Katy's request in temporal graph
 vis.

---
 productMods/css/visualization/entitycomparison/layout.css  | 4 ++++
 .../entityComparisonGrantsStandaloneActivator.ftl          | 7 ++++---
 .../entityComparisonStandaloneActivator.ftl                | 7 ++++---
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/productMods/css/visualization/entitycomparison/layout.css b/productMods/css/visualization/entitycomparison/layout.css
index 48741d86..cd3e7599 100644
--- a/productMods/css/visualization/entitycomparison/layout.css
+++ b/productMods/css/visualization/entitycomparison/layout.css
@@ -25,6 +25,10 @@ a.temporalGraphLinks {
     text-decoration: none;
 }
 
+a.clear-selected-entities {
+    background-color: #878787;
+}
+
 #paginated-table-footer {
     margin-top: 10px;
     text-align: right;
diff --git a/productMods/templates/freemarker/visualization/entitycomparison/entityComparisonGrantsStandaloneActivator.ftl b/productMods/templates/freemarker/visualization/entitycomparison/entityComparisonGrantsStandaloneActivator.ftl
index 45d3a554..66788718 100644
--- a/productMods/templates/freemarker/visualization/entitycomparison/entityComparisonGrantsStandaloneActivator.ftl
+++ b/productMods/templates/freemarker/visualization/entitycomparison/entityComparisonGrantsStandaloneActivator.ftl
@@ -99,10 +99,10 @@ var organizationLabel = '${organizationLabel}';
         
 
         //click event handler for clear button
-        $("a#clear").click(function(){
+        $("a.clear-selected-entities").click(function(){
             clearRenderedObjects();
         }); 
-
+        
         /*
          * When the intra-entity parameters are clicked,
          * update the status accordingly.   
@@ -307,6 +307,7 @@ var organizationLabel = '${organizationLabel}';
                 <div id="paginatedTable"></div>
                 <div id="paginated-table-footer">
                 <a id="csv" href="${TemporalGraphDownloadFile}" class="temporalGraphLinks">Save as CSV</a>
+                <a class="clear-selected-entities temporalGraphLinks">Clear</a>
                 </div>
             </div>
 <#--        
@@ -331,7 +332,7 @@ var organizationLabel = '${organizationLabel}';
             <p class="displayCounter">You have selected <span id="counter">0</span> of a maximum 
             <span id="total">10</span> <span id="entityleveltext"> schools</span> to compare. 
             <span id="legend-row-header"> 
-            <a id="clear" class="temporalGraphLinks">Clear</a>
+            <a class="clear-selected-entities temporalGraphLinks">Clear</a>
             </span>
             </p>
         
diff --git a/productMods/templates/freemarker/visualization/entitycomparison/entityComparisonStandaloneActivator.ftl b/productMods/templates/freemarker/visualization/entitycomparison/entityComparisonStandaloneActivator.ftl
index 2db6a04c..9fb08cbf 100644
--- a/productMods/templates/freemarker/visualization/entitycomparison/entityComparisonStandaloneActivator.ftl
+++ b/productMods/templates/freemarker/visualization/entitycomparison/entityComparisonStandaloneActivator.ftl
@@ -97,7 +97,7 @@ var organizationLabel = '${organizationLabel}';
         init(graphContainer);
         
         //click event handler for clear button
-        $("a#clear").click(function(){
+        $("a.clear-selected-entities").click(function(){
             clearRenderedObjects();
         }); 
 
@@ -141,7 +141,7 @@ var organizationLabel = '${organizationLabel}';
             }
         });
         
-		//parse the json object and pass it to loadData
+        //parse the json object and pass it to loadData
         jsonObject.prepare(jQuery.parseJSON(jsonString));
            
         function performEntityCheckboxUnselectedActions(entity, checkboxValue, checkbox) {
@@ -304,6 +304,7 @@ var organizationLabel = '${organizationLabel}';
                 <div id="paginatedTable"></div>
                 <div id="paginated-table-footer">
                 <a id="csv" href="${TemporalGraphDownloadFile}" class="temporalGraphLinks">Save as CSV</a>
+                <a class="clear-selected-entities temporalGraphLinks">Clear</a>
                 </div>
             </div>
 <#--        
@@ -328,7 +329,7 @@ var organizationLabel = '${organizationLabel}';
             <p class="displayCounter">You have selected <span id="counter">0</span> of a maximum 
             <span id="total">10</span> <span id="entityleveltext"> schools</span> to compare.
             <span id="legend-row-header"> 
-            <a id="clear" class="temporalGraphLinks">Clear</a>
+            <a class="clear-selected-entities temporalGraphLinks">Clear</a>
             </span>
             </p>