Commit graph

38 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
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
rjy7
174c548b27 NIHVIVO-151. Display the DisplayMessage on the next page loaded. Clear the message from the session. Added sample display markup to page templates. 2010-11-16 19:09:03 +00:00
rjy7
c0d24139dc A new approach to widgets, that will allow them to be invoked directly from a page template, rather than a body template, but still add files to the template stylesheets and scripts objects. 2010-10-29 19:12:40 +00:00
rjy7
c178c8d922 NIHVIVO-1297 Undid the effects of revision 6246. This was a mistake, since including the body template from the page template rather than pregenerating the body string doesn't allow the addition of stylesheet tags to the page head. 2010-10-29 16:44:29 +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
df3a3dd1c7 NIHVIVO-1234 Removed separation of body and root maps in Freemarker controllers. Combine everything into one map, which includes the name of the body template also, to be invoked from the page template. Simplifies the logic considerably, in both controllers and templates, and allows the template author to dump the name of the body template rather than having to inspect the controller code. 2010-10-27 01:27:52 +00:00
rjy7
3a0feaeff2 NIHVIVO-1234 Initial version of HomePageController and templates 2010-10-22 21:39:14 +00:00
rjy7
5bc5c0b93c NIHVIVO-1176. Removed themeStylesheetDir from template model, and replaced with themeDir. Also modified stylesheet and script addFromTheme methods so the prepend only the theme directory; the specific stylesheet or css directory must be added to the path argument. 2010-10-01 14:55:03 +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
nac26
b99b6fac14 fixed a couple typos in the comments at the bottom of this page 2010-07-15 16:29:49 +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
df683191cf Changed template variable stylesheetDir to themeStylesheetDir for clarity. Added examples of how to add a script from a body template. Pass themedir to ScriptList object. 2010-06-25 17:44:50 +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
rjy7
197aa2f4f9 Tweaks to: adding stylesheets from freemarker templates; contact form styles. Add sender's name to sender address on contact form email notification. 2010-05-21 16:39:32 +00:00
rjy7
bda278e59b Implement StylesheetList and ScriptList view objects and new strategy for templates to direct stylesheets and script files to be loaded onto a page. 2010-05-21 15:55:26 +00:00
rjy7
f88a77d307 Rewrote comment form controllers and templates in FreeMarker. 2010-05-19 19:50:54 +00:00
rjy7
fc8c9876f0 Move Terms of Use controller & template into FreeMarker. 2010-05-17 21:30:54 +00:00
rjy7
aab3f23f3a Breadcrumbs template. Copied some templates into vivo-basic theme. 2010-05-14 20:50:33 +00:00
rjy7
3105e29bca Use FreeMarker templates to generate page identity, menu, search, and footer in JSP pages. This will allow theme authors to work just with the ftls rather than having to maintain both jsp and ftl versions of these templates, during the transition from JSP to FreeMarker. 2010-05-14 20:01:12 +00:00
rjy7
a0c93fda6d Move FreeMarker templates, controllers, setup, and library upgrades into trunk. Not used to generate any pages or templates yet (except a couple of hidden pages that are only available through the url). 2010-05-11 20:37:48 +00:00