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

NIHVIVO-145, NIHVIVO-146 Don't output wrapping div for blurb and description if not in editing mode and the item has no value, since it adds too much blank space to the page.

Browse source
This commit is contained in:
rjy7 2010-03-23 20:04:34 +00:00
parent 354b2f0961
commit dd84a0ddf4
1 changed files with 64 additions and 58 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

122
webapp/web/templates/entity/entityBasic.jsp
View file

@ -125,7 +125,7 @@ RY Description not working - FIX
<%-- Moniker. Wrap in the div only if editing. If not editing, displays inline next to label. --%> <%-- Moniker. Wrap in the div only if editing. If not editing, displays inline next to label. --%>
<c:if test="${showEdits}"> <c:if test="${showEdits}">
<div id="dprop-vitro-moniker" class="propsItem editing" style="display:block;"> <div id="dprop-vitro-moniker" class="propsItem editing">
<h3 class="propertyName">moniker</h3> <h3 class="propertyName">moniker</h3>
<edLnk:editLinks item="<%= VitroVocabulary.MONIKER %>" icons="false"/> <edLnk:editLinks item="<%= VitroVocabulary.MONIKER %>" icons="false"/>
</c:if> </c:if>
@ -198,7 +198,7 @@ RY Description not working - FIX
</div> </div>
<%-- Citation --%> <%-- Citation --%>
<div id="dprop-vitro-citation" class="propsItem ${editingClass}" style="display:block;"> <div id="dprop-vitro-citation" class="propsItem ${editingClass}">
<c:if test="${showEdits}"> <c:if test="${showEdits}">
<h3 class="propertyName">citation</h3> <h3 class="propertyName">citation</h3>
<edLnk:editLinks item="<%= VitroVocabulary.CITATION %>" icons="false"/> <edLnk:editLinks item="<%= VitroVocabulary.CITATION %>" icons="false"/>
@ -222,46 +222,50 @@ RY Description not working - FIX
<p:process> <p:process>
<%-- Blurb --%> <%-- Blurb --%>
<div id="dprop-vitro-blurb" class="propsItem ${editingClass}" style="display:block;"> <c:if test="${showEdits || !empty entity.blurb}">
<c:if test="${showEdits}"> <div id="dprop-vitro-blurb" class="propsItem ${editingClass}">
<h3 class="propertyName">blurb</h3> <c:if test="${showEdits}">
<edLnk:editLinks item="<%= VitroVocabulary.BLURB %>" icons="false"/> <h3 class="propertyName">blurb</h3>
</c:if> <edLnk:editLinks item="<%= VitroVocabulary.BLURB %>" icons="false"/>
<c:if test="${!empty entity.blurb}"> </c:if>
<div class="datatypeProperties"> <c:if test="${!empty entity.blurb}">
<div class="datatypePropertyValue"> <div class="datatypeProperties">
<div class="statementWrap"> <div class="datatypePropertyValue">
<div class="description">${entity.blurb}</div> <div class="statementWrap">
<c:if test="${showEdits}"> <div class="description">${entity.blurb}</div>
<c:set var="editLinks"><edLnk:editLinks item="<%= VitroVocabulary.BLURB %>" data="${entity.blurb}" icons="false"/></c:set> <c:if test="${showEdits}">
<c:if test="${!empty editLinks}"><span class="editLinks">${editLinks}</span></c:if> <c:set var="editLinks"><edLnk:editLinks item="<%= VitroVocabulary.BLURB %>" data="${entity.blurb}" icons="false"/></c:set>
</c:if> <c:if test="${!empty editLinks}"><span class="editLinks">${editLinks}</span></c:if>
</div> </c:if>
</div> </div>
</div> </div>
</c:if> </div>
</div> </c:if>
</div>
</c:if>
<%-- Description --%> <%-- Description --%>
<div id="dprop-vitro-description" class="propsItem ${editingClass}" style="display:block;"> <c:if test="${showEdits || !empty entity.description}">
<c:if test="${showEdits}"> <div id="dprop-vitro-description" class="propsItem ${editingClass}">
<h3 class="propertyName">description</h3> <c:if test="${showEdits}">
<edLnk:editLinks item="<%= VitroVocabulary.DESCRIPTION %>" icons="false"/> <h3 class="propertyName">description</h3>
</c:if> <edLnk:editLinks item="<%= VitroVocabulary.DESCRIPTION %>" icons="false"/>
<c:if test="${!empty entity.description}"> </c:if>
<div class="datatypeProperties"> <c:if test="${!empty entity.description}">
<div class="datatypePropertyValue"> <div class="datatypeProperties">
<div class="statementWrap"> <div class="datatypePropertyValue">
<div class="description">${entity.description}</div> <div class="statementWrap">
<c:if test="${showEdits}"> <div class="description">${entity.description}</div>
<c:set var="editLinks"><edLnk:editLinks item="<%= VitroVocabulary.DESCRIPTION %>" data="${entity.description}" icons="false"/></c:set> <c:if test="${showEdits}">
<c:if test="${!empty editLinks}"><span class="editLinks">${editLinks}</span></c:if> <c:set var="editLinks"><edLnk:editLinks item="<%= VitroVocabulary.DESCRIPTION %>" data="${entity.description}" icons="false"/></c:set>
</c:if> <c:if test="${!empty editLinks}"><span class="editLinks">${editLinks}</span></c:if>
</div> </c:if>
</div> </div>
</div> </div>
</c:if> </div>
</div> </c:if>
</div>
</c:if>
</p:process> </p:process>
@ -275,25 +279,27 @@ RY Description not working - FIX
<p:process> <p:process>
<%-- Citation, if no thumbnail --%> <%-- Citation, if no thumbnail --%>
<div id="dprop-vitro-citation" class="propsItem ${editingClass}" style="display:block;"> <c:if test="${empty entity.imageThumb}">
<c:if test="${showEdits}"> <div id="dprop-vitro-citation" class="propsItem ${editingClass}">
<h3 class="propertyName">citation</h3> <c:if test="${showEdits}">
<edLnk:editLinks item="<%= VitroVocabulary.CITATION %>" icons="false"/> <h3 class="propertyName">citation</h3>
</c:if> <edLnk:editLinks item="<%= VitroVocabulary.CITATION %>" icons="false"/>
<c:if test="${!empty entity.citation}"> </c:if>
<div class="datatypeProperties"> <c:if test="${!empty entity.citation}">
<div class="datatypePropertyValue"> <div class="datatypeProperties">
<div class="statementWrap"> <div class="datatypePropertyValue">
${entity.citation} <div class="statementWrap">
<c:if test="${showEdits}"> ${entity.citation}
<c:set var="editLinks"><edLnk:editLinks item="<%= VitroVocabulary.CITATION %>" data="${entity.citation}" icons="false"/></c:set> <c:if test="${showEdits}">
<c:if test="${!empty editLinks}"><span class="editLinks">${editLinks}</span></c:if> <c:set var="editLinks"><edLnk:editLinks item="<%= VitroVocabulary.CITATION %>" data="${entity.citation}" icons="false"/></c:set>
</c:if> <c:if test="${!empty editLinks}"><span class="editLinks">${editLinks}</span></c:if>
</c:if>
</div>
</div> </div>
</div> </div>
</div> </c:if>
</c:if> </div>
</div> </c:if>
<c:if test="${!empty entity.keywordString}"> <c:if test="${!empty entity.keywordString}">
<p id="keywords">Keywords: ${entity.keywordString}</p> <p id="keywords">Keywords: ${entity.keywordString}</p>
</c:if> </c:if>