Permalink
Browse files

API CHANGE Removed LeftAndMain->setLogo() $logoStyle parameter and Le…

…ftAndMain->LogoStyle(), use CSS
  • Loading branch information...
1 parent e3928a0 commit 05f0ce3a21a9032e0ea9111fc18566a18412a7f1 @chillu chillu committed Mar 30, 2011
Showing with 2 additions and 25 deletions.
  1. +1 −24 admin/code/LeftAndMain.php
  2. +1 −1 admin/templates/Includes/CMSTopMenu.ss
View
@@ -1137,39 +1137,16 @@ function SectionTitle() {
* @var unknown_type
*/
static $application_logo = 'sapphire/admin/images/mainmenu/logo.gif';
-
- /**
- * The application logo style. Customisable by calling
- * LeftAndMain::setLogo() - the second parameter.
- *
- * @var String
- */
- static $application_logo_style = '';
/**
* Set the CMS application logo.
*
* @param String $logo Relative path to the logo
- * @param String $logoStyle Custom CSS styles for the logo
- * e.g. "border: 1px solid red; padding: 5px;"
*/
- static function setLogo($logo, $logoStyle) {
+ static function setLogo($logo) {
self::$application_logo = $logo;
- self::$application_logo_style = $logoStyle;
self::$application_logo_text = '';
}
-
- /**
- * Combines an optional background image and additional CSS styles,
- * set through {@link setLogo()}.
- *
- * @return String CSS attribute
- */
- function LogoStyle() {
- $attr = self::$application_logo_style;
- if(self::$application_logo) $attr .= "background: url(" . self::$application_logo . ") no-repeat; ";
- return $attr;
- }
/**
* Return the base directory of the tiny_mce codebase
@@ -1,4 +1,4 @@
-<div id="Logo" style="$LogoStyle">
+<div id="Logo">
<% if ApplicationLogoText %>
<a href="$ApplicationLink" target="_blank">$ApplicationLogoText</a><br />
<% end_if %>

0 comments on commit 05f0ce3

Please sign in to comment.