Custom Facebook Feed - Version 1.6.8.1

Version Description

  • Tweak: Moved 'View on Facebook' link up to be level with the date rather than on the line below it
  • Fix: Don't show the caption when it is the same as the post text
  • Fix: Fixed issue with enqueueing JavaScript file
Download this release

Release Info

Developer smashballoon
Plugin Icon 128x128 Custom Facebook Feed
Version 1.6.8.1
Comparing to
See all releases

Code changes from version 1.6.8 to 1.6.8.1

Files changed (6) hide show
  1. README.txt +7 -2
  2. css/cff-admin-style.css +17 -2
  3. css/cff-style.css +3 -2
  4. custom-facebook-feed-admin.php +43 -54
  5. custom-facebook-feed.php +16 -25
  6. js/cff-scripts.js +2 -2
README.txt CHANGED
@@ -2,8 +2,8 @@
2
  Contributors: smashballoon
3
  Tags: facebook, custom, customizable, feed, events, seo, search engine, responsive, mobile, shortcode, social, status, posts
4
  Requires at least: 3.0
5
- Tested up to: 3.7.1
6
- Stable tag: 1.6.8
7
  License: GPLv2 or later
8
  License URI: http://www.gnu.org/licenses/gpl-2.0.html
9
 
@@ -121,6 +121,11 @@ You can embed your Facebook feed directly into a template file by using the Word
121
 
122
  == Changelog ==
123
 
 
 
 
 
 
124
  = 1.6.8 =
125
  * New: Added option to remove border from the Like box when showing faces
126
  * New: Set "Like" box text color to either blue or white
2
  Contributors: smashballoon
3
  Tags: facebook, custom, customizable, feed, events, seo, search engine, responsive, mobile, shortcode, social, status, posts
4
  Requires at least: 3.0
5
+ Tested up to: 3.8
6
+ Stable tag: 1.6.8.1
7
  License: GPLv2 or later
8
  License URI: http://www.gnu.org/licenses/gpl-2.0.html
9
 
121
 
122
  == Changelog ==
123
 
124
+ = 1.6.8.1 =
125
+ * Tweak: Moved 'View on Facebook' link up to be level with the date rather than on the line below it
126
+ * Fix: Don't show the caption when it is the same as the post text
127
+ * Fix: Fixed issue with enqueueing JavaScript file
128
+
129
  = 1.6.8 =
130
  * New: Added option to remove border from the Like box when showing faces
131
  * New: Set "Like" box text color to either blue or white
css/cff-admin-style.css CHANGED
@@ -1,13 +1,22 @@
1
- #cff-admin .bump-left{
 
2
  padding-left: 10px;
3
  }
4
  #cff-admin .cff-tooltip{
5
  display: none;
 
 
 
 
 
 
 
 
6
  }
7
  #cff-admin hr{
8
  border: none;
9
  margin: 25px 0;
10
- border-bottom: 3px solid #eee;
11
  }
12
  #cff-admin select{
13
  width: 150px;
@@ -36,4 +45,10 @@
36
  display: block;
37
  float: left;
38
  width: 60px;
 
 
 
 
 
 
39
  }
1
+ #cff-admin th.bump-left,
2
+ #cff-admin a.bump-left{
3
  padding-left: 10px;
4
  }
5
  #cff-admin .cff-tooltip{
6
  display: none;
7
+ padding: 10px 0;
8
+ }
9
+ #cff-admin .cff-tooltip ul{
10
+ margin-top: 0;
11
+ margin-bottom: 0;
12
+ }
13
+ #cff-admin .cff-tooltip li{
14
+ padding: 4px 0;
15
  }
16
  #cff-admin hr{
17
  border: none;
18
  margin: 25px 0;
19
+ border-bottom: 1px solid #ccc;
20
  }
21
  #cff-admin select{
22
  width: 150px;
45
  display: block;
46
  float: left;
47
  width: 60px;
48
+ margin-top: 5px;
49
+ }
50
+ #cff-admin .hndle{
51
+ /*background: #333;
52
+ color: #fff;*/
53
+ font-size: 16px;
54
  }
css/cff-style.css CHANGED
@@ -52,7 +52,7 @@
52
  /* Date */
53
  #cff .cff-date{
54
  float: left;
55
- width: 100%;
56
  font-size: 11px;
57
  }
58
  /************/
@@ -158,7 +158,8 @@
158
  #cff .cff-viewpost-facebook{
159
  float: right;
160
  clear: none;
161
- padding-top: 12px;
 
162
  font-size: 11px;
163
  }
164
 
52
  /* Date */
53
  #cff .cff-date{
54
  float: left;
55
+ width: auto;
56
  font-size: 11px;
57
  }
58
  /************/
158
  #cff .cff-viewpost-facebook{
159
  float: right;
160
  clear: none;
161
+ padding-top: 4px;
162
+ padding-left: 4px;
163
  font-size: 11px;
164
  }
165
 
