Commit graph

10 commits

Author SHA1 Message Date
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
rjy7
ca6ab8288e NIHVIVO-1386 Self-editors don't get SiteAdmin link in top nav. They also don't get revision info link in footer. Implemented with new User template model class. Changed tests for loginName, showFlag1Status in templates to use this object. 2010-11-23 01:28:39 +00:00
rjy7
fa247f1f79 Renamed Freemarker macro files. Implemented data input portion of main site admin page in Freemarker. 2010-08-30 22:06:17 +00:00
rjy7
cb1ab5a041 In FreeMarkerHttpServlet.getTemplateLoader(), handle the case where the theme directory has no templates subdirectory without an error. 2010-07-09 22:10:43 +00:00
rjy7
5a11344775 NIHVIVO-649 Add freemarker template flattening to build. Includes flattening of template directory structure in vivo theme, and renaming of templates as needed for clarity. 2010-07-08 17:10:31 +00:00
rjy7
fb0377134b NIHVIVO-658 Reintegrate changes from dev-freemarker-new. Most necessary updates to freemarker controllers for thread-safety are complete. A couple of details remain. 2010-06-24 21:51:46 +00:00
rjy7
4e168078c6 Added Support link to header and footer link lists. Modified firstLastList macro so it doesn't require delimiters separating the list items. 2010-06-09 19:37:16 +00:00
rjy7
340970c891 Miscellaneous minor changes for Freemarker implementation. Restored old entitylist instead of new individuallist until url errors in the latter are fixed. 2010-06-02 21:23:23 +00:00
rjy7
037ff45736 Complete default individual list view in FreeMarker 2010-06-02 17:06:55 +00:00
rjy7
b7d2027da4 Some reorganization of templates. Restored entitylist as destination of links on index page, since new individuallist controller/templates not finished yet. 2010-05-26 14:03:59 +00:00
Renamed from webapp/web/templates/freemarker/components/identity.ftl (Browse further)