Updates to Tenderfoot individual presentation

This commit is contained in:
Graham Triggs 2017-02-24 18:07:24 +00:00
parent d46dca75c3
commit 7b7bffdc41
7 changed files with 399 additions and 83 deletions

View file

@ -0,0 +1,280 @@
header {
height:114px;
}
legend {
display: none;
}
#nav {
background: #f7f9f9;
}
#nav.affix {
position: fixed;
top: 0;
width: 100%;
z-index:10;
}
#nav .container {
padding-left: 0px;
padding-right: 0px;
}
p.navbar-text {
margin-left: 15px;
}
body {
padding: 0;
height: 100%; /* needed for container min-height */
font-family: "Noto Sans", "Lucida Sans Unicode","Lucida Grande", Geneva, helvetica, sans-serif;
height: auto !important; /* real browsers */
height: 100%; /* IE6: treaded as min-height*/;
min-height: 100%; /* real browsers */
margin: 0 auto;
background: #f3f3f0 url(../images/header-background.png) center 0 no-repeat;
}
#wrapper-content {
background: none repeat scroll 0 0 #fff;
}
#property-tabs {
padding-right: 0px;
}
.row {
background: #ffffff;
}
.row.title {
background: #398AAC;
padding-top: 10px;
padding-bottom: 10px;
}
.row.title span {
color: #ffffff;
}
.row.title h1 {
margin-left: 10px;
}
.row-eq-height {
display: -webkit-box;
display: -webkit-flex;
display: -ms-flexbox;
display: flex;
}
.photo-wrapper {
padding: 0 !important;
margin: 0 !important;
background: #f3f3f0;
}
.photo-wrapper img {
height: 100%;
width: 100%;
padding: 0 !important;
margin: 0 !important;
object-fit: contain;
}
.person-details {
background: #f3f3f0;
}
/* HEADER ------> */
#branding {
position: relative;
// width: 970px;
height: 114px;
margin: 0 auto;
}
#branding .row {
background-color:rgba(255, 255, 255, 0);
}
/* HEADER NAV------> */
ul#header-nav {
float: right;
list-style: none;
height: 30px;
padding-top: 10px;
margin-right: 13px;
}
ul#header-nav li {
float: left;
display: block;
padding-left: 10px;
padding-right: 10px;
border-right: 1px solid #7c7d7f;
font-size: .7em;
color: #fff;
}
ul#header-nav li:last-child {
padding-left: 1px;
padding-right: 0;
border-right: none;
}
ul#header-nav a {
color: #fff;
}
ul#header-nav a:hover,
ul#header-nav a:active {
text-decoration: none;
color: #999;
}
ul#header-nav a.log-out {
padding-left: 10px;
}
/* SEARCH ------> */
#search {
width: 396px;
height: 38px;
right: 10px;
padding-top: 5px;
}
#search-field {
width: 396px;
height: 38px;
background: url(../images/search-interior-pages.png) 0 0 no-repeat;
}
#search-field input.search {
text-decoration: none;
background-color: transparent;
color: #fff;
font-size: 14px;
border: none;
padding-left: 25px;
padding-top: 8px;
cursor: pointer;
}
input.search-vivo {
float: left;
width: 290px;
height: 25px;
border: 0;
font-size: 16px;
color: #5e6363;
margin-left: 10px;
margin-top: 5px;
padding: 0;
}
#search-form-modifier {
display: none;
}
/* FOOTER------> */
footer {
height: 88px;
margin: 0 auto;
font-size: .7em;
color: #4e5051;
}
footer p.copyright {
float: left;
padding-top: 55px;
}
footer p.copyright small {
font-size: 1em;
}
ul#footer-nav {
float: right;
list-style: none;
height: 20px;
margin: 0;
padding: 0;
padding-top: 55px;
}
ul#footer-nav li {
float: left;
display: block;
padding-left: 10px;
padding-right: 10px;
border-right: 1px solid #c9c8c8;
}
ul#footer-nav li:last-child,
ul#header-nav li.last,
ul#individual-hasResearchArea li:last-child,
ul#individual-facultyMemberships li:last-child {
border-right: none;
}
#footer-nav a {
color: #4e5051
}
#footer-nav a:hover,
a.terms,
a.powered-by-vivo {
color: #09C;
text-decoration: none;
}
#footer-nav a.terms:hover,
a.powered-by-vivo:hover {
color: #4e5051;
text-decoration: none;
}
#footer-nav p {
margin-bottom: 1.3em;
}
/* BRANDING ------> */
h1.vivo-logo {
position: absolute;
width: 442px;
height: 59px;
top: 30px;
left: 0;
background: url(../images/VIVO-logo.png) 0 0 no-repeat;
}
h1.vivo-logo a {
display: block;
width: 386px;
height: 59px;
}
.displace {
left: -9999px;
position: absolute;
}
#individual-hasResearchArea a {
font-size: 13px;
background: transparent;
border: 1px solid #337ab7;
color: #337ab7;
font-weight: 400;
transition: all 0.5s;
padding: .2em .6em .3em;
border-top-left-radius: 4px;
border-top-right-radius: 4px;
}
#individual-hasResearchArea a:hover {
background: #337ab7;
color: #fff;
text-decoration: none;
}
#individual-intro h1 {
font-size: 1.375em;
color: #2485ae;
}
#individual-intro span.display-title {
padding-left: 10px;
margin-left: 10px;
}
#individual-intro span.display-title, h1.fn .display-title {
font-size: .825em;
border-left: 1px solid #a6b1b0;
}
ul#individual-hasResearchArea li,
ul#individual-facultyMemberships li {
float: left;
padding-right: 10px;
margin-right: 10px;
border-right: none;
}

