Riverdashboard updated to new UI. DOM simplified a bit & css cleaned up.

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

5 files changed, 15 insertions, 20 deletions

diff --git a/views/default/annotation/annotate.php b/views/default/annotation/annotate.php
index 9e0d20881..a1940bed7 100644
--- a/views/default/annotation/annotate.php
+++ b/views/default/annotation/annotate.php
@@ -11,8 +11,8 @@
 	if($vars['item']->annotation_id != 0)
 		$comment = get_annotation($vars['item']->annotation_id)->value; 
 	$url = "<a href=\"{$performed_by->getURL()}\">{$performed_by->name}</a>";
-	$string = "<div class=\"river_content_title\">" . sprintf(elgg_echo("river:posted:generic"),$url) . " ";
-	$string .= elgg_echo("{$subtype}:river:annotate") . "  <a href=\"{$object->getURL()}\">" . $title . "</a> " . friendly_time($object->time_created) . "</div>";
+	$string = sprintf(elgg_echo("river:posted:generic"),$url) . " ";
+	$string .= elgg_echo("{$subtype}:river:annotate") . "  <a href=\"{$object->getURL()}\">" . $title . "</a> " . friendly_time($object->time_created);
 	if(get_context() != 'riverdashboard'){
 		$string .= "<div class=\"river_content_display\">";
 		if($comment){
diff --git a/views/default/css.php b/views/default/css.php
index 6673df876..91d93acf5 100644
--- a/views/default/css.php
+++ b/views/default/css.php
@@ -688,11 +688,8 @@ h2 {
 	PAGINATION
 *************************************** */
 .pagination {
-	-webkit-border-radius: 8px; 
-	-moz-border-radius: 8px;
-	background:white;
-	margin:5px 10px 5px 10px;
-	padding:5px;
+	margin:5px 0 5px 0;
+	padding:5px 0;
 }
 .pagination .pagination_number {
 	display:block;
@@ -732,7 +729,7 @@ h2 {
 .pagination .pagination_next {
 	display:block;
 	float:left;
-	border:1px solid #4690d6;
+	border:1px solid #cccccc;
 	color:#4690d6;
 	text-align: center;
 	font-size: 12px;
@@ -746,6 +743,7 @@ h2 {
 .pagination .pagination_previous:hover,
 .pagination .pagination_next:hover {
 	background:#4690d6;
+	border:1px solid #4690d6;
 	color:white;
 	text-decoration: none;
 }
@@ -753,7 +751,7 @@ h2 {
 	display:block;
 	float:left;
 	background:#4690d6;
-	border:1px solid #4690d6;
+	border:1px solid #cccccc;
 	text-align: center;
 	color:white;
 	font-size: 12px;
@@ -952,21 +950,18 @@ select.styled .select_option {
 	margin:0;
 	line-height:1.2em;
 }
-p.entity_title {
+.entity_title {
 	font-weight: bold;
 	font-size: 1.1em;
 	line-height:1.2em;
 	color:#666666;
 }
-p.entity_title a {
+.entity_title a {
 	color:#0054A7;
 }
-p.entity_subtext {
-	margin:0;
-	padding:0;
+.entity_subtext {
 	color:#666666;
 	font-size: 90%;
-	line-height:1.2em;
 }
 /* entity metadata block */
 .entity_metadata {
diff --git a/views/default/friends/river/create.php b/views/default/friends/river/create.php
index da9dde1f0..3b0b7c309 100644
--- a/views/default/friends/river/create.php
+++ b/views/default/friends/river/create.php
@@ -13,8 +13,8 @@ $performed_on = get_entity($vars['item']->object_guid);
 $url = $performed_on->getURL();
 
 $url = "<a href=\"{$performed_by->getURL()}\">{$performed_by->name}</a>";
-$string = "<div class=\"river_content_title\">" . sprintf(elgg_echo("friends:river:add"),$url) . " ";
-$string .= "<a href=\"{$performed_on->getURL()}\">{$performed_on->name}</a></div>";
+$string = sprintf(elgg_echo("friends:river:add"),$url) . " ";
+$string .= "<a href=\"{$performed_on->getURL()}\">{$performed_on->name}</a>";
 $string .= "<div class=\"river_content_display\">";
 $string .= "<table><tr><td>" . elgg_view("profile/icon",array('entity' => $performed_by, 'size' => 'tiny')) . "</td>";
 $string .= "<td><div class=\"following_icon\"></div></td><td>" . elgg_view("profile/icon",array('entity' => $performed_on, 'size' => 'tiny')) . "</td></tr></table>";
diff --git a/views/default/river/item/wrapper.php b/views/default/river/item/wrapper.php
index 0080cf48b..a00273648 100644
--- a/views/default/river/item/wrapper.php
+++ b/views/default/river/item/wrapper.php
@@ -26,7 +26,7 @@ if($avatar_icon == "icon"){
 						<?php
 								echo $vars['body'];
 						?>
-						<span class="river_item_time">
+						<span class="entity_subtext">
 							(<?php
 								echo friendly_time($vars['item']->posted);
 							?>)
@@ -51,7 +51,7 @@ if($avatar_icon == "icon"){
 			<?php
 				echo $vars['body'];
 			?>
-			<span class="river_item_time">
+			<span class="entity_subtext">
 				(<?php
 					echo friendly_time($vars['item']->posted);
 				?>)
diff --git a/views/default/river/wrapper.php b/views/default/river/wrapper.php
index 0b5bfad62..eddf5e2a2 100644
--- a/views/default/river/wrapper.php
+++ b/views/default/river/wrapper.php
@@ -34,7 +34,7 @@ if ($statement->getObject() instanceof ElggEntity) {
 					echo $vars['entry'];
 
 				?>
-				<span class="river_item_time">
+				<span class="entity_subtext">
 					(<?php
 
 						echo friendly_time($time);