Project

General

Profile

« Previous | Next » 

Revision cf4b9055

Added by Andreas Kohlbecker about 5 years ago

ref #6329 fixing bug in proxy_content() which could affect the display of sources and annotations in media galleries

View differences:

modules/cdm_dataportal/cdm_api/cdm_api.module
813 813
            break;
814 814

  
815 815
        case 'cdm_media_caption':
816
          $variables = array(
817
            'media' => $obj,
818
            // $args[0] is set in taxon_image_gallery_default in
819
            // cdm_dataportal.page.theme.
820
            'elements' => isset($args[0]) ? $args[0] : array(
821
            'title',
822
            'description',
823
            'artist',
824
            'location',
825
            'rights',
826
          ),
827
            'sources_as_content' =>  isset($args[1]) ? $args[1] : FALSE
828
          );
816
          $variables = $arg;
817
          $variables['media'] = $obj;
818

  
829 819
          $reponse_data = theme($hook, $variables);
830 820
          break;
831 821

  
modules/cdm_dataportal/includes/media.inc
505 505
 * @param $maxExtend
506 506
 * @param $addPassePartout
507 507
 * @param $attributes
508
 *   An array of attributes for the img tag.
508 509
 * @return string
509 510
 *   The markup for the media representation
510 511
 */
......
593 594
    if ($addPassePartout) {
594 595
      $out .= '<div class="image-passe-partout" style="width:' . $maxExtend . 'px; height:' . $maxExtend . 'px;">';
595 596
    }
596
    $out .= '<div class="application">Web Application</div>';
597
    $out .= '<div class="application">Link to external media resource or web application</div>';
597 598

  
598 599
    if ($addPassePartout) {
599 600
      $out .= '</div>';
modules/cdm_dataportal/translations/cdm_dataportal.es.po
1774 1774
msgstr ""
1775 1775

  
1776 1776
#: cdm_mediauri/cdm_mediauri.module:285
1777
msgid "Web Application"
1778
msgstr ""
1777
msgid "Link to external media resource or web application"
1778
msgstr "Vínculo – servidor de multimedia externo"
1779 1779

  
1780 1780
#: cdm_mediauri/cdm_mediauri.module:287
1781 1781
msgid "The type media representation."

Also available in: Unified diff