Ver código fonte

renamed files to d6 convention (as before my mods) and cleaned up a few include statements

alexgl 13 anos atrás
pai
commit
8e0b13224c

+ 6 - 5
extensions/tripal_analysis_blast/node-chado_analysis_blast.tpl.php

@@ -24,15 +24,16 @@
 <?php
  //uncomment this line to see a full listing of the fields avail. to $node
  //print '<pre>'.print_r($variables,TRUE).'</pre>';
-// drupal_add_css('./tripal-node-templates.css');
-drupal_add_css('./css/tripal-node-templates.css');
-dpm('node -- chado is running' ,'template');
+ //drupal_add_css('./tripal-node-templates.css');
+drupal_add_css(drupal_get_path('theme', 'tripal') . '/tripal-node-templates.css');
+//this makes tripal required as theme-------^  !!!
+                                          
 $node = $variables['node'];
 $organism = $variables['node']->organism;
 ?>
 
 <?php if ($teaser) { 
-  include('tripal_analysis_blast/tripal_analysis_blast_teaser.tpl.php'); 
+	include('templates/tripal_analysis_blast_teaser.tpl.php');
 } else { ?>
 
 <script type="text/javascript">
@@ -84,7 +85,7 @@ if (Drupal.jsEnabled) {
 <div id="tripal_analysis_blast_details" class="tripal_details">
 
    <!-- Basic Details Theme -->
-   <?php include('tripal_analysis_blast/tripal_analysis_blast_base.tpl.php'); dpm('hello', 'hello')?>
+   <?php include('templates/tripal_analysis_blast_base.tpl.php');?>
 
    <?php print $content ?>
 </div>

+ 0 - 1
extensions/tripal_analysis_blast/templates/tripal-analysis-blast-base.tpl.php → extensions/tripal_analysis_blast/templates/tripal_analysis_blast_base.tpl.php

@@ -9,7 +9,6 @@ $analysis = tripal_core_expand_chado_vars($analysis,'field','analysis.descriptio
 $blast = $node->analysis->tripal_analysis_blast;
 
 //dpm($analysis);
-dpm('tripal-analysis-base','template');
 
 ?>
 <div id="tripal_analysis_blast-base-box" class="tripal_analysis_blast-info-box tripal-info-box">

+ 0 - 0
extensions/tripal_analysis_blast/templates/tripal-analysis-blast-report.tpl.php → extensions/tripal_analysis_blast/templates/tripal_analysis_blast_report.tpl.php


+ 0 - 0
extensions/tripal_analysis_blast/templates/tripal-analysis-blast-teaser.tpl.php → extensions/tripal_analysis_blast/templates/tripal_analysis_blast_teaser.tpl.php


+ 0 - 0
extensions/tripal_analysis_blast/templates/tripal-feature-blast-results.tpl.php → extensions/tripal_analysis_blast/templates/tripal_feature_blast_results.tpl.php


+ 4 - 7
extensions/tripal_analysis_blast/tripal_analysis_blast.module

@@ -13,7 +13,6 @@ function tripal_analysis_blast_init(){
 	// drupal_add_js( drupal_get_path('theme', 'tripal').'/js/tripal_analysis_blast.js');
 	drupal_add_css(drupal_get_path('module', 'tripal_analysis_blast') .'/css/tripal_analysis_blast.css');
 	drupal_add_js(drupal_get_path('module', 'tripal_analysis_blast') .'/js/tripal_analysis_blast.js');
-	dpm('helloinit', 'hello');
 }
 
 /*******************************************************************************
@@ -149,13 +148,12 @@ function tripal_analysis_blast_theme_registry_alter(&$info) {
 function tripal_analysis_blast_theme () {
 	$theme = array(
       'tripal_analysis_blast_results_index_version' => array (
-      // 'node__chado_analysis_blast' => array (
          'arguments' => array('node'),
 		),
-		'node_chado_analysis_blast' => array(
-		'template' => 'node-chado-analysis-blast',
-		'arguments' => array('node'=>null),
-		),
+	//	'node_chado_analysis_blast' => array(
+	//	'template' => 'node-chado-analysis-blast',
+	//	'arguments' => array('node'=>null),
+	//	),
 		'tripal_feature_blast_results' => array(
 			'template' => 'tripal-feature-blast-results',
 			'arguments' =>  array('node'=> null),
@@ -198,7 +196,6 @@ function tripal_analysis_blast_preprocess_tripal_feature_blast_results(&$variabl
    }
 
    $blast_results = tripal_get_feature_blast_results($feature->feature_id, $db_id, $max);
-	 dpm($blast_results, 'blast_resulst');
    $feature->tripal_analysis_blast->blast_results_list = $blast_results;