litvinovg/vitro
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

NIHVIVO-2317 NIHVIVO-2318 removing vitro namespace properties from editing and various Java classes and interfaces

Browse source
This commit is contained in:
brianjlowe 2011-07-05 19:14:16 +00:00
parent 9c469cef6b
commit 6e4fcedb6c
87 changed files with 178 additions and 3918 deletions
Download patch file Download diff file Expand all files Collapse all files

41
webapp/web/templates/edit/specific/entity_retry.jsp
View file

@ -5,34 +5,11 @@
<tr class="editformcell" id="entityNameTr">
<td valign="bottom" id="entityNameTd" colspan="2">
<b>Individual Name</b><br/>
<input style="width:80%;" type="text" name="Name" value="<form:value name="Name"/>" maxlength="255" />
<input style="width:80%;" type="text" name="Name" value="<form:value name="Name"/>" />
<p class="error"><form:error name="Name"/></p>
</td>
</tr>
<tr class='editformcell' id='GenericTypeTr'>
<td valign="top" id="genericTypeTd" colspan="2">
<b>Generic Type<br/>
<select disabled="disabled" id="VClassURI" name="VClassURI" onChange="update();">
<form:option name="VClassURI"/>
</select>
<p class="error"><form:error name="VClassURI"/></p>
</td>
</tr>
<tr class="editformcell" id='urlTr'>
<td id="urlTd" valign="bottom" colspan="1">
<b>URL</b><br />
<input style="width:80%;" type="text" name="Url" value="<form:value name="Url"/>" maxlength="255" />
<p><form:error name="Url"/></p>
</td>
<td id="urlAnchorTd" valign="bottom" colspan="1">
<b>Anchor Text for URL</b> <em> Required if URL is to be visible</em><br />
<input style="width:65%;" type="text" name="Anchor" value="<form:value name="Anchor"/>" maxlength="255" />
<p class="error"><form:error name="Anchor"/></p>
</td>
</tr>
<!-- begin datatype properties section -->
<tr class="editformcell" style="border-collapse:collapse;">
@ -44,22 +21,6 @@
</tr>
<!-- end datatype properties section -->
<tr class="editformcell" id='blurbTr'>
<td id="blurbTd" valign="bottom" colspan="2">
<b>Blurb</b> <em>Usually optional; shows up when this entity is included underneath a tab;</em> <b> max 255 chars</b><br />
<input style="width:80%;" type="text" name="Blurb" value="<form:value name="Blurb"/>" maxlength="255" />
<p class="error"><form:error name="Blurb"/></p>
</td>
</tr>
<tr class="editformcell" id='descriptionTr'>
<td id="descriptionTd" valign="bottom" colspan="2">
<b>Description</b> <em>Optional. Consider using more specific datatype properties where possible.</em><br/>
<textarea id="Description" name="Description" ROWS="15" COLS="115" wrap="physical"><form:value name="Description"/></textarea>
<p class="error"><form:error name="Description"/></p>
</td>
</tr>

39
webapp/web/templates/edit/specific/entity_retry_init.jsp
View file

@ -26,44 +26,5 @@
<br><font size="2" color="red"><form:error name="VClassId"/></font>
</td>
</tr>
<tr class='editformcell' id='specificTypeTr'>
<td valign="top" id="specificTypeTd" colspan="1">
<b>Specific Type</b><br/>
<select name="Moniker" id="Moniker">
<form:option name="Moniker"/>
</select>
<br><font size="2" color="red"><form:error name="Moniker"/></font>
</td>
<td id="newMonikerTd" valign="top">If [new moniker] is selected, enter here:<br/>
<input name="Moniker" value="<form:value name="Moniker"/>"/>
<i>otherwise leave this field blank</i>
</td>
</tr>
<tr class="editformcell" id='urlTr'>
<td id="urlTd" valign="bottom" colspan="1">
<b>URL</b><br />
<input type="text" name="Url" value="<form:value name="Url"/>" size="80" maxlength="255" />
<font size="2" color="red"><form:error name="Url"/></font>
</td>
<td id="urlAnchorTd" valign="bottom" colspan="1">
<b>Anchor Text for URL</b> <em> Required if URL is to be visible</em><br />
<input type="text" name="Anchor" value="<form:value name="Anchor"/>" size="30" maxlength="255" />
<font size="2" color="red"><form:error name="Anchor"/></font>
</td>
</tr>
<tr class="editformcell" id='blurbTr'>
<td id="blurbTd" valign="bottom" colspan="2">
<b>Blurb</b> <em>Usually optional; shows up when this entity is included underneath a tab;</em> <b> max 255 chars</b><br />
<input type="text" name="Blurb" value="<form:value name="Blurb"/>" size="153" maxlength="255" />
<font size="2" color="red"><form:error name="Blurb"/></font>
</td>
</tr>
<tr class="editformcell" id='descriptionTr'>
<td id="descriptionTd" valign="bottom" colspan="2">
<b>Description</b> <em>Optional; may include valid HTML</em><br/>
<textarea name="Description" ROWS="5" COLS="115" wrap="physical"><form:value name="Description"/></textarea>
<font size="2" color="red"><form:error name="Description"/></font>
</td>
</tr>

