diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/visualization/personlevel/VisualizationRequestHandler.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/visualization/personlevel/VisualizationRequestHandler.java index 0d03af9c0..a7026c2a3 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/visualization/personlevel/VisualizationRequestHandler.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/visualization/personlevel/VisualizationRequestHandler.java @@ -127,7 +127,8 @@ public class VisualizationRequestHandler { prepareVisualizationQueryStandaloneResponse(egoURIParam, sparklineVO, request, response, vitroRequest); - requestDispatcher = request.getRequestDispatcher("/templates/page/blankPage.jsp"); +// requestDispatcher = request.getRequestDispatcher("/templates/page/blankPage.jsp"); + requestDispatcher = request.getRequestDispatcher(Controllers.BASIC_JSP); try { requestDispatcher.forward(request, response); @@ -186,18 +187,15 @@ public class VisualizationRequestHandler { VitroRequest vreq) { Portal portal = vreq.getPortal(); - -// request.setAttribute("visContentCode", visContentCode); -// request.setAttribute("visContextCode", visContextCode); - + request.setAttribute("egoURIParam", egoURIParam); request.setAttribute("sparklineVO", sparklineVO); - request.setAttribute("bodyJsp", "/templates/visualization/person_level.jsp"); + request.setAttribute("title", "Person Level Visualization"); request.setAttribute("portalBean", portal); -// request.setAttribute("title", "Individual Publication Count Visualization"); -// request.setAttribute("scripts", "/templates/visualization/visualization_scripts.jsp"); - + request.setAttribute("scripts", "/templates/visualization/person_level_inject_head.jsp"); + + request.setAttribute("bodyJsp", "/templates/visualization/person_level.jsp"); } private void handleMalformedParameters(String errorMessage) diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/visualization/personpubcount/VisualizationCodeGenerator.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/visualization/personpubcount/VisualizationCodeGenerator.java index b1ca32939..4faa8af80 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/visualization/personpubcount/VisualizationCodeGenerator.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/visualization/personpubcount/VisualizationCodeGenerator.java @@ -144,7 +144,7 @@ public class VisualizationCodeGenerator { numOfYearsToBeRendered = currentYear - minPubYearConsidered + 1; visualizationCode.append("\n"); + + + visualizationCode.append(" - - - - - - - - - - - - - - - - - -
- - -<%-- Label --%> +
<%-- Label --%>
-
- -
+
-<%-- Moniker--%> +<%-- Moniker--%>
-
-
- -
-
+
+
+
- -<%-- Image --%> -
-
-
-
-
-
-<%-- Sparkline --%> +<%-- Image --%>
-
-
- - ${sparkline.sparklineContent} - -
-
-
+
+
+
+
+ +<%-- Sparkline --%> +
+
+
${sparkline.sparklineContent}
+
+
+ -

+ - - -
+



@@ -150,32 +68,36 @@ renderCoAuthorshipVisualization();

- +
-Download co-authorship newtwork as .graphml file. - + +
@@ -183,64 +105,60 @@ Download co-authorship newtwork as - - - - - - - - - - - - - - - - - - - - - - - - - -
Publications per year
YearPublications
20044
20052
11
Unknown1
+ + +
+ + +
+

+
+ +
- - - + \ No newline at end of file diff --git a/webapp/web/templates/visualization/person_level_inject_head.jsp b/webapp/web/templates/visualization/person_level_inject_head.jsp new file mode 100644 index 000000000..ac1373dca --- /dev/null +++ b/webapp/web/templates/visualization/person_level_inject_head.jsp @@ -0,0 +1,56 @@ +<%@ taglib uri="http://java.sun.com/jstl/core" prefix="c" %> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +