diff --git a/webapp/web/css/edit.css b/webapp/web/css/edit.css index 619e686c8..2afbe39c7 100644 --- a/webapp/web/css/edit.css +++ b/webapp/web/css/edit.css @@ -1,5 +1,70 @@ /* $This file is distributed under the terms of the license in /doc/license.txt$ */ +/******************* mb863: making styles theme agnostic ********************************/ + +label{ + display: block; + margin-top: .5em; +} +input{ + padding:0.4em; +} + + + +/******************* mb863: content below copied from Wilma theme /css/formedit.css ********************************/ + +form { + padding-bottom: 20px; +} + +.form p { + margin-bottom:0.5em; +} + +form textarea { + width: 60%; +} + +form a:link.cancel, form a:visited.cancel { + color: #f70; + border-color: #f70; +} + +form a:hover.cancel { + text-decoration: none; +} + +form select option{ + padding-right: 5px; +} + +form dl { + margin-bottom: 20px; +} + +form dl dt, form dl dd { + padding-top: 15px; +} + +.validationError { + padding-top: .5em; + color:red; +} + +.inlineForm input { + display:inline; +} + +.inlineForm label { + display:inline; +} + +p.submit { + clear: left; + margin-top: 2em; +} + /******************* styles copied from old global.css.jsp ********************************/ .buttonForm { diff --git a/webapp/web/js/jquery_plugins/thickbox/thickbox.css b/webapp/web/js/jquery_plugins/thickbox/thickbox.css index d24b9bedf..20fa02add 100644 --- a/webapp/web/js/jquery_plugins/thickbox/thickbox.css +++ b/webapp/web/js/jquery_plugins/thickbox/thickbox.css @@ -1,7 +1,7 @@ /* ----------------------------------------------------------------------------------------------------------------*/ /* ---------->>> global settings needed for thickbox <<<-----------------------------------------------------------*/ /* ----------------------------------------------------------------------------------------------------------------*/ -*{padding: 0; margin: 0;} +/* *{padding: 0; margin: 0;} Theme addes a reset.css file */ /* ----------------------------------------------------------------------------------------------------------------*/ /* ---------->>> thickbox specific link and font settings <<<------------------------------------------------------*/ diff --git a/webapp/web/templates/freemarker/body/individual/individual.ftl b/webapp/web/templates/freemarker/body/individual/individual.ftl index e19714bb4..42ef95d5e 100644 --- a/webapp/web/templates/freemarker/body/individual/individual.ftl +++ b/webapp/web/templates/freemarker/body/individual/individual.ftl @@ -72,7 +72,7 @@ - <#include "individual-properties.ftl"> + <#-- <#include "individual-properties.ftl"> --> <#-- Keywords --> <#if individual.keywords?has_content> @@ -81,7 +81,110 @@ +<#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> +
+
+ <#-- Thumbnail --> + <#--
--> + <#if individual.thumbUrl??> + <#--<@p.dataPropsWrapper id="thumbnail">--> + ${individual.name} + <#----> + <#elseif individual.person> + <#--<@p.dataPropsWrapper id="thumbnail">--> + placeholder image + <#----> + + <#--
--> + + + + 555 567 7878 + + +
+ +
+
+ <#if relatedSubject??> +

${relatedSubject.relatingPredicateDomainPublic} for ${relatedSubject.name}

+

← return to ${relatedSubject.name}

+ <#else> + <#-- Label --> + <#--<@p.dataPropWrapper id="label">--> +

${individual.name} + <#----> + + <#-- Moniker --> + <#if individual.moniker?has_content> + <#--<@p.dataPropsWrapper id="moniker">--> + ${individual.moniker} + <#----> + +

+ + +

Current Positions

+ + +
+ +

Born Margarita Carmen Cansino in Brooklyn, New York City, she was the daughter of flamenco dancer Eduardo Cansino, Sr., who was himself a Sephardic Jewish Spaniard from Castilleja de la Cuesta (Seville), and Ziegfeld girl Volga Hayworth who was of Irish and English descent. She was raised as a Roman Catholic. Her father wanted her to become a dancer while her mother hoped she would become an actress. Her grandfather, Antonio Cansino [+]

+ +

Roles

+ + +
+
+ +
+
+
+

2 publications within the last 10 years

+
+ +

All VIVO publications & co-author network.

+
+ +
+
+

10 Co-Authors

+
+ + + +

View All 4

+
+
${stylesheets.addFromTheme("/css/entity.css")} <#-- RY Figure out which of these scripts really need to go into the head, and which are needed at all (e.g., tinyMCE??) --> diff --git a/webapp/web/templates/freemarker/page/partials/stylesheets.ftl b/webapp/web/templates/freemarker/page/partials/stylesheets.ftl index 890356397..f77fa32cc 100644 --- a/webapp/web/templates/freemarker/page/partials/stylesheets.ftl +++ b/webapp/web/templates/freemarker/page/partials/stylesheets.ftl @@ -3,4 +3,6 @@ ${stylesheets.add("/css/edit.css")} <#-- temporary until edit controller can include this when needed --> ${stylesheets.add("/css/menupage/menupage.css")} <#-- we need to call it from the theme until freemarker controller and menupage.ftl are created --> ${stylesheets.add("/css/individual/individual.css")} <#-- we need to call it from the theme until freemarker controller and individual.ftl are created --> -${stylesheets.tags} \ No newline at end of file +${stylesheets.tags} + + \ No newline at end of file