From b27b3aa607c1301bb6f4ef6057bdc214e8d0e102 Mon Sep 17 00:00:00 2001 From: nac26 Date: Wed, 15 Dec 2010 13:46:09 +0000 Subject: [PATCH] NIHVIVO-1389 NIHVIVO-1506 Added include for ${scripts} variable that had been mistakenly left out of basicPage.jsp. This was resulting in missing JavaScript and causing problems on individual control panel and visualizations for the individual page. Once the JS was returned, there was still another problem with jQuery's user of $() conflicting with DWR on the entity edits page. Resolved this using jQuery's built in noConflict() method. --- .../edit/specific/ents_edit_head.jsp | 31 ++++++++++--------- webapp/web/templates/page/basicPage.jsp | 6 +++- 2 files changed, 22 insertions(+), 15 deletions(-) diff --git a/webapp/web/templates/edit/specific/ents_edit_head.jsp b/webapp/web/templates/edit/specific/ents_edit_head.jsp index 875fd139f..0f07b1a35 100644 --- a/webapp/web/templates/edit/specific/ents_edit_head.jsp +++ b/webapp/web/templates/edit/specific/ents_edit_head.jsp @@ -1,5 +1,5 @@ -<%-- $This file is distributed under the terms of the license in /doc/license.txt$ --%> - +<%-- $This file is distributed under the terms of the license in /doc/license.txt$ --%> + <% request.setAttribute("dwrDisabled", new Boolean(false)); @@ -11,23 +11,26 @@ String context = request.getContextPath(); <% if (!(Boolean)request.getAttribute("dwrDisabled")) { %> + - - - - - - - - - - - - + + + + + + + + + + + <% } %> diff --git a/webapp/web/templates/page/basicPage.jsp b/webapp/web/templates/page/basicPage.jsp index 0e7ac8aee..295f68539 100644 --- a/webapp/web/templates/page/basicPage.jsp +++ b/webapp/web/templates/page/basicPage.jsp @@ -59,7 +59,11 @@ - ${ftl_head} + + ${ftl_head} + + + ${ftl_identity}