Revision f95bf1b1
Added by Andreas Kohlbecker over 3 years ago
| modules/cdm_dataportal/includes/descriptions.inc | ||
|---|---|---|
| 851 | 851 |
*/ |
| 852 | 852 |
$block->content[] = markup_to_render_array(theme('cdm_footnotes', array('footnoteListKey' => PSEUDO_FEATURE_BIBLIOGRAPHY . '-' . $feature_node->term->uuid)));
|
| 853 | 853 |
$block->content[] = markup_to_render_array(theme('cdm_footnotes', array('footnoteListKey' => $feature_node->term->uuid)));
|
| 854 |
$block->content[] = markup_to_render_array(theme('cdm_annotation_footnotes', array('footnoteListKey' => $feature_node->term->uuid)));
|
|
| 854 |
$block->content[] = markup_to_render_array(cdm_annotation_footnotes($feature_node->term->uuid));
|
|
| 855 | 855 |
} |
| 856 | 856 |
} // END all other features |
| 857 | 857 |
|
| ... | ... | |
| 1150 | 1150 |
|
| 1151 | 1151 |
$block->content[] = markup_to_render_array(theme('cdm_footnotes', array('footnoteListKey' => 'BIBLIOGRAPHY-' . UUID_DISTRIBUTION)));
|
| 1152 | 1152 |
$block->content[] = markup_to_render_array(theme('cdm_footnotes', array('footnoteListKey' => UUID_DISTRIBUTION)));
|
| 1153 |
$block->content[] = markup_to_render_array(theme('cdm_annotation_footnotes', array('footnoteListKey' => UUID_DISTRIBUTION)));
|
|
| 1153 |
$block->content[] = markup_to_render_array(cdm_annotation_footnotes(UUID_DISTRIBUTION));
|
|
| 1154 | 1154 |
|
| 1155 | 1155 |
return $block; |
| 1156 | 1156 |
} |
| ... | ... | |
| 1774 | 1774 |
|
| 1775 | 1775 |
$footnotes = theme('cdm_footnotes', array('footnoteListKey' => 'BIBLIOGRAPHY-' . $footnote_key_suggestion));
|
| 1776 | 1776 |
$footnotes .= theme('cdm_footnotes', array('footnoteListKey' => $footnote_key_suggestion)); // FIXME is this needed at all?
|
| 1777 |
$footnotes .= theme('cdm_annotation_footnotes', array('footnoteListKey' => $footnote_key_suggestion));
|
|
| 1777 |
$footnotes .= cdm_annotation_footnotes($footnote_key_suggestion);
|
|
| 1778 | 1778 |
|
| 1779 | 1779 |
return markup_to_render_array( // FIXME markup_to_render_array should no longer be needed |
| 1780 | 1780 |
'<div class="common-taxon-name">' . $common_name_out . '</div>' |
| modules/cdm_dataportal/includes/taxon.inc | ||
|---|---|---|
| 210 | 210 |
} |
| 211 | 211 |
|
| 212 | 212 |
$footnotes = theme('cdm_footnotes', array('footnoteListKey' => $footnote_list_key, 'enclosingTag' => 'li'));
|
| 213 |
$footnotes .= theme('cdm_annotation_footnotes', array('footnoteListKey' => $footnote_list_key, 'enclosingTag' => 'li'));
|
|
| 213 |
$footnotes .= cdm_annotation_footnotes($footnote_list_key,'li');
|
|
| 214 | 214 |
|
| 215 | 215 |
$out .= '<ul class="footnotes">' . $footnotes . '</ul>'; |
| 216 | 216 |
$out .= '</div>'; |
| modules/cdm_dataportal/theme/cdm_dataportal.common.theme | ||
|---|---|---|
| 181 | 181 |
* @todo Please document this function. |
| 182 | 182 |
* @see http://drupal.org/node/1354 |
| 183 | 183 |
*/ |
| 184 |
function theme_cdm_annotation_footnotes($variables) {
|
|
| 185 |
$footnoteListKey = $variables['footnoteListKey']; |
|
| 186 |
$enclosingTag = $variables['enclosingTag']; |
|
| 184 |
function theme_cdm_annotation_footnotes($footnoteListKey = null, $enclosingTag = span) {
|
|
| 187 | 185 |
if (variable_get('cdm_dataportal_annotations_footnotes', CDM_DATAPORTAL_ALL_FOOTNOTES)) {
|
| 188 | 186 |
return ''; |
| 189 | 187 |
} |
| modules/cdm_dataportal/theme/cdm_dataportal.descriptions.theme | ||
|---|---|---|
| 330 | 330 |
$out .= '</li>'; |
| 331 | 331 |
} |
| 332 | 332 |
$out .= '</ul>'; |
| 333 |
$out .= theme("cdm_annotation_footnotes", array('footnoteListKey' => RenderHints::getRenderPath()));
|
|
| 333 |
$out .= cdm_annotation_footnotes(RenderHints::getRenderPath());
|
|
| 334 | 334 |
RenderHints::popFromRenderStack(); |
| 335 | 335 |
|
| 336 | 336 |
return $out; |
| modules/cdm_dataportal/theme/cdm_dataportal.name.theme | ||
|---|---|---|
| 59 | 59 |
|
| 60 | 60 |
// ------- footnotes ------- // |
| 61 | 61 |
$out .= '<ul class="footnotes">'; |
| 62 |
$out .= theme('cdm_annotation_footnotes', array('footnoteListKey' => RenderHints::getFootnoteListKey(), 'enclosingTag' => 'li'));
|
|
| 62 |
$out .= cdm_annotation_footnotes(RenderHints::getFootnoteListKey(), 'li');
|
|
| 63 | 63 |
$out .= theme('cdm_footnotes', array('footnoteListKey' => RenderHints::getFootnoteListKey(), 'enclosingTag' => 'li'));
|
| 64 | 64 |
$out .= '</ul>'; |
| 65 | 65 |
|
| ... | ... | |
| 124 | 124 |
// all foonotes of the homotypic group and also of the accepted taxon are |
| 125 | 125 |
// rendered here, both should have the same footnote key |
| 126 | 126 |
$out .= '<ul class="footnotes">'; |
| 127 |
$out .= theme('cdm_annotation_footnotes', array('footnoteListKey' => RenderHints::getFootnoteListKey(), 'enclosingTag' => 'li'));
|
|
| 127 |
$out .= cdm_annotation_footnotes(RenderHints::getFootnoteListKey(), 'li');
|
|
| 128 | 128 |
$out .= theme('cdm_footnotes', array('footnoteListKey' => RenderHints::getFootnoteListKey(), 'enclosingTag' => 'li'));
|
| 129 | 129 |
$out .= '</ul>'; |
| 130 | 130 |
|
| modules/cdm_dataportal/theme/theme_registry.inc | ||
|---|---|---|
| 38 | 38 |
|
| 39 | 39 |
// Themes in cdm_dataportal.common.theme. |
| 40 | 40 |
'cdm_entities_annotations_as_footnotekeys' => array('variables' => array('cdmBase_list' => NULL, 'footnote_list_key' => NULL)),
|
| 41 |
'cdm_annotation_footnotes' => array('variables' => array('footnoteListKey' => NULL, 'enclosingTag' => 'span')),
|
|
| 42 | 41 |
'cdm_annotation_content' => array('variables' => array('AnnotationTO' => NULL)),
|
| 43 | 42 |
'cdm_list_of_annotations' => array('variables' => array('annotationElements' => NULL)),
|
| 44 | 43 |
'cdm_footnote_key' => array('variables' => array(
|
Also available in: Unified diff
ref #8543 refactoring theme_cdm_annotation_footnotes to normal function