Removed Portal class and almost everything related to portals and flags for NIHVIVO-2248
This commit is contained in:
brianjlowe
parent
de5c5ff7de
commit
eb00f1cd43
189 changed files with 928 additions and 6859 deletions
|
|
@ -15,8 +15,7 @@
|
|||
request.setAttribute("isEditor", Boolean.TRUE);
|
||||
}
|
||||
%>
|
||||
|
||||
<c:set var="singlePortal" value="${requestScope.singlePortal}"/>
|
||||
|
||||
<div name="anybody" class="editingForm">
|
||||
<jsp:include page="/templates/edit/fetch/vertical.jsp"/>
|
||||
<c:set var='individual' value='${requestScope.entityWebapp}'/>
|
||||
|
|
@ -29,7 +28,6 @@
|
|||
<form action="entity" method="get">
|
||||
<input type="submit" class="form-button" value="Display This Individual (public)"/>
|
||||
<input type="hidden" name="uri" value="${individual.URI}"/>
|
||||
<input type="hidden" name="home" value="${portalBean.portalId}" />
|
||||
</form>
|
||||
|
||||
<c:set var="query"
|
||||
|
|
@ -68,29 +66,18 @@
|
|||
|
||||
</td>
|
||||
<td valign="bottom" align="center">
|
||||
<c:if test="${!empty curationNotes}">
|
||||
<h2>Curation Notes</h2>
|
||||
<ul>
|
||||
<c:forEach var="note" items="${curationNotes}">
|
||||
<li>${note.data}</li>
|
||||
</c:forEach>
|
||||
</ul>
|
||||
</c:if>
|
||||
<form action="editForm" method="get">
|
||||
<input type="hidden" name="home" value="${portalBean.portalId}" />
|
||||
<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"/>
|
||||
</form><br/>
|
||||
|
||||
<!-- put the curator notes here -->
|
||||
|
||||
<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="hidden" name="home" value="${portalBean.portalId}" />
|
||||
<input type="submit" class="form-button" value="Edit Extra URLs"/>
|
||||
<input type="hidden" name="controller" value="Link"/>
|
||||
</form>
|
||||
|
|
@ -102,7 +89,6 @@
|
|||
<form:option name="externalIds"/>
|
||||
</select><br/>
|
||||
<input type="hidden" name="IndividualURI" value="${individual.URI}"/>
|
||||
<input type="hidden" name="home" value="${portalBean.portalId}" />
|
||||
<input type="submit" class="form-button" value="Edit External Identifiers"/>
|
||||
<input type="hidden" name="controller" value="ExternalId"/>
|
||||
</form>
|
||||
|
|
@ -114,40 +100,28 @@
|
|||
<form:option name="VClassURI"/>
|
||||
</select><br/>
|
||||
<input type="submit" class="form-button" value="Add New Individual of above Type"/>
|
||||
<input type="hidden" name="home" value="${portalBean.portalId}" />
|
||||
<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="home" value="${portalBean.portalId}" />
|
||||
<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="home" value="${portalBean.portalId}" />
|
||||
<input type="hidden" name="IndividualURI" value="${individual.URI}"/>
|
||||
<input type="hidden" name="controller" value="ExternalId"/>
|
||||
</form>
|
||||
<form action="editForm" method="get">
|
||||
<input type="submit" class="form-button" value="Change URI"/>
|
||||
<input type="hidden" name="home" value="${portalBean.portalId}" />
|
||||
<input type="hidden" name="oldURI" value="${individual.URI}"/>
|
||||
<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="home" value="${portalBean.portalId}" />
|
||||
<input type="hidden" name="entityUri" value="${individual.URI}"/>
|
||||
</form>
|
||||
<form action="editForm" method="get">
|
||||
<input type="submit" class="form-button" value="Add a Curation Note"/>
|
||||
<input type="hidden" name="home" value="${portalBean.portalId}" />
|
||||
<input type="hidden" name="IndividualURI" value="${individual.URI}"/>
|
||||
<input type="hidden" name="DatapropURI" value="${curatorNoteURI}"/>
|
||||
<input type="hidden" name="controller" value="DataPropertyStatement"/>
|
||||
</form>
|
||||
</td>
|
||||
</tr>
|
||||
<tr><td colspan="3"><hr/></td></tr>
|
||||
|
|
@ -161,11 +135,9 @@
|
|||
<ul style="list-style-type:none;">
|
||||
<c:forEach var="type" items="${types}">
|
||||
<c:url var="individualURL" value="entityEdit">
|
||||
<c:param name="home" value="${portalBean.portalId}"/>
|
||||
<c:param name="uri" value="${type.URI}"/>
|
||||
</c:url>
|
||||
<c:url var="typeURL" value="/vclassEdit">
|
||||
<c:param name="home" value="${portalBean.portalId}"/>
|
||||
<c:param name="uri" value="${type.URI}"/>
|
||||
</c:url>
|
||||
<li><input type="checkbox" name="TypeURI" value="${type.URI}" class="form-item"/><a href="${typeURL}"> ${type.localNameWithPrefix} </a></li>
|
||||
|
|
@ -173,122 +145,23 @@
|
|||
</ul>
|
||||
<input type="hidden" name="individualURI" value="${individual.URI}"/>
|
||||
<input type="submit" class="form-button" value="Remove Checked Asserted Types"/>
|
||||
<input type="hidden" name="home" value="${portalBean.portalId}" />
|
||||
<input type="hidden" name="operation" value="remove"/>
|
||||
<input type="hidden" name="_epoKey" value="${epoKey}"/>
|
||||
</form>
|
||||
</c:if>
|
||||
<form action="editForm" method="get">
|
||||
<input type="hidden" name="controller" value="IndividualType"/>
|
||||
<input type="hidden" name="home" value="${portalBean.portalId}" />
|
||||
<input type="hidden" name="IndividualURI" value="${individual.URI}"/>
|
||||
<input type="submit" class="form-button" value="Add Type"/>
|
||||
</form>
|
||||
</td>
|
||||
|
||||
<td colspan="2">
|
||||
<c:if test="${!singlePortal}" >
|
||||
<c:if test="${isFlag1Active || isFlag2Active}">
|
||||
|
||||
<!-- Flags -->
|
||||
<table>
|
||||
<tr valign="bottom" align="center">
|
||||
<form action="flagUpdate" method="POST">
|
||||
<td class="editformcell" colspan="1">
|
||||
<c:if test="${isFlag1Active}">
|
||||
<h4>Portal visibility</h4>
|
||||
<c:forEach var="checkbox" items="${epo.formObject.checkboxLists['portalFlag']}">
|
||||
<c:choose>
|
||||
<c:when test="${checkbox.checked}">
|
||||
<c:set var="checked" value="checked='checked'"/>
|
||||
</c:when>
|
||||
<c:otherwise>
|
||||
<c:set var="checked" value=""/>
|
||||
</c:otherwise>
|
||||
</c:choose>
|
||||
<span style="white-space:nowrap;"><input type="checkbox" name="Flag1Value" id="Flag1Value_${checkbox.value}" value="${checkbox.value}" ${checked}/><label for="Flag1Value_${checkbox.value}"> ${checkbox.body} </label></span>
|
||||
</c:forEach>
|
||||
<hr/>
|
||||
</c:if>
|
||||
</td>
|
||||
<td class="editformcell" colspan="1">
|
||||
<c:if test="${isFlag2Active}">
|
||||
<h4>College affiliation</h4>
|
||||
<c:forEach var="checkbox" items="${epo.formObject.checkboxLists['flag2']}">
|
||||
<c:choose>
|
||||
<c:when test="${checkbox.checked}">
|
||||
<c:set var="checked" value="checked='checked'"/>
|
||||
</c:when>
|
||||
<c:otherwise>
|
||||
<c:set var="checked" value=""/>
|
||||
</c:otherwise>
|
||||
</c:choose>
|
||||
<span style="white-space:nowrap;"><input type="checkbox" name="Flag2Value" id="Flag2Value_${checkbox.value}" value="${checkbox.value}" ${checked}/><label for="Flag2Value_${checkbox.value}"> ${checkbox.body} </label></span>
|
||||
</c:forEach>
|
||||
</c:if>
|
||||
</td>
|
||||
<td class="editformcell" colspan="1">
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td colspan="2">
|
||||
<p style="text-align:center"><input type="submit" class="form-button" value="update flag values"/></p>
|
||||
</td>
|
||||
<td colspan="1"/>
|
||||
</tr>
|
||||
<input type="hidden" name="_epoKey" value="${_flagEpoKey}"/>
|
||||
</form>
|
||||
</tr>
|
||||
</table>
|
||||
</c:if>
|
||||
</c:if>
|
||||
|
||||
<!-- empty now that flags are gone -->
|
||||
</td>
|
||||
|
||||
</tr>
|
||||
<%-- RY Removing these forms: they are buggy; the property is not displayed on the individual page;
|
||||
and the property will be removed in v1.3.
|
||||
<!-- keyterms -->
|
||||
<tr valign="bottom" align="center">
|
||||
<td valign="bottom" align="center">
|
||||
<c:if test="${!empty epo.formObject.optionLists['existingKeywordRelations']}">
|
||||
<form action="editForm" method="get">
|
||||
<select name="uri" class="form-item">
|
||||
<c:forEach var="kirOpt" items="${epo.formObject.optionLists['existingKeywordRelations']}">
|
||||
<option value="${kirOpt.value}">${kirOpt.body}</option>
|
||||
</c:forEach>
|
||||
</select><br/>
|
||||
<input type="submit" class="form-button" value="edit keyword link"/>
|
||||
<input type="hidden" name="individualURI" value="${individual.URI}"/>
|
||||
<input type="hidden" name="home" value="${portalBean.portalId}" />
|
||||
<input type="hidden" name="controller" value="Keys2Ents"/>
|
||||
</form>
|
||||
</c:if>
|
||||
</td>
|
||||
|
||||
|
||||
<td>
|
||||
<form action="editForm" method="get">
|
||||
<input type="hidden" name="home" value="${portalBean.portalId}" />
|
||||
<input type="hidden" name="individualURI" value="${individual.URI}"/>
|
||||
<input type="hidden" name="controller" value="Keys2Ents"/>
|
||||
<input type="submit" class="form-button" value="link to existing keyword"/>
|
||||
</form>
|
||||
</td>
|
||||
<td>
|
||||
<form action="editForm" method="get">
|
||||
<input type="submit" class="form-button" value="new keyword, linked to this individual" />
|
||||
<select name="mode" class="form-item">
|
||||
<option value="hidden">hidden</option>
|
||||
<option value="visible" selected="selected">visible</option>
|
||||
</select>
|
||||
<input type="hidden" name="home" value="${portalBean.portalId}" />
|
||||
<input type="hidden" name="individualURI" value="${individual.URI}" />
|
||||
<input type="hidden" name="Origin" value="curator-added"/>
|
||||
<input type="hidden" name="controller" value="Keyword"/>
|
||||
</form>
|
||||
</td>
|
||||
--%>
|
||||
</tr>
|
||||
|
||||
</table>
|
||||
|
||||
<c:if test="${dwrDisabled != true}">
|
||||
|
|
@ -366,8 +239,8 @@
|
|||
|
||||
<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','${portalBean.themeDir}site_icons')" title="old editing" class="navlinkblock" onmouseover="onMouseOverHeading(this)" onmouseout="onMouseOutHeading(this)">
|
||||
<span class="entityRelationsSpan"><img src="${portalBean.themeDir}site_icons/plus.gif" id="oldEditingSw0"/>
|
||||
<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>
|
||||
|
|
@ -388,19 +261,16 @@
|
|||
</select><br/>
|
||||
<input type="hidden" name="SubjectEntURI" value="${individual.URI}"/>
|
||||
<input type="submit" class="form-button" value="Edit Statement"/>
|
||||
<input type="hidden" name="home" value="${portalBean.portalId}" />
|
||||
<input type="hidden" name="controller" value="ObjectPropertyStatement"/>
|
||||
</form>
|
||||
</c:if>
|
||||
</td>
|
||||
<td>
|
||||
<form action="editForm" method="get">
|
||||
<input type="hidden" name="home" value="${portalBean.portalId}" />
|
||||
<input type="hidden" name="SubjectEntURI" value="${individual.URI}"/>
|
||||
<select name="PropertyURI" class="form-item">
|
||||
<form:option name="PropertyURI"/>
|
||||
</select><br/>
|
||||
<input type="hidden" name="home" value="${portalBean.portalId}" />
|
||||
<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"/>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue