diff options
| -rw-r--r-- | engine/lib/views.php | 2 | ||||
| -rw-r--r-- | mod/blog/views/default/object/blog.php | 40 | ||||
| -rw-r--r-- | views/default/annotation/generic_comment.php | 4 | ||||
| -rw-r--r-- | views/default/comments/latest.php | 2 | ||||
| -rw-r--r-- | views/default/css/screen.php | 19 | ||||
| -rw-r--r-- | views/default/entities/list.php | 2 |
6 files changed, 42 insertions, 27 deletions
diff --git a/engine/lib/views.php b/engine/lib/views.php index 789348567..249177c4e 100644 --- a/engine/lib/views.php +++ b/engine/lib/views.php @@ -800,7 +800,7 @@ function elgg_view_annotation(ElggAnnotation $annotation, $full = true, $bypass $params = array( 'annotation' => $annotation, - 'full_view' => $full, + 'full' => $full, ); $view = $annotation->view; diff --git a/mod/blog/views/default/object/blog.php b/mod/blog/views/default/object/blog.php index 975ea713a..0638c2fc4 100644 --- a/mod/blog/views/default/object/blog.php +++ b/mod/blog/views/default/object/blog.php @@ -79,11 +79,7 @@ if ($full) { ); $header = elgg_view('content/header', $params); -echo <<<___HTML -$header -<div class="entity-listing-icon"> - $owner_icon -</div> + $info = <<<HTML <div class="entity-listing-info clearfix"> <div class="entity-metadata">$edit</div> <p class="entity-subtext"> @@ -94,20 +90,28 @@ $header </p> $tags </div> -<div class='blog_post'> +HTML; + + $params = array( + 'img' => $owner_icon, + 'body' => $info, + ); + $blog_info = elgg_view('layout_elements/media', $params); + +echo <<<HTML +$header +$blog_info +<div class="blog_post elgg-content"> $body </div> - -___HTML; +HTML; } else { - echo <<<___HTML -<div class="blog $status_class entity-listing clearfix"> - <div class="entity-listing-icon"> - $owner_icon - </div> + // brief view + + $body = <<<HTML <div class="entity-listing-info"> - <div class="entity-metadata">$edit</div> + <div class="elgg-metadata">$edit</div> <p class="entity-title">$linked_title</p> <p class="entity-subtext"> $author_text @@ -118,7 +122,11 @@ ___HTML; $tags <p>$excerpt</p> </div> -</div> +HTML; -___HTML; + $params = array( + 'img' => $owner_icon, + 'body' => $body, + ); + echo elgg_view('layout_elements/media', $params); } 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); |