Homepage structure and footer changes.

This commit is contained in:
Graham Triggs 2017-04-08 07:08:31 -06:00
parent 4b7322e351
commit 2f405ac4d8
3 changed files with 117 additions and 79 deletions

View file

@ -175,11 +175,16 @@ footer {
height: 88px; height: 88px;
margin: 0 auto; margin: 0 auto;
font-size: .7em; font-size: .7em;
color: #4e5051; color: white;
background-color: black;
}
footer .row {
background-color: black;
} }
footer p.copyright { footer p.copyright {
float: left; float: left;
padding-top: 55px; padding-top: 55px;
color: white;
} }
footer p.copyright small { footer p.copyright small {
font-size: 1em; font-size: 1em;
@ -206,17 +211,17 @@ ul#individual-facultyMemberships li:last-child {
border-right: none; border-right: none;
} }
#footer-nav a { #footer-nav a {
color: #4e5051 color: white;
} }
#footer-nav a:hover, #footer-nav a:hover,
a.terms, a.terms,
a.powered-by-vivo { a.powered-by-vivo {
color: #09C; color: white;
text-decoration: none; text-decoration: none;
} }
#footer-nav a.terms:hover, #footer-nav a.terms:hover,
a.powered-by-vivo:hover { a.powered-by-vivo:hover {
color: #4e5051; color: white;
text-decoration: none; text-decoration: none;
} }
#footer-nav p { #footer-nav p {

View file

@ -25,63 +25,92 @@
</head> </head>
<body class="${bodyClasses!}" onload="${bodyOnload!}"> <body class="${bodyClasses!}" onload="${bodyOnload!}">
<#-- supplies the faculty count to the js function that generates a random row number for the search query --> <#-- supplies the faculty count to the js function that generates a random row number for the search query -->
<@lh.facultyMemberCount vClassGroups! /> <@lh.facultyMemberCount vClassGroups! />
<header id="branding" role="banner"> <header id="branding" role="banner">
<#include "identity.ftl"> <#include "identity.ftl">
</header> </header>
<#include "menu.ftl"> <#include "menu.ftl">
<div class="row hero">
<section id="intro" role="region"> <div class="theme-showcase">
<h2>${i18n().intro_title}</h2> <div class="col-md-12">
<div class="container" role="main">
<p>${i18n().intro_para1}</p> <div class="jumbotron">
<p>${i18n().intro_para2}</p> <h1>${i18n().intro_title}</h1>
<section id="search-home" role="region">
<h3>${i18n().intro_searchvivo} <span class="search-filter-selected">filteredSearch</span></h3>
<fieldset>
<legend>${i18n().search_form}</legend>
<form id="search-homepage" action="${urls.search}" name="search-home" role="search" method="post" >
<div id="search-home-field">
<input type="text" name="querytext" class="search-homepage" value="" autocapitalize="off" />
<input type="submit" value="${i18n().search_button}" class="search" />
<input type="hidden" name="classgroup" value="" autocapitalize="off" />
</div> </div>
<section id="search-home" role="region">
<h3>${i18n().intro_searchvivo} <span class="search-filter-selected">filteredSearch</span></h3>
<a class="filter-search filter-default" href="#" title="${i18n().intro_filtersearch}"> <fieldset>
<span class="displace">${i18n().intro_filtersearch}</span> <legend>${i18n().search_form}</legend>
</a> <form id="search-homepage" action="${urls.search}" name="search-home" role="search" method="post" >
<div id="search-home-field">
<input type="text" name="querytext" class="search-homepage" value="" autocapitalize="off" />
<input type="submit" value="${i18n().search_button}" class="search" />
<input type="hidden" name="classgroup" value="" autocapitalize="off" />
</div>
<ul id="filter-search-nav"> <a class="filter-search filter-default" href="#" title="${i18n().intro_filtersearch}">
<li><a class="active" href="">${i18n().all_capitalized}</a></li> <span class="displace">${i18n().intro_filtersearch}</span>
<@lh.allClassGroupNames vClassGroups! /> </a>
</ul>
</form>
</fieldset>
</section> <!-- #search-home -->
</section> <!-- #intro --> <ul id="filter-search-nav">
<li><a class="active" href="">${i18n().all_capitalized}</a></li>
<@lh.allClassGroupNames vClassGroups! />
</ul>
</form>
</fieldset>
</section> <!-- #search-home -->
</div>
</div>
<div class="col-md-12">
<div class="container">
<div class="jumbotron">
<p>${i18n().intro_para1}</p>
<p>${i18n().intro_para2}</p>
</div>
</div>
</div>
</div>
</div>
<@widget name="login" /> <div class="row faculty-home">
<div class="container">
<div class="col-md-12">
<!-- List of research classes: e.g., articles, books, collections, conference papers -->
<@lh.researchClasses />
<!-- List of research classes: e.g., articles, books, collections, conference papers --> <!-- List of four randomly selected faculty members -->
<@lh.researchClasses /> <@lh.facultyMbrHtml />
<!-- List of four randomly selected faculty members --> <!-- List of randomly selected academic departments -->
<@lh.facultyMbrHtml /> <@lh.academicDeptsHtml />
</div>
<!-- List of randomly selected academic departments --> </div>
<@lh.academicDeptsHtml /> </div>
<#if geoFocusMapsEnabled > <#if geoFocusMapsEnabled >
<!-- Map display of researchers' areas of geographic focus. Must be enabled in runtime.properties --> <div class="row geo-focus">
<@lh.geographicFocusHtml /> <div class="container">
<div class="col-md-12">
<!-- Map display of researchers' areas of geographic focus. Must be enabled in runtime.properties -->
<@lh.geographicFocusHtml />
</div>
</div>
</div>
</#if> </#if>
<!-- Statistical information relating to property groups and their classes; displayed horizontally, not vertically--> <!-- List of research classes: e.g., articles, books, collections, conference papers -->
<@lh.allClassGroups vClassGroups! /> <div class="row research-count">
<div class="container">
<div class="col-md-6">
</div>
<div class="col-md-6">
<!-- Statistical information relating to property groups and their classes; displayed horizontally, not vertically-->
<@lh.allClassGroups vClassGroups! />
</div>
</div>
</div>
<#include "footer.ftl"> <#include "footer.ftl">
<#-- builds a json object that is used by js to render the academic departments section --> <#-- builds a json object that is used by js to render the academic departments section -->

View file

@ -1,34 +1,38 @@
<#-- $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$ -->
<footer role="contentinfo"> <footer role="contentinfo">
<div class="container"> <div class="row">
<div class="row"> <div class="col-md-12">
<div class="col-md-8"> <div class="container">
<p class="copyright"> <div class="row">
<#if copyright??> <div class="col-md-8">
<small>&copy;${copyright.year?c} <p class="copyright">
<#if copyright.url??> <#if copyright??>
<a href="${copyright.url}" title="${i18n().menu_copyright}">${copyright.text}</a> <small>&copy;${copyright.year?c}
<#else> <#if copyright.url??>
${copyright.text} <a href="${copyright.url}" title="${i18n().menu_copyright}">${copyright.text}</a>
<#else>
${copyright.text}
</#if>
| <a class="terms" href="${urls.termsOfUse}" title="${i18n().menu_termuse}">${i18n().menu_termuse}</a></small> |
</#if> </#if>
| <a class="terms" href="${urls.termsOfUse}" title="${i18n().menu_termuse}">${i18n().menu_termuse}</a></small> | ${i18n().menu_powered} <a class="powered-by-vivo" href="http://vivoweb.org" target="_blank" title="${i18n().menu_powered} VIVO"><strong>VIVO</strong></a>
</#if> <#if user.hasRevisionInfoAccess>
${i18n().menu_powered} <a class="powered-by-vivo" href="http://vivoweb.org" target="_blank" title="${i18n().menu_powered} VIVO"><strong>VIVO</strong></a> | ${i18n().menu_version} <a href="${version.moreInfoUrl}" title="${i18n().menu_version}">${version.label}</a>
<#if user.hasRevisionInfoAccess> </#if>
| ${i18n().menu_version} <a href="${version.moreInfoUrl}" title="${i18n().menu_version}">${version.label}</a> </p>
</#if> </div>
</p> <div class="col-md-4">
</div> <nav role="navigation">
<div class="col-md-4"> <ul id="footer-nav" role="list">
<nav role="navigation"> <li role="listitem"><a href="${urls.about}" title="${i18n().menu_about}">${i18n().menu_about}</a></li>
<ul id="footer-nav" role="list"> <#if urls.contact??>
<li role="listitem"><a href="${urls.about}" title="${i18n().menu_about}">${i18n().menu_about}</a></li> <li role="listitem"><a href="${urls.contact}" title="${i18n().menu_contactus}">${i18n().menu_contactus}</a></li>
<#if urls.contact??> </#if>
<li role="listitem"><a href="${urls.contact}" title="${i18n().menu_contactus}">${i18n().menu_contactus}</a></li> <li role="listitem"><a href="http://www.vivoweb.org/support" target="blank" title="${i18n().menu_support}">${i18n().menu_support}</a></li>
</#if> </ul>
<li role="listitem"><a href="http://www.vivoweb.org/support" target="blank" title="${i18n().menu_support}">${i18n().menu_support}</a></li> </nav>
</ul> </div>
</nav> </div>
</div> </div>
</div> </div>
</div> </div>