View file

@ -19,5 +19,6 @@ VIVO tenderfoot theme: screen styles
@import url("../bootstrap/css/bootstrap.min.css"); @import url("../bootstrap/css/bootstrap.min.css");
@import url("../bootstrap/css/bootstrap-theme.min.css"); @import url("../bootstrap/css/bootstrap-theme.min.css");
@import url("reset.css"); @import url("reset.css");
@import url("individual-tenderfoot.css");
@import url("tenderfoot.css"); @import url("tenderfoot.css");
@import url("https://fonts.googleapis.com/css?family=Noto+Sans"); @import url("https://fonts.googleapis.com/css?family=Noto+Sans");

View file

@ -17,6 +17,15 @@ legend {
z-index:10; z-index:10;
} }
#nav .container {
padding-left: 0px;
padding-right: 0px;
}
p.navbar-text {
margin-left: 15px;
}
body { body {
padding: 0; padding: 0;
height: 100%; /* needed for container min-height */ height: 100%; /* needed for container min-height */
@ -42,6 +51,8 @@ body {
.row.title { .row.title {
background: #398AAC; background: #398AAC;
padding-top: 10px;
padding-bottom: 10px;
} }
.row.title span { .row.title span {
@ -108,6 +119,9 @@ ul#header-nav li:last-child {
padding-right: 0; padding-right: 0;
border-right: none; border-right: none;
} }
ul#header-nav a {
color: #fff;
}
ul#header-nav a:hover, ul#header-nav a:hover,
ul#header-nav a:active { ul#header-nav a:active {
text-decoration: none; text-decoration: none;
@ -178,6 +192,15 @@ h1.vivo-logo a {
color: #337ab7; color: #337ab7;
font-weight: 400; font-weight: 400;
transition: all 0.5s; transition: all 0.5s;
padding: .2em .6em .3em;
border-top-left-radius: 4px;
border-top-right-radius: 4px;
}
#individual-hasResearchArea a:hover {
background: #337ab7;
color: #fff;
text-decoration: none;
} }
#individual-intro h1 { #individual-intro h1 {
@ -194,3 +217,11 @@ h1.vivo-logo a {
font-size: .825em; font-size: .825em;
border-left: 1px solid #a6b1b0; border-left: 1px solid #a6b1b0;
} }
ul#individual-hasResearchArea li,
ul#individual-facultyMemberships li {
float: left;
padding-right: 10px;
margin-right: 10px;
border-right: none;
}

View file

