VIVO-112: and the slog continues...

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
+manage_publications = Gestione publicaciónes para
-check_pubs_to_exclude = Compruebe las subvenciones que desea excluir de la página de perfil.
+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.
@@ -822,3 +822,6 @@ full_name = Nombre y apellidos
 full_name_for = nombre y apellidos para
 first_name = Primer nombre
 last_name = Apellido
+title_not_found = Título que no se encuentra.
+speeches_capitalized = Discursos
+theses_capitalized = Tesis

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 .
+               OPTIONAL { ?infoResource vitro:mostSpecificType ?subclass }     
-                          ?subclass rdfs:subClassOf core:InformationResource
-               }     
                OPTIONAL { ?infoResource core:hasPublicationVenue ?publishedIn .
                           ?publishedIn  rdfs:label ?journal 
                }
@@ -67,12 +65,14 @@
     </query-select>
 
     <query-construct>
-        PREFIX core: &lt;http://vivoweb.org/ontology/core#&gt;
+        PREFIX bibo: &lt;http://purl.org/ontology/bibo/&gt;
-        PREFIX rdfs: &lt;http://www.w3.org/2000/01/rdf-schema#&gt;    
+        PREFIX vitro: &lt;http://vitro.mannlib.cornell.edu/ns/vitro/0.7#&gt;    
         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 
         }
     </query-construct>
 

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 &&
+    if ( $('ul#RO_0000053-ResearcherRole-List').children('li').length < 1 &&
-            $('ul#hasPrincipalInvestigatorRoleList').children('li').length < 1 &&
+            $('ul#RO_0000053-PrincipalInvestigatorRole-List').children('li').length < 1 &&
-            $('ul#hasCo-PrincipalInvestigatorRoleList').children('li').length < 1 &&
+            $('ul#RO_0000053-CoPrincipalInvestigatorRole-List').children('li').length < 1 &&
-            $('ul#hasInvestigatorRoleList').children('li').length < 1 &&
+            $('ul#RO_0000053-InvestigatorRole-List').children('li').length < 1 &&
-            $('h3#hasResearcherRole').attr('class') != "hiddenGrants" ) {
+            $('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();
     }
    

productMods/templates/freemarker/body/individual/individual.ftl

@@ -15,7 +15,7 @@
     ${affiliatedResearchAreas!}
         </section> <!-- #individual-info -->
     </section> <!-- #individual-intro -->
-    <!--postindiviudal overiew tfl-->
+    <!--postindividual overiew ftl-->
 </#assign>
 
 <#include "individual-vitro.ftl">

productMods/templates/freemarker/body/partials/individual/propStatement-authorInAuthorship.ftl

@@ -18,8 +18,8 @@
     <span class="hideThis">&nbsp;</span>
     <script type="text/javascript" >
         $('span.hideThis').parent().parent().addClass("hideThis");
-        if ( $('h3#authorInAuthorship').attr('class').length == 0 ) {
+        if ( $('h3#relatedBy-Authorship').attr('class').length == 0 ) {
-            $('h3#authorInAuthorship').addClass('hiddenPubs');
+            $('h3#relatedBy-Authorship').addClass('hiddenPubs');
         }
         $('span.hideThis').parent().remove();
     </script>

productMods/templates/freemarker/body/partials/individual/propStatement-hasInvestigatorRole.ftl

@@ -16,8 +16,8 @@
     <span class="hideThis">&nbsp;</span>
     <script type="text/javascript" >
         $('span.hideThis').parent().parent().addClass("hideThis");
-        if ( $('h3#hasResearcherRole').attr('class').length == 0 ) {
+        if ( $('h3#RO_0000053-ResearcherRole').attr('class').length == 0 ) {
-            $('h3#hasResearcherRole').addClass('hiddenGrants');
+            $('h3#RO_0000053-ResearcherRole').addClass('hiddenGrants');
         }
         $('span.hideThis').parent().remove();
     </script>

productMods/templates/freemarker/edit/forms/manageGrantsForIndividual.ftl

@@ -25,7 +25,7 @@ ${i18n().check_grants_to_exclude}
         <ul >
             <#list grantList as grant>
             <li>
-                <input type="checkbox" class="grantCheckbox" <#if grant.hideThis??>checked</#if> />${grant.label!}
+                <input type="checkbox" class="grantCheckbox" <#if grant.hideThis??>checked</#if> />${grant.label!grant.activity!}
             </li>
             <script type="text/javascript">
                 grantData.push({

productMods/templates/freemarker/edit/forms/managePublicationsForIndividual.ftl

@@ -6,9 +6,9 @@
 <#if subjectName?contains(",") >
 <#assign lastName = subjectName?substring(0,subjectName?index_of(",")) />
 <#assign firstName = subjectName?substring(subjectName?index_of(",") + 1) />
-<h2>${i18n().manage_publications} ${firstName} ${lastName}</h2>
+<h2>${i18n().manage_publications_for} ${firstName} ${lastName}</h2>
 <#else>
-<h2>${i18n().manage_publications} ${subjectName}</h2>
+<h2>${i18n().manage_publications_for} ${subjectName}</h2>
 </#if>
 <p style="margin-left:25px;margin-bottom:12px">
 ${i18n().check_pubs_to_exclude}
@@ -25,9 +25,9 @@ ${i18n().check_pubs_to_exclude}
         <#if sub = "Software">
             ${sub}
         <#elseif sub = "Thesis">
-            Theses
+            ${i18n().theses_capitalized}
         <#elseif sub = "Speech">
-            Speeches
+            ${i18n().speeches_capitalized}
         <#else>
             ${sub}s
         </#if>
@@ -38,7 +38,7 @@ ${i18n().check_pubs_to_exclude}
             <#list pubs as pub>
             <li>
                 <input type="checkbox" class="pubCheckbox" <#if pub.hideThis??>checked</#if> />
-                <#if pub.title?has_content>${pub.title!}<#else>Title not found.</#if>
+                <#if pub.title?has_content>${pub.title!}<#else>${i18n().title_not_found}</#if>
             </li>
             <script type="text/javascript">
                 publicationData.push({

src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ManageGrantsForIndividualController.java

@@ -67,13 +67,13 @@ public class ManageGrantsForIndividualController extends FreemarkerHttpServlet {
         + "PREFIX afn:  <http://jena.hpl.hp.com/ARQ/function#> \n"
         + "SELECT DISTINCT ?subclass ?role (str(?label2) as ?label) ?activity ?hideThis WHERE { \n"
         + "    ?subject ?roleProp ?role . \n"
-        + "    ?roleProp rdfs:subPropertyOf core:hasResearcherRole . \n"
+        + "    ?role a core:ResearcherRole . \n"
         + "    ?role vitro:mostSpecificType ?subclass \n"
-        + "    OPTIONAL { ?role core:roleRealizedIn ?activity . \n" 
+        + "    OPTIONAL { ?role core:relatedBy ?activity . \n" 
-        + "               ?activity rdfs:label ?label2  \n" 
+        + "               OPTIONAL {?activity rdfs:label ?label2}  \n" 
         + "    } \n"
-        + "    OPTIONAL { ?role core:roleContributesTo ?activity . \n" 
+        + "    OPTIONAL { ?role <http://purl.obolibrary.org/obo/BFO_0000054> ?activity . \n" 
-        + "               ?activity rdfs:label ?label2  \n" 
+        + "               OPTIONAL {?activity rdfs:label ?label2}  \n" 
         + "    } \n"
         + "    OPTIONAL { ?role core:hideFromDisplay ?hideThis } \n" 
         + "} ORDER BY ?subclass ?label2";

src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ManagePublicationsForIndividualController.java

@@ -66,11 +66,12 @@ public class ManagePublicationsForIndividualController extends FreemarkerHttpSer
         + "PREFIX vitro: <http://vitro.mannlib.cornell.edu/ns/vitro/0.7#> \n"
         + "PREFIX afn: <http://jena.hpl.hp.com/ARQ/function#> \n"
         + "SELECT DISTINCT ?subclass ?authorship (str(?label) as ?title) ?pub ?hideThis WHERE { \n"
-        + "    ?subject core:authorInAuthorship ?authorship . \n"
+        + "    ?subject core:relatedBy ?authorship . \n"
-        + "    OPTIONAL { ?authorship core:linkedInformationResource ?pub . " 
+        + "    ?authorship a core:Authorship  . \n"
+        + "    OPTIONAL { ?authorship core:relates ?pub . " 
+        + "               ?pub a <http://purl.org/ontology/bibo/Document> . \n"
         + "               ?pub rdfs:label ?label  \n"
-        + "               OPTIONAL { ?pub vitro:mostSpecificType ?subclass . \n"
+        + "               OPTIONAL { ?pub vitro:mostSpecificType ?subclass } \n"
-        + "                          ?subclass rdfs:subClassOf core:InformationResource } \n"
         + "    } \n" 
         + "    OPTIONAL { ?authorship core:hideFromDisplay ?hideThis } \n"
         + "} ORDER BY ?subclass ?title";

themes/wilma/i18n/all.properties

@@ -435,8 +435,8 @@ check_grants_to_exclude = Check those grants and projects you want to exclude fr
 manage_affiliated_people = Manage People Affiliated with
 check_people_to_exclude = Check those people you want to exclude from the profile page.
 
-manage_grants = Manage grants for
+manage_publications_for = Manage Publications for
-check_pubs_to_exclude = Check those grants you want to exclude from the profile page.
+check_pubs_to_exclude = Check those publications you want to exclude from the profile page.
 
 manage_web_pages = Manage Web Pages
 has_no_webpages = This individual currently has no web pages specified. Add a new web page by clicking on the button below.
@@ -840,3 +840,6 @@ full_name = Full name
 full_name_for = full name for
 first_name = First name
 last_name = Last name
+title_not_found = Title not found.
+speeches_capitalized = Speeches
+theses_capitalized = Theses 

themes/wilma/templates/individual--foaf-person.ftl

@@ -148,4 +148,3 @@ ${scripts.add('<script type="text/javascript" src="${urls.base}/js/individual/in
               '<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>')}
-