diff --git a/code/BetterNavigatorExtension.php b/code/BetterNavigatorExtension.php
index 9a7489a..e14ff5f 100755
--- a/code/BetterNavigatorExtension.php
+++ b/code/BetterNavigatorExtension.php
@@ -35,7 +35,7 @@ class BetterNavigatorExtension extends DataExtension {
}
}
// Only show edit link if user has permission to edit this page
- $editLink = (($this->owner->dataRecord->canEdit() && Permission::check('CMS_ACCESS_CMSMain')) || $isDev) ? Controller::join_links('/', $nav['CMSLink']['Link']) : false;
+ $editLink = (($this->owner->dataRecord->canEdit() && Permission::check('CMS_ACCESS_CMSMain')) || $isDev) ? Controller::join_links(Director::absoluteBaseURL(), $nav['CMSLink']['Link']) : false;
// Is the logged in member nominated as a developer?
$member = Member::currentUser();
@@ -49,8 +49,8 @@ class BetterNavigatorExtension extends DataExtension {
'Member' => $member,
'Stage' => Versioned::current_stage(),
'Viewing' => $viewing, // What we're viewing doesn't necessarily align with the active Stage
- 'LoginLink' => Controller::join_links('/', Config::inst()->get('Security', 'login_url'), $backURL),
- 'LogoutLink' => Controller::join_links('/Security/logout', $backURL),
+ 'LoginLink' => Controller::join_links(Director::absoluteBaseURL(), Config::inst()->get('Security', 'login_url'), $backURL),
+ 'LogoutLink' => Controller::join_links(Director::absoluteBaseURL() . 'Security/logout', $backURL),
'EditLink' => $editLink,
'Mode' => Director::get_environment_type(),
'IsDeveloper' => $isDeveloper
diff --git a/templates/BetterNavigator.ss b/templates/BetterNavigator.ss
index 3dac247..6b209ec 100644
--- a/templates/BetterNavigator.ss
+++ b/templates/BetterNavigator.ss
@@ -56,12 +56,12 @@
<% if $BetterNavigator.Mode='dev' %>
Dev mode on
<% else %>
- Dev mode
+ Dev mode
<% end_if %>
- Flush caches
- Build database
- Dev menu
+ Flush caches
+ Build database
+ Dev menu
@@ -71,13 +71,13 @@