16
webapp/web/templates/edit/specific/ents2ents_retry_rangeSide.jsp
View file

@ -20,19 +20,3 @@
</select> <span class="warning"><form:error name="DomainId"/></span>
</td>
</tr>
<tr class="editformcell">
<td valign="top" colspan="2">
<b>Sunrise</b><br/>
<input name="Sunrise" value="<form:value name="Sunrise"/>" />
</td>
<td valign="top" colspan="1">
<b>Sunset</b><br/>
<input name="Sunset" value="<form:value name="Sunset"/>"/>
</td>
</tr>
<tr class="editformcell">
<td valign="top">
<b>Qualifier</b><br/>
<input name="Qualifier" value="<form:value name="Qualifier"/>"/>
</td>
</tr>

72
webapp/web/templates/edit/specific/ents_edit.jsp
View file

@ -70,19 +70,8 @@
<form action="editForm" method="get">
<input name="uri" type = "hidden" value="${individual.URI}" />
<input name="controller" type = "hidden" value="Entity" />
<input type="submit" class="form-button" value="Edit This Individual"/>
<input type="submit" class="form-button" value="Edit This Individual's Datatype Properties"/>
</form><br/>
<c:if test="${!empty individual.linksList}">
<form action="editForm" method="get">
<select name="uri" class="form-item">
<form:option name="ExtraURL"/>
</select><br />
<input type="submit" class="form-button" value="Edit Extra URLs"/>
<input type="hidden" name="controller" value="Link"/>
</form>
</c:if>
<c:if test="${!empty individual.externalIds}">
<form action="editForm" method="get">
@ -104,11 +93,6 @@
<input type="hidden" name="controller" value="Entity"/>
</form>
<form action="editForm" method="get">
<input type="submit" class="form-button" value="Add Another URL"/>
<input type="hidden" name="entityUri" value="${individual.URI}"/>
<input type="hidden" name="controller" value="Link"/>
</form>
<form action="editForm" method="get">
<input type="submit" class="form-button" value="Add an External Identifier"/>
<input type="hidden" name="IndividualURI" value="${individual.URI}"/>
<input type="hidden" name="controller" value="ExternalId"/>
@ -119,10 +103,6 @@
<input type="hidden" name="mode" value="renameResource"/>
<input type="hidden" name="controller" value="Refactor"/>
</form>
<form action="uploadImages" method="get">
<input type="submit" class="form-button" value="Upload Image"/>
<input type="hidden" name="entityUri" value="${individual.URI}"/>
</form>
</td>
</tr>
<tr><td colspan="3"><hr/></td></tr>
@ -216,11 +196,6 @@
<td colspan="9"><select id="entitiesList" class="form-item"><option>select individual</option></select></td>
</tr>
<!-- no longer available in v.0.7 : something to reimplement in 0.8 or 0.9 -->
<tr style="display:none;">
<td>Sunrise:</td><td><input id="sunrise" class="form-item" type="text"/></td>
<td>Sunset:</td><td><input id="sunset" class="form-item" type="text"/></td>
</tr>
<tr>
<td><input type="button" id="saveButt" class="form-button"
@ -236,51 +211,6 @@
</c:if> <!-- end dwr section -->
<!-- __________ Relationships to object nodes (domain id is broader or parent side, range id is narrower or child side) _________________ -->
<table class="form-background" border="0" cellpadding="2" cellspacing="2" width="100%">
<tr><td colspan="3" align="center">
<div style="color: black; cursor: pointer;" onclick="javascript:switchGroupDisplay('oldEditing','oldEditingSw0','${appBean.themeDir}site_icons')" title="old editing" class="navlinkblock" onmouseover="onMouseOverHeading(this)" onmouseout="onMouseOutHeading(this)">
<span class="entityRelationsSpan"><img src="${appBean.themeDir}site_icons/plus.gif" id="oldEditingSw0"/>
Click here for original-style object property statement editing (should work on any browser)</span>
</div>
</td></tr>
</table>
<div id="oldEditing" style="display:none;">
<table class="form-background" border="0" cellpadding="2" cellspacing="2" width="100%">
<tr valign="bottom" align="center">
<td colspan="3"><i>This individual is the subject in the following relationships to other object individuals</i></td>
</tr>
<tr valign="bottom" align="center">
<td/>
<td valign="bottom" align="center">
<c:if test="${!empty epo.formObject.optionLists['ExistingPropertyInstances']}">
<form action="editForm" method="edit">
<select name="multiplexedParam" class="form-item">
<form:option name="ExistingPropertyInstances"/>
</select><br/>
<input type="hidden" name="SubjectEntURI" value="${individual.URI}"/>
<input type="submit" class="form-button" value="Edit Statement"/>
<input type="hidden" name="controller" value="ObjectPropertyStatement"/>
</form>
</c:if>
</td>
<td>
<form action="editForm" method="get">
<input type="hidden" name="SubjectEntURI" value="${individual.URI}"/>
<select name="PropertyURI" class="form-item">
<form:option name="PropertyURI"/>
</select><br/>
<input type="hidden" name="controller" value="ObjectPropertyStatement"/>
<input type="hidden" name="domainSide" value="true"/>
<input type="submit" class="form-button" value="new link for this individual"/>
</form>
</td>
</tr>
<tr><td colspan="3"></td></tr>
</table>
</div><!-- END div "oldEditing" -->
</div><!-- END div "authorized" -->
</c:if><!-- end if (securityLevel less than MIN_EDIT_ROLE) -->
</div><!-- END div "anybody" -->

