Update to Tenderfoot
This commit is contained in:
Graham Triggs
parent
1774a07ffa
commit
d46dca75c3
8 changed files with 173 additions and 141 deletions
|
|
@ -16,7 +16,7 @@
|
|||
var suiteTableData = new Array();
|
||||
</script>
|
||||
<!--
|
||||
<script type="text/javascript" src="jquery-ui/js/jquery-ui-1.8.16.custom.min.js"></script>
|
||||
<script type="text/javascript" src="jquery-ui/js/jquery-ui-1.12.1.custom.min.js"></script>
|
||||
-->
|
||||
</head>
|
||||
|
||||
|
|
|
|||
|
|
@ -54,7 +54,7 @@ td {
|
|||
font-weight: inherit;
|
||||
font-style: inherit;
|
||||
font-size: 100%;
|
||||
font-family: inherit;
|
||||
font-family: "Noto Sans", "Lucida Sans Unicode","Lucida Grande", Geneva, helvetica, sans-serif;
|
||||
vertical-align: baseline;
|
||||
color: #595b5b;
|
||||
font-weight: normal;
|
||||
|
|
@ -99,4 +99,15 @@ fieldset {
|
|||
}
|
||||
legend {
|
||||
display: none;
|
||||
}
|
||||
}
|
||||
.row {
|
||||
font-size: 100%;
|
||||
}
|
||||
.navbar {
|
||||
margin-bottom: 0px;
|
||||
border: 0px solid transparent;
|
||||
}
|
||||
.navbar-collapse {
|
||||
padding-left: 0px;
|
||||
padding-right: 0px;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -16,7 +16,8 @@ VIVO tenderfoot theme: screen styles
|
|||
|
||||
@charset "UTF-8";
|
||||
|
||||
@import url("reset.css");
|
||||
@import url("../bootstrap/css/bootstrap.min.css");
|
||||
@import url("../bootstrap/css/bootstrap-theme.min.css");
|
||||
@import url("reset.css");
|
||||
@import url("tenderfoot.css");
|
||||
@import url("https://fonts.googleapis.com/css?family=Noto+Sans");
|
||||
@import url("tenderfoot.css");
|
||||
|
|
@ -1,13 +1,13 @@
|
|||
header {
|
||||
height:114px;
|
||||
height:114px;
|
||||
}
|
||||
|
||||
legend {
|
||||
display: none;
|
||||
display: none;
|
||||
}
|
||||
|
||||
#nav {
|
||||
background: #f7f9f9;
|
||||
background: #f7f9f9;
|
||||
}
|
||||
|
||||
#nav.affix {
|
||||
|
|
@ -33,47 +33,47 @@ body {
|
|||
}
|
||||
|
||||
#property-tabs {
|
||||
padding-right: 0px;
|
||||
padding-right: 0px;
|
||||
}
|
||||
|
||||
.row {
|
||||
background: #ffffff;
|
||||
background: #ffffff;
|
||||
}
|
||||
|
||||
.row.title {
|
||||
background: #398AAC;
|
||||
background: #398AAC;
|
||||
}
|
||||
|
||||
.row.title span {
|
||||
color: #ffffff;
|
||||
color: #ffffff;
|
||||
}
|
||||
|
||||
.row.title h1 {
|
||||
margin-left: 10px;
|
||||
margin-left: 10px;
|
||||
}
|
||||
|
||||
.row-eq-height {
|
||||
display: -webkit-box;
|
||||
display: -webkit-flex;
|
||||
display: -ms-flexbox;
|
||||
display: flex;
|
||||
display: -webkit-box;
|
||||
display: -webkit-flex;
|
||||
display: -ms-flexbox;
|
||||
display: flex;
|
||||
}
|
||||
.photo-wrapper {
|
||||
padding: 0 !important;
|
||||
margin: 0 !important;
|
||||
background: #f3f3f0;
|
||||
padding: 0 !important;
|
||||
margin: 0 !important;
|
||||
background: #f3f3f0;
|
||||
}
|
||||
|
||||
|
||||
.photo-wrapper img {
|
||||
height: 100%;
|
||||
width: 100%;
|
||||
padding: 0 !important;
|
||||
margin: 0 !important;
|
||||
object-fit: contain;
|
||||
height: 100%;
|
||||
width: 100%;
|
||||
padding: 0 !important;
|
||||
margin: 0 !important;
|
||||
object-fit: contain;
|
||||
}
|
||||
|
||||
.person-details {
|
||||
background: #f3f3f0;
|
||||
background: #f3f3f0;
|
||||
}
|
||||
|
||||
/* HEADER ------> */
|
||||
|
|
@ -84,7 +84,7 @@ body {
|
|||
margin: 0 auto;
|
||||
}
|
||||
#branding .row {
|
||||
background-color:rgba(255, 255, 255, 0);
|
||||
background-color:rgba(255, 255, 255, 0);
|
||||
}
|
||||
/* HEADER NAV------> */
|
||||
ul#header-nav {
|
||||
|
|
@ -157,7 +157,7 @@ h1.vivo-logo {
|
|||
position: absolute;
|
||||
width: 442px;
|
||||
height: 59px;
|
||||
top: 10px;
|
||||
top: 30px;
|
||||
left: 0;
|
||||
background: url(../images/VIVO-logo.png) 0 0 no-repeat;
|
||||
}
|
||||
|
|
@ -178,4 +178,19 @@ h1.vivo-logo a {
|
|||
color: #337ab7;
|
||||
font-weight: 400;
|
||||
transition: all 0.5s;
|
||||
}
|
||||
|
||||
#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;
|
||||
}
|
||||
File diff suppressed because one or more lines are too long
|
|
@ -22,75 +22,78 @@
|
|||
<#assign visRequestingTemplate = "foaf-person-tenderfoot">
|
||||
|
||||
<#--add the VIVO-ORCID interface -->
|
||||
<#include "individual-orcidInterface.ftl">
|
||||
|
||||
<#include "individual-orcidInterface.ftl">
|
||||
|
||||
<section id="individual-intro" class="vcard person" role="region"><span itemscope itemtype="http://schema.org/Person">
|
||||
<div class="row title" style="margin-bottom: 10px;">
|
||||
<div class="col-md-12">
|
||||
<h1 class="vcard foaf-person">
|
||||
<#-- Label -->
|
||||
<span itemprop="name" class="fn"><@p.label individual editable labelCount localesCount/></span>
|
||||
</h1>
|
||||
</div>
|
||||
</div>
|
||||
<div class="row row-eq-height">
|
||||
<div class="col-md-2 photo-wrapper">
|
||||
<!-- Image -->
|
||||
<!-- Image -->
|
||||
<#assign individualImage>
|
||||
<@p.image individual=individual
|
||||
propertyGroups=propertyGroups
|
||||
namespaces=namespaces
|
||||
editable=editable
|
||||
showPlaceholder="always" />
|
||||
<@p.image individual=individual
|
||||
propertyGroups=propertyGroups
|
||||
namespaces=namespaces
|
||||
editable=editable
|
||||
showPlaceholder="always" />
|
||||
</#assign>
|
||||
<#if ( individualImage?contains('<img class="individual-photo"') )>
|
||||
<#assign infoClass = 'class="withThumb"'/>
|
||||
</#if>
|
||||
|
||||
<!-- div id="photo-wrapper">${individualImage}</div -->
|
||||
${individualImage}
|
||||
<!-- div id="photo-wrapper">${individualImage}</div -->
|
||||
${individualImage}
|
||||
</div>
|
||||
<div class="col-md-7 person-details">
|
||||
<h2>
|
||||
<#-- 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")!>
|
||||
<#if title?has_content> <#-- true when the property is in the list, even if not populated (when editing) -->
|
||||
<#if (title.statements?size < 1) >
|
||||
<@p.addLinkWithLabel title editable />
|
||||
<#elseif editable>
|
||||
<h2>${title.name?capitalize!}</h2>
|
||||
<@p.verboseDisplay title />
|
||||
</#if>
|
||||
<#list title.statements as statement>
|
||||
<span itemprop="jobTitle" class="display-title<#if editable>-editable</#if>">${statement.preferredTitle}</span>
|
||||
<@p.editingLinks "${title.localName}" "${title.name}" statement editable title.rangeUri />
|
||||
</#list>
|
||||
</#if>
|
||||
<#-- If preferredTitle is unpopulated, display mostSpecificTypes -->
|
||||
<#if ! (title.statements)?has_content>
|
||||
<@p.mostSpecificTypes individual />
|
||||
</#if>
|
||||
</h2>
|
||||
<div class="col-md-10 person-details">
|
||||
<div class="row title" style="margin-bottom: 10px;">
|
||||
<div class="col-md-12">
|
||||
<h1 class="vcard foaf-person">
|
||||
<#-- Label -->
|
||||
<span itemprop="name" class="fn"><@p.label individual editable labelCount localesCount/></span>
|
||||
|
||||
<#-- 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")!>
|
||||
<#if title?has_content> <#-- true when the property is in the list, even if not populated (when editing) -->
|
||||
<#if (title.statements?size < 1) >
|
||||
<@p.addLinkWithLabel title editable />
|
||||
<#elseif editable>
|
||||
<h2>${title.name?capitalize!}</h2>
|
||||
<@p.verboseDisplay title />
|
||||
</#if>
|
||||
<#list title.statements as statement>
|
||||
<span itemprop="jobTitle" class="display-title<#if editable>-editable</#if>">${statement.preferredTitle}</span>
|
||||
<@p.editingLinks "${title.localName}" "${title.name}" statement editable title.rangeUri />
|
||||
</#list>
|
||||
</#if>
|
||||
<#-- If preferredTitle is unpopulated, display mostSpecificTypes -->
|
||||
<#if ! (title.statements)?has_content>
|
||||
<@p.mostSpecificTypes individual />
|
||||
</#if>
|
||||
</h1>
|
||||
</div>
|
||||
</div>
|
||||
<div class="row">
|
||||
<div class="col-md-12 person-details">
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-md-3 person-details" style="margin-left: 10px;">
|
||||
<section id="share-contact" role="region">
|
||||
<!-- Research Areas -->
|
||||
<!-- 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>
|
||||
|
||||
<section itemscope itemtype="http://schema.org/Person" id="individual-intro" class="vcard person" role="region">
|
||||
<section id="individual-info" ${infoClass!} role="region">
|
||||
<div class="row">
|
||||
<div class="col-md-12">
|
||||
<section id="individual-info" ${infoClass!} role="region">
|
||||
<div class="row">
|
||||
<div class="col-md-12">
|
||||
<#include "individual-adminPanel.ftl">
|
||||
</div>
|
||||
</div>
|
||||
<!-- Positions -->
|
||||
<!-- #include "individual-positions.ftl" -->
|
||||
|
||||
</div>
|
||||
</div>
|
||||
<!-- Positions -->
|
||||
<!-- #include "individual-positions.ftl" -->
|
||||
|
||||
<!-- Overview -->
|
||||
<!-- #include "individual-overview.ftl" -->
|
||||
|
||||
|
|
@ -99,56 +102,56 @@
|
|||
</section>
|
||||
</section>
|
||||
|
||||
<#assign nameForOtherGroup = "${i18n().other}">
|
||||
<#assign nameForOtherGroup = "${i18n().other}">
|
||||
|
||||
<#-- Ontology properties -->
|
||||
<#if !editable>
|
||||
<#-- We don't want to see the first name and last name unless we might edit them. -->
|
||||
<#assign skipThis = propertyGroups.pullProperty("http://xmlns.com/foaf/0.1/firstName")!>
|
||||
<#assign skipThis = propertyGroups.pullProperty("http://xmlns.com/foaf/0.1/lastName")!>
|
||||
<#-- We don't want to see the first name and last name unless we might edit them. -->
|
||||
<#assign skipThis = propertyGroups.pullProperty("http://xmlns.com/foaf/0.1/firstName")!>
|
||||
<#assign skipThis = propertyGroups.pullProperty("http://xmlns.com/foaf/0.1/lastName")!>
|
||||
</#if>
|
||||
|
||||
<section style="overflow: hidden">
|
||||
<div class="row row-eq-height">
|
||||
<div id="property-tabs" class="col-md-9">
|
||||
<#include "individual-property-group-tabs.ftl">
|
||||
</div>
|
||||
<div class="col-md-3 person-details" style="margin-left: 10px;">
|
||||
<#include "individual-visualizationFoafPerson.ftl">
|
||||
<div class="row row-eq-height">
|
||||
<div class="col-md-2">
|
||||
<#include "individual-visualizationFoafPerson.ftl">
|
||||
|
||||
<!-- Contact Info -->
|
||||
<div id="individual-tools-people">
|
||||
<!-- Contact Info -->
|
||||
<div id="individual-tools-people">
|
||||
<span id="iconControlsLeftSide">
|
||||
<img id="uriIcon" title="${individual.uri}" src="${urls.images}/individual/uriIcon.gif" alt="${i18n().uri_icon}"/>
|
||||
<#if checkNamesResult?has_content >
|
||||
<img id="qrIcon" src="${urls.images}/individual/qr_icon.png" alt="${i18n().qr_icon}" />
|
||||
<span id="qrCodeImage" class="hidden">${qrCodeLinkedImage!}
|
||||
<a class="qrCloseLink" href="#" title="${i18n().qr_code}">${i18n().close_capitalized}</a>
|
||||
<#if checkNamesResult?has_content >
|
||||
<img id="qrIcon" src="${urls.images}/individual/qr_icon.png" alt="${i18n().qr_icon}" />
|
||||
<span id="qrCodeImage" class="hidden">${qrCodeLinkedImage!}
|
||||
<a class="qrCloseLink" href="#" title="${i18n().qr_code}">${i18n().close_capitalized}</a>
|
||||
</span>
|
||||
</#if>
|
||||
</#if>
|
||||
</span>
|
||||
</div>
|
||||
<#include "individual-contactInfo.ftl">
|
||||
|
||||
<!-- Websites -->
|
||||
<#include "individual-webpage.ftl">
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<#include "individual-contactInfo.ftl">
|
||||
|
||||
<!-- Websites -->
|
||||
<#include "individual-webpage.ftl">
|
||||
</div>
|
||||
<div id="property-tabs" class="col-md-10">
|
||||
<#include "individual-property-group-tabs.ftl">
|
||||
</div>
|
||||
</div>
|
||||
</section>
|
||||
|
||||
<#assign rdfUrl = individual.rdfUrl>
|
||||
|
||||
<#if rdfUrl??>
|
||||
<script>
|
||||
var individualRdfUrl = '${rdfUrl}';
|
||||
</script>
|
||||
<script>
|
||||
var individualRdfUrl = '${rdfUrl}';
|
||||
</script>
|
||||
</#if>
|
||||
<script>
|
||||
var imagesPath = '${urls.images}';
|
||||
var individualUri = '${individual.uri!}';
|
||||
var individualPhoto = '${individual.thumbNail!}';
|
||||
var exportQrCodeUrl = '${urls.base}/qrcode?uri=${individual.uri!}';
|
||||
var baseUrl = '${urls.base}';
|
||||
var individualUri = '${individual.uri!}';
|
||||
var individualPhoto = '${individual.thumbNail!}';
|
||||
var exportQrCodeUrl = '${urls.base}/qrcode?uri=${individual.uri!}';
|
||||
var baseUrl = '${urls.base}';
|
||||
var i18nStrings = {
|
||||
displayLess: '${i18n().display_less}',
|
||||
displayMoreEllipsis: '${i18n().display_more_ellipsis}',
|
||||
|
|
@ -165,15 +168,15 @@
|
|||
</script>
|
||||
|
||||
${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}/js/jquery-ui/css/smoothness/jquery-ui-1.8.9.custom.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" />')}
|
||||
|
||||
${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-1.0.0-rc3.min.js"></script>',
|
||||
'<script type="text/javascript" src="${urls.base}/js/jquery_plugins/jquery.truncator.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/jquery.truncator.js"></script>')}
|
||||
|
||||
${scripts.add('<script type="text/javascript" src="${urls.base}/js/individual/individualUtils.js"></script>',
|
||||
'<script type="text/javascript" src="${urls.base}/js/individual/individualQtipBubble.js"></script>',
|
||||
'<script type="text/javascript" src="${urls.base}/js/individual/individualUriRdf.js"></script>',
|
||||
'<script type="text/javascript" src="${urls.base}/js/jquery-ui/js/jquery-ui-1.8.9.custom.min.js"></script>',
|
||||
'<script type="text/javascript" src="${urls.base}/js/imageUpload/imageUploadUtils.js"></script>')}
|
||||
'<script type="text/javascript" src="${urls.base}/js/individual/individualQtipBubble.js"></script>',
|
||||
'<script type="text/javascript" src="${urls.base}/js/individual/individualUriRdf.js"></script>',
|
||||
'<script type="text/javascript" src="${urls.base}/js/jquery-ui/js/jquery-ui-1.12.1.min.js"></script>',
|
||||
'<script type="text/javascript" src="${urls.base}/js/imageUpload/imageUploadUtils.js"></script>')}
|
||||
|
|
|
|||
|
|
@ -6,7 +6,8 @@ var i18nStrings = {
|
|||
allCapitalized: '${i18n().all_capitalized}',
|
||||
};
|
||||
</script>
|
||||
<script type="text/javascript" src="${urls.theme}/js/jquery-2.1.3.min.js"></script>
|
||||
<script type="text/javascript" src="${urls.base}/js/jquery-1.12.4.min.js"></script>
|
||||
<script type="text/javascript" src="${urls.base}/js/jquery-migrate-1.4.1.js"></script>
|
||||
<script type="text/javascript" src="${urls.base}/js/vitroUtils.js"></script>
|
||||
|
||||
<#-- script for enabling new HTML5 semantic markup in IE browsers -->
|
||||
|
|
|
|||
|
|
@ -1,21 +1,26 @@
|
|||
<#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
|
||||
<#include "developer.ftl">
|
||||
|
||||
<div id="nav">
|
||||
<div class="container">
|
||||
<div class="navbar-collapse collapse">
|
||||
<nav role="navigation">
|
||||
<ul id="main-nav" role="list" class="nav navbar-nav">
|
||||
<div class="container-fluid">
|
||||
<div class="container">
|
||||
<nav class="navbar navbar-default">
|
||||
<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">
|
||||
<span class="sr-only">Toggle navigation</span>
|
||||
<span class="icon-bar"></span>
|
||||
<span class="icon-bar"></span>
|
||||
<span class="icon-bar"></span>
|
||||
</button>
|
||||
<div class="collapse navbar-collapse" id="navbarContent">
|
||||
<ul id="main-nav" role="list" class="nav navbar-nav mr-auto mt-2 mt-md-0">
|
||||
<#list menu.items as item>
|
||||
<li role="listitem" <#if item.active> class="active" </#if>><a href="${item.url}" title="${item.linkText} ${i18n().menu_item}">${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>
|
||||
</ul>
|
||||
<ul class="nav pull-right navbar-nav">
|
||||
<li>
|
||||
<#include "search.ftl">
|
||||
</li>
|
||||
</ul>
|
||||
</nav>
|
||||
</div>
|
||||
</div>
|
||||
</ul>
|
||||
<ul class="nav pull-right navbar-nav">
|
||||
<li>
|
||||
<#include "search.ftl">
|
||||
</li>
|
||||
</ul>
|
||||
</nav>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue