From 4ece630febf2c1275c7781e8cb9d4f4321aacfc1 Mon Sep 17 00:00:00 2001
From: brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
Date: Thu, 15 Jul 2010 11:17:01 +0000
Subject: Fixes #2284.  Pulled out home link in elgg_header to
 page_elements/elgg_header_logo. Removed csseditor-specific code that caused
 custom logos to still appear even when csseditor was disabled.

git-svn-id: http://code.elgg.org/elgg/trunk@6709 36083f99-b078-4883-b0ff-0f9b5a30f544
---
 views/default/page_elements/elgg_header.php      | 16 +++++-----------
 views/default/page_elements/elgg_header_logo.php | 10 ++++++++++
 2 files changed, 15 insertions(+), 11 deletions(-)
 create mode 100644 views/default/page_elements/elgg_header_logo.php

(limited to 'views')

diff --git a/views/default/page_elements/elgg_header.php b/views/default/page_elements/elgg_header.php
index d036fcf46..7cd52a32b 100644
--- a/views/default/page_elements/elgg_header.php
+++ b/views/default/page_elements/elgg_header.php
@@ -7,24 +7,18 @@
 ?>
 <div id="elgg_header">
 	<div id="elgg_header_contents">
-		<!-- site name -->
-		<h1><a href="<?php echo $vars['url']; ?>"><?php
-		$logo = $vars['config']->site->customlogo;
-		$logo_time = $vars['config']->site->customlogo_time;
-		if (empty($logo)) {
-			echo "<span class='network_title'>".$vars['config']->sitename ."</span>";
-		} else {
-			echo "<img class='custom_logo' src=\"{$vars['url']}pg/csseditor/{$logo_time}.jpg\" alt=\"". htmlentities($vars['config']->sitename) ."\" />";	
-		}
-		?></a></h1>
 		<?php
+			// link back to main site.
+			echo elgg_view('page_elements/elgg_header_logo', $vars);
+			
 			// drop-down login
 			echo elgg_view('account/forms/login_dropdown');
 		
 			// insert site-wide navigation
 			echo elgg_view('navigation/site_nav');
+
 			// insert a view which can be extended
 			echo elgg_view('header/extend');
 		?>
 	</div>
-</div>
\ No newline at end of file
+</div>
diff --git a/views/default/page_elements/elgg_header_logo.php b/views/default/page_elements/elgg_header_logo.php
new file mode 100644
index 000000000..4449c9644
--- /dev/null
+++ b/views/default/page_elements/elgg_header_logo.php
@@ -0,0 +1,10 @@
+<?php
+/**
+ * Elgg header logo
+ * The logo to display in elgg_header.
+ **/
+?>
+
+<h1><a href="<?php echo $vars['url']; ?>">
+<span class='network_title'><?php echo $vars['config']->sitename; ?></span>
+</a></h1>
-- 
cgit v1.2.3