Project

General

Profile

« Previous | Next » 

Revision 7ea461ec

Added by Alex Theys almost 12 years ago

AT: Committing Uses dataportal interface changes

View differences:

5.x/modules/cdm_dataportal/cdm_dataportal.module
582 582
    //$block[3]["info"] = t("CDM Filters");
583 583
    $block[4]["info"] = t("CDM Dataportal Print");
584 584
    $block["keys"]["info"] = t("CDM identification keys");
585
<<<<<<< .working
586 585
    $block["uses"]["info"] = t("CDM Uses");
587
=======
588 586
    $block["fundedByEDIT"]["info"] = t('Funded by EDIT');
589
>>>>>>> .merge-right.r14872
587

  
590 588
    return $block;
591 589
  }
592 590
  else if ($op == 'view') {
......
610 608
        $block['subject'] = t('Identification Keys');
611 609
        $block['content'] = theme('cdm_block_IdentificationKeys');
612 610
        return $block;
613
<<<<<<< .working
614 611
      //Creating a block specific for the Use Interface.
615 612
      case "uses":
616 613
      	$block['subject'] = t('Uses');
617 614
        $block['content'] = theme('cdm_block_uses');
618 615
        return $block;
619
=======
620 616
      case "fundedByEDIT":
621 617
        $text = '<none>'; //t('Funded by EDIT');
622 618
        $block['subject'] = $text;
623 619
        $img_tag = '<img src="' . drupal_get_path('module', 'cdm_dataportal').'/images/funded_by_EDIT.png' . '" alt="'.$text.'"/>';
624 620
        $block['content'] = l($img_tag, "http://www.e-taxonomy.eu/", array("target"=>"EDIT"), NULL, NULL, TRUE, TRUE);
625 621
        return $block;
626
>>>>>>> .merge-right.r14872
627 622
    }
628 623
  }
629 624
}

Also available in: Unified diff