From fa2f4be08784360bd26431527fe25142a576a2a4 Mon Sep 17 00:00:00 2001
From: cdtank <cdtank@43c2fc9b-1942-4403-87b2-35b4218f7473>
Date: Thu, 20 Jan 2011 00:18:51 +0000
Subject: [PATCH] 1. Fixed a design bug for IE where the y-axis legen did not
 get the padding-top. 2. Reflected the changes for publication version of
 temporal-graphs into grants version.

---
 .../visualization/entitycomparison/layout.css    |  2 +-
 ...entityComparisonGrantsStandaloneActivator.ftl | 16 ++++++----------
 .../entityComparisonStandaloneActivator.ftl      |  8 ++------
 3 files changed, 9 insertions(+), 17 deletions(-)

diff --git a/productMods/css/visualization/entitycomparison/layout.css b/productMods/css/visualization/entitycomparison/layout.css
index a48a85cb..48741d86 100644
--- a/productMods/css/visualization/entitycomparison/layout.css
+++ b/productMods/css/visualization/entitycomparison/layout.css
@@ -48,7 +48,7 @@ a.temporalGraphLinks {
     display: block;
     height: 150px;
     text-align: center;
-    padding-top: 50px;
+    margin-top: 50px;
     position: absolute !important;
 }
 
diff --git a/productMods/templates/freemarker/visualization/entitycomparison/entityComparisonGrantsStandaloneActivator.ftl b/productMods/templates/freemarker/visualization/entitycomparison/entityComparisonGrantsStandaloneActivator.ftl
index e997ace9..45d3a554 100644
--- a/productMods/templates/freemarker/visualization/entitycomparison/entityComparisonGrantsStandaloneActivator.ftl
+++ b/productMods/templates/freemarker/visualization/entitycomparison/entityComparisonGrantsStandaloneActivator.ftl
@@ -200,14 +200,6 @@ var organizationLabel = '${organizationLabel}';
             prepareTableForDataTablePagination(jsonData);
             setEntityLevel();
         
-                    /*
-                        calcMinandMaxYears(labelToEntityRecord, year);
-                        yearRange = (year.max - year.min);
-        
-                        setLineWidthAndTickSize(yearRange, FlotOptions);     
-                        setTickSizeOfYAxis(calcMaxOfComparisonParameter(labelToEntityRecord), FlotOptions);
-                    */
-        
             $(".disabled-checkbox-event-receiver").live("click", function () {
         
                 if ($(this).next().is(':disabled')) {
@@ -313,8 +305,9 @@ var organizationLabel = '${organizationLabel}';
                 </div>
                 <h3>Who do you want to compare?</h3>
                 <div id="paginatedTable"></div>
-                <br />
+                <div id="paginated-table-footer">
                 <a id="csv" href="${TemporalGraphDownloadFile}" class="temporalGraphLinks">Save as CSV</a>
+                </div>
             </div>
 <#--        
             <div id = "stopwordsdiv">
@@ -337,7 +330,10 @@ var organizationLabel = '${organizationLabel}';
                 <h3><span id="comparisonParameter"></span></h3>
             <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. 
-            <a id="clear" class="temporalGraphLinks">Clear</a></p>
+            <span id="legend-row-header"> 
+            <a id="clear" class="temporalGraphLinks">Clear</a>
+            </span>
+            </p>
         
             </div>
         </div>      
diff --git a/productMods/templates/freemarker/visualization/entitycomparison/entityComparisonStandaloneActivator.ftl b/productMods/templates/freemarker/visualization/entitycomparison/entityComparisonStandaloneActivator.ftl
index 1110b92e..2db6a04c 100644
--- a/productMods/templates/freemarker/visualization/entitycomparison/entityComparisonStandaloneActivator.ftl
+++ b/productMods/templates/freemarker/visualization/entitycomparison/entityComparisonStandaloneActivator.ftl
@@ -141,13 +141,9 @@ var organizationLabel = '${organizationLabel}';
             }
         });
         
-        //console.log("parse jaon", jQuery.parseJSON(jsonString));
-                            
-        //parse the json object and pass it to loadData
+		//parse the json object and pass it to loadData
         jsonObject.prepare(jQuery.parseJSON(jsonString));
-        
-        //console.log(jsonObject);
-        
+           
         function performEntityCheckboxUnselectedActions(entity, checkboxValue, checkbox) {
             
             removeUsedColor(entity);