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

Removed Portal class and almost everything related to portals and flags for NIHVIVO-2248

Browse source
This commit is contained in:
brianjlowe 2011-05-03 19:01:15 +00:00
parent de5c5ff7de
commit eb00f1cd43
189 changed files with 928 additions and 6859 deletions
Download patch file Download diff file Expand all files Collapse all files

17
webapp/web/templates/alpha/alphaIndex.jsp
View file

@ -2,7 +2,6 @@
<%@ page import="org.apache.commons.logging.Log" %>
<%@ page import="org.apache.commons.logging.LogFactory" %>
<%@ page import="edu.cornell.mannlib.vitro.webapp.beans.Portal" %>
<%@ taglib uri="http://java.sun.com/jstl/core" prefix="c" %><%/* this odd thing points to something in web.xml */ %>
<%@ page errorPage="/error.jsp"%>
<% /***********************************************
@ -18,23 +17,9 @@
put something like this in for debuggin: < % = MiscWebUtils.getReqInfo(request) % >
bdc34 2006-02-06
**********************************************/
/***************************************************
nac26 2008-05-09 following brian's lead from menu.jsp to get the portalId so it can be added to the alpha index links */
final Log log = LogFactory.getLog("edu.cornell.mannlib.vitro.web.alphaIndex.jsp");
Portal portal = (Portal)request.getAttribute("portalBean");
int portalId = -1;
if (portal==null) {
log.error("Attribute 'portalBean' missing or null; portalId defaulted to 1");
portalId=1;
} else {
portalId=portal.getPortalId();
}
/**************************************************/
%>
<c:set var="portalId" value="<%=portalId%>" />
<c:if test="${ requestScope.showAlpha == 1 }">
<div class='alphaIndex'>
<c:forEach items='${requestScope.letters}' var='letter'>

27
webapp/web/templates/edit/specific/classes_edit.jsp
View file

@ -29,25 +29,20 @@
<tr valign="bottom" align="center">
<td valign="bottom">
<form action="listVClassWebapps" method="get">
<input type="hidden" name="home" value="${portalBean.portalId}" />
<input type="submit" class="form-button" value="Show All Classes"/>
</form>
<form action="showClassHierarchy" method="get">
<input type="hidden" name="home" value="${portalBean.portalId}" />
<input type="submit" class="form-button" value="Show Class Hierarchy"/>
</form>
<form action="showClassHierarchy" method="get">
<input type="hidden" name="home" value="${portalBean.portalId}" />
<input type="hidden" name="vclassUri" value="${VClass.URI}"/>
<input type="submit" class="form-button" value="Show Hierarchy below This Class"/>
</form>
<form action="listIndividuals" method="get">
<input type="hidden" name="home" value="${portalBean.portalId}" />
<input type="hidden" name="VClassURI" value="${VClass.URI}" />
<input type="submit" class="form-button" value="Show All Individuals in This Class"/>
</form>
<form action="listIndividuals" method="get">
<input type="hidden" name="home" value="${portalBean.portalId}" />
<input type="hidden" name="VClassURI" value="${VClass.URI}" />
<input type="hidden" name="assertedOnly" value="true"/>
<input type="submit" class="form-button" value="Show Individuals Asserted To Be in This Class"/>
@ -55,32 +50,27 @@
</td>
<td valign="bottom" align="center">
<form action="vclass_retry" method="get">
<input type="hidden" name="home" value="${portalBean.portalId}" />
<input name="uri" type = "hidden" value="${VClass.URI}" />
<input type="submit" class="form-button" value="Edit Class"/>
</form>
</td>
<td valign="bottom">
<form action="vclass_retry" method="get">
<input type="hidden" name="home" value="${portalBean.portalId}" />
<input type="submit" class="form-button" value="Add New Class"/>
</form>
<form action="editForm" method="get">
<input type="hidden" name="home" value="${portalBean.portalId}" />
<input type="submit" class="form-button" value="Add New Individual in This Class"/>
<input type="hidden" name="controller" value="Entity"/>
<input type="hidden" name="VClassURI" value="${VClass.URI}"/>
</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="${VClass.URI}"/>
<input type="hidden" name="mode" value="renameResource"/>
<input type="hidden" name="controller" value="Refactor"/>
</form>
<form action="editForm" method="get">
<input type="submit" class="form-button" value="Move Instances to Another Class"/>
<input type="hidden" name="home" value="${portalBean.portalId}" />
<input type="hidden" name="VClassURI" value="${VClass.URI}"/>
<c:choose>
<c:when test="${VClass.namespace eq 'http://vitro.mannlib.cornell.edu/ns/bnode#'}">
@ -104,7 +94,6 @@
<ul style="list-style-type:none;">
<c:forEach var="superclass" items="${superclasses}">
<c:url var="superclassURL" value="vclassEdit">
<c:param name="home" value="${portalBean.portalId}"/>
<c:param name="uri" value="${superclass.URI}"/>
</c:url>
<li><input type="checkbox" name="SuperclassURI" value="${superclass.URI}" class="form-item"/>
@ -120,7 +109,6 @@
</c:forEach>
</ul>
<input type="hidden" name="SubclassURI" value="${VClass.URI}"/>
<input type="hidden" name="home" value="${portalBean.portalId}" />
<input type="hidden" name="operation" value="remove"/>
<input type="hidden" name="_epoKey" value="${epoKey}"/>
<input type="submit" class="form-button" value="Remove Checked Superclass Links"/>
@ -129,7 +117,6 @@
</td>
<td>
<form action="editForm" method="get">
<input type="hidden" name="home" value="${portalBean.portalId}" />
<input type="hidden" name="SubclassURI" value="${VClass.URI}"/>
<input type="hidden" name="controller" value="Classes2Classes"/>
<input type="submit" class="form-button" value="New Link to Superclass"/>
@ -145,7 +132,6 @@
<ul style="list-style-type:none;">
<c:forEach var="subclass" items="${subclasses}">
<c:url var="subclassURL" value="vclassEdit">
<c:param name="home" value="${portalBean.portalId}"/>
<c:param name="uri" value="${subclass.URI}"/>
</c:url>
<li><input type="checkbox" name="SubclassURI" value="${subclass.URI}" class="form-item"/>
@ -162,7 +148,6 @@
</ul>
<input type="hidden" name="SuperclassURI" value="${VClass.URI}"/>
<input type="submit" class="form-button" value="Remove Checked Subclass Links"/>
<input type="hidden" name="home" value="${portalBean.portalId}" />
<input type="hidden" name="operation" value="remove"/>
<input type="hidden" name="_epoKey" value="${epoKey}"/>
</form>
@ -171,12 +156,10 @@
<td valign="bottom">
<form action="editForm" method="get">
<input type="hidden" name="controller" value="Classes2Classes"/>
<input type="hidden" name="home" value="${portalBean.portalId}" />
<input type="hidden" name="SuperclassURI" value="${VClass.URI}"/>
<input type="submit" class="form-button" value="New Link to Subclass"/>
</form>
<form action="vclass_retry" method="get">
<input type="hidden" name="home" value="${portalBean.portalId}" />
<input type="hidden" name="superclassUri" value="${VClass.URI}" />
<input type="submit" class="form-button" value="Add New Subclass of This Class"/>
</form>
@ -193,7 +176,6 @@
<ul style="list-style-type:none;">
<c:forEach var="subclass" items="${equivalentClasses}">
<c:url var="subclassURL" value="vclassEdit">
<c:param name="home" value="${portalBean.portalId}"/>
<c:param name="uri" value="${subclass.URI}"/>
</c:url>
<li><input type="checkbox" name="SubclassURI" value="${subclass.URI}" class="form-item"/>
@ -210,7 +192,6 @@
</ul>
<input type="hidden" name="SuperclassURI" value="${VClass.URI}"/>
<input type="submit" class="form-button" value="Remove Checked Equivalent Classes"/>
<input type="hidden" name="home" value="${portalBean.portalId}" />
<input type="hidden" name="operation" value="remove"/>
<input type="hidden" name="_epoKey" value="${epoKey}"/>
</form>
@ -219,7 +200,6 @@
<td valign="bottom">
<form action="editForm" method="get">
<input type="hidden" name="controller" value="Classes2Classes"/>
<input type="hidden" name="home" value="${portalBean.portalId}" />
<input type="hidden" name="SuperclassURI" value="${VClass.URI}"/>
<input type="hidden" name="opMode" value="equivalentClass"/>
<input type="submit" class="form-button" value="Assert Class Equivalence"/>
@ -238,7 +218,6 @@
<ul style="list-style-type:none;">
<c:forEach var="subclass" items="${disjointClasses}">
<c:url var="subclassURL" value="vclassEdit">
<c:param name="home" value="${portalBean.portalId}"/>
<c:param name="uri" value="${subclass.URI}"/>
</c:url>
<li><input type="checkbox" name="SubclassURI" value="${subclass.URI}" class="form-item"/>
@ -255,7 +234,6 @@
</ul>
<input type="hidden" name="SuperclassURI" value="${VClass.URI}"/>
<input type="submit" class="form-button" value="Remove Checked Disjoint Classes"/>
<input type="hidden" name="home" value="${portalBean.portalId}" />
<input type="hidden" name="operation" value="remove"/>
<input type="hidden" name="_epoKey" value="${epoKey}"/>
</form>
@ -264,7 +242,6 @@
<td valign="bottom">
<form action="editForm" method="get">
<input type="hidden" name="controller" value="Classes2Classes"/>
<input type="hidden" name="home" value="${portalBean.portalId}" />
<input type="hidden" name="SuperclassURI" value="${VClass.URI}"/>
<input type="hidden" name="opMode" value="disjointWith"/>
<input type="submit" class="form-button" value="New Disjointness Axiom"/>
@ -277,13 +254,11 @@
<tr valign="top" align="center">
<td>
<form action="listPropertyWebapps" method="get">
<input type="hidden" name="home" value="${portalBean.portalId}" />
<input type="submit" class="form-button" value="Show All Object Properties Applicable to This Class"/>
<input type="hidden" name="vclassUri" value="${VClass.URI}"/>
<input type="hidden" name="propsForClass" value="true"/>
</form><br/>
<form action="listDatatypeProperties" method="get">
<input type="hidden" name="home" value="${portalBean.portalId}" />
<input type="submit" class="form-button" value="Show All Data Properties Applicable to This Class"/>
<input type="hidden" name="vclassUri" value="${VClass.URI}"/>
<input type="hidden" name="propsForClass" value="true"/>
@ -292,7 +267,6 @@
<td></td>
<td valign="bottom">
<form action="editForm" method="get">
<input type="hidden" name="home" value="${portalBean.portalId}" />
<input type="hidden" name="domainClassUri" value="${VClass.URI}"/>
<input type="hidden" name="controller" value="Property"/>
<input type="submit" class="form-button" value="Define New Domain Property at This Class"/>
@ -311,7 +285,6 @@
<option value="maxCardinality">maximum cardinality</option>
<option value="cardinality">exact cardinality</option>
</select>
<input type="hidden" name="home" value="${portalBean.portalId}" />
<input type="submit" class="form-button" value="Apply Restriction"/>
<input type="hidden" name="VClassURI" value="${VClass.URI}"/>
<p>Restrict:

