From c4d32307cce4818136f6bf8bfc9a6cf72437d3dc Mon Sep 17 00:00:00 2001 From: mb863 Date: Wed, 26 Jan 2011 22:19:18 +0000 Subject: [PATCH] NIHVIVO-1315, NIHVIVO1316: Re-factored the markup and styles for individual pages. Also I have introduced an image placeholder for non person individuals. --- .../css/individual/individual-vivo.css | 38 ++++++++++++++++++ .../individual/individual--foaf-person.ftl | 28 ++++++++----- .../freemarker/body/individual/individual.ftl | 7 +++- themes/wilma/css/wilma.css | 39 +++++++++++++------ 4 files changed, 89 insertions(+), 23 deletions(-) create mode 100644 productMods/css/individual/individual-vivo.css diff --git a/productMods/css/individual/individual-vivo.css b/productMods/css/individual/individual-vivo.css new file mode 100644 index 00000000..770347d9 --- /dev/null +++ b/productMods/css/individual/individual-vivo.css @@ -0,0 +1,38 @@ +/* $This file is distributed under the terms of the license in /doc/license.txt$ */ + +@charset "UTF-8"; +/* CSS Document */ + +/* <------ INDIVIDUAL CORE:OVERVIEW */ +#overview{ + clear: left; +} +.overview-value{ + display: inline; +} +div.overview-value :last-child{ + margin-bottom: .2em; +} +.individual-overview{ + font-size: 1em; + padding-bottom: 0; + line-height: 1.3em; + padding-right: 10px; + padding-top: 10px; + width: 100%; +} +/* <------ INDIVIDUAL TEMPORAL GRAPH */ +#temporal-graph{ + float: right; + padding: 0 3px 20px 0; + background-color: #fff; + margin-top: -20px; +} +#temporal-graph h3{ + margin: 0; + padding: 0; +} +#temporal-graph h3 img{ + padding-right: 10px; + vertical-align: text-top; +} \ No newline at end of file diff --git a/productMods/templates/freemarker/body/individual/individual--foaf-person.ftl b/productMods/templates/freemarker/body/individual/individual--foaf-person.ftl index ed1bee7f..b9789d42 100644 --- a/productMods/templates/freemarker/body/individual/individual--foaf-person.ftl +++ b/productMods/templates/freemarker/body/individual/individual--foaf-person.ftl @@ -4,16 +4,25 @@ <#include "individual-setup.ftl"> -
+
- <#-- Image --> - <@p.imageLinks individual=individual - propertyGroups=propertyGroups - namespaces=namespaces - editable=editable - showPlaceholder="always" - placeholder="${urls.images}/placeholders/person.thumbnail.jpg" /> + <#-- Image --> + <#assign individualImage> + <@p.imageLinks individual=individual + propertyGroups=propertyGroups + namespaces=namespaces + editable=editable + showPlaceholder="always" + placeholder="${urls.images}/placeholders/person.thumbnail.jpg" /> + + + <#-- <#if ( individualImage?matches(' 0 )> --> + <#if ( individualImage?contains(' + <#assign infoClass = 'class="withThumb"'/> + + +
${individualImage}
-
+
<#include "individual-sparklineVisualization.ftl"> <#-- Disable for now until controller sends data --> <#-- @@ -134,6 +143,7 @@ ${stylesheets.add("/css/individual/individual.css")} +${stylesheets.add("/css/individual/individual-vivo.css")} <#-- RY Figure out which of these scripts really need to go into the head, and which are needed at all (e.g., tinyMCE??) --> ${headScripts.add("/js/jquery_plugins/getURLParam.js", diff --git a/productMods/templates/freemarker/body/individual/individual.ftl b/productMods/templates/freemarker/body/individual/individual.ftl index f7523600..85ddd7a5 100644 --- a/productMods/templates/freemarker/body/individual/individual.ftl +++ b/productMods/templates/freemarker/body/individual/individual.ftl @@ -5,15 +5,18 @@ <#include "individual-setup.ftl"> <#assign individualProductExtension> - <#include "individual-overview.ftl"> - + <#-- Remove invlude below when individual--foaf-organization.ftl is created --> <#include "individual-visualization.ftl"> + + <#include "individual-overview.ftl">
<#include "individual-vitro.ftl"> +${stylesheets.add("/css/individual/individual-vivo.css")} + ${headScripts.add("/js/jquery_plugins/jquery.truncator.js")} ${scripts.add("/js/individual/individualUtils.js")} \ No newline at end of file diff --git a/themes/wilma/css/wilma.css b/themes/wilma/css/wilma.css index 0ac09063..128b688c 100644 --- a/themes/wilma/css/wilma.css +++ b/themes/wilma/css/wilma.css @@ -1,6 +1,8 @@ /* $This file is distributed under the terms of the license in /doc/license.txt$ */ + @charset "UTF-8"; /* CSS Document */ + /* Tell the browser to render HTML 5 elements as block */ header, hgroup, @@ -965,15 +967,23 @@ nav.pagination.menupage li a:hover{ /* -------------------------------------------------> */ /* ADMIN PANEL ------> */ -.admin h3{ - color: #fff; - background: #2485AE; -} -/* INDIVIDUAL INTRO FOR PERSON ------> */ +#admin{ + background-color: #f2f9fb; +} +#admin h3{ + background: #2485AE; + color: #fff; +} +#admin .uri-link { + color: #888c8c; +} +#admin a{ + color: #2a98bc; +} +/* INDIVIDUAL INTRO FOR ANY CLASS ------> */ .preferred{ padding-top: .2em; } -/* INDIVIDUAL INTRO FOR ANY CLASS ------> */ #individual-intro h1{ font-size: 1.375em; color: #2485ae; @@ -989,9 +999,8 @@ ul#individual-tools{ #individual-intro ul.individual-urls li a{ color: #2485ae; } -/* INDIVIDUAL INTRO FOR PERSON ------> */ -#individual-intro-person{ - /*border-right: 1px solid #edf0ed;*/ +h2#mainImage, #share-contact h2{ + color: #5E6363; } /* INDIVIDUAL INTRO - LEFT SIDE CONTENT ------> */ img.individual-photo{ @@ -1050,6 +1059,7 @@ ul.individual-urls-people li a{ #individual-info h1.fn{ font-size: 1.375em; color: #2485ae; + line-height: 1.3em; } h1.fn .preferred-title { font-size: 0.825em; @@ -1057,8 +1067,9 @@ h1.fn .preferred-title { border-left: 1px solid #a6b1b0; } #individual-info h2{ - font-size: 1.125em; - font-weight: normal; + color: #5E6363; + font-size: 1em; + font-weight: bold; } #individual-info h3{ font-size: 1.125em; @@ -1192,6 +1203,10 @@ article.property ul.property-list li a{ a { text-decoration: underline } -.middle { +.middle{ vertical-align: middle; +} +/* EDITING DISPLAY------> */ +.edit-individual{ + border-left: 1px dotted #B2D15A; } \ No newline at end of file