Browse Source

more theme fixes

alexgl 13 years ago
parent
commit
94800e095b

+ 11 - 7
extensions/tripal_analysis_blast/tripal_analysis_blast.module

@@ -13,6 +13,7 @@ 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') .'/theme/css/tripal_analysis_blast.css');
 	drupal_add_js(drupal_get_path('module', 'tripal_analysis_blast') .'/theme/js/tripal_analysis_blast.js');
+	dpm('helloinit', 'hello');
 }
 
 /*******************************************************************************
@@ -134,8 +135,7 @@ 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 = drupal_get_path('module', 'tripal_analysis_blast') . '/theme';
 	// $path_feature = $path . '/tripal_feature';
 	// $path_analysis = $path . '/tripal_analysis_blast';
 	//dpm($path, 'path');
@@ -143,22 +143,26 @@ function tripal_analysis_blast_theme () {
 	$theme = array(
       'tripal_analysis_blast_results_index_version' => array (
          'arguments' => array('node'),
-         'template' => 'theme/node-chado_analysis_blast',
+         'path' => $path,
+         'template' => 'node-chado_analysis_blast',
 		),
 		'tripal_feature_blast_results' => array(
 			'arguments' =>  array('node'=> null),
-		   'template' => 'theme/tripal_analysis_blast/tripal_feature_blast_results',
+			'path' => $path,
+		   'template' => 'tripal_analysis_blast/tripal_feature_blast_results',
 		),
 		'tripal_analysis_blast_report' => array(
 			'arguments' =>  array('report_object'=> null),
-		   'template' => 'theme/tripal_analysis_blast/tripal_analysis_blast_report',
+			'path' => $path,
+		   'template' => 'tripal_analysis_blast/tripal_analysis_blast_report',
 		),
 		'tripal_analysis_blast_base' => array(
 			'arguments' =>  array('report_object'=> null),
-		   'template' => 'theme/tripal_analysis_blast/tripal_analysis_blast_base',
+			'path' => $path,
+		   'template' => 'tripal_analysis_blast/tripal_analysis_blast_base',
 		)
 	);
-	//dpm($theme, 'blast theme');
+	dpm($theme, 'blast theme');
 	return $theme;
 }
 /*******************************************************************************

+ 2 - 2
extensions/tripal_analysis_go/tripal_analysis_go.module

@@ -4,9 +4,9 @@ require_once "gaf_loader.inc";
 
 function tripal_analysis_go_init(){
    // Add style sheet
-   drupal_add_css(drupal_get_path('theme', 'tripal').'/css/tripal_analysis_go.css');
+   drupal_add_css(drupal_get_path('module', 'tripal_analysis_go').'/theme/css/tripal_analysis_go.css');
 
-   drupal_add_js(drupal_get_path('theme', 'tripal').'/js/tripal_analysis_go.js');
+   drupal_add_js(drupal_get_path('module', 'tripal_analysis_go').'/theme/js/tripal_analysis_go.js');
 }
 
 /*******************************************************************************

+ 2 - 2
extensions/tripal_analysis_interpro/tripal_analysis_interpro.module

@@ -9,8 +9,8 @@ require_once "parseInterpro.inc";
 function tripal_analysis_interpro_init(){
 
 	// Add javascript and style sheet
-   drupal_add_css(drupal_get_path('theme', 'tripal').'/css/tripal_analysis_interpro.css');
-   drupal_add_js( drupal_get_path('theme', 'tripal').'/js/tripal_analysis_interpro.js');
+   drupal_add_css(drupal_get_path('module', 'tripal_analysis_interpro').'/theme/css/tripal_analysis_interpro.css');
+   drupal_add_js( drupal_get_path('module', 'tripal_analysis_interpro').'/theme/js/tripal_analysis_interpro.js');
 }
 /*******************************************************************************
  *  Provide information to drupal about the node types that we're creating

+ 1 - 1
extensions/tripal_analysis_kegg/tripal_analysis_kegg.module

@@ -7,7 +7,7 @@
 
 function tripal_analysis_kegg_init(){
    // add the tripal_analysis_kegg JS and CSS
-   drupal_add_js(drupal_get_path('theme', 'tripal').'/js/tripal_analysis_kegg.js');
+   drupal_add_js(drupal_get_path('module', 'tripal_analysis_kegg').'/theme/js/tripal_analysis_kegg.js');
    drupal_add_css(drupal_get_path('theme', 'tripal').'/css/tripal_analysis_kegg.css');
    // add the jsTree JS and CSS
    drupal_add_css(drupal_get_path('theme', 'tripal').'/js/jsTree/source/tree_component.css');

+ 1 - 1
extensions/tripal_analysis_unigene/tripal_analysis_unigene.module

@@ -2,7 +2,7 @@
 
 function tripal_analysis_unigene_init(){
    // Add style sheet
-   drupal_add_css(drupal_get_path('theme', 'tripal').'/css/tripal_analysis_unigene.css');
+   drupal_add_css(drupal_get_path('module', 'tripal_analysis_unigene').'/theme/css/tripal_analysis_unigene.css');
 }
 /**
 *