Shortcodes by Angie Makes - Version 1.35

Version Description

Download this release

Release Info

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

Code changes from version 1.34 to 1.35

README.md CHANGED
@@ -4,7 +4,7 @@
4
  **Donate link:** http://webplantmedia.com/donate/
5
  **Tags:** shortcode, shortcodes, accordion, accordions, tab, tabs, toggle, columns, column, section, sections, testimonials, border, borders, button, buttons, fullwidth, full width, notification, notifications, google maps, maps, googlemaps, social icons, progress bar, pricing, pricing box, highlights, image, flags, banners, countdown, rsvp, custom html, code, code snippets, snippets, isotope, masonry, posts, post_type, font awesome, icons, fontawesome, fa icons
6
  **Requires at least:** 3.7
7
- **Tested up to:** 3.8.1
8
  **Stable tag:** trunk
9
  **License:** GPLv2 or later
10
  **License URI:** http://www.gnu.org/licenses/gpl-2.0.html
@@ -66,6 +66,16 @@ Use the shortcode manager in the TinyMCE text editor
66
 
67
  ## Changelog ##
68
 
 
 
 
 
 
 
 
 
 
 
69
  ### Version 1.34
70
 
71
  * Updated plugin to be compatible with version 3.9
4
  **Donate link:** http://webplantmedia.com/donate/
5
  **Tags:** shortcode, shortcodes, accordion, accordions, tab, tabs, toggle, columns, column, section, sections, testimonials, border, borders, button, buttons, fullwidth, full width, notification, notifications, google maps, maps, googlemaps, social icons, progress bar, pricing, pricing box, highlights, image, flags, banners, countdown, rsvp, custom html, code, code snippets, snippets, isotope, masonry, posts, post_type, font awesome, icons, fontawesome, fa icons
6
  **Requires at least:** 3.7
7
+ **Tested up to:** 3.9
8
  **Stable tag:** trunk
9
  **License:** GPLv2 or later
10
  **License URI:** http://www.gnu.org/licenses/gpl-2.0.html
66
 
67
  ## Changelog ##
68
 
69
+ ### Version 1.35
70
+
71
+ * wc_box short code needed line breaks inserted
72
+ * update to image flag short code
73
+ * changed name
74
+ * added more options to image shortcode
75
+ * removed unnecessary short code parameters from accordion
76
+ * fixed style bug before accordion js was loaded
77
+ * isotope appear and animation enabled after initial load.
78
+
79
  ### Version 1.34
80
 
81
  * Updated plugin to be compatible with version 3.9
includes/css/style.css CHANGED
@@ -76,11 +76,15 @@
76
  .wc-shortcodes-accordion .wc-shortcodes-accordion-trigger.ui-state-hover { }
77
  .wc-shortcodes-accordion .wc-shortcodes-accordion-trigger.ui-state-active { }
78
  .wc-shortcodes-accordion .wc-shortcodes-accordion-trigger.ui-state-active a { }
79
- .wc-shortcodes-accordion .ui-accordion-content {
80
  padding: 20px;
81
  border: 1px solid #cccccc;
82
  border-top: 0px;
83
  }
 
 
 
 
84
  .wc-shortcodes-accordion .ui-accordion-content *:last-child {
85
  margin-bottom: 0
86
  }
@@ -155,6 +159,10 @@
155
  border: 1px solid #cccccc;
156
  border-top: 0px;
157
  }
 
 
 
 
158
  .wc-shortcodes-toggle .wc-shortcodes-toggle-container *:last-child {
159
  margin-bottom: 0
160
  }
@@ -204,6 +212,10 @@
204
  border-right: solid 1px #cccccc;
205
  border-bottom: solid 1px #cccccc;
206
  }
 
 
 
 
207
  .wc-shortcodes-tabs .tab-content *:last-child {
208
  margin-bottom: 0
209
  }
@@ -1211,6 +1223,7 @@ pre.pre-wrap {
1211
  }
1212
  .wc-shortcodes-posts {
1213
  position: relative;
 
1214
  }