custom-facebook-feed-admin.php CHANGED
@@ -829,27 +829,27 @@ function cff_style_page() {
829
  <tbody>
830
  <h3><?php _e('General'); ?></h3>
831
  <tr valign="top">
832
- <th scope="row"><?php _e('Feed Width'); ?></th>
833
  <td>
834
  <input name="cff_feed_width" type="text" value="<?php esc_attr_e( $cff_feed_width ); ?>" size="6" />
835
  <span>Eg. 500px, 50%, 10em. <i style="color: #666; font-size: 11px; margin-left: 5px;"><?php _e('Default is 100%'); ?></i></span>
836
  </td>
837
  </tr>
838
  <tr valign="top">
839
- <th scope="row"><?php _e('Feed Height'); ?></th>
840
  <td>
841
  <input name="cff_feed_height" type="text" value="<?php esc_attr_e( $cff_feed_height ); ?>" size="6" />
842
  <span>Eg. 500px, 50em. <i style="color: #666; font-size: 11px; margin-left: 5px;"><?php _e('Leave empty to set no maximum height. If the feed exceeds this height then a scroll bar will be used.'); ?></i></span>
843
  </td>
844
  </tr>
845
- <th scope="row"><?php _e('Feed Padding'); ?></th>
846
  <td>
847
  <input name="cff_feed_padding" type="text" value="<?php esc_attr_e( $cff_feed_padding ); ?>" size="6" />
848
  <span>Eg. 20px, 5%. <i style="color: #666; font-size: 11px; margin-left: 5px;"><?php _e('This is the amount of padding/spacing that goes around the feed. This is particularly useful if you intend to set a background color on the feed.'); ?></i></span>
849
  </td>
850
  </tr>
851
  <tr valign="top">
852
- <th scope="row"><?php _e('Feed Background Color'); ?></th>
853
  <td>
854
  <label for="cff_bg_color">#</label>
855
  <input name="cff_bg_color" type="text" value="<?php esc_attr_e( $cff_bg_color ); ?>" size="10" placeholder="Eg. ED9A00" />
@@ -857,7 +857,7 @@ function cff_style_page() {
857
  </td>
858
  </tr>
859
  <tr valign="top">
860
- <th scope="row"><?php _e('Show name and picture of author'); ?></th>
861
  <td>
862
  <input name="cff_show_author" type="checkbox" id="cff_show_author" <?php if($cff_show_author == true) echo "checked"; ?> />
863
  <label for="cff_show_status_type">Yes</label>
@@ -866,7 +866,7 @@ function cff_style_page() {
866
  </td>
867
  </tr>
868
  <tr valign="top">
869
- <th scope="row"><?php _e('Add CSS class to feed'); ?></th>
870
  <td>
871
  <input name="cff_class" type="text" value="<?php esc_attr_e( $cff_class ); ?>" size="25" />
872
  <i style="color: #666; font-size: 11px; margin-left: 5px;"><?php _e('To add multiple classes separate each with a space, Eg. classone classtwo classthree'); ?></i>
@@ -953,7 +953,7 @@ function cff_style_page() {
953
  <table class="form-table">
954
  <tbody>
955
  <tr valign="top">
956
- <th scope="row"><?php _e('Include the following in posts:'); ?><br /><?php _e('(when applicable)'); ?>
957
  <br /><i style="color: #666; font-size: 11px;"><a href="http://smashballoon.com/custom-facebook-feed/" target="_blank"><?php _e('Upgrade to Pro to enable all of these options'); ?></a></i></th>
958
  <td>
959
  <div>
@@ -990,7 +990,7 @@ function cff_style_page() {
990
  </div>
991
  <div>
992
  <input type="checkbox" name="cff_show_link" id="cff_show_link" <?php if($cff_show_link == true) echo 'checked="checked"' ?> />
993
- <label for="cff_show_link"><?php _e('View on Facebook/View Link'); ?></label>
994
  </div>
995
  </td>
996
  </tr>
@@ -1244,53 +1244,53 @@ function cff_style_page() {
1244
  <a class="cff-tooltip-link" href="JavaScript:void(0);"><?php _e('Translate this'); ?></a>
1245
  <div class="cff-tooltip">
1246
  <div class="cff-tooltip-table">
1247
- <p><?php _e('Translate the text below into the language you would like to use:'); ?></p>
1248
 
1249
 
1250
  <label for="cff_translate_second"><?php _e("second"); ?></label>
1251
- <input name="cff_translate_second" type="text" value="<?php esc_attr_e( $cff_translate_second ); ?>" size="30" />
1252
  <br />
1253
  <label for="cff_translate_seconds"><?php _e("seconds"); ?></label>
1254
- <input name="cff_translate_seconds" type="text" value="<?php esc_attr_e( $cff_translate_second ); ?>" size="30" />
1255
  <br />
1256
  <label for="cff_translate_minute"><?php _e("minute"); ?></label>
1257
- <input name="cff_translate_minute" type="text" value="<?php esc_attr_e( $cff_translate_minute ); ?>" size="30" />
1258
  <br />
1259
  <label for="cff_translate_minutes"><?php _e("minutes"); ?></label>
1260
- <input name="cff_translate_minutes" type="text" value="<?php esc_attr_e( $cff_translate_minutes ); ?>" size="30" />
1261
  <br />
1262
  <label for="cff_translate_hour"><?php _e("hour"); ?></label>
1263
- <input name="cff_translate_hour" type="text" value="<?php esc_attr_e( $cff_translate_hour ); ?>" size="30" />
1264
  <br />
1265
  <label for="cff_translate_hours"><?php _e("hours"); ?></label>
1266
- <input name="cff_translate_hours" type="text" value="<?php esc_attr_e( $cff_translate_hours ); ?>" size="30" />
1267
  <br />
1268
  <label for="cff_translate_day"><?php _e("day"); ?></label>
1269
- <input name="cff_translate_day" type="text" value="<?php esc_attr_e( $cff_translate_day ); ?>" size="30" />
1270
  <br />
1271
  <label for="cff_translate_days"><?php _e("days"); ?></label>
1272
- <input name="cff_translate_days" type="text" value="<?php esc_attr_e( $cff_translate_days ); ?>" size="30" />
1273
  <br />
1274
  <label for="cff_translate_week"><?php _e("week"); ?></label>
1275
- <input name="cff_translate_week" type="text" value="<?php esc_attr_e( $cff_translate_week ); ?>" size="30" />
1276
  <br />
1277
  <label for="cff_translate_weeks"><?php _e("weeks"); ?></label>
1278
- <input name="cff_translate_weeks" type="text" value="<?php esc_attr_e( $cff_translate_weeks ); ?>" size="30" />
1279
  <br />
1280
  <label for="cff_translate_month"><?php _e("month"); ?></label>
1281
- <input name="cff_translate_month" type="text" value="<?php esc_attr_e( $cff_translate_month ); ?>" size="30" />
1282
  <br />
1283
  <label for="cff_translate_months"><?php _e("months"); ?></label>
1284
- <input name="cff_translate_months" type="text" value="<?php esc_attr_e( $cff_translate_months ); ?>" size="30" />
1285
  <br />
1286
  <label for="cff_translate_year"><?php _e("year"); ?></label>
1287
- <input name="cff_translate_year" type="text" value="<?php esc_attr_e( $cff_translate_year ); ?>" size="30" />
1288
  <br />
1289
  <label for="cff_translate_years"><?php _e("years"); ?></label>
1290
- <input name="cff_translate_years" type="text" value="<?php esc_attr_e( $cff_translate_years ); ?>" size="30" />
1291
  <br />
1292
  <label for="cff_translate_ago"><?php _e("ago"); ?></label>
1293
- <input name="cff_translate_ago" type="text" value="<?php esc_attr_e( $cff_translate_ago ); ?>" size="30" />
1294
  </div>
1295
  </div>
1296
 
@@ -1300,7 +1300,7 @@ function cff_style_page() {
1300
  <th><label for="cff_date_custom" class="bump-left"><?php _e('Custom format'); ?></label></th>
1301
  <td>
1302
  <input name="cff_date_custom" type="text" value="<?php esc_attr_e( $cff_date_custom ); ?>" size="10" placeholder="Eg. F j, Y" />
1303
- <i style="color: #666; font-size: 11px;">(<a href="http://smashballoon.com/custom-facebook-feed/docs/date/" target="_blank"><?php _e('Examples'); ?></a>)</i>
1304
  </td>
1305
  </tr>
1306
  <tr>
@@ -1467,7 +1467,7 @@ function cff_style_page() {
1467
  <th><label for="cff_event_date_custom" class="bump-left"><?php _e('Custom event date format'); ?></label></th>
1468
  <td>
1469
  <input name="cff_event_date_custom" type="text" value="<?php esc_attr_e( $cff_event_date_custom ); ?>" size="10" placeholder="Eg. F j, Y - g:ia" />
1470
- <i style="color: #666; font-size: 11px;">(<a href="http://smashballoon.com/custom-facebook-feed/docs/date/" target="_blank"><?php _e('Examples'); ?></a>)</i>
1471
  </td>
1472
  </tr>
1473
  </tbody>
@@ -1579,20 +1579,6 @@ function cff_style_page() {
1579
  <i style="color: #666; font-size: 11px; margin-left: 5px;"><?php _e('Use different text in place of the default "View on Facebook" link'); ?></i>
1580
  </td>
1581
  </tr>
1582
- <tr>
1583
- <th><label for="cff_view_link_text" class="bump-left"><?php _e('Custom "View Link" text'); ?></label></th>
1584
- <td>
1585
- <input name="cff_view_link_text" type="text" value="<?php esc_attr_e( $cff_view_link_text ); ?>" size="20" />
1586
- <i style="color: #666; font-size: 11px; margin-left: 5px;"><?php _e('Use different text in place of the default "View on Facebook" link'); ?></i>
1587
- </td>
1588
- </tr>
1589
- <tr>
1590
- <th><label for="cff_link_to_timeline" class="bump-left"><?php _e('Link statuses to your page'); ?></label></th>
1591
- <td>
1592
- <input type="checkbox" name="cff_link_to_timeline" id="cff_link_to_timeline" <?php if($cff_link_to_timeline == true) echo 'checked="checked"' ?> />&nbsp;Yes
1593
- <i style="color: #666; font-size: 11px; margin-left: 5px;"><?php _e("Check this if you'd like to link statuses to your Facebook timeline/page instead of to their individual posts on Facebook"); ?></i>
1594
- </td>
1595
- </tr>
1596
 
1597
  </tbody>
1598
  </table>
@@ -1628,18 +1614,17 @@ function cff_style_page() {
1628
  </tbody>
1629
  </table>
1630
  <hr />
1631
- <h3><?php _e('Misc'); ?></h3>
1632
  <table class="form-table">
1633
  <tbody>
1634
- <tr><td><b style="font-size: 14px;"><?php _e('Like Box'); ?></b></td></tr>
1635
  <tr valign="top">
1636
- <th scope="row"><label class="bump-left"><?php _e('Show the Like Box'); ?></label></th>
1637
  <td>
1638
  <input type="checkbox" name="cff_show_like_box" id="cff_show_like_box" <?php if($cff_show_like_box == true) echo 'checked="checked"' ?> />
1639
  </td>
1640
  </tr>
1641
  <tr valign="top">
1642
- <th scope="row"><label class="bump-left"><?php _e('Like Box Position'); ?></label></th>
1643
  <td>
1644
  <select name="cff_like_box_position">
1645
  <option value="bottom" <?php if($cff_like_box_position == "bottom") echo 'selected="selected"' ?> ><?php _e('Bottom'); ?></option>
@@ -1648,14 +1633,14 @@ function cff_style_page() {
1648
  </td>
1649
  </tr>
1650
  <tr valign="top">
1651
- <th scope="row"><label class="bump-left"><?php _e('Display outside the scrollable area'); ?></label></th>
1652
  <td>
1653
  <input type="checkbox" name="cff_like_box_outside" id="cff_like_box_outside" <?php if($cff_like_box_outside == true) echo 'checked="checked"' ?> />
1654
  <i style="color: #666; font-size: 11px; margin-left: 5px;"><?php _e('(Only applicable if you have set a height on the feed)'); ?></i>
1655
  </td>
1656
  </tr>
1657
  <tr valign="top">
1658
- <th scope="row"><label class="bump-left"><?php _e('Like Box Background Color'); ?></label></th>
1659
  <td>
1660
  <label for="cff_likebox_bg_color">#</label>
1661
  <input name="cff_likebox_bg_color" type="text" value="<?php esc_attr_e( $cff_likebox_bg_color ); ?>" size="10" />
@@ -1663,7 +1648,7 @@ function cff_style_page() {
1663
  </td>
1664
  </tr>
1665
  <tr valign="top">
1666
- <th scope="row"><label class="bump-left"><?php _e('Color of page name'); ?></label></th>
1667
  <td>
1668
  <select name="cff_like_box_text_color">
1669
  <option value="blue" <?php if($cff_like_box_text_color == "blue") echo 'selected="selected"' ?> ><?php _e('Blue'); ?></option>
@@ -1674,30 +1659,34 @@ function cff_style_page() {
1674
  </td>
1675
  </tr>
1676
  <tr valign="top">
1677
- <th scope="row"><label for="cff_likebox_width" class="bump-left"><?php _e('Custom Like Box Width'); ?></label></th>
1678
  <td>
1679
  <input name="cff_likebox_width" type="text" value="<?php esc_attr_e( $cff_likebox_width ); ?>" size="6" />
1680
  <span><span>Eg. 50%, 300px</span> <i style="color: #666; font-size: 11px; margin-left: 5px;"><?php _e('Default is 100%'); ?></i></span>
1681
  </td>
1682
  </tr>
1683
  <tr valign="top">
1684
- <th scope="row"><label class="bump-left"><?php _e('Show faces of fans'); ?></label></th>
1685
  <td>
1686
  <input type="checkbox" name="cff_like_box_faces" id="cff_like_box_faces" <?php if($cff_like_box_faces == true) echo 'checked="checked"' ?> />
1687
  <i style="color: #666; font-size: 11px; margin-left: 5px;"><?php _e('Show thumbnail photos of fans who like your page'); ?></i>
1688
  </td>
1689
  </tr>
1690
  <tr valign="top">
1691
- <th scope="row"><label class="bump-left"><?php _e('Show the Like Box border'); ?></label></th>
1692
  <td>
1693
  <input type="checkbox" name="cff_like_box_border" id="cff_like_box_outside" <?php if($cff_like_box_border == true) echo 'checked="checked"' ?> />
1694
  <i style="color: #666; font-size: 11px; margin-left: 5px;"><?php _e('Only applicable if you are showing faces of fans'); ?></i>
1695
  </td>
1696
  </tr>
1697
-
1698
- <tr><td><b style="font-size: 14px;"><?php _e('Separating Line'); ?></b></td></tr>
 
 
 
 
1699
  <tr valign="top">
1700
- <th scope="row"><label class="bump-left"><?php _e('Separating Line Color'); ?></label></th>
1701
  <td>
1702
  <label for="cff_sep_color">#</label>
1703
  <input name="cff_sep_color" type="text" value="<?php esc_attr_e( $cff_sep_color ); ?>" size="10" />
@@ -1705,7 +1694,7 @@ function cff_style_page() {
1705
  </td>
1706
  </tr>
1707
  <tr valign="top">
1708
- <th scope="row"><label class="bump-left"><?php _e('Separating Line Thickness'); ?></label></th>
1709
  <td>
1710
  <input name="cff_sep_size" type="text" value="<?php esc_attr_e( $cff_sep_size ); ?>" size="1" /><span>px</span> <i style="color: #666; font-size: 11px; margin-left: 5px;"><?php _e('(Leave empty to hide)'); ?></i>
1711
  </td>
829
  <tbody>
830
  <h3><?php _e('General'); ?></h3>
831
  <tr valign="top">
832
+ <th class="bump-left" scope="row"><label><?php _e('Feed Width'); ?></label></th>
833
  <td>
834
  <input name="cff_feed_width" type="text" value="<?php esc_attr_e( $cff_feed_width ); ?>" size="6" />
835
  <span>Eg. 500px, 50%, 10em. <i style="color: #666; font-size: 11px; margin-left: 5px;"><?php _e('Default is 100%'); ?></i></span>
836
  </td>
837
  </tr>
838
  <tr valign="top">
839
+ <th class="bump-left" scope="row"><label><?php _e('Feed Height'); ?></label></th>
840
  <td>
841
  <input name="cff_feed_height" type="text" value="<?php esc_attr_e( $cff_feed_height ); ?>" size="6" />
842
  <span>Eg. 500px, 50em. <i style="color: #666; font-size: 11px; margin-left: 5px;"><?php _e('Leave empty to set no maximum height. If the feed exceeds this height then a scroll bar will be used.'); ?></i></span>
843
  </td>
844
  </tr>
845
+ <th class="bump-left" scope="row"><label><?php _e('Feed Padding'); ?></label></th>
846
  <td>
847
  <input name="cff_feed_padding" type="text" value="<?php esc_attr_e( $cff_feed_padding ); ?>" size="6" />
848
  <span>Eg. 20px, 5%. <i style="color: #666; font-size: 11px; margin-left: 5px;"><?php _e('This is the amount of padding/spacing that goes around the feed. This is particularly useful if you intend to set a background color on the feed.'); ?></i></span>
849
  </td>
850
  </tr>
851
  <tr valign="top">
852
+ <th class="bump-left" scope="row"><label><?php _e('Feed Background Color'); ?></label></th>
853
  <td>
854
  <label for="cff_bg_color">#</label>
855
  <input name="cff_bg_color" type="text" value="<?php esc_attr_e( $cff_bg_color ); ?>" size="10" placeholder="Eg. ED9A00" />
857
  </td>
858
  </tr>
859
  <tr valign="top">
860
+ <th class="bump-left" scope="row"><label><?php _e('Show name and picture of author'); ?></label></th>
861
  <td>
862
  <input name="cff_show_author" type="checkbox" id="cff_show_author" <?php if($cff_show_author == true) echo "checked"; ?> />
863
  <label for="cff_show_status_type">Yes</label>
866
  </td>
867
  </tr>
868
  <tr valign="top">
869
+ <th class="bump-left" scope="row"><label><?php _e('Add CSS class to feed'); ?></label></th>
870
  <td>
871
  <input name="cff_class" type="text" value="<?php esc_attr_e( $cff_class ); ?>" size="25" />
872
  <i style="color: #666; font-size: 11px; margin-left: 5px;"><?php _e('To add multiple classes separate each with a space, Eg. classone classtwo classthree'); ?></i>
953
  <table class="form-table">
954
  <tbody>
955
  <tr valign="top">
956
+ <th scope="row"><?php _e('Include the following in posts: <i style="font-size: 11px;">(when applicable)</i>'); ?>
957
  <br /><i style="color: #666; font-size: 11px;"><a href="http://smashballoon.com/custom-facebook-feed/" target="_blank"><?php _e('Upgrade to Pro to enable all of these options'); ?></a></i></th>
958
  <td>
959
  <div>
990
  </div>
991
  <div>
992
  <input type="checkbox" name="cff_show_link" id="cff_show_link" <?php if($cff_show_link == true) echo 'checked="checked"' ?> />
993
+ <label for="cff_show_link"><?php _e('View on Facebook'); ?></label>
994
  </div>
995
  </td>
996
  </tr>
1244
  <a class="cff-tooltip-link" href="JavaScript:void(0);"><?php _e('Translate this'); ?></a>
1245
  <div class="cff-tooltip">
1246
  <div class="cff-tooltip-table">
1247
+ <p style="margin-bottom: 15px;"><?php _e('Translate the text below into the language you would like to use:'); ?></p>
1248
 
1249
 
1250
  <label for="cff_translate_second"><?php _e("second"); ?></label>
1251
+ <input name="cff_translate_second" type="text" value="<?php esc_attr_e( $cff_translate_second ); ?>" size="20" />
1252
  <br />
1253
  <label for="cff_translate_seconds"><?php _e("seconds"); ?></label>
1254
+ <input name="cff_translate_seconds" type="text" value="<?php esc_attr_e( $cff_translate_second ); ?>" size="20" />
1255
  <br />
1256
  <label for="cff_translate_minute"><?php _e("minute"); ?></label>
1257
+ <input name="cff_translate_minute" type="text" value="<?php esc_attr_e( $cff_translate_minute ); ?>" size="20" />
1258
  <br />
1259
  <label for="cff_translate_minutes"><?php _e("minutes"); ?></label>
1260
+ <input name="cff_translate_minutes" type="text" value="<?php esc_attr_e( $cff_translate_minutes ); ?>" size="20" />
1261
  <br />
1262
  <label for="cff_translate_hour"><?php _e("hour"); ?></label>
1263
+ <input name="cff_translate_hour" type="text" value="<?php esc_attr_e( $cff_translate_hour ); ?>" size="20" />
1264
  <br />
1265
  <label for="cff_translate_hours"><?php _e("hours"); ?></label>
1266
+ <input name="cff_translate_hours" type="text" value="<?php esc_attr_e( $cff_translate_hours ); ?>" size="20" />
1267
  <br />
1268
  <label for="cff_translate_day"><?php _e("day"); ?></label>
1269
+ <input name="cff_translate_day" type="text" value="<?php esc_attr_e( $cff_translate_day ); ?>" size="20" />
1270
  <br />
1271
  <label for="cff_translate_days"><?php _e("days"); ?></label>
1272
+ <input name="cff_translate_days" type="text" value="<?php esc_attr_e( $cff_translate_days ); ?>" size="20" />
1273
  <br />
1274
  <label for="cff_translate_week"><?php _e("week"); ?></label>
1275
+ <input name="cff_translate_week" type="text" value="<?php esc_attr_e( $cff_translate_week ); ?>" size="20" />
1276
  <br />
1277
  <label for="cff_translate_weeks"><?php _e("weeks"); ?></label>
1278
+ <input name="cff_translate_weeks" type="text" value="<?php esc_attr_e( $cff_translate_weeks ); ?>" size="20" />
1279
  <br />
1280
  <label for="cff_translate_month"><?php _e("month"); ?></label>
1281
+ <input name="cff_translate_month" type="text" value="<?php esc_attr_e( $cff_translate_month ); ?>" size="20" />
1282
  <br />
1283
  <label for="cff_translate_months"><?php _e("months"); ?></label>
1284
+ <input name="cff_translate_months" type="text" value="<?php esc_attr_e( $cff_translate_months ); ?>" size="20" />
1285
  <br />
1286
  <label for="cff_translate_year"><?php _e("year"); ?></label>
1287
+ <input name="cff_translate_year" type="text" value="<?php esc_attr_e( $cff_translate_year ); ?>" size="20" />
1288
  <br />
1289
  <label for="cff_translate_years"><?php _e("years"); ?></label>
1290
+ <input name="cff_translate_years" type="text" value="<?php esc_attr_e( $cff_translate_years ); ?>" size="20" />
1291
  <br />
1292
  <label for="cff_translate_ago"><?php _e("ago"); ?></label>
1293
+ <input name="cff_translate_ago" type="text" value="<?php esc_attr_e( $cff_translate_ago ); ?>" size="20" />
1294
  </div>
1295
  </div>
1296
 
1300
  <th><label for="cff_date_custom" class="bump-left"><?php _e('Custom format'); ?></label></th>
1301
  <td>
1302
  <input name="cff_date_custom" type="text" value="<?php esc_attr_e( $cff_date_custom ); ?>" size="10" placeholder="Eg. F j, Y" />
1303
+ <a href="http://smashballoon.com/custom-facebook-feed/docs/date/" target="_blank"><?php _e('Examples'); ?></a>
1304
  </td>
1305
  </tr>
1306
  <tr>
1467
  <th><label for="cff_event_date_custom" class="bump-left"><?php _e('Custom event date format'); ?></label></th>
1468
  <td>
1469
  <input name="cff_event_date_custom" type="text" value="<?php esc_attr_e( $cff_event_date_custom ); ?>" size="10" placeholder="Eg. F j, Y - g:ia" />
1470
+ <a href="http://smashballoon.com/custom-facebook-feed/docs/date/" target="_blank"><?php _e('Examples'); ?></a>
1471
  </td>
1472
  </tr>
1473
  </tbody>
1579
  <i style="color: #666; font-size: 11px; margin-left: 5px;"><?php _e('Use different text in place of the default "View on Facebook" link'); ?></i>
1580
  </td>
1581
  </tr>
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1582
 
1583
  </tbody>
1584
  </table>
1614
  </tbody>
1615
  </table>
1616
  <hr />
1617
+ <h3><?php _e('Like Box'); ?></h3>
1618
  <table class="form-table">
1619
  <tbody>
 
1620
  <tr valign="top">
1621
+ <th class="bump-left" scope="row"><label><?php _e('Show the Like Box'); ?></label></th>
1622
  <td>
1623
  <input type="checkbox" name="cff_show_like_box" id="cff_show_like_box" <?php if($cff_show_like_box == true) echo 'checked="checked"' ?> />
1624
  </td>
1625
  </tr>
1626
  <tr valign="top">
1627
+ <th class="bump-left" scope="row"><label><?php _e('Like Box Position'); ?></label></th>
1628
  <td>
1629
  <select name="cff_like_box_position">
1630
  <option value="bottom" <?php if($cff_like_box_position == "bottom") echo 'selected="selected"' ?> ><?php _e('Bottom'); ?></option>
1633
  </td>
1634
  </tr>
1635
  <tr valign="top">
1636
+ <th class="bump-left" scope="row"><label><?php _e('Display outside the scrollable area'); ?></label></th>
1637
  <td>
1638
  <input type="checkbox" name="cff_like_box_outside" id="cff_like_box_outside" <?php if($cff_like_box_outside == true) echo 'checked="checked"' ?> />
1639
  <i style="color: #666; font-size: 11px; margin-left: 5px;"><?php _e('(Only applicable if you have set a height on the feed)'); ?></i>
1640
  </td>
1641
  </tr>
1642
  <tr valign="top">
1643
+ <th class="bump-left" scope="row"><label><?php _e('Like Box Background Color'); ?></label></th>
1644
  <td>
1645
  <label for="cff_likebox_bg_color">#</label>
1646
  <input name="cff_likebox_bg_color" type="text" value="<?php esc_attr_e( $cff_likebox_bg_color ); ?>" size="10" />
1648
  </td>
1649
  </tr>
1650
  <tr valign="top">
1651
+ <th class="bump-left" scope="row"><label><?php _e('Color of page name'); ?></label></th>
1652
  <td>
1653
  <select name="cff_like_box_text_color">
1654
  <option value="blue" <?php if($cff_like_box_text_color == "blue") echo 'selected="selected"' ?> ><?php _e('Blue'); ?></option>
1659
  </td>
1660
  </tr>
1661
  <tr valign="top">
1662
+ <th class="bump-left" scope="row"><label for="cff_likebox_width"><?php _e('Custom Like Box Width'); ?></label></th>
1663
  <td>
1664
  <input name="cff_likebox_width" type="text" value="<?php esc_attr_e( $cff_likebox_width ); ?>" size="6" />
1665
  <span><span>Eg. 50%, 300px</span> <i style="color: #666; font-size: 11px; margin-left: 5px;"><?php _e('Default is 100%'); ?></i></span>
1666
  </td>
1667
  </tr>
1668
  <tr valign="top">
1669
+ <th class="bump-left" scope="row"><label><?php _e('Show faces of fans'); ?></label></th>
1670
  <td>
1671
  <input type="checkbox" name="cff_like_box_faces" id="cff_like_box_faces" <?php if($cff_like_box_faces == true) echo 'checked="checked"' ?> />
1672
  <i style="color: #666; font-size: 11px; margin-left: 5px;"><?php _e('Show thumbnail photos of fans who like your page'); ?></i>
1673
  </td>
1674
  </tr>
1675
  <tr valign="top">
1676
+ <th class="bump-left" scope="row"><label><?php _e('Show the Like Box border'); ?></label></th>
1677
  <td>
1678
  <input type="checkbox" name="cff_like_box_border" id="cff_like_box_outside" <?php if($cff_like_box_border == true) echo 'checked="checked"' ?> />
1679
  <i style="color: #666; font-size: 11px; margin-left: 5px;"><?php _e('Only applicable if you are showing faces of fans'); ?></i>
1680
  </td>
1681
  </tr>
1682
+ </tbody>
1683
+ </table>
1684
+ <hr />
1685
+ <h3><?php _e('Separating Line'); ?></h3>
1686
+ <table class="form-table">
1687
+ <tbody>
1688
  <tr valign="top">
1689
+ <th class="bump-left" scope="row"><label><?php _e('Separating Line Color'); ?></label></th>
1690
  <td>
1691
  <label for="cff_sep_color">#</label>
1692
  <input name="cff_sep_color" type="text" value="<?php esc_attr_e( $cff_sep_color ); ?>" size="10" />
1694
  </td>
1695
  </tr>
1696
  <tr valign="top">
1697
+ <th class="bump-left" scope="row"><label><?php _e('Separating Line Thickness'); ?></label></th>
1698
  <td>
1699
  <input name="cff_sep_size" type="text" value="<?php esc_attr_e( $cff_sep_size ); ?>" size="1" /><span>px</span> <i style="color: #666; font-size: 11px; margin-left: 5px;"><?php _e('(Leave empty to hide)'); ?></i>
1700
  </td>
custom-facebook-feed.php CHANGED
@@ -3,7 +3,7 @@
3
  Plugin Name: Custom Facebook Feed
4
  Plugin URI: http://smashballoon.com/custom-facebook-feed
5
  Description: Add a completely customizable Facebook feed to your WordPress site
6
- Version: 1.6.8
7
  Author: Smash Balloon
8
  Author URI: http://smashballoon.com/
9
  License: GPLv2 or later
@@ -126,6 +126,8 @@ function display_cff($atts) {
126
  $cff_page_type = $atts[ 'pagetype' ];
127
  if ($cff_page_type == 'group') $cff_is_group = true;
128
 
 
 
129
  $cff_feed_width = $atts['width'];
130
  $cff_feed_height = $atts[ 'height' ];
131
  $cff_feed_padding = $atts[ 'padding' ];
@@ -521,6 +523,9 @@ function display_cff($atts) {
521
  }
522
  $cff_description .= '<p class="cff-post-desc" '.$cff_body_styles.'><span>' . cff_make_clickable($description_text) . '</span></p>';
523
 
 
 
 
524
  }
525
 
526
  //LINK
@@ -1046,24 +1051,26 @@ if(!is_callable('stripos')){
1046
  // remove_filter( 'the_content', 'wpautop' );
1047
  // add_filter( 'the_content', 'wpautop', 99 );
1048
 
 
 
 
 
1049
  //Enqueue stylesheet
1050
  add_action( 'wp_enqueue_scripts', 'cff_add_my_stylesheet' );
1051
  function cff_add_my_stylesheet() {
1052
  // Respects SSL, Style.css is relative to the current file
1053
- wp_register_style( 'cff', plugins_url('css/cff-style.css?3', __FILE__) );
1054
  wp_enqueue_style( 'cff' );
1055
  }
1056
  //Enqueue scripts
1057
  add_action( 'wp_enqueue_scripts', 'cff_scripts_method' );
1058
  function cff_scripts_method() {
1059
- wp_enqueue_script(
1060
- 'cffscripts',
1061
- plugins_url( '/js/cff-scripts.js?3' , __FILE__ ),
1062
- array( 'jquery' )
1063
- );
1064
  }
1065
- //Allows shortcodes in theme
1066
- add_filter('widget_text', 'do_shortcode');
1067
  function cff_activate() {
1068
  $options = get_option('cff_style_settings');
1069
  $options[ 'cff_show_links_type' ] = true;
@@ -1118,22 +1125,6 @@ function cff_custom_css() {
1118
  echo '</style>';
1119
  echo "\r\n";
1120
  }
1121
- add_action( 'wp_footer', 'cff_js' );
1122
- function cff_js() {
1123
- // $path = site_url();
1124
- $url = site_url();
1125
- $path = urlencode(ABSPATH);
1126
- echo '<!-- Custom Facebook Feed JS -->';
1127
- echo "\r\n";
1128
- echo '<script type="text/javascript">';
1129
- echo "\r\n";
1130
- echo 'var siteURL = "' . $url . '";';
1131
- echo "\r\n";
1132
- echo 'var rootPath = "' . $path . '";';
1133
- echo "\r\n";
1134
- echo '</script>';
1135
- echo "\r\n";
1136
- }
1137
 
1138
  //Comment out the line below to view errors
1139
  error_reporting(0);
3
  Plugin Name: Custom Facebook Feed
4
  Plugin URI: http://smashballoon.com/custom-facebook-feed
5
  Description: Add a completely customizable Facebook feed to your WordPress site
6
+ Version: 1.6.8.1
7
  Author: Smash Balloon
8
  Author URI: http://smashballoon.com/
9
  License: GPLv2 or later
126
  $cff_page_type = $atts[ 'pagetype' ];
127
  if ($cff_page_type == 'group') $cff_is_group = true;
128
 
129
+ $cff_post_limit = $atts[ 'limit' ];
130
+
131
  $cff_feed_width = $atts['width'];
132
  $cff_feed_height = $atts[ 'height' ];
133
  $cff_feed_padding = $atts[ 'padding' ];
523
  }
524
  $cff_description .= '<p class="cff-post-desc" '.$cff_body_styles.'><span>' . cff_make_clickable($description_text) . '</span></p>';
525
 
526
+ //If the post text and description/caption are the same then don't show the description
527
+ if($post_text == $description_text) $cff_description = '';
528
+
529
  }
530
 
531
  //LINK
1051
  // remove_filter( 'the_content', 'wpautop' );
1052
  // add_filter( 'the_content', 'wpautop', 99 );
1053
 
1054
+
1055
+ //Allows shortcodes in theme
1056
+ add_filter('widget_text', 'do_shortcode');
1057
+
1058
  //Enqueue stylesheet
1059
  add_action( 'wp_enqueue_scripts', 'cff_add_my_stylesheet' );
1060
  function cff_add_my_stylesheet() {
1061
  // Respects SSL, Style.css is relative to the current file
1062
+ wp_register_style( 'cff', plugins_url('css/cff-style.css?4', __FILE__) );
1063
  wp_enqueue_style( 'cff' );
1064
  }
1065
  //Enqueue scripts
1066
  add_action( 'wp_enqueue_scripts', 'cff_scripts_method' );
1067
  function cff_scripts_method() {
1068
+ //Register the script to make it available
1069
+ wp_register_script( 'cffscripts', plugins_url( '/js/cff-scripts.js?4' , __FILE__ ), array('jquery'), '1.8', true );
1070
+ //Enqueue it to load it onto the page
1071
+ wp_enqueue_script('cffscripts');
 
1072
  }
1073
+
 
1074
  function cff_activate() {
1075
  $options = get_option('cff_style_settings');
1076
  $options[ 'cff_show_links_type' ] = true;
1125
  echo '</style>';
1126
  echo "\r\n";
1127
  }
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1128
 
1129
  //Comment out the line below to view errors
1130
  error_reporting(0);
js/cff-scripts.js CHANGED
@@ -4,8 +4,8 @@ jQuery(document).ready(function() {
4
  var $self = jQuery(this);
5
 
6
  //Wpautop fix
7
- if( $self.find('.cff-viewpost').parent('p').length ){
8
- $self.find('.cff-viewpost').unwrap('p');
9
  }
10
  if( $self.find('.cff-author').parent('p').length ){
11
  $self.find('.cff-author').eq(1).unwrap('p');
4
  var $self = jQuery(this);
5
 
6
  //Wpautop fix
7
+ if( $self.find('.cff-viewpost-facebook').parent('p').length ){
8
+ $self.find('.cff-viewpost-facebook').unwrap('p');
9
  }
10
  if( $self.find('.cff-author').parent('p').length ){
11
  $self.find('.cff-author').eq(1).unwrap('p');