Project

General

Profile

« Previous | Next » 

Revision a20ddbc4

Added by Andreas Kohlbecker over 7 years ago

fix #6288 common names area and language label in one common dom element

View differences:

modules/cdm_dataportal/includes/descriptions.inc
1471 1471
        // common name without a language or area, should not happen but is possible
1472 1472
        $language_area_key = '';
1473 1473
        if (isset($element->language->representation_L10n)) {
1474
          $language_area_key .= '<span class="language-label">' . $element->language->representation_L10n . '</span>';
1474
          $language_area_key .= $element->language->representation_L10n ;
1475 1475
        }
1476 1476
        if(isset($element->area->titleCache) && strlen($element->area->titleCache) > 0){
1477 1477
          $language_area_key .= ($language_area_key ? ' '  : '') . '(' . $element->area->titleCache . ')';
1478 1478
        }
1479
        if($language_area_key){
1480
          $language_area_key = '<span class="language-area-label">' . $language_area_key . '<span class="separator">: </span></span>';
1481
        }
1479 1482

  
1480 1483
        if(isset($common_names[$language_area_key][$element->name])) {
1481 1484
          // same name already exists for language and area combination, se we merge the description elements
......
1515 1518
        $per_language_area_out[] = $common_name_markup;
1516 1519
      }
1517 1520

  
1518
      $common_name_feature_elements[] = ($language_area_key ? $language_area_key . ': ' : '' ) . join(', ', $per_language_area_out);
1521
      $common_name_feature_elements[] = $language_area_key . join(', ', $per_language_area_out);
1519 1522
    } // End of loop over set of elements per language area
1520 1523

  
1521 1524

  

Also available in: Unified diff