Some reorganization of templates. Restored entitylist as destination of links on index page, since new individuallist controller/templates not finished yet.
This commit is contained in:
rjy7
parent
8b0665a0d7
commit
b7d2027da4
20 changed files with 37 additions and 21 deletions
|
|
@ -131,8 +131,16 @@ public static Log log = LogFactory.getLog("edu.cornell.mannlib.vitro.webapp.jsp.
|
|||
</c:if>
|
||||
</c:if>
|
||||
<c:set var="objStyle" value="display: block;"/>
|
||||
|
||||
<%-- rjy7 We have a logic problem here: if the custom short view dictates that the item NOT be rendered,
|
||||
and because of this there are NO items to render, we shouldn't show the label when not in edit mode.
|
||||
Example: people ( = positionHistory) of an organization don't render if the position end date is in the past.
|
||||
So the organization might not have any current people, in which case we shouldn't show the "people" label.
|
||||
We need to compute objRows on the basis of the rendering, not the number of objectPropertyStatements.
|
||||
See NIHVIVO-512. --%>
|
||||
|
||||
<c:set var="objRows" value="${fn:length(objProp.objectPropertyStatements)}"/>
|
||||
<c:if test="${objRows==0}"><c:set var="objStyle" value="display: block;"/></c:if>
|
||||
<c:if test="${objRows==0}"><c:set var="objStyle" value="display: block;"/></c:if>
|
||||
<c:if test="${editableInSomeWay || objRows>0}">
|
||||
<c:set var="first" value=""/><c:if test="${counter == 0}"><c:set var="first" value=" first"/></c:if>
|
||||
<c:set var="last" value=""/><c:if test="${(counter+1) == propTotal}"><c:set var="last" value=" last"/></c:if>
|
||||
|
|
|
|||
|
|
@ -3,7 +3,6 @@
|
|||
<#-- List individual members of a class. -->
|
||||
|
||||
<div class="contents">
|
||||
|
||||
<div class="individualList">
|
||||
<h2>${title}</h2>
|
||||
<#if subtitle??>
|
||||
|
|
@ -17,11 +16,10 @@
|
|||
<ul>
|
||||
<#list individuals as individual>
|
||||
<li>
|
||||
<a href="${individual.profileUrl}">${individual.name}</a> ${individual.tagline}
|
||||
<#include "partials/defaultIndividualListView.ftl">
|
||||
</li>
|
||||
</#list>
|
||||
</ul>
|
||||
</#if>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -0,0 +1,3 @@
|
|||
<#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
|
||||
|
||||
<a href="${individual.profileUrl}">${individual.name}</a> ${individual.tagline}
|
||||
|
|
@ -1,22 +1,22 @@
|
|||
<#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
|
||||
|
||||
<#include "/components/doctype.html">
|
||||
<#include "partials/doctype.html">
|
||||
|
||||
<#include "/components/head.ftl">
|
||||
<#include "partials/head.ftl">
|
||||
|
||||
<body>
|
||||
<div id="wrap" class="container">
|
||||
<div id="header">
|
||||
|
||||
<#include "/components/identity.ftl">
|
||||
<#include "partials/identity.ftl">
|
||||
|
||||
<#-- Note to UI team: do not change this div without also making the corresponding change in menu.jsp -->
|
||||
<div id="navAndSearch" class="block">
|
||||
<#include "/components/menu.ftl">
|
||||
<#include "/components/search.ftl">
|
||||
<#include "partials/menu.ftl">
|
||||
<#include "partials/search.ftl">
|
||||
</div> <!-- navAndSearch -->
|
||||
|
||||
<#include "/components/breadcrumbs.ftl">
|
||||
<#include "partials/breadcrumbs.ftl">
|
||||
</div> <!-- header -->
|
||||
|
||||
<hr class="hidden" />
|
||||
|
|
@ -29,10 +29,10 @@
|
|||
</div> <!-- content -->
|
||||
</div> <!-- contentwrap -->
|
||||
|
||||
<#include "/components/footer.ftl">
|
||||
<#include "partials/footer.ftl">
|
||||
|
||||
</div> <!-- wrap -->
|
||||
|
||||
<#include "/components/scripts.ftl">
|
||||
<#include "partials/scripts.ftl">
|
||||
</body>
|
||||
</html>
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@
|
|||
</@l.makeList>
|
||||
</ul>
|
||||
</div>
|
||||
|
||||
|
||||
<#include "copyright.ftl">
|
||||
|
||||
All Rights Reserved. <a href="${urls.termsOfUse}">Terms of Use</a>
|
||||
Loading…
Add table
Add a link
Reference in a new issue