From 50c53a62e65d942007ef37d90f9320698cfbc8aa Mon Sep 17 00:00:00 2001 From: tworrall Date: Wed, 25 Sep 2013 17:08:41 -0400 Subject: [PATCH 1/7] VIVO-112: and the slog continues... --- .../example/themes/wilma/i18n/all_es.properties | 9 ++++++--- .../config/listViewConfig-authorInAuthorship.xml | 16 ++++++++-------- productMods/js/individual/individualUtils.js | 14 +++++++------- .../freemarker/body/individual/individual.ftl | 2 +- .../propStatement-authorInAuthorship.ftl | 6 +++--- .../propStatement-hasInvestigatorRole.ftl | 4 ++-- .../edit/forms/manageGrantsForIndividual.ftl | 2 +- .../forms/managePublicationsForIndividual.ftl | 10 +++++----- .../ManageGrantsForIndividualController.java | 10 +++++----- ...anagePublicationsForIndividualController.java | 9 +++++---- themes/wilma/i18n/all.properties | 7 +++++-- .../wilma/templates/individual--foaf-person.ftl | 1 - 12 files changed, 48 insertions(+), 42 deletions(-) diff --git a/languages/example/themes/wilma/i18n/all_es.properties b/languages/example/themes/wilma/i18n/all_es.properties index e8641a38..2a89246e 100644 --- a/languages/example/themes/wilma/i18n/all_es.properties +++ b/languages/example/themes/wilma/i18n/all_es.properties @@ -421,8 +421,8 @@ check_grants_to_exclude = Compruebe las subvenciones y proyectos que desea exclu manage_affiliated_people = Gestione personas afiliadas check_people_to_exclude = Compruebe las personas que desea excluir de la página de perfil. -manage_grants = Gestione subvenciones para -check_pubs_to_exclude = Compruebe las subvenciones que desea excluir de la página de perfil. +manage_publications = Gestione publicaciónes para +check_pubs_to_exclude = Compruebe las publicaciónes que desea excluir de la página de perfil. manage_web_pages = Gestionar páginas Web has_no_webpages = Este individuo no tiene actualmente las páginas web específicas. Añadir una nueva página web haciendo clic en el botón de abajo. @@ -821,4 +821,7 @@ enter_email_address = Por favor, introduzca un valor en el campo Dirección de C full_name = Nombre y apellidos full_name_for = nombre y apellidos para first_name = Primer nombre -last_name = Apellido \ No newline at end of file +last_name = Apellido +title_not_found = Título que no se encuentra. +speeches_capitalized = Discursos +theses_capitalized = Tesis \ No newline at end of file diff --git a/productMods/config/listViewConfig-authorInAuthorship.xml b/productMods/config/listViewConfig-authorInAuthorship.xml index 51f0a127..b63ab0a8 100644 --- a/productMods/config/listViewConfig-authorInAuthorship.xml +++ b/productMods/config/listViewConfig-authorInAuthorship.xml @@ -30,7 +30,7 @@ ?subject ?property ?authorship . ?authorship core:relates ?infoResource . ?infoResource a bibo:Document . - ?infoResource rdfs:label ?infoResourceName + ?infoResource rdfs:label ?infoResourceName . OPTIONAL { ?infoResource bibo:volume ?volume } OPTIONAL { ?infoResource bibo:pageStart ?startPage } @@ -49,9 +49,7 @@ OPTIONAL { ?infoResource core:partOf ?partOfObj . ?partOfObj rdfs:label ?partOf } - OPTIONAL { ?infoResource vitro:mostSpecificType ?subclass . - ?subclass rdfs:subClassOf core:InformationResource - } + OPTIONAL { ?infoResource vitro:mostSpecificType ?subclass } OPTIONAL { ?infoResource core:hasPublicationVenue ?publishedIn . ?publishedIn rdfs:label ?journal } @@ -67,12 +65,14 @@ - PREFIX core: <http://vivoweb.org/ontology/core#> - PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#> + PREFIX bibo: <http://purl.org/ontology/bibo/> + PREFIX vitro: <http://vitro.mannlib.cornell.edu/ns/vitro/0.7#> CONSTRUCT { - ?subclass rdfs:subClassOf core:InformationResource + ?infoResource a bibo:Document . + ?infoResource vitro:mostSpecificType ?subclass } WHERE { - ?subclass rdfs:subClassOf core:InformationResource + ?infoResource a bibo:Document . + ?infoResource vitro:mostSpecificType ?subclass } diff --git a/productMods/js/individual/individualUtils.js b/productMods/js/individual/individualUtils.js index b5ebf503..da9729f2 100644 --- a/productMods/js/individual/individualUtils.js +++ b/productMods/js/individual/individualUtils.js @@ -122,19 +122,19 @@ $(document).ready(function(){ // if there are no selected pubs, hide the manage link; same for grants // and affiliated people on the org profile page - if ( $('ul#authorInAuthorshipList').children('li').length < 1 && $('h3#authorInAuthorship').attr('class') != "hiddenPubs" ) { + if ( $('ul#relatedBy-Authorship-List').children('li').length < 1 && $('h3#relatedBy-Authorship').attr('class') != "hiddenPubs" ) { $('a#managePubLink').hide(); } - if ( $('ul#hasResearcherRoleList').children('li').length < 1 && - $('ul#hasPrincipalInvestigatorRoleList').children('li').length < 1 && - $('ul#hasCo-PrincipalInvestigatorRoleList').children('li').length < 1 && - $('ul#hasInvestigatorRoleList').children('li').length < 1 && - $('h3#hasResearcherRole').attr('class') != "hiddenGrants" ) { + if ( $('ul#RO_0000053-ResearcherRole-List').children('li').length < 1 && + $('ul#RO_0000053-PrincipalInvestigatorRole-List').children('li').length < 1 && + $('ul#RO_0000053-CoPrincipalInvestigatorRole-List').children('li').length < 1 && + $('ul#RO_0000053-InvestigatorRole-List').children('li').length < 1 && + $('h3#RO_0000053-ResearcherRole').attr('class') != "hiddenGrants" ) { $('a#manageGrantLink').hide(); } - if ( $('ul#organizationForPositionList').children('li').length < 1 && $('h3#organizationForPosition').attr('class') != "hiddenPeople" ) { + if ( $('ul#relatedBy-Position-List').children('li').length < 1 && $('h3#relatedBy-Position').attr('class') != "hiddenPeople" ) { $('a#managePeopleLink').hide(); } diff --git a/productMods/templates/freemarker/body/individual/individual.ftl b/productMods/templates/freemarker/body/individual/individual.ftl index cd2a6c43..290c49a5 100644 --- a/productMods/templates/freemarker/body/individual/individual.ftl +++ b/productMods/templates/freemarker/body/individual/individual.ftl @@ -15,7 +15,7 @@ ${affiliatedResearchAreas!} - + <#include "individual-vitro.ftl"> diff --git a/productMods/templates/freemarker/body/partials/individual/propStatement-authorInAuthorship.ftl b/productMods/templates/freemarker/body/partials/individual/propStatement-authorInAuthorship.ftl index 839cfa12..b8cd6c1c 100644 --- a/productMods/templates/freemarker/body/partials/individual/propStatement-authorInAuthorship.ftl +++ b/productMods/templates/freemarker/body/partials/individual/propStatement-authorInAuthorship.ftl @@ -18,8 +18,8 @@   @@ -111,6 +111,6 @@ - ${resourceTitle} ${citationDetails} <@dt.yearSpan "${statement.dateTime!}" /> + ${resourceTitle} ${citationDetails} <@dt.yearSpan "${statement.dateTime!}" /> diff --git a/productMods/templates/freemarker/body/partials/individual/propStatement-hasInvestigatorRole.ftl b/productMods/templates/freemarker/body/partials/individual/propStatement-hasInvestigatorRole.ftl index 2f4ca74c..d458c4dd 100644 --- a/productMods/templates/freemarker/body/partials/individual/propStatement-hasInvestigatorRole.ftl +++ b/productMods/templates/freemarker/body/partials/individual/propStatement-hasInvestigatorRole.ftl @@ -16,8 +16,8 @@   diff --git a/productMods/templates/freemarker/edit/forms/manageGrantsForIndividual.ftl b/productMods/templates/freemarker/edit/forms/manageGrantsForIndividual.ftl index 8a2e3db1..7bb30d3f 100644 --- a/productMods/templates/freemarker/edit/forms/manageGrantsForIndividual.ftl +++ b/productMods/templates/freemarker/edit/forms/manageGrantsForIndividual.ftl @@ -25,7 +25,7 @@ ${i18n().check_grants_to_exclude}