Merge branch 'enable_http_jb' into 'master'

enable link to external JB

See merge request !4

templates/page--front.tpl.php

@@ -183,11 +183,14 @@
                         <?php if (getenv('ENABLE_JBROWSE')): ?>
                             <?php
                                 if (getenv('ENABLE_JBROWSE') == "1")
-                                    $url = '/jbrowse/';
+                                    $url = $GLOBALS['base_url'].'/jbrowse/';
                                 else
-                                    $url = getenv('ENABLE_JBROWSE');
+                                    if substr(getenv('ENABLE_JBROWSE'), 0, 8) === "https://" OR substr(getenv('ENABLE_JBROWSE'), 0, 7) === "http://"
+                                        $url = $getenv('ENABLE_JBROWSE');
+                                    else
+                                        $url = $GLOBALS['base_url'].getenv('ENABLE_JBROWSE');
                             ?>
-                            <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; ?>">JBrowse</a></li>
+                            <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; ?>">JBrowse</a></li>
                         <?php endif; ?>
                         <?php if (getenv('ENABLE_APOLLO')): ?>
                             <?php

templates/page.tpl.php

@@ -197,11 +197,14 @@ if (isset($node) && $node->type == "chado_feature") {
                         <?php if (getenv('ENABLE_JBROWSE')): ?>
                             <?php
                                 if (getenv('ENABLE_JBROWSE') == "1")
-                                    $url = '/jbrowse/';
+                                    $url = $GLOBALS['base_url'].'/jbrowse/';
                                 else
-                                    $url = getenv('ENABLE_JBROWSE');
+                                    if substr(getenv('ENABLE_JBROWSE'), 0, 8) === "https://" OR substr(getenv('ENABLE_JBROWSE'), 0, 7) === "http://"
+                                        $url = $getenv('ENABLE_JBROWSE');
+                                    else
+                                        $url = $GLOBALS['base_url'].getenv('ENABLE_JBROWSE');
                             ?>
-                            <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; ?>">JBrowse</a></li>
+                            <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; ?>">JBrowse</a></li>
                         <?php endif; ?>
                         <?php if (getenv('ENABLE_APOLLO')): ?>
                             <?php