From 1f7962a454f40419ff18c0ef90a5e91c013b120c Mon Sep 17 00:00:00 2001 From: cdtank Date: Tue, 25 Jan 2011 00:55:47 +0000 Subject: [PATCH] 1. Made style changes to the temporal graph vis per Katy's suggestions. 2. Refactored the temporal graph views (based on different comparison parameters). Now there is one basic template from which different parameter templates inherit. 3. Did code cleanup for the same. 4. Removed GUI related javascript into separate file & include it in the common basic template for temporal graph vis. 5. Reflected the changes in the servlets as well. --- .../visualization/entitycomparison/layout.css | 8 +- .../entitycomparison/gui-event-manager.js | 206 +++++++++++ .../jquery_plugins/datatable/demo_table.css | 2 + .../js/visualization/entitycomparison/util.js | 1 - .../entitycomparison/entityComparisonBody.ftl | 87 +++++ ...ityComparisonGrantsStandaloneActivator.ftl | 341 ------------------ .../entityComparisonOnGrantsStandalone.ftl | 24 ++ ...tityComparisonOnPublicationsStandalone.ftl | 24 ++ .../entityComparisonSetup.ftl | 106 ++++++ .../entityComparisonStandaloneActivator.ftl | 338 ----------------- .../EntityPublicationCountRequestHandler.java | 4 +- .../EntityGrantCountRequestHandler.java | 2 +- 12 files changed, 457 insertions(+), 686 deletions(-) create mode 100644 productMods/js/visualization/entitycomparison/gui-event-manager.js create mode 100644 productMods/templates/freemarker/visualization/entitycomparison/entityComparisonBody.ftl delete mode 100644 productMods/templates/freemarker/visualization/entitycomparison/entityComparisonGrantsStandaloneActivator.ftl create mode 100644 productMods/templates/freemarker/visualization/entitycomparison/entityComparisonOnGrantsStandalone.ftl create mode 100644 productMods/templates/freemarker/visualization/entitycomparison/entityComparisonOnPublicationsStandalone.ftl create mode 100644 productMods/templates/freemarker/visualization/entitycomparison/entityComparisonSetup.ftl delete mode 100644 productMods/templates/freemarker/visualization/entitycomparison/entityComparisonStandaloneActivator.ftl diff --git a/productMods/css/visualization/entitycomparison/layout.css b/productMods/css/visualization/entitycomparison/layout.css index cd3e7599..2327d84c 100644 --- a/productMods/css/visualization/entitycomparison/layout.css +++ b/productMods/css/visualization/entitycomparison/layout.css @@ -23,6 +23,7 @@ a.temporalGraphLinks { padding: 4px 3px 3px; text-align: center; text-decoration: none; + padding-bottom: 3px; } a.clear-selected-entities { @@ -31,7 +32,8 @@ a.clear-selected-entities { #paginated-table-footer { margin-top: 10px; - text-align: right; + text-align: left; + height: 25px; } #legend-row-header a { @@ -93,7 +95,7 @@ a.clear-selected-entities { float: left; font-size: 12px; width: 160px; - text-align: right; + text-align: left; } .easy-deselect-label a, #text { @@ -132,7 +134,7 @@ a.clear-selected-entities { .entity-label-url { width: 125px; - margin-right: 10px; + margin-left: 10px; display:inline-block; text-decoration: underline; } diff --git a/productMods/js/visualization/entitycomparison/gui-event-manager.js b/productMods/js/visualization/entitycomparison/gui-event-manager.js new file mode 100644 index 00000000..d9434562 --- /dev/null +++ b/productMods/js/visualization/entitycomparison/gui-event-manager.js @@ -0,0 +1,206 @@ +/* $This file is distributed under the terms of the license in /doc/license.txt$ */ + +$(document).ready(function() { + + /* This is used to cache the current state whether the user is allowed to select more entities from + the datatable or not. Once Max number of entity selection is reached the user can no longer select + more & this variable will be set to false. */ + $("#datatable").data("isEntitySelectionAllowed", true); + + $("#organizationLabel").text(organizationLabel).css("color", "#2485ae"); + $("#organizationMoniker").text(organizationLabel); + $("#organizationMoniker").attr("href", organizationVIVOProfileURL); + + $notificationContainer = $("#notification-container").notify(); + + var jsonObject = { + prepare : function(arg1){ + loadData(arg1); + } + }; + + graphContainer = $("#graphContainer"); + tableDiv = $('#paginatedTable'); + + // initial display of the grid when the page loads + init(graphContainer); + + + //click event handler for clear button + $("a.clear-selected-entities").click(function(){ + clearRenderedObjects(); + }); + + /* + * When the intra-entity parameters are clicked, + * update the status accordingly. + */ + + $("select.comparisonValues").change(function(){ + + var selectedValue = $("select.comparisonValues option:selected").val(); + + var selectedParameter; + + $.each(COMPARISON_PARAMETERS_INFO, function(index, parameter) { + + if (parameter.value === selectedValue) { + selectedParameter = parameter; + window.location = parameter.viewLink; + } + + }); + + /* + * This piece of code is not executed at all because the redirect happens before there is a chance + * to render the below contents. + * */ + + $("#comparisonParameter").text("Total Number of " + selectedValue); + $('#yaxislabel').html("Number of " + selectedValue).mbFlipText(false); + $('#yaxislabel').css("color", "#595B5B"); + $('#comparisonHeader').html(selectedValue).css('font-weight', 'bold'); + + }); + + $("input[type=checkbox].easyDeselectCheckbox").live('click', function(){ + + var checkbox = $(this); + var checkboxValue = $(this).attr("value"); + var linkedCheckbox = labelToCheckedEntities[checkboxValue]; + var entityToBeRemoved = labelToEntityRecord[checkboxValue]; + + if(!checkbox.is(':checked')){ + //console.log("Easy deselect checkbox is unclicked!"); + updateRowHighlighter(linkedCheckbox); + removeUsedColor(entityToBeRemoved); + removeEntityUnChecked(renderedObjects, entityToBeRemoved); + removeLegendRow(linkedCheckbox); + removeCheckBoxFromGlobalSet(linkedCheckbox); + $(linkedCheckbox).attr('checked', false); + checkIfColorLimitIsReached(); + displayLineGraphs(); + updateCounter(); + } + }); + + //parse the json object and pass it to loadData + jsonObject.prepare(jQuery.parseJSON(jsonString)); + + function performEntityCheckboxUnselectedActions(entity, checkboxValue, checkbox) { + + removeUsedColor(entity); + removeEntityUnChecked(renderedObjects, entity); + removeLegendRow(checkbox); + removeCheckBoxFromGlobalSet(checkbox); + + checkbox.closest("tr").removeClass('datatablerowhighlight'); + + } + + function performEntityCheckboxSelectedActions(entity, checkboxValue, checkbox) { + + getNextFreeColor(entity); + + //Generate the bar, checkbox and label for the legend. + createLegendRow(entity, $("#bottom")); + + renderLineGraph(renderedObjects, entity); + labelToCheckedEntities[checkboxValue] = checkbox; + + /* + * To highlight the rows belonging to selected entities. + * */ + checkbox.closest("tr").addClass('datatablerowhighlight'); + + } + + function performEntityCheckboxClickedRedrawActions() { + + setTickSizeOfAxes(); + checkIfColorLimitIsReached(); + displayLineGraphs(); + updateCounter(); + + } + + /* + * function to populate the labelToEntityRecord object with the + * values from the json file and + * dynamically generate checkboxes + */ + function loadData(jsonData) { + + // var yearRange; + $.each(jsonData, function (index, val) { + setOfLabels.push(val.label); + labelToEntityRecord[val.label] = val; + }); + + getEntityVisMode(jsonData); + prepareTableForDataTablePagination(jsonData); + setEntityLevel(); + + $(".disabled-checkbox-event-receiver").live("click", function () { + + if ($(this).next().is(':disabled')) { + + createNotification("warning-notification", { + title: 'Error', + text: 'A Maximum 10 entities can be compared. Please remove some & try again.' + }, { + custom: true, + expires: false + }); + + } + + }); + + /* + * When the elements in the paginated div + * are clicked this event handler is called + */ + $("input.if_clicked_on_school").live('click', function () { + + var checkbox = $(this); + var checkboxValue = $(this).attr("value"); + var entity = labelToEntityRecord[checkboxValue]; + + if (checkbox.is(':checked')) { + + performEntityCheckboxSelectedActions(entity, checkboxValue, checkbox); + + } else { + + performEntityCheckboxUnselectedActions(entity, checkboxValue, checkbox); + + } + + performEntityCheckboxClickedRedrawActions(); + + }); + } + + /* + This will make sure that top 3 entites are selected by default when the page loads. + + */ + $.each($("input.if_clicked_on_school"), function(index, checkbox) { + + if (index > 2) { + return false; + } + + $(this).attr('checked', true); + + var checkboxValue = $(this).attr("value"); + var entity = labelToEntityRecord[checkboxValue]; + + performEntityCheckboxSelectedActions(entity, checkboxValue, $(this)); + + performEntityCheckboxClickedRedrawActions(); + + }); + +}); \ No newline at end of file diff --git a/productMods/js/visualization/entitycomparison/jquery_plugins/datatable/demo_table.css b/productMods/js/visualization/entitycomparison/jquery_plugins/datatable/demo_table.css index 17fd8289..88fa30a2 100644 --- a/productMods/js/visualization/entitycomparison/jquery_plugins/datatable/demo_table.css +++ b/productMods/js/visualization/entitycomparison/jquery_plugins/datatable/demo_table.css @@ -61,6 +61,8 @@ background:#F1F2ee; font-weight:bold; font-size:12px; + padding-bottom: 3px; + padding-top: 3px; } #infoContainer { diff --git a/productMods/js/visualization/entitycomparison/util.js b/productMods/js/visualization/entitycomparison/util.js index 286b2e31..f1145d75 100644 --- a/productMods/js/visualization/entitycomparison/util.js +++ b/productMods/js/visualization/entitycomparison/util.js @@ -1,6 +1,5 @@ /* $This file is distributed under the terms of the license in /doc/license.txt$ */ - (function ($) { $.fn.dataTableExt.oPagination.gmail_style = { diff --git a/productMods/templates/freemarker/visualization/entitycomparison/entityComparisonBody.ftl b/productMods/templates/freemarker/visualization/entitycomparison/entityComparisonBody.ftl new file mode 100644 index 00000000..97b2163d --- /dev/null +++ b/productMods/templates/freemarker/visualization/entitycomparison/entityComparisonBody.ftl @@ -0,0 +1,87 @@ +<#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> + +
+ +

