Changeset 407700

Timestamp:

07/10/2011 03:46:49 AM (15 years ago)

Author:

sproject

Message:

1.3.3 release

Location:

facebook-likes-you/trunk

Files:

• facebook-likes-you.php (modified) (6 diffs)
• readme.txt (modified) (2 diffs)

facebook-likes-you/trunk/facebook-likes-you.php

@@ -4 +4 @@
 Plugin URI: http://www.sproject.name/download/wp-facebook-likes-you/
 Description: Facebook Likes You! is simple plugin which makes it easy to add Facebook Like button and widgetable Like box. It's fully configurable, so you can decide where to append the button.
-Version: 1.3.2
+Version: 1.3.3
 Author: Piotr Sochalewski
 Author URI: http://www.sproject.name/
@@ -245 +245 @@
 }
 
+function fb_like_count_margin() {
+    global $fb_like_settings;
+
+    return $fb_like_settings['margin_top'] . 'px '
+        . $fb_like_settings['margin_right'] . 'px ' 
+        . $fb_like_settings['margin_bottom'] . 'px '
+        . $fb_like_settings['margin_left'] . 'px';
+}
+
 /* Generate code for Google +1 Button. Nothing more. */
-function generate_google1() {
+function fb_like_generate_google1() {
     global $fb_like_settings;
     
@@ -252 +261 @@
         switch($fb_like_settings['layout']) {
             case "standard":
-                return '<div style="float: right;"><g:plusone href="' . get_permalink() . '"></g:plusone></div>';
+                return '<div style="float: right; margin: ' . fb_like_count_margin() . '"><g:plusone href="' . get_permalink() . '"></g:plusone></div>';
                 break;                  
             case "button_count":
-                return '<div style="float: right;"><g:plusone size="medium" href="' . get_permalink() . '"></g:plusone></div>';
+                return '<div style="float: right; margin: ' . fb_like_count_margin() . '"><g:plusone size="medium" href="' . get_permalink() . '"></g:plusone></div>';
                 break;
             case "standard (show faces)": case "box_count":
-                return '<div style="float: right;"><g:plusone size="tall" href="' . get_permalink() . '"></g:plusone></div>';
+                return '<div style="float: right; margin: ' . fb_like_count_margin() . '"><g:plusone size="tall" href="' . get_permalink() . '"></g:plusone></div>';
                 break;
         }
@@ -268 +277 @@
     global $fb_like_settings;
     
-    $margin = $fb_like_settings['margin_top'] . 'px '
-        . $fb_like_settings['margin_right'] . 'px ' 
-        . $fb_like_settings['margin_bottom'] . 'px '
-        . $fb_like_settings['margin_left'] . 'px';
+    $margin = fb_like_count_margin();
 
     if($fb_like_settings['xfbml']) {
@@ -306 +312 @@
         $url .= ($fb_like_settings['css_style']!='') ? ' ' . $fb_like_settings['css_style'] . '"' : '"';
         
-        return '<div id="fb-root"></div><script src="http://connect.facebook.net/' . $locale . '/all.js#appId=' . fb_like_return_appid() . '&xfbml=1" type="text/javascript"></script> <fb:like' . $url . '></fb:like>' . generate_google1();
+        return '<div id="fb-root"></div><script src="http://connect.facebook.net/' . $locale . '/all.js#appId=' . fb_like_return_appid() . '&xfbml=1" type="text/javascript"></script> <fb:like' . $url . '></fb:like>' . fb_like_generate_google1();
         /* END OF XFBML VERSION */
     }
@@ -336 +342 @@
             
         if($fb_like_settings['html5'])
-            return $url.'" style="scrolling:no; allowTransparency:true; border:none; overflow:hidden; width:'.$fb_like_settings['width'].'px; height:'.$height.'px; margin:'.$margin.'; '.$fb_like_settings['css_style'].'"></iframe>' . generate_google1();
+            return $url.'" style="scrolling:no; allowTransparency:true; border:none; overflow:hidden; width:'.$fb_like_settings['width'].'px; height:'.$height.'px; margin:'.$margin.'; '.$fb_like_settings['css_style'].'"></iframe>' . fb_like_generate_google1();
         else
-            return $url.'" scrolling="no" frameborder="0" style="border:none; overflow:hidden; width:'.$fb_like_settings['width'].'px; height:'.$height.'px; margin:'.$margin.'; '.$fb_like_settings['css_style'].'" allowTransparency="true"></iframe>' . generate_google1();
+            return $url.'" scrolling="no" frameborder="0" style="border:none; overflow:hidden; width:'.$fb_like_settings['width'].'px; height:'.$height.'px; margin:'.$margin.'; '.$fb_like_settings['css_style'].'" allowTransparency="true"></iframe>' . fb_like_generate_google1();
         /* END OF STANDARD (NON-XFBML) VERSION */
     }

facebook-likes-you/trunk/readme.txt

@@ -5 +5 @@
 Requires at least: 2.9
 Tested up to: 3.2
-Stable tag: 1.3.2
+Stable tag: 1.3.3
 
 Facebook Likes You! is simple plugin which makes it easy to add Like Button and widgetable Like Box. Google +1 Button isn't a problem too!
@@ -45 +45 @@
 
 == Changelog ==
+
+= 1.3.3 =
+* Margins work for Google +1 Button too
 
 = 1.3.2 =