1215
  .wc-shortcodes-post-box {
1216
  background-color: #ffffff;
@@ -1261,8 +1274,8 @@ pre.pre-wrap {
1261
  }
1262
 
1263
  /* Isotopes */
1264
- .wc-shortcodes-posts,
1265
- .wc-shortcodes-posts .wc-shortcodes-post-box {
1266
  -webkit-transition-duration: 0.8s;
1267
  -moz-transition-duration: 0.8s;
1268
  -ms-transition-duration: 0.8s;
@@ -1278,7 +1291,7 @@ pre.pre-wrap {
1278
  z-index: 1;
1279
  }
1280
 
1281
- .wc-shortcodes-posts {
1282
  -webkit-transition-property: height, width;
1283
  -moz-transition-property: height, width;
1284
  -ms-transition-property: height, width;
@@ -1286,7 +1299,7 @@ pre.pre-wrap {
1286
  transition-property: height, width;
1287
  }
1288
 
1289
- .wc-shortcodes-posts .wc-shortcodes-post-box {
1290
  -webkit-transition-property: -webkit-transform, opacity;
1291
  -moz-transition-property: -moz-transform, opacity;
1292
  -ms-transition-property: -ms-transform, opacity;
76
  .wc-shortcodes-accordion .wc-shortcodes-accordion-trigger.ui-state-hover { }
77
  .wc-shortcodes-accordion .wc-shortcodes-accordion-trigger.ui-state-active { }
78
  .wc-shortcodes-accordion .wc-shortcodes-accordion-trigger.ui-state-active a { }
79
+ .wc-shortcodes-accordion .wc-shortcodes-accordion-content {
80
  padding: 20px;
81
  border: 1px solid #cccccc;
82
  border-top: 0px;
83
  }
84
+ .wc-shortcodes-accordion.wc-shortcodes-accordion-layout-none .wc-shortcodes-accordion-content {
85
+ padding: 20px 0;
86
+ border-width: 0;
87
+ }
88
  .wc-shortcodes-accordion .ui-accordion-content *:last-child {
89
  margin-bottom: 0
90
  }
159
  border: 1px solid #cccccc;
160
  border-top: 0px;
161
  }
162
+ .wc-shortcodes-toggle.wc-shortcodes-toggle-layout-none .wc-shortcodes-toggle-container {
163
+ border-width: 0;
164
+ padding: 20px 0;
165
+ }
166
  .wc-shortcodes-toggle .wc-shortcodes-toggle-container *:last-child {
167
  margin-bottom: 0
168
  }
212
  border-right: solid 1px #cccccc;
213
  border-bottom: solid 1px #cccccc;
214
  }
215
+ .wc-shortcodes-tabs.wc-shortcodes-tabs-layout-none .tab-content {
216
+ padding: 20px 0;
217
+ border-width: 0;
218
+ }
219
  .wc-shortcodes-tabs .tab-content *:last-child {
220
  margin-bottom: 0
221
  }
1223
  }
1224
  .wc-shortcodes-posts {
1225
  position: relative;
1226
+ visibility: hidden;
1227
  }
1228
  .wc-shortcodes-post-box {
1229
  background-color: #ffffff;
1274
  }
1275
 
1276
  /* Isotopes */
1277
+ .wc-shortcodes-posts.wc-shortcodes-posts-animation,
1278
+ .wc-shortcodes-posts.wc-shortcodes-posts-animation .wc-shortcodes-post-box {
1279
  -webkit-transition-duration: 0.8s;
1280
  -moz-transition-duration: 0.8s;
1281
  -ms-transition-duration: 0.8s;
1291
  z-index: 1;
1292
  }
1293
 
1294
+ .wc-shortcodes-posts.wc-shortcodes-posts-animation {
1295
  -webkit-transition-property: height, width;
1296
  -moz-transition-property: height, width;
1297
  -ms-transition-property: height, width;
1299
  transition-property: height, width;
1300
  }
1301
 
1302
+ .wc-shortcodes-posts.wc-shortcodes-posts-animation .wc-shortcodes-post-box {
1303
  -webkit-transition-property: -webkit-transform, opacity;
1304
  -moz-transition-property: -moz-transform, opacity;
1305
  -ms-transition-property: -ms-transform, opacity;
includes/js/posts.js CHANGED
@@ -40,6 +40,7 @@
40
 
41
  $(document).ready(function(){
42
  var $container = $('.wc-shortcodes-posts');
 
43
  var columnWidth = 0;
44
  var gutterWidth = 0;
45
 
@@ -80,7 +81,7 @@
80
  if ( 1 == columns ) {
81
  marginBottom = 20;
82
  }
83
- $container.children('.wc-shortcodes-post-box').css({'width':columnWidth+'px', 'marginBottom':marginBottom+'px', 'padding':'0'});
84
  }
85
 
86
  calculateGrid();
@@ -93,6 +94,7 @@
93
  gutterWidth: gutterWidth
94
  }
95
  });
 