11
webapp/web/templates/edit/specific/classgroups_edit.jsp
View file

@ -1,11 +1,5 @@
<%-- $This file is distributed under the terms of the license in /doc/license.txt$ --%>
<%
int DEFAULT_PORTAL_ID=1;
String portalIdStr=(portalIdStr=(String)request.getAttribute("home"))==null ?
((portalIdStr=request.getParameter("home"))==null?String.valueOf(DEFAULT_PORTAL_ID):portalIdStr):portalIdStr;
%>
<div class="editingForm"/>
<jsp:include page="/templates/edit/fetch/vertical.jsp"/>
@ -18,14 +12,12 @@ String portalIdStr=(portalIdStr=(String)request.getAttribute("home"))==null ?
<td>
<form action="fetch" method="get">
<input type="submit" class="form-button" value="display this class group's record"/>
<input type="hidden" name="home" value="<%=portalIdStr%>" />
<input type="hidden" name="queryspec" value="private_classgroup"/>
<input type="hidden" name="header" value="titleonly"/>
<input type="hidden" name="linkwhere" value="classgroups.id=<%=request.getAttribute("firstvalue")%>"/>
</form>
<form action="fetch" method="get">
<input type="submit" class="form-button" value="see all class groups"/>
<input type="hidden" name="home" value="<%=portalIdStr%>" />
<input type="hidden" name="queryspec" value="private_classgroups"/>
<input type="hidden" name="header" value="titleonly"/>
</form>
@ -34,18 +26,15 @@ String portalIdStr=(portalIdStr=(String)request.getAttribute("home"))==null ?
<form action="editForm" method="get">
<input name="id" type = "hidden" value="<%=request.getAttribute("firstvalue")%>" />
<input type="submit" class="form-button" value="edit class group <%=request.getAttribute("firstvalue")%>"/>
<input type="hidden" name="home" value="<%=portalIdStr%>" />
<input type="hidden" name="controller" value="Classgroup"/>
</form>
</td>
<td valign="bottom">
<form action="editForm" method="get">
<input type="hidden" name="home" value="<%=portalIdStr%>" />
<input type="hidden" name="controller" value="Classgroup"/>
<input type="submit" class="form-button" value="add new class group"/>
</form>
<form action="editForm" method="get">
<input type="hidden" name="home" value="<%=portalIdStr%>" />
<input type="hidden" name="controller" value="Vclass"/>
<input type="hidden" name="GroupId" value="<%=request.getAttribute("firstvalue")%>"/>
<input type="submit" class="form-button" value="add new class to this group"/>

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

