Explorar el Código

to theme standard yet again

alexgl hace 13 años
padre
commit
6967923504

+ 0 - 0
extensions/tripal_analysis_blast/css/tripal_analysis_blast.css → extensions/tripal_analysis_blast/theme/css/tripal_analysis_blast.css


+ 0 - 0
extensions/tripal_analysis_blast/js/tripal_analysis_blast.js → extensions/tripal_analysis_blast/theme/js/tripal_analysis_blast.js


+ 0 - 0
extensions/tripal_analysis_blast/templates/tripal_analysis_blast_base.tpl.php → extensions/tripal_analysis_blast/theme/tripal_analysis_blast/tripal_analysis_blast_base.tpl.php


+ 0 - 0
extensions/tripal_analysis_blast/templates/tripal_analysis_blast_report.tpl.php → extensions/tripal_analysis_blast/theme/tripal_analysis_blast/tripal_analysis_blast_report.tpl.php


+ 0 - 0
extensions/tripal_analysis_blast/templates/tripal_analysis_blast_teaser.tpl.php → extensions/tripal_analysis_blast/theme/tripal_analysis_blast/tripal_analysis_blast_teaser.tpl.php


+ 0 - 0
extensions/tripal_analysis_blast/templates/tripal_feature_blast_results.tpl.php → extensions/tripal_analysis_blast/theme/tripal_feature/tripal_feature_blast_results.tpl.php


+ 9 - 5
extensions/tripal_analysis_blast/tripal_analysis_blast.module

@@ -9,8 +9,8 @@ require_once "includes/parse_blast_XML.inc";
  ******************************************************************************/
 function tripal_analysis_blast_init(){
 	// Add javascript and style sheet
-	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');
+	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');
 }
 
 /*******************************************************************************
@@ -147,21 +147,25 @@ function tripal_analysis_blast_theme_registry_alter(&$info) {
  *  look and feel of the output generated in this module
  */
 function tripal_analysis_blast_theme () {
+	$path = drupal_get_path('module', 'tripal_analysis_blast') . '/theme';
 	$theme = array(
       'tripal_analysis_blast_results_index_version' => array (
          'arguments' => array('node'),
 		),
 		'tripal_feature_blast_results' => array(
-			'template' => 'templates/tripal_feature_blast_results',
+			'template' => 'tripal_feature_blast_results',
 			'arguments' =>  array('node'=> null),
+			'path' => $path . '/tripal_feature',
 		),
 		'tripal_analysis_blast_report' => array(
-			'template' => 'templates/tripal_analysis_blast_report',
+			'template' => 'tripal_analysis_blast_report',
 			'arguments' =>  array('report_object'=> null),
+			'path' => $path . '/tripal_analysis_blast',
 		),
 		'tripal_analysis_blast_base' => array(
-			'template' => 'templates/tripal_analysis_blast_base',
+			'template' => 'tripal_analysis_blast_base',
 			'arguments' =>  array('report_object'=> null),
+			'path' => $path . '/tripal_analysis_blast',
 		)
 	);
 	return $theme;

+ 5 - 2
extensions/tripal_analysis_interpro/tripal_analysis_interpro.module

@@ -397,17 +397,20 @@ function tripal_analysis_interpro_theme_registry_alter(&$info) {
  *  look and feel of the output generated in this module
  */
 function tripal_analysis_interpro_theme () {
+	$path = drupal_get_path('module' , 'tripal_analysis_interpro') . '/theme';
 	return array(
       'parse_EBI_Interpro_XML_index_version' => array (
          'arguments' => array('node'),
 	   ),
       'tripal_feature_interpro_results' => array (
          'arguments' => array('node'=> null),
-         'template' => 'templates/tripal_features/tripal_feature_interpro_results',
+         'template' => 'tripal_feature_interpro_results',
+         'path' => $path . '/tripal_features',
 	   ),
       'tripal_analysis_interpro_base' => array (
          'arguments' => array('node'=> null),
-         'template' => 'templates/tripal_analysis_interpro/tripal_analysis_interpro_base',
+         'template' => 'tripal_analysis_interpro_base',
+         'path' => $path . '/tripal_analysis_interpro',
 	   )
 	);
 }