96
  $container.imagesLoaded( function(){
97
  calculateGrid();
98
 
@@ -104,6 +106,9 @@
104
  gutterWidth: gutterWidth
105
  }
106
  });
 
 
 
107
  });
108
  $(window).smartresize(function(){
109
  calculateGrid();
40
 
41
  $(document).ready(function(){
42
  var $container = $('.wc-shortcodes-posts');
43
+ var $postBox = $container.children('.wc-shortcodes-post-box');
44
  var columnWidth = 0;
45
  var gutterWidth = 0;
46
 
81
  if ( 1 == columns ) {
82
  marginBottom = 20;
83
  }
84
+ $postBox.css({'width':columnWidth+'px', 'marginBottom':marginBottom+'px', 'padding':'0'});
85
  }
86
 
87
  calculateGrid();
94
  gutterWidth: gutterWidth
95
  }
96
  });
97
+
98
  $container.imagesLoaded( function(){
99
  calculateGrid();
100
 
106
  gutterWidth: gutterWidth
107
  }
108
  });
109
+
110
+ $postBox.css('visibility', 'visible');
111
+ $container.addClass('wc-shortcodes-posts-animation');
112
  });
113
  $(window).smartresize(function(){
114
  calculateGrid();
includes/mce/js/shortcodes-tinymce-4.js CHANGED
@@ -133,7 +133,7 @@
133
  {
134
  text: "Image",
135
  onclick: function(){
136
- editor.insertContent('[wc_image attachment_id="" size="" title="" alt="" caption="" link_to="post" url="" align="none" flag="For Sale" left="" top="" right="0" bottom="20" text_color="" background_color="" font_size=""][/wc_image]');
137
  }
138
  },
139
  {
@@ -164,43 +164,43 @@
164
  {
165
  text: "Primary",
166
  onclick: function(){
167
- editor.insertContent('[wc_box color="primary" text_align="left"]' + wcDummyContent + '[/wc_box]');
168
  }
169
  },
170
  {
171
  text: "Secondary",
172
  onclick: function(){
173
- editor.insertContent('[wc_box color="secondary" text_align="left"]' + wcDummyContent + '[/wc_box]');
174
  }
175
  },
176
  {
177
  text: "Inverse",
178
  onclick: function(){
179
- editor.insertContent('[wc_box color="inverse" text_align="left"]' + wcDummyContent + '[/wc_box]');
180
  }
181
  },
182
  {
183
  text: "Success",
184
  onclick: function(){
185
- editor.insertContent('[wc_box color="success" text_align="left"]' + wcDummyContent + '[/wc_box]');
186
  }
187
  },
188
  {
189
  text: "Warning",
190
  onclick: function(){
191
- editor.insertContent('[wc_box color="warning" text_align="left"]' + wcDummyContent + '[/wc_box]');
192
  }
193
  },
194
  {
195
  text: "Danger",
196
  onclick: function(){
197
- editor.insertContent('[wc_box color="danger" text_align="left"]' + wcDummyContent + '[/wc_box]');
198
  }
199
  },
200
  {
201
  text: "Info",
202
  onclick: function(){
203
- editor.insertContent('[wc_box color="info" text_align="left"]' + wcDummyContent + '[/wc_box]');
204
  }
205
  }
206
  ]
@@ -293,19 +293,19 @@
293
  {
294
  text: "Accordion",
295
  onclick: function(){
296
- editor.insertContent('[wc_accordion collapse="0"]<p>[wc_accordion_section title="Section 1"]</p>' + wcParagraphContent + '<p>[/wc_accordion_section]</p><p>[wc_accordion_section title="Section 2"]</p>' + wcParagraphContent + '<p>[/wc_accordion_section]</p>[/wc_accordion]');
297
  }
298
  },
299
  {
300
  text: "Tabs",
301
  onclick: function(){
302
- editor.insertContent('[wc_tabgroup][wc_tab title="First Tab"]'+wcParagraphContent+'<p>[/wc_tab][wc_tab title="Second Tab"]</p>'+wcParagraphContent+'[/wc_tab][/wc_tabgroup]');
303
  }
304
  },
305
  {
306
  text: "Toggle",
307
  onclick: function(){
308
- editor.insertContent('[wc_toggle title="This Is Your Toggle Title" padding="" border_width=""]' + wcParagraphContent + '[/wc_toggle]');
309
  }
310
  }
311
  ]
133
  {
134
  text: "Image",
135
  onclick: function(){
136
+ editor.insertContent('[wc_image attachment_id="" size="" title="" alt="" caption="" link_to="post" url="" align="none" flag="For Sale" left="" top="" right="0" bottom="20" text_color="" background_color="" font_size="" text_align="center" flag_width=""][/wc_image]');
137
  }
138
  },
139
  {
164
  {
165
  text: "Primary",
166
  onclick: function(){
167
+ editor.insertContent('[wc_box color="primary" text_align="left"]' + wcParagraphContent + '[/wc_box]');
168
  }
169
  },
170
  {
171
  text: "Secondary",
172
  onclick: function(){
173
+ editor.insertContent('[wc_box color="secondary" text_align="left"]' + wcParagraphContent + '[/wc_box]');
174
  }
175
  },
176
  {
177
  text: "Inverse",
178
  onclick: function(){
179
+ editor.insertContent('[wc_box color="inverse" text_align="left"]' + wcParagraphContent + '[/wc_box]');
180
  }
181
  },
182
  {
183
  text: "Success",
184
  onclick: function(){
185
+ editor.insertContent('[wc_box color="success" text_align="left"]' + wcParagraphContent + '[/wc_box]');
186
  }
187
  },
188
  {
189
  text: "Warning",
190
  onclick: function(){
191
+ editor.insertContent('[wc_box color="warning" text_align="left"]' + wcParagraphContent + '[/wc_box]');
192
  }
193
  },
194
  {
195
  text: "Danger",
196
  onclick: function(){
197
+ editor.insertContent('[wc_box color="danger" text_align="left"]' + wcParagraphContent + '[/wc_box]');
198
  }
199
  },
200
  {
201
  text: "Info",
202
  onclick: function(){
203
+ editor.insertContent('[wc_box color="info" text_align="left"]' + wcParagraphContent + '[/wc_box]');
204
  }
205
  }
206
  ]
293
  {
294
  text: "Accordion",
295
  onclick: function(){
296
+ editor.insertContent('[wc_accordion collapse="0" layout="box"]<p>[wc_accordion_section title="Section 1"]</p>' + wcParagraphContent + '<p>[/wc_accordion_section]</p><p>[wc_accordion_section title="Section 2"]</p>' + wcParagraphContent + '<p>[/wc_accordion_section]</p>[/wc_accordion]');
297
  }
298
  },
299
  {
300
  text: "Tabs",
301
  onclick: function(){
302
+ editor.insertContent('[wc_tabgroup layout="box"][wc_tab title="First Tab"]'+wcParagraphContent+'<p>[/wc_tab][wc_tab title="Second Tab"]</p>'+wcParagraphContent+'[/wc_tab][/wc_tabgroup]');
303
  }
304
  },
305
  {
306
  text: "Toggle",
307
  onclick: function(){
308
+ editor.insertContent('[wc_toggle title="This Is Your Toggle Title" layout="box"]' + wcParagraphContent + '[/wc_toggle]');
309
  }
310
  }
311
  ]