@ -24,21 +24,17 @@
<tr valign="bottom" align="center">
<td>
<form action="showDataPropertyHierarchy" method="get">
<input type="hidden" name="home" value="${portalBean.portalId}" />
<input type="submit" class="form-button" value="Data Property Hierarchy"/>
</form>
<form action="listDatatypeProperties" method="get">
<input type="hidden" name="home" value="${portalBean.portalId}" />
<input type="submit" class="form-button" value="All Data Properties"/>
</form>
<form action="listVClassWebapps" method="get">
<input type="hidden" name="home" value="${portalBean.portalId}" />
<input type="hidden" name="showPropertyRestrictions" value="true"/>
<input type="hidden" name="propertyURI" value="${datatypeProperty.URI}"/>
<input type="submit" class="form-button" value="Show Classes With a Restriction on This Property"/>
</form>
<form action="listDataPropertyStatements" method="get">
<input type="hidden" name="home" value="${portalBean.portalId}" />
<input type="hidden" name="propertyURI" value="${datatypeProperty.URI}"/>
from <input type="text" name="startAt" value="1" size="2"/>
to <input type="text" name="endAt" value="50" size="3"/><br/>
@ -47,7 +43,6 @@
</td>
<td valign="bottom" align="center">
<form action="editForm" method="get">
<input type="hidden" name="home" value="${portalBean.portalId}" />
<input type="hidden" name="controller" value="Dataprop"/>
<input type="hidden" name="uri" value="${datatypeProperty.URI}"/>
<input type="submit" class="form-button" value="Edit this Data Property"/>
@ -55,20 +50,17 @@
</td>
<td valign="bottom">
<form action="editForm" method="get">
<input type="hidden" name="home" value="${portalBean.portalId}" />
<input type="hidden" name="controller" value="Dataprop"/>
<input type="submit" class="form-button" value="Add New Data Property"/>
</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="${datatypeProperty.URI}"/>
<input type="hidden" name="mode" value="renameResource"/>
<input type="hidden" name="controller" value="Refactor"/>
</form>
<form action="editForm" method="get">
<input type="submit" class="form-button" value="Move Statements to Different Property"/>
<input type="hidden" name="home" value="${portalBean.portalId}" />
<input type="hidden" name="propertyURI" value="${datatypeProperty.URI}"/>
<input type="hidden" name="mode" value="movePropertyStatements"/>
<input type="hidden" name="propertyType" value="DataProperty"/>
@ -86,7 +78,6 @@
<ul style="list-style-type:none;">
<c:forEach var="superproperty" items="${superproperties}">
<c:url var="superpropertyURL" value="datapropEdit">
<c:param name="home" value="${portalBean.portalId}"/>
<c:param name="uri" value="${superproperty.URI}"/>
</c:url>
<li><input type="checkbox" name="SuperpropertyURI" value="${superproperty.URI}" class="form-item"/>
@ -95,7 +86,6 @@
</c:forEach>
</ul>
<input type="hidden" name="SubpropertyURI" value="${datatypeProperty.URI}"/>
<input type="hidden" name="home" value="${portalBean.portalId}" />
<input type="hidden" name="operation" value="remove"/>
<input type="hidden" name="_epoKey" value="${epoKey}"/>
<input type="submit" class="form-button" value="Remove Checked Superproperty Links"/>
@ -104,7 +94,6 @@
</td>
<td>
<form action="editForm" method="get">
<input type="hidden" name="home" value="${portalBean.portalId}" />
<input type="hidden" name="SubpropertyURI" value="${datatypeProperty.URI}"/>
<input type="hidden" name="opMode" value="superproperty"/>
<input type="hidden" name="controller" value="Properties2Properties"/>
@ -122,7 +111,6 @@
<ul style="list-style-type:none;">
<c:forEach var="subproperty" items="${subproperties}">
<c:url var="subpropertyURL" value="datapropEdit">
<c:param name="home" value="${portalBean.portalId}"/>
<c:param name="uri" value="${subproperty.URI}"/>
</c:url>
<li><input type="checkbox" name="SubpropertyURI" value="${subproperty.URI}" class="form-item"/>
@ -132,7 +120,6 @@
</ul>
<input type="hidden" name="SuperpropertyURI" value="${datatypeProperty.URI}"/>
<input type="submit" class="form-button" value="Remove Checked Subproperty Links"/>
<input type="hidden" name="home" value="${portalBean.portalId}" />
<input type="hidden" name="_epoKey" value="${epoKey}"/>
<input type="hidden" name="operation" value="remove"/>
</form>
@ -141,7 +128,6 @@
<td valign="bottom">
<form action="editForm" method="get">
<input type="hidden" name="controller" value="Properties2Properties"/>
<input type="hidden" name="home" value="${portalBean.portalId}" />
<input type="hidden" name="SuperpropertyURI" value="${datatypeProperty.URI}"/>
<input type="hidden" name="opMode" value="subproperty"/>
<input type="hidden" name="propertyType" value="data"/>
@ -158,7 +144,6 @@
<ul style="list-style-type:none;">
<c:forEach var="eqproperty" items="${equivalentProperties}">
<c:url var="eqpropertyURL" value="datapropEdit">
<c:param name="home" value="${portalBean.portalId}"/>
<c:param name="uri" value="${eqproperty.URI}"/>
</c:url>
<li><input type="checkbox" name="SubpropertyURI" value="${eqproperty.URI}" class="form-item"/>
@ -168,7 +153,6 @@
</ul>
<input type="hidden" name="SuperpropertyURI" value="${datatypeProperty.URI}"/>
<input type="submit" class="form-button" value="Remove Checked Equivalent Property Links"/>
<input type="hidden" name="home" value="${portalBean.portalId}" />
<input type="hidden" name="_epoKey" value="${epoKey}"/>
<input type="hidden" name="operation" value="remove"/>
<input type="hidden" name="opMode" value="equivalentProperty"/>
@ -178,7 +162,6 @@
<td valign="bottom">
<form action="editForm" method="get">
<input type="hidden" name="controller" value="Properties2Properties"/>
<input type="hidden" name="home" value="${portalBean.portalId}" />
<input type="hidden" name="SuperpropertyURI" value="${datatypeProperty.URI}"/>
<input type="hidden" name="opMode" value="equivalentProperty"/>
<input type="hidden" name="propertyType" value="data"/>

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

@ -1,11 +1,4 @@
<%-- $This file is distributed under the terms of the license in /doc/license.txt$ --%>
<%
final int DEFAULT_PORTAL_ID=1; //Vivo
String portalIdStr=(portalIdStr=(String)request.getAttribute("home"))==null ?
((portalIdStr=request.getParameter("home"))==null?String.valueOf(DEFAULT_PORTAL_ID):portalIdStr):portalIdStr;
int incomingPortalId=Integer.parseInt(portalIdStr);
%>
<%-- $This file is distributed under the terms of the license in /doc/license.txt$ --%>
<div class="editingForm">
@ -18,7 +11,6 @@ int incomingPortalId=Integer.parseInt(portalIdStr);
<tr valign="bottom" align="center">
<td>
<form action="fetch" method="post">
<input type="hidden" name="home" value="<%=portalIdStr%>" />
<input type="submit" class="form-button" value="See All Datatypes"/>
<input type="hidden" name="queryspec" value="private_datatypes"/>
<input type="hidden" name="header" value="titleonly"/>
@ -26,14 +18,12 @@ int incomingPortalId=Integer.parseInt(portalIdStr);
</td>
<td valign="bottom" align="center">
<form action="datatype_retry" method="get">
<input type="hidden" name="home" value="<%=portalIdStr%>" />
<input type="hidden" name="id" value="<%=request.getAttribute("firstvalue")%>"/>
<input type="submit" class="form-button" value="Edit This Datatype"/>
</form>
</td>
<td valign="bottom">
<form action="datatype_retry" method="get">
<input type="hidden" name="home" value="<%=portalIdStr%>" />
<input type="submit" class="form-button" value="Add New Datatype"/>
</form>
</td>

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

@ -20,22 +20,6 @@
</td>
</tr>
<tr class='editformcell' id='specificTypeTr'>
<td style="width:50%;" valign="top" id="specificTypeTd" colspan="1">
<b>Specific Type</b><br/>
<select style="width:80%;" name="Moniker" id="Moniker">
<form:option name="Moniker"/>
</select>
<p class="error"><form:error name="Moniker"/></p>
</td>
<td id="newMonikerTd" valign="top">If [new moniker] is selected, enter here:<br/>
<input id="MonikerSelectAlt" name="Moniker" value="<form:value name="Moniker"/>" disabled="disabled" />
<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 />
@ -76,25 +60,6 @@
<p class="error"><form:error name="Description"/></p>
</td>
</tr>
<tr class="editformcell" id='sunriseTr'>
<td id="sunriseTd" valign="bottom">
<b>Sunrise</b>, or date first visible (e.g., 2004-09-17) <br/><em>Optional; populated primarily for entities such as new releases that are auto-linked to tabs for a spcified number of days following their release date</em><br/>
<input type="text" name="Sunrise" value="<form:value name="Sunrise"/>" size="14" maxlength="14"><br>
<p class="error"><form:error name="Sunrise"/></p>
</td>
<td id="sunsetTd" valign="bottom">
<b>Sunset</b>, or date stops being visible (e.g., 2004-09-18) <br/><em>Optional; used only to hide entities based on a date rather than the Display Status specified above.<br/>After this date, an entity will disappear except when searching in "entire database" mode</em><br/>
<input type="text" name="Sunset" value="<form:value name="Sunset"/>" size="19" maxlength="19"><br>
<p class="error"><form:error name="Sunset"/></p>
</td>
</tr>
<tr class="editformcell" id='timekeyTr'>
<td id="timekeyTd" valign="bottom">
<b>Timekey</b>, or date and time for event sort order (e.g., 2004-09-17 09:30:00) <br/><em>Optional; populated primarily for entities such as seminars that are auto-linked to tabs for a specified number of days leading up to the event</em><br/>
<input type="text" name="Timekey" value="<form:value name="Timekey"/>" size="19" maxlength="19"><br>
<p class="error"><form:error name="Timekey"/></p>
</td>
</tr>

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

