Commit graph

2162 commits

Author SHA1 Message Date
bjl23
1a008ee5a1 web.xml update for NIHVIVO-1221 2010-11-11 21:20:30 +00:00
bdc34
30e1269c3e Adding test for DateTimeWithPrecision. 2010-11-11 19:12:08 +00:00
jeb228
b8ec635ac0 NIHVIVO-1207 Add the LoginShibboleth servlet. 2010-11-10 21:26:30 +00:00
rjy7
3cd38b7583 NIHVIVO-1304 Initial implementation of Widget directive. Requires two templates, one for assets and one for markup; would like to combine into a single template with two macros instead. 2010-11-10 19:50:30 +00:00
bjl23
8fb9c56b86 temporarily disabling browse controller on SDB 2010-11-10 17:15:10 +00:00
sjm222
2196092a69 New directories for file graphs for NIHVIVO-1311 2010-11-10 15:19:04 +00:00
bdc34
8968b07c53 Working on date time with precision edit element, NIHVIVO-295. 2010-11-09 20:37:09 +00:00
sjm222
16bd448853 Adding ontology state as of Nov 5. 2010-11-05 13:57:58 +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
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
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
sjm222
f8cd744daa VIVOONT-221 implement new date/time representation. VIVOONT-197 add several new academic degrees. 2010-10-26 22:58:09 +00:00
sjm222
099c8534ce VIVOONT-221 implement new date/time representation. VIVOONT-197 add 3 new Academic Degrees. 2010-10-26 22:50:35 +00:00
jeb228
41c8c202d9 NIHVIVO-1229 Set up the RevisionInfo when the application is initialized. 2010-10-25 21:32:09 +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
33981afe1d NIHVIVO-1234 Initial version of HomePageController and templates 2010-10-22 21:39:17 +00:00
bjl23
931ebecb1d disabling Pellet on sdb-dev 2010-10-15 20:40: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
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
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
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
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
rjy7
b9833f2d11 Merge r1397:1399 from rel-1.1-maint 2010-09-28 15:34:26 +00:00
rjy7
9a918e911f Merge r1390-1395 from rel-1.1.-maint: custom sorting and collation 2010-09-28 15:02:39 +00:00
rjy7
3d612872c8 NIHVIVO-1098 Make start year optional when adding a new position as well as when editing an existing position 2010-09-23 20:26:34 +00:00
rjy7
1b45d59529 Fixed bug in interaction with autocomplete help text and other changes on the trunk 2010-09-23 20:26:01 +00:00
rjy7
f54cbe5b92 NIHVIVO-650 Display image on new (Freemarker) individual profile page. Add <@url /> directive to generate img src value. 2010-09-21 16:05:38 +00:00
tlw72
84598559fd Merge r1375 from rel-1.1-maint branch (autocomplete help text changes) 2010-09-21 14:25:10 +00:00
tlw72
2684dcd035 Commented out customForm.acSelector.focus(), which was clearing ac help text 2010-09-21 14:04:01 +00:00
tlw72
e76b9647e6 r1378 merge from rel-1.1-maint; resized acSelector element 2010-09-20 21:11:58 +00:00
rjy7
ce74bfc81e Change sortable event that triggers author reordering from stop to update. 2010-09-20 20:11:51 +00:00
tlw72
b01dbf2d54 Merge 1375 from rel-1.1-maint branch; autocomplete help text 2010-09-20 18:13:00 +00:00
tlw72
e48d80d008 Change for autocomplete help text; merge from r1374 in rel-1.1-maint branch 2010-09-20 17:46:33 +00:00
rjy7
6af4b3c87d Some refactoring in FreemarkerHttpServlet 2010-09-16 15:50:39 +00:00
cdtank
571182b98e 1. Made changes to the styling of text for the sparklines. Made them more amenable to IE's whims. 2010-09-15 20:46:08 +00:00
rjy7
62761c9542 CSS fixes for custom forms 2010-09-15 20:20:47 +00:00
rjy7
a83ebecc36 NIHVIVO-650 Reworked Freemarker sparkline implementation for better controller/view separation 2010-09-10 14:23:58 +00:00
rjy7
5f0e4515fb Merge r1363 from rel-1.1-maint 2010-09-10 13:37:41 +00:00
rjy7
f776d5de09 NIHVIVO-650 Display label, moniker, and sparkline visualization on Freemarker version of individual profile page 2010-09-09 21:56:39 +00:00
rjy7
24de7c4471 Merge r1357 from rel-1.1-maint branch (reverting addition of description field to role custom form and short view) 2010-09-08 20:40:02 +00:00
rjy7
5b25d92181 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:26 +00:00
rjy7
e3c30f3227 Merge r1348:1350 from rel-1.1-maint 2010-09-08 14:27:28 +00:00
rjy7
b4e5a3903b Merge r1346 from rel-1.1-maint 2010-09-08 13:51:47 +00:00
rjy7
5484036ee9 Put focus on acSelector field after type is selected in custom forms. 2010-09-07 20:54:13 +00:00