+ +
+
+

How do you want to compare?

+ +
+ + + +
+
+ +
+ +

Who do you want to compare?

+
+ +
+<#-- +
+ * The entity types core:Person, foaf:Organization have been excluded as they are too general. +
+--> +
+ +
+ +

Comparing ${currentParameterObject.value} of Institutions in

+ +
+
+
+
Year
+
+ +
+

+

You have selected 0 of a maximum + 10 schools to compare. + + Clear + +

+ +
+
+
\ No newline at end of file diff --git a/productMods/templates/freemarker/visualization/entitycomparison/entityComparisonGrantsStandaloneActivator.ftl b/productMods/templates/freemarker/visualization/entitycomparison/entityComparisonGrantsStandaloneActivator.ftl deleted file mode 100644 index 66788718..00000000 --- a/productMods/templates/freemarker/visualization/entitycomparison/entityComparisonGrantsStandaloneActivator.ftl +++ /dev/null @@ -1,341 +0,0 @@ -<#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> - -<#assign standardVisualizationURLRoot ="/visualization"> -<#assign ajaxVisualizationURLRoot ="/visualizationAjax"> -<#assign dataVisualizationURLRoot ="/visualizationData"> - -<#assign organizationURI ="${organizationURI?url}"> -<#assign jsonContent ="${jsonContent}"> -<#assign organizationLabel = "${organizationLabel}"> -<#assign organizationVivoProfileURL = "${urls.base}/individual?uri=${organizationURI}"> -<#assign subOrganizationTemporalGraphURL = "${urls.base}${standardVisualizationURLRoot}?vis=entity_grant_count"> -<#assign subOrganizationTemporalGraphPubURL = "${urls.base}${standardVisualizationURLRoot}?vis=entity_comparison"> -<#assign subOrganizationVivoProfileURL = "${urls.base}/individual?"> - - - -<#assign temporalGraphSmallIcon = '${urls.images}/visualization/temporal_vis_small_icon.jpg'> - -<#assign TemporalGraphDownloadFile = '${urls.base}${dataVisualizationURLRoot}?vis=entity_grant_count&uri=${organizationURI}&labelField=label'> - -<#-- Javascript files --> - -<#assign excanvas = '${urls.base}/js/visualization/entitycomparison/jquery_plugins/flot/excanvas.js'> -<#assign flot = 'js/visualization/entitycomparison/jquery_plugins/flot/jquery.flot.js'> -<#assign fliptext = 'js/visualization/entitycomparison/jquery_plugins/fliptext/jquery.mb.flipText.js'> -<#assign jqueryNotify = 'js/jquery_plugins/jquery.notify.min.js'> -<#assign jqueryUI = 'js/jquery-ui/js/jquery-ui-1.8.4.custom.min.js'> -<#assign datatable = 'js/jquery_plugins/jquery.dataTables.min.js'> -<#assign entityComparisonUtils = 'js/visualization/entitycomparison/util.js'> -<#assign entityComparisonConstants = 'js/visualization/entitycomparison/constants.js'> - - -${scripts.add(flot)} -${scripts.add(fliptext)} -${scripts.add(jqueryUI)} -${scripts.add(datatable)} -${scripts.add(entityComparisonUtils)} -${scripts.add(entityComparisonConstants)} -${scripts.add(jqueryNotify)} - -<#-- CSS files --> - -<#assign demoTable = "js/visualization/entitycomparison/jquery_plugins/datatable/demo_table.css" /> -<#assign jqueryUIStyle = "js/jquery-ui/css/smoothness/jquery-ui-1.8.4.custom.css" /> -<#assign jqueryNotifyStyle = "css/jquery_plugins/ui.notify.css" /> -<#assign entityComparisonStyle = "css/visualization/entitycomparison/layout.css" /> -<#assign entityComparisonStyleIEHack = "${urls.base}/css/visualization/entitycomparison/layout-ie.css" /> -<#assign vizStyle = "css/visualization/visualization.css" /> - -${stylesheets.add(jqueryUIStyle)} -${stylesheets.add(demoTable)} -${stylesheets.add(entityComparisonStyle)} -${stylesheets.add(vizStyle)} -${stylesheets.add(jqueryNotifyStyle)} - - - -<#-- variables passed from server-side code --> - - - - -
- -