@ -65,38 +65,5 @@
<font size="2" color="red"><form:error name="Description"/></font>
</td>
</tr>
<tr class="editformcell" id='sunriseTr'>
<td id="sunriseTd" valign="bottom">
<b>Sunrise</b>, or date first visible (e.g., 2004-09-17) <em>Optional; populated primarily for entities such as new releases that are auto-linked to tabs for a spcified number of days following their release date</em>
<input type="text" name="Sunrise" value="<form:value name="Sunrise"/>" size="14" maxlength="14"><br>
<font size="2" color="red"><form:error name="Sunrise"/></font>
</td>
<td id="sunsetTd" valign="bottom">
<b>Sunset</b>, or date stops being visible (e.g., 2004-09-18) <em>Optional; used only to hide entities based on a date rather than the Display Status specified above.<br/>After this date, an entity will disappear except when searching in "entire database" mode</em>
<input type="text" name="Sunset" value="<form:value name="Sunset"/>" size="19" maxlength="19"><br>
<font size="2" color="red"><form:error name="Sunset"/></font>
</td>
</tr>
<tr class="editformcell" id='timekeyTr'>
<td id="timekeyTd" valign="bottom">
<b>Timekey</b>, or date and time for event sort order (e.g., 2004-09-17 09:30:00) <em>Optional; populated primarily for entities such as seminars that are auto-linked to tabs for a specified number of days leading up to the event</em>
<input type="text" name="Timekey" value="<form:value name="Timekey"/>" size="19" maxlength="19"><br>
<font size="2" color="red"><form:error name="Timekey"/></font>
</td>
</tr>
<tr class="editformcell" id="portalFlagsTr">
<td id="portalFlagsTd" valign="bottom" colspan="3">
<b>portal</b> <i>(uncheck to hide in any portal)</i> <br />
</td>
</tr>
<tr class="editformcell" id="flag2SetTr">
<td id="collegeFlagsTd" valign="bottom" colspan="3">
<b>college</b>
</td>
</tr>
<tr class="editformcell" id="flag3SetTr">
<td id="campusFlagsTd" valign="bottom" colspan="3">
<b>campus</b>
</td>
</tr>

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

@ -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}">&nbsp;${checkbox.body}&nbsp;</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}">&nbsp;${checkbox.body}&nbsp;</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>
&nbsp; <!-- 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"/>

10
webapp/web/templates/edit/specific/namespaces_edit.jsp
View file

@ -1,9 +1,4 @@
<%-- $This file is distributed under the terms of the license in /doc/license.txt$ --%>
<%
final int DEFAULT_PORTAL_ID=1;
String portalIdStr=(portalIdStr=(String)request.getAttribute("home"))==null ?
((portalIdStr=request.getParameter("home"))==null?String.valueOf(DEFAULT_PORTAL_ID):portalIdStr):portalIdStr; %>
<%-- $This file is distributed under the terms of the license in /doc/license.txt$ --%>
<div class="editingForm">
@ -16,7 +11,6 @@
<tr valign="bottom" align="center">
<td>
<form action="fetch" method="get">
<input type="hidden" name="home" value="<%=portalIdStr%>" />
<input type="submit" class="form-button" value="See All Namespaces"/>
<input type="hidden" name="queryspec" value="private_namespaces"/>
<input type="hidden" name="header" value="titleonly"/>
@ -24,7 +18,6 @@
</td>
<td valign="bottom" align="center">
<form action="editForm" method="get">
<input type="hidden" name="home" value="<%=portalIdStr%>" />
<input type="submit" class="form-button" value="Edit Namespace <%=request.getAttribute("firstvalue")%>"/>
<input name="id" type = "hidden" value="<%=request.getAttribute("firstvalue")%>" />
<input type="hidden" name="controller" value="Namespace"/>
@ -32,7 +25,6 @@
</td>
<td valign="bottom">
<form action="editForm" method="get">
<input type="hidden" name="home" value="<%=portalIdStr%>" />
<input type="submit" class="form-button" value="Add New Namespace"/>
<input type="hidden" name="controller" value="Namespace"/>
</form>

7
webapp/web/templates/edit/specific/ontologies_edit.jsp
View file

@ -18,28 +18,23 @@
<tr valign="bottom" align="center">
<td>
<form action="listOntologies" method="get">
<input type="hidden" name="home" value="${portalBean.portalId}" />
<input type="submit" class="form-button" value="All Ontologies"/>
</form>
<form action="showClassHierarchy" method="get">
<input type="hidden" name="home" value="${portalBean.portalId}" />
<input type="submit" class="form-button" value="Hierarchy of Classes Defined in This Namespace" />
<input type="hidden" name="ontologyUri" value="${Ontology.URI}" />
</form>
<form action="listPropertyWebapps" method="get">
<input type="hidden" name="home" value="${portalBean.portalId}" />
<input type="submit" class="form-button" value="Object Properties Defined in This Namespace" />
<input type="hidden" name="ontologyUri" value="${Ontology.URI}" />
</form>
<form action="listDatatypeProperties" method="get">
<input type="hidden" name="home" value="${portalBean.portalId}" />
<input type="submit" class="form-button" value="Datatype Properties Defined in This Namespace" />
<input type="hidden" name="ontologyUri" value="${Ontology.URI}" />
</form>
</td>
<td valign="bottom" align="center">
<form action="editForm" method="get">
<input type="hidden" name="home" value="${portalBean.portalId}" />
<input type="submit" class="form-button" value="Edit ${Ontology.name}"/>
<input name="uri" type = "hidden" value="${Ontology.URI}" />
<input type="hidden" name="controller" value="Ontology"/>
@ -47,13 +42,11 @@
</td>
<td valign="bottom">
<form action="editForm" method="get">
<input type="hidden" name="home" value="${portalBean.portalId}" />
<input type="submit" class="form-button" value="Add New Ontology"/>
<input type="hidden" name="controller" value="Ontology"/>
</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="${realURI}"/>
<input type="hidden" name="mode" value="renameResource"/>
<input type="hidden" name="controller" value="Refactor"/>

96
webapp/web/templates/edit/specific/portal_retry.jsp
View file

