Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
T
tripal_abims
Manage
Activity
Members
Labels
Plan
Issues
0
Issue boards
Milestones
Wiki
Code
Merge requests
0
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
abims
e-infra
tripal_abims
Commits
eb80abfd
Commit
eb80abfd
authored
4 years ago
by
Anthony Bretaudeau
Browse files
Options
Downloads
Patches
Plain Diff
support absolute apollo url
parent
90927f27
No related branches found
Branches containing commit
No related tags found
1 merge request
!1
Merge upstream
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
templates/page--front.tpl.php
+9
-5
9 additions, 5 deletions
templates/page--front.tpl.php
templates/page.tpl.php
+9
-5
9 additions, 5 deletions
templates/page.tpl.php
templates/tripal_feature_alignments.tpl.php
+2
-2
2 additions, 2 deletions
templates/tripal_feature_alignments.tpl.php
with
20 additions
and
12 deletions
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
;
?>
...
...
This diff is collapsed.
Click to expand it.
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
;
?>
...
...
This diff is collapsed.
Click to expand it.
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
.
=
" View in <a href='"
.
$
GLOBALS
[
'base_url'
]
.
$
url
.
"loc="
.
$alignment
->
name
.
"%3A"
.
(
$alignment
->
fmin
+
1
)
.
".."
.
$alignment
->
fmax
.
"'>Apollo</a>"
;
$feature_loc
.
=
" View in <a href='"
.
$url
.
"loc="
.
$alignment
->
name
.
"%3A"
.
(
$alignment
->
fmin
+
1
)
.
".."
.
$alignment
->
fmax
.
"'>Apollo</a>"
;
}
$rows
[]
=
array
(
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment