Commit graph

1068 commits

Author SHA1 Message Date
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
ejc12
ef2026b3e9 Holly made changes due to Release 1.1.1 RC2 testing. 2010-10-08 14:21:35 +00:00
ejc12
26f04a241a Holly made test case changes per changes in VIVO release 1.1.1. 2010-10-07 17:41:24 +00:00
jeb228
946542543e Merge 1472 from the branch: VIVOFEED-603 Tweaks, typos and minor corrections. 2010-10-07 16:46:11 +00:00
ejc12
35a6f2a962 Merging from branch to trunk - New file to deal with upgrade from V1.1 to V1.1.1 with pointers to upgrade-1.1.txt for folks upgrading from V1.0 to V1.1.1 where needed. 2010-10-06 21:07:37 +00:00
ejc12
28afb5895c Merged from branch - Updated to point to V1.1.1 file 2010-10-06 21:02:43 +00:00
mb863
1d84201acb Added new utils.js files and folder under js for javascript code need it for the theme. 2010-10-06 20:32:00 +00:00
mb863
5ab172e929 Updated list of exception files in VIVO 2010-10-06 19:41:10 +00:00
mb863
f7d4c653b5 Deleted vivo/themes/wilma/js and moved files to webapp/web/js 2010-10-06 18:18:08 +00:00
mb863
69d548436f NIHVIVO-555. Added comment to page.ftl and added new path files to the
license-insertion process file
2010-10-06 16:08:25 +00:00
mb863
7aca168460 NIHVIVO-555. Deleted comment 2010-10-06 15:56:12 +00:00
mb863
e164e2af8e NIHVIVO-555. Added a list of files and directories that are known exceptions to the license-insertion process. 2010-10-06 15:38:43 +00:00
mb863
a18bee2b6b Removed jsp's from new theme based on work in revision 6026 on VITRO trunk. 2010-10-06 14:22:07 +00:00
mb863
78a152ea12 NIHVIVO-555, NIHVIVO-559. Introducing new default VIVO theme. Work in progress. 2010-10-06 14:16:12 +00:00
nac26
7713dd2ca1 Merge r1452 from rel-1.1-maint branch. Added commented-out div for those looking to apply institutional branding. 2010-10-05 16:22:06 +00:00
jeb228
13f51bc712 NIHVIVO-1044 Merged 1453 from the maintenance branch. 2010-10-05 16:20:31 +00:00
sjm222
9fac8948e2 adding in changes made to 1.1.1 branch 2010-10-05 14:32:58 +00:00
nac26
3734b16d1c updated include path for footer.jsp, identity.jsp and menu.jsp to reflect their new location in the vitro core 2010-10-05 03:14:58 +00:00
nac26
5bb4b7794f Merge r1445 from rel-1.1-maint branch. Moving footer.jsp, identity.jsp, and menu.jsp to vitro core (were temporarily in vivo/productMods) so they are not tied to vivo-basic and can be used by any theme. 2010-10-04 23:39:05 +00:00
nac26
7e49295417 Merge r1440 from rel-1.1-maint branch. Moving footer.jsp, identity.jsp, and menu.jsp so they are not tied to vivo-basic and can be used by any theme. 2010-10-04 17:20:03 +00:00
rjy7
1bd624d550 NIHVIVO-1187 Migrate handling of empty or invalid query from PagedSearchController to FreemarkerPagedSearchController 2010-10-01 20:53:14 +00:00
nac26
96c91a9195 Merge r1431,1436 from rel-1.1-maint branch (IE6 fix for coathorship visualization page) NIHVIVO-954 2010-10-01 20:01:46 +00:00
nac26
eba31a884a Merge r1430 from rel-1.1-maint branch (IE fix for search bar width) 2010-10-01 18:42:09 +00:00
cdtank
3ed20ae4fd 1. Made checking for "if the sparkline visualization should be rendered for an entity" safer per Brian L's suggestion. 2010-10-01 17:42:31 +00:00
cdtank
0f6c18fca1 1. Removed the checking of publication being an instance of bibo:Document in sparql query. This check is unnecessary. Refer [VIVOFEED-583] at http://issues.library.cornell.edu/browse/VIVOFEED-583 for more info. 2010-10-01 17:25:51 +00:00
cdtank
bc89ddbb91 1. Fixed a bug where in person level vis for people who do not have any image attached to it, there was a silent error message being provided to the front-end, which caused for extra css files to be loaded. 2010-09-30 20:42:12 +00:00
rjy7
8efaf54ee3 Merge r1408:1410 from rel-1.1-maint: externally-linked namespaces. 2010-09-29 18:58:51 +00:00