@ -10,42 +10,18 @@
<% request.setAttribute("requestedActions", new ManagePortals()); %>
<vitro:confirmAuthorization />
<c:set var="singlePortal" value="${requestScope.singlePortal}"/>
<c:set var="creatingNewPortal" value="${requestScope.creatingNewPortal}"/>
<c:set var="multiPortal" value = "${!singlePortal || creatingNewPortal}"/>
<c:set var="appNameLabel" value="${ !multiPortal ? 'Site Name' : 'Portal Application Name' }"/>
<c:set var="appNameLabel" value="Site Name"/>
<c:set var="smallCell" value="style='width: 33%;'" />
<c:set var="longField" value="${multiPortal == true ? \"style='width: 90%;'\" : \"style='width: 75%;'\"}" />
<c:set var="longField" value="style='width: 75%;'" />
<tr class="editformcell">
<td valign="top" colspan="2">
<b>${appNameLabel}</b> <i>(max 50 characters)</i><br />
<input type="text" name="AppName" value="<form:value name="AppName"/>" ${longField} maxlength="50" />
<font color="red"><form:error name="AppName"/></font>
<input type="text" name="ApplicationName" value="<form:value name="ApplicationName"/>" ${longField} maxlength="50" />
<font color="red"><form:error name="ApplicationName"/></font>
</td>
<c:if test="${multiPortal}">
<td valign="top" colspan="1">
<b>Portal ID number</b><br />
<c:choose>
<c:when test="${_action == 'insert'}">
<input type="text" name="PortalId" ${smallCell}
value="<form:value name="PortalId"/>" maxlength="5" />
</c:when>
<c:otherwise>
<input type="text" name="PortalId" disabled="disabled" ${smallCell}
value="<form:value name="PortalId"/>" maxlength="5" />
</c:otherwise>
</c:choose>
<font color="red"><form:error name="PortalId" /> </font>
</td>
<td valign="top" colspan="1">
<b>URL ending</b><br/>
<input type="text" name="Urlprefix" ${smallCell} value="<form:value name="Urlprefix"/>"/>
<font color="red"><form:error name="PortalId"/><font>
</td>
</c:if>
</tr>
<!-- With introduction of new logo that includes tagline as part of the image, hiding this field for now to reduce user confusion -->
@ -65,14 +41,7 @@
</tr>
<tr class="editformcell">
<td valign="bottom" colspan="1">
<b>Root Tab</b><br />
<select name="RootTabId">
<form:option name="RootTabId"/>
</select>
<font color="red"><form:error name="RootTabId"/></font>
</td>
<td valign="top" colspan="1">
<td valign="top" colspan="2">
<b>Theme</b><br />
<select id="ThemeDir" name="ThemeDir">
<form:option name="ThemeDir" />
@ -110,15 +79,6 @@
</td>
</tr>
<tr class="editformcell hideFromVivoWeb">
<td valign="bottom" colspan="2">
<b>Flag 1 Filtering</b> <i>if true, then filter pages generated for this portal by flag1</i><br/>
<select name="Flag1Filtering" >
<form:option name="Flag1Filtering"/>
</select>
<font color="red"><form:error name="Flag1Filtering"/></font>
</td>
</tr>
<tr class="editformcell hideFromVivoWeb">
<td valign="bottom" colspan="1">
<b>Banner image</b><br />
@ -161,47 +121,3 @@ $(function() {
});
});
</script>
<% /*
<tr class="editformcell">
<!-- this needs to be added to the bean -->
<td valign="bottom" colspan="1">
<b>Flag 1 values</b><br/>
<input disabled="disabled" type="text" name="field9Value" value="" style="width:60" maxlength="255" />
<font color="red"></font>
</td>
<td valign="bottom" colspan="1">
<b>Flag 2 numeric equivalent</b> <i>THIS FILTERING HAS BEEN TRANSFERRED TO TABS</i><br />
<input type="text" name="Flag2Numeric" value="<form:value name="Flag2Numeric"/>" style="width:33%" maxlength="11" />
<font color="red"><form:error name="Flag2Numeric"/></font>
</td>
<td valign="bottom" colspan="1">
<b>Flag 3 numeric equivalent</b> <i>THIS FILTERING HAS BEEN TRANSFERRED TO TABS</i><br />
<input type="text" name="Flag3Numeric" value="<form:value name="Flag3Numeric"/>" style="width:33%" maxlength="11" />
<font color="red"><form:error name="Flag3Numeric"/></font>
</td>
</tr>
<tr class="editformcell">
<td valign="bottom" colspan="1">
<b>Filter by XXXX on Advanced Search form?</b><br />
<select disabled="disabled" name="field23Value">
<option selected value="false">false</option>
</select>
<font color="red"></font>
</td>
<td valign="bottom" colspan="1">
<b>Filter by XXXY on Advanced Search form?</b><br />
<select disabled="disabled" name="field24Value">
<option value="false">false</option>
</select>
<font color="red"></font>
</td>
<td valign="bottom" colspan="1">
<b>Filter by XXYX on Advanced Search form?</b><br />
<select disabled="disabled" name="field25Value">
<option value="false">false</option>
</select>
<font color="red"></font>
</td>
</tr>
*/ %>

21
webapp/web/templates/edit/specific/props_edit.jsp
View file

@ -28,27 +28,22 @@
<tr valign="bottom" align="center">
<td>
<form action="showObjectPropertyHierarchy" method="get">
<input type="hidden" name="home" value="${portalBean.portalId}" />
<input type="hidden" name="iffRoot" value="true" />
<input type="submit" class="form-button" value="Root Properties"/>
</form>
<form action="listPropertyWebapps" method="get">
<input type="hidden" name="home" value="${portalBean.portalId}" />
<input type="submit" class="form-button" value="See All Properties"/>
</form>
<form action="showObjectPropertyHierarchy" method="get">
<input type="hidden" name="home" value="${portalBean.portalId}" />
<input type="hidden" name="propertyUri" value="${property.URI}"/>
<input type="submit" class="form-button" value="Show Hierarchy below This Property"/>
</form>
<form action="listVClassWebapps" method="get">
<input type="hidden" name="home" value="${portalBean.portalId}" />
<input type="hidden" name="showPropertyRestrictions" value="true"/>
<input type="hidden" name="propertyURI" value="${property.URI}"/>
<input type="submit" class="form-button" value="Show Classes With a Restriction on This Property"/>
</form>
<form action="listObjectPropertyStatements" method="get">
<input type="hidden" name="home" value="${portalBean.portalId}" />
<input type="hidden" name="propertyURI" value="${property.URI}"/>
<input type="hidden" name="assertedStmts" value="true"/>
<input type="hidden" name="showVClasses" value="true"/>
@ -59,7 +54,6 @@
</td>
<td valign="bottom" align="center">
<form action="editForm" method="get">
<input name="home" type="hidden" value="${portalBean.portalId}" />
<input name="uri" type = "hidden" value="${property.URI}" />
<input type="submit" class="form-button" value="Edit Property Record"/>
<input type="hidden" name="controller" value="Property"/>
@ -67,26 +61,22 @@
</td>
<td valign="bottom">
<form action="editForm" method="get">
<input name="home" type="hidden" value="${portalBean.portalId}" />
<input type="hidden" name="parentId" value="${property.URI}" />
<input type="hidden" name="controller" value="Property"/>
<input type="submit" class="form-button" value="Add New Child Property"/>
</form>
<form action="editForm" method="get">
<input name="home" type="hidden" value="${portalBean.portalId}" />
<input type="submit" class="form-button" value="Add New Property"/>
<input type="hidden" name="controller" value="Property"/>
</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="${property.URI}"/>
<input type="hidden" name="mode" value="renameResource"/>
<input type="hidden" name="controller" value="Refactor"/>
</form>
<form action="editForm" method="get">
<input type="submit" class="form-button" value="Move Statements to Different Property"/>
<input type="hidden" name="home" value="${portalBean.portalId}" />
<input type="hidden" name="propertyURI" value="${property.URI}"/>
<input type="hidden" name="mode" value="movePropertyStatements"/>
<input type="hidden" name="propertyType" value="ObjectProperty"/>
@ -95,7 +85,6 @@
<c:if test="${!empty property.URIInverse}">
<form action="propertyEdit" method="get">
<input type="submit" class="form-button" value="Go to Inverse Property"/>
<input type="hidden" name="home" value="${portalBean.portalId}" />
<input type="hidden" name="uri" value="${property.URIInverse}"/>
</form>
</c:if>
@ -111,7 +100,6 @@
<ul style="list-style-type:none;">
<c:forEach var="superproperty" items="${superproperties}">
<c:url var="superpropertyURL" value="propertyEdit">
<c:param name="home" value="${portalBean.portalId}"/>
<c:param name="uri" value="${superproperty.URI}"/>
</c:url>
<li><input type="checkbox" name="SuperpropertyURI" value="${superproperty.URI}" class="form-item"/>
@ -120,7 +108,6 @@
</c:forEach>
</ul>
<input type="hidden" name="SubpropertyURI" value="${property.URI}"/>
<input type="hidden" name="home" value="${portalBean.portalId}" />
<input type="hidden" name="operation" value="remove"/>
<input type="hidden" name="_epoKey" value="${epoKey}"/>
<input type="submit" class="form-button" value="Remove Checked Superproperty Links"/>
@ -129,7 +116,6 @@
</td>
<td>
<form action="editForm" method="get">
<input type="hidden" name="home" value="${portalBean.portalId}" />
<input type="hidden" name="SubpropertyURI" value="${property.URI}"/>
<input type="hidden" name="opMode" value="superproperty"/>
<input type="hidden" name="controller" value="Properties2Properties"/>
@ -146,7 +132,6 @@
<ul style="list-style-type:none;">
<c:forEach var="subproperty" items="${subproperties}">
<c:url var="subpropertyURL" value="propertyEdit">
<c:param name="home" value="${portalBean.portalId}"/>
<c:param name="uri" value="${subproperty.URI}"/>
</c:url>
<li><input type="checkbox" name="SubpropertyURI" value="${subproperty.URI}" class="form-item"/>
@ -156,7 +141,6 @@
</ul>
<input type="hidden" name="SuperpropertyURI" value="${property.URI}"/>
<input type="submit" class="form-button" value="Remove Checked Subproperty Links"/>
<input type="hidden" name="home" value="${portalBean.portalId}" />
<input type="hidden" name="_epoKey" value="${epoKey}"/>
<input type="hidden" name="operation" value="remove"/>
</form>
@ -165,14 +149,12 @@
<td valign="bottom">
<form action="editForm" method="get">
<input type="hidden" name="controller" value="Properties2Properties"/>
<input type="hidden" name="home" value="${portalBean.portalId}" />
<input type="hidden" name="SuperpropertyURI" value="${property.URI}"/>
<input type="hidden" name="opMode" value="subproperty"/>
<input type="submit" class="form-button" value="New Link to Subproperty"/>
</form>
<form action="editForm" method="get">
<input type="hidden" name="controller" value="Property"/>
<input type="hidden" name="home" value="${portalBean.portalId}" />
<input type="hidden" name="parentId" value="${property.URI}" />
<input type="submit" class="form-button" value="Add New Subproperty of This Property"/>
</form>
@ -187,7 +169,6 @@
<ul style="list-style-type:none;">
<c:forEach var="eqproperty" items="${equivalentProperties}">
<c:url var="eqpropertyURL" value="datapropEdit">
<c:param name="home" value="${portalBean.portalId}"/>
<c:param name="uri" value="${eqproperty.URI}"/>
</c:url>
<li><input type="checkbox" name="SubpropertyURI" value="${eqproperty.URI}" class="form-item"/>
@ -197,7 +178,6 @@
</ul>
<input type="hidden" name="SuperpropertyURI" value="${property.URI}"/>
<input type="submit" class="form-button" value="Remove Checked Equivalent Property Links"/>
<input type="hidden" name="home" value="${portalBean.portalId}" />
<input type="hidden" name="_epoKey" value="${epoKey}"/>
<input type="hidden" name="operation" value="remove"/>
<input type="hidden" name="opMode" value="equivalentProperty"/>
@ -207,7 +187,6 @@
<td valign="bottom">
<form action="editForm" method="get">
<input type="hidden" name="controller" value="Properties2Properties"/>
<input type="hidden" name="home" value="${portalBean.portalId}" />
<input type="hidden" name="SuperpropertyURI" value="${property.URI}"/>
<input type="hidden" name="opMode" value="equivalentProperty"/>
<input type="hidden" name="propertyType" value="object"/>

