Shortcodes by Angie Makes - Version 1.50

Version Description

Download this release

Release Info

Developer cbaldelomar
Plugin Icon wp plugin Shortcodes by Angie Makes
Version 1.50
Comparing to
See all releases

Code changes from version 1.49 to 1.50

Files changed (7) hide show
  1. README.md +5 -0
  2. includes/options.php +46 -0
  3. includes/settings.php +38 -0
  4. includes/shortcode-functions.php +74 -43
  5. includes/widgets.php +1 -1
  6. readme.txt +5 -0
  7. wc-shortcodes.php +8 -2
README.md CHANGED
@@ -66,6 +66,11 @@ Use the shortcode manager in the TinyMCE text editor
66
 
67
  ## Changelog ##
68
 
 
 
 
 
 
69
  ### Version 1.49
70
 
71
  * Added padding around price heading
66
 
67
  ## Changelog ##
68
 
69
+ ### Version 1.50
70
+
71
+ * Social icons now open a new tab by default
72
+ * Added ability to display share buttons as text
73
+
74
  ### Version 1.49
75
 
76
  * Added padding around price heading
includes/options.php CHANGED
@@ -317,12 +317,30 @@ function wc_shortcodes_set_options() {
317
  'description' => '',
318
  'type' => 'share_buttons',
319
  ),
 
 
 
 
 
 
 
 
 
 
 
320
  ),
321
  ),
