From fa77c80a910932403763114b1d2dc1afa4f59dcf Mon Sep 17 00:00:00 2001 From: nac26 Date: Thu, 22 Jul 2010 18:38:29 +0000 Subject: [PATCH] merge from nihvivo-rel-1.1-maint branch: moving the individual rendering changes back to the vitro --- webapp/web/templates/entity/entityBasic.jsp | 122 +++++++++--------- .../entity/entityMergedPropsList.jsp | 100 ++++++++++++-- 2 files changed, 151 insertions(+), 71 deletions(-) diff --git a/webapp/web/templates/entity/entityBasic.jsp b/webapp/web/templates/entity/entityBasic.jsp index 709275417..2554152a3 100644 --- a/webapp/web/templates/entity/entityBasic.jsp +++ b/webapp/web/templates/entity/entityBasic.jsp @@ -80,6 +80,7 @@ if (VitroRequestPrep.isSelfEditing(request) || LoginFormBean.loggedIn(request, L
+
@@ -126,6 +127,55 @@ if (VitroRequestPrep.isSelfEditing(request) || LoginFormBean.loggedIn(request, L + <%-- Thumbnail --%> + + + + + + +
+

image

+ ${imageLinks} +
+ + + +
+
+
+
+ + + ${imageLinks} + +
+
+
+
+ + <%-- hasImage --%> +
+
+
+
+ + + + + ${imageLinks} + +
+
+
+
+ + + + <%-- Links --%> - - - <%-- Thumbnail --%> - - - - - - -
-

image

- ${imageLinks} -
- - - -
-
-
-
- - - ${imageLinks} - -
-
-
-
- - <%-- hasImage --%> -
-
-
-
- - - - - ${imageLinks} - -
-
-
-
- - - + - <%-- Description --%> + <%-- Description --%> + <%-- - + @@ -257,8 +259,8 @@ if (VitroRequestPrep.isSelfEditing(request) || LoginFormBean.loggedIn(request, L
${entity.description}
- - ${editLinksForExisitngDesc} + + ${editLinksForExistingDesc}
@@ -268,14 +270,14 @@ if (VitroRequestPrep.isSelfEditing(request) || LoginFormBean.loggedIn(request, L
- + --%> <%-- Ontology properties --%> - + <%-- unless a value is provided, properties not assigned to a group will not have a tab or appear on the page --%> - + <%-- Blurb --%> @@ -308,9 +310,7 @@ if (VitroRequestPrep.isSelfEditing(request) || LoginFormBean.loggedIn(request, L -->
- +
- - - + \ No newline at end of file diff --git a/webapp/web/templates/entity/entityMergedPropsList.jsp b/webapp/web/templates/entity/entityMergedPropsList.jsp index 9cde91e52..e80948fe6 100644 --- a/webapp/web/templates/entity/entityMergedPropsList.jsp +++ b/webapp/web/templates/entity/entityMergedPropsList.jsp @@ -110,13 +110,13 @@ public static Log log = LogFactory.getLog("edu.cornell.mannlib.vitro.webapp.jsp. - <%-- Getting the count of properties in each group --%> + <%-- Getting the count of properties in each group --%> - + <% int propTotal = g.getPropertyList().size(); %> - +

<%=g.getName()%>

@@ -141,13 +141,53 @@ public static Log log = LogFactory.getLog("edu.cornell.mannlib.vitro.webapp.jsp. See NIHVIVO-512. --%> - - + + <%-- nac26 Changing the test on objRows here to be GTE so that properties marked with an update level of "nobody" are still rendered --%> +

${objProp.editLabel}

+ <%-- Verbose property display additions for object properties, using context variable verbosePropertyListing --%> + + + + + + + + + + + + + + + + + + + + + + + + <% PropertyGroup pg = pgDao.getGroupByURI(op.getGroupURI()); + if (pg!=null && pg.getName()!=null) { + request.setAttribute("groupName",pg.getName());%> + ${localName} (object property); display tier ${displayTier} within group ${groupName}; display level: ${displayCue}; update level: ${updateCue} + <% } else {%> + ${localName} (object property); display tier ${displayTier}; display level: ${displayCue}; update level: ${updateCue} + <% } %> + + + ${localName} (object property); display tier ${displayTier}; display level: ${displayCue}; update level: ${updateCue} + + + + <%-- end Verbose property display additions for object properties --%> + @@ -162,13 +202,13 @@ public static Log log = LogFactory.getLog("edu.cornell.mannlib.vitro.webapp.jsp. - + <% String customShortView = MiscWebUtils.getCustomShortView(request); %> - + @@ -221,6 +261,46 @@ public static Log log = LogFactory.getLog("edu.cornell.mannlib.vitro.webapp.jsp. + + <%-- Verbose property display additions for data properties, using context variable verbosePropertyListing --%> + + + + + + + + + + + + + + + + + + + + + + + + <% PropertyGroup pg = pgDao.getGroupByURI(dp.getGroupURI()); + if (pg!=null && pg.getName()!=null) { + request.setAttribute("groupName",pg.getName());%> + ${localName} (data property); display tier ${displayTier} within group ${groupName}; display level: ${displayCue}; update level: ${updateCue} + <% } else {%> + ${localName} (data property); display tier ${displayTier}; display level: ${displayCue}; update level: ${updateCue} + <% } %> + + + ${localName} (data property); display tier ${displayTier}; display level: ${displayCue}; update level: ${updateCue} + + + + <%-- end Verbose property display additions for data properties --%> + <%-- set to an arbitrary but high positive limit if unset on property, i.e. -1 --%> @@ -240,7 +320,7 @@ public static Log log = LogFactory.getLog("edu.cornell.mannlib.vitro.webapp.jsp. ${dataPropertyStmt.data} - + ${editLinks} (non-editable) @@ -285,6 +365,7 @@ public static Log log = LogFactory.getLog("edu.cornell.mannlib.vitro.webapp.jsp. %>
+ back to top @@ -292,5 +373,4 @@ public static Log log = LogFactory.getLog("edu.cornell.mannlib.vitro.webapp.jsp. } else { log.debug("incoming groups list with merged properties not found as request attribute for subject "+subject.getName()+"\n"); } -%> - +%> \ No newline at end of file