Project

General

Profile

« Previous | Next » 

Revision 38e46518

Added by Andreas Kohlbecker over 12 years ago

bugfix for #2679 (Improve Concept Relationships for Dataportal) and removing whitespace before nom status

View differences:

5.x/modules/cdm_dataportal/cdm_dataportal.install
43 43
 *    2 digits for sequential counting starting with 00
44 44
 * The 2nd digit should be 0 for initial porting of your module to a new Drupal core API.
45 45
 *
46
 * Update 1 for version 5.x-1.0
46
 * Update 2 for version 5.x-1.0
47 47
 */
48 48
function cdm_dataportal_update_5102() {
49 49
  $items = array();
......
61 61
  return $items;
62 62
}
63 63

  
64
/**
65
 * Implementation of hook_api_update_N().
66
 *
67
 * Database updates consist of 3 parts:
68
 *    1 digit for Drupal core compatibility
69
 *    1 digit for your module's major release version (e.g. is this the 5.x-1.* (1) or 5.x-2.* (2) series of your module?)
70
 *    2 digits for sequential counting starting with 00
71
 * The 2nd digit should be 0 for initial porting of your module to a new Drupal core API.
72
 *
73
 * Update 1 for version 5.x-3.0
74
 */
75
function cdm_dataportal_update_5301() {
76
  $items = array();
77
  // add new default to
78
  $annotation_types_filter = variable_get('annotations_types_as_footnotes', FALSE);
79
  if($annotation_types_filter) {
80
    $annotation_types_filter['NULL_VALUE'] = 'NULL_VALUE';
81
  }
82
  $items[] = _modify_variable('annotations_types_as_footnotes', $annotation_types_filter);
83
  return $items;
84
}
85

  
64 86
// ------------------------- SQL  Scripts ------------------------ //
65 87

  
66 88

  
5.x/modules/cdm_dataportal/cdm_dataportal.module
577 577
  // listing of blocks, such as on the admin/block page
578 578
  if ($op == "list") {
579 579
    //$block[0]["info"] = t("CDM DataPortal DevLinks");
580
    //		$block[1]["info"] = t("CDM DataPortal Credits");
580
    //$block[1]["info"] = t("CDM DataPortal Credits");
581 581
    $block[2]["info"] = t("CDM Search Taxa");
582 582
    //$block[3]["info"] = t("CDM Filters");
583 583
    $block[4]["info"] = t("CDM Dataportal Print");
5.x/modules/cdm_dataportal/theme/cdm_dataportal.common.theme
161 161
  if (variable_get('cdm_dataportal_annotations_footnotes', CDM_DATAPORTAL_ALL_FOOTNOTES)){
162 162
    return '';
163 163
  }
164
  $out = '';
164 165
  $footNoteKeys = cdm_annotations_as_footnotekeys($cdmBase_list, $footnote_list_key);
165 166
  foreach($footNoteKeys as $a){
166 167
    //$out .=  theme('cdm_footnote_key', $a, $a->footnoteListKey, (isset($out)? ',' : ''));
167
    $out .=  theme('cdm_footnote_key', $a, (isset($out)? ',' : ''));
168
    $out .=  theme('cdm_footnote_key', $a, ($out ? ',' : ''));
168 169
  }
169 170
  return $out;
170 171
}
5.x/modules/cdm_dataportal/theme/cdm_dataportal.name.theme
633 633
					$statusHtml .= ', '.$status->type->representation_L10n_abbreviatedLabel;
634 634
				}
635 635
			}
636
			array_setr('status', ' <span class="nomenclatural_status">'.$statusHtml.'</span>', $renderTemplate);
636
			array_setr('status', '<span class="nomenclatural_status">'.$statusHtml.'</span>', $renderTemplate);
637 637
		}
638 638
	}
639 639

  
5.x/modules/cdm_dataportal/theme/cdm_dataportal.taxon.theme
383 383
  $out_taxon_part .= theme('cdm_annotations_as_footnotekeys', array($taxon->name, $taxon), $footnoteListKey);
384 384

  
385 385
  if($showSecReference) {
386
    $out_taxon_part .= ' sensu ' . theme('cdm_reference',  $taxon->sec);
386
    $out_taxon_part .= ' sec. ' . theme('cdm_reference',  $taxon->sec);
387 387
  }
388 388

  
389 389

  

Also available in: Unified diff