Revision 6f5c7f2a
Added by Andreas Kohlbecker about 9 years ago
| 7.x/themes/palmweb_2/template.php | ||
|---|---|---|
| 183 | 183 |
|
| 184 | 184 |
|
| 185 | 185 |
if ($text_data_out_array && variable_get(DISTRIBUTION_TEXTDATA_DISPLAY_ON_TOP, 0)) {
|
| 186 |
$block->content .= compose_cdm_feature_block_elements(
|
|
| 186 |
$tmp_render_array = compose_cdm_feature_block_elements(
|
|
| 187 | 187 |
$text_data_out_array, |
| 188 | 188 |
$node->feature, |
| 189 | 189 |
$text_data_glue, |
| 190 | 190 |
$text_data_sort, |
| 191 | 191 |
$text_data_enclosingTag |
| 192 | 192 |
); |
| 193 |
|
|
| 194 |
$block->content .= $tmp_render_array['#markup']; |
|
| 193 | 195 |
} |
| 194 | 196 |
|
| 195 | 197 |
// --- Distribution map |
| ... | ... | |
| 225 | 227 |
|
| 226 | 228 |
} |
| 227 | 229 |
// |
| 228 |
$block->content .= compose_cdm_feature_block_elements( |
|
| 230 |
|
|
| 231 |
$tmp_render_array = compose_cdm_feature_block_elements( |
|
| 229 | 232 |
$dto_out_array, |
| 230 | 233 |
$node->feature, |
| 231 | 234 |
$distribution_glue, |
| 232 | 235 |
$distribution_sortOutArray, |
| 233 | 236 |
$distribution_enclosingTag |
| 234 | 237 |
); |
| 238 |
$block->content .= $tmp_render_array['#markup']; |
|
| 235 | 239 |
} |
| 236 | 240 |
|
| 237 | 241 |
// --- TextData at the bottom |
| 238 | 242 |
if ($text_data_out_array && !variable_get(DISTRIBUTION_TEXTDATA_DISPLAY_ON_TOP, 0)) {
|
| 239 |
$block->content .= compose_cdm_feature_block_elements(
|
|
| 243 |
$tmp_render_array = compose_cdm_feature_block_elements(
|
|
| 240 | 244 |
$text_data_out_array, |
| 241 | 245 |
$node->feature, |
| 242 | 246 |
$text_data_glue, |
| 243 | 247 |
$text_data_sort, |
| 244 | 248 |
$text_data_enclosingTag |
| 245 | 249 |
); |
| 250 |
$block->content .= $tmp_render_array['#markup']; |
|
| 246 | 251 |
} |
| 247 | 252 |
|
| 248 | 253 |
} |
| ... | ... | |
| 262 | 267 |
// $block->content .= theme('cdm_descriptionElements', $node->descriptionElements, $node->feature->uuid, $taxon->uuid),
|
| 263 | 268 |
} |
| 264 | 269 |
else {
|
| 265 |
$block->content .= theme('cdm_descriptionElements', array(
|
|
| 266 |
'descriptionElements' => $node->descriptionElements, |
|
| 267 |
'featureUuid' => $node->feature->uuid, |
|
| 268 |
'taxon_uuid' => $taxon->uuid, |
|
| 269 |
)); |
|
| 270 |
$block->content .= compose_cdm_descriptionElements($node->descriptionElements, $node->feature->uuid, $taxon->uuid); |
|
| 270 | 271 |
|
| 271 | 272 |
/* |
| 272 | 273 |
Content/ALL OTHER FEATURES/Subordinate Features |
Also available in: Unified diff
fixing #1933 (DescriptionElementBases do not show annotation footnotes in flora malesiana portal)