From eb65c1c79e5b8dee99b3bfc53442a3302afce55f Mon Sep 17 00:00:00 2001
From: "Michael J. Rubinsky" <mrubinsk@horde.org>
Date: Mon, 16 Aug 2010 13:23:01 -0400
Subject: [PATCH] Tweak facebook block style

---
 horde/services/facebook.php                   |  3 ++-
 horde/templates/block/facebook_story.html.php | 11 +++++++----
 horde/themes/facebook.css                     |  4 +++-
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/horde/services/facebook.php b/horde/services/facebook.php
index 2f5db7eba..dd97f7a67 100644
--- a/horde/services/facebook.php
+++ b/horde/services/facebook.php
@@ -92,7 +92,8 @@ if ($token = Horde_Util::getFormData('auth_token')) {
         foreach ($posts as $post) {
                 $postView = new Horde_View(array('templatePath' => HORDE_TEMPLATES . '/block'));
                 $postView->actorImgUrl = $profiles[(string)$post['actor_id']]['pic_square'];
-                $postView->actorProfileLink =  Horde::externalUrl($profiles[(string)$post['actor_id']]['url'], true) . $profiles[(string)$post['actor_id']]['name'] . '</a>';
+                $postView->actorProfileLink =  Horde::externalUrl($profiles[(string)$post['actor_id']]['url'], true);
+                $postView->actorName = $profiles[(string)$post['actor_id']]['name'];
                 $postView->message = empty($post['message']) ? '' : $post['message'];
                 $postView->attachment = empty($post['attachment']) ? null : $post['attachment'];
                 $postView->likes = $post['likes'];
diff --git a/horde/templates/block/facebook_story.html.php b/horde/templates/block/facebook_story.html.php
index 04f65825d..8984a5264 100644
--- a/horde/templates/block/facebook_story.html.php
+++ b/horde/templates/block/facebook_story.html.php
@@ -12,11 +12,14 @@
  */
 ?>
 <div class="hordeSmStreamstory">
- <div class="fbstreampic"><img style="float:left;" src="<?php echo $this->actorImgUrl ?>" /></div>
- <div class="hodreSmStreambody">
-  <?php echo $this->actorProfileLink ?><br />
+ <div class="hordeSmAvatar"><img width="48px" height="48px" src="<?php echo $this->actorImgUrl ?>" alt="<?php echo $this->actorName ?>" /></div>
+ <div class="hordeSmStreambody">
+  <?php echo $this->actorProfileLink . $this->actorName?></a><br />
   <?php echo empty($this->message) ? '' : $this->message;?>
-  <?php if(!empty($this->attachment)):?>
+  <?php if(!empty($this->attachment) &&
+           (!empty($this->attachment['description']) ||
+            !empty($this->attachment['media']) ||
+            !empty($this->attachment['caption']))):?>
     <div class="fbattachment">
       <?php if (!empty($this->attachment['media']) && count($this->attachment['media'])):?>
         <div class="fbmedia<?php echo count($this->attachment['media']) > 1 ? ' fbmediawide' : ''?>">
diff --git a/horde/themes/facebook.css b/horde/themes/facebook.css
index f2d78881c..57d83cf5f 100644
--- a/horde/themes/facebook.css
+++ b/horde/themes/facebook.css
@@ -119,8 +119,10 @@
     width: 50px;
 }
 .fbattachment {
-    margin-top: 6px;
+    margin: 6px 6px 0 0;
     overflow: hidden;
+    padding: 4px;
+    border: 1px solid #3B5998;
 }
 .fbattachmenttitle {
     font-weight: bold;
-- 
2.11.0