Browse Source

theme out of module, work in progress

alexgl 13 years ago
parent
commit
5deb82d17f
1 changed files with 18 additions and 3 deletions
  1. 18 3
      extensions/tripal_analysis_blast/tripal_analysis_blast.module

+ 18 - 3
extensions/tripal_analysis_blast/tripal_analysis_blast.module

@@ -9,8 +9,10 @@ require_once "parse_blast_XML.inc";
  ******************************************************************************/
 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('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');
 }
 
 /*******************************************************************************
@@ -132,23 +134,36 @@ function tripal_analysis_blast_nodeapi(&$node, $op, $teaser, $page) {
  *  look and feel of the output generated in this module
  */
 function tripal_analysis_blast_theme () {
-	return array(
+	
+	$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 (
          'arguments' => array('node'),
+         'template' => 'node-chado_analysis_blast',
+         'path' => $path,
 		),
 		'tripal_feature_blast_results' => array(
 			'arguments' =>  array('node'=> null),
 		   'template' => 'tripal_feature_blast_results',
+		   //'path' => $path_feature,
 		),
 		'tripal_analysis_blast_report' => array(
 			'arguments' =>  array('report_object'=> null),
 		   'template' => 'tripal_analysis_blast_report',
+		   //'path' => $path_analysis,
 		),
 		'tripal_analysis_blast_base' => array(
 			'arguments' =>  array('report_object'=> null),
 		   'template' => 'tripal_analysis_blast_base',
+		   //'path' => $path_analysis,
 		)
 	);
+	//dpm($theme, 'blast theme');
+	return $theme;
 }
 /*******************************************************************************
  *