Revision d8069342
Added by Andreas Kohlbecker over 2 years ago
| modules/cdm_dataportal/includes/name.inc | ||
|---|---|---|
| 580 | 580 |
} |
| 581 | 581 |
$out .= '</span>'; |
| 582 | 582 |
if ($show_annotations) {
|
| 583 |
// $out .= theme('cdm_entities_annotations_as_footnotekeys', $taxonName);
|
|
| 583 |
// $out .= render_entities_annotations_as_footnote_keys([$taxonName]);
|
|
| 584 | 584 |
} |
| 585 | 585 |
return $out; |
| 586 | 586 |
} |
| ... | ... | |
| 984 | 984 |
// footnotes should be rendered in the parent element so we |
| 985 | 985 |
// are relying on the FootnoteListKey set there |
| 986 | 986 |
$_fkey2 = FootnoteManager::addNewFootnote(RenderHints::getFootnoteListKey(), $citation_footnote_str); |
| 987 |
$footnote_key_markup = cdm_footnote_key($_fkey2, $separator, TRUE);
|
|
| 987 |
$footnote_key_markup = render_footnote_key($_fkey2, $separator, TRUE);
|
|
| 988 | 988 |
} |
| 989 | 989 |
|
| 990 | 990 |
$type_citation_markup .= ' (' . t('designated by') . ' <span class="typeReference">' . $authorteam_str . '</span>';
|
| ... | ... | |
| 1064 | 1064 |
RenderHints::getFootnoteListKey(), |
| 1065 | 1065 |
(isset($derivedUnitFacadeInstance->collection->titleCache) ? $derivedUnitFacadeInstance->collection->titleCache : FALSE) |
| 1066 | 1066 |
); |
| 1067 |
$out .= cdm_footnote_key($_fkey, $separator);
|
|
| 1067 |
$out .= render_footnote_key($_fkey, $separator);
|
|
| 1068 | 1068 |
$out .= '</' . $enclosing_tag .'>'; |
| 1069 | 1069 |
|
| 1070 | 1070 |
RenderHints::popFromRenderStack(); |
| ... | ... | |
| 1435 | 1435 |
|
| 1436 | 1436 |
RenderHints::popFromRenderStack(); |
| 1437 | 1437 |
if(RenderHints::getFootnoteListKey() == $key) {
|
| 1438 |
$render_array['footnotes'] = markup_to_render_array(cdm_footnotes(RenderHints::getFootnoteListKey()));
|
|
| 1438 |
$render_array['footnotes'] = markup_to_render_array(render_footnotes(RenderHints::getFootnoteListKey()));
|
|
| 1439 | 1439 |
RenderHints::clearFootnoteListKey(); |
| 1440 | 1440 |
} |
| 1441 | 1441 |
return $render_array; |
| ... | ... | |
| 1590 | 1590 |
} |
| 1591 | 1591 |
if ($footnote_markup) {
|
| 1592 | 1592 |
$fnkey = FootnoteManager::addNewFootnote(RenderHints::getFootnoteListKey(), $footnote_markup); |
| 1593 |
$footnote_key_markup = cdm_footnote_key($fnkey,',',TRUE);
|
|
| 1593 |
$footnote_key_markup = render_footnote_key($fnkey,',',TRUE);
|
|
| 1594 | 1594 |
} |
| 1595 | 1595 |
return $footnote_key_markup; |
| 1596 | 1596 |
} |
| ... | ... | |
| 1622 | 1622 |
} |
| 1623 | 1623 |
if ($footnote_markup) {
|
| 1624 | 1624 |
$fnkey = FootnoteManager::addNewFootnote(RenderHints::getFootnoteListKey(), $footnote_markup); |
| 1625 |
$footnote_key_markup = cdm_footnote_key($fnkey, ',',TRUE);
|
|
| 1625 |
$footnote_key_markup = render_footnote_key($fnkey, ',',TRUE);
|
|
| 1626 | 1626 |
} |
| 1627 | 1627 |
return $footnote_key_markup; |
| 1628 | 1628 |
} |
| ... | ... | |
| 1990 | 1990 |
// footnotes should be rendered in the parent element so we |
| 1991 | 1991 |
// are relying on the FootnoteListKey set there |
| 1992 | 1992 |
$fkey_typeDesignation = FootnoteManager::addNewFootnote(RenderHints::getFootnoteListKey(), $typeDesignation->citation->titleCache); |
| 1993 |
$res .= cdm_footnote_key($fkey_typeDesignation, $footnote_separator,TRUE) . ')';
|
|
| 1993 |
$res .= render_footnote_key($fkey_typeDesignation, $footnote_separator,TRUE) . ')';
|
|
| 1994 | 1994 |
} |
| 1995 | 1995 |
return $res; |
| 1996 | 1996 |
} |
Also available in: Unified diff
ref #8543 further harmonizing footnote functions