litvinovg/vivo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

1. Fixed the notification bug in temporal graph vis for IE.

Browse source
This commit is contained in:
cdtank 2011-01-08 00:03:26 +00:00
parent 5e5f4686e9
commit 3cd9016715
4 changed files with 32 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

3
productMods/css/visualization/entitycomparison/layout-ie.css Normal file
View file

@ -0,0 +1,3 @@
.disabled-checkbox-event-receiver {
background-color: white;
}

20
productMods/js/visualization/entitycomparison/util.js
View file

@ -904,7 +904,25 @@ function disableUncheckedEntities(){
$(val).prev().show(); $(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); $("#datatable").data("isEntitySelectionAllowed", false);
} }

15
productMods/templates/freemarker/visualization/entitycomparison/entityComparisonStandaloneActivator.ftl
View file

@ -65,13 +65,18 @@
<#assign jqueryNotifyStyle = "${urls.base}/css/jquery_plugins/ui.notify.css" /> <#assign jqueryNotifyStyle = "${urls.base}/css/jquery_plugins/ui.notify.css" />
<#assign entityComparisonStyle = "${urls.base}/css/visualization/entitycomparison/layout.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" /> <#assign vizStyle = "${urls.base}/css/visualization/visualization.css" />
<link href="${jqueryUIStyle}" rel="stylesheet" type="text/css" /> <link href="${jqueryUIStyle}" rel="stylesheet" type="text/css" />
<link href="${demoTable}" rel="stylesheet" type="text/css" /> <link href="${demoTable}" rel="stylesheet" type="text/css" />
<link href="${entityComparisonStyle}" rel="stylesheet" type="text/css" /> <link href="${entityComparisonStyle}" rel="stylesheet" type="text/css" />
<link href="${vizStyle}" rel="stylesheet" type="text/css" /> <link href="${vizStyle}" rel="stylesheet" type="text/css" />
<link href="${jqueryNotifyStyle}" 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 --> <#-- variables passed from server-side code -->
@ -88,7 +93,7 @@ var subOrganizationTemporalGraphURL = "${subOrganizationTemporalGraphURL}";
<script type="text/javascript"> <script type="text/javascript">
$(document).ready(function() { $(document).ready(function() {
var jsonString = '${jsonContent}'; var jsonString = '${jsonContent}';
var organizationLabel = '${organizationLabel}'; 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> <p style="text-align:center"><a class="ui-notify-close" href="#">Close Me</a></p>
</div> </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;"> <div id="warning-notification">
<a class="ui-notify-close" href="#"><span class="ui-icon ui-icon-close" style="float:right"></span></a> <a class="ui-notify-close ui-notify-cross" href="#">x</a>
<span style="float:left; margin:0 5px 0 0;" class="ui-icon ui-icon-alert"></span>
<h1>&#035;{title}</h1> <h1>&#035;{title}</h1>
<p>&#035;{text}</p> <p>&#035;{text}</p>
<p style="text-align:center"><a class="ui-notify-close" href="#">Close Me</a></p>
</div> </div>
</div> </div>
@ -321,4 +324,4 @@ var subOrganizationTemporalGraphURL = "${subOrganizationTemporalGraphURL}";
</div> </div>
</div> </div>
</div> </div>

5
src/edu/cornell/mannlib/vitro/webapp/controller/visualization/freemarker/VisualizationInjector.java
View file

@ -9,14 +9,11 @@ public class VisualizationInjector {
private Map<String, VisualizationRequestHandler> visualizationIDToClass; private Map<String, VisualizationRequestHandler> visualizationIDToClass;
public Map<String, VisualizationRequestHandler> getVisualizationIDToClass() { public Map<String, VisualizationRequestHandler> getVisualizationIDToClass() {
System.out.println("giving the vis id class " + visualizationIDToClass);
return visualizationIDToClass; return visualizationIDToClass;
} }
public void setVisualizations(Map<String, VisualizationRequestHandler> visualizationIDToClass) { public void setVisualizations(Map<String, VisualizationRequestHandler> visualizationIDToClass) {
this.visualizationIDToClass = visualizationIDToClass; this.visualizationIDToClass = visualizationIDToClass;
System.out.println("setting the vis id class " + visualizationIDToClass);
} }
} }