includes/shortcode-functions.php CHANGED
@@ -585,8 +585,21 @@ if( !function_exists('wc_shortcodes_toggle') ) {
585
  'class' => '',
586
  'padding' => '',
587
  'border_width' => '',
 
588
  ), $atts ) );
589
 
 
 
 
 
 
 
 
 
 
 
 
 
590
  $style = array();
591
 
592
  if ( ! empty( $padding ) || '0' === $padding )
@@ -600,7 +613,7 @@ if( !function_exists('wc_shortcodes_toggle') ) {
600
  wp_enqueue_script('wc-shortcodes-toggle');
601
 
602
  // Display the Toggle
603
- return '<div class="wc-shortcodes-toggle '. $class .'"><div class="wc-shortcodes-toggle-trigger"><a href="#">'. $title .'</a></div><div style="'.$style.'" class="wc-shortcodes-toggle-container">' . do_shortcode($content) . '</div></div>';
604
  }
605
  }
606
 
@@ -618,18 +631,31 @@ if( !function_exists('wc_shortcodes_accordion_main') ) {
618
  extract( shortcode_atts( array(
619
  'class' => '',
620
  'collapse' => 0,
 
621
  ), $atts ) );
622
 
623
- $type = 'wc-shortcodes-accordion-default';
 
 
624
 
625
  if ( (int) $collapse )
626
- $type = 'wc-shortcodes-accordion-collapse';
627
-
 
 
 
 
 
 
 
 
 
 
628
  // Enque scripts
629
  wp_enqueue_script('wc-shortcodes-accordion');
630
 
631
  // Display the accordion
632
- return '<div class="wc-shortcodes-accordion '.$type.' '. $class .'">' . do_shortcode($content) . '</div>';
633
  }
