Project

General

Profile

« Previous | Next » 

Revision 7fc77599

Added by Francisco Revilla almost 14 years ago

also published in, taxon_name_descriptions ticket #403 and
diptera footnotes layout

View differences:

modules/cdm_dataportal/classes/footnotemanager.php
63 63
      if(!$object){
64 64
      	return false;
65 65
      }
66
    	
66

  
67 67
      if(!array_key_exists($footnoteListKey, self::$fnstore)){
68 68
          self::$fnstore[$footnoteListKey] = array();
69 69
      }
modules/cdm_dataportal/theme/cdm_dataportal.common.theme
118 118
	        foreach($annotationPager->records as $annotation){
119 119
		        $footnoteKey = FootnoteManager::addNewFootnote(RenderHints::getFootnoteListKey() . '-annotations', $annotation->text);
120 120
		        $out .=  theme('cdm_footnote_key', $footnoteKey, RenderHints::getFootnoteListKey() . '-annotations', (isset($out)? ',' : ''));
121
		        
122
//		        var_dump(RenderHints::getFootnoteListKey());
123
//		        var_dump(RenderHints::getRenderPath());
124
//	        	$footnoteKey = FootnoteManager::addNewFootnote(RenderHints::getRenderPath() . '-annotations', $annotation->text);
125
//            $out .=  theme('cdm_footnote_key', $footnoteKey, RenderHints::getRenderPath() . '-annotations', (isset($out)? ',' : ''));
121 126
	        }   
122 127
        }
123 128
    }
modules/cdm_dataportal/theme/cdm_dataportal.descriptions.theme
185 185
    if ($name_used_in_source_link_to_show && ($description || $sourceRefs)){
186 186
    	$out .= ': ';
187 187
    }
188
     $out .= $description . $sourceRefs . '</li>';
188
     $out .= $description . $sourceRefs . theme('cdm_annotations_as_footnotekeys', $element) . '</li>';   
189 189
  }else{
190 190
    $out = $description . $sourceRefs . ' (name in source: '. $name_used_in_source_link_to_show . ')';
191
    $out .= theme('cdm_annotations_as_footnotekeys', $element);
191 192
  }
192 193
  
193 194
  // add annotations as footnote key
194
  $out .= theme('cdm_annotations_as_footnotekeys', $element);
195
  //$out .= theme('cdm_annotations_as_footnotekeys', $element); move above
196

  
195 197
  return $out;
196 198
}
197 199

  
......
240 242
	// take the feature of the last $descriptionElement
241 243
	$feature = $descriptionElement->feature;
242 244
	$out = theme('cdm_descriptionElementArray', $outArray, $feature, $glue, $sortOutArray, $enclosingHtml);
243
	
244
    RenderHints::popFromRenderStack();
245
    
245

  
246
  RenderHints::popFromRenderStack();
247
   
246 248
	return $out;
247 249
}
248 250

  
modules/cdm_dataportal/theme/cdm_dataportal.name.theme
396 396
		foreach($descriptions as $description){
397 397
			if(!empty($description)){
398 398
				foreach($description->elements as $description_element){
399
				  $second_citation = '';
400
					if ($description_element->multilanguageText_L10n->text){
401
					  $second_citation = '[& ' . $description_element->multilanguageText_L10n->text . '].';
402
					}
403
					$descriptionHtml .= $second_citation;
399 404
					$descriptionHtml .= theme("cdm_media", $description_element, array('application/pdf', 'image/png', 'image/jpeg', 'image/gif', 'text/html'));
400 405
				}
401 406
			}

Also available in: Unified diff