litvinovg/vivo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'maint-rel-1.6' into develop

Browse source
This commit is contained in:
tworrall 2013-12-19 10:06:23 -05:00
commit c40c7ad0e5
5 changed files with 88 additions and 86 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

50
productMods/templates/freemarker/body/partials/individual/individual-affiliated-dept-details.ftl
View file

@ -1,25 +1,25 @@
<#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> <#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
<#if deptResearchAreas?has_content> <#if deptResearchAreas?has_content>
<section id="pageList"> <section id="pageList">
<#list deptResearchAreas as firstRow> <#list deptResearchAreas as firstRow>
<#assign raLink = "${urls.base}/individual?uri=${firstRow['raURI']}" /> <#assign raLink = "${urls.base}/individual?uri=${firstRow['ra']}" />
<div class="tab"> <div class="tab">
<h2>${firstRow["orgLabel"]}</h2> <h2>${firstRow["orgLabel"]}</h2>
<p>${i18n().individuals_with_dept(firstRow['raLabel'],raLink)} <a href="${urls.base}/individual?uri=${firstRow["orgURI"]}">${i18n().view_all_individuals_in_dept}</a></p> <p>${i18n().individuals_with_dept(firstRow['raLabel'],raLink)} <a href="${urls.base}/individual?uri=${firstRow["org"]}">${i18n().view_all_individuals_in_dept}</a></p>
</div> </div>
<#break> <#break>
</#list> </#list>
</section> </section>
<section id="deptResearchAreas"> <section id="deptResearchAreas">
<ul role="list" class="deptDetailsList"> <ul role="list" class="deptDetailsList">
<#list deptResearchAreas as resultRow> <#list deptResearchAreas as resultRow>
<li class="deptDetailsListItem"> <li class="deptDetailsListItem">
<a href="${urls.base}/individual${resultRow["person"]?substring(resultRow["person"]?last_index_of("/"))}" title="${i18n().person_name}">${resultRow["personLabel"]}</a> <a href="${urls.base}/individual${resultRow["person"]?substring(resultRow["person"]?last_index_of("/"))}" title="${i18n().person_name}">${resultRow["personLabel"]}</a>
</li> </li>
</#list> </#list>
</ul> </ul>
</section> </section>
</#if> </#if>

64
productMods/templates/freemarker/body/partials/individual/individual-affiliated-res-area-details.ftl
View file

@ -1,32 +1,32 @@
<#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> <#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
<#if affiliatedResearchAreas?has_content> <#if affiliatedResearchAreas?has_content>
<section id="pageList"> <section id="pageList">
<#list affiliatedResearchAreas as firstRow> <#list affiliatedResearchAreas as firstRow>
<#assign firstOrgLabel = firstRow["orgLabel"]?upper_case /> <#assign firstOrgLabel = firstRow["orgLabel"]?upper_case />
<#assign deptLink = "${urls.base}/individual?uri=${firstRow['orgURI']}" /> <#assign deptLink = "${urls.base}/individual?uri=${firstRow['orgURI']}" />
<#assign i18TextString1 = "" /> <#assign i18TextString1 = "" />
<#if ( firstOrgLabel?index_of("THE") == 0 ) > <#if ( firstOrgLabel?index_of("THE") == 0 ) >
<#assign i18TextString1 = "${i18n().individuals_with_researh_area_one(firstRow['orgLabel'],deptLink)}" /> <#assign i18TextString1 = "${i18n().individuals_with_researh_area_one(firstRow['orgLabel'],deptLink)}" />
<#else> <#else>
<#assign i18TextString1 = "${i18n().individuals_with_researh_area_two(firstRow['orgLabel'],deptLink)}" /> <#assign i18TextString1 = "${i18n().individuals_with_researh_area_two(firstRow['orgLabel'],deptLink)}" />
</#if> </#if>
<div class="tab"> <div class="tab">
<h2>${firstRow["raLabel"]}</h2> <h2>${firstRow["raLabel"]}</h2>
<p>${i18TextString1} <a href="${urls.base}/individual?uri=${firstRow["raURI"]}">${i18n().view_all_individuals_in_area}</a></p> <p>${i18TextString1} <a href="${urls.base}/individual?uri=${firstRow["ra"]}">${i18n().view_all_individuals_in_area}</a></p>
</div> </div>
<#break> <#break>
</#list> </#list>
</section> </section>
<section id="deptResearchAreas"> <section id="deptResearchAreas">
<ul role="list" class="deptDetailsList"> <ul role="list" class="deptDetailsList">
<#list affiliatedResearchAreas as resultRow> <#list affiliatedResearchAreas as resultRow>
<li class="deptDetailsListItem"> <li class="deptDetailsListItem">
<a href="${urls.base}/individual${resultRow["person"]?substring(resultRow["person"]?last_index_of("/"))}" title="${i18n().person_name}">${resultRow["personLabel"]}</a> <a href="${urls.base}/individual${resultRow["person"]?substring(resultRow["person"]?last_index_of("/"))}" title="${i18n().person_name}">${resultRow["personLabel"]}</a>
</li> </li>
</#list> </#list>
</ul> </ul>
</section> </section>
</#if> </#if>