634
  }
635
 
@@ -640,20 +666,9 @@ if( !function_exists('wc_shortcodes_accordion_section') ) {
640
  extract( shortcode_atts( array(
641
  'title' => 'Title',
642
  'class' => '',
643
- 'padding' => '',
644
- 'border_width' => '',
645
  ), $atts ) );
646
 
647
- $style = array();
648
-
649
- if ( ! empty( $padding ) || '0' === $padding )
650
- $style[] = 'padding:'.$padding;
651
- if ( ! empty( $border_width ) || '0' === $border_width )
652
- $style[] = 'border-width:'.$border_width;
653
-
654
- $style = implode( ';', $style );
655
-
656
- return '<div class="wc-shortcodes-accordion-trigger '. $class .'"><a href="#">'. $title .'</a></div><div style="'.$style.'" class="wc-shortcodes-accordion-content">' . do_shortcode($content) . '</div>';
657
  }
658
 
659
  }
@@ -671,14 +686,30 @@ if (!function_exists('wc_shortcodes_tabgroup')) {
671
  wp_enqueue_script('wc-shortcodes-tabs');
672
 
673
  // Display Tabs
674
- $defaults = array();
 
 
 
675
  extract( shortcode_atts( $defaults, $atts ) );
 
 
 
 
 
 
 
 
 
 
 
 
 
676
  preg_match_all( '/tab title="([^\"]+)"/i', $content, $matches, PREG_OFFSET_CAPTURE );
677
  $tab_titles = array();
678
  if( isset($matches[1]) ){ $tab_titles = $matches[1]; }
679
  $output = '';
680
  if( count($tab_titles) ){
681
- $output .= '<div id="wc-shortcodes-tab-'. rand(1, 100) .'" class="wc-shortcodes-tabs">';
682
  $output .= '<ul class="ui-tabs-nav wc-shortcodes-clearfix">';
683
  foreach( $tab_titles as $tab ){
684
  $output .= '<li><a href="#wc-shortcodes-tab-'. sanitize_title( $tab[0] ) .'">' . $tab[0] . '</a></li>';
@@ -696,10 +727,16 @@ if (!function_exists('wc_shortcodes_tab')) {
696
  function wc_shortcodes_tab( $atts, $content = null ) {
697
  $defaults = array(
698
  'title' => 'Tab',
699
- 'class' => ''
700
  );
701
  extract( shortcode_atts( $defaults, $atts ) );
702
- return '<div id="wc-shortcodes-tab-'. sanitize_title( $title ) .'" class="tab-content '. $class .'">'. do_shortcode( $content ) .'</div>';
 
 
 
 
 
 
 
703
  }
704
  }
705
 
@@ -829,7 +866,7 @@ if (! function_exists( 'wc_shortcodes_googlemaps' ) ) :
829
  wp_enqueue_script('wc-shortcodes-googlemap-api');
830
 
831
 
832
- $output = '<div id="map_canvas_'.rand(1, 100).'" class="googlemap '. $class .'" style="height:'.$height.'px;width:100%">';
833
  $output .= (!empty($title)) ? '<input class="title" type="hidden" value="'.$title.'" />' : '';
834
  $output .= '<input class="location" type="hidden" value="'.$location.'" />';
835
  $output .= '<input class="zoom" type="hidden" value="'.$zoom.'" />';
@@ -1179,6 +1216,8 @@ if( !function_exists('wc_shortcodes_image') ) {
1179
  'text_color' => '',
1180
  'background_color' => '',
1181
  'font_size' => '',
 
 
1182
 
1183
  // misc options
1184
  'class' => '',
@@ -1233,6 +1272,11 @@ if( !function_exists('wc_shortcodes_image') ) {
1233
  $style[] = 'color:' . $text_color;
1234
  if ( is_numeric( $font_size ) )
1235
  $style[] = 'font-size:' . (int) $font_size . 'px';
 
 
 
 
 
1236
 
1237
  $html .= '<span style="' . implode( ';', $style ) . '" class="wc-shortcodes-image-flag-bg"><span class="wc-shortcodes-image-flag-text">' . esc_html( $flag ) . '</span></span>';
1238
  $div_wrapper = true;
585
  'class' => '',
586
  'padding' => '',
587
  'border_width' => '',
588
+ 'layout' => 'box',
589
  ), $atts ) );
590
 
591
+ $classes = array();
592
+
593
+ $classes[] = 'wc-shortcodes-toggle';
594
+
595
+ if ( ! empty( $class ) )
596
+ $classes[] = $class;
597
+
598
+ if ( ! empty( $layout ) )
599
+ $classes[] = 'wc-shortcodes-toggle-layout-' . $layout;
600
+
601
+ $class = implode( ' ', $classes );
602
+
603
  $style = array();
604
 
605
  if ( ! empty( $padding ) || '0' === $padding )
613
  wp_enqueue_script('wc-shortcodes-toggle');
614
 
615
  // Display the Toggle
616
+ return '<div class="'. $class .'"><div class="wc-shortcodes-toggle-trigger"><a href="#">'. $title .'</a></div><div style="'.$style.'" class="wc-shortcodes-toggle-container">' . do_shortcode($content) . '</div></div>';
617
  }
618
  }
