9 files changed, 88 insertions, 21 deletions
diff --git a/mod/riverdashboard/index.php b/mod/riverdashboard/index.php
index 737fd4446..f269c66ba 100644
--- a/mod/riverdashboard/index.php
+++ b/mod/riverdashboard/index.php
@@ -51,7 +51,7 @@
 							break;
 		}
 
-		$river = elgg_view_river_items($subject_guid, 0, $relationship_type, $type, $subtype, '');
+		$river = elgg_view_river_items($subject_guid, 0, $relationship_type, $type, $subtype, '') . "</div>";
 		$body .= elgg_view('riverdashboard/nav',array(
 														'type' => $type,
 														'subtype' => $subtype,
diff --git a/mod/riverdashboard/start.php b/mod/riverdashboard/start.php
index b99cff0a0..0c765ffa5 100644
--- a/mod/riverdashboard/start.php
+++ b/mod/riverdashboard/start.php
@@ -11,9 +11,13 @@
 	 */
 
 		function riverdashboard_init() {
+		
+			extend_view('css','riverdashboard/css');
 			
 			register_page_handler('dashboard','riverdashboard_dashboard');
 			
+			
+			
 		}
 		
 		function riverdashboard_dashboard() {
diff --git a/mod/riverdashboard/views/default/riverdashboard/css.php b/mod/riverdashboard/views/default/riverdashboard/css.php
new file mode 100644
index 000000000..23474fbad
--- /dev/null
+++ b/mod/riverdashboard/views/default/riverdashboard/css.php
@@ -0,0 +1,18 @@
+<?php
+
+	/**
+	 * Elgg riverdashboard CSS
+	 * 
+	 * @package riverdashboard
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Curverider <info@elgg.com>
+	 * @copyright Curverider Ltd 2008-2009
+	 * @link http://elgg.org/
+	 */
+
+?>
+
+.sidebarBox .recentMember {
+	margin:0 4px 4px 4px;
+	float:left;
+}
+\ No newline at end of file
diff --git a/mod/riverdashboard/views/default/riverdashboard/nav.php b/mod/riverdashboard/views/default/riverdashboard/nav.php
index 56b232da0..6a485f229 100644
--- a/mod/riverdashboard/views/default/riverdashboard/nav.php
+++ b/mod/riverdashboard/views/default/riverdashboard/nav.php
@@ -25,13 +25,13 @@
 
 ?>
 
-<div class="riverdashboard_navigation">
-	<div class="riverdashboard_tabs">
-		<p>
-			<a <?php echo $allselect; ?> href="?type=<?php echo $vars['type']; ?>&content=<?php echo $vars['subtype']; ?>"><?php echo elgg_echo('all'); ?></a>
-			<a <?php echo $friendsselect; ?> href="?type=<?php echo $vars['type']; ?>&display=friends&content=<?php echo $vars['subtype']; ?>"><?php echo elgg_echo('friends'); ?></a>
-			<a <?php echo $mineselect; ?> href="?type=<?php echo $vars['type']; ?>&display=mine&content=<?php echo $vars['subtype']; ?>"><?php echo elgg_echo('mine'); ?></a>
-		</p>
+<div class="contentWrapper">
+	<div id="elgg_horizontal_tabbed_nav">
+		<ul>
+			<li><a <?php echo $allselect; ?> href="?type=<?php echo $vars['type']; ?>&content=<?php echo $vars['subtype']; ?>"><?php echo elgg_echo('all'); ?></a></li>
+			<li><a <?php echo $friendsselect; ?> href="?type=<?php echo $vars['type']; ?>&display=friends&content=<?php echo $vars['subtype']; ?>"><?php echo elgg_echo('friends'); ?></a></li>
+			<li><a <?php echo $mineselect; ?> href="?type=<?php echo $vars['type']; ?>&display=mine&content=<?php echo $vars['subtype']; ?>"><?php echo elgg_echo('mine'); ?></a></li>
+		</ul>
 	</div>
 	
 	<div class="riverdashboard_content_select">
@@ -53,4 +53,4 @@
 			<input type="submit" value="<?php echo elgg_echo('filter'); ?>" />
 		</form>
 	</div>
-</div>
-\ No newline at end of file
+<!-- </div> -->
+\ No newline at end of file
diff --git a/mod/riverdashboard/views/default/riverdashboard/newestmembers.php b/mod/riverdashboard/views/default/riverdashboard/newestmembers.php
index f25424a9e..62455e101 100644
--- a/mod/riverdashboard/views/default/riverdashboard/newestmembers.php
+++ b/mod/riverdashboard/views/default/riverdashboard/newestmembers.php
@@ -15,11 +15,12 @@
 	
 ?>
 
-<div id="recent_members">
+<div class="sidebarBox">
 <h3>Recent members</h3>
 <?php 
 	foreach($newest_members as $mem){
-		echo "<div style=\"float:left;\">" . elgg_view("profile/icon",array('entity' => $mem, 'size' => 'tiny')) . "</div>";
+		echo "<div class=\"recentMember\">" . elgg_view("profile/icon",array('entity' => $mem, 'size' => 'tiny')) . "</div>";
 	}
 ?>
+<div class="clearfloat"></div>
 </div>
 \ No newline at end of file
diff --git a/mod/riverdashboard/views/default/riverdashboard/sitemessage.php b/mod/riverdashboard/views/default/riverdashboard/sitemessage.php
index 610e84504..bf99e7dd3 100644
--- a/mod/riverdashboard/views/default/riverdashboard/sitemessage.php
+++ b/mod/riverdashboard/views/default/riverdashboard/sitemessage.php
@@ -13,6 +13,6 @@
 	 
 ?>
 
-<div id="sitewide_message">
+<div class="contentWrapper">
 <p>This would be a message from the site admin. This would be a message from the site admin. This would be a message from the site admin. This would be a message from the site admin.</p>
 </div>
 \ No newline at end of file
diff --git a/mod/riverdashboard/views/default/riverdashboard/welcome.php b/mod/riverdashboard/views/default/riverdashboard/welcome.php
index e39153ee7..16b48f453 100644
--- a/mod/riverdashboard/views/default/riverdashboard/welcome.php
+++ b/mod/riverdashboard/views/default/riverdashboard/welcome.php
@@ -13,7 +13,7 @@
 	 
 ?>
 
-<div id="welcome_message">
+<div class="contentWrapper">
 <p><b>Welcome <?php echo $_SESSION['user']->name; ?></b></p>
 <p>On this page you will find your gateway to the site and the recent activity from your network.</p>
 </div>
 \ No newline at end of file
diff --git a/views/default/css.php b/views/default/css.php
index 3d92fd2c6..766e147fa 100644
--- a/views/default/css.php
+++ b/views/default/css.php
@@ -1231,13 +1231,13 @@ table.search_gallery {
 .plugin_details a.manifest_details {
 	cursor:pointer;
 	font-size:80%;
-}
-.plugin_details a.pluginsettings_link {
-	cursor:pointer;
-	font-size:80%;
-}
-.pluginsettings {
-	display:none;
+}
+.plugin_details a.pluginsettings_link {
+	cursor:pointer;
+	font-size:80%;
+}
+.pluginsettings {
+	display:none;
 }
 .not-active .admin_plugin_enable_disable a {
 	float:right;
@@ -2146,3 +2146,47 @@ div.ajax_loader {
 	height:33px;
 }
 
+
+/* reusable elgg horizontal tabbed navigation 
+   (used on friends collections, and external pages mod)
+*/
+#elgg_horizontal_tabbed_nav {
+	margin:10px 0 10px 0;
+	padding: 0;
+	border-bottom: 1px solid #cccccc;
+	display:table;
+	width:100%;
+}
+#elgg_horizontal_tabbed_nav ul {
+	list-style: none;
+	padding: 0;
+	margin: 0;
+}
+#elgg_horizontal_tabbed_nav li {
+	float: left;
+	border: 1px solid #ffffff;
+	border-bottom-width: 0;
+	margin: 0;
+}
+#elgg_horizontal_tabbed_nav a {
+	text-decoration: none;
+	display: block;
+	padding: 0.22em 1em;
+	color: #666666;
+	text-align: center;
+}
+#elgg_horizontal_tabbed_nav a:hover {
+	color: #4690d6;
+}
+#elgg_horizontal_tabbed_nav .selected {
+	border-color: #cccccc;
+}
+#elgg_horizontal_tabbed_nav .selected a {
+	position: relative;
+	top: 1px;
+	background: white;
+	color: #4690d6;
+}
+
+
+
diff --git a/views/default/friends/collectiontabs.php b/views/default/friends/collectiontabs.php
index f9b74146c..31ae0eacd 100644
--- a/views/default/friends/collectiontabs.php
+++ b/views/default/friends/collectiontabs.php
@@ -7,7 +7,7 @@
 	
 ?>
 
-<div id="friendsPickerNavigationTabs">
+<div id="elgg_horizontal_tabbed_nav">
 <ul>
 <li class="selected"><a href="#" class="collectionmembers<?php echo $friendspicker . "\">" . elgg_echo('friends:collections:members'); ?></a></li>