- -
-
-

How do you want to compare?

- -
- - - -
-
- -
- -

Who do you want to compare?

-
- -
-<#-- -
- * The entity types core:Person, foaf:Organization have been excluded as they are too general. -
---> -
- -
- -

Comparing Grants of Institutions in

- -
-
-
-
Year
-
- -
-

-

You have selected 0 of a maximum - 10 schools to compare. - - Clear - -

- -
-
-
\ No newline at end of file diff --git a/productMods/templates/freemarker/visualization/entitycomparison/entityComparisonOnGrantsStandalone.ftl b/productMods/templates/freemarker/visualization/entitycomparison/entityComparisonOnGrantsStandalone.ftl new file mode 100644 index 00000000..027630a8 --- /dev/null +++ b/productMods/templates/freemarker/visualization/entitycomparison/entityComparisonOnGrantsStandalone.ftl @@ -0,0 +1,24 @@ +<#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> + +<#-- The Order of each element in this file is very important. Do not make any changes to it unless making +corresponding changes in the included Templates. --> + +<#assign currentParameter = "grant"> + +<#include "entityComparisonSetup.ftl"> + +<#assign temporalGraphDownloadFileLink = '${temporalGraphDownloadCSVCommonURL}&vis=entity_grant_count'> + +<#-- variables passed from server-side code --> + + +<#assign currentParameterObject = grantParameter> + +<#include "entityComparisonBody.ftl"> \ No newline at end of file diff --git a/productMods/templates/freemarker/visualization/entitycomparison/entityComparisonOnPublicationsStandalone.ftl b/productMods/templates/freemarker/visualization/entitycomparison/entityComparisonOnPublicationsStandalone.ftl new file mode 100644 index 00000000..403138ed --- /dev/null +++ b/productMods/templates/freemarker/visualization/entitycomparison/entityComparisonOnPublicationsStandalone.ftl @@ -0,0 +1,24 @@ +<#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> + +<#-- The Order of each element in this file is very important. Do not make any changes to it unless making +corresponding changes in the included Templates. --> + +<#assign currentParameter = "publication"> + +<#include "entityComparisonSetup.ftl"> + +<#assign temporalGraphDownloadFileLink = '${temporalGraphDownloadCSVCommonURL}&vis=entity_comparison'> + +<#-- variables passed from server-side code --> + + +<#assign currentParameterObject = publicationParameter> + +<#include "entityComparisonBody.ftl"> \ No newline at end of file diff --git a/productMods/templates/freemarker/visualization/entitycomparison/entityComparisonSetup.ftl b/productMods/templates/freemarker/visualization/entitycomparison/entityComparisonSetup.ftl new file mode 100644 index 00000000..63843a8b --- /dev/null +++ b/productMods/templates/freemarker/visualization/entitycomparison/entityComparisonSetup.ftl @@ -0,0 +1,106 @@ +<#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> + +<#assign standardVisualizationURLRoot ="/visualization"> +<#assign ajaxVisualizationURLRoot ="/visualizationAjax"> +<#assign dataVisualizationURLRoot ="/visualizationData"> + +<#assign organizationURI ="${organizationURI?url}"> +<#assign jsonContent ="${jsonContent}"> +<#assign organizationLabel = "${organizationLabel}"> +<#assign organizationVivoProfileURL = "${urls.base}/individual?uri=${organizationURI}"> + +<#assign subOrganizationVivoProfileURL = "${urls.base}/individual?"> + +<#assign subOrganizationGrantTemporalGraphCommonURL = "${urls.base}${standardVisualizationURLRoot}?vis=entity_grant_count"> +<#assign subOrganizationPublicationTemporalGraphCommonURL = "${urls.base}${standardVisualizationURLRoot}?vis=entity_comparison"> + +<#assign organizationPublicationTemporalGraphURL = "${urls.base}${standardVisualizationURLRoot}?vis=entity_comparison&uri=${organizationURI}"> +<#assign organizationGrantTemporalGraphURL = "${urls.base}${standardVisualizationURLRoot}?vis=entity_grant_count&uri=${organizationURI}"> + +<#assign temporalGraphSmallIcon = '${urls.images}/visualization/temporal_vis_small_icon.jpg'> + +<#assign temporalGraphDownloadCSVCommonURL = '${urls.base}${dataVisualizationURLRoot}?uri=${organizationURI}&labelField=label'> + +<#assign publicationParameter = { "name": "publication", + "dropDownText": "by Publications", + "viewLink": "${organizationPublicationTemporalGraphURL}", + "value": "Publications" }> + +<#assign grantParameter = { "name": "grant", + "dropDownText": "by Grants", + "viewLink": "${organizationGrantTemporalGraphURL}", + "value": "Grants" }> + +<#assign parameterOptions = [publicationParameter, grantParameter]> + +<#-- Javascript files --> + +<#assign excanvas = '${urls.base}/js/visualization/entitycomparison/jquery_plugins/flot/excanvas.js'> +<#assign flot = 'js/visualization/entitycomparison/jquery_plugins/flot/jquery.flot.js'> +<#assign fliptext = 'js/visualization/entitycomparison/jquery_plugins/fliptext/jquery.mb.flipText.js'> +<#assign jqueryNotify = 'js/jquery_plugins/jquery.notify.min.js'> +<#assign jqueryUI = 'js/jquery-ui/js/jquery-ui-1.8.4.custom.min.js'> +<#assign datatable = 'js/jquery_plugins/jquery.dataTables.min.js'> +<#assign entityComparisonUtils = 'js/visualization/entitycomparison/util.js'> +<#assign entityComparisonConstants = 'js/visualization/entitycomparison/constants.js'> +<#assign guiEventManager = 'js/visualization/entitycomparison/gui-event-manager.js'> + + + +${scripts.add(flot)} +${scripts.add(fliptext)} +${scripts.add(jqueryUI)} +${scripts.add(datatable)} +${scripts.add(entityComparisonUtils)} +${scripts.add(entityComparisonConstants)} +${scripts.add(jqueryNotify)} + +<#-- CSS files --> + +<#assign demoTable = "js/visualization/entitycomparison/jquery_plugins/datatable/demo_table.css" /> +<#assign jqueryUIStyle = "js/jquery-ui/css/smoothness/jquery-ui-1.8.4.custom.css" /> +<#assign jqueryNotifyStyle = "css/jquery_plugins/ui.notify.css" /> +<#assign entityComparisonStyle = "css/visualization/entitycomparison/layout.css" /> +<#assign entityComparisonStyleIEHack = "${urls.base}/css/visualization/entitycomparison/layout-ie.css" /> +<#assign vizStyle = "css/visualization/visualization.css" /> + +${stylesheets.add(jqueryUIStyle)} +${stylesheets.add(demoTable)} +${stylesheets.add(entityComparisonStyle)} +${stylesheets.add(vizStyle)} +${stylesheets.add(jqueryNotifyStyle)} + + +<#-- variables passed from server-side code --> + + +${scripts.add(guiEventManager)} \ No newline at end of file diff --git a/productMods/templates/freemarker/visualization/entitycomparison/entityComparisonStandaloneActivator.ftl b/productMods/templates/freemarker/visualization/entitycomparison/entityComparisonStandaloneActivator.ftl deleted file mode 100644 index 9fb08cbf..00000000 --- a/productMods/templates/freemarker/visualization/entitycomparison/entityComparisonStandaloneActivator.ftl +++ /dev/null @@ -1,338 +0,0 @@ -<#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> - -<#assign standardVisualizationURLRoot ="/visualization"> -<#assign ajaxVisualizationURLRoot ="/visualizationAjax"> -<#assign dataVisualizationURLRoot ="/visualizationData"> - -<#assign organizationURI ="${organizationURI?url}"> -<#assign jsonContent ="${jsonContent}"> -<#assign organizationLabel = "${organizationLabel}"> -<#assign organizationVivoProfileURL = "${urls.base}/individual?uri=${organizationURI}"> -<#assign subOrganizationTemporalGraphURL = "${urls.base}${standardVisualizationURLRoot}?vis=entity_comparison"> -<#assign subOrganizationTemporalGraphGrantURL = "${urls.base}${standardVisualizationURLRoot}?vis=entity_grant_count"> -<#assign subOrganizationVivoProfileURL = "${urls.base}/individual?"> - -<#assign temporalGraphSmallIcon = '${urls.images}/visualization/temporal_vis_small_icon.jpg'> - -<#assign TemporalGraphDownloadFile = '${urls.base}${dataVisualizationURLRoot}?vis=entity_comparison&uri=${organizationURI}&labelField=label'> - - -<#-- Javascript files --> - -<#assign excanvas = '${urls.base}/js/visualization/entitycomparison/jquery_plugins/flot/excanvas.js'> -<#assign flot = 'js/visualization/entitycomparison/jquery_plugins/flot/jquery.flot.js'> -<#assign fliptext = 'js/visualization/entitycomparison/jquery_plugins/fliptext/jquery.mb.flipText.js'> -<#assign jqueryNotify = 'js/jquery_plugins/jquery.notify.min.js'> -<#assign jqueryUI = 'js/jquery-ui/js/jquery-ui-1.8.4.custom.min.js'> -<#assign datatable = 'js/jquery_plugins/jquery.dataTables.min.js'> -<#assign entityComparisonUtils = 'js/visualization/entitycomparison/util.js'> -<#assign entityComparisonConstants = 'js/visualization/entitycomparison/constants.js'> - - -${scripts.add(flot)} -${scripts.add(fliptext)} -${scripts.add(jqueryUI)} -${scripts.add(datatable)} -${scripts.add(entityComparisonUtils)} -${scripts.add(entityComparisonConstants)} -${scripts.add(jqueryNotify)} - -<#-- CSS files --> - -<#assign demoTable = "js/visualization/entitycomparison/jquery_plugins/datatable/demo_table.css" /> -<#assign jqueryUIStyle = "js/jquery-ui/css/smoothness/jquery-ui-1.8.4.custom.css" /> -<#assign jqueryNotifyStyle = "css/jquery_plugins/ui.notify.css" /> -<#assign entityComparisonStyle = "css/visualization/entitycomparison/layout.css" /> -<#assign entityComparisonStyleIEHack = "${urls.base}/css/visualization/entitycomparison/layout-ie.css" /> -<#assign vizStyle = "css/visualization/visualization.css" /> - -${stylesheets.add(jqueryUIStyle)} -${stylesheets.add(demoTable)} -${stylesheets.add(entityComparisonStyle)} -${stylesheets.add(vizStyle)} -${stylesheets.add(jqueryNotifyStyle)} - - - -<#-- variables passed from server-side code --> - - - - -
- -