619
 
631
  extract( shortcode_atts( array(
632
  'class' => '',
633
  'collapse' => 0,
634
+ 'layout' => 'box',
635
  ), $atts ) );
636
 
637
+ $classes = array();
638
+
639
+ $classes[] = 'wc-shortcodes-accordion';
640
 
641
  if ( (int) $collapse )
642
+ $classes[] = 'wc-shortcodes-accordion-collapse';
643
+ else
644
+ $classes[] = 'wc-shortcodes-accordion-default';
645
+
646
+ if ( ! empty( $class ) )
647
+ $classes[] = $class;
648
+
649
+ if ( ! empty( $layout ) )
650
+ $classes[] = 'wc-shortcodes-accordion-layout-' . $layout;
651
+
652
+ $class = implode( ' ', $classes );
653
+
654
  // Enque scripts
655
  wp_enqueue_script('wc-shortcodes-accordion');
656
 
657
  // Display the accordion
658
+ return '<div class="'. $class .'">' . do_shortcode($content) . '</div>';
659
  }
660
  }
661
 
666
  extract( shortcode_atts( array(
667
  'title' => 'Title',
668
  'class' => '',
 
 
669
  ), $atts ) );
670
 
671
+ return '<div class="wc-shortcodes-accordion-trigger '. $class .'"><a href="#">'. $title .'</a></div><div class="wc-shortcodes-accordion-content">' . do_shortcode($content) . '</div>';
 
 
 
 
 
 
 
 
 
