Skip to content
Browse files

API CHANGE Removed LeftAndMain->setApplicationName() $logoText parame…

…ter, and LeftAndMain->getApplicationLogoText(), overload templates instead
  • Loading branch information...
1 parent 05f0ce3 commit cfaec051413edeaaf7a647546c06a4735f48d2a4 @chillu chillu committed
Showing with 3 additions and 39 deletions.
  1. +1 −35 admin/code/LeftAndMain.php
  2. +2 −4 admin/templates/Includes/CMSTopMenu.ss
View
36 admin/code/LeftAndMain.php
@@ -1069,30 +1069,12 @@ function SwitchView() {
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 @@ static function setApplicationName($name, $logoText = null, $link = null) {
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 @@ function SectionTitle() {
*/
static function setLogo($logo) {
self::$application_logo = $logo;
- self::$application_logo_text = '';
}
/**
View
6 admin/templates/Includes/CMSTopMenu.ss
@@ -1,7 +1,5 @@
-<div id="Logo">
- <% if ApplicationLogoText %>
- <a href="$ApplicationLink" target="_blank">$ApplicationLogoText</a><br />
- <% end_if %>
+<div class="logo">
+ <a href="http://www.silverstripe.org/" target="_blank">SilverStripe</a><br />
</div>
<ul id="MainMenu">
<% control MainMenu %>

0 comments on commit cfaec05

Please sign in to comment.
Something went wrong with that request. Please try again.