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

5155 commits

This branch
This branch
All branches
Author SHA1 Message Date
hlm7
8e3ebe86aa 2010-05-21 14:29:53 +00:00
hlm7
df92d3b16e 2010-05-21 14:29:41 +00:00
hlm7
f09c49201e 2010-05-21 14:28:31 +00:00
hlm7
ab7a7e6c9c Holly added a pause 2010-05-21 14:18:43 +00:00
rjy7
2646c9ff74 Rewrote comment form controllers and templates in FreeMarker. 2010-05-19 19:50:56 +00:00
rjy7
31d4cdee40 Reorganized FreeMarker controllers into a single package 2010-05-18 14:24:05 +00:00
rjy7
331907b4cc Move Terms of Use controller & template into FreeMarker. 2010-05-17 21:30:55 +00:00
rjy7
015ee4c448 Moved vivo-basic theme jsps out of themes into productMods, to make them less easily accessible to theme customizers. 2010-05-17 19:30:26 +00:00
rjy7
a6722233aa NIHVIVO-154 Added sample google analytics tracking code, and an include to the template. 2010-05-14 21:33:43 +00:00
rjy7
01be04827a Breadcrumbs template. Copied some templates into vivo-basic theme. 2010-05-14 20:50:33 +00:00
rjy7
138f5bf496 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:13 +00:00
rjy7
f5fe62039e Implement multi-location template loading to look for a template first in the themes directory, then in the vitro template directory. 2010-05-12 15:08:57 +00:00
rjy7
e3e38c87c6 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:50 +00:00
rjy7
3a78b7ae23 Add class to footer "About" link to suppress right border if there's no contact page (small change to test) 2010-04-29 19:25:50 +00:00
rjy7
4eb052b3c8 Add class to footer "About" link to suppress right border if there's no contact page. 2010-04-29 19:21:35 +00:00
rjy7
dfe7928ccf FreeMarker development 2010-04-27 22:30:47 +00:00
jeb228
a90c0695e3 Fix mismatched parenthesis 2010-04-27 18:31:31 +00:00
sjm222
5514ec2905 removing local classpath settings that were inadvertently checked in 2010-04-23 16:30:21 +00:00
hlm7
057531db7f 2010-04-19 21:39:38 +00:00
ejc12
5670cbfab9 Adding missing link to txt file. Will add to web version. 2010-04-16 16:52:07 +00:00
rjy7
ff76c04e9f Have custom form Javascript enforce edit forms having one step, in case the custom form forgets to. 2010-04-16 13:41:17 +00:00
rjy7
072512c220 Added validation to custom activity form to ensure that end date does not precede start date 2010-04-15 21:43:34 +00:00
jeb228
5b77126d36 NIHVIVO-241 Move the licenser script into Vitro core, with some re-writing to use relative paths and such, and changes to the build scripts to support it. 2010-04-15 20:20:35 +00:00
rjy7
40990255c7 Added some more Javascript behavior to edit version of custom forms. 2010-04-15 19:53:18 +00:00
rjy7
d255909f3b Added "cancel" link to add new organization box on edit version of position history custom form. Previously had only been present on educational background form. Removed the link in non-Javascript version. 2010-04-15 19:34:26 +00:00
rjy7
a5f9d133c0 NIHVIVO-377 When a custom form fails validation due to a missing organization, the server generates an error appropriate to the non-Javascript version of the form, and the Javascript then modifies it for the Javascript version of the form. 2010-04-14 21:28:11 +00:00
rjy7
1f2b200320 Improved custom form behavior so after returning from a failed submission due to validation errors, we can return to the view we were on, without attempting to detect that from the organization input field data (since if all three fields are empty we cannot determine the previous view). 2010-04-14 20:33:42 +00:00
rjy7
34e80cff4e Merging r447 through r448 (Brian Caruso's custom form validation code) from rel-1.0-maint 2010-04-14 18:48:12 +00:00
hlm7
6633aa3a70 2010-04-14 18:40:37 +00:00
hlm7
8adff65f4c 2010-04-14 18:40:12 +00:00
hlm7
1a3405fe05 2010-04-14 18:39:26 +00:00
jeb228
443d200ef3 Add output line so we know what suite we are running. 2010-04-14 15:47:10 +00:00
rjy7
36e79de5ff NIHVIVO-379 Merge vitro nihvivo-rel-1.0 r4753, vitro rel-1.0-maint r477: Remove front end editing capabilities from moniker, blurb, and citation. 2010-04-14 15:09:12 +00:00
rjy7
010a143880 Merging revision 474 from rel-1.0-maint. 2010-04-13 23:24:35 +00:00
rjy7
83d1b564ef NIHVIVO-377 Initial work on getting custom form to retrieve its past state after a failed form submission. Not all cases working yet. 2010-04-13 23:05:28 +00:00
bjl23
b5db8baf0e merging label change back to the trunk 2010-04-13 21:01:36 +00:00
hlm7
3f51b8a32d 2010-04-13 19:37:29 +00:00
ejc12
d827b20459 Added a section to have them remove the Location "edit/forms" deny from all. Manual merge from branch. 2010-04-13 19:04:35 +00:00
rjy7
b8ccb8d9ef Improvements to handling of required hints in customForm.js 2010-04-13 18:50:38 +00:00
ejc12
a81c768bb6 Merge rev 460 to trunk. Includes context changes. 2010-04-13 18:31:40 +00:00
hlm7
1b060d931d 2010-04-13 18:27:24 +00:00
hlm7
e258c5292a 2010-04-13 18:27:13 +00:00
hlm7
3953c41555 2010-04-13 18:27:04 +00:00
hlm7
37a88715e1 2010-04-13 18:26:37 +00:00
hlm7
50e75b491b 2010-04-13 18:26:24 +00:00
nac26
011be7ffe1 NIHVIVO-343 merging bug fix into trunk. CSS tweak to correct layout for site admin in ie7 2010-04-13 16:51:53 +00:00
rjy7
c95976fbc6 Merging changes from rel-1.0-maint branch. 2010-04-13 14:44:31 +00:00
jeb228
fd98969be3 Merge revisions 415 to the trunk. For bdc34 2010-04-13 12:57:52 +00:00
jeb228
b6cf423af4 Merge revisions 410 and 443 to the trunk. For sjm222 and bjl23 2010-04-13 12:52:14 +00:00
jeb228
107b12c9a3 Merge revisions 411 419 422 426 427 428 and 439 to the trunk. For ejc12 2010-04-13 12:33:30 +00:00