From 2c03dd569c4c0ff45b0f98de490a9de540c9b2b5 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Mon, 28 Feb 2011 12:20:47 -0800
Subject: [PATCH] visual tweaks for convo view

---
 lib/noticelist.php         |  7 ++++++-
 lib/threadednoticelist.php | 23 ++++++++++++++++++++---
 theme/base/css/display.css | 12 ++++++++++++
 3 files changed, 38 insertions(+), 4 deletions(-)

diff --git a/lib/noticelist.php b/lib/noticelist.php
index 7b2fbb1e7c..8c07f904c8 100644
--- a/lib/noticelist.php
+++ b/lib/noticelist.php
@@ -329,7 +329,7 @@ class NoticeListItem extends Widget
 
     function showAvatar()
     {
-	$avatar_size = AVATAR_STREAM_SIZE;
+        $avatar_size = $this->avatarSize();
 
         $avatar = $this->profile->getAvatar($avatar_size);
 
@@ -345,6 +345,11 @@ class NoticeListItem extends Widget
                                          $this->profile->nickname));
     }
 
+    function avatarSize()
+    {
+        return AVATAR_STREAM_SIZE;
+    }
+
     /**
      * show the nickname of the author
      *
diff --git a/lib/threadednoticelist.php b/lib/threadednoticelist.php
index 3a6e5e76c4..933a051f38 100644
--- a/lib/threadednoticelist.php
+++ b/lib/threadednoticelist.php
@@ -168,10 +168,8 @@ class ThreadedNoticeListItem extends NoticeListItem
         if ($notices) {
             $this->out->elementStart('ul', 'notices threaded-notices xoxo');
             foreach (array_reverse($notices) as $notice) {
-                $this->out->elementStart('li');
-                $item = new NoticeListItem($notice, $this->out);
+                $item = new ThreadedNoticeListSubItem($notice, $this->out);
                 $item->show();
-                $this->out->elementEnd('li');
             }
             $this->out->elementEnd('ul');
         }
@@ -179,3 +177,22 @@ class ThreadedNoticeListItem extends NoticeListItem
         parent::showEnd();
     }
 }
+
+class ThreadedNoticeListSubItem extends NoticeListItem
+{
+
+    function avatarSize()
+    {
+        return AVATAR_STREAM_SIZE; // @fixme would like something in between
+    }
+
+    function showNoticeLocation()
+    {
+        //
+    }
+
+    function showNoticeSource()
+    {
+        //
+    }
+}
\ No newline at end of file
diff --git a/theme/base/css/display.css b/theme/base/css/display.css
index 383b9c6ec2..817de209ba 100644
--- a/theme/base/css/display.css
+++ b/theme/base/css/display.css
@@ -1109,6 +1109,18 @@ border-top-width:1px;
 border-top-style:solid;
 }
 
+/* Threaded notices sublist */
+#content .notices .threaded-notices {
+    margin-left: 10%;
+    width: 90%;
+
+    background: #e4e8f1;
+}
+#content .threaded-notices .notice .author .photo {
+    left: 8px;
+    width: 32px;
+    height: 32px;
+}
 /* NOTICES */
 #notices_primary {
 float:left;