Merge branch 'master' of git.drupal.org:sandbox/spficklin/1337878 into 6.x-0.4-dev

README.txt

@@ -0,0 +1,3 @@
+This branch is tested to work with drupal core version 6.22.
+Mileage will vary with 6.x .
+

extensions/tripal_analysis_blast/node-chado_analysis_blast.tpl.php

@@ -33,7 +33,7 @@ $organism = $variables['node']->organism;
 ?>
 
 <?php if ($teaser) { 
-	include('templates/tripal_analysis_blast_teaser.tpl.php');
+	include(drupal_get_path('module' , 'tripal_analysis_blast') . '/theme/tripal_analysis_blast/tripal_analysis_blast_teaser.tpl.php');
 } else { ?>
 
 <script type="text/javascript">

extensions/tripal_analysis_blast/theme/tripal_analysis_blast/tripal_analysis_blast_report.tpl.php

@@ -22,7 +22,7 @@ $hits = $report->hits;
 
 <div id="tripal_ajaxLoading" style="display:none">
 	<div id="loadingText">Loading...</div>
-	<img src="<?php print url("sites/all/themes/theme_tripal/images/ajax-loader.gif") ?>">
+	<img src="<?php print url(drupal_get_path('theme', 'tripal') . '/images/ajax-loader.gif') ?>">
 </div>
 
 <div id="blast-hits-report">

extensions/tripal_analysis_blast/theme/tripal_feature/tripal_feature_blast_results.tpl.php

@@ -5,7 +5,7 @@ $blast_results_list = $feature->tripal_analysis_blast->blast_results_list;
 ?>
 <div id="tripal_ajaxLoading" style="display:none">
 	<div id="loadingText">Loading...</div>
-	<img src="sites/all/themes/theme_tripal/images/ajax-loader.gif">
+	<img src="<?php print drupal_get_path('theme', 'tripal') . '/images/ajax-loader.gif';?>">
 </div>
 
 <?php 

extensions/tripal_analysis_interpro/node-chado_analysis_interpro.tpl.php

@@ -31,7 +31,7 @@ $organism = $variables['node']->organism;
 ?>
 
 <?php if ($teaser) { 
-  include('tripal_analysis_interpro/tripal_analysis_interpro_teaser.tpl.php'); 
+  include(drupal_get_path('module' , 'tripal_analysis_interpro') . '/theme/tripal_analysis_interpro/tripal_analysis_interpro_teaser.tpl.php'); 
 } else { ?>
 
 <script type="text/javascript">

extensions/tripal_analysis_interpro/tripal_analysis_interpro.module

@@ -405,7 +405,7 @@ function tripal_analysis_interpro_theme () {
       'tripal_feature_interpro_results' => array (
          'arguments' => array('node'=> null),
          'template' => 'tripal_feature_interpro_results',
-         'path' => $path . '/tripal_features',
+         'path' => $path . '/tripal_feature',
 	   ),
       'tripal_analysis_interpro_base' => array (
          'arguments' => array('node'=> null),

extensions/tripal_analysis_kegg/node-chado_analysis_kegg.tpl.php

@@ -30,7 +30,7 @@ $organism = $variables['node']->organism;
 ?>
 
 <?php if ($teaser) { 
-  include('tripal_analysis_kegg/tripal_analysis_kegg_teaser.tpl.php'); 
+  include(drupal_get_path('module', 'tripal_analysis_kegg') . '/theme/tripal_analysis_kegg/tripal_analysis_kegg_teaser.tpl.php'); 
 } else { ?>
 
 <script type="text/javascript">
@@ -83,8 +83,8 @@ if (Drupal.jsEnabled) {
 <div id="tripal_analysis_kegg_details" class="tripal_details">
 
    <!-- Basic Details Theme -->
-   <?php include('tripal_analysis_kegg/tripal_analysis_kegg_base.tpl.php'); ?>
-   <?php include('tripal_analysis_kegg/tripal_analysis_kegg_report.tpl.php'); ?>
+   <?php include(drupal_get_path('module', 'tripal_analysis_kegg') . '/theme/tripal_analysis_kegg/tripal_analysis_kegg_base.tpl.php'); ?>
+   <?php include(drupal_get_path('module', 'tripal_analysis_kegg') . '/theme/tripal_analysis_kegg/tripal_analysis_kegg_report.tpl.php'); ?>
 
    <?php print $content ?>
 </div>

extensions/tripal_analysis_kegg/theme/css/tripal_analysis_kegg.css

@@ -25,7 +25,7 @@
 }
 
 #tripal_kegg_brite_links {
-   background-image:url("../images/kegg.gif");
+   background-image:url("../images/kegg.gif");/*TODO: figure out what to do about images in tripal extensions*/
    background-repeat: no-repeat;
    padding-left:20px;
 }