12
webapp/web/templates/edit/specific/keys2ents_dashboard_retry.jsp
View file

@ -1,12 +0,0 @@
<%-- $This file is distributed under the terms of the license in /doc/license.txt$ --%>
<%@ taglib prefix="form" uri="http://vitro.mannlib.cornell.edu/edit/tags" %>
<tr class="editformcell">
<td valign="bottom" colspan="2">
<b>Keyword</b><br/>
<select name="KeyId">
<form:option name="KeyId"/>
</select>
<font size="2" color="red"><form:error name="KeyId"/></font>
</td>
</tr>

29
webapp/web/templates/edit/specific/keys2ents_retry.jsp
View file

@ -1,29 +0,0 @@
<%-- $This file is distributed under the terms of the license in /doc/license.txt$ --%>
<%@ taglib prefix="form" uri="http://vitro.mannlib.cornell.edu/edit/tags" %>
<tr class="editformcell">
<td valign="bottom" colspan="2">
<b>Keyword</b><br/>
<select name="KeyId">
<form:option name="KeyId"/>
</select>
<font size="2" color="red"><form:error name="KeyId"/></font>
</td>
</tr>
<tr class="editformcell">
<td valign="top" colspan="2">
<b>Individual</b><br>
<select name="EntId">
<form:option name="EntId"/>
</select>
<font size="2" color="red"><form:error name="EntId"/></font>
</td>
</tr>
<tr class="editformcell">
<td valign="bottom" colspan="2">
<select name="Mode">
<form:option name="Mode"/>
</select>
<font size="2" color="red"><form:error name="Mode"/></font>
</td>
</tr>

17
webapp/web/templates/edit/specific/keyterms_dashboard_retry.jsp
View file

@ -1,17 +0,0 @@
<%-- $This file is distributed under the terms of the license in /doc/license.txt$ --%>
<%@ taglib prefix="form" uri="http://vitro.mannlib.cornell.edu/edit/tags" %>
<tr class="editformcell">
<td valign="top" colspan="2">
<b>Keyword</b><br />
<input type="text" name="Term" value="<form:value name="Term"/>" size="60" maxlength="255" />
<p><font size="2" color="red"><form:error name="Term"/></font></p>
</td>
</tr>
<tr class="editformcell">
<td valign="bottom" colspan="3">
<b>Comment</b> <i>limited to ~255 characters</i><br />
<textarea name="Comments" ROWS="3" COLS="80" wrap="physical"><form:value name="Comments"/></textarea>
<font size="2" color="red"><form:error name="Comments"/></font>
</td>
</tr>

