litvinovg/vivo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
1144 commits 8 branches 1 tag 111 MiB
Commit graph

1144 commits

This branch
This branch
All branches
Author SHA1 Message Date
sjm222
16bd448853 Adding ontology state as of Nov 5. 2010-11-05 13:57:58 +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
jeb228
fe89fd6c62 NIHVIVO-1230 NIHVIVO-1231 Example implementation of the Freemarker templates to show revision info. 2010-10-27 19:59:35 +00:00
rjy7
97118e16eb NIHVIVO-1287 Moved changes from PagedSearchController to FreemarkerPagedSearchController, since this is the active search controller in vivo and vitro 2010-10-27 18:57:15 +00:00
nac26
935e7490f2 NIHVIV-1287 reinstated PagedSearchController in lieu of FreemarkerPagedSearchController since it's not quite ready for prime time 2010-10-27 16:26:41 +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
sjm222
f8cd744daa VIVOONT-221 implement new date/time representation. VIVOONT-197 add several new academic degrees. 2010-10-26 22:58:09 +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
nac26
aaf4458cbf missed a couple files on that last commit due to copying directories from my local working copy... NIHVIVO-556 2010-10-26 17:27:42 +00:00
nac26
8ccfef4fcc more tweaks to wilma to correct issues with theme images (visualization, property groups, and editing) and markup conflicts for custom editing forms NIHVIVO-556 2010-10-26 17:17:37 +00:00
jeb228
41c8c202d9 NIHVIVO-1229 Set up the RevisionInfo when the application is initialized. 2010-10-25 21:32:09 +00:00
mb863
5b1a9ed4b9 Added back menu.ftl and footer.ftl to VIVO/themes/wilma/templates because VIVO/themes/wilma/templates/page/basic-Page.jsp needs these templates to function properly 2010-10-25 19:39:50 +00:00
mb863
97720d3720 Further development of Wilma theme, still include a lot of temporary files and directories. There are duplicated files, wrong file image location, still a work in progress. 2010-10-25 18:43:26 +00:00
rjy7
3dd0b5163f NIHVIVO-1234 Restored version of home page controller and templates that uses a pre-generated body string, like other pages, in order to support themes that use page.ftl instead of a page-home.ftl. 2010-10-25 18:20:32 +00:00
rjy7
33981afe1d NIHVIVO-1234 Initial version of HomePageController and templates 2010-10-22 21:39:17 +00:00
ejc12
edfe3655fe Adding information that augments the tomcat connnector when there are more than one webapp context. VIVOFEED-244 2010-10-22 19:17:39 +00:00
ejc12
af172564cd Quick comment about NIH-funded institutions regarding GATC. 2010-10-21 20:00:07 +00:00
ejc12
fba4e40549 Adding information about setting the limits.conf file to improve performance. 2010-10-18 15:12:26 +00:00
ejc12
8789f269fc Adding information about setting the limits.conf file to improve performance. 2010-10-18 15:09:03 +00:00
sjm222
0aff2c6fcd Manual merge of NIHVIV-1203 from the 1.1.1 branch - because the merge tool didn't work properly for me (or people I asked for help) for this particular update. 2010-10-14 18:00:57 +00:00
ejc12
6242624dea Holly's final changes from testing release 1.1.1 rc 3. 2010-10-14 17:03:52 +00:00
jeb228
cd437cfab5 NIHVIVO-736 transitioning from LoginFormBean to LoginStatusBean. 2010-10-13 16:46:23 +00:00
ejc12
53bb8d38c5 1477 - Merging into trunk from rel-1.1-maint branch - Last revisions to upgrade doc. 2010-10-08 18:32:28 +00:00