- -
-
-

How do you want to compare?

- -
- - - -
-
- -
- -

Who do you want to compare?

-
- -
-<#-- -
- * The entity types core:Person, foaf:Organization have been excluded as they are too general. -
---> -
- -
- -

Comparing Publications of Institutions in

- -
-
-
-
Year
-
- -
-

-

You have selected 0 of a maximum - 10 schools to compare. - - Clear - -

- -
-
-
\ No newline at end of file diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/entitycomparison/EntityPublicationCountRequestHandler.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/entitycomparison/EntityPublicationCountRequestHandler.java index 6d8c1ef6..d8862b20 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/entitycomparison/EntityPublicationCountRequestHandler.java +++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/entitycomparison/EntityPublicationCountRequestHandler.java @@ -51,7 +51,7 @@ public class EntityPublicationCountRequestHandler implements return prepareStandaloneErrorResponse(vitroRequest,entityURI); - } else{ + } else { QueryRunner>> queryManagerForsubOrganisationTypes = new EntitySubOrganizationTypesQueryRunner( entityURI, dataSource, log); @@ -141,7 +141,7 @@ public class EntityPublicationCountRequestHandler implements Entity entity, String entityURI, Map> subOrganizationTypesResult) { Portal portal = vreq.getPortal(); - String standaloneTemplate = "entityComparisonStandaloneActivator.ftl"; + String standaloneTemplate = "entityComparisonOnPublicationsStandalone.ftl"; String jsonContent = ""; jsonContent = writePublicationsOverTimeJSON(vreq, entity.getSubEntities(), subOrganizationTypesResult); diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/entitygrantcount/EntityGrantCountRequestHandler.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/entitygrantcount/EntityGrantCountRequestHandler.java index f85d66f9..c88fed43 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/entitygrantcount/EntityGrantCountRequestHandler.java +++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/entitygrantcount/EntityGrantCountRequestHandler.java @@ -141,7 +141,7 @@ public class EntityGrantCountRequestHandler implements Entity entity, String entityURI, Map> subOrganizationTypesResult) { Portal portal = vreq.getPortal(); - String standaloneTemplate = "entityComparisonGrantsStandaloneActivator.ftl"; + String standaloneTemplate = "entityComparisonOnGrantsStandalone.ftl"; String jsonContent = ""; jsonContent = writeGrantsOverTimeJSON(vreq, entity.getSubEntities(), subOrganizationTypesResult);