From 2b48549e0cc30e7efe23c85918ce049106ff4ab3 Mon Sep 17 00:00:00 2001
From: "Michael J. Rubinsky" <mrubinsk@horde.org>
Date: Thu, 1 Jul 2010 13:09:03 -0400
Subject: [PATCH] Use Horde styled elements.

Start getting rid of facebook/twitter specific design elements.
Still use the selectors that help with layout though.
---
 horde/lib/Block/fb_stream.php        | 4 ++--
 horde/lib/Block/twitter_timeline.php | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/horde/lib/Block/fb_stream.php b/horde/lib/Block/fb_stream.php
index 4a72254c4..93bb17931 100644
--- a/horde/lib/Block/fb_stream.php
+++ b/horde/lib/Block/fb_stream.php
@@ -183,7 +183,7 @@ EOF;
 
         // Bring in the Facebook CSS
         $html .= '<link href="' . $csslink . '" rel="stylesheet" type="text/css" />';
-        $html .= '<div class="fbbody" style="float:left;padding-left: 8px;padding-right:8px;">';
+        $html .= '<div style="float:left;padding-left: 8px;padding-right:8px;">';
 
         // User's current status and input box to change it.
         $fql = 'SELECT first_name, last_name, status, pic_square_with_logo from user where uid=' . $fbp['uid'] . ' LIMIT 1';
@@ -215,7 +215,7 @@ EOF;
             //TODO: We could probably cache this perm somehow - maybe in the session?
             if ($facebook->users->hasAppPermission(Horde_Service_Facebook_Auth::EXTEND_PERMS_PUBLISHSTREAM)) {
                 $html .= '<input style="width:100%;margin-top:4px;margin-bottom:4px;" type="text" class="fbinput" id="newStatus" name="newStatus" />'
-                . '<div class="fbaction"><a class="fbbutton" onclick="updateStatus($F(\'newStatus\'), $(\'newStatus\'));" href="#">' . _("Update") . '</a></div>'
+                . '<div><a class="button" onclick="updateStatus($F(\'newStatus\'), $(\'newStatus\'));" href="#">' . _("Update") . '</a></div>'
                 . Horde::img('loading.gif', '', array('id' => 'loading', 'style' => 'display:none;'));
             }
         } catch (Horde_Service_Facebook_Exception $e) {
diff --git a/horde/lib/Block/twitter_timeline.php b/horde/lib/Block/twitter_timeline.php
index 7f0e52d80..7fcbe02c9 100644
--- a/horde/lib/Block/twitter_timeline.php
+++ b/horde/lib/Block/twitter_timeline.php
@@ -137,9 +137,9 @@ class Horde_Block_Horde_twitter_timeline extends Horde_Block
         $csslink = $GLOBALS['registry']->get('themesuri', 'horde') . '/facebook.css';
         $defaultText = _("What are you working on now?");
         $html = '<link href="' . $csslink . '" rel="stylesheet" type="text/css" />';
-        $html .= '<div class="fbbody" style="float:left;padding-left: 8px;padding-right:8px;">'
+        $html .= '<div style="float:left;padding-left: 8px;padding-right:8px;">'
            . '<input style="width:98%;margin-top:4px;margin-bottom:4px;" type="text" id="' . $instance . '_newStatus" name="' . $instance . '_newStatus" value="' . $defaultText . '" />'
-           . '<div class="fbaction"><a class="fbbutton" onclick="Horde.twitter.updateStatus($F(\'' . $instance . '_newStatus\'));" href="#">' . _("Update") . '</a><span id="' . $instance . '_inReplyTo"></span></div>'
+           . '<div><a class="button" onclick="Horde.twitter.updateStatus($F(\'' . $instance . '_newStatus\'));" href="#">' . _("Update") . '</a><span id="' . $instance . '_inReplyTo"></span></div>'
            . Horde::img('loading.gif', '', array('id' => $instance . '_loading', 'style' => 'display:none;'));
         $html .= '<div id="currentStatus" class="fbemptystatus" style="margin-left:10px;margin-top:10px;">' . sprintf(_("Latest: %s - %s"), $latestStatus, Horde_Date_Utils::relativeDateTime(strtotime($this->_profile->status->created_at), $GLOBALS['prefs']->getValue('date_format'), ($GLOBALS['prefs']->getValue('twentyFour') ? "%H:%M %P" : "%I %M %P"))) . '</div>';
         $html .= '<div id="twitter_body' . $instance . '">';
-- 
2.11.0