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

Fix for editing/deleting data properties with property groups enabled NIHVIVO-398

Browse source
This commit is contained in:
nac26 2010-07-16 17:01:33 +00:00
parent 53848b8976
commit c491d316a3
2 changed files with 4 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

16
productMods/templates/entity/entityMergedPropsList.jsp
View file

@ -208,19 +208,7 @@ public static Log log = LogFactory.getLog("edu.cornell.mannlib.vitro.webapp.jsp.
<div id="${dataProp.localName}" class="propsItem dataItem${first}${last}${multiItem}${addable}" style="${dataStyle}">
<h4>${dataProp.editLabel}</h4>
<c:if test="${showSelfEdits || showCuratorEdits}">
<c:choose>
<c:when test="${dataRows == 1 && displayLimit==1 }">
<%-- just put in a single "edit" link, not an "add" link that expands to reveal edit/delete links --%>
<c:set var="editLinks"><edLnk:editLinks item="${dataProp.dataPropertyStatements[0]}" icons="false"/></c:set>
<c:if test="${!empty editLinks}"><span class="editLinks">${editLinks}</span></c:if>
<c:if test="${empty editLinks}"><em class="nonEditable">(non-editable)</em></c:if>
</c:when>
<c:otherwise><%-- creates an add link, even if displayLimit is unset, i.e. -1 --%>
<edLnk:editLinks item="${dataProp}" icons="false"/>
</c:otherwise>
</c:choose>
</c:if>
<c:if test="${displayLimit<0}">
<%-- set to an arbitrary but high positive limit if unset on property, i.e. -1 --%>
<c:set var="displayLimit" value="32"/>
@ -240,7 +228,7 @@ public static Log log = LogFactory.getLog("edu.cornell.mannlib.vitro.webapp.jsp.
<c:when test='${dataRows==1}'>
<span class="statementWrap">
${dataPropertyStmt.data}
<c:if test='${displayLimit>1 && (showSelfEdits || showCuratorEdits)}'>
<c:if test='${showSelfEdits || showCuratorEdits}'>
<c:set var="editLinks"><edLnk:editLinks item="${dataPropertyStmt}" icons="false"/></c:set>
<c:if test="${!empty editLinks}"><span class="editLinks">${editLinks}</span></c:if>
<c:if test="${empty editLinks}"><em class="nonEditable">(non-editable)</em></c:if>

4
themes/vivo-basic/css/individual.css
View file

@ -263,7 +263,7 @@ img.screenshot {
}
#personWrap div.datatypeProperties {
/* font-size: 1.2em;*/
font-size: 0.9em;
}
#personWrap div.datatypeProperties p, /* resetting font sizes for html inside data props */
@ -455,7 +455,7 @@ ul.keywords li {
}
#personWrap #overview a.delete {
display: none;
/* display: none;*/
}
#personWrap #overview a.edit {