trac750 better settings tab workflow

darcs-hash:20090106205738-7b5ce-e80f73130a1f699e8d33f31c63cf90ee259b72cd.gz

3 files changed, 8 insertions, 4 deletions

diff --git a/_darcs/pristine/actions/facebookhome.php b/_darcs/pristine/actions/facebookhome.php
index 069ea5e75..6206fb6c2 100644
--- a/_darcs/pristine/actions/facebookhome.php
+++ b/_darcs/pristine/actions/facebookhome.php
@@ -75,7 +75,7 @@ class FacebookhomeAction extends FacebookAction
                     $flink_id = $flink->insert();
 
                     if ($flink_id) {
-                        echo '<fb:success message="You can now use the Identi.ca from Facebook!" />';
+                        echo '<fb:success message="You can now use Identi.ca from Facebook!" />';
                     }
 
                     $this->show_home($facebook, $fbuid, $user);
diff --git a/_darcs/pristine/actions/facebooksettings.php b/_darcs/pristine/actions/facebooksettings.php
index 469bcfc45..d28b1aa5c 100644
--- a/_darcs/pristine/actions/facebooksettings.php
+++ b/_darcs/pristine/actions/facebooksettings.php
@@ -69,10 +69,12 @@ class FacebooksettingsAction extends FacebookAction
 
         $fbml = '<fb:if-section-not-added section="profile">'
             .'<h2>Add an Identi.ca box to my profile</h2>'
-            .'<fb:add-section-button section="profile"/>'
+            .'<p><fb:add-section-button section="profile"/></p>'
             .'</fb:if-section-not-added>';
 
-        $fbml .= '<fb:prompt-permission perms="status_update"><h2>Allow Identi.ca to update my Facebook status</h2></fb:prompt-permission>';
+        $fbml .= '<p><fb:prompt-permission perms="status_update"><h2>Allow Identi.ca to update my Facebook status</h2></fb:prompt-permission></p>';
+
+        if ($facebook->api_client->users_hasAppPermission('status_update')) {
 
         $fbml .= '<form method="post" id="facebook_settings">'
         .'<h2>Sync preferences</h2>'
@@ -101,6 +103,8 @@ class FacebooksettingsAction extends FacebookAction
         .'</p>'
         .'</form>';
 
+    }
+
         echo $fbml;
 
         $this->show_footer();
diff --git a/_darcs/pristine/lib/facebookaction.php b/_darcs/pristine/lib/facebookaction.php
index 7fa097587..9230bad59 100644
--- a/_darcs/pristine/lib/facebookaction.php
+++ b/_darcs/pristine/lib/facebookaction.php
@@ -72,7 +72,7 @@ class FacebookAction extends Action
          }
          </style>';
 
-        $html = Facebookaction::Aender_notice($notice);
+        $html = Facebookaction::render_notice($notice);
 
  
         $fbml = "<fb:wide>$style $html</fb:wide>";