diff --git a/admin/code/LeftAndMain.php b/admin/code/LeftAndMain.php index 1108bd008..f8f2ed613 100644 --- a/admin/code/LeftAndMain.php +++ b/admin/code/LeftAndMain.php @@ -1068,31 +1068,13 @@ class LeftAndMain extends Controller { */ static $application_name = 'SilverStripe CMS'; - /** - * The application logo text. Customisable by calling - * LeftAndMain::setApplicationName() - the second parameter. - * - * @var String - */ - static $application_logo_text = 'SilverStripe'; - - /** - * Set the application name, and the logo text. - * - * @param String $name The application name - * @param String $logoText The logo text - */ - static $application_link = "http://www.silverstripe.org/"; - /** * @param String $name * @param String $logoText * @param String $link (Optional) */ - static function setApplicationName($name, $logoText = null, $link = null) { + static function setApplicationName($name) { self::$application_name = $name; - self::$application_logo_text = $logoText ? $logoText : $name; - if($link) self::$application_link = $link; } /** @@ -1102,21 +1084,6 @@ class LeftAndMain extends Controller { function getApplicationName() { return self::$application_name; } - - /** - * Get the application logo text. - * @return String - */ - function getApplicationLogoText() { - return self::$application_logo_text; - } - - /** - * @return String - */ - function ApplicationLink() { - return self::$application_link; - } /** * Return the title of the current section, as shown on the main menu @@ -1145,7 +1112,6 @@ class LeftAndMain extends Controller { */ static function setLogo($logo) { self::$application_logo = $logo; - self::$application_logo_text = ''; } /** diff --git a/admin/templates/Includes/CMSTopMenu.ss b/admin/templates/Includes/CMSTopMenu.ss index 8e6064231..6bd2df0ce 100644 --- a/admin/templates/Includes/CMSTopMenu.ss +++ b/admin/templates/Includes/CMSTopMenu.ss @@ -1,7 +1,5 @@ -