From 7ba9437564bc6ab830c79a3261f107798105bbb6 Mon Sep 17 00:00:00 2001
From: pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
Date: Tue, 1 Jun 2010 12:04:45 +0000
Subject: Updated Sitepages homepage markup with clearfloat, content wrappers
 and associated css.

git-svn-id: http://code.elgg.org/elgg/trunk@6304 36083f99-b078-4883-b0ff-0f9b5a30f544
---
 mod/sitepages/start.php                           |  3 +++
 mod/sitepages/views/default/sitepages/css.php     | 23 ++++++++++++++++++-----
 mod/sitepages/views/default/sitepages/sidebar.php |  4 ++--
 mod/sitepages/views/default/sitepages/welcome.php |  4 ++--
 4 files changed, 25 insertions(+), 9 deletions(-)

diff --git a/mod/sitepages/start.php b/mod/sitepages/start.php
index 2974d3036..9f9bc1441 100644
--- a/mod/sitepages/start.php
+++ b/mod/sitepages/start.php
@@ -25,6 +25,9 @@
 function sitepages_init() {
 	require_once(dirname(__FILE__) . '/sitepages_functions.php');
 	global $CONFIG;
+	
+	// Extend CSS
+	elgg_extend_view('css', 'sitepages/css');
 
 	// register our subtype
 	run_function_once('sitepages_runonce');
diff --git a/mod/sitepages/views/default/sitepages/css.php b/mod/sitepages/views/default/sitepages/css.php
index 9a2b84166..91fe9d9e3 100644
--- a/mod/sitepages/views/default/sitepages/css.php
+++ b/mod/sitepages/views/default/sitepages/css.php
@@ -1,7 +1,20 @@
-#elgg_sidebar.frontpage { /* elgg sidebar */
-	width:260px;
+<?php
+/**
+* Sitepages CSS
+*/
+?>
+#elgg_sidebar.frontpage {
+	margin-top:0;
 }
-
-#elgg_page_contents.frontpage { /* main page contents */
-	width:680px;
+#elgg_sidebar.frontpage .sitepages_sidebar_object {
+	margin-bottom: 30px;
+}
+#elgg_sidebar.frontpage .sitepages_sidebar_object h3 {
+	margin-top:12px;
+}
+#elgg_page_contents.frontpage .sitepages_welcome {
+	margin-bottom: 20px;
+}
+#elgg_page_contents.frontpage .sitepages_message {
+	margin-top: 10px;
 }
\ No newline at end of file
diff --git a/mod/sitepages/views/default/sitepages/sidebar.php b/mod/sitepages/views/default/sitepages/sidebar.php
index 8ec177fd8..455f71a58 100644
--- a/mod/sitepages/views/default/sitepages/sidebar.php
+++ b/mod/sitepages/views/default/sitepages/sidebar.php
@@ -8,6 +8,6 @@ $sidebartitle = $sitepages_object->sidebartitle;
 $sidebarmessage = $sitepages_object->sidebarmessage;
  
 if($sidebarmessage){
-	echo "<h3>" . $sidebartitle . "</h3>";
-	echo $sidebarmessage;
+	echo "<div class='sitepages_sidebar_object clearfloat'><h3>" . $sidebartitle . "</h3>";
+	echo $sidebarmessage ."</div>";
 }
\ No newline at end of file
diff --git a/mod/sitepages/views/default/sitepages/welcome.php b/mod/sitepages/views/default/sitepages/welcome.php
index bf97eb81f..c8032f4af 100644
--- a/mod/sitepages/views/default/sitepages/welcome.php
+++ b/mod/sitepages/views/default/sitepages/welcome.php
@@ -8,6 +8,6 @@ $welcometitle = $sitepages_object->welcometitle;
 $welcomemessage = $sitepages_object->welcomemessage;
 
 if($welcomemessage){
-	echo "<h2>" . $welcometitle . "</h2>";
-	echo $welcomemessage;
+	echo "<div class='sitepages_welcome clearfloat'><h2>" . $welcometitle . "</h2>";
+	echo "<div class='sitepages_message'>".$welcomemessage."</div></div>";
 }
\ No newline at end of file
-- 
cgit v1.2.3