瀏覽代碼

Added Stock Phenotypes theme

spficklin 12 年之前
父節點
當前提交
31c427a366
共有 2 個文件被更改,包括 20 次插入2 次删除
  1. 1 2
      tripal_feature/includes/gff_loader.inc
  2. 19 0
      tripal_stock/tripal_stock.module

+ 1 - 2
tripal_feature/includes/gff_loader.inc

@@ -221,8 +221,7 @@ function tripal_feature_load_gff3($gff_file, $organism_id, $analysis_id,
     $dfile = $gff_file;
   }
   if (!file_exists($dfile)) {
-    watchdog('T_gff3_loader',"Cannot find the file: %dfile", 
-      array($dfile), WATCHDOG_ERROR);
+    watchdog('T_gff3_loader',"Cannot find the file: %dfile", array($dfile), WATCHDOG_ERROR);
     return 0;
   }
 

+ 19 - 0
tripal_stock/tripal_stock.module

@@ -273,6 +273,15 @@ function tripal_stock_theme() {
        'arguments' => array('node' => NULL),
        'template' => 'tripal_stock_collections',
     ),
+    'tripal_stock_collections' => array(
+       'arguments' => array('node' => NULL),
+       'template' => 'tripal_stock_collections',
+    ),
+    'tripal_stock_phenotypes' => array(
+       'arguments' => array('node' => NULL),
+       'template' => 'tripal_stock_phenotypes',
+    ),
+    
     
     'tripal_organism_stocks' => array(
        'arguments' => array('node' => NULL),
@@ -870,8 +879,13 @@ function tripal_stock_block($op = 'list', $delta = 0, $edit=array()) {
       $blocks['collections']['info'] = t('Tripal Stock Collections');
       $blocks['collections']['cache'] = BLOCK_NO_CACHE;
       
+      $blocks['phenotypes']['info'] = t('Tripal Stock Phenotypes');
+      $blocks['phenotypes']['cache'] = BLOCK_NO_CACHE;
+      
       $blocks['orgstocks']['info'] = t('Tripal Organism Stocks');
       $blocks['orgstocks']['cache'] = BLOCK_NO_CACHE;
+      
+      
 
       return $blocks;
 
@@ -912,6 +926,11 @@ function tripal_stock_block($op = 'list', $delta = 0, $edit=array()) {
           $block['content'] = theme('tripal_stock_collections', $node);
           break;
           
+        case 'phenotypes':
+          $block['subject'] = t('Stock Phenotypes');
+          $block['content'] = theme('tripal_stock_phenotypes', $node);
+          break;
+          
         case 'orgstocks':
           $block['subject'] = t('Organism Stocks');
           $block['content'] = theme('tripal_organism_stocks', $node);