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

merging revision 4681

Browse source
This commit is contained in:
bdc34 2010-04-08 18:43:07 +00:00
parent 6eac5a30c4
commit adfa85142f
1 changed files with 103 additions and 97 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
webapp/web/templates/entity/entityMergedPropsListUngrouped.jsp
View file

@ -229,15 +229,20 @@ public static Log log = LogFactory.getLog("edu.cornell.mannlib.vitro.webapp.jsp.
DataProperty dp = (DataProperty)p;%> DataProperty dp = (DataProperty)p;%>
<c:set var="dataProp" value="<%=dp%>"/> <c:set var="dataProp" value="<%=dp%>"/>
<c:set var="dataRows" value="${fn:length(dataProp.dataPropertyStatements)}"/> <c:set var="dataRows" value="${fn:length(dataProp.dataPropertyStatements)}"/>
<c:set var="hasRowsToShow" value="${ dataRows > 0 }"/>
<c:if test="${showSelfEdits || showCuratorEdits}"><edLnk:editLinks var="editLinks" item="${dataProp}" icons="false"/></c:if>
<c:set var="mayEdit" value="${ !empty editLinks }"/>
<c:set var="dataStyle" value="display: block;"/> <c:set var="dataStyle" value="display: block;"/>
<c:if test="${dataRows==0}"><c:set var="dataStyle" value="display: block;"/></c:if> <c:if test="${dataRows==0}"><c:set var="dataStyle" value="display: block;"/></c:if>
<c:set var="classForEditControls" value=""/> <c:set var="classForEditControls" value=""/>
<c:if test="${showSelfEdits || showCuratorEdits}"><c:set var="classForEditControls" value=" editing"/></c:if> <c:if test="${showSelfEdits || showCuratorEdits}"><c:set var="classForEditControls" value=" editing"/></c:if>
<c:set var="uniqueDpropDivName" value="${fn:replace(dataProp.localNameWithPrefix,':','-')}"/> <c:set var="uniqueDpropDivName" value="${fn:replace(dataProp.localNameWithPrefix,':','-')}"/>
<c:if test="${ hasRowsToShow or mayEdit }">
<div id="${'dprop-'}${uniqueDpropDivName}" class="propsItem ${classForEditControls}" style="${dataStyle}"> <div id="${'dprop-'}${uniqueDpropDivName}" class="propsItem ${classForEditControls}" style="${dataStyle}">
<h3 class="propertyName">${dataProp.editLabel}</h3> <h3 class="propertyName">${dataProp.editLabel}</h3>
<c:if test="${showSelfEdits || showCuratorEdits}"><edLnk:editLinks item="${dataProp}" icons="false"/></c:if> <c:if test="${showSelfEdits || showCuratorEdits}"><edLnk:editLinks item="${dataProp}" icons="false"/></c:if>
<%-- Verbose property display additions for data properties, using context variable verbosePropertyListing --%> <%-- Verbose property display additions for data properties, using context variable verbosePropertyListing --%>
<c:if test="${showCuratorEdits && verbosePropertyListing}"> <c:if test="${showCuratorEdits && verbosePropertyListing}">
<c:url var="propertyEditLink" value="/datapropEdit"> <c:url var="propertyEditLink" value="/datapropEdit">
@ -332,6 +337,7 @@ public static Log log = LogFactory.getLog("edu.cornell.mannlib.vitro.webapp.jsp.
<c:if test="${stmtCounter > displayLimit}"></div></div></c:if> <c:if test="${stmtCounter > displayLimit}"></div></div></c:if>
<c:if test="${!empty dataProp.dataPropertyStatements}"></div><!-- datatypeProperties --></c:if> <c:if test="${!empty dataProp.dataPropertyStatements}"></div><!-- datatypeProperties --></c:if>
</div><!-- ${dataProp.localNameWithPrefix} --> </div><!-- ${dataProp.localNameWithPrefix} -->
</c:if>
<% } else { // keyword property -- ignore <% } else { // keyword property -- ignore
if (p instanceof KeywordProperty) {%> if (p instanceof KeywordProperty) {%>
<p>Not expecting keyword properties here.</p> <p>Not expecting keyword properties here.</p>