@ -28,16 +28,16 @@
<div class="row row-eq-height"> <div class="row row-eq-height">
<div class="col-md-2 photo-wrapper"> <div class="col-md-2 photo-wrapper">
<!-- Image --> <!-- Image -->
<#assign individualImage> <#assign individualImage>
<@p.image individual=individual <@p.image individual=individual
propertyGroups=propertyGroups propertyGroups=propertyGroups
namespaces=namespaces namespaces=namespaces
editable=editable editable=editable
showPlaceholder="always" /> showPlaceholder="always" />
</#assign> </#assign>
<#if ( individualImage?contains('<img class="individual-photo"') )> <#if ( individualImage?contains('<img class="individual-photo"') )>
<#assign infoClass = 'class="withThumb"'/> <#assign infoClass = 'class="withThumb"'/>
</#if> </#if>
<!-- div id="photo-wrapper">${individualImage}</div --> <!-- div id="photo-wrapper">${individualImage}</div -->
${individualImage} ${individualImage}
@ -47,7 +47,7 @@
<div class="col-md-12"> <div class="col-md-12">
<h1 class="vcard foaf-person"> <h1 class="vcard foaf-person">
<#-- Label --> <#-- Label -->
<span itemprop="name" class="fn"><@p.label individual editable labelCount localesCount/></span> <span itemprop="name" class="fn"><@p.label individual editable labelCount localesCount/></span>
<#-- Display preferredTitle if it exists; otherwise mostSpecificTypes --> <#-- Display preferredTitle if it exists; otherwise mostSpecificTypes -->
<#assign title = propertyGroups.pullProperty("http://purl.obolibrary.org/obo/ARG_2000028","http://www.w3.org/2006/vcard/ns#Title")!> <#assign title = propertyGroups.pullProperty("http://purl.obolibrary.org/obo/ARG_2000028","http://www.w3.org/2006/vcard/ns#Title")!>
@ -70,17 +70,16 @@
</h1> </h1>
</div> </div>
</div> </div>
<div class="row"> <div class="row person-details">
<div class="col-md-12 person-details"> <div class="col-md-12">
<#include "individual-adminPanel.ftl">
<!-- Positions -->
<#include "individual-positions.ftl">
<!-- Research Areas -->
<#include "individual-researchAreas.ftl">
</div> </div>
</div> </div>
</div> </div>
<!-- div class="col-md-3 person-details" style="margin-left: 10px;">
<section id="share-contact" role="region">
<!-- Research Areas -- >
<#include "individual-researchAreas.ftl">
</section>
</div -->
</div> </div>
</span></section> </span></section>
@ -88,11 +87,9 @@
<section id="individual-info" ${infoClass!} role="region"> <section id="individual-info" ${infoClass!} role="region">
<div class="row"> <div class="row">
<div class="col-md-12"> <div class="col-md-12">
<#include "individual-adminPanel.ftl"> <#include "individual-adminPanel.ftl">
</div> </div>
</div> </div>
<!-- Positions -->
<!-- #include "individual-positions.ftl" -->
<!-- Overview --> <!-- Overview -->
<!-- #include "individual-overview.ftl" --> <!-- #include "individual-overview.ftl" -->
@ -111,10 +108,14 @@
<#assign skipThis = propertyGroups.pullProperty("http://xmlns.com/foaf/0.1/lastName")!> <#assign skipThis = propertyGroups.pullProperty("http://xmlns.com/foaf/0.1/lastName")!>
</#if> </#if>
<section id="property-tabs" class="col-md-12">
<#include "individual-property-group-tabs.ftl">
</section>
<section style="overflow: hidden"> <section style="overflow: hidden">
<div class="row row-eq-height"> <div class="row row-eq-height">
<div class="col-md-2"> <div class="col-md-2">
<#include "individual-visualizationFoafPerson.ftl"> <#include "individual-visualizationFoafPerson.ftl">
<!-- Contact Info --> <!-- Contact Info -->
<div id="individual-tools-people"> <div id="individual-tools-people">
@ -133,9 +134,6 @@
<!-- Websites --> <!-- Websites -->
<#include "individual-webpage.ftl"> <#include "individual-webpage.ftl">
</div> </div>
<div id="property-tabs" class="col-md-10">
<#include "individual-property-group-tabs.ftl">
</div>
</div> </div>
</section> </section>
@ -169,7 +167,8 @@
${stylesheets.add('<link rel="stylesheet" href="${urls.base}/css/individual/individual.css" />', ${stylesheets.add('<link rel="stylesheet" href="${urls.base}/css/individual/individual.css" />',
'<link rel="stylesheet" href="${urls.base}/css/individual/individual-vivo.css" />', '<link rel="stylesheet" href="${urls.base}/css/individual/individual-vivo.css" />',
'<link rel="stylesheet" href="${urls.base}/js/jquery-ui/css/smoothness/jquery-ui-1.12.1.css" />')} '<link rel="stylesheet" href="${urls.base}/js/jquery-ui/css/smoothness/jquery-ui-1.12.1.css" />',
'<link rel="stylesheet" type="text/css" href="${urls.base}/css/jquery_plugins/qtip/jquery.qtip.min.css" />')}
${headScripts.add('<script type="text/javascript" src="${urls.base}/js/tiny_mce/tiny_mce.js"></script>', ${headScripts.add('<script type="text/javascript" src="${urls.base}/js/tiny_mce/tiny_mce.js"></script>',
'<script type="text/javascript" src="${urls.base}/js/jquery_plugins/qtip/jquery.qtip.min.js"></script>', '<script type="text/javascript" src="${urls.base}/js/jquery_plugins/qtip/jquery.qtip.min.js"></script>',

View file

@ -21,16 +21,16 @@
<#assign groupNameHtmlId = "${i18n().properties}" > <#assign groupNameHtmlId = "${i18n().properties}" >
</#if> </#if>
<#if tabCount = 1 > <#if tabCount = 1 >
<li class="active" groupName="${groupNameHtmlId?replace("/","-")}"><a href="#">${groupName?capitalize}</a></li> <li data-toggle="tab" class="active" href="#${groupNameHtmlId?replace("/","-")}"><a href="#">${groupName?capitalize}</a></li>
<#assign tabCount = 2> <#assign tabCount = 2>
<#else> <#else>
<li groupName="${groupNameHtmlId?replace("/","-")}"><a href="#">${groupName?capitalize}</a></li> <li data-toggle="tab" href="#${groupNameHtmlId?replace("/","-")}"><a href="#">${groupName?capitalize}</a></li>
</#if> </#if>
</#if> </#if>
</#list> </#list>
<#if (propertyGroups.all?size > 1) > <#-- if (propertyGroups.all?size > 1) >
<li groupName="viewAll"><a href="#">${i18n().view_all_capitalized}</a></li> <li data-toggle="tab" href="viewAll"><a href="#">${i18n().view_all_capitalized}</a></li>
</#if> </#if -->
</ul> </ul>
</div> </div>
</div> </div>
@ -43,8 +43,8 @@
<#assign verbose = (verbosePropertySwitch.currentValue)!false> <#assign verbose = (verbosePropertySwitch.currentValue)!false>
<div id="${groupNameHtmlId?replace("/","-")}" <div id="${groupNameHtmlId?replace("/","-")}"
class="tab-pane <#if (sectionCount > 1) >hidden<#else>active</#if>" class="tab-pane <#if (sectionCount == 1) >active</#if>"
role="tabpanel"> role="tabpanel">
<#-- Display the group heading --> <#-- Display the group heading -->
<#if groupName?has_content> <#if groupName?has_content>
<#--the function replaces spaces in the name with underscores, also called for the property group menu--> <#--the function replaces spaces in the name with underscores, also called for the property group menu-->

View file

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

View file

@ -1,26 +1,24 @@
<div id="nav"> <div id="nav">
<div class="container-fluid"> <div class="container">
<div class="container"> <nav class="navbar navbar-default">
<nav class="navbar navbar-default"> <p class="navbar-text visible-xs-inline-block">Menu</p>
<p class="navbar-text visible-xs-inline-block">Menu</p> <button class="navbar-toggle" type="button" data-toggle="collapse" data-target="#navbarContent" aria-controls="navbarContent" aria-expanded="false" aria-label="Toggle navigation">
<button class="navbar-toggle" type="button" data-toggle="collapse" data-target="#navbarContent" aria-controls="navbarContent" aria-expanded="false" aria-label="Toggle navigation"> <span class="sr-only">Toggle navigation</span>
<span class="sr-only">Toggle navigation</span> <span class="icon-bar"></span>
<span class="icon-bar"></span> <span class="icon-bar"></span>
<span class="icon-bar"></span> <span class="icon-bar"></span>
<span class="icon-bar"></span> </button>
</button> <div class="collapse navbar-collapse" id="navbarContent">
<div class="collapse navbar-collapse" id="navbarContent"> <ul id="main-nav" role="list" class="nav navbar-nav mr-auto mt-2 mt-md-0">
<ul id="main-nav" role="list" class="nav navbar-nav mr-auto mt-2 mt-md-0"> <#list menu.items as item>
<#list menu.items as item> <li class="nav-item" role="listitem" <#if item.active> class="active" </#if>><a href="${item.url}" title="${item.linkText} ${i18n().menu_item}" class="nav-link">${item.linkText}</a></li>
<li class="nav-item" role="listitem" <#if item.active> class="active" </#if>><a href="${item.url}" title="${item.linkText} ${i18n().menu_item}" class="nav-link">${item.linkText}</a></li> </#list>
</#list> </ul>
</ul> <ul class="nav pull-right navbar-nav">
<ul class="nav pull-right navbar-nav"> <li>
<li> <#include "search.ftl">
<#include "search.ftl"> </li>
</li> </ul>
</ul> </nav>
</nav>
</div>
</div> </div>
</div> </div>