Commit graph

2900 commits

Author SHA1 Message Date
rjy7
bda278e59b Implement StylesheetList and ScriptList view objects and new strategy for templates to direct stylesheets and script files to be loaded onto a page. 2010-05-21 15:55:26 +00:00
rjy7
5ed46b631b NIHVIVO-442. Fixed logout link in identity. Error was in URL generated in FreeMarkerHttpServlet. 2010-05-20 16:58:13 +00:00
rjy7
dbafad9e9e Fixed compile error 2010-05-20 13:23:20 +00:00
rjy7
a005d26f1c Fixed try/catch statement in ContactMailController 2010-05-19 21:31:17 +00:00
rjy7
4f77fa419e Changed class Router to Routes to clarify its purpose. Decode the referrer url in the contact form email. 2010-05-19 21:08:48 +00:00
bdc34
947c6841c9 Changing log message so it is less alarming on startup 2010-05-19 20:55:27 +00:00
bdc34
8b7d510e26 Removing AXIS web services. NIHVIVO-415 2010-05-19 19:52:29 +00:00
rjy7
f88a77d307 Rewrote comment form controllers and templates in FreeMarker. 2010-05-19 19:50:54 +00:00
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
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
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
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
bdc34
a8cfc10b2e Fixing bug in HTTP accept header processing as requested by timbl@w3.org 2010-05-11 13:50:33 +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
83f0854c31 resolution of JIRA issue NIHVIVO-404 2010-04-28 14:47:47 +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
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
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
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
hjk54
17ef726ad8 Changes and updates related to Datastar (and or testing) 2010-04-12 16:23:45 +00:00
bdc34
59f9edc53f merging r4700 to trunk 2010-04-08 20:36:19 +00:00
rjy7
6526c3c882 NIHVIVO-331 Merge revision from rel-1.0-maint branch: Provide appropriate error message when a new user logs in, is prompted to change password, and re-enters the original password instead of a new one. 2010-04-08 20:13:35 +00:00
bdc34
e106dff219 merging revision 4685 2010-04-08 18:44:25 +00:00
rjy7
caedb8861e Add utilities and corresponding unit tests for manipulation of strings and display dates. 2010-04-08 16:44:52 +00:00
bjl23
66e555b0bf copying changes to trunk for NIHVIVO-322 'Statements added by SPARQL CONSTRUCTs in the ontology updater are not recorded in the log or added statements file' 2010-04-08 15:26:13 +00:00
bdc34
96d902219d Fixing bug with dependent resource delete. NIHVIVO-304 2010-04-06 22:04:49 +00:00
bjl23
35452e8b36 resolves NIHVIVO-171 re: syntactically invalid restrictions 2010-04-05 15:59:31 +00:00
bjl23
16f3dd4324 resolves NIHVIVO-287 cardinality form 2010-04-05 13:04:27 +00:00
bjl23
c8172a49ea bugfixes for NIHVIVO-177 and NIHVIVO-205 2010-04-05 12:37:40 +00:00
rjy7
41c84beade NIHVIVO-193 On step 1 of position history form, don't show Continue button. Instead, bind the event listener that opens the rest of the form to a selection from the org drop-down. 2010-04-04 22:56:33 +00:00
bdc34
4ea2ae107b Fixing bug in PropertyEditLinks when requesting an edit link for a property that doesn't exist. 2010-04-03 21:44:23 +00:00
bdc34
6b6cef2e71 Removing more portal filtering NIHVIVO-194 2010-04-03 00:29:42 +00:00
bdc34
5da58324b8 Change individual display so labels for moniker, blurb, citation, and description only appear if the user has edit permissions for those properties. NIHVIVO-275 2010-04-02 23:13:09 +00:00
bjl23
4a3ef8d03d minor improvement for NIHVIVO-205 ontology upgrade 2010-04-02 22:52:34 +00:00
bjl23
f5627b74a6 adding a missing lock release 2010-04-02 22:32:13 +00:00
bjl23
0703632f9a improvements for NIHVIVO-205 ontology upgrade 2010-04-02 20:55:39 +00:00
sjm222
369454233f extra line between change records, NIHVIVO-205 2010-04-02 20:32:35 +00:00