From 3cd90167158f2f6db3615989c8682a710981a5f4 Mon Sep 17 00:00:00 2001
From: cdtank <cdtank@43c2fc9b-1942-4403-87b2-35b4218f7473>
Date: Sat, 8 Jan 2011 00:03:26 +0000
Subject: [PATCH] 1. Fixed the notification bug in temporal graph vis for IE.

---
 .../entitycomparison/layout-ie.css            |  3 +++
 .../js/visualization/entitycomparison/util.js | 20 ++++++++++++++++++-
 .../entityComparisonStandaloneActivator.ftl   | 15 ++++++++------
 .../freemarker/VisualizationInjector.java     |  5 +----
 4 files changed, 32 insertions(+), 11 deletions(-)
 create mode 100644 productMods/css/visualization/entitycomparison/layout-ie.css

diff --git a/productMods/css/visualization/entitycomparison/layout-ie.css b/productMods/css/visualization/entitycomparison/layout-ie.css
new file mode 100644
index 00000000..005a9ee2
--- /dev/null
+++ b/productMods/css/visualization/entitycomparison/layout-ie.css
@@ -0,0 +1,3 @@
+.disabled-checkbox-event-receiver {
+	background-color: white;
+}
diff --git a/productMods/js/visualization/entitycomparison/util.js b/productMods/js/visualization/entitycomparison/util.js
index 64a5268e..89fe7788 100644
--- a/productMods/js/visualization/entitycomparison/util.js
+++ b/productMods/js/visualization/entitycomparison/util.js
@@ -904,7 +904,25 @@ function disableUncheckedEntities(){
 		$(val).prev().show();
 	});
 	
-	//console.log($("input[type=checkbox].if_clicked_on_school:not(:checked)"));
+	/*
+	 * This indicates the first time this function is called presumably after the 10th checkbox is selected.
+	 * We want to display a warning message only in Internet Explorer because in IE the div that handles
+	 * disabled-checkbox-clicks is colored white & we cant see the actual checkbox.
+	 * 
+	 * Note that the usual Error message will still display if the user tries to click on the white box 
+	 * (or a disabled checkbox in case of non-IE browsers).   
+	 * */
+	
+	if ($("#datatable").data("isEntitySelectionAllowed")) {
+		if ($.browser.msie) {
+			createNotification("warning-notification", { title:'Information', 
+				text:'A Maximum of 10 entities can be compared.' },{
+				custom: false,
+				expires: 4000
+				});	
+		}
+	} 
+		
 	
 	$("#datatable").data("isEntitySelectionAllowed", false);
 }
diff --git a/productMods/templates/freemarker/visualization/entitycomparison/entityComparisonStandaloneActivator.ftl b/productMods/templates/freemarker/visualization/entitycomparison/entityComparisonStandaloneActivator.ftl
index e9aab1c6..ecdda81d 100644
--- a/productMods/templates/freemarker/visualization/entitycomparison/entityComparisonStandaloneActivator.ftl
+++ b/productMods/templates/freemarker/visualization/entitycomparison/entityComparisonStandaloneActivator.ftl
@@ -65,13 +65,18 @@
 <#assign jqueryNotifyStyle = "${urls.base}/css/jquery_plugins/ui.notify.css" />
 
 <#assign entityComparisonStyle = "${urls.base}/css/visualization/entitycomparison/layout.css" />
+<#assign entityComparisonStyleIEHack = "${urls.base}/css/visualization/entitycomparison/layout-ie.css" />
+
 <#assign vizStyle = "${urls.base}/css/visualization/visualization.css" />
 
+
+
 <link href="${jqueryUIStyle}" rel="stylesheet" type="text/css" />
 <link href="${demoTable}" rel="stylesheet" type="text/css" />
 <link href="${entityComparisonStyle}" rel="stylesheet" type="text/css" />
 <link href="${vizStyle}" rel="stylesheet" type="text/css" />
 <link href="${jqueryNotifyStyle}" rel="stylesheet" type="text/css" />
+<!--[if IE]><link href="${entityComparisonStyleIEHack}" rel="stylesheet" type="text/css" /><![endif]-->
 
 
 <#-- variables passed from server-side code -->
@@ -88,7 +93,7 @@ var subOrganizationTemporalGraphURL = "${subOrganizationTemporalGraphURL}";
 <script type="text/javascript">
 
 	$(document).ready(function() {
-
+	
 		var jsonString = '${jsonContent}';
 		var organizationLabel = '${organizationLabel}';
 		
@@ -279,12 +284,10 @@ var subOrganizationTemporalGraphURL = "${subOrganizationTemporalGraphURL}";
 						<p style="text-align:center"><a class="ui-notify-close" href="#">Close Me</a></p>
 					</div>
 					
-					<div id="warning-notification" class="ui-state-error" style="padding:10px; -moz-box-shadow:0 0 6px #980000; -webkit-box-shadow:0 0 6px #980000; box-shadow:0 0 6px #980000;">
-						<a class="ui-notify-close" href="#"><span class="ui-icon ui-icon-close" style="float:right"></span></a>
-						<span style="float:left; margin:0 5px 0 0;" class="ui-icon ui-icon-alert"></span>
+					<div id="warning-notification">
+					<a class="ui-notify-close ui-notify-cross" href="#">x</a>
 						<h1>&#035;{title}</h1>
 						<p>&#035;{text}</p>
-						<p style="text-align:center"><a class="ui-notify-close" href="#">Close Me</a></p>
 					</div>
 				
 				</div>
@@ -321,4 +324,4 @@ var subOrganizationTemporalGraphURL = "${subOrganizationTemporalGraphURL}";
 			</div>
 		
 		</div>		
-</div>
+</div>
\ No newline at end of file
diff --git a/src/edu/cornell/mannlib/vitro/webapp/controller/visualization/freemarker/VisualizationInjector.java b/src/edu/cornell/mannlib/vitro/webapp/controller/visualization/freemarker/VisualizationInjector.java
index 03a60bf6..31f86e17 100644
--- a/src/edu/cornell/mannlib/vitro/webapp/controller/visualization/freemarker/VisualizationInjector.java
+++ b/src/edu/cornell/mannlib/vitro/webapp/controller/visualization/freemarker/VisualizationInjector.java
@@ -9,14 +9,11 @@ public class VisualizationInjector {
 	private Map<String, VisualizationRequestHandler> visualizationIDToClass;
 
 	public Map<String, VisualizationRequestHandler> getVisualizationIDToClass() {
-		
-		System.out.println("giving the vis id class " + visualizationIDToClass);
 		return visualizationIDToClass;
 	}
 
 	public void setVisualizations(Map<String, VisualizationRequestHandler> visualizationIDToClass) {
 		this.visualizationIDToClass = visualizationIDToClass;
-		System.out.println("setting the vis id class " + visualizationIDToClass);
 	}
 
-}
+}
\ No newline at end of file