48
productMods/templates/freemarker/body/partials/individual/individual-dept-res-area-details.ftl
View file

@ -1,24 +1,24 @@
<#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> <#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
<#if deptResearchAreas?has_content> <#if deptResearchAreas?has_content>
<section id="pageList"> <section id="pageList">
<#list deptResearchAreas as firstRow> <#list deptResearchAreas as firstRow>
<div class="tab"> <div class="tab">
<h2>${firstRow["raLabel"]}</h2> <h2>${firstRow["raLabel"]}</h2>
<p>${i18n().faculty_with_researh_area(firstRow["deptLabel"])} <a href="${urls.base}/individual?uri=${firstRow["raURI"]}">${i18n().view_all_faculty_in_area}</a></p> <p>${i18n().faculty_with_researh_area(firstRow["orgLabel"])} <a href="${urls.base}/individual?uri=${firstRow["ra"]}">${i18n().view_all_faculty_in_area}</a></p>
</div> </div>
<#break> <#break>
</#list> </#list>
<section id="deptResearchAreas"> <section id="deptResearchAreas">
<ul role="list" class="deptDetailsList"> <ul role="list" class="deptDetailsList">
<#list deptResearchAreas as resultRow> <#list deptResearchAreas as resultRow>
<li class="deptDetailsListItem"> <li class="deptDetailsListItem">
<a href="${urls.base}/individual${resultRow["person"]?substring(resultRow["person"]?last_index_of("/"))}" title="${i18n().person_name}">${resultRow["personLabel"]}</a> <a href="${urls.base}/individual${resultRow["person"]?substring(resultRow["person"]?last_index_of("/"))}" title="${i18n().person_name}">${resultRow["personLabel"]}</a>
</li> </li>
</#list> </#list>
</ul> </ul>
</section> </section>
</#if> </#if>
</section> </section>

6
rdf/display/everytime/vivoConceptDataGetters.n3
View file

@ -65,8 +65,8 @@ display:getDepartmentDataGetter
?person ?person
(Str(?researchAreaLabel) AS ?raLabel) (Str(?researchAreaLabel) AS ?raLabel)
(str(?departmentLabel) AS ?orgLabel) (str(?departmentLabel) AS ?orgLabel)
?raURI ?ra
?orgURI ?org
WHERE { WHERE {
?orgURI vivo:relatedBy ?posn . ?orgURI vivo:relatedBy ?posn .
?posn a vivo:Position . ?posn a vivo:Position .
@ -76,6 +76,8 @@ display:getDepartmentDataGetter
?person rdfs:label ?prsnLabel . ?person rdfs:label ?prsnLabel .
?person vivo:hasResearchArea ?raURI . ?person vivo:hasResearchArea ?raURI .
?raURI rdfs:label ?researchAreaLabel ?raURI rdfs:label ?researchAreaLabel
BIND(?raURI AS ?ra)
BIND(?orgURI AS ?org)
} }
ORDER BY ?personLabel ORDER BY ?personLabel

6
rdf/display/everytime/vivoOrganizationDataGetters.n3
View file

@ -107,9 +107,8 @@ display:getResearchAreaDataGetter
SELECT DISTINCT (str (?prsnLabel) AS ?personLabel) SELECT DISTINCT (str (?prsnLabel) AS ?personLabel)
?person ?person
(Str(?researchAreaLabel) AS ?raLabel) (Str(?researchAreaLabel) AS ?raLabel)
(str(?departmentLabel) AS ?orgLabel) (str(?organizationLabel) AS ?orgLabel)
?raURI ?ra
?orgURI
WHERE { WHERE {
?orgURI vivo:relatedBy ?posn . ?orgURI vivo:relatedBy ?posn .
?posn a vivo:Position . ?posn a vivo:Position .
@ -119,6 +118,7 @@ display:getResearchAreaDataGetter
?person rdfs:label ?prsnLabel . ?person rdfs:label ?prsnLabel .
?person vivo:hasResearchArea ?raURI . ?person vivo:hasResearchArea ?raURI .
?raURI rdfs:label ?researchAreaLabel ?raURI rdfs:label ?researchAreaLabel
BIND(?raURI AS ?ra)
} }
ORDER BY ?personLabel ORDER BY ?personLabel