29
webapp/web/templates/edit/specific/keyterms_retry.jsp
View file

@ -1,29 +0,0 @@
<%-- $This file is distributed under the terms of the license in /doc/license.txt$ --%>
<%@ taglib prefix="form" uri="http://vitro.mannlib.cornell.edu/edit/tags" %>
<tr class="editformcell">
<td valign="top" colspan="2">
<b>Keyword</b><br />
<input type="text" name="Term" value="<form:value name="Term"/>" size="60" maxlength="255" />
<p><font size="2" color="red"><form:error name="Term"/></font></p>
</td>
</tr>
<tr class="editformcell">
<td valign="top" colspan="1">
<b>Origin</b> <i>(source of 1st use of this keyword)</i><br/>
<select name="Origin" >
<form:option name="Origin"/>
</select>
<font size="2" color="red"><form:error name="Origin"/></font>
</td>
<td valign="top"><sup>*</sup>If [new origin] is selected, optionally enter a <b>new origin</b> here:<br/>
<input type="text" name="Origin" size="30" maxlength="80" /><br>
</td>
</tr>
<tr class="editformcell">
<td valign="bottom" colspan="3">
<b>Comment</b> <i>limited to ~255 characters</i><br />
<textarea name="Comments" ROWS="3" COLS="80" wrap="physical"><form:value name="Comments"/></textarea>
<font size="2" color="red"><form:error name="Comments"/></font>
</td>
</tr>

40
webapp/web/templates/edit/specific/links_retry.jsp
View file

@ -1,40 +0,0 @@
<%-- $This file is distributed under the terms of the license in /doc/license.txt$ --%>
<%@ taglib prefix="form" uri="http://vitro.mannlib.cornell.edu/edit/tags" %>
<%@ taglib prefix="c" uri="http://java.sun.com/jstl/core" %>
<tr class="editformcell">
<td valign="top" colspan="3">
<b>Individual Name</b><br/>
<select name="EntityId" >
<form:option name="EntityId"/></option>
</select>
<font size="2" color="red"><form:error name="EntityId"/></font>
</td>
</tr>
<c:if test="${!empty epo.formObject.optionLists['TypeURI']}">
<tr class='editformcell'>
<td valign="top" colspan="3">
<b>Link Type</b><br>
<select name="TypeURI">
<form:option name="TypeURI"/>
</select>
<br><font size="2" color="red"><form:error name="TypeURI"/></font>
</td>
</tr>
</c:if>
<tr class="editformcell">
<td valign="bottom" colspan="3">
<b>URL</b> itself (http://...)<br/>
<input type="text" name="Url" style="width:32em;" value="<form:value name="Url"/>"/>
<font size="2" color="red"><form:error name="Url"/></font>
</td>
</tr>
<tr class="editformcell">
<td valign="bottom" colspan="2">
<b>anchor text for above URL</b><br/>
<input type="text" name="Anchor" value="<form:value name="Anchor"/>" style="width:24em;" maxlength="255" />
<font size="2" color="red"><form:error name="Anchor"/></font>
</td>
</tr>

4
webapp/web/templates/edit/specific/property_retry.jsp
View file

@ -135,7 +135,7 @@
<tr class="editformcell">
<td valign="bottom" colspan="2">
<em>Optional: <strong>sort related individuals</strong> by<br />
(name,timekey,sunrise,or sunset; default is name)</em><br/>
(default is sort by name)</em><br/>
<input name="DomainEntitySortField" value="<form:value name="DomainEntitySortField"/>" />
<font size="2" color="red"><form:error name="DomainEntitySortField"/></font><br />
</td>
@ -254,7 +254,7 @@
<tr class="editformcell">
<td valign="bottom" colspan="2">
<em>Optional: <strong>sort related object individuals of inverse property</strong> by<br />
(name,timekey,sunrise,or sunset; default is name)</em><br/>
(default is sort by name)</em><br/>
<input name="RangeEntitySortField" value="<form:value name="RangeEntitySortField"/>" />
<font size="2" color="red"><form:error name="RangeEntitySortField"/></font>
</td>