Revision d8069342
Added by Andreas Kohlbecker over 2 years ago
modules/cdm_dataportal/includes/descriptions.inc | ||
---|---|---|
527 | 527 |
} // END of loop over sources |
528 | 528 |
|
529 | 529 |
// annotations footnotes separate from sources |
530 |
$annotations_and_sources['foot_note_keys'] = footnote_keys_to_markup(
|
|
530 |
$annotations_and_sources['foot_note_keys'] = render_footnote_keys(
|
|
531 | 531 |
cdm_entity_annotations_as_footnote_keys($entity, $footnote_list_key_suggestion), ', ' |
532 | 532 |
); |
533 | 533 |
|
... | ... | |
535 | 535 |
|
536 | 536 |
// footnotes for sources and annotations or put into into bibliography if requested ... |
537 | 537 |
if ($config['add_footnote_keys'] == 1) { |
538 |
$annotations_and_sources['foot_note_keys'] = cdm_entity_footnotes(
|
|
538 |
$annotations_and_sources['foot_note_keys'] = render_entity_footnotes(
|
|
539 | 539 |
$entity, ',', |
540 | 540 |
$footnote_list_key_suggestion, |
541 | 541 |
$config['link_to_reference'] == 1, |
... | ... | |
736 | 736 |
/* |
737 | 737 |
* Footnotes for the feature block |
738 | 738 |
*/ |
739 |
$block->content[] = markup_to_render_array(cdm_footnotes(PSEUDO_FEATURE_BIBLIOGRAPHY . '-' . $feature_node->term->uuid));
|
|
740 |
$block->content[] = markup_to_render_array(cdm_footnotes($feature_node->term->uuid));
|
|
741 |
$block->content[] = markup_to_render_array(cdm_annotation_footnotes($feature_node->term->uuid));
|
|
739 |
$block->content[] = markup_to_render_array(render_footnotes(PSEUDO_FEATURE_BIBLIOGRAPHY . '-' . $feature_node->term->uuid));
|
|
740 |
$block->content[] = markup_to_render_array(render_footnotes($feature_node->term->uuid));
|
|
741 |
$block->content[] = markup_to_render_array(render_annotation_footnotes($feature_node->term->uuid));
|
|
742 | 742 |
} |
743 | 743 |
} // END all other features |
744 | 744 |
|
... | ... | |
1035 | 1035 |
); |
1036 | 1036 |
} |
1037 | 1037 |
|
1038 |
$block->content[] = markup_to_render_array(cdm_footnotes('BIBLIOGRAPHY-' . UUID_DISTRIBUTION));
|
|
1039 |
$block->content[] = markup_to_render_array(cdm_footnotes(UUID_DISTRIBUTION));
|
|
1040 |
$block->content[] = markup_to_render_array(cdm_annotation_footnotes(UUID_DISTRIBUTION));
|
|
1038 |
$block->content[] = markup_to_render_array(render_footnotes('BIBLIOGRAPHY-' . UUID_DISTRIBUTION));
|
|
1039 |
$block->content[] = markup_to_render_array(render_footnotes(UUID_DISTRIBUTION));
|
|
1040 |
$block->content[] = markup_to_render_array(render_annotation_footnotes(UUID_DISTRIBUTION));
|
|
1041 | 1041 |
|
1042 | 1042 |
return $block; |
1043 | 1043 |
} |
... | ... | |
1659 | 1659 |
$text_data_out, $feature |
1660 | 1660 |
); |
1661 | 1661 |
|
1662 |
$footnotes = cdm_footnotes('BIBLIOGRAPHY-' . $footnote_key_suggestion);
|
|
1663 |
$footnotes .= cdm_footnotes($footnote_key_suggestion); // FIXME is this needed at all?
|
|
1664 |
$footnotes .= cdm_annotation_footnotes($footnote_key_suggestion);
|
|
1662 |
$footnotes = render_footnotes('BIBLIOGRAPHY-' . $footnote_key_suggestion);
|
|
1663 |
$footnotes .= render_footnotes($footnote_key_suggestion); // FIXME is this needed at all?
|
|
1664 |
$footnotes .= render_annotation_footnotes($footnote_key_suggestion);
|
|
1665 | 1665 |
|
1666 | 1666 |
return markup_to_render_array( // FIXME markup_to_render_array should no longer be needed |
1667 | 1667 |
'<div class="common-taxon-name">' . $common_name_out . '</div>' |
Also available in: Unified diff
ref #8543 further harmonizing footnote functions