672
  }
673
 
674
  }
686
  wp_enqueue_script('wc-shortcodes-tabs');
687
 
688
  // Display Tabs
689
+ $defaults = array(
690
+ 'class' => '',
691
+ 'layout' => 'box',
692
+ );
693
  extract( shortcode_atts( $defaults, $atts ) );
694
+
695
+ $classes = array();
696
+
697
+ $classes[] = 'wc-shortcodes-tabs';
698
+
699
+ if ( ! empty( $class ) )
700
+ $classes[] = $class;
701
+
702
+ if ( ! empty( $layout ) )
703
+ $classes[] = 'wc-shortcodes-tabs-layout-' . $layout;
704
+
705
+ $class = implode( ' ', $classes );
706
+
707
  preg_match_all( '/tab title="([^\"]+)"/i', $content, $matches, PREG_OFFSET_CAPTURE );
708
  $tab_titles = array();
709
  if( isset($matches[1]) ){ $tab_titles = $matches[1]; }
710
  $output = '';
711
  if( count($tab_titles) ){
712
+ $output .= '<div class="'.$class.'">';
713
  $output .= '<ul class="ui-tabs-nav wc-shortcodes-clearfix">';
714
  foreach( $tab_titles as $tab ){
715
  $output .= '<li><a href="#wc-shortcodes-tab-'. sanitize_title( $tab[0] ) .'">' . $tab[0] . '</a></li>';
727
  function wc_shortcodes_tab( $atts, $content = null ) {
728
  $defaults = array(
729
  'title' => 'Tab',
 
730
  );
731
  extract( shortcode_atts( $defaults, $atts ) );
732
+
733
+ $classes = array();
734
+
735
+ $classes[] = 'tab-content';
736
+
737
+ $class = implode( ' ', $classes );
738
+
739
+ return '<div id="wc-shortcodes-tab-'. sanitize_title( $title ) .'" class="'. $class .'">'. do_shortcode( $content ) .'</div>';
740
  }
741
  }
742
 
866
  wp_enqueue_script('wc-shortcodes-googlemap-api');
867
 
868
 
869
+ $output = '<div class="googlemap '. $class .'" style="height:'.$height.'px;width:100%">';
870
  $output .= (!empty($title)) ? '<input class="title" type="hidden" value="'.$title.'" />' : '';
871
  $output .= '<input class="location" type="hidden" value="'.$location.'" />';
872
  $output .= '<input class="zoom" type="hidden" value="'.$zoom.'" />';
1216
  'text_color' => '',
1217
  'background_color' => '',
1218
  'font_size' => '',
1219
+ 'text_align' => '', // none, left, center, right
1220
+ 'flag_width' => '',
1221
 
1222
  // misc options
1223
  'class' => '',
1272
  $style[] = 'color:' . $text_color;
1273
  if ( is_numeric( $font_size ) )
1274
  $style[] = 'font-size:' . (int) $font_size . 'px';
1275
+ if ( in_array( $text_align, $whitelist ) )
1276
+ $style[] = 'text-align:' . $text_align;
1277
+ if ( is_numeric( $flag_width ) && ! empty( $flag_width ) )
1278
+ $style[] = 'width:' . (int) $flag_width . 'px';
1279
+
1280
 
1281
  $html .= '<span style="' . implode( ';', $style ) . '" class="wc-shortcodes-image-flag-bg"><span class="wc-shortcodes-image-flag-text">' . esc_html( $flag ) . '</span></span>';
1282
  $div_wrapper = true;
readme.txt CHANGED
@@ -4,7 +4,7 @@ Contributors: cbaldelomar
4
  Donate link: http://webplantmedia.com/donate/
5
  Tags: shortcode, shortcodes, accordion, accordions, tab, tabs, toggle, columns, column, section, sections, testimonials, border, borders, button, buttons, fullwidth, full width, notification, notifications, google maps, maps, googlemaps, social icons, progress bar, pricing, pricing box, highlights, image, flags, banners, countdown, rsvp, custom html, code, code snippets, snippets, isotope, masonry, posts, post_type, font awesome, icons, fontawesome, fa icons
6
  Requires at least: 3.7
7
- Tested up to: 3.8.1
8
  Stable tag: trunk
9
  License: GPLv2 or later
10
  License URI: http://www.gnu.org/licenses/gpl-2.0.html
@@ -88,6 +88,16 @@ Use the shortcode manager in the TinyMCE text editor
88
 
89
  == Changelog ==
90
 
 
 
 
 
 
 
 
 
 
 
91
  ### Version 1.34
92
 
93
  * Updated plugin to be compatible with version 3.9
4
  Donate link: http://webplantmedia.com/donate/
5
  Tags: shortcode, shortcodes, accordion, accordions, tab, tabs, toggle, columns, column, section, sections, testimonials, border, borders, button, buttons, fullwidth, full width, notification, notifications, google maps, maps, googlemaps, social icons, progress bar, pricing, pricing box, highlights, image, flags, banners, countdown, rsvp, custom html, code, code snippets, snippets, isotope, masonry, posts, post_type, font awesome, icons, fontawesome, fa icons
6
  Requires at least: 3.7
7
+ Tested up to: 3.9
8
  Stable tag: trunk
9
  License: GPLv2 or later
10
  License URI: http://www.gnu.org/licenses/gpl-2.0.html
88
 
89
  == Changelog ==
90
 
91
+ ### Version 1.35
92
+
93
+ * wc_box short code needed line breaks inserted
94
+ * update to image flag short code
95
+ * changed name
96
+ * added more options to image shortcode
97
+ * removed unnecessary short code parameters from accordion
98
+ * fixed style bug before accordion js was loaded
99
+ * isotope appear and animation enabled after initial load.
100
+
101
  ### Version 1.34
102
 
103
  * Updated plugin to be compatible with version 3.9
wc-shortcodes.php CHANGED
@@ -1,15 +1,15 @@
1
  <?php
2
  /*
3
- Plugin Name: WordPress Canvas - Shortcodes
4
  Plugin URI: http://wordpresscanvas.com/features/shortcodes/
5
  Description: A family of shortcodes to enhance site functionality.
6
  Author: Chris Baldelomar
7
  Author URI: http://webplantmedia.com/
8
- Version: 1.34
9
  License: GPLv2 or later
10
  */
11
 
12
- define( 'WC_SHORTCODES_VERSION', '1.34' );
13
  define( 'WC_SHORTCODES_PREFIX', 'wc_shortcodes_' );
14
  define( '_WC_SHORTCODES_PREFIX', '_wc_shortcodes_' );
15
  define( 'WC_SHORTCODES_PLUGIN_URL', plugin_dir_url( __FILE__ ) );
1
  <?php
2
  /*
3
+ Plugin Name: WP Canvas - Shortcodes
4
  Plugin URI: http://wordpresscanvas.com/features/shortcodes/
5
  Description: A family of shortcodes to enhance site functionality.
6
  Author: Chris Baldelomar
7
  Author URI: http://webplantmedia.com/
8
+ Version: 1.35
9
  License: GPLv2 or later
10
  */
11
 
12
+ define( 'WC_SHORTCODES_VERSION', '1.35' );
13
  define( 'WC_SHORTCODES_PREFIX', 'wc_shortcodes_' );
14
  define( '_WC_SHORTCODES_PREFIX', '_wc_shortcodes_' );
15
  define( 'WC_SHORTCODES_PLUGIN_URL', plugin_dir_url( __FILE__ ) );