Commit graph

4841 commits

Author SHA1 Message Date
rjy7
d24ea067ca Temporarily add back CONTACT, since the version of FreeMarkerHttpServlet in svn is looking for it. 2010-05-19 18:31:53 +00:00
rjy7
6741f7d586 Fix link to individual list page 2010-05-18 17:38:47 +00:00
rjy7
269b89825f Reorganized FreeMarker controllers into a single package 2010-05-18 14:24:03 +00:00
rjy7
fc8c9876f0 Move Terms of Use controller & template into FreeMarker. 2010-05-17 21:30:54 +00:00
rjy7
8a83103367 Moved vivo-basic theme jsps out of themes into productMods, to make them less easily accessible to theme customizers. 2010-05-17 19:22:30 +00:00
rjy7
046ca60439 Use FreeMarker controller and templates for About and Index pages. Improvements to FreeMarkerHttpServlet.getUrl() method. Unit tests for FreeMarkerHttpServlet static methods. 2010-05-17 17:26:40 +00:00
jeb228
92f9280af0 NIHVIVO-222 Second step at coding the Java-based SeleniumRunner. 2010-05-17 14:17:01 +00:00
hjk54
1c5e7fdde8 Removing debugging messages/text 2010-05-17 14:01:01 +00:00
rjy7
aab3f23f3a Breadcrumbs template. Copied some templates into vivo-basic theme. 2010-05-14 20:50:33 +00:00
sjm222
8d538b5fc6 modifications for NIHVIVO-246.
changed the getSuperPropertyURIs and getSuperClassURIs methods in the property and class DaoJenas (and the interfaces that they implement, and the filtering code) to take an additional boolean argument named direct and to pass it to the Jena call.

changed the edit controllers to invoke the above methods with direct=false.

changed the recursive methods within the daos to invoke the above methods with direct=true
2010-05-14 20:40:19 +00:00
rjy7
3105e29bca 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:12 +00:00
hjk54
73172f4f40 Datastar cleanup release - including changes to access permissions review and editing as well as fedora utilities. 2010-05-14 17:37:55 +00:00
rjy7
e402b03ac9 Fix import errors that resulted in build errors 2010-05-12 15:18:21 +00:00
rjy7
7c72f0f37c 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:56 +00:00
rjy7
a0c93fda6d 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:48 +00:00
jeb228
72ee86f0a7 NIHVIVO-222 First step at coding the Java-based SeleniumRunner. 2010-05-11 14:06:28 +00:00
bdc34
a8cfc10b2e Fixing bug in HTTP accept header processing as requested by timbl@w3.org 2010-05-11 13:50:33 +00:00
rjy7
da6ac0eef1 Add StringProcessorTag taglib directive - was missing, even though tags were used. 2010-04-30 17:39:56 +00:00
jeb228
44f9706d82 NIHVIVO-327 Set <sync> steps to not fail if ontologies or submodels directories are missing. Modify <copyetc> target to copy those directories even if they are empty. 2010-04-30 14:02:49 +00:00
jeb228
de2fe22338 NIHVIVO-213 Modify product-build so a /src directory does not require a productMods/WEB-INF/lib directory. 2010-04-29 20:24:25 +00:00
rjy7
27025bff72 NIHVIVO-247 Upgrade jquery from 1.2.6 to 1.4.2 2010-04-29 18:59:22 +00:00
sjm222
886d88e129 change method name (of the method newly added to PropertyDaoJena) from getClassesRestrictedOn to getClassesWithRestrictionOnProperty (NIHVIVO-404) 2010-04-28 17:01:17 +00:00
sjm222
d718ebb9de Resolution of JIRA issue NIHVIVO-404 2010-04-28 14:48:23 +00:00
sjm222
83f0854c31 resolution of JIRA issue NIHVIVO-404 2010-04-28 14:47:47 +00:00
jeb228
082627f121 Clean up svn:ignore property 2010-04-26 14:09:28 +00:00
jeb228
f43164e0f0 NIHVIVO-241 tweak the file handling, expanding paths properly. 2010-04-16 14:00:05 +00:00
jeb228
ff36a1b06d NIHVIVO-241 comments 2010-04-16 13:59:17 +00:00
rjy7
4359520ee8 Added validation to custom activity form to ensure that end date does not precede start date 2010-04-15 21:43:33 +00:00
jeb228
bca0df0570 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:14 +00:00
rjy7
1d5eedae4c Load custom form css before theme css, so the latter can more easily be used to override the former. Load custom form js at bottom of page rather than top (Javascript best practice). 2010-04-15 19:40:09 +00:00
rjy7
be65629194 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:10 +00:00
rjy7
1df47314e1 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:41 +00:00
jeb228
48df581b0b Manually copy TestController.java from branch - manual merge of 4734. 2010-04-14 17:59:56 +00:00
jeb228
d0756fa6ce Manually copy IndexBuilder.java from branch - manual merge of the remainder of 4725 (other files already merged). 2010-04-14 17:58:15 +00:00
jeb228
846aad6d50 Manually copy EntityController.java from branch - manual merge of 4721, 4722 and the remainder of 4719 (web.xml was already merged). 2010-04-14 17:54:55 +00:00
rjy7
16496437c9 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
jeb228
4965958602 Merge 4725 and most of 4732 into the trunk (IndexBuilder.java would not merge). 2010-04-14 14:42:26 +00:00
rjy7
5579c1a9ac 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
rjy7
56b92576f3 NIHVIVO-375 Merging from rel-1.0-maint branch: Add a case for both existing org and new org name empty to custom form validation. Small change to personHasPosition validator. 2010-04-13 20:27:05 +00:00
jeb228
e1ceb15339 Merge revisions 4740 and 4744 to the trunk. For bdc34 and jeb228. 2010-04-13 19:56:59 +00:00
jeb228
b88ed19ed0 Merge revisions 4706 4715 4724 4726 4731 4733 4734 4735 4739 to the trunk. For bjl23 and bdc34. Also web.xml from 4719, but not EntityController.java, which causes SVN to barf. 2010-04-13 19:51:58 +00:00
nac26
10bf357d5e NIHVIVO-355 merging fix into trunk to hide tagline field 2010-04-13 16:50:40 +00:00
nac26
59ac3aff2d NIHVIVO-358 merging bug fixes into trunk 2010-04-13 16:49:33 +00:00
hjk54
17ef726ad8 Changes and updates related to Datastar (and or testing) 2010-04-12 16:23:45 +00:00
jeb228
1fb7530c57 Merge revision 4716 from the branch - for bdc34. 2010-04-12 14:22:35 +00:00
jeb228
b49a6e3b3a NIHVIVO-340 for bdc34 - Merging 4710 and 4711 into the trunk. 2010-04-12 13:29:27 +00:00
bdc34
e65e72a065 merging r4717 from nihvivo-rel-1.0-maint to trunk 2010-04-09 18:17:52 +00:00
rjy7
211fef1551 NIHVIVO-343 Merge changes from nihvivo-rel-1.0-maint: Include add moniker links when user has editing privileges on the moniker. 2010-04-09 15:47:08 +00:00
bdc34
75d176e263 merging r4708 into trunk. 2010-04-08 22:07:04 +00:00
bdc34
5a22f2099d merging r4705 into trunk 2010-04-08 21:21:21 +00:00