22
webapp/web/templates/edit/specific/tab_retry.jsp
View file

@ -8,7 +8,7 @@
<font size="2" color="red"><form:error name="Title"/></font>
</td>
<td valign="bottom" colspan="1">
<b>Tab Shorthand</b> <i>(an alternate phrase for display as <strong>More ...</strong> in the home portal)</i><br/>
<b>Tab Shorthand</b> <i>(an alternate phrase for display as <strong>More ...</strong> in the application)</i><br/>
<input type="text" name="ShortHand" value="<form:value name="MoreTag"/>" style="width:80%;" maxlength="80" />
<font size="2" color="red"><form:error name="MoreTag"/></font>
</td>
@ -59,16 +59,6 @@
<font size="2" color="red"><form:error name="RssURL"/></font>
</td>
</tr>
<tr class="editformcell">
<td valign="top" colspan="3">
<b>Portal</b> <i>(like-named tabs in multiple portals are created and modified separately)</i><br />
<input type="text" name="PortalId" value="<form:value name="PortalId"/>">
<br><font size="2" color="red"><form:error name="PortalId"/></font>
</td>
</tr>
*/ %>
@ -117,14 +107,4 @@
<input type="text" name="ImageWidth" value="<form:value name="ImageWidth"/>" size="5" maxlength="11" />
<font size="2" color="red"><form:error name="ImageWidth"/></font>
</td>
</tr>
<tr class="editformcell">
<td valign="bottom" colspan="1">
<b>Flag 2 Mode</b><em> to support legacy applications - ignore</em><br/>
<input type="text" name="Flag2Mode" value="<form:value name="Flag2Mode"/>" size="10"/>
</td>
<td valign="bottom" colspan="2">
<b>Flag 2 Set</b><br/>
<input type="text" name="Flag2Set" value="<form:value name="Flag2Set"/>" size="50"/>
</td>
</tr>

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

@ -36,25 +36,20 @@
<form action="./" method="get">
<input type="submit" class="form-button" value="Display This Tab (Public)"/>
<input type="hidden" name="primary" value="${tab.tabId}" />
<input type="hidden" name="home" value="${portal.portalId}" />
</form>
<form action="listTabs" method="get">
<input type="submit" class="form-button" value="See All Tabs"/>
<input type="hidden" name="home" value="${portal.portalId}" />
</form>
</td>
<td valign="bottom" align="center">
<form action="editForm" method="get">
<input name="id" type = "hidden" value="<%=request.getAttribute("tabId")%>" />
<input type="submit" class="form-button" value="Edit Tab Details"/>
<input type="hidden" name="home" value=""${portal.portalId}" />
<input type="hidden" name="controller" value="Tab"/>
</form>
</td>
<td valign="bottom">
<form action="editForm" method="get">
<input type="hidden" name="portalId" value="${portal.portalId}"/>
<input type="hidden" name="home" value="${portal.portalId}" />
<input type="submit" class="form-button" value="Add New Tab"/>
<input type="hidden" name="controller" value="Tab"/>
</form>
@ -75,7 +70,6 @@
</c:forEach>
</ul>
<input type="submit" class="form-button" value="Remove checked parent tabs"/>
<input type="hidden" name="home" value="${portal.portalId}" />
<input type="hidden" name="ChildId" value="${tab.tabId}"/>
<input type="hidden" name="primaryAction" value="_remove"/>
<input type="hidden" name="_epoKey" value="${tabHierarchyEpoKey}"/>
@ -84,7 +78,6 @@
</td>
<td>
<form action="editForm" method="get">
<input type="hidden" name="home" value="${portal.portalId}" />
<input type="hidden" name="ChildId" value="${tab.tabId}">
<input type="hidden" name="controller" value="Tabs2Tabs"/>
<input type="submit" class="form-button" value="Add existing tab as parent tab"/>
@ -93,7 +86,7 @@
</tr>
</c:when>
<c:otherwise>
<tr><td colspan="3" align="center">This is the highest level tab for any portal, so no links to higher tabs are possible.</td></tr>
<tr><td colspan="3" align="center">This is the highest level tab, so no links to higher tabs are possible.</td></tr>
</c:otherwise>
</c:choose>
<tr><td colspan="3"><hr/></td></tr>
@ -111,7 +104,6 @@
</ul>
<input type="hidden" name="ParentId" value="${tab.tabId}"/>
<input type="submit" class="form-button" value="Remove checked child tabs"/>
<input type="hidden" name="home" value="${portal.portalId}" />
<input type="hidden" name="primaryAction" value="_remove"/>
<input type="hidden" name="_epoKey" value="${tabHierarchyEpoKey}"/>
</form>
@ -119,7 +111,6 @@
</td>
<td>
<form action="editForm" method="get">
<input type="hidden" name="home" value="${portal.portalId}" />
<input type="hidden" name="ParentId" value="${tab.tabId}">
<input type="hidden" name="controller" value="Tabs2Tabs">
<input type="submit" class="form-button" value="Add existing tab as child tab"/>
@ -128,7 +119,7 @@
</tr>
</c:when>
<c:otherwise>
<tr><td colspan="3" align="center">This is the lowest level tab for any portal, so no links to lower tabs are possible.</td></tr>
<tr><td colspan="3" align="center">This is the lowest level tab, so no links to lower tabs are possible.</td></tr>
</c:otherwise>
</c:choose>
<tr><td colspan="3"><hr/></td></tr>
@ -145,7 +136,6 @@
</c:forEach>
</ul>
<input type="hidden" name="TabId" value="${tab.tabId}"/>
<input type="hidden" name="home" value="${portalBean.portalId}" />
<input type="hidden" name="operation" value="remove"/>
<input type="hidden" name="_epoKey" value="${epoKey}"/>
<input type="submit" class="form-button" value="Remove Checked Class Autolinks"/>
@ -154,7 +144,6 @@
</td>
<td>
<form action="editForm" method="get">
<input type="hidden" name="home" value="${portalBean.portalId}" />
<input type="hidden" name="TabId" value="${tab.tabId}"/>
<input type="hidden" name="controller" value="Tabs2Types"/>
<input type="submit" class="form-button" value="Add Class Autolink"/>
@ -178,7 +167,6 @@
</c:forEach>
</ul>
<input type="hidden" name="TabId" value="${tab.tabId}"/>
<input type="hidden" name="home" value="${portalBean.portalId}" />
<input type="hidden" name="operation" value="remove"/>
<input type="hidden" name="_epoKey" value="${epoKey}"/>
<input type="submit" class="form-button" value="Remove Checked Individuals"/>
@ -191,7 +179,6 @@
<form:option name="VClassURI"/>
</select><br/>
<p>Select class of individual</p>
<input type="hidden" name="home" value="${portalBean.portalId}" />
<input type="hidden" name="TabId" value="${tab.tabId}"/>
<input type="hidden" name="controller" value="Tabs2Ents"/>
<input type="submit" class="form-button" value="Add an individual to this tab"/>

