|  | @@ -11,8 +11,8 @@ function tripal_analysis_blast_init(){
 | 
	
		
			
				|  |  |  	// Add javascript and style sheet
 | 
	
		
			
				|  |  |  	// drupal_add_css(drupal_get_path('theme', 'tripal').'/css/tripal_analysis_blast.css');
 | 
	
		
			
				|  |  |  	// drupal_add_js( drupal_get_path('theme', 'tripal').'/js/tripal_analysis_blast.js');
 | 
	
		
			
				|  |  | -	drupal_add_css(drupal_get_path('module', 'tripal_analysis_blast') .'/theme/css/tripal_analysis_blast.css');
 | 
	
		
			
				|  |  | -	drupal_add_js(drupal_get_path('module', 'tripal_analysis_blast') .'/theme/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');
 | 
	
		
			
				|  |  |  }
 | 
	
		
			
				|  |  |  
 | 
	
	
		
			
				|  | @@ -135,34 +135,27 @@ function tripal_analysis_blast_nodeapi(&$node, $op, $teaser, $page) {
 | 
	
		
			
				|  |  |   *  look and feel of the output generated in this module
 | 
	
		
			
				|  |  |   */
 | 
	
		
			
				|  |  |  function tripal_analysis_blast_theme () {
 | 
	
		
			
				|  |  | -	$path = drupal_get_path('module', 'tripal_analysis_blast') . '/theme';
 | 
	
		
			
				|  |  | -	// $path_feature = $path . '/tripal_feature';
 | 
	
		
			
				|  |  | -	// $path_analysis = $path . '/tripal_analysis_blast';
 | 
	
		
			
				|  |  | -	//dpm($path, 'path');
 | 
	
		
			
				|  |  | -	
 | 
	
		
			
				|  |  |  	$theme = array(
 | 
	
		
			
				|  |  | -      'tripal_analysis_blast_results_index_version' => array (
 | 
	
		
			
				|  |  | +      // 'tripal_analysis_blast_results_index_version' => array (
 | 
	
		
			
				|  |  | +      'node__chado_analysis_blast' => array (
 | 
	
		
			
				|  |  |           'arguments' => array('node'),
 | 
	
		
			
				|  |  | -         'path' => $path,
 | 
	
		
			
				|  |  | -         'template' => 'node-chado_analysis_blast',
 | 
	
		
			
				|  |  | +         'template' => 'templates/node--chado_analysis_blast',
 | 
	
		
			
				|  |  |  		),
 | 
	
		
			
				|  |  |  		'tripal_feature_blast_results' => array(
 | 
	
		
			
				|  |  |  			'arguments' =>  array('node'=> null),
 | 
	
		
			
				|  |  | -			'path' => $path,
 | 
	
		
			
				|  |  | -		   'template' => 'tripal_analysis_blast/tripal_feature_blast_results',
 | 
	
		
			
				|  |  | +		   'template' => 'templates/tripal_analysis_blast/tripal_feature_blast_results',
 | 
	
		
			
				|  |  |  		),
 | 
	
		
			
				|  |  |  		'tripal_analysis_blast_report' => array(
 | 
	
		
			
				|  |  |  			'arguments' =>  array('report_object'=> null),
 | 
	
		
			
				|  |  | -			'path' => $path,
 | 
	
		
			
				|  |  | -		   'template' => 'tripal_analysis_blast/tripal_analysis_blast_report',
 | 
	
		
			
				|  |  | +		   'template' => 'templates/tripal_analysis_blast/tripal_analysis_blast_report',
 | 
	
		
			
				|  |  |  		),
 | 
	
		
			
				|  |  |  		'tripal_analysis_blast_base' => array(
 | 
	
		
			
				|  |  |  			'arguments' =>  array('report_object'=> null),
 | 
	
		
			
				|  |  | -			'path' => $path,
 | 
	
		
			
				|  |  | -		   'template' => 'tripal_analysis_blast/tripal_analysis_blast_base',
 | 
	
		
			
				|  |  | +		   'template' => 'templates/tripal_analysis_blast/tripal_analysis_blast_base',
 | 
	
		
			
				|  |  |  		)
 | 
	
		
			
				|  |  |  	);
 | 
	
		
			
				|  |  |  	dpm($theme, 'blast theme');
 | 
	
		
			
				|  |  | +	dpm(node_load(array('nid' => 18)),'node18');
 | 
	
		
			
				|  |  |  	return $theme;
 | 
	
		
			
				|  |  |  }
 | 
	
		
			
				|  |  |  /*******************************************************************************
 |