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

Merge branch 'develop' of git+ssh://github.com/vivo-project/VIVO into develop

Browse source
This commit is contained in:
j2blake 2013-06-11 13:03:25 -04:00
commit 12ea721218
4 changed files with 16 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
productMods/js/individual/propertyGroupControls.js
View file

@ -3,7 +3,6 @@
$(document).ready(function(){
$.extend(this, individualLocalName);
$.extend(this, i18nStringsTabs);
adjustFontSize();
padSectionBottoms();
checkLocationHash();
@ -34,7 +33,7 @@ $(document).ready(function(){
$propertyGroupLi.removeClass("nonSelectedGroupTab clickable");
$propertyGroupLi.addClass("selectedGroupTab clickable");
}
if ( $propertyGroupLi.text() == i18nStringsTabs.viewAllCapitalized ) {
if ( $propertyGroupLi.attr("groupname") == "viewAll" ) {
processViewAllTab();
}
else {

5
productMods/templates/freemarker/body/individual/individual--foaf-person-2column.ftl
View file

@ -161,6 +161,11 @@ var i18nStrings = {
showMoreContent: '${i18n().show_more_content}',
verboseTurnOff: '${i18n().verbose_turn_off}'
};
var i18nStringsUriRdf = {
shareProfileUri: '${i18n().share_profile_uri}',
viewRDFProfile: '${i18n().view_profile_in_rdf}',
closeString: '${i18n().close}'
};
</script>
${stylesheets.add('<link rel="stylesheet" href="${urls.base}/css/individual/individual.css" />',

5
productMods/templates/freemarker/body/individual/individual--foaf-person-quickview.ftl
View file

@ -207,6 +207,11 @@ var i18nStrings = {
showMoreContent: '${i18n().show_more_content}',
verboseTurnOff: '${i18n().verbose_turn_off}'
};
var i18nStringsUriRdf = {
shareProfileUri: '${i18n().share_profile_uri}',
viewRDFProfile: '${i18n().view_profile_in_rdf}',
closeString: '${i18n().close}'
};
</script>
<#if editable>
<script>

5
themes/wilma/templates/individual--foaf-person.ftl
View file

@ -123,6 +123,11 @@
showMoreContent: '${i18n().show_more_content}',
verboseTurnOff: '${i18n().verbose_turn_off}',
};
var i18nStringsUriRdf = {
shareProfileUri: '${i18n().share_profile_uri}',
viewRDFProfile: '${i18n().view_profile_in_rdf}',
closeString: '${i18n().close}'
};
</script>
${stylesheets.add('<link rel="stylesheet" href="${urls.base}/css/individual/individual.css" />',