11
webapp/web/templates/edit/specific/upload_rdf.jsp
View file

@ -36,17 +36,6 @@
<option value="TTL">Turtle</option>
</select>
<p><input type="checkbox" name="makeClassgroups" value="true"/> create classgroups automatically</p>
<c:if test="${requestScope.singlePortal == true}">
<input type="hidden" name="checkIndividualsIntoPortal" value="current"/>
</c:if>
<c:if test="${requestScope.singlePortal == false }">
<p>
<input type="radio" name="checkIndividualsIntoPortal" value="current"/> make individuals visible in current portal
<input type="radio" name="checkIndividualsIntoPortal" value="all"/> make individuals visible in all portals
</p>
</c:if>
<p><input id="submit" type="submit" name="submit" value="submit"/></p>
</form>

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

@ -21,19 +21,16 @@
<tr align="center">
<td valign="bottom">
<form action="listUsers" method="get">
<input type="hidden" name="home" value="${portalBean.portalId}" />
<input type="submit" class="form-button" value="See All User Accounts"/>
</form>
</td>
<td valign="bottom" align="center">
<form action="editForm" method="get">
<input name="home" type="hidden" value="${portalBean.portalId}" />
<input name="uri" type = "hidden" value="${user.URI}" />
<input type="submit" class="form-button" value="Edit User Account"/>
<input type="hidden" name="controller" value="User"/>
</form>
<form action="editForm" method="get">
<input name="home" type="hidden" value="${portalBean.portalId}" />
<input name="uri" type = "hidden" value="${user.URI}" />
<input name="Md5password" type="hidden" value=""/>
<input name="OldPassword" type="hidden" value=""/>
@ -43,7 +40,6 @@
</td>
<td valign="bottom">
<form action="editForm" method="get">
<input name="home" type="hidden" value="${portalBean.portalId}" />
<input type="hidden" name="controller" value="User"/>
<input type="submit" class="form-button" value="Add New User Account"/>
</form>

4
webapp/web/templates/entity/entityListForTabs.jsp
View file

@ -8,7 +8,6 @@
request.attributes:
a List of Entity objects with the name "entities"
portal id as "portal"
request.parameters:
None yet.
@ -24,13 +23,11 @@
%>
<c:set var="searchViewPrefix" value="/templates/search/"/>
<c:set var='entities' value='${requestScope.entities}' /><%/* just moving this into page scope for easy use */ %>
<c:set var='portal' value='${requestScope.portal}' />
<c:set var='IMG_WIDTH' value='75'/>
<jsp:include page="/templates/alpha/alphaIndex.jsp"/>
<ul class='tabEntities entityListForTab'>
<c:forEach items='${entities}' var='ent'>
<c:url var="entHref" value="/entity">
<c:param name="home" value="${sessionScope.currentPortalId}"/>
<c:param name="uri" value="${ent.URI}"/>
</c:url>
<li>
@ -77,7 +74,6 @@
<c:choose>
<c:when test='${not empty ent.thumbUrl }'>
<c:url var="imageHref" value="entity">
<c:param name="home" value="${sessionScope.currentPortalId}"/>
<c:param name="uri" value="${ent.URI}"/>
</c:url>
<div class="tab-image"><a class="image" href="<c:out value="${imageHref}"/>"><img width="${IMG_WIDTH}" src="${pageContext.request.contextPath}${ent.thumbUrl}" title="${ent.name}" alt="" /></a></div>

20
webapp/web/templates/freemarker/body/contactForm/contactForm-form.ftl
View file

@ -6,29 +6,11 @@
<h2>${title}</h2>
<p>Thank you for your interest in
<#compress>
<#if portalType == "CALSResearch">
the Cornell University College of Agriculture and Life Sciences Research Portal
<#elseif portalType == "VIVO">
VIVO
<#else>
the ${siteName} portal
</#if>
</#compress>.
<p>Thank you for your interest in ${siteName}.
Please submit this form with questions, comments, or feedback about the content of this site.
</p>
<#if siteName == "CALSResearch" || siteName == "CALSImpact">
<p>
${siteName} is a service that depends on regular updates and feedback.
Please help us out by providing comments and suggestions for additional content (people, departments, courses, research services, etc.)
that you would like to see represented. The reference librarians at Albert R. Mann Library will be in touch with you soon.
</p>
</#if>
<form name="contact_form" id="contact_form" action="${formAction}" method="post" onsubmit="return ValidateForm('contact_form');">
<input type="hidden" name="home" value="${portalId}"/>
<input type="hidden" name="RequiredFields" value="webusername,webuseremail,s34gfd88p9x1"/>
<input type="hidden" name="RequiredFieldsNames" value="Name,Email address,Comments"/>
<input type="hidden" name="EmailFields" value="webuseremail"/>

12
webapp/web/templates/freemarker/body/siteAdmin/siteAdmin-siteConfiguration.ftl
View file

@ -8,15 +8,9 @@
<h3>Site Configuration</h3>
<ul>
<#if siteConfig.urls.portals??>
<#if siteConfig.urls.siteInfo??>
<li><a href="${siteConfig.urls.siteInfo}">Current portal information</a></li>
</#if>
<li><a href="${siteConfig.urls.portals}">List all portals</a></li>
<#else>
<#if siteConfig.urls.siteInfo??>
<li><a href="${siteConfig.urls.siteInfo}">Site information</a></li>
</#if>
<#if siteConfig.urls.siteInfo??>
<li><a href="${siteConfig.urls.siteInfo}">Site information</a></li>
</#if>
<#if siteConfig.urls.menuN3Editor??>

12
webapp/web/templates/freemarker/page/partials/identity.ftl
View file

@ -32,16 +32,6 @@
<legend>Search form</legend>
<form id="search-form" action="${urls.search}" name="search" role="search">
<#if user.showFlag1SearchField>
<select id="search-form-modifier" name="flag1" class="form-item" >
<option value="nofiltering" selected="selected">entire database (${user.loginName})</option>
<option value="${portalId}">${siteTagline!}</option>
</select>
<#else>
<input type="hidden" name="flag1" value="${portalId}" />
</#if>
<div id="search-field">
<input type="text" name="querytext" class="search-vivo" value="${querytext!}" />
<input type="submit" value="Search" class="submit">
@ -49,4 +39,4 @@
</form>
</fieldset>
</section>
</header>
</header>

