Skip to content
Snippets Groups Projects
Commit eb80abfd authored by Anthony Bretaudeau's avatar Anthony Bretaudeau
Browse files

support absolute apollo url

parent 90927f27
No related branches found
No related tags found
1 merge request!1Merge upstream
Hide whitespace changes
Inline Side-by-side
templates/page--front.tpl.php
+ 9
− 5
View file @ eb80abfd
......@@ -165,14 +165,18 @@
<?php endif; ?>
<?php if (getenv('ENABLE_APOLLO')): ?>
<?php
if (getenv('ENABLE_APOLLO') == "1")
$url = '/apollo';
else
if (getenv('ENABLE_APOLLO') == "1") {
$url = $GLOBALS['base_url'] . '/apollo';
$url_report = $GLOBALS['base_url'] . '/apollo_report';
}
else {
$url = getenv('ENABLE_APOLLO');
$url_report = $url . 'report';
}
?>
<li id="menu-item-46" class="menu-item menu-item-type-custom menu-item-object-custom menu-item-has-children menu-item-46"><a href="<?php echo $GLOBALS['base_url'].$url; ?>">Apollo</a>
<li id="menu-item-46" class="menu-item menu-item-type-custom menu-item-object-custom menu-item-has-children menu-item-46"><a href="<?php echo $url; ?>">Apollo</a>
<ul class="sub-menu">
<li id="menu-item-43" class="menu-item menu-item-type-post_type menu-item-object-page menu-item-has-children menu-item-43"><a href="<?php echo $GLOBALS['base_url'].'/apollo_report'; ?>">Annotation report</a></li>
<li id="menu-item-43" class="menu-item menu-item-type-post_type menu-item-object-page menu-item-has-children menu-item-43"><a href="<?php echo $url_report; ?>">Annotation report</a></li>
</ul>
</li>
<?php endif; ?>
......
templates/page.tpl.php
+ 9
− 5
View file @ eb80abfd
......@@ -176,14 +176,18 @@ if (isset($node) && $node->type == "chado_feature") {
<?php endif; ?>
<?php if (getenv('ENABLE_APOLLO')): ?>
<?php
if (getenv('ENABLE_APOLLO') == "1")
$url = '/apollo';
else
if (getenv('ENABLE_APOLLO') == "1") {
$url = $GLOBALS['base_url'] . '/apollo';
$url_report = $GLOBALS['base_url'] . '/apollo_report';
}
else {
$url = getenv('ENABLE_APOLLO');
$url_report = $url . 'report';
}
?>
<li id="menu-item-46" class="menu-item menu-item-type-custom menu-item-object-custom menu-item-has-children menu-item-46"><a href="<?php echo $GLOBALS['base_url'].$url; ?>">Apollo</a>
<li id="menu-item-46" class="menu-item menu-item-type-custom menu-item-object-custom menu-item-has-children menu-item-46"><a href="<?php echo $url; ?>">Apollo</a>
<ul class="sub-menu">
<li id="menu-item-43" class="menu-item menu-item-type-post_type menu-item-object-page menu-item-has-children menu-item-43"><a href="<?php echo $GLOBALS['base_url'].'/apollo_report'; ?>">Annotation report</a></li>
<li id="menu-item-43" class="menu-item menu-item-type-post_type menu-item-object-page menu-item-has-children menu-item-43"><a href="<?php echo $url_report; ?>">Annotation report</a></li>
</ul>
</li>
<?php endif; ?>
......
templates/tripal_feature_alignments.tpl.php
+ 2
− 2
View file @ eb80abfd
......@@ -153,7 +153,7 @@ if(count($alignments) > 0){ ?>
if (!$found_link) {
if (getenv('ENABLE_APOLLO') == "1")
$url = '/apollo/annotator/loadLink?';
$url = $GLOBALS['base_url'] . '/apollo/annotator/loadLink?';
else {
// Some url was given
$url = getenv('ENABLE_APOLLO');
......@@ -164,7 +164,7 @@ if(count($alignments) > 0){ ?>
}
}
$feature_loc .= " &nbsp;&nbsp; View in <a href='".$GLOBALS['base_url'].$url."loc=".$alignment->name."%3A".($alignment->fmin + 1)."..".$alignment->fmax."'>Apollo</a>";
$feature_loc .= " &nbsp;&nbsp; View in <a href='".$url."loc=".$alignment->name."%3A".($alignment->fmin + 1)."..".$alignment->fmax."'>Apollo</a>";
}
$rows[] = array(
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment