From dd84a0ddf410436675d0f137b403543f7298c618 Mon Sep 17 00:00:00 2001
From: rjy7 <rjy7@440791e1-c2bf-4c1e-ad7c-caf3f8b0ebe8>
Date: Tue, 23 Mar 2010 20:04:34 +0000
Subject: [PATCH] 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.

---
 webapp/web/templates/entity/entityBasic.jsp | 122 ++++++++++----------
 1 file changed, 64 insertions(+), 58 deletions(-)

diff --git a/webapp/web/templates/entity/entityBasic.jsp b/webapp/web/templates/entity/entityBasic.jsp
index a83c1b79b..e4a764964 100644
--- a/webapp/web/templates/entity/entityBasic.jsp
+++ b/webapp/web/templates/entity/entityBasic.jsp
@@ -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. --%>
                         <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>
                                 <edLnk:editLinks item="<%= VitroVocabulary.MONIKER %>" icons="false"/>
                         </c:if>
@@ -198,7 +198,7 @@ RY Description not working - FIX
                 </div>
                 
                 <%-- Citation --%>
-                <div id="dprop-vitro-citation" class="propsItem ${editingClass}" style="display:block;">   
+                <div id="dprop-vitro-citation" class="propsItem ${editingClass}">   
                     <c:if test="${showEdits}">                           
                         <h3 class="propertyName">citation</h3>
                         <edLnk:editLinks item="<%= VitroVocabulary.CITATION %>" icons="false"/>
@@ -222,46 +222,50 @@ RY Description not working - FIX
             <p:process>
 
                 <%-- Blurb --%>
-                <div id="dprop-vitro-blurb" class="propsItem ${editingClass}" style="display:block;">   
-                    <c:if test="${showEdits}">                           
-                        <h3 class="propertyName">blurb</h3>
-                        <edLnk:editLinks item="<%= VitroVocabulary.BLURB %>" icons="false"/>
-                    </c:if>
-                    <c:if test="${!empty entity.blurb}">
-                        <div class="datatypeProperties">
-                            <div class="datatypePropertyValue">
-                                <div class="statementWrap">
-                                    <div class="description">${entity.blurb}</div>
-                                    <c:if test="${showEdits}">
-                                        <c:set var="editLinks"><edLnk:editLinks item="<%= VitroVocabulary.BLURB %>" data="${entity.blurb}" icons="false"/></c:set>
-                                        <c:if test="${!empty editLinks}"><span class="editLinks">${editLinks}</span></c:if>                                                                     
-                                    </c:if> 
-                                </div>
-                            </div>
-                        </div>
-                    </c:if>     
-                </div>
+                <c:if test="${showEdits || !empty entity.blurb}">
+	                <div id="dprop-vitro-blurb" class="propsItem ${editingClass}">   
+	                    <c:if test="${showEdits}">                           
+	                        <h3 class="propertyName">blurb</h3>
+	                        <edLnk:editLinks item="<%= VitroVocabulary.BLURB %>" icons="false"/>
+	                    </c:if>
+	                    <c:if test="${!empty entity.blurb}">
+	                        <div class="datatypeProperties">
+	                            <div class="datatypePropertyValue">
+	                                <div class="statementWrap">
+	                                    <div class="description">${entity.blurb}</div>
+	                                    <c:if test="${showEdits}">
+	                                        <c:set var="editLinks"><edLnk:editLinks item="<%= VitroVocabulary.BLURB %>" data="${entity.blurb}" icons="false"/></c:set>
+	                                        <c:if test="${!empty editLinks}"><span class="editLinks">${editLinks}</span></c:if>                                                                     
+	                                    </c:if> 
+	                                </div>
+	                            </div>
+	                        </div>
+	                    </c:if>     
+	                </div>
+                </c:if>
 
-                <%-- Description --%>                   
-                <div id="dprop-vitro-description" class="propsItem ${editingClass}" style="display:block;">   
-                    <c:if test="${showEdits}">                           
-                        <h3 class="propertyName">description</h3>
-                        <edLnk:editLinks item="<%= VitroVocabulary.DESCRIPTION %>" icons="false"/>
-                    </c:if>
-                    <c:if test="${!empty entity.description}">
-                        <div class="datatypeProperties">
-                            <div class="datatypePropertyValue">
-                                <div class="statementWrap">
-                                    <div class="description">${entity.description}</div>
-                                    <c:if test="${showEdits}">
-                                        <c:set var="editLinks"><edLnk:editLinks item="<%= VitroVocabulary.DESCRIPTION %>" data="${entity.description}" icons="false"/></c:set>
-                                        <c:if test="${!empty editLinks}"><span class="editLinks">${editLinks}</span></c:if>                                                                     
-                                    </c:if> 
-                                </div>
-                            </div>
-                        </div>
-                    </c:if>     
-                </div>
+                <%-- Description --%>   
+                <c:if test="${showEdits || !empty entity.description}">                
+	                <div id="dprop-vitro-description" class="propsItem ${editingClass}">   
+	                    <c:if test="${showEdits}">                           
+	                        <h3 class="propertyName">description</h3>
+	                        <edLnk:editLinks item="<%= VitroVocabulary.DESCRIPTION %>" icons="false"/>
+	                    </c:if>
+	                    <c:if test="${!empty entity.description}">
+	                        <div class="datatypeProperties">
+	                            <div class="datatypePropertyValue">
+	                                <div class="statementWrap">
+	                                    <div class="description">${entity.description}</div>
+	                                    <c:if test="${showEdits}">
+	                                        <c:set var="editLinks"><edLnk:editLinks item="<%= VitroVocabulary.DESCRIPTION %>" data="${entity.description}" icons="false"/></c:set>
+	                                        <c:if test="${!empty editLinks}"><span class="editLinks">${editLinks}</span></c:if>                                                                     
+	                                    </c:if> 
+	                                </div>
+	                            </div>
+	                        </div>
+	                    </c:if>     
+	                </div>
+                </c:if>
                                 
             </p:process>
             
@@ -275,25 +279,27 @@ RY Description not working - FIX
 
             <p:process>
                 <%-- Citation, if no thumbnail --%>
-                <div id="dprop-vitro-citation" class="propsItem ${editingClass}" style="display:block;">   
-                    <c:if test="${showEdits}">                           
-                        <h3 class="propertyName">citation</h3>
-                        <edLnk:editLinks item="<%= VitroVocabulary.CITATION %>" icons="false"/>
-                    </c:if>
-                    <c:if test="${!empty entity.citation}">
-                        <div class="datatypeProperties">
-                            <div class="datatypePropertyValue">
-                                <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> 
+                <c:if test="${empty entity.imageThumb}">
+                    <div id="dprop-vitro-citation" class="propsItem ${editingClass}">   
+                        <c:if test="${showEdits}">                           
+                            <h3 class="propertyName">citation</h3>
+                            <edLnk:editLinks item="<%= VitroVocabulary.CITATION %>" icons="false"/>
+                        </c:if>
+                        <c:if test="${!empty entity.citation}">
+                            <div class="datatypeProperties">
+                                <div class="datatypePropertyValue">
+                                    <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>
-                    </c:if>     
-                </div>
+                        </c:if>     
+                    </div>
+                </c:if>
                 <c:if test="${!empty entity.keywordString}">
                     <p id="keywords">Keywords: ${entity.keywordString}</p>
                 </c:if>