2
webapp/web/templates/freemarker/page/partials/search.ftl
View file

@ -6,4 +6,4 @@
<input type="text" name="querytext" id="search" class="search-form-item" value="${querytext!}" size="20" />
<input class="search-form-submit" name="submit" type="submit" value="Search" />
</form>
</div> <!-- end searchBlock -->
</div> <!-- end searchBlock -->

5
webapp/web/templates/page/basicPage.jsp
View file

@ -7,7 +7,6 @@
<%@ page errorPage="/error.jsp"%>
<%@ page contentType="text/html; charset=UTF-8"%>
<%@ page import="edu.cornell.mannlib.vitro.webapp.filters.VitroRequestPrep" %>
<%@ page import="edu.cornell.mannlib.vitro.webapp.beans.Portal"%>
<%@ page import="edu.cornell.mannlib.vitro.webapp.controller.freemarker.FreemarkerHttpServlet" %>
<% /***********************************************
@ -22,7 +21,6 @@
"css" - optional additional css for page
"scripts" - optional name of file containing <script> elements to be included in the page
"bodyAttr" - optional attributes for the <body> tag, e.g. 'onload': use leading space
"portalBean" - PortalBean object for request.
Consider sticking < % = MiscWebUtils.getReqInfo(request) % > in the html output
for debugging info.
@ -40,9 +38,6 @@
if (request.getAttribute("css") == null){
e+="basicPage.jsp expects that request parameter 'css' be set to css to include in page.\n";
}
if( request.getAttribute("portalBean") == null){
e+="basicPage.jsp expects that request attribute 'portalBean' be set.\n";
}
if( request.getAttribute("appBean") == null){
e+="basicPage.jsp expects that request attribute 'appBean' be set.\n";
}

4
webapp/web/templates/page/blankPage.jsp
View file

@ -14,7 +14,6 @@
"css" - optional additional css for page
"scripts" - optional name of file containing <script> elements to be included in the page
"bodyAttr" - optional attributes for the <body> tag, e.g. 'onload': use leading space
"portalBean" - PortalBean object for request.
Consider sticking < % = MiscWebUtils.getReqInfo(request) % > in the html output
for debugging info.
@ -32,9 +31,6 @@
if (request.getAttribute("css") == null){
e+="basicPage.jsp expects that request parameter 'css' be set to css to include in page.\n";
}
if( request.getAttribute("portalBean") == null){
e+="basicPage.jsp expects that request attribute 'portalBean' be set.\n";
}
if( request.getAttribute("appBean") == null){
e+="basicPage.jsp expects that request attribute 'appBean' be set.\n";
}

8
webapp/web/templates/page/headContent.jsp
View file

@ -4,7 +4,6 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %>
<%@ page import="javax.servlet.ServletException" %>
<%@ page import="edu.cornell.mannlib.vitro.webapp.controller.VitroRequest"%>
<%@ page import="edu.cornell.mannlib.vitro.webapp.beans.Portal"%>
<%@ page import="edu.cornell.mannlib.vitro.webapp.beans.ApplicationBean"%>
<%@ page import="org.apache.commons.logging.Log" %>
<%@ page import="org.apache.commons.logging.LogFactory" %>
@ -12,10 +11,9 @@
public static Log log = LogFactory.getLog("edu.cornell.mannlib.vitro.webapp.jsp.templates.page.headContent.jsp");
%>
<%
VitroRequest vreq = new VitroRequest(request);
Portal portal = vreq.getPortal();
String themeDir = portal != null ? portal.getThemeDir() : Portal.DEFAULT_THEME_DIR_FROM_CONTEXT;
VitroRequest vreq = new VitroRequest(request);
String themeDir = vreq.getAppBean().getThemeDir();
themeDir = vreq.getContextPath() + '/' + themeDir;
%>

1
webapp/web/templates/parts/emailUsers.jsp
View file

@ -13,7 +13,6 @@
<hr/>
<form name = "contact_form" action="mailusers" method="post">
<input type="hidden" name="home" value="${portalId}"/>
<input type="hidden" name="RequiredFields" value="comments"/>
<input type="hidden" name="RequiredFieldsNames" value="Comments"/>
<input type="hidden" name="EmailFields" value="webuseremail"/>

5
webapp/web/templates/tabs/tabAdmin.jsp
View file

@ -31,17 +31,14 @@
<% if ( LoginStatusBean.getBean(request).isLoggedInAtLeast(LoginStatusBean.EDITOR)) { %>
<c:set var='tab' value='${requestScope.leadingTab}'/><%/* just moving this into page scope for easy use */ %>
<c:set var='portal' value='${requestScope.portalBean.portalId}'/>
<div class='admin bottom'>
<c:url var="editHref" value="tabEdit">
<c:param name="home" value="${currentPortalId}"/>
<c:param name="controller" value="Tab"/>
<c:param name="id" value="${tab.tabId}"/>
</c:url>
<c:set var="editHref">
<c:out value="${editHref}" escapeXml="true"/>
</c:set>
<a href="${editHref}">edit tab: <em>${tab.title}</em></a>
<% /* | <a href='<c:url value="cloneEntity?home=${portal}&tabId=${tab.tabId}"/>'> <i>clone tab</i> ${tab.title}</a> */ %>
<a href="${editHref}">edit tab: <em>${tab.title}</em></a>
</div>
<% } %>

11
webapp/web/templates/tabs/tabAtom.jsp
View file

@ -6,7 +6,6 @@
<%@ page import="edu.cornell.mannlib.vitro.webapp.beans.Tab" %>
<%@ page import="edu.cornell.mannlib.vitro.webapp.controller.VitroRequest" %>
<%@ page import="java.util.Collection" %>
<%@ page import="edu.cornell.mannlib.vitro.webapp.beans.Portal" %>
<%@ page import="edu.cornell.mannlib.vitro.webapp.beans.Individual" %>
<%@ page import="edu.cornell.mannlib.vitro.webapp.beans.Link" %>
<%@ page import="java.net.URLEncoder" %>
@ -28,13 +27,9 @@ if (leadingTab == null) {
}
Collection<Individual> individuals = leadingTab.getRelatedEntities();
Collection<Tab> tabs = leadingTab.getChildTabs();
Portal portal = (Portal)request.getAttribute("portalBean");
int portalId = -1;
if (portal==null) {
portalId=1;
} else {
portalId=portal.getPortalId();
}
int portalId = 1;
DateTime dt = new DateTime();
DateTimeFormatter dtf = ISODateTimeFormat.basicDateTimeNoMillis();
String time = dtf.print(dt.getMillis());

13
webapp/web/templates/tabs/tabBasic.jsp
View file

@ -4,7 +4,6 @@
<%@ page import="org.apache.commons.logging.LogFactory" %>
<%@ page import="edu.cornell.mannlib.vitro.webapp.web.TabWebUtil" %>
<%@ page import="edu.cornell.mannlib.vitro.webapp.beans.Tab" %>
<%@ page import="edu.cornell.mannlib.vitro.webapp.beans.Portal" %>
<%@ page import="edu.cornell.mannlib.vitro.webapp.controller.Controllers" %>
<%@ page errorPage="/error.jsp"%>
<% /***********************************************
@ -44,15 +43,9 @@
/***************************************************
nac26 2008-05-08 following brian's lead from menu.jsp to get the portalId so it can be added to the tab links */
final Log log = LogFactory.getLog("edu.cornell.mannlib.vitro.web.tabBasic.jsp");
Portal portal = (Portal)request.getAttribute("portalBean");
int portalId = -1;
if (portal==null) {
log.error("Attribute 'portalBean' missing or null; portalId defaulted to 1");
portalId=1;
} else {
portalId=portal.getPortalId();
}
int portalId = 1;
/**************************************************/
String tabId = request.getParameter("tabId");