diff --git a/code/ContentController.php b/code/ContentController.php index e443f66e..64f5ffcd 100755 --- a/code/ContentController.php +++ b/code/ContentController.php @@ -337,11 +337,11 @@ class ContentController extends Controller { if(Director::isDev() || Permission::check('CMS_ACCESS_CMSMain') || Permission::check('VIEW_DRAFT_CONTENT')) { if($this->dataRecord) { - Requirements::css(SAPPHIRE_DIR . '/css/SilverStripeNavigator.css'); + Requirements::css(CMS_DIR . '/css/SilverStripeNavigator.css'); Requirements::javascript(SAPPHIRE_DIR . '/thirdparty/behaviour/behaviour.js'); Requirements::javascript(SAPPHIRE_DIR . '/thirdparty/jquery/jquery.js'); Requirements::javascript(SAPPHIRE_DIR . '/thirdparty/jquery-livequery/jquery.livequery.js'); - Requirements::javascript(SAPPHIRE_DIR . '/javascript/SilverStripeNavigator.js'); + Requirements::javascript(CMS_DIR . '/javascript/SilverStripeNavigator.js'); $return = $nav = SilverStripeNavigator::get_for_record($this->dataRecord); $items = $return['items']; @@ -376,7 +376,7 @@ HTML; // On live sites we should still see the archived message } else { if($date = Versioned::current_archived_date()) { - Requirements::css(SAPPHIRE_DIR . '/css/SilverStripeNavigator.css'); + Requirements::css(CMS_DIR . '/css/SilverStripeNavigator.css'); $dateObj = Object::create('Datetime', $date, null); // $dateObj->setVal($date); return "
". _t('ContentController.ARCHIVEDSITEFROM') ."
" . $dateObj->Nice() . "
"; diff --git a/code/LeftAndMain.php b/code/LeftAndMain.php index 6ef6f341..aac218e2 100644 --- a/code/LeftAndMain.php +++ b/code/LeftAndMain.php @@ -252,8 +252,8 @@ class LeftAndMain extends Controller { Requirements::javascript(CMS_DIR . '/javascript/LeftAndMain.BatchActions.js'); // navigator - Requirements::css(SAPPHIRE_DIR . '/css/SilverStripeNavigator.css'); - Requirements::javascript(SAPPHIRE_DIR . '/javascript/SilverStripeNavigator.js'); + Requirements::css(CMS_DIR . '/css/SilverStripeNavigator.css'); + Requirements::javascript(CMS_DIR . '/javascript/SilverStripeNavigator.js'); Requirements::themedCSS('typography');