From 7b7bffdc41e9bea8f0ba6067ec4442a6b5c77e8c Mon Sep 17 00:00:00 2001 From: Graham Triggs Date: Fri, 24 Feb 2017 18:07:24 +0000 Subject: [PATCH] Updates to Tenderfoot individual presentation --- .../tenderfoot/css/individual-tenderfoot.css | 280 ++++++++++++++++++ .../webapp/themes/tenderfoot/css/screen.css | 1 + .../themes/tenderfoot/css/tenderfoot.css | 33 ++- .../individual/individual--foaf-person.ftl | 53 ++-- .../individual-property-group-tabs.ftl | 14 +- .../templates/page/partials/footer.ftl | 57 ++-- .../templates/page/partials/menu.ftl | 44 ++- 7 files changed, 399 insertions(+), 83 deletions(-) create mode 100644 webapp/src/main/webapp/themes/tenderfoot/css/individual-tenderfoot.css diff --git a/webapp/src/main/webapp/themes/tenderfoot/css/individual-tenderfoot.css b/webapp/src/main/webapp/themes/tenderfoot/css/individual-tenderfoot.css new file mode 100644 index 00000000..eb0579b7 --- /dev/null +++ b/webapp/src/main/webapp/themes/tenderfoot/css/individual-tenderfoot.css @@ -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; +} diff --git a/webapp/src/main/webapp/themes/tenderfoot/css/screen.css b/webapp/src/main/webapp/themes/tenderfoot/css/screen.css index eda6c01f..6a7eee58 100644 --- a/webapp/src/main/webapp/themes/tenderfoot/css/screen.css +++ b/webapp/src/main/webapp/themes/tenderfoot/css/screen.css @@ -19,5 +19,6 @@ VIVO tenderfoot theme: screen styles @import url("../bootstrap/css/bootstrap.min.css"); @import url("../bootstrap/css/bootstrap-theme.min.css"); @import url("reset.css"); +@import url("individual-tenderfoot.css"); @import url("tenderfoot.css"); @import url("https://fonts.googleapis.com/css?family=Noto+Sans"); diff --git a/webapp/src/main/webapp/themes/tenderfoot/css/tenderfoot.css b/webapp/src/main/webapp/themes/tenderfoot/css/tenderfoot.css index 168f4e4b..cd68154f 100644 --- a/webapp/src/main/webapp/themes/tenderfoot/css/tenderfoot.css +++ b/webapp/src/main/webapp/themes/tenderfoot/css/tenderfoot.css @@ -17,6 +17,15 @@ legend { 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 */ @@ -42,6 +51,8 @@ body { .row.title { background: #398AAC; + padding-top: 10px; + padding-bottom: 10px; } .row.title span { @@ -108,6 +119,9 @@ ul#header-nav li:last-child { 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; @@ -178,6 +192,15 @@ h1.vivo-logo a { 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 { @@ -193,4 +216,12 @@ h1.vivo-logo a { #individual-intro span.display-title, h1.fn .display-title { font-size: .825em; border-left: 1px solid #a6b1b0; -} \ No newline at end of file +} + +ul#individual-hasResearchArea li, +ul#individual-facultyMemberships li { + float: left; + padding-right: 10px; + margin-right: 10px; + border-right: none; +} diff --git a/webapp/src/main/webapp/themes/tenderfoot/templates/body/individual/individual--foaf-person.ftl b/webapp/src/main/webapp/themes/tenderfoot/templates/body/individual/individual--foaf-person.ftl index 6680b6dd..d14c6981 100644 --- a/webapp/src/main/webapp/themes/tenderfoot/templates/body/individual/individual--foaf-person.ftl +++ b/webapp/src/main/webapp/themes/tenderfoot/templates/body/individual/individual--foaf-person.ftl @@ -28,16 +28,16 @@
- <#assign individualImage> - <@p.image individual=individual - propertyGroups=propertyGroups - namespaces=namespaces - editable=editable - showPlaceholder="always" /> - - <#if ( individualImage?contains(' - <#assign infoClass = 'class="withThumb"'/> - + <#assign individualImage> + <@p.image individual=individual + propertyGroups=propertyGroups + namespaces=namespaces + editable=editable + showPlaceholder="always" /> + + <#if ( individualImage?contains(' + <#assign infoClass = 'class="withThumb"'/> + ${individualImage} @@ -47,7 +47,7 @@

<#-- Label --> - <@p.label individual editable labelCount localesCount/> + <@p.label individual editable labelCount localesCount/> <#-- 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")!> @@ -70,17 +70,16 @@

-
-
+
+
+ <#include "individual-adminPanel.ftl"> + + <#include "individual-positions.ftl"> + + <#include "individual-researchAreas.ftl">
-
@@ -88,11 +87,9 @@
- <#include "individual-adminPanel.ftl"> + <#include "individual-adminPanel.ftl">
- - @@ -111,10 +108,14 @@ <#assign skipThis = propertyGroups.pullProperty("http://xmlns.com/foaf/0.1/lastName")!> +
+ <#include "individual-property-group-tabs.ftl"> +
+
- <#include "individual-visualizationFoafPerson.ftl"> + <#include "individual-visualizationFoafPerson.ftl">
@@ -133,9 +134,6 @@ <#include "individual-webpage.ftl">
-
- <#include "individual-property-group-tabs.ftl"> -
@@ -169,7 +167,8 @@ ${stylesheets.add('', '', -'')} +'', +'')} ${headScripts.add('', '', diff --git a/webapp/src/main/webapp/themes/tenderfoot/templates/body/partials/individual/individual-property-group-tabs.ftl b/webapp/src/main/webapp/themes/tenderfoot/templates/body/partials/individual/individual-property-group-tabs.ftl index 2cbb4b48..21a34625 100644 --- a/webapp/src/main/webapp/themes/tenderfoot/templates/body/partials/individual/individual-property-group-tabs.ftl +++ b/webapp/src/main/webapp/themes/tenderfoot/templates/body/partials/individual/individual-property-group-tabs.ftl @@ -21,16 +21,16 @@ <#assign groupNameHtmlId = "${i18n().properties}" > <#if tabCount = 1 > -
  • ${groupName?capitalize}
    • +
  • ${groupName?capitalize}
    • <#assign tabCount = 2> <#else> -
  • ${groupName?capitalize}
    • +
  • ${groupName?capitalize}
    • - <#if (propertyGroups.all?size > 1) > -
  • ${i18n().view_all_capitalized}
    • - + <#-- if (propertyGroups.all?size > 1) > +
  • ${i18n().view_all_capitalized}
    • +
    @@ -43,8 +43,8 @@ <#assign verbose = (verbosePropertySwitch.currentValue)!false>
    + class="tab-pane <#if (sectionCount == 1) >active" + role="tabpanel"> <#-- Display the group heading --> <#if groupName?has_content> <#--the function replaces spaces in the name with underscores, also called for the property group menu--> diff --git a/webapp/src/main/webapp/themes/tenderfoot/templates/page/partials/footer.ftl b/webapp/src/main/webapp/themes/tenderfoot/templates/page/partials/footer.ftl index 9489ebbf..9fe50595 100644 --- a/webapp/src/main/webapp/themes/tenderfoot/templates/page/partials/footer.ftl +++ b/webapp/src/main/webapp/themes/tenderfoot/templates/page/partials/footer.ftl @@ -1,30 +1,37 @@ <#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> <#include "scripts.ftl"> \ No newline at end of file diff --git a/webapp/src/main/webapp/themes/tenderfoot/templates/page/partials/menu.ftl b/webapp/src/main/webapp/themes/tenderfoot/templates/page/partials/menu.ftl index a2a60f75..9ba97d2e 100644 --- a/webapp/src/main/webapp/themes/tenderfoot/templates/page/partials/menu.ftl +++ b/webapp/src/main/webapp/themes/tenderfoot/templates/page/partials/menu.ftl @@ -1,26 +1,24 @@