summaryrefslogtreecommitdiff
path: root/actions
diff options
context:
space:
mode:
authorZach Copley <zach@controlyourself.ca>2008-12-07 18:59:25 -0500
committerZach Copley <zach@controlyourself.ca>2008-12-07 18:59:25 -0500
commitbdb27cfce8337e96ccafc52721e3d41de9b02e0e (patch)
treeb2b9701d5420c159f1818df2071814eac9a2fb30 /actions
parentdccf8374cf7e4673cbc83f695e1665031bdf6539 (diff)
trac750 - linked in CSS file and added CSS for profile box
- added button for adding a box to the profile on settings darcs-hash:20081207235925-7b5ce-224fd2482f66c2c9ac9da9ce72c1c0da0243bd83.gz
Diffstat (limited to 'actions')
-rw-r--r--actions/facebookhome.php49
-rw-r--r--actions/facebooksettings.php8
2 files changed, 50 insertions, 7 deletions
diff --git a/actions/facebookhome.php b/actions/facebookhome.php
index b58110bcc..b261e6a8c 100644
--- a/actions/facebookhome.php
+++ b/actions/facebookhome.php
@@ -137,8 +137,9 @@ class FacebookhomeAction extends FacebookAction {
echo '<ul>';
- common_pagination($page > 1, $cnt > NOTICES_PER_PAGE,
- $page, 'all', array('nickname' => $user->nickname));
+ $this->pagination($page > 1, $cnt > NOTICES_PER_PAGE,
+ $page, 'index.php', array('nickname' => $user->nickname));
+
}
@@ -147,13 +148,49 @@ class FacebookhomeAction extends FacebookAction {
$notice = $user->getCurrentNotice();
- $html = $this->render_notice($notice);
+ # Need to include CSS for styling the Profile box
- $fbml = "<fb:wide>$html</fb:wide>";
- $fbml .= "<fb:narrow>$html</fb:narrow>";
+ $style = '<style>
+ #notices {
+ clear: both;
+ margin: 0 auto;
+ padding: 0;
+ list-style-type: none;
+ width: 600px;
+ border-top: 1px solid #dec5b5;
+ }
+ #notices a:hover {
+ text-decoration: underline;
+ }
+ .notice_single {
+ clear: both;
+ display: block;
+ margin: 0;
+ padding: 5px 5px 5px 0;
+ min-height: 48px;
+ font-family: Georgia, "Times New Roman", Times, serif;
+ font-size: 13px;
+ line-height: 16px;
+ border-bottom: 1px solid #dec5b5;
+ background-color:#FCFFF5;
+ opacity:1;
+ }
+ .notice_single:hover {
+ background-color: #f7ebcc;
+ }
+ .notice_single p {
+ display: inline;
+ margin: 0;
+ padding: 0;
+ }
+ </style>';
+
+ $html = $this->render_notice($notice);
- $fbml_main = "<fb:narrow>$html</fb:narrow>";
+ $fbml = "<fb:wide>$content $html</fb:wide>";
+ $fbml .= "<fb:narrow>$content $html</fb:narrow>";
+ $fbml_main = "<fb:narrow>$content $html</fb:narrow>";
$facebook->api_client->profile_setFBML(NULL, $fbuid, $fbml, NULL, NULL, $fbml_main);
diff --git a/actions/facebooksettings.php b/actions/facebooksettings.php
index 3855a0c29..4d7000d60 100644
--- a/actions/facebooksettings.php
+++ b/actions/facebooksettings.php
@@ -35,9 +35,15 @@ class FacebooksettingsAction extends FacebookAction {
$fbuid = $facebook->require_login();
+ $fbml = '<fb:if-section-not-added section="profile">'
+ .'<h2>Add an Identi.ca box to your profile!</h2>'
+ .'<fb:add-section-button section="profile"/>'
+ .'</fb:if-section-not-added>';
+
+
$this->show_header('Settings');
- echo '<h2>Coming soon...</h2>';
+ echo $fbml;
$this->show_footer();