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-20 13:28:44 -05:00
commit b5244693bf
2 changed files with 75 additions and 75 deletions
Download patch file Download diff file Expand all files Collapse all files

70
productMods/templates/freemarker/body/partials/individual/individual-affiliated-departments.ftl
View file

@ -1,35 +1,35 @@
<#-- $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 departmentsResults?has_content> <#if departmentsResults?has_content>
<#-- is strictly a usability issue so we can refer accurately to "faculty members" within the dept. --> <#-- is strictly a usability issue so we can refer accurately to "faculty members" within the dept. -->
<#assign urlForDetailsPage = "affiliatedDepartments" /> <#assign urlForDetailsPage = "affiliatedDepartments" />
<#assign headingText = "${i18n().affiliated_departments}" /> <#assign headingText = "${i18n().affiliated_departments}" />
<h2 id="facultyResearchAreas" class="mainPropGroup"> <h2 id="facultyResearchAreas" class="mainPropGroup">
${headingText} ${headingText}
</h2> </h2>
<ul id="individual-hasResearchArea" role="list"> <ul id="individual-hasResearchArea" role="list">
<#assign moreDisplayed = false> <#assign moreDisplayed = false>
<#list departmentsResults as resultRow> <#list departmentsResults as resultRow>
<li class="raLink"> <li class="raLink">
<a class="raLink" href="${urls.base}/${urlForDetailsPage}?orgURI=${resultRow["dept"]}&raURI=${individual.uri}" title="${i18n().organization}"> <a class="raLink" href="${urls.base}/${urlForDetailsPage}?orgURI=${resultRow["dept"]?url}&raURI=${individual.uri?url}" title="${i18n().organization}">
${resultRow["deptLabel"]} ${resultRow["deptLabel"]}
</a> </a>
</li> </li>
</#list> </#list>
</ul> </ul>
</#if> </#if>
<script> <script>
$('a#raMore').click(function() { $('a#raMore').click(function() {
$('li.raLinkMore').each(function() { $('li.raLinkMore').each(function() {
$(this).show(); $(this).show();
}); });
$('li#raMoreContainer').hide(); $('li#raMoreContainer').hide();
$('li#raLessContainer').show(); $('li#raLessContainer').show();
}); });
$('a#raLess').click(function() { $('a#raLess').click(function() {
$('li.raLinkMore').each(function() { $('li.raLinkMore').each(function() {
$(this).hide(); $(this).hide();
}); });
$('li#raMoreContainer').show(); $('li#raMoreContainer').show();
$('li#raLessContainer').hide(); $('li#raLessContainer').hide();
}); });
</script> </script>

80
productMods/templates/freemarker/body/partials/individual/individual-affiliated-research-areas.ftl
View file

@ -1,40 +1,40 @@
<#-- $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 researchAreaResults?has_content> <#if researchAreaResults?has_content>
<#-- If the organization is an Academic Department, we use a different datagetter and detail page. This --> <#-- If the organization is an Academic Department, we use a different datagetter and detail page. This -->
<#-- is strictly a usability issue so we can refer accurately to "faculty members" within the dept. --> <#-- is strictly a usability issue so we can refer accurately to "faculty members" within the dept. -->
<#assign urlForDetailsPage = "affiliatedResearchAreas" /> <#assign urlForDetailsPage = "affiliatedResearchAreas" />
<#assign headingText = "${i18n().affiliated_research_areas}" /> <#assign headingText = "${i18n().affiliated_research_areas}" />
<#if individual.mostSpecificTypes?seq_contains("Academic Department")> <#if individual.mostSpecificTypes?seq_contains("Academic Department")>
<#assign urlForDetailsPage = "deptResearchAreas" /> <#assign urlForDetailsPage = "deptResearchAreas" />
<#assign headingText = "${i18n().faculty_research_areas}" /> <#assign headingText = "${i18n().faculty_research_areas}" />
</#if> </#if>
<h2 id="facultyResearchAreas" class="mainPropGroup"> <h2 id="facultyResearchAreas" class="mainPropGroup">
${headingText} ${headingText}
</h2> </h2>
<ul id="individual-hasResearchArea" role="list"> <ul id="individual-hasResearchArea" role="list">
<#assign moreDisplayed = false> <#assign moreDisplayed = false>
<#list researchAreaResults as resultRow> <#list researchAreaResults as resultRow>
<li class="raLink"> <li class="raLink">
<a class="raLink" href="${urls.base}/${urlForDetailsPage}?orgURI=${individual.uri}&raURI=${resultRow["ra"]}" title="${i18n().research_area}"> <a class="raLink" href="${urls.base}/${urlForDetailsPage}?orgURI=${individual.uri?url}&raURI=${resultRow["ra"]?url}" title="${i18n().research_area}">
${resultRow["raLabel"]} ${resultRow["raLabel"]}
</a> </a>
</li> </li>
</#list> </#list>
</ul> </ul>
</#if> </#if>
<script> <script>
$('a#raMore').click(function() { $('a#raMore').click(function() {
$('li.raLinkMore').each(function() { $('li.raLinkMore').each(function() {
$(this).show(); $(this).show();
}); });
$('li#raMoreContainer').hide(); $('li#raMoreContainer').hide();
$('li#raLessContainer').show(); $('li#raLessContainer').show();
}); });
$('a#raLess').click(function() { $('a#raLess').click(function() {
$('li.raLinkMore').each(function() { $('li.raLinkMore').each(function() {
$(this).hide(); $(this).hide();
}); });
$('li#raMoreContainer').show(); $('li#raMoreContainer').show();
$('li#raLessContainer').hide(); $('li#raLessContainer').hide();
}); });
</script> </script>