From 7dedb2720ec8af57f27d1c0bfe1d951d62c50337 Mon Sep 17 00:00:00 2001
From: nac26 <nac26@43c2fc9b-1942-4403-87b2-35b4218f7473>
Date: Thu, 22 Jul 2010 16:00:32 +0000
Subject: [PATCH] merge from rel-1.1-maint branch: verbose property display is
 back, empty groups are almost there NIHVIVO-845, NIHVIVO-848

---
 productMods/templates/entity/entityBasic.jsp  |  2 +-
 .../entity/entityMergedPropsList.jsp          | 86 ++++++++++++++++++-
 themes/vivo-basic/css/individual.css          |  1 -
 themes/vivo-basic/css/screen.css              |  2 +-
 4 files changed, 85 insertions(+), 6 deletions(-)

diff --git a/productMods/templates/entity/entityBasic.jsp b/productMods/templates/entity/entityBasic.jsp
index e763cdc0..4b43c06a 100644
--- a/productMods/templates/entity/entityBasic.jsp
+++ b/productMods/templates/entity/entityBasic.jsp
@@ -277,7 +277,7 @@ if (VitroRequestPrep.isSelfEditing(request) || LoginFormBean.loggedIn(request, L
                 <c:param name="mode" value="${showEdits ? 'edit' : ''}"/>
                 <c:param name="grouped" value="true"/>
                 <%-- unless a value is provided, properties not assigned to a group will not have a tab or appear on the page --%>
-                <c:param name="unassignedPropsGroupName" value=""/>
+                <c:param name="unassignedPropsGroupName" value="other"/>
             </c:import>
 
             <%-- Blurb --%>                              
diff --git a/productMods/templates/entity/entityMergedPropsList.jsp b/productMods/templates/entity/entityMergedPropsList.jsp
index 48ec73a3..330aff5f 100644
--- a/productMods/templates/entity/entityMergedPropsList.jsp
+++ b/productMods/templates/entity/entityMergedPropsList.jsp
@@ -110,13 +110,13 @@ public static Log log = LogFactory.getLog("edu.cornell.mannlib.vitro.webapp.jsp.
             <c:if test="${group.statementCount==0}"><c:set var="groupStyle" value="display: block"/></c:if>
 
 
-            	<%-- Getting the count of properties in each group --%>
+        <%-- Getting the count of properties in each group --%>
 				<c:set var="counter" value="0"/>
-            	<c:set var="propTotal" value="0"/>
+        <c:set var="propTotal" value="0"/>
 				<% int propTotal = g.getPropertyList().size(); %>
 				<c:set var="propTotal" value="<%=propTotal%>" />
 				
-            
+    <c:if test="${propTotal>0}">  
 			<div class="propsCategory" id="<%=g.getLocalName()%>">
 				<h3><strong><%=g.getName()%></strong></h3>
 				<div class="propsWrap">
@@ -148,6 +148,45 @@ public static Log log = LogFactory.getLog("edu.cornell.mannlib.vitro.webapp.jsp.
                             <div class="propsItem${first}${last}" id="${objProp.localName}">
                                 <h4>${objProp.editLabel}</h4>
 					    		<c:if test="${showSelfEdits || showCuratorEdits}"><edLnk:editLinks item="${objProp}" icons="false" /></c:if>
+					    		<%-- Verbose property display additions for object properties, using context variable verbosePropertyListing --%>
+                          <c:if test="${showCuratorEdits && verbosePropertyListing}">
+                              <c:url var="propertyEditLink" value="/propertyEdit">
+                                  <c:param name="home" value="${portal.portalId}"/>
+                                  <c:param name="uri" value="${objProp.URI}"/>
+                              </c:url>
+                              <c:choose>
+                                  <c:when test="${!empty objProp.hiddenFromDisplayBelowRoleLevel.label}"><c:set var="displayCue" value="${objProp.hiddenFromDisplayBelowRoleLevel.label}"/></c:when>
+                                  <c:otherwise><c:set var="displayCue" value="unspecified"/></c:otherwise>
+                              </c:choose>
+                              <c:choose>
+                                  <c:when test="${!empty objProp.prohibitedFromUpdateBelowRoleLevel.label}"><c:set var="updateCue" value="${objProp.prohibitedFromUpdateBelowRoleLevel.label}"/></c:when>
+                                  <c:otherwise><c:set var="updateCue" value="unspecified"/></c:otherwise>
+                              </c:choose>
+                              <c:choose>
+                                  <c:when test="${!empty objProp.localNameWithPrefix}"><c:set var="localName" value="${objProp.localNameWithPrefix}"/></c:when>
+                                  <c:otherwise><c:set var="localName" value="no local name"/></c:otherwise>
+                              </c:choose>
+                              <c:choose>
+                                  <c:when test="${!empty objProp.domainDisplayTier}"><c:set var="displayTier" value="${objProp.domainDisplayTier}"/></c:when>
+                                  <c:otherwise><c:set var="displayTier" value="blank"/></c:otherwise>
+                              </c:choose>
+                              <c:choose>
+                                  <c:when test="${!empty objProp.groupURI}">
+      <%                              PropertyGroup pg = pgDao.getGroupByURI(op.getGroupURI());
+                                      if (pg!=null && pg.getName()!=null) {
+                                          request.setAttribute("groupName",pg.getName());%>
+                                          <span class="verbosePropertyListing"><a class="propertyLink" href="${propertyEditLink}"/>${localName}</a> (object property); display tier ${displayTier} within group ${groupName}; display level: ${displayCue}; update level: ${updateCue}</span>
+      <%                              } else {%>
+                                          <span class="verbosePropertyListing"><a class="propertyLink" href="${propertyEditLink}"/>${localName}</a> (object property); display tier ${displayTier}; display level: ${displayCue}; update level: ${updateCue}</span>
+      <%                              } %>
+                                  </c:when>
+                                  <c:otherwise>
+                                      <span class="verbosePropertyListing"><a class="propertyLink" href="${propertyEditLink}"/>${localName}</a> (object property); display tier ${displayTier}; display level: ${displayCue}; update level: ${updateCue}</span>
+                                  </c:otherwise>
+                              </c:choose>
+                          </c:if>
+        					<%-- end Verbose property display additions for object properties --%>
+					    		
 	    						<c:set var="displayLimit" value="${objProp.domainDisplayLimit}"/>
 
 								<c:if test="${displayLimit<0}">
@@ -221,6 +260,46 @@ public static Log log = LogFactory.getLog("edu.cornell.mannlib.vitro.webapp.jsp.
                                     </c:otherwise>
                                 </c:choose>
                             </c:if>
+                            
+                            <%-- Verbose property display additions for data properties, using context variable verbosePropertyListing --%>
+                	                <c:if test="${showCuratorEdits && verbosePropertyListing}">
+                	                    <c:url var="propertyEditLink" value="/datapropEdit">
+                	                        <c:param name="home" value="${portal.portalId}"/>
+                	                        <c:param name="uri" value="${dataProp.URI}"/>
+                	                    </c:url>
+                	                    <c:choose>
+                	                        <c:when test="${!empty dataProp.hiddenFromDisplayBelowRoleLevel.label}"><c:set var="displayCue" value="${dataProp.hiddenFromDisplayBelowRoleLevel.label}"/></c:when>
+                	                        <c:otherwise><c:set var="displayCue" value="unspecified"/></c:otherwise>
+                	                    </c:choose>
+                	                    <c:choose>
+                	                        <c:when test="${!empty dataProp.prohibitedFromUpdateBelowRoleLevel.label}"><c:set var="updateCue" value="${dataProp.prohibitedFromUpdateBelowRoleLevel.label}"/></c:when>
+                	                        <c:otherwise><c:set var="updateCue" value="unspecified"/></c:otherwise>
+                	                    </c:choose>
+                	                    <c:choose>
+                	                        <c:when test="${!empty dataProp.localNameWithPrefix}"><c:set var="localName" value="${dataProp.localNameWithPrefix}"/></c:when>
+                	                        <c:otherwise><c:set var="localName" value="no local name"/></c:otherwise>
+                	                    </c:choose>
+                	                    <c:choose>
+                	                        <c:when test="${!empty dataProp.displayTier}"><c:set var="displayTier" value="${dataProp.displayTier}"/></c:when>
+                	                        <c:otherwise><c:set var="displayTier" value="blank"/></c:otherwise>
+                	                    </c:choose>
+                	                    <c:choose>
+                	                        <c:when test="${!empty dataProp.groupURI}">
+                	<%                          PropertyGroup pg = pgDao.getGroupByURI(dp.getGroupURI());
+                	                            if (pg!=null && pg.getName()!=null) {
+                	                                request.setAttribute("groupName",pg.getName());%>
+                	                                <span class="verbosePropertyListing"><a class="propertyLink" href="${propertyEditLink}"/>${localName}</a> (data property); display tier ${displayTier} within group ${groupName}; display level: ${displayCue}; update level: ${updateCue}</span>
+                	<%                          } else {%>
+                	                                <span class="verbosePropertyListing"><a class="propertyLink" href="${propertyEditLink}"/>${localName}</a> (data property); display tier ${displayTier}; display level: ${displayCue}; update level: ${updateCue}</span>
+                	<%                          } %>
+                	                        </c:when>
+                	                        <c:otherwise>
+                	                            <span class="verbosePropertyListing"><a class="propertyLink" href="${propertyEditLink}"/>${localName}</a> (data property); display tier ${displayTier}; display level: ${displayCue}; update level: ${updateCue}</span>
+                	                        </c:otherwise>
+                	                    </c:choose>
+                	                </c:if>
+                	                <%-- end Verbose property display additions for data properties --%>
+                            
                             <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"/>
@@ -285,6 +364,7 @@ public static Log log = LogFactory.getLog("edu.cornell.mannlib.vitro.webapp.jsp.
 				%>
 				</div><!-- propsWrap -->
 			</div><!-- class="propsCategory" -->
+		</c:if>
 			<c:if test="${showSelfEdits || showCuratorEdits}">
 		    	<a class="backToTop" href="#wrap" title="jump to top of the page">back to top</a>
 			</c:if>
diff --git a/themes/vivo-basic/css/individual.css b/themes/vivo-basic/css/individual.css
index b53273d1..0d1301ec 100644
--- a/themes/vivo-basic/css/individual.css
+++ b/themes/vivo-basic/css/individual.css
@@ -224,7 +224,6 @@ img.screenshot {
 }
 
 #personWrap div.propsCategory div.propsItem { /* being more specific here to leave borders off ungrouped (single) properties */
-  padding-bottom: 3em;
 /*    border-top: 1px solid #fff;*/
 /*    border-bottom: 1px solid #f0ede4;*/
     border-bottom: 1px solid #f2f2f2;
diff --git a/themes/vivo-basic/css/screen.css b/themes/vivo-basic/css/screen.css
index 2b4e7664..a4aa3a38 100644
--- a/themes/vivo-basic/css/screen.css
+++ b/themes/vivo-basic/css/screen.css
@@ -631,7 +631,7 @@ a.add {
 
 a.add:hover {
   background-image: url(../site_icons/plus_transparent_hover.gif);
-  background-color: #000; 
+  background-color: #576772; 
 }
 
 ul.properties { margin: 0; }