nac26
|
b27b3aa607
|
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.
|
2010-12-15 13:46:09 +00:00 |
|
nac26
|
9892846244
|
NIHVIVO-1389 NIHVIVO-1407 NIHVIVO-1437 Significant refactoring of templates both in vitro core and vivo themes to ensure consistent markup with 3 different base templates at play (page.ftl, basicPage.jsp and formPrefix/formSuffix.jsp) Resulted in creating smaller component freemarker templates that could be included by all of the base templates, whether ftl or jsp. This is a temporary compromise while we continue our conversion to Freemarker. The goal was to keep jsp files outside of the theme and working behind the scenes.
|
2010-12-08 14:05:16 +00:00 |
|
nac26
|
ae449f9f2c
|
Merge r6025 from nihvivo-rel-1.1-maint branch. Moved footer.jsp, identity.jsp, and menu.jsp to vitro core (were temporarily in vivo/productMods) so they are not tied to vivo-basic and can be used by any theme. Updated include paths for all templates that include these 3 files.
|
2010-10-05 03:13:14 +00:00 |
|
jeb228
|
4f2e303079
|
Improve output: distinguish between failed assertions (failures) and unexpected exceptions (errors), and print a filtered stack trace for any exception.
|
2010-01-29 22:13:57 +00:00 |
|