Commit graph

594 commits

Author SHA1 Message Date
rjy7
eeb70984c7 Committing changes to go with vitro r6482. Added ${url.base} to template model so templates can build urls. Modified templates accordingly to replace ${url.home} with {$url.base}. Also replaced ${url.base}/images with ${url.images}. 2010-11-18 23:24:32 +00:00
mb863
b974e37445 Committing files to VIVO. vivo-basic wasn't rendering property. Created page.ftl to property get the right style files. 2010-11-18 18:52:26 +00:00
nac26
d194ad2678 temporary fix to have all form titles as "Edit" to keep Selenium happy. 2010-11-18 14:37:41 +00:00
mb863
65056de80d NIHVIVO-556: organized Wilma theme screen.css. 2010-11-17 23:18:14 +00:00
mb863
bf6b1e5390 NIHVIVO-556. Added css property to individual.css 2010-11-17 20:30:11 +00:00
mb863
239e5db4b0 NIHVIVO-556: Applying Wilma theme styles to back-end pages 2010-11-17 16:18:55 +00:00
mb863
1f34ad1bbc NIHVIVO-556: styled log in btn 2010-11-17 15:39:05 +00:00
mb863
8ed0438e1d NIHVIVO-556: Added aria roles for accessibility 2010-11-17 15:34:38 +00:00
mb863
0db54244ec NIHVIVO-556: Added accessibility (aria roles). 2010-11-17 14:31:13 +00:00
rjy7
961c11f1a5 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:05 +00:00
rjy7
40958fc813 Added urls.theme to template data model and changed paths containing themeDir to use urls.theme 2010-11-16 18:32:10 +00:00
rjy7
7d28e601ea Use login widget on login page (committing files that got skipped in r6451). Add help() method to WidgetDirective. 2010-11-16 15:10:12 +00:00
mb863
2830c3554d NIHVIVO-556: Added Google Chrome Frame open source plug-in. It brings Google Chrome's open web technologies and speedy JavaScript engine to Internet Explorer 6,7, and 8. 2010-11-15 20:43:35 +00:00
mb863
30a30bb9a5 NIHVIVO-556: put code back to r-1581 2010-11-12 18:52:40 +00:00
mb863
37d89bba4f NIHVIVO-556: CSS clean up 2010-11-09 21:56:02 +00:00
rjy7
020c8fed0e Corrected path to screen.css 2010-11-09 13:27:35 +00:00
mb863
89113c34a3 NIHVIVO-556. Organized and clean up html header elements and used HEX colors for the all the Wilma css files. 2010-11-08 18:08:10 +00:00
mb863
6226b4c2a1 NIHVIVO-1230: Added VIVO vesion/revision on footer pages, only for authenticated users. 2010-11-05 20:33:28 +00:00
mb863
306b4a44f2 NIHVIVO-556: Created temporary fix for not showing log-in widget after users log-in. 2010-11-05 18:46:18 +00:00
mb863
0083cd84a7 NIHVIVO-556: Changed wrong end tag for h1 on branding section. 2010-11-05 17:42:46 +00:00
mb863
1d5d8d0276 Fixed width for admin panel in individual pages. 2010-11-04 14:24:06 +00:00
mb863
3ca081aa86 Converted tab to spaces. 2010-11-04 13:50:34 +00:00
mb863
856b38dc63 NIHVIVO-556: Fixed code indentation. 2010-11-03 20:07:23 +00:00
mb863
0876f2c28a NIHVIVO-556: Changed H2 containing VIVO logo and tagline for H1.Added proper indentation. 2010-11-03 19:15:51 +00:00
rjy7
2b48aab2a3 Combine addition of scripts and stylesheets into a single macro in the login widget 2010-11-03 02:30:34 +00:00
mb863
9757879cf5 NIHVIVO-556: a few js files were called from the wrong location: html5.js,supersleight.js, and selectivizr.js 2010-11-02 21:47:38 +00:00
mb863
386163f649 Deleted by mistake ${stylesheets.tags} on page.ftl
Included html5.js in a script tag page-home.ftl
2010-11-01 20:53:38 +00:00
mb863
8ad81c7195 reverting to r1560 2010-11-01 20:48:34 +00:00
mb863
5ea9c6a7c8 NIHVIVO-1298: Updated CSS 2010-11-01 19:02:02 +00:00
mb863
bc3af80d28 NIHVIVO-556: Deleted extra ${stylesheets.tags} 2010-11-01 18:46:05 +00:00
mb863
5a841875b9 NIHVIVO-556: supersleight.js was called from VIVO theme instead of VITRO. 2010-11-01 18:41:20 +00:00
mb863
34bbea8cd0 2010-10-29 20:03:16 +00:00
rjy7
c48b7d3d05 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:42 +00:00
rjy7
bc08734bbc 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 17:53:14 +00:00
mb863
9338e2ca0e NIHVIVO-556: page-ftl and page-homepage.ftp don't use any more a wrapper div. Also, HTML5 footer element is styling the footer of those templates. div#footer-content was styling the footer before and it has been deleted. 2010-10-29 15:55:41 +00:00
rjy7
676baeb596 NIHVIVO-1293 Corrected typo in variable name to show classgroup limitation on search results. Also added search.css from vivo-basic, as a temporary measure to format search results. 2010-10-28 20:16:17 +00:00
mb863
8d0e24df42 NIH-VIVO556: Added styles to the theme 2010-10-28 19:26:14 +00:00
nac26
4386a22da0 NIHVIVO-556 removed temporary homeBody.jsp used to render the home page while the controllers were being worked out. Also including login block (login.ftl) on page-home.ftl now. First stab at making this widget like. Would like to remove login.ftl from theme and place in vitro core. 2010-10-28 16:45:05 +00:00
rjy7
96ff5c99b5 NIHVIVO-1234 Handle routing of a request for the home page to the HomePageController by forwarding from TabController 2010-10-28 15:09:20 +00:00
mb863
d431495481 NIHVIVO-556: Wilma clean up and housekeeping. 2010-10-27 22:11:52 +00:00
nac26
835bfff2db NIHVIVO-556 renamed top-level.css to menupage.css and updated some styles for current tabs related to alphaIndex and individual font size 2010-10-27 15:58:07 +00:00
rjy7
1e051cdac1 NIHVIVO-1230 Added stub for version info in FreemarkerHttpServlet and templates 2010-10-27 14:51:51 +00:00
nac26
e2d5dfbc24 NIHVIVO-556 removed duplicate import of individual.css and added rule to underline anchors 2010-10-27 14:27:35 +00:00
nac26
545f5ddc8a Couldn't get the login to work on the home page after refactoring in JSP/FTL mashup world, so disabling for now NIHVIVO-556 2010-10-27 13:48:40 +00:00
nac26
f7517ba34d Markup cleanup, style tweaks and some refactoring of the home page for Wilma. Turns out that all requests for tabs were being routed to the new HomePageController since it had "/index.jsp" set as its url-pattern under the servlet-mapping in web.xml. This isn't going to work as it made every tab render using page-home.ftl. Restored TabController servlet mapping in web.xml temporarily and will discuss potential solutions with Rebecca. NIHVIVO-556 NIHVIVO-1234 2010-10-27 13:21:55 +00:00
rjy7
10c352dbf9 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:54 +00:00
mb863
a78210e137 Updated hightlights section with dummy/real content 2010-10-27 00:28:27 +00:00
mb863
d342ae5b5b NIHVIVO-1234. Added <link> elements to the head. 2010-10-26 23:49:40 +00:00
mb863
9f967b2f90 Fixed picto font rendering. 2010-10-26 21:08:12 +00:00
mb863
1e0429119b Added dummy/real content to page-home.ftl. 2010-10-26 19:22:28 +00:00