pagination on river fixed / styled, and site message styled

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

4 files changed, 23 insertions, 20 deletions

diff --git a/mod/riverdashboard/views/default/riverdashboard/nav.php b/mod/riverdashboard/views/default/riverdashboard/nav.php
index 6a485f229..bfebf8420 100644
--- a/mod/riverdashboard/views/default/riverdashboard/nav.php
+++ b/mod/riverdashboard/views/default/riverdashboard/nav.php
@@ -15,11 +15,11 @@
 	

 	$allselect = ''; $friendsselect = ''; $mineselect = '';

 	switch($vars['orient']) {

-		case '':		$allselect = 'class="riverdashboard_tabs_selected"';

+		case '':		$allselect = 'class="selected"';

 						break;

-		case 'friends':		$friendsselect = 'class="riverdashboard_tabs_selected"';

+		case 'friends':		$friendsselect = 'class="selected"';

 						break;

-		case 'mine':		$mineselect = 'class="riverdashboard_tabs_selected"';

+		case 'mine':		$mineselect = 'class="selected"';

 						break;

 	}

 

@@ -28,13 +28,13 @@
 <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>

+			<li <?php echo $allselect; ?> ><a href="?type=<?php echo $vars['type']; ?>&content=<?php echo $vars['subtype']; ?>"><?php echo elgg_echo('all'); ?></a></li>

+			<li <?php echo $friendsselect; ?> ><a href="?type=<?php echo $vars['type']; ?>&display=friends&content=<?php echo $vars['subtype']; ?>"><?php echo elgg_echo('friends'); ?></a></li>

+			<li <?php echo $mineselect; ?> ><a 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">

+	<div class="riverdashboard_filtermenu">

 		<form action="index.php">

 			<select name="content">

 				<?php

@@ -50,7 +50,7 @@
 				?>

 			</select>

 			<input type="hidden" name="display" value="<?php echo htmlentities($vars['orient']); ?>" />

-			<input type="submit" value="<?php echo elgg_echo('filter'); ?>" />

+			<!-- <input type="submit" value="<?php echo elgg_echo('filter'); ?>" /> -->

 		</form>

 	</div>

 <!-- </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 62455e101..34398706f 100644
--- a/mod/riverdashboard/views/default/riverdashboard/newestmembers.php
+++ b/mod/riverdashboard/views/default/riverdashboard/newestmembers.php
@@ -17,10 +17,12 @@
 

 <div class="sidebarBox">

 <h3>Recent members</h3>

+<div class="membersWrapper">

 <?php 

 	foreach($newest_members as $mem){

 		echo "<div class=\"recentMember\">" . elgg_view("profile/icon",array('entity' => $mem, 'size' => 'tiny')) . "</div>";

 	}

 ?>

 <div class="clearfloat"></div>

+</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 8b8aaf3b0..cb81700bb 100644
--- a/mod/riverdashboard/views/default/riverdashboard/sitemessage.php
+++ b/mod/riverdashboard/views/default/riverdashboard/sitemessage.php
@@ -25,7 +25,7 @@
 	

 ?>

 

-	<div class="contentWrapper">

+	<div class="contentWrapper welcomemessage">

 	

 <?php

 

diff --git a/views/default/river/item/list.php b/views/default/river/item/list.php
index 8b7d37bd0..127d1cdd9 100644
--- a/views/default/river/item/list.php
+++ b/views/default/river/item/list.php
@@ -21,25 +21,26 @@
 	

 	$nav = '';

 	

+	if (sizeof($vars['items']) > $vars['limit']) {

+		$newoffset = $vars['offset'] + $vars['limit'];

+		$urladdition = 'offset='.$newoffset;

+		if (substr_count($baseurl,'?')) $nexturl=$baseurl . '&' . $urladdition; else $nexturl=$baseurl . '?' . $urladdition;

+		

+		$nav .= '<a class="back" href="'.$nexturl.'">' . elgg_echo('previous') . '</a> ';

+	}

+		

 	if ($vars['offset'] > 0) {

 		$newoffset = $vars['offset'] - $vars['limit'];

 		if ($newoffset < 0) $newoffset = 0;

 		$urladdition = 'offset='.$newoffset;

 		if (substr_count($baseurl,'?')) $prevurl=$baseurl . '&' . $urladdition; else $prevurl=$baseurl . '?' . $urladdition;

 		

-		$nav .= '<a href="'.$prevurl.'">' . elgg_echo('previous') . '</a> ';

-	}  

-	

-	if (sizeof($vars['items']) > $vars['limit']) {

-		$newoffset = $vars['offset'] + $vars['limit'];

-		$urladdition = 'offset='.$newoffset;

-		if (substr_count($baseurl,'?')) $nexturl=$baseurl . '&' . $urladdition; else $nexturl=$baseurl . '?' . $urladdition;

-		

-		$nav .= '<a href="'.$nexturl.'">' . elgg_echo('next') . '</a> ';

-	} 

+		$nav .= '<a class="forward" href="'.$prevurl.'">' . elgg_echo('next') . '</a> ';

+	}

+ 

 	

 	if (!empty($nav)) {

-		echo '<div class="river_pagination>"<p>'.$nav.'</p></div>';

+		echo '<div class="river_pagination"><p>'.$nav.'</p><div class="clearfloat"></div></div>';

 	}

 

 ?>