rjy7
|
74297a14af
|
Remove call to FreeMarkerHttpServlet.getFreeMarkerComponentsForJsp from VitroHttpServlet, since was getting called more than once per request (since there are multiple servlets that are called for a single request). Use calls from the jsps instead.
|
2010-06-02 17:29:12 +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
|
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
|
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 |
|
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 |
|
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 |
|
rjy7
|
b8ccb8d9ef
|
Improvements to handling of required hints in customForm.js
|
2010-04-13 18:50:38 +00:00 |
|
rjy7
|
c95976fbc6
|
Merging changes from rel-1.0-maint branch.
|
2010-04-13 14:44:31 +00:00 |
|
rjy7
|
888607cf39
|
NIHVIVO-360 Merge changes from rel-1.0-maint branch: Fixed custom form javascript so required hint spans get removed on cancel in IE. IE transforms the text inserted in the html() call, so a string replace was not removing them.
|
2010-04-12 23:49:23 +00:00 |
|
rjy7
|
a8b39bf005
|
NIHVIVO-356, NIHVIVO-362 Merging custom form fixes from rel-1.0-maint branch.
|
2010-04-12 21:26:09 +00:00 |
|
rjy7
|
60f93a2875
|
Merging Brian L's changes from rel-1.0-maint branch
|
2010-04-12 21:03:24 +00:00 |
|
rjy7
|
f3f1f1bc22
|
NIHVIVO-362 Merge from rel-1.0-maint branch: Fixed comma issues in position history custom short view that were observed while investigating this bug.
|
2010-04-12 19:18:25 +00:00 |
|
rjy7
|
f65c491deb
|
NIHVIVO-356 Merge from rel-1.0-maint branch: Change activity form to use vitro ns description property instead of vivo core description property
|
2010-04-12 18:15:39 +00:00 |
|
rjy7
|
be6c40510b
|
Merge small change to customForm.js into trunk
|
2010-04-09 16:42:14 +00:00 |
|
rjy7
|
2f3545796c
|
NIHVIVO-300 Merge changes from rel-1.0-maint to fix ed background short view
|
2010-04-08 15:19:14 +00:00 |
|
rjy7
|
5a929d91bc
|
Removed reference to DisplayUtils in activity short view
|
2010-04-07 21:58:00 +00:00 |
|
rjy7
|
967c53284d
|
NIHVIVO-294 Corrections to custom short view for missing role, missing start date. Merge from /branches/rel-1.0-maint
|
2010-04-07 20:57:35 +00:00 |
|
rjy7
|
e3efdfcaf6
|
Changed field label from "Name" to "Activity Name" on custom activity form. Remove unused Javascript files.
|
2010-04-06 15:03:51 +00:00 |
|
rjy7
|
67c28b9e92
|
NIHVIVO-292 Fixed error when creating new professional service activity
|
2010-04-05 18:39:05 +00:00 |
|
rjy7
|
2fd8efcbca
|
NIHVIVO-291 Added validator to position type to fix position-type related bugs
|
2010-04-05 17:51:17 +00:00 |
|
rjy7
|
d264552364
|
NIHVIVO-195 Fixed custom short view for activities to show date range rather than just start date.
|
2010-04-05 17:20:05 +00:00 |
|
rjy7
|
89380115b5
|
NIHVIVO-195 First draft of custom short view for activities (service, teaching, research, and outreach)
|
2010-04-05 17:16:31 +00:00 |
|
rjy7
|
0822ebbb2d
|
NIHVIVO-195 Add annotations for custom activity forms
|
2010-04-05 15:43:25 +00:00 |
|
bjl23
|
81b0045ede
|
adding a namespace prefix for geopolitical ontology
|
2010-04-05 15:27:36 +00:00 |
|
rjy7
|
1663e9ff2d
|
NIHVIVO-195 Custom activity forms basically working now.
|
2010-04-05 15:27:20 +00:00 |
|
nac26
|
cb2760c1bd
|
NIHVIVO-195 Removed rogue <h1> on line 251
|
2010-04-05 15:01:37 +00:00 |
|
rjy7
|
2d9a10ccea
|
NIHVIVO-195 Working on custom activity forms. Markup is screwed up and form doesn't submit yet.
|
2010-04-05 14:30:49 +00:00 |
|
bjl23
|
a613d78b21
|
changing namespace of academic degrees
|
2010-04-05 12:48:23 +00:00 |
|
nac26
|
f5fcc3ecb9
|
NIHVIVO-194 changed "close" text when adding new organization to "cancel"
|
2010-04-05 05:09:21 +00:00 |
|
rjy7
|
138b1b4bd0
|
NIHVIVO-193, NIHVIVO-194 Comments
|
2010-04-05 02:34:27 +00:00 |
|
rjy7
|
5f428364a2
|
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:35 +00:00 |
|
rjy7
|
f2a9ddd219
|
NIHVIVO-193, NIHVIVO-194. Javascript tweaks
|
2010-04-04 22:21:39 +00:00 |
|
rjy7
|
01deac8aa7
|
NIHVIVO-194. Replaced string values for view types with Javascript "enum."
|
2010-04-04 20:20:45 +00:00 |
|
rjy7
|
ae9fabdf8e
|
NIHVIVO-194. Small fix to ed background custom short view to insert a space before the year in some cases.
|
2010-04-04 19:45:38 +00:00 |
|
rjy7
|
59d8ccef74
|
NIHVIVO-194. Sorted out issues with event listeners in one-step custom form.
|
2010-04-04 19:37:20 +00:00 |
|
rjy7
|
99d737a399
|
NIHVIVO-194. Added button text modification to close button event listener.
|
2010-04-04 18:11:45 +00:00 |
|
rjy7
|
1c3772a125
|
NIHVIVO-194. Added a close button with click event listener to the custom form addNew div.
|
2010-04-04 04:48:41 +00:00 |
|
bdc34
|
52f45b2394
|
Adding degree abbreviations. NIHVIVO-225
|
2010-04-03 23:21:52 +00:00 |
|
bdc34
|
d5b1d77b38
|
Working on short view for educational background.
|
2010-04-03 22:59:54 +00:00 |
|
bdc34
|
01d92c5c2d
|
Working on short view for educational background.
|
2010-04-03 22:54:24 +00:00 |
|
bdc34
|
42f8aed42e
|
Working on short view for educational background.
|
2010-04-03 22:42:06 +00:00 |
|
rjy7
|
c0c802af96
|
NIHVIVO-193, NIHVIVO-194. Cleaned up n3 statements in position history and educational background forms. Restored degree to required status in educational background status; had temporarily been made optional due to bugs related to the degree which have now been fixed.
|
2010-04-03 20:16:53 +00:00 |
|