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

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

@ -1,16 +1,12 @@
<#-- $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>
${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>
<section class="individualList">
<h2>${title} <span class="rdfLink"><a class="icon-rdf" href="${redirecturl}" title="View the ${title} list in RDF format">RDF</a></span></h2>
<#if subtitle??>
<h4>${subtitle}</h4>
</#if>
@ -18,22 +14,23 @@ ${stylesheets.add("/css/browseIndex.css")}
<#if message??>
<p>${message}</p>
<#else>
<#assign pagination>
<#if (pages?size > 1) >
pages:&nbsp;
pages:
<ul class="pagination">
<#list pages as page>
<#if page.selected><li class="selectedNavPage">${page.text}</li>
<#if page.selected>
<li class="selectedNavPage">${page.text}</li>
<#else>
<#-- 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>
</#list>
</ul>
</#if>
</#assign>
${pagination}
${pagination} \
<ul>
<#list individuals as individual>
@ -43,11 +40,10 @@ ${stylesheets.add("/css/browseIndex.css")}
a custom list or use the custom short view, but for now just hard-code the view here; it will not be
customizable.
<#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">
<@l.firstLastList>
<#if individual.moniker??><li>${individual.moniker}</li></#if>
<#list individual.links as link>
<#if link?? && link.url?? && link.anchor?? >
<li><a class="externalLink" href="${link.url}">${link.anchor}</a></li>
@ -55,13 +51,11 @@ ${stylesheets.add("/css/browseIndex.css")}
</#list>
</@l.firstLastList>
</ul>
</#if>
</li>
</#list>
</ul>
${pagination}
</#if>
</div>
</div>
</section> <!-- .individualList -->