Commit graph

62 commits

Author SHA1 Message Date
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
rjy7
da6ac0eef1 Add StringProcessorTag taglib directive - was missing, even though tags were used. 2010-04-30 17:39:56 +00:00
sjm222
d718ebb9de Resolution of JIRA issue NIHVIVO-404 2010-04-28 14:48:23 +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
nac26
10bf357d5e NIHVIVO-355 merging fix into trunk to hide tagline field 2010-04-13 16:50:40 +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
rjy7
a4497d1fa5 NIHVIVO-333 Merge revisions from rel-1.0-maint: Removed choice between image sizes on image upload page. Also added a note explaining that images smaller than 150x150px will not display well. 2010-04-08 21:12:27 +00:00
bdc34
e872d9da0f merging revision 4688 2010-04-08 18:44:40 +00:00
bdc34
db2ba89ecb merging revision 4682 2010-04-08 18:43:32 +00:00
bdc34
adfa85142f merging revision 4681 2010-04-08 18:43:07 +00:00
bdc34
6eac5a30c4 Undoing last revision 2010-04-08 18:42:20 +00:00
bdc34
c813094697 Merging r4678 to trunk 2010-04-08 18:36:50 +00:00
rjy7
a2da8aedde NIHVIVO-312 Changed label "links" to "web pages" 2010-04-07 20:51:36 +00:00
bdc34
103cf1ec18 Fixing vitro namespace property edit hiding for blurb, description and citation. NIHVIVO-274 2010-04-05 17:26:14 +00:00
bjl23
745da69072 changing some el expression syntax to avoid parse errors 2010-04-05 13:43:33 +00:00
nac26
b931993a5e NIHVIVO-121 Tweaked text and overall experience of associating user accounts to individuals. Specifically, limited # of individuals that can be associated (max = 1) and also limited class of individuals available in select list (Person) 2010-04-05 13:37:10 +00:00
bjl23
16f3dd4324 resolves NIHVIVO-287 cardinality form 2010-04-05 13:04:27 +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
bdc34
232c8d0ae5 Adding ability to edit user to individual relations for unusual individuals. NIHVIVO-231 2010-04-02 19:48:56 +00:00
rjy7
3cb92fac0c NIHVIVO-193 Fixed custom short view bug: new code that looks for superclass custom short views was neglecting to look for the subclass's custom short view first. 2010-04-01 05:44:08 +00:00
rjy7
e97d3ef637 NIHVIVO-271 Find any custom short view attached to an object's class or superclass, before the inference engine has updated, so that a new position entry will display on the individual page immediately on form submission using the custom short view for position. This could should probably be moved into an instance method of the appropriate class, however. 2010-03-31 19:49:11 +00:00
bdc34
c90d286d8f Adding code to make link to rdf/xml of entity page. 2010-03-30 21:25:04 +00:00
bdc34
e50a1bc6f5 Add dependent resources annotation to back end editing for object properties. NIHVIVO-212 2010-03-30 20:00:17 +00:00
bdc34
0103ac4713 Added names to list of people that a user may edit as on the user account control panel. NIHVIVO-262 2010-03-30 13:08:14 +00:00
bdc34
17116c547b Adding ability for collate by class to work with display limit. NIHVIVO-118 2010-03-29 19:25:36 +00:00
rjy7
732266d962 NIHVIVO-144 On front end in editing mode, distinguish primary from additional links so it's clear to the user which type is being edited. 2010-03-26 15:48:15 +00:00
bdc34
25da5a2866 Fixing NIHVIVO-237: Unable to create a new user 2010-03-26 15:15:48 +00:00
rjy7
7a09152f53 NIHVIVO-144 Corrected query parameters on primary and additional link edit/delete links. (These links still generate errors when clicked, though.) 2010-03-25 19:10:58 +00:00
rjy7
53ac7a2587 NIHVIVO-144 Add edit/delete links to primary and additional links on front end individual page. (These links generate errors when clicked, though.) 2010-03-25 19:01:03 +00:00
rjy7
7f3ba68290 NIHVIVO-144 Enable adding new primary or additional link from front end 2010-03-24 21:41:33 +00:00
jeb228
b1744fd541 NIHVIVO-46 Add license tags to these files. 2010-03-24 20:26:26 +00:00
bdc34
8d75af5901 Adding collation of object property statements by class NIHVIVO-118 2010-03-24 20:14:02 +00:00
rjy7
f0576f82bd NIHVIVO-147 Fixed bug in last commit.
NIHVIVO-142 Moved some code around to better locations.
2010-03-24 16:04:54 +00:00
rjy7
ac1a9d4cb4 NIHVIVO-147 Moved citation display to a separate jsp, since it's used twice in entityBasic.jsp.
Renamed some siteAdmin jsp files.
2010-03-24 15:39:02 +00:00
rjy7
15e45f4474 NIHVIVO-220 Add links to image upload on front end individual page 2010-03-23 22:05:25 +00:00
rjy7
dd84a0ddf4 NIHVIVO-145, NIHVIVO-146 Don't output wrapping div for blurb and description if not in editing mode and the item has no value, since it adds too much blank space to the page. 2010-03-23 20:04:34 +00:00
rjy7
1085a57957 NIHVIVO-142 Consolidated code to display data and object properties in entityBasic.jsp 2010-03-23 18:43:59 +00:00
rjy7
2eee890143 Restored code that was inadvertently removed from entityBasic.jsp. In edit mode, empty property values were erroneously not appearing with labels and plus links. 2010-03-23 18:33:57 +00:00
rjy7
c162cf675e NIHVIVO-147 Add/edit/delete citation from front end.
NIHVIVO-142 Removed some unneeded styles for front end editing.
2010-03-23 18:29:03 +00:00
rjy7
65d9c2a7e4 NIHVIVO-146 Add/edit/delete description on front end.
NIHVIVO-145 Remove extra closing div tag in the blurb block that was messing up formatting
2010-03-23 18:10:12 +00:00
rjy7
54c5019347 NIHVIVO-142 Add/edit/delete blurb on front end 2010-03-23 17:28:11 +00:00
rjy7
bcbe290c51 NIHVIVO-143 Allow adding a new moniker from the front end 2010-03-22 23:17:22 +00:00
bdc34
87a97cd8df Adding a new boolean property to ObjectProperty. NIHVIVO-118 2010-03-22 22:04:47 +00:00
rjy7
6c3c0e0199 NIHVIVO-142 Markup and styles for adding a new moniker from the front end when there isn't already one present. 2010-03-20 18:36:24 +00:00
rjy7
1081648126 NIHVIVO-200 Redid previous commit so span tag is not in the custom tag itself, since it messes up other front end links. Just test the value in the JSP before outputting the span tag. 2010-03-19 15:50:43 +00:00
rjy7
8cd54743d5 NIHVIVO-200 Incorporate the <span> tag that wraps front end editing links into the custom tag, so that if there are no links, we don't get the span.
NIHVIVO-142 Various tweaks to front end editing.
2010-03-19 15:11:10 +00:00
rjy7
e8c272e4ff NIHVIVO-143 Front end deletion of moniker through the "delete" link: fixed bugs. Also added edit links for other vitro namespace properties on the individual page, but some are not working yet. 2010-03-18 21:04:19 +00:00