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

NIHVIVO-147 Add/edit/delete citation from front end.

Browse source 
NIHVIVO-142 Removed some unneeded styles for front end editing.
This commit is contained in:
rjy7 2010-03-23 18:29:03 +00:00
parent 65d9c2a7e4
commit c162cf675e
1 changed files with 38 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -185,7 +185,7 @@ RY Description not working - FIX
</div> </div>
</c:if> </c:if>
<%-- Thumbnail --%> <%-- Thumbnail (with citation) --%>
<c:if test="${!empty entity.imageThumb}"> <c:if test="${!empty entity.imageThumb}">
<div class="thumbnail"> <div class="thumbnail">
<c:if test="${!empty entity.imageFile}"> <c:if test="${!empty entity.imageFile}">
@ -196,19 +196,27 @@ RY Description not working - FIX
<img src="<c:out value="${imageSrc}"/>" title="click to view larger image in new window" alt="" width="150"/> <img src="<c:out value="${imageSrc}"/>" title="click to view larger image in new window" alt="" width="150"/>
<c:if test="${!empty entity.imageFile}"></a></c:if> <c:if test="${!empty entity.imageFile}"></a></c:if>
</div> </div>
<%-- Citation --%> <%-- Citation --%>
<c:if test="${!empty entity.citation}"> <div id="dprop-vitro-citation" class="propsItem ${editingClass}" style="display:block;">
<div class="datatypePropertyValue"> <c:if test="${showEdits}">
<div class="statementWrap"> <h3 class="propertyName">citation</h3>
<div class="citation">${entity.citation}</div> <edLnk:editLinks item="<%= VitroVocabulary.CITATION %>" icons="false"/>
<%-- </c:if>
<c:if test="${showEdits}"> <c:if test="${!empty entity.citation}">
<c:set var="editLinks"><edLnk:editLinks item="<%= VitroVocabulary.CITATION %>" data="${entity.citation}" icons="false"/></c:set> <div class="datatypeProperties">
<c:if test="${!empty editLinks}"><span class="editLinks">${editLinks}</span></c:if> <div class="datatypePropertyValue">
</c:if> --%> <div class="statementWrap">
${entity.citation}
<c:if test="${showEdits}">
<c:set var="editLinks"><edLnk:editLinks item="<%= VitroVocabulary.CITATION %>" data="${entity.citation}" icons="false"/></c:set>
<c:if test="${!empty editLinks}"><span class="editLinks">${editLinks}</span></c:if>
</c:if>
</div>
</div>
</div> </div>
</div> </c:if>
</c:if> </div>
</c:if> </c:if>
<p:process> <p:process>
@ -268,18 +276,25 @@ RY Description not working - FIX
<p:process> <p:process>
<%-- Citation, if no thumbnail --%> <%-- Citation, if no thumbnail --%>
<c:if test="${(!empty entity.citation) && (empty entity.imageThumb)}"> <div id="dprop-vitro-citation" class="propsItem ${editingClass}" style="display:block;">
<div class="datatypePropertyValue"> <c:if test="${showEdits}">
<div class="statementWrap"> <h3 class="propertyName">citation</h3>
<div class="citation">${entity.citation}</div> <edLnk:editLinks item="<%= VitroVocabulary.CITATION %>" icons="false"/>
<%-- </c:if>
<c:if test="${showEdits}"> <c:if test="${!empty entity.citation}">
<c:set var="editLinks"><edLnk:editLinks item="<%= VitroVocabulary.CITATION %>" data="${entity.citation}" icons="false"/></c:set> <div class="datatypeProperties">
<c:if test="${!empty editLinks}"><span class="editLinks">${editLinks}</span></c:if> <div class="datatypePropertyValue">
</c:if> --%> <div class="statementWrap">
${entity.citation}
<c:if test="${showEdits}">
<c:set var="editLinks"><edLnk:editLinks item="<%= VitroVocabulary.CITATION %>" data="${entity.citation}" icons="false"/></c:set>
<c:if test="${!empty editLinks}"><span class="editLinks">${editLinks}</span></c:if>
</c:if>
</div>
</div>
</div> </div>
</div> </c:if>
</c:if> </div>
<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>