Project

General

Profile

« Previous | Next » 

Revision c2c6e29f

Added by Francisco Revilla over 13 years ago

fixing Ticket #1997

View differences:

modules/cdm_dataportal/theme/cdm_dataportal.common.theme
188 188
}
189 189

  
190 190

  
191
function theme_cdm_footnotes($footnoteListKey, $enclosingTag = 'span'){	
191
function theme_cdm_footnotes($footnoteListKey, $enclosingTag = 'span'){
192 192
	$out = '<'.$enclosingTag.' class="footnotes footnotes-'.$footnoteListKey.' ">' . FootnoteManager::renderFootnoteList($footnoteListKey) . '</'.$enclosingTag.'>';
193 193
	FootnoteManager::removeFootnoteList($footnoteListKey);
194 194
	return $out;
modules/cdm_dataportal/theme/cdm_dataportal.name.theme
280 280
	$footnoteListKey = isset($prependedSynonyms[0]) ? $prependedSynonyms[0]->uuid : (isset($synonymList[0]) ? $synonymList[0]->uuid : 'NULL');
281 281
	$accepted_taxon_footnoteListKey = RenderHints::getFootnoteListKey();
282 282
	RenderHints::setFootnoteListKey($footnoteListKey);
283

  
283
 
284 284
	if(! is_array($synonymList) || count($synonymList) == 0){
285 285
		return;
286 286
	}
......
301 301
	if($typeDesignations){
302 302
		$out .= theme('cdm_typedesignations', $typeDesignations);
303 303
	}
304

  
305
	$out .= theme('cdm_footnotes', $accepted_taxon_footnoteListKey, 'li');
304
  if($accepted_taxon_footnoteListKey){// to avoiding drupal warnings (#1830) why false???
305
  	 $out .= theme('cdm_footnotes', $accepted_taxon_footnoteListKey, 'li');
306
  }
306 307
	$out .= theme('cdm_annotation_footnotes', $footnoteListKey, 'li');
307 308
	$out .= '</ul>';
308 309

  
modules/cdm_dataportal/theme/cdm_dataportal.page.theme
226 226
		$special_annotations_array[] = $taxon->name;
227 227
		$special_annotations_array[] = $taxon;
228 228
		$out .= theme('cdm_annotations_as_footnotekeys',
229
		$special_annotations_array,
230
		RenderHints::getRenderPath() . '-annotations');
231
		RenderHints::setFootnoteListKey(RenderHints::getRenderPath() . '-annotations');
229
		              $special_annotations_array,
230
		              RenderHints::getRenderPath() . '-annotations');
231
		              RenderHints::setFootnoteListKey(RenderHints::getRenderPath() . '-annotations');
232 232
	}
233 233

  
234 234
	//if($addAcceptedTaxon && !isset($synomymie->homotypicSynonymsByHomotypicGroup[0])){
235
	if(!isset($synomymie->homotypicSynonymsByHomotypicGroup[0])){	
235
	if(!isset($synomymie->homotypicSynonymsByHomotypicGroup[0])){
236 236
		// display the type information for the added taxon
237 237
		$typeDesignations = cdm_ws_get(CDM_WS_PORTAL_TAXON_NAMETYPEDESIGNATIONS, $taxon->uuid);
238 238
		if($typeDesignations){

Also available in: Unified diff