From 54330495a2ee0478bd6d144b55398d12cc556afe Mon Sep 17 00:00:00 2001 From: Ingo Schommer Date: Wed, 14 Apr 2010 04:00:43 +0000 Subject: [PATCH] APICHANGE: Use the same navigator items in the CMS that are used on the frontend (from r97395) (from r99079) git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@102837 467b73ca-7a2a-4603-9d3b-597d59a354a9 --- core/control/ContentController.php | 27 +-------- core/control/SilverStripeNavigatorItem.php | 65 +++++++++++++++++++++- core/model/SiteTree.php | 35 ++++++++++++ 3 files changed, 102 insertions(+), 25 deletions(-) diff --git a/core/control/ContentController.php b/core/control/ContentController.php index 6647fada8..dfd627bb2 100755 --- a/core/control/ContentController.php +++ b/core/control/ContentController.php @@ -319,30 +319,9 @@ JS if($this->dataRecord) { - $navItemClasses = ClassInfo::subclassesFor('SilverStripeNavigatorItem'); - array_shift($navItemClasses); - - // Sort menu items according to priority - $menuPriority = array(); - $i = 0; - foreach($navItemClasses as $navItemClass) { - if($navItemClass == 'SilverStripeNavigatorItem') continue; - - $i++; - $obj = new $navItemClass(); - // This funny litle formula ensures that the first item added with the same priority will be left-most. - $priority = Object::get_static($navItemClass, 'priority'); - $menuPriority[$priority * 100 - 1] = $obj; - } - ksort($menuPriority); - - foreach($menuPriority as $obj) { - - $text = $obj->getHTML($this->dataRecord); - if($text) $items .= $text; - $newMessage = $obj->getMessage($this); - if($newMessage) $message = $newMessage; - } + $return = $nav = SilverStripeNavigator::get_for_record($this->dataRecord); + $items = $return['items']; + $message = $return['message']; } if($member) { diff --git a/core/control/SilverStripeNavigatorItem.php b/core/control/SilverStripeNavigatorItem.php index ba51a52b6..8568bc188 100644 --- a/core/control/SilverStripeNavigatorItem.php +++ b/core/control/SilverStripeNavigatorItem.php @@ -1,15 +1,66 @@ getHTML($record); + if($text) $items .= $text; + $newMessage = $obj->getMessage($record); + if($newMessage) $message = $newMessage; + } + + return array( + 'items' => $items, + 'message' => $message + ); + } +} /** * Navigator items are links that appear in the $SilverStripeNavigator bar. * To add an item, extends this class. + * + * @package cms + * @subpackage content */ class SilverStripeNavigatorItem extends Object { function getHTML($controller) {} function getMessage($controller) {} } +/** + * @package cms + * @subpackage content + */ class SilverStripeNavigatorItem_CMSLink extends SilverStripeNavigatorItem { static $priority = 10; @@ -32,6 +83,10 @@ class SilverStripeNavigatorItem_CMSLink extends SilverStripeNavigatorItem { } +/** + * @package cms + * @subpackage content + */ class SilverStripeNavigatorItem_StageLink extends SilverStripeNavigatorItem { static $priority = 20; @@ -51,6 +106,10 @@ class SilverStripeNavigatorItem_StageLink extends SilverStripeNavigatorItem { } } +/** + * @package cms + * @subpackage content + */ class SilverStripeNavigatorItem_LiveLink extends SilverStripeNavigatorItem { static $priority = 30; @@ -70,6 +129,10 @@ class SilverStripeNavigatorItem_LiveLink extends SilverStripeNavigatorItem { } } +/** + * @package cms + * @subpackage content + */ class SilverStripeNavigatorItem_ArchiveLink extends SilverStripeNavigatorItem { static $priority = 40; @@ -88,4 +151,4 @@ class SilverStripeNavigatorItem_ArchiveLink extends SilverStripeNavigatorItem { } } -?> +?> \ No newline at end of file diff --git a/core/model/SiteTree.php b/core/model/SiteTree.php index a64d59761..e635826e2 100755 --- a/core/model/SiteTree.php +++ b/core/model/SiteTree.php @@ -1847,6 +1847,41 @@ class SiteTree extends DataObject implements PermissionProvider,i18nEntityProvid return $fields; } + function getNavigatorItems() { + $items = ''; + $message = ''; + + $navItemClasses = ClassInfo::subclassesFor('SilverStripeNavigatorItem'); + array_shift($navItemClasses); + + // Sort menu items according to priority + $menuPriority = array(); + $i = 0; + foreach($navItemClasses as $navItemClass) { + if($navItemClass == 'SilverStripeNavigatorItem') continue; + + $i++; + $obj = new $navItemClass(); + // This funny litle formula ensures that the first item added with the same priority will be left-most. + $priority = Object::get_static($navItemClass, 'priority'); + $menuPriority[$priority * 100 - 1] = $obj; + } + ksort($menuPriority); + + foreach($menuPriority as $obj) { + + $text = $obj->getHTML($this); + if($text) $items .= $text; + $newMessage = $obj->getMessage($this); + if($newMessage) $message = $newMessage; + } + + return array( + 'items' => $items, + 'message' => $message + ); + } + /** * * @param boolean $includerelations a boolean value to indicate if the labels returned include relation fields