Commit graph

35 commits

Author SHA1 Message Date
nac26
0ed2c4ece5 Syntax cleanup 2011-02-09 06:06:23 +00:00
rjy7
1f16791d2a NHIVIVO-2051 Fix values of currentServlet (was currentPage) and urls.currentPage 2011-02-08 22:33:01 +00:00
rjy7
17d41d281a NIHVIVO-2071 Include pageSetup.ftl in every page template. Use to generate a body class value, and apply to body element in page templates. 2011-02-08 21:07:16 +00:00
rjy7
12406d35d0 NIHVIVO-1864 Fix menu.jsp to work with changes to menu.ftl and identity.ftl since the initial freemarker transition 2011-02-03 20:07:00 +00:00
nac26
66163d24c2 Reordered scripts to ensure jQuery is first. Put html5.js within conditional comments so that the additional http request is fired only for those browsers that need the crutch (IE8 and below) 2011-02-03 14:34:20 +00:00
tlw72
38227f9115 have the welcome message fade out 2011-01-19 14:53:00 +00:00
nac26
6b47329954 Refactored approach for inserting visualization links on menu pages. Still hoping to remove JavaScript altogether based on outcome of NIHVIVO-1681. Also introduced the initial version of application-wide styles with vitro.css. 2011-01-13 14:05:14 +00:00
mb863
9197b888cc Moved supersleight.js to vitro core. 2011-01-12 22:25:44 +00:00
rjy7
a504b703bd NIHVIVO-1380 Comment on use of variable ${headContent} in the templates 2011-01-10 23:38:41 +00:00
rjy7
be8930ea5c NIHVIVO-1380 On individual page, add rdf link tag for discoverable rdf 2011-01-10 22:19:35 +00:00
nac26
cea493de32 Moved call for individual.css and menupages.css to respective templates now that controllers are in place 2010-12-23 15:05:03 +00:00
nac26
cd7e362de3 Removed some temporary comments. 2010-12-22 23:33:28 +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
4f909b3a6e added link for index page 2010-12-04 23:08:27 +00:00
mb863
ed08113669 NIHVIVO-1238: Continue working on styles and making custom forms theme agnostic 2010-12-02 22:45:51 +00:00
mb863
73aea203ed NIHVIVO-556: Moved screen.css to theme level. 2010-12-02 20:55:47 +00:00
nac26
584a285465 moving <script> for jquery into the vitro core and out of the themes 2010-12-02 17:53:30 +00:00
mb863
9f22a78864 NIHVIVO-1238: Making custom forms theme agnostic 2010-12-01 19:39:10 +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
mb863
d4c96c6ba9 vivo-basic wasn't rendering property. Now It is fixed. 2010-11-18 18:50:52 +00:00
mb863
239c38b3c3 NIHVIVO-1361: clean up, added login.css to stylesheets.ftl 2010-11-17 23:16:59 +00:00
jeb228
a7a083c7b3 NIHVIVO-1230 NIHVIVO-1231 Example implementation of the Freemarker templates to show revision info. 2010-10-27 19:57:57 +00:00
rjy7
9941cb206e NIHVIVO-1230 Added a comment 2010-10-27 15:00:57 +00:00
rjy7
9b3ac410c2 NIHVIVO-1230 Added stub for version info in FreemarkerHttpServlet and templates 2010-10-27 14:51:50 +00:00
rjy7
3269252aaa Initial work moving individual profile page to Freemarker. Includes temporary servlet mappings for new Freemarker page. Allow adding script tags to the page head element. 2010-09-08 20:37:28 +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
e3d09333c4 Merge r5371:5373 from http://svn.mannlib.cornell.edu/svn/vitro/branches/nihvivo-rel-1.1-maint 2010-07-21 22:02:11 +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
jeb228
e92bea31bf Add license tags, or list as known exceptions. 2010-06-22 14:55:55 +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