object/blog view uses new media view - needs some clean up

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

4 files changed, 17 insertions, 10 deletions

diff --git a/views/default/annotation/generic_comment.php b/views/default/annotation/generic_comment.php
index ac603e978..7b26756a3 100644
--- a/views/default/annotation/generic_comment.php
+++ b/views/default/annotation/generic_comment.php
@@ -3,14 +3,14 @@
  * Elgg generic comment view
  *
  * @uses $vars['annotation']  ElggAnnotation object
- * @uses $vars['full_view']   Display fill view or brief view
+ * @uses $vars['full']   Display fill view or brief view
  */
 
 if (!isset($vars['annotation'])) {
 	return true;
 }
 
-$full_view = elgg_get_array_value('full_view', $vars, true);
+$full_view = elgg_get_array_value('full', $vars, true);
 
 $comment = $vars['annotation'];
 
diff --git a/views/default/comments/latest.php b/views/default/comments/latest.php
index f8e1af10f..c38b1f5c4 100644
--- a/views/default/comments/latest.php
+++ b/views/default/comments/latest.php
@@ -6,7 +6,7 @@
  */
 
 if (isset($vars['comments'])) {
-	echo '<ul class="elgg-latest-comments">';
+	echo '<ul class="elgg-latest-comments elgg-list">';
 	foreach ($vars['comments'] as $comment) {
 		$html = elgg_view_annotation($comment, false);
 		if ($html) {
diff --git a/views/default/css/screen.php b/views/default/css/screen.php
index 6450f541c..0026d8038 100644
--- a/views/default/css/screen.php
+++ b/views/default/css/screen.php
@@ -360,11 +360,11 @@ h2 {
 	margin-right: 10px;
 }
 
-.elgg-latest-comments li {
+.elgg-list li {
 	border-bottom: 1px dotted #CCCCCC;
 }
 
-.elgg-latest-comments:first-child {
+.elgg-list {
     border-top: 1px dotted #CCCCCC;
 }
 
@@ -1277,25 +1277,32 @@ a.widget-edit-button:hover, a.widget-delete-button:hover {
 	line-height:1.2em;
 }
 /* entity metadata block */
+.elgg-metadata {
+	float:right;
+	margin-left:15px;
+	color:#aaaaaa;
+	font-size: 90%;
+}
 .entity-metadata {
 	float:right;
 	margin:0 3px 0 15px;
 	color:#aaaaaa;
 	font-size: 90%;
 }
-.entity-metadata span {
+.entity-metadata span, .elgg-metadata span {
 	margin-left:14px;
 	text-align:right;
 }
-.entity-metadata .entity-edit a {
+.entity-metadata .entity-edit a, .elgg-metadata .entity-edit a {
 	color:#aaaaaa;
 }
-.entity-metadata .entity-edit a:hover {
+.entity-metadata .entity-edit a:hover, .elgg-metadata .entity-edit a:hover {
 	color:#555555;
 }
-.entity-metadata .delete-button {
+.entity-metadata .delete-button, .elgg-metadata .delete-button {
 	margin-top:3px;
 }
+
 /* override hover for lists of site users/members */
 .members-list .entity-listing:hover {
 	background-color:white;
diff --git a/views/default/entities/list.php b/views/default/entities/list.php
index d35c66500..2ddd96ee9 100644
--- a/views/default/entities/list.php
+++ b/views/default/entities/list.php
@@ -42,7 +42,7 @@ if ($pagination) {
 
 if ($list_type == 'list') {
 	if (is_array($entities) && sizeof($entities) > 0) {
-		$html .= '<ul class="elgg-entity-list">';
+		$html .= '<ul class="elgg-entity-list elgg-list">';
 		foreach ($entities as $entity) {
 			$html .= '<li>';
 			$html .= elgg_view_entity($entity, $full_view);