]> gitweb.fluxo.info Git - lorea/elgg.git/commitdiff
projects / lorea / elgg.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 7433b07)
object/blog view uses new media view - needs some clean up
authorcash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
Sat, 4 Dec 2010 21:53:38 +0000 (21:53 +0000)
committercash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
Sat, 4 Dec 2010 21:53:38 +0000 (21:53 +0000)
git-svn-id: http://code.elgg.org/elgg/trunk@7531 36083f99-b078-4883-b0ff-0f9b5a30f544

engine/lib/views.php patch | blob | history
mod/blog/views/default/object/blog.php patch | blob | history
views/default/annotation/generic_comment.php patch | blob | history
views/default/comments/latest.php patch | blob | history
views/default/css/screen.php patch | blob | history
views/default/entities/list.php patch | blob | history

diff --git a/engine/lib/views.php b/engine/lib/views.php
index 789348567f5e0b588fcfde6c557cc19637f80a5e..249177c4e7288a42836dfe18d3ecb3f9cfcfa07a 100644 (file)
--- 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 975ea713a68519923b19b47add2149fc492297c2..0638c2fc4d25e34d1164a87dc9652367606e3686 100644 (file)
--- 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 ac603e9785d96b85b731e933feffdf2724c5e7cd..7b26756a3549789a41e7b9b6d03bc21b318fb1fb 100644 (file)
--- 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 f8e1af10f8f0be009d9f253af4905df4f207f48e..c38b1f5c4b983a96dc9c43731285b26ca15fae07 100644 (file)
--- 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 6450f541ce4fe929a97f7e5f4c49931459fb2aaf..0026d803809e72bf84d0dd10620081a22f87c3db 100644 (file)
--- 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 d35c6650045e274a79a181bb2d2b074973722b2f..2ddd96ee96cd937294fa4110fb839847827c085c 100644 (file)
--- 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);
Social Networking Engine