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

Style and markup tweaks for browse index

Browse source
This commit is contained in:
nac26 2011-01-26 14:14:32 +00:00
parent 2fb9547738
commit f7e126cf50
2 changed files with 53 additions and 57 deletions
Download patch file Download diff file Expand all files Collapse all files

10
webapp/web/css/browseIndex.css
View file

@ -2,7 +2,7 @@
/* browseIndex.css contains styles used in the Index pages. */ /* browseIndex.css contains styles used in the Index pages. */
/* INDIVIDUAL LIST ------> */ /* INDIVIDUAL LIST ------> */
.individualList ul.individualData li{ .individualList ul.individualData li {
padding-bottom: 0; padding-bottom: 0;
display: inline; display: inline;
padding-right: .3em; padding-right: .3em;
@ -10,15 +10,17 @@
.pagination { .pagination {
display: inline-block; display: inline-block;
} }
.pagination li{ .pagination li {
display: inline-block; display: inline-block;
padding-right: 2px; padding-right: 2px;
} }
.pagination li.selectedNavPage{ .pagination li.selectedNavPage {
font-size: 1em; font-size: 1em;
} }
.rdfLink { .rdfLink {
padding-left: 0.5em;
font-size: 0.8em; font-size: 0.8em;
border-left: 1px solid #a6b1b0;
} }
.individualList a.externalLink { .individualList a.externalLink {
text-decoration: none; text-decoration: none;
@ -36,7 +38,7 @@
.individualList li { .individualList li {
list-style-type: none; list-style-type: none;
margin-bottom: .5em; margin-bottom: .5em;
} }
.individualList li a { .individualList li a {
font-weight: normal; font-weight: normal;
} }

88
webapp/web/templates/freemarker/body/individualList.ftl
View file

@ -1,53 +1,49 @@
<#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> <#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
<#-- List individual members of a class. --> <#-- List individuals in the requested class. -->
<#import "lib-list.ftl" as l> <#import "lib-list.ftl" as l>
${stylesheets.add("/css/browseIndex.css")} ${stylesheets.add("/css/browseIndex.css")}
<div class="contents">
<div class="individualList">
<h2>${title}
&nbsp;<span class="rdfLink">&nbsp;
<a class="icon-rdf" href="${redirecturl}" title="View the ${title} list in RDF format">RDF</a>
</span>
</h2>
<#if subtitle??>
<h4>${subtitle}</h4>
</#if>
<#if message??> <section class="individualList">
<p>${message}</p> <h2>${title} <span class="rdfLink"><a class="icon-rdf" href="${redirecturl}" title="View the ${title} list in RDF format">RDF</a></span></h2>
<#else> <#if subtitle??>
<h4>${subtitle}</h4>
</#if>
<#assign pagination> <#if message??>
<#if (pages?size > 1) > <p>${message}</p>
pages:&nbsp; <#else>
<ul class="pagination"> <#assign pagination>
<#list pages as page> <#if (pages?size > 1) >
<#if page.selected><li class="selectedNavPage">${page.text}</li> pages:
<ul class="pagination">
<#list pages as page>
<#if page.selected>
<li class="selectedNavPage">${page.text}</li>
<#else>
<#-- RY Ideally the urls would be generated by the controller; see search-pagedResults.ftl --> <#-- RY Ideally the urls would be generated by the controller; see search-pagedResults.ftl -->
<#else><li><a href="${urls.base}/individuallist?${page.param}&vclassId=${vclassId?url}">${page.text}</a></li> <li><a href="${urls.base}/individuallist?${page.param}&vclassId=${vclassId?url}">${page.text}</a></li>
</#if> </#if>
</#list> </#list>
</ul> </ul>
</#if> </#if>
</#assign> </#assign>
${pagination} ${pagination} \
<ul> <ul>
<#list individuals as individual> <#list individuals as individual>
<li> <li>
<#-- The old JSP version uses a custom search view if one is defined, but it doesn't make sense <#-- The old JSP version uses a custom search view if one is defined, but it doesn't make sense
to do that in the current system, because we don't use the default search view. We could define to do that in the current system, because we don't use the default search view. We could define
a custom list or use the custom short view, but for now just hard-code the view here; it will not be a custom list or use the custom short view, but for now just hard-code the view here; it will not be
customizable. customizable.
<#include "${individual.searchView}"> --> <#include "${individual.searchView}"> -->
<a href="${individual.profileUrl}">${individual.name}</a> <a href="${individual.profileUrl}">${individual.name}</a><#if individual.moniker??> <span class="moniker">${individual.moniker}</span></#if>
<#if individual.links?has_content>
<ul class="individualData"> <ul class="individualData">
<@l.firstLastList> <@l.firstLastList>
<#if individual.moniker??><li>${individual.moniker}</li></#if>
<#list individual.links as link> <#list individual.links as link>
<#if link?? && link.url?? && link.anchor?? > <#if link?? && link.url?? && link.anchor?? >
<li><a class="externalLink" href="${link.url}">${link.anchor}</a></li> <li><a class="externalLink" href="${link.url}">${link.anchor}</a></li>
@ -55,13 +51,11 @@ ${stylesheets.add("/css/browseIndex.css")}
</#list> </#list>
</@l.firstLastList> </@l.firstLastList>
</ul> </ul>
</li> </#if>
</#list> </li>
</ul> </#list>
</ul>
${pagination}
</#if>
</div>
</div>
${pagination}
</#if>
</section> <!-- .individualList -->