trac750 New CSS files for FB app to allow bettter per-install theming

diff --git a/lib/facebookaction.php b/lib/facebookaction.php
index 0a364851febccdf29b4e73129bccbf075ed839b4..fd171c4578bfdbcebacf6d9cf8869b6fb68329b1 100644 (file)
--- a/lib/facebookaction.php
+++ b/lib/facebookaction.php
@@ -37,7 +37,11 @@ class FacebookAction extends Action
 
         common_element('link', array('rel' => 'stylesheet',
                                      'type' => 'text/css',
-                                     'href' => getFacebookCSS()));
+                                     'href' => getFacebookBaseCSS()));
+
+        common_element('link', array('rel' => 'stylesheet',
+                                     'type' => 'text/css',
+                                     'href' => getFacebookThemeCSS()));
 
         common_element('script', array('type' => 'text/javascript',
                                        'src' => getFacebookJS()),

diff --git a/lib/facebookutil.php b/lib/facebookutil.php
index 74e5945923e785b899b9fb6b7a2063a6b976d627..0bde68c0f6dc1afedf1b1c807a061f0b59cd2ada 100644 (file)
--- a/lib/facebookutil.php
+++ b/lib/facebookutil.php
@@ -107,14 +107,22 @@ function update_profile_box($facebook, $fbuid, $user, $notice)
     $facebook->api_client->profile_setFBML(null, $fbuid, $fbml, null, null, $fbml_main);
 }
 
-function getFacebookCSS()
+function getFacebookBaseCSS()
 {
     # Add a timestamp to the CSS file so Facebook cache wont ignore our changes
-    $ts = filemtime(theme_file('facebookapp.css'));
-    $cssurl = theme_path('facebookapp.css') . "?ts=$ts";
+    $ts = filemtime(theme_file('facebookapp_base.css'));
+    $cssurl = theme_path('facebookapp_base.css') . "?ts=$ts";
     return $cssurl;
 }
 
+function getFacebookThemeCSS() 
+{
+    # Add a timestamp to the CSS file so Facebook cache wont ignore our changes
+    $ts = filemtime(theme_file('facebookapp_theme.css'));
+    $cssurl = theme_path('facebookapp_theme.css') . "?ts=$ts";
+    return $cssurl;   
+}
+
 function getFacebookJS() {
 
     # Add a timestamp to the FBJS file so Facebook cache wont ignore our changes