322
  array(
323
  'section' => 'wc-shortcodes-options-facebook-share-section',
324
  'title' => 'Facebook',
325
  'options' => array(
 
 
 
 
 
 
 
326
  array(
327
  'id' => 'facebook_share_icon',
328
  'title' => 'Icon',
@@ -336,6 +354,13 @@ function wc_shortcodes_set_options() {
336
  'section' => 'wc-shortcodes-options-twitter-share-section',
337
  'title' => 'Twitter',
338
  'options' => array(
 
 
 
 
 
 
 
339
  array(
340
  'id' => 'twitter_share_icon',
341
  'title' => 'Icon',
@@ -349,6 +374,13 @@ function wc_shortcodes_set_options() {
349
  'section' => 'wc-shortcodes-options-pinterest-share-section',
350
  'title' => 'Pinterest',
351
  'options' => array(
 
 
 
 
 
 
 
352
  array(
353
  'id' => 'pinterest_share_icon',
354
  'title' => 'Icon',
@@ -362,6 +394,13 @@ function wc_shortcodes_set_options() {
362
  'section' => 'wc-shortcodes-options-google-share-section',
363
  'title' => 'Google',
364
  'options' => array(
 
 
 
 
 
 
 
365
  array(
366
  'id' => 'google_share_icon',
367
  'title' => 'Icon',
@@ -375,6 +414,13 @@ function wc_shortcodes_set_options() {
375
  'section' => 'wc-shortcodes-options-email-share-section',
376
  'title' => 'Email',
377
  'options' => array(
 
 
 
 
 
 
 
378
  array(
379
  'id' => 'email_share_icon',
380
  'title' => 'Icon',
317
  'description' => '',
318
  'type' => 'share_buttons',
319
  ),
320
+ array(
321
+ 'id' => 'share_buttons_format',
322
+ 'title' => 'Format',
323
+ 'default' => $wc_shortcodes_theme_support['share_buttons_format'],
324
+ 'description' => '',
325
+ 'type' => 'dropdown',
326
+ 'options' => array(
327
+ 'text' => 'Text',
328
+ 'image' => 'Image',
329
+ ),
330
+ ),
331
  ),
332
  ),
333
  array(
334
  'section' => 'wc-shortcodes-options-facebook-share-section',
335
  'title' => 'Facebook',
336
  'options' => array(
337
+ array(
338
+ 'id' => 'facebook_share_text',
339
+ 'title' => 'Share Text',
340
+ 'default' => $wc_shortcodes_theme_support['facebook_share_text'],
341
+ 'description' => '',
342
+ 'type' => 'input',
343
+ ),
344
  array(
345
  'id' => 'facebook_share_icon',
346
  'title' => 'Icon',
354
  'section' => 'wc-shortcodes-options-twitter-share-section',
355
  'title' => 'Twitter',
356
  'options' => array(
357
+ array(
358
+ 'id' => 'twitter_share_text',
359
+ 'title' => 'Share Text',
360
+ 'default' => $wc_shortcodes_theme_support['twitter_share_text'],
361
+ 'description' => '',
362
+ 'type' => 'input',
363
+ ),
364
  array(
365
  'id' => 'twitter_share_icon',
366
  'title' => 'Icon',
374
  'section' => 'wc-shortcodes-options-pinterest-share-section',
375
  'title' => 'Pinterest',
376
  'options' => array(
377
+ array(
378
+ 'id' => 'pinterest_share_text',
379
+ 'title' => 'Share Text',
380
+ 'default' => $wc_shortcodes_theme_support['pinterest_share_text'],
381
+ 'description' => '',
382
+ 'type' => 'input',
383
+ ),
384
  array(
385
  'id' => 'pinterest_share_icon',
386
  'title' => 'Icon',
394
  'section' => 'wc-shortcodes-options-google-share-section',
395
  'title' => 'Google',
396
  'options' => array(
397
+ array(
398
+ 'id' => 'google_share_text',
399
+ 'title' => 'Share Text',
400
+ 'default' => $wc_shortcodes_theme_support['google_share_text'],
401
+ 'description' => '',
402
+ 'type' => 'input',
403
+ ),
404
  array(
405
  'id' => 'google_share_icon',
406
  'title' => 'Icon',
414
  'section' => 'wc-shortcodes-options-email-share-section',
415
  'title' => 'Email',
416
  'options' => array(
417
+ array(
418
+ 'id' => 'email_share_text',
419
+ 'title' => 'Share Text',
420
+ 'default' => $wc_shortcodes_theme_support['email_share_text'],
421
+ 'description' => '',
422
+ 'type' => 'input',
423
+ ),
424
  array(
425
  'id' => 'email_share_icon',
426
  'title' => 'Icon',
includes/settings.php CHANGED
@@ -121,6 +121,9 @@ function wc_shortcodes_options_display_setting( $args ) {
121
  case 'image' :
122
  wc_shortcodes_options_display_image_field( $args );
123
  break;
 
 
 
124
  case 'background' :
125
  wc_shortcodes_options_display_background_fields( $args );
126
  break;
@@ -416,6 +419,41 @@ function wc_shortcodes_options_display_textarea_field( $args ) {
416
  <?php
417
  }
418
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
419
  /*
420
  * Sanitize Options
421
  */
121
  case 'image' :
122
  wc_shortcodes_options_display_image_field( $args );
123
  break;
124
+ case 'dropdown' :
125
+ wc_shortcodes_options_display_custom_dropdown( $args );
126
+ break;
127
  case 'background' :
128
  wc_shortcodes_options_display_background_fields( $args );
129
  break;
419
  <?php
420
  }
421
 
422
+ /**
423
+ * Display custom dropdown
424
+ *
425
+ * @since 3.5.2
426
+ * @access public
427
+ *
428
+ * @param array $args
429
+ * @return void
430
+ */
431
+ function wc_shortcodes_options_display_custom_dropdown( $args ) {
432
+ extract( $args );
433
+
434
+ $val = get_option( $option_name, $default );
435
+
436
+ if ( isset( $options_callback ) && ! empty( $options_callback ) )
437
+ $options = call_user_func( $options_callback );
438
+ ?>
439
+
440
+ <?php if ( isset( $label ) ) : ?>
441
+ <label for="<?php echo $option_name; ?>"><?php echo $label; ?></label>&nbsp;
442
+ <?php endif; ?>
443
+
444
+ <select name="<?php echo $option_name; ?>" id="<?php echo $option_name; ?>">
445
+ <?php foreach ( $options as $key => $name ) : ?>
446
+ <option value="<?php echo $key; ?>" <?php selected( $val, $key); ?>><?php echo $name; ?></option>
447
+ <?php endforeach; ?>
448
+ </select>&nbsp;
449
+
450
+ <?php // Description ?>
451
+ <?php if ( isset( $description ) && !empty( $description ) ) : ?>
452
+ <p class="description"><?php echo $description; ?></p>
453
+ <?php endif; ?>
454
+ <?php
455
+ }
456
+
457
  /*
458
  * Sanitize Options
459
  */
includes/shortcode-functions.php CHANGED
@@ -345,7 +345,7 @@ if( !function_exists('wc_shortcodes_social_icons') ) {
345
  $first = false;
346
 
347
  $html .= '<li class="wc-shortcodes-social-icon wc-shortcode-social-icon-' . $key . $first_class . '">';
348
- $html .='<a href="'.$social_link.'">';
349
  $html .= '<img src="'.$icon_url.'">';
350
  $html .= '</a>';
351
  $html .= '</li>';
@@ -1383,6 +1383,9 @@ if ( ! function_exists('wc_shortcodes_share_buttons') ) {
1383
  ), $atts ) );
1384
 
1385
  $share_buttons = get_option( WC_SHORTCODES_PREFIX . 'share_buttons_display' );
 
 
 
1386
 
1387
  if ( empty( $share_buttons ) )
1388
  return '';
@@ -1391,6 +1394,8 @@ if ( ! function_exists('wc_shortcodes_share_buttons') ) {
1391
  $classes = array();
1392
 
1393
  $classes[] = 'wc-shortcodes-share-buttons';
 
 
1394
  if ( ! empty( $class ) )
1395
  $classes[] = $class;
1396
 
@@ -1402,49 +1407,75 @@ if ( ! function_exists('wc_shortcodes_share_buttons') ) {
1402
  $html .= '<ul class="wc-shortcodes-clearfix">';
1403
  foreach ( $share_buttons as $key => $name ) {
1404
  $icon_option_name = WC_SHORTCODES_PREFIX . $key . '_share_icon';
1405
-
1406
- if ( $icon_url = get_option( $icon_option_name ) ) {
1407
- $first_class = $first ? ' first-share-button' : '';
1408
- $first = false;
1409
-
1410
- switch ( $key ) {
1411
- case 'pinterest' :
1412
- $html .= '<li class="wc-shortcodes-share-button-icon wc-shortcode-share-button-icon-' . $key . $first_class . '">';
1413
- $html .='<a href="javascript:void((function()%7Bvar%20e=document.createElement(&apos;script&apos;);e.setAttribute(&apos;type&apos;,&apos;text/javascript&apos;);e.setAttribute(&apos;charset&apos;,&apos;UTF-8&apos;);e.setAttribute(&apos;src&apos;,&apos;http://assets.pinterest.com/js/pinmarklet.js?r=&apos;+Math.random()*99999999);document.body.appendChild(e)%7D)());">';
1414
- $html .= '<img src="'.$icon_url.'" alt="Pin it">';
1415
- $html .= '</a>';
1416
- $html .= '</li>';
1417
- break;
1418
- case 'facebook' :
1419
- $html .= '<li class="wc-shortcodes-share-button-icon wc-shortcode-share-button-icon-' . $key . $first_class . '">';
1420
- $html .='<a target="_blank" onclick="return !window.open(this.href, \'Facebook\', \'width=640,height=300\')" href="http://www.facebook.com/sharer/sharer.php?u='.urlencode(get_permalink()).'">';
1421
- $html .= '<img src="'.$icon_url.'" alt="Share on Facebook">';
1422
- $html .= '</a>';
1423
- $html .= '</li>';
1424
- break;
1425
- case 'twitter' :
1426
- $html .= '<li class="wc-shortcodes-share-button-icon wc-shortcode-share-button-icon-' . $key . $first_class . '">';
1427
- $html .='<a target="_blank" onclick="return !window.open(this.href, \'Twitter\', \'width=500,height=430\')" href="https://twitter.com/share?url='.urlencode(get_permalink()).'" class="share-button-twitter" data-lang="en">';
1428
- $html .= '<img src="'.$icon_url.'" alt="Share on Twitter">';
1429
- $html .= '</a>';
1430
- $html .= '</li>';
1431
- break;
1432
- case 'email' :
1433
- $html .= '<li class="wc-shortcodes-share-button-icon wc-shortcode-share-button-icon-' . $key . $first_class . '">';
1434
- $html .='<a title="Share by Email" target="_self" href="mailto:?subject=&amp;body='.urlencode(get_permalink()).'">';
1435
- $html .= '<img src="'.$icon_url.'" alt="Share by Email">';
1436
- $html .= '</a>';
1437
- $html .= '</li>';
1438
- break;
1439
- case 'google' :
1440
- $html .= '<li class="wc-shortcodes-share-button-icon wc-shortcode-share-button-icon-' . $key . $first_class . '">';
1441
- $html .='<a href="https://plus.google.com/share?url='.urlencode(get_permalink()).'" onclick="javascript:window.open(this.href,
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1442
  \'\', \'menubar=no,toolbar=no,resizable=yes,scrollbars=yes,height=600,width=600\');return false;">';
1443
- $html .= '<img src="'.$icon_url.'" alt="Share on Google+">';
1444
- $html .= '</a>';
1445
- $html .= '</li>';
1446
- break;
1447
- }
 
 
 
 
1448
  }
1449
  }
1450
  $html .= '</ul>';
345
  $first = false;
346
 
347
  $html .= '<li class="wc-shortcodes-social-icon wc-shortcode-social-icon-' . $key . $first_class . '">';
348
+ $html .='<a target="_blank" href="'.$social_link.'">';
349
  $html .= '<img src="'.$icon_url.'">';
350
  $html .= '</a>';
351
  $html .= '</li>';
1383
  ), $atts ) );
1384
 
1385
  $share_buttons = get_option( WC_SHORTCODES_PREFIX . 'share_buttons_display' );
1386
+ $size = sizeof( $share_buttons );
1387
+ $format = get_option( WC_SHORTCODES_PREFIX . 'share_buttons_format', 'image' );
1388
+ $show_image = 'image' == $format ? true : false;
1389
 
1390
  if ( empty( $share_buttons ) )
1391
  return '';
1394
  $classes = array();
1395
 
1396
  $classes[] = 'wc-shortcodes-share-buttons';
1397
+ $classes[] = 'wc-shortcodes-share-buttons-format-'.$format;
1398
+ $classes[] = 'wc-shortcodes-share-buttons-size-'.$size;
1399
  if ( ! empty( $class ) )
1400
  $classes[] = $class;
1401
 
1407
  $html .= '<ul class="wc-shortcodes-clearfix">';
1408
  foreach ( $share_buttons as $key => $name ) {
1409
  $icon_option_name = WC_SHORTCODES_PREFIX . $key . '_share_icon';
1410
+ $icon_url = get_option( $icon_option_name );
1411
+
1412
+ $icon_option_name = WC_SHORTCODES_PREFIX . $key . '_share_text';
1413
+ $icon_text = get_option( $icon_option_name );
1414
+
1415
+ $first_class = $first ? ' first-share-button' : '';
1416
+
1417
+ switch ( $key ) {
1418
+ case 'pinterest' :
1419
+ $html .= '<li class="wc-shortcodes-share-button-icon wc-shortcode-share-button-icon-' . $key . $first_class . '">';
1420
+ $html .='<a href="javascript:void((function()%7Bvar%20e=document.createElement(&apos;script&apos;);e.setAttribute(&apos;type&apos;,&apos;text/javascript&apos;);e.setAttribute(&apos;charset&apos;,&apos;UTF-8&apos;);e.setAttribute(&apos;src&apos;,&apos;http://assets.pinterest.com/js/pinmarklet.js?r=&apos;+Math.random()*99999999);document.body.appendChild(e)%7D)());">';
1421
+ if ( $show_image ) {
1422
+ $html .= '<img src="'.$icon_url.'" alt="'.$icon_text.'">';
1423
+ }
1424
+ else {
1425
+ $html .= '<span class="wc-share-button-"'.$key.'>'.$icon_text.'</span>';
1426
+ }
1427
+ $html .= '</a>';
1428
+ $html .= '</li>';
1429
+ break;
1430
+ case 'facebook' :
1431
+ $html .= '<li class="wc-shortcodes-share-button-icon wc-shortcode-share-button-icon-' . $key . $first_class . '">';
1432
+ $html .='<a target="_blank" onclick="return !window.open(this.href, \'Facebook\', \'width=640,height=300\')" href="http://www.facebook.com/sharer/sharer.php?u='.urlencode(get_permalink()).'">';
1433
+ if ( $show_image ) {
1434
+ $html .= '<img src="'.$icon_url.'" alt="'.$icon_text.'">';
1435
+ }
1436
+ else {
1437
+ $html .= '<span class="wc-share-button-"'.$key.'>'.$icon_text.'</span>';
1438
+ }
1439
+ $html .= '</a>';
1440
+ $html .= '</li>';
1441
+ break;
1442
+ case 'twitter' :
1443
+ $html .= '<li class="wc-shortcodes-share-button-icon wc-shortcode-share-button-icon-' . $key . $first_class . '">';
1444
+ $html .='<a target="_blank" onclick="return !window.open(this.href, \'Twitter\', \'width=500,height=430\')" href="https://twitter.com/share?url='.urlencode(get_permalink()).'" class="share-button-twitter" data-lang="en">';
1445
+ if ( $show_image ) {
1446
+ $html .= '<img src="'.$icon_url.'" alt="'.$icon_text.'">';
1447
+ }
1448
+ else {
1449
+ $html .= '<span class="wc-share-button-"'.$key.'>'.$icon_text.'</span>';
1450
+ }
1451
+ $html .= '</a>';
1452
+ $html .= '</li>';
1453
+ break;
1454
+ case 'email' :
1455
+ $html .= '<li class="wc-shortcodes-share-button-icon wc-shortcode-share-button-icon-' . $key . $first_class . '">';
1456
+ $html .='<a title="Share by Email" target="_self" href="mailto:?subject=&amp;body='.urlencode(get_permalink()).'">';
1457
+ if ( $show_image ) {
1458
+ $html .= '<img src="'.$icon_url.'" alt="'.$icon_text.'">';
1459
+ }
1460
+ else {
1461
+ $html .= '<span class="wc-share-button-"'.$key.'>'.$icon_text.'</span>';
1462
+ }
1463
+ $html .= '</a>';
1464
+ $html .= '</li>';
1465
+ break;
1466
+ case 'google' :
1467
+ $html .= '<li class="wc-shortcodes-share-button-icon wc-shortcode-share-button-icon-' . $key . $first_class . '">';
1468
+ $html .='<a href="https://plus.google.com/share?url='.urlencode(get_permalink()).'" onclick="javascript:window.open(this.href,
1469
  \'\', \'menubar=no,toolbar=no,resizable=yes,scrollbars=yes,height=600,width=600\');return false;">';
1470
+ if ( $show_image ) {
1471
+ $html .= '<img src="'.$icon_url.'" alt="'.$icon_text.'">';
1472
+ }
1473
+ else {
1474
+ $html .= '<span class="wc-share-button-"'.$key.'>'.$icon_text.'</span>';
1475
+ }
1476
+ $html .= '</a>';
1477
+ $html .= '</li>';
1478
+ break;
1479
  }
1480
  }
1481
  $html .= '</ul>';
includes/widgets.php CHANGED
@@ -88,7 +88,7 @@ class WC_Shortcodes_Social_Icons_Widget extends WP_Widget {
88
  $first = false;
89
 
90
  $html .= '<li class="'.implode( ' ', $li_class ).'">';
91
- $html .='<a href="'.$social_link.'">';
92
  $html .= '<img src="'.$icon_url.'">';
93
  $html .= '</a>';
94
  $html .= '</li>';
88
  $first = false;
89
 
90
  $html .= '<li class="'.implode( ' ', $li_class ).'">';
91
+ $html .='<a target="_blank" href="'.$social_link.'">';
92
  $html .= '<img src="'.$icon_url.'">';
93
  $html .= '</a>';
94
  $html .= '</li>';
readme.txt CHANGED
@@ -88,6 +88,11 @@ Use the shortcode manager in the TinyMCE text editor
88
 
89
  == Changelog ==
90
 
 
 
 
 
 
91
  ### Version 1.49
92
 
93
  * Added padding around price heading
88
 
89
  == Changelog ==
90
 
91
+ ### Version 1.50
92
+
93
+ * Social icons now open a new tab by default
94
+ * Added ability to display share buttons as text
95
+
96
  ### Version 1.49
97
 
98
  * Added padding around price heading
wc-shortcodes.php CHANGED
@@ -5,11 +5,11 @@ Plugin URI: http://webplantmedia.com/starter-themes/wordpresscanvas/features/sho
5
  Description: A family of shortcodes to enhance site functionality.
6
  Author: Chris Baldelomar
7
  Author URI: http://webplantmedia.com/
8
- Version: 1.49
9
  License: GPLv2 or later
10
  */
11
 
12
- define( 'WC_SHORTCODES_VERSION', '1.49' );
13
  define( 'WC_SHORTCODES_PREFIX', 'wc_shortcodes_' );
14
  define( '_WC_SHORTCODES_PREFIX', '_wc_shortcodes_' );
15
  define( 'WC_SHORTCODES_PLUGIN_URL', plugin_dir_url( __FILE__ ) );
@@ -62,11 +62,17 @@ $wc_shortcodes_theme_support = array(
62
  'custom3_social_icon' => WC_SHORTCODES_PLUGIN_URL . 'includes/img/youtube.png',
63
  'custom4_social_icon' => WC_SHORTCODES_PLUGIN_URL . 'includes/img/etsy.png',
64
  'custom5_social_icon' => WC_SHORTCODES_PLUGIN_URL . 'includes/img/tumblr.png',
 
65
  'pinterest_share_button' => WC_SHORTCODES_PLUGIN_URL . 'includes/img/pinterest.png',
66
  'facebook_share_button' => WC_SHORTCODES_PLUGIN_URL . 'includes/img/facebook.png',
67
  'twitter_share_button' => WC_SHORTCODES_PLUGIN_URL . 'includes/img/twitter.png',
68
  'google_share_button' => WC_SHORTCODES_PLUGIN_URL . 'includes/img/google.png',
69
  'email_share_button' => WC_SHORTCODES_PLUGIN_URL . 'includes/img/email.png',
 
 
 
 
 
70
  );
71
 
72
  require_once( dirname(__FILE__) . '/includes/options.php' ); // define options array
5
  Description: A family of shortcodes to enhance site functionality.
6
  Author: Chris Baldelomar
7
  Author URI: http://webplantmedia.com/
8
+ Version: 1.50
9
  License: GPLv2 or later
10
  */
11
 
12
+ define( 'WC_SHORTCODES_VERSION', '1.50' );
13
  define( 'WC_SHORTCODES_PREFIX', 'wc_shortcodes_' );
14
  define( '_WC_SHORTCODES_PREFIX', '_wc_shortcodes_' );
15
  define( 'WC_SHORTCODES_PLUGIN_URL', plugin_dir_url( __FILE__ ) );
62
  'custom3_social_icon' => WC_SHORTCODES_PLUGIN_URL . 'includes/img/youtube.png',
63
  'custom4_social_icon' => WC_SHORTCODES_PLUGIN_URL . 'includes/img/etsy.png',
64
  'custom5_social_icon' => WC_SHORTCODES_PLUGIN_URL . 'includes/img/tumblr.png',
65
+ 'share_buttons_format' => 'image',
66
  'pinterest_share_button' => WC_SHORTCODES_PLUGIN_URL . 'includes/img/pinterest.png',
67
  'facebook_share_button' => WC_SHORTCODES_PLUGIN_URL . 'includes/img/facebook.png',
68
  'twitter_share_button' => WC_SHORTCODES_PLUGIN_URL . 'includes/img/twitter.png',
69
  'google_share_button' => WC_SHORTCODES_PLUGIN_URL . 'includes/img/google.png',
70
  'email_share_button' => WC_SHORTCODES_PLUGIN_URL . 'includes/img/email.png',
71
+ 'pinterest_share_text' => 'Pin it',
72
+ 'facebook_share_text' => 'Share',
73
+ 'twitter_share_text' => 'Tweet',
74
+ 'google_share_text' => 'Google+',
75
+ 'email_share_text' => 'Email',
76
  );
77
 
78
  require_once( dirname(__FILE__) . '/includes/options.php' ); // define options array