3 files changed, 84 insertions, 37 deletions
diff --git a/_graphics/footer_logo.gif b/_graphics/footer_logo.gif
new file mode 100644
index 000000000..4e0c95e55
--- /dev/null
+++ b/_graphics/footer_logo.gif
diff --git a/views/default/css.php b/views/default/css.php
index d0eed0d27..802a38e51 100644
--- a/views/default/css.php
+++ b/views/default/css.php
@@ -252,12 +252,22 @@ h6 { font-size: 0.8em; }
 	background: url(<?php echo $vars['url']; ?>_graphics/footer_back.gif) repeat-x left top;
 	height:80px;
 }
-#layout_footer p {
-   padding:20px;
+#layout_footer table {
+   margin:0 0 0 20px;
 }
-#layout_footer a {
+#layout_footer a, #layout_footer p {
    color:white;
+   margin:0;
 }
+#layout_footer .footer_toolbar_links {
+	text-align:right;
+	padding:15px 0 0 0;
+	font-size:1.2em;
+}
+#layout_footer .footer_legal_links {
+	text-align:right;
+}
+
 /* ***************************************
   WIDGET PICKER (PROFILE & DASHBOARD)
 *************************************** */
@@ -558,18 +568,18 @@ a.toggle_customise_edit_panel:hover {
     background:#F7DAD8;
     color:#000000;
     padding:3px 10px 3px 10px;
-    margin:20px 20px 0px 20px;
+    margin:20px 20px 0px 180px;
     z-index: 99999;
     position:absolute;
-    width:936px;
+    width:776px;
 }
 /* IE6 fix */
 * html .messages { 
-	width:777px;
+	margin:20px 20px 0px 20px;
 }
 /* IE7 */
 *:first-child+html .messages {
-	width:777px;
+	margin:20px 20px 0px 20px;
 }
 
 /* ***************************************
@@ -993,8 +1003,9 @@ p.user_menu_friends_of {
 	padding:0px 10px 20px 0px;
 }
 	
-	
-	
+#forums, #forum_topics, #topic_posts {
+	background:white;
+}	
 	
 	
 	
diff --git a/views/default/page_elements/footer.php b/views/default/page_elements/footer.php
index c7ac30a36..4828c5caa 100644
--- a/views/default/page_elements/footer.php
+++ b/views/default/page_elements/footer.php
@@ -1,29 +1,65 @@
-<?php
-
-	/**
-	 * Elgg footer
-	 * The standard HTML footer that displays across the site
-	 * 
-	 * @package Elgg
-	 * @subpackage Core
-	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
-	 * @author Curverider Ltd
-	 * @copyright Curverider Ltd 2008
-	 * @link http://elgg.org/
-	 * 
-	 */
-?>
-
-<div class="clearfloat"></div>
-
-<div id="layout_footer">
-<p><a href="http://elgg.com/">Elgg</a></p>
-</div><!-- /#layout_footer -->
-
-<div class="clearfloat"></div>
-
-</div><!-- /#page_wrapper -->
-</div><!-- /#page_container -->
-
-</body>
+<?php
+
+	/**
+	 * Elgg footer
+	 * The standard HTML footer that displays across the site
+	 * 
+	 * @package Elgg
+	 * @subpackage Core
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Curverider Ltd
+	 * @copyright Curverider Ltd 2008
+	 * @link http://elgg.org/
+	 * 
+	 */
+?>
+
+<div class="clearfloat"></div>
+
+<div id="layout_footer">
+<table width="958" height="79" border="1" cellpadding="0" cellspacing="0">
+	<tr>
+		<td width="310" height="50">
+		<a href="http://www.elgg.org" target="_blank">
+		<img src="<?php echo $vars['url']; ?>_graphics/footer_logo.gif" border="0" />
+		</a>
+		</td>
+		
+		<td width="648" height="50" align="right">
+		<p class="footer_toolbar_links">
+		|  <a href="">Dashboard</a>
+		|  <a href="">Profile</a>
+		|  <a href="">Messages</a>
+		|  <a href="">Shouts</a>
+		|  <a href="">Blog</a>
+		|  <a href="">Forums</a>
+		|  <a href="">Sharing</a>
+		|  <a href="">Files</a>  |
+		</p>
+		</td>
+	</tr>
+	
+	<tr>
+		<td width="310" height="28">
+		<p><small>Copyright &copy; 2008 elgg.org. All rights reserved.</small></p>
+		</td>
+		
+		<td width="648" height="28" align="right">
+		<p class="footer_legal_links"><small>
+		 | <a href="">Privacy Statement</a>
+		 | <a href="">Security Statement</a>
+		 | <a href="">Terms of Use</a> |
+		</small>
+		</p>
+		</td>
+	</tr>
+</table>
+</div><!-- /#layout_footer -->
+
+<div class="clearfloat"></div>
+
+</div><!-- /#page_wrapper -->
+</div><!-- /#page_container -->
+
+</body>
 </html>
 \ No newline at end of file