Revision d8069342
Added by Andreas Kohlbecker over 2 years ago
| modules/cdm_dataportal/includes/taxon.inc | ||
|---|---|---|
| 145 | 145 |
if($sensu_strings['order_by_key'] != $sensu_reference->titleCache){
|
| 146 | 146 |
$sensu_reference_markup = cdm_reference_markup($sensu_reference); |
| 147 | 147 |
$footnote_key = FootnoteManager::addNewFootnote($footnote_list_key, $sensu_reference_markup); |
| 148 |
$footnote_key = cdm_footnote_key($footnote_key);
|
|
| 148 |
$footnote_key = render_footnote_key($footnote_key);
|
|
| 149 | 149 |
$joined_refs[$ref_key]['markup'] = '<span class="sensu">' . $sensu_strings['markup'] . $footnote_key . '</span>'; |
| 150 | 150 |
} |
| 151 | 151 |
} |
| ... | ... | |
| 209 | 209 |
$out .= '</ul>'; |
| 210 | 210 |
} |
| 211 | 211 |
|
| 212 |
$footnotes = cdm_footnotes($footnote_list_key, 'li');
|
|
| 213 |
$footnotes .= cdm_annotation_footnotes($footnote_list_key,'li');
|
|
| 212 |
$footnotes = render_footnotes($footnote_list_key, 'li');
|
|
| 213 |
$footnotes .= render_annotation_footnotes($footnote_list_key,'li');
|
|
| 214 | 214 |
|
| 215 | 215 |
$out .= '<ul class="footnotes">' . $footnotes . '</ul>'; |
| 216 | 216 |
$out .= '</div>'; |
| ... | ... | |
| 393 | 393 |
$referenceUri = FALSE; |
| 394 | 394 |
} |
| 395 | 395 |
$out_taxon_part = render_taxon_or_name($taxon, $taxonUri, $referenceUri, TRUE, FALSE, $skip_tags, $is_invalid); |
| 396 |
$taxon_footnotes = cdm_entities_annotations_as_footnotekeys([$taxon->name,$taxon], $footnoteListKey);
|
|
| 396 |
$taxon_footnotes = render_entities_annotations_as_footnote_keys([$taxon->name,$taxon], $footnoteListKey);
|
|
| 397 | 397 |
$name_relations = cdm_name_relationships_for_taxon($taxon); |
| 398 | 398 |
$name_relations_render_array = compose_name_relationships_inline($name_relations, $taxon->name->uuid, $taxon->uuid); |
| 399 | 399 |
|
| ... | ... | |
| 435 | 435 |
$referenceUri = url(path_to_reference($synonym->name->nomenclaturalReference->uuid)); |
| 436 | 436 |
} |
| 437 | 437 |
$out .= render_taxon_or_name($synonym->name, NULL, $referenceUri); |
| 438 |
$out .= cdm_entities_annotations_as_footnotekeys($synonym);
|
|
| 438 |
$out .= render_entities_annotations_as_footnote_keys([$synonym]);
|
|
| 439 | 439 |
$out .= '</span>'; |
| 440 | 440 |
} |
| 441 | 441 |
RenderHints::popFromRenderStack(); |
| ... | ... | |
| 566 | 566 |
} |
| 567 | 567 |
$out .= '<span class="classifications"><span class="separator"> : </span>' . implode(', ', $classification_titles) . '</span>';
|
| 568 | 568 |
} |
| 569 |
$out .= cdm_entities_annotations_as_footnotekeys($taxon);
|
|
| 569 |
$out .= render_entities_annotations_as_footnote_keys([$taxon]);
|
|
| 570 | 570 |
if ($showMedia_synonyms) {
|
| 571 | 571 |
$out .= theme('cdm_taxon_list_thumbnails', array('taxon' => $acceptedTaxon));
|
| 572 | 572 |
} |
| ... | ... | |
| 594 | 594 |
} |
| 595 | 595 |
$out .= '<span class="classifications"><span class="separator"> : </span>' . implode(', ', $classification_titles) . '</span>';
|
| 596 | 596 |
} |
| 597 |
$out .= cdm_entities_annotations_as_footnotekeys($taxon);
|
|
| 597 |
$out .= render_entities_annotations_as_footnote_keys([$taxon]);
|
|
| 598 | 598 |
|
| 599 | 599 |
if ($showMedia_taxa) {
|
| 600 | 600 |
$out .= theme('cdm_taxon_list_thumbnails', array('taxon' => $taxon));
|
Also available in: Unified diff
ref #8543 further harmonizing footnote functions