Project

General

Profile

« Previous | Next » 

Revision 3daa3743

Added by Andreas Kohlbecker almost 11 years ago

removing out commented code related to #3005, #3006, #3008, #3009, #3010, #3011, #3012

View differences:

7.x/modules/cdm_dataportal/theme/cdm_dataportal.descriptions.theme
1137 1137

  
1138 1138
    $legendFormatQueryStr = "format=image" . urlencode('/') . "png&TRANSPARENT=TRUE";
1139 1139
    $legendFormatQueryStr .= "&WIDTH=" . $legend_url_icon_width . "&HEIGHT=" . $legend_url_icon_height . "&";
1140
    // TODO why is the layer=topp:tdwg_level_4 parameter neede at all here??
1141
    // Comment @WA $sldLegend is not used.
1142
    // $legendFormatQueryStr
1143
    // .="layer=topp".urlencode(':')."tdwg_level_4&LEGEND_OPTIONS=forceLabels".urlencode(':')."on;fontStyle".urlencode(':').$legend_url_font_style.";fontSize".urlencode(':').$legend_url_font_size."&SLD=".urlencode($sldLegend);
1140
    // TODO why is the layer=topp:tdwg_level_4 parameter needed at all here??
1144 1141
    $legendFormatQueryStr .= "layer=topp" . urlencode(':') . "tdwg_level_4&LEGEND_OPTIONS=forceLabels" . urlencode(':') . "on;fontStyle" . urlencode(':') . $legend_url_font_style . ";fontSize" . urlencode(':') . $legend_url_font_size . "&SLD=";
1145 1142

  
1146 1143
    $out .= get_openlayers_map(variable_get('cdm_dataportal_geoservice_display_width', 300), variable_get('cdm_dataportal_geoservice_bounding_box', FALSE), NULL, $query_string, $legendFormatQueryStr, variable_get('cdm_dataportal_geoservice_map_caption', ''));
......
1554 1551
  RenderHints::pushToRenderStack('block_IdentificationKeys');
1555 1552
  $out = '';
1556 1553
  foreach ($types as $type => $label) {
1557
    // @WA $pageNumber is not defined, $pageSize is not used in the theme
1558
    // function
1559
    // $keylist = theme('cdm_list_IdentificationKeys', $type, $taxonUuid,
1560
    // $pageSize, $pageNumber);
1561 1554
    $keylist = theme('cdm_list_IdentificationKeys', array('type' => $type, 'taxonUuid' => $taxonUuid));
1562 1555
    if (!$keylist) {
1563 1556
      continue;
......
1593 1586
  $currentTaxon = cdm_ws_get(CDM_WS_PORTAL_TAXON, $taxonUuid);
1594 1587

  
1595 1588
  foreach ($descriptions as $description) {
1596
    $useSummary = "";
1597
    // Comment @WA: $synonyms is not defined.
1598
    // $serializedSynonyms = serialize($synonyms).
1589
    $useSummary = '';
1599 1590
    foreach ($description->elements as $element) {
1600 1591

  
1601 1592
      if ($element->feature->uuid == UUID_USE && !(strlen($useSummary) > 0)) {
......
1714 1705
  if (!empty($useDescriptions)) {
1715 1706
    // FIXME use theme_block instaed of hardcoding the block html here !!!!
1716 1707
    $out .= '<div id="block-cdm_dataportal-feature-description" class="clear-block block block-cdm_dataportal-feature"><H2><a name="userecords"> </a> Uses </H2>';
1717
    // @WA $pageNumber is not defined
1718
    // $formatUseDescriptions = theme('cdm_UseDescription', $useDescriptions,
1719
    // $taxonUuid, $pageSize, $pageNumber);
1720 1708
    $formatUseDescriptions = theme('cdm_UseDescription', array('description' => $useDescriptions, 'taxonUuid' => $taxonUuid));
1721 1709

  
1722 1710
    $out .= $formatUseDescriptions;

Also available in: Unified diff