Updated Sitepages homepage markup with clearfloat, content wrappers and associated...

git-svn-id: http://code.elgg.org/elgg/trunk@6304 36083f99-b078-4883-b0ff-0f9b5a30f544

diff --git a/mod/sitepages/start.php b/mod/sitepages/start.php
index 2974d3036e6eea678a66307f1503d4df3d4d1645..9f9bc1441ca3a56e3f44d530ca0850261a6c8927 100644 (file)
--- 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 9a2b841667b481ef6da650936d00134133cb2845..91fe9d9e3dc094aa270bb67e98b7f4da162483db 100644 (file)
--- 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 */\r
-       width:260px;\r
+<?php\r
+/**\r
+* Sitepages CSS\r
+*/\r
+?>\r
+#elgg_sidebar.frontpage {\r
+       margin-top:0;\r
 }\r
-\r
-#elgg_page_contents.frontpage { /* main page contents */\r
-       width:680px;\r
+#elgg_sidebar.frontpage .sitepages_sidebar_object {\r
+       margin-bottom: 30px;\r
+}\r
+#elgg_sidebar.frontpage .sitepages_sidebar_object h3 {\r
+       margin-top:12px;\r
+}\r
+#elgg_page_contents.frontpage .sitepages_welcome {\r
+       margin-bottom: 20px;\r
+}\r
+#elgg_page_contents.frontpage .sitepages_message {\r
+       margin-top: 10px;\r
 }
\ 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 8ec177fd8ebcb01459c03e15fe63bbf41cd71387..455f71a58163b503ad169a74f4d0dad4d6b01c13 100644 (file)
--- 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;\r
  \r
 if($sidebarmessage){\r
-       echo "<h3>" . $sidebartitle . "</h3>";\r
-       echo $sidebarmessage;\r
+       echo "<div class='sitepages_sidebar_object clearfloat'><h3>" . $sidebartitle . "</h3>";\r
+       echo $sidebarmessage ."</div>";\r
 }
\ 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 bf97eb81f4d8d7235e67722959a9d4788ec799b9..c8032f4af13b08a12f01eb1d0d0df01ab15e3601 100644 (file)
--- 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;\r
 \r
 if($welcomemessage){\r
-       echo "<h2>" . $welcometitle . "</h2>";\r
-       echo $welcomemessage;\r
+       echo "<div class='sitepages_welcome clearfloat'><h2>" . $welcometitle . "</h2>";\r
+       echo "<div class='sitepages_message'>".$welcomemessage."</div></div>";\r
 }
\ No newline at end of file