Weaver Xtreme Theme Support - Version 3.1.9

Version Description

See ChangeLog for changes to this version.

Download this release

Release Info

Developer wpweaver
Plugin Icon 128x128 Weaver Xtreme Theme Support
Version 3.1.9
Comparing to
See all releases

Code changes from version 3.1.8 to 3.1.9

Files changed (7) hide show
  1. admin/admin-advancedopts.php +1 -1
  2. admin/admin-lib-ts-2.php +4 -4
  3. admin/admin-mainopts.php +1 -1
  4. help/help.html +2 -1
  5. includes/wvrx-ts-shortcodes.php +33 -29
  6. readme.txt +7 -1
  7. weaverx-ts.php +10 -2
admin/admin-advancedopts.php CHANGED
@@ -372,7 +372,7 @@ If you have a theme using transparent backgrounds, this option will likely impro
372
  <label><input type="checkbox" name="<?php weaverx_sapi_main_name('_hide_auto_css_rules'); ?>" id="hide_auto_css_rules" <?php checked(weaverx_getopt_checked( '_hide_auto_css_rules' )); ?> />
373
  <?php _e('Don\'t auto-display CSS rules - <small>Checking this box will disable the auto-display of Main Option elements that have CSS settings.</small> &diams;', 'weaver-xtreme' /*adm*/); ?></label><br />
374
 
375
- <input name="<?php weaverx_sapi_main_name('_css_rows'); ?>" id="css_rows" type="text" style="width:30px;height:20px;" class="regular-text" value="<?php weaverx_esc_textarea(weaverx_getopt('_css_rows')); ?>" />
376
  <?php _e('lines - Set CSS+ text box height - <small>You can increase the default height of the CSS+ input area (1 to 25 lines).</small> &diams;', 'weaver-xtreme' /*adm*/); ?>
377
  <br />
378
  <br />
372
  <label><input type="checkbox" name="<?php weaverx_sapi_main_name('_hide_auto_css_rules'); ?>" id="hide_auto_css_rules" <?php checked(weaverx_getopt_checked( '_hide_auto_css_rules' )); ?> />
373
  <?php _e('Don\'t auto-display CSS rules - <small>Checking this box will disable the auto-display of Main Option elements that have CSS settings.</small> &diams;', 'weaver-xtreme' /*adm*/); ?></label><br />
374
 
375
+ <input name="<?php weaverx_sapi_main_name('_css_rows'); ?>" id="css_rows" type="text" style="width:30px;" class="regular-text" value="<?php weaverx_esc_textarea(weaverx_getopt('_css_rows')); ?>" />
376
  <?php _e('lines - Set CSS+ text box height - <small>You can increase the default height of the CSS+ input area (1 to 25 lines).</small> &diams;', 'weaver-xtreme' /*adm*/); ?>
377
  <br />
378
  <br />
admin/admin-lib-ts-2.php CHANGED
@@ -31,7 +31,7 @@ function weaverx_form_text($value,$media=false) {
31
  <tr>
32
  <th scope="row" align="right"><?php weaverx_echo_name($value); ?>:&nbsp;</th>
33
  <td>
34
- <input name="<?php weaverx_sapi_main_name($value['id']); ?>" id="<?php echo $value['id']; ?>" type="text" style="width:<?php echo $twide;?>px;height:22px;" class="regular-text" value="<?php echo esc_textarea(weaverx_getopt( $value['id'] )); ?>" />
35
  <?php
36
  if ($media) {
37
  weaverx_media_lib_button($value['id']);
@@ -49,7 +49,7 @@ function weaverx_form_val($value, $unit = '') {
49
  <tr>
50
  <th scope="row" align="right"><?php weaverx_echo_name($value); ?>:&nbsp;</th>
51
  <td>
52
- <input name="<?php weaverx_sapi_main_name($value['id']); ?>" id="<?php echo $value['id']; ?>" type="text" style="width:50px;height:22px;" class="regular-text" value="<?php echo esc_textarea(weaverx_getopt( $value['id'] )); ?>" /> <?php echo $unit; ?>
53
  </td>
54
  <?php weaverx_form_info($value);
55
  ?>
@@ -65,8 +65,8 @@ function weaverx_form_text_xy($value,$x='X', $y='Y', $units='px') {
65
  <tr>
66
  <th scope="row" align="right"><?php weaverx_echo_name($value); echo $colon;?>&nbsp;</th>
67
  <td>
68
- <?php echo '<span class="rtl-break">' . $x;?>:<input name="<?php weaverx_sapi_main_name($xid); ?>" id="<?php echo $xid; ?>" type="text" style="width:40px;height:20px;" class="regular-text" value="<?php weaverx_esc_textarea(weaverx_getopt( $xid )); ?>" /> <?php echo $units; ?></span>
69
- &nbsp;<?php echo '<span class="rtl-break">' . $y;?>:<input name="<?php weaverx_sapi_main_name($yid); ?>" id="<?php echo $yid; ?>" type="text" style="width:40px;height:20px;" class="regular-text" value="<?php weaverx_esc_textarea(weaverx_getopt( $yid )); ?>" /> <?php echo $units; ?></span>
70
  </td>
71
  <?php weaverx_form_info($value);
72
  ?>
31
  <tr>
32
  <th scope="row" align="right"><?php weaverx_echo_name($value); ?>:&nbsp;</th>
33
  <td>
34
+ <input name="<?php weaverx_sapi_main_name($value['id']); ?>" id="<?php echo $value['id']; ?>" type="text" style="width:<?php echo $twide;?>px;" class="regular-text" value="<?php echo esc_textarea(weaverx_getopt( $value['id'] )); ?>" />
35
  <?php
36
  if ($media) {
37
  weaverx_media_lib_button($value['id']);
49
  <tr>
50
  <th scope="row" align="right"><?php weaverx_echo_name($value); ?>:&nbsp;</th>
51
  <td>
52
+ <input name="<?php weaverx_sapi_main_name($value['id']); ?>" id="<?php echo $value['id']; ?>" type="text" style="width:50px;" class="regular-text" value="<?php echo esc_textarea(weaverx_getopt( $value['id'] )); ?>" /> <?php echo $unit; ?>
53
  </td>
54
  <?php weaverx_form_info($value);
55
  ?>
65
  <tr>
66
  <th scope="row" align="right"><?php weaverx_echo_name($value); echo $colon;?>&nbsp;</th>
67
  <td>
68
+ <?php echo '<span class="rtl-break">' . $x;?>:<input name="<?php weaverx_sapi_main_name($xid); ?>" id="<?php echo $xid; ?>" type="text" style="width:40px;" class="regular-text" value="<?php weaverx_esc_textarea(weaverx_getopt( $xid )); ?>" /> <?php echo $units; ?></span>
69
+ &nbsp;<?php echo '<span class="rtl-break">' . $y;?>:<input name="<?php weaverx_sapi_main_name($yid); ?>" id="<?php echo $yid; ?>" type="text" style="width:40px;" class="regular-text" value="<?php weaverx_esc_textarea(weaverx_getopt( $yid )); ?>" /> <?php echo $units; ?></span>
70
  </td>
71
  <?php weaverx_form_info($value);
72
  ?>
admin/admin-mainopts.php CHANGED
@@ -575,7 +575,7 @@ array( 'name' => __('Header Other options', 'weaver-xtreme'), 'type' => 'break')
575
 
576
  array('name' => '<span class="i-left dashicons dashicons-editor-kitchensink"></span>' . __('Fixed-Top Header Widget Area', 'weaver-xtreme' /*adm*/) ,
577
  'id' => 'header_sb_fixedtop', 'type' => 'checkbox',
578
- 'info' => __('Fix the Header Widget Area to top of page. Use the <em>Expand/Extend BG Attributes</em> on the "Full Width" tab to make a full width Header Widget Area.', 'weaver-xtreme' /*adm*/)),
579
 
580
  array( 'type' => 'submit'),
581
 
575
 
576
  array('name' => '<span class="i-left dashicons dashicons-editor-kitchensink"></span>' . __('Fixed-Top Header Widget Area', 'weaver-xtreme' /*adm*/) ,
577
  'id' => 'header_sb_fixedtop', 'type' => 'checkbox',
578
+ 'info' => __('Fix the Header Widget Area to top of page. If primary/secondary menus also fixed-top, header widget area will always be after secondary and before primary. Use the <em>Expand/Extend BG Attributes</em> on the "Full Width" tab to make a full width Header Widget Area.', 'weaver-xtreme' /*adm*/)),
579
 
580
  array( 'type' => 'submit'),
581
 
help/help.html CHANGED
@@ -555,6 +555,7 @@ Wrap content in a box.</p>
555
  'controls' = '1' . . . . . . . 0: hide player controls<br />
556
  'disablekb' = '0' . . . . . . 1: disable keyboard controls<br />
557
  'egm' ='0' . . . . . . . . . . . 1: enable &quot;Enhanced Genie Menu&quot;<br />
 
558
  'hd' = '0' . . . . . . . . . . . . 1: enable HD playback by default<br />
559
  'iv_load_policy' = '1' . . . 1: show annotations; 3: don't show; 2: discontinued support<br />
560
  'loop' = '0' . . . . . . . . . . . 1: loop video<br />
@@ -563,7 +564,7 @@ Wrap content in a box.</p>
563
  'playlist' = not set . . . . . . Comma separated list of videoIDs to play (id/url video played 1st)<br />
564
  'showinfo' = '1' . . . . . . . 0: hide video title<br />
565
  'showsearch' = '1' . . . . . 0: hide video searchbox<br />
566
- 'start' = not set . . . . . . . start vide this number of seconds from start<br />
567
  'theme' = 'dark' . . . . . . . dark or light - display theme for player<br />
568
  'wmode' = 'transparent' . Keeps video behind menu bars, etc. Other values available - see YouTube</p>
569
  <h2><a name="widg-sum" id="widg-sum"></a>Widget Summary</h2>
555
  'controls' = '1' . . . . . . . 0: hide player controls<br />
556
  'disablekb' = '0' . . . . . . 1: disable keyboard controls<br />
557
  'egm' ='0' . . . . . . . . . . . 1: enable &quot;Enhanced Genie Menu&quot;<br />
558
+ 'end' = not set . . . . . . . end video this number of seconds from start<br />
559
  'hd' = '0' . . . . . . . . . . . . 1: enable HD playback by default<br />
560
  'iv_load_policy' = '1' . . . 1: show annotations; 3: don't show; 2: discontinued support<br />
561
  'loop' = '0' . . . . . . . . . . . 1: loop video<br />
564
  'playlist' = not set . . . . . . Comma separated list of videoIDs to play (id/url video played 1st)<br />
565
  'showinfo' = '1' . . . . . . . 0: hide video title<br />
566
  'showsearch' = '1' . . . . . 0: hide video searchbox<br />
567
+ 'start' = not set . . . . . . . start video this number of seconds from start<br />
568
  'theme' = 'dark' . . . . . . . dark or light - display theme for player<br />
569
  'wmode' = 'transparent' . Keeps video behind menu bars, etc. Other values available - see YouTube</p>
570
  <h2><a name="widg-sum" id="widg-sum"></a>Widget Summary</h2>
includes/wvrx-ts-shortcodes.php CHANGED
@@ -4,36 +4,37 @@
4
  */
5
 
6
  function wvrx_ts_setup_shortcodes() {
7
- // we setup all of our shortcodes only after the theme has been loaded...
8
-
9
- $codes = array( // list of shortcodes
10
- array('bloginfo' => 'wvrx_ts_sc_bloginfo'), // [bloginfo]
11
- array('box' => 'wvrx_ts_sc_box'), // [box]
12
- array('div' => 'wvrx_ts_sc_div'), // [div]
13
- array('header_image' => 'wvrx_ts_sc_header_image'), // [header_image]
14
- array('hide_if' => 'wvrx_ts_sc_hide_if' ), // [hide_if]
15
- array('html' => 'wvrx_ts_sc_html'), // [html]
16
- array('iframe' => 'wvrx_ts_sc_iframe'), // [iframe]
17
- array('login' => 'wvrx_ts_sc_login'), // [login]
18
- array('show_if' => 'wvrx_ts_sc_show_if' ), // [show_if]
19
- array('span' => 'wvrx_ts_sc_span'), // [span]
20
- array('site_tagline' => 'wvrx_ts_sc_site_tagline'), // [site_tagline]
21
- array('site_title' => 'wvrx_ts_sc_site_title'), // [site_title]
22
- array('tab_group' => 'wvrx_ts_sc_tab_group',
23
- 'tab' => 'wvrx_ts_sc_tab'), // [tab_group], [tab]
24
- array('vimeo' => 'wvrx_ts_sc_vimeo'), // [vimeo]
25
- array('youtube' => 'wvrx_ts_sc_youtube'), // [youtube]
26
- array('weaverx_info' => 'wvrx_ts_weaverx_sc_info'), // [weaverx_info]
27
  );
28
 
29
  $prefix = get_option('wvrx_toggle_shortcode_prefix');
30
 
31
- foreach ($codes as $code) {
32
- wvrx_ts_set_shortcodes($code, $prefix);
 
33
  }
34
  }
35
 
36
- add_action('init', 'wvrx_ts_setup_shortcodes'); // allow shortcodes to load after theme has loaded so we know which version to use
 
37
 
38
  // =============== [box] ===================
39
  function wvrx_ts_sc_box( $args = '', $text ) {
@@ -415,10 +416,12 @@ function wvrx_ts_sc_tab( $args, $content ) {
415
 
416
 
417
  // =============== [youtube id=videoid sd=0 hd=0 related=0 https=0 privacy=0 w=0 h=0] ======================
418
- function wvrx_ts_sc_youtube($args = '') {
 
 
419
  $share = '';
420
  if ( isset ( $args[0] ) )
421
- $share = trim($args[0]);
422
 
423
 
424
  // http://code.google.com/apis/youtube/player_parameters.html
@@ -440,6 +443,7 @@ function wvrx_ts_sc_youtube($args = '') {
440
  'controls' => '1',
441
  'disablekb' => '0',
442
  'egm' => '0',
 
443
  'fs' => '1',
444
  'fullscreen' => 1,
445
  'hd' => '0',
@@ -458,6 +462,7 @@ function wvrx_ts_sc_youtube($args = '') {
458
 
459
  ), $args));
460
 
 
461
  if (!$share && !$id)
462
  return __('<strong>No share or id values provided for youtube shortcode.</strong>','weaverx-theme-support' /*adm*/);
463
 
@@ -468,8 +473,7 @@ function wvrx_ts_sc_youtube($args = '') {
468
  $share = str_replace('&amp;','+',$share);
469
  $share = str_replace('&','+',$share);
470
  }
471
- $share = str_replace('http://','',$share);
472
- $share = str_replace('https://','',$share);
473
  if ($share)
474
  $id = $share;
475
  }
@@ -496,6 +500,7 @@ function wvrx_ts_sc_youtube($args = '') {
496
  $opts = wvrx_ts_add_url_opt($opts, true, 'showinfo=' . $showinfo);
497
  $opts = wvrx_ts_add_url_opt($opts, $showsearch != '1', 'showsearch=0');
498
  $opts = wvrx_ts_add_url_opt($opts, $start, 'start='.$start);
 
499
  $opts = wvrx_ts_add_url_opt($opts, $theme != 'dark', 'theme=light');
500
  $opts = wvrx_ts_add_url_opt($opts, $wmode, 'wmode='.$wmode);
501
 
@@ -550,7 +555,7 @@ function wvrx_ts_sc_vimeo($args = '') {
550
  if (!$share && !$id) return __('<strong>No share or id values provided for vimeo shortcode.</strong>','weaverx-theme-support' /*adm*/);
551
 
552
  if ($share) { // let the share override any id
553
- $share = str_replace('http://vimeo.com/','',$share);
554
  if ($share) $id = $share;
555
  }
556
 
@@ -694,5 +699,4 @@ function wvrx_ts_set_shortcodes($sc_list, $prefix) {
694
 
695
  // =============== Utilities ======================
696
 
697
-
698
  ?>
4
  */
5
 
6
  function wvrx_ts_setup_shortcodes() {
7
+
8
+ $codes = array( // list of shortcodes
9
+ 'bloginfo' => 'wvrx_ts_sc_bloginfo', // [bloginfo]
10
+ 'box' => 'wvrx_ts_sc_box', // [box]
11
+ 'div' => 'wvrx_ts_sc_div', // [div]
12
+ 'header_image' => 'wvrx_ts_sc_header_image', // [header_image]
13
+ 'hide_if' => 'wvrx_ts_sc_hide_if' , // [hide_if]
14
+ 'html' => 'wvrx_ts_sc_html', // [html]
15
+ 'iframe' => 'wvrx_ts_sc_iframe', // [iframe]
16
+ 'login' => 'wvrx_ts_sc_login', // [login]
17
+ 'show_if' => 'wvrx_ts_sc_show_if' , // [show_if]
18
+ 'span' => 'wvrx_ts_sc_span', // [span]
19
+ 'site_tagline' => 'wvrx_ts_sc_site_tagline', // [site_tagline]
20
+ 'site_title' => 'wvrx_ts_sc_site_title', // [site_title]
21
+ 'tab_group' => 'wvrx_ts_sc_tab_group',
22
+ 'tab' => 'wvrx_ts_sc_tab', // [tab_group], [tab]
23
+ 'vimeo' => 'wvrx_ts_sc_vimeo', // [vimeo]
24
+ 'youtube' => 'wvrx_ts_sc_yt', // [youtube]
25
+ 'weaverx_info' => 'wvrx_ts_weaverx_sc_info' // [weaverx_info]
 
26
  );
27
 
28
  $prefix = get_option('wvrx_toggle_shortcode_prefix');
29
 
30
+ foreach ($codes as $code => $func ) {
31
+ remove_shortcode($prefix . $code); // use our shortcode instead of someone elses.
32
+ add_shortcode($prefix . $code, $func);
33
  }
34
  }
35
 
36
+ // load our definitions of shortcodes later than probably most anyone else so that we user our versions.
37
+ add_action('init', 'wvrx_ts_setup_shortcodes', 99);
38
 
39
  // =============== [box] ===================
40
  function wvrx_ts_sc_box( $args = '', $text ) {
416
 
417
 
418
  // =============== [youtube id=videoid sd=0 hd=0 related=0 https=0 privacy=0 w=0 h=0] ======================
419
+
420
+
421
+ function wvrx_ts_sc_yt($args = '') {
422
  $share = '';
423
  if ( isset ( $args[0] ) )
424
+ $share = trim($args[0]);
425
 
426
 
427
  // http://code.google.com/apis/youtube/player_parameters.html
443
  'controls' => '1',
444
  'disablekb' => '0',
445
  'egm' => '0',
446
+ 'end' => false,
447
  'fs' => '1',
448
  'fullscreen' => 1,
449
  'hd' => '0',
462
 
463
  ), $args));
464
 
465
+
466
  if (!$share && !$id)
467
  return __('<strong>No share or id values provided for youtube shortcode.</strong>','weaverx-theme-support' /*adm*/);
468
 
473
  $share = str_replace('&amp;','+',$share);
474
  $share = str_replace('&','+',$share);
475
  }
476
+ $share = str_replace(array('http://','https://',"'",'"'), '' ,$share);
 
477
  if ($share)
478
  $id = $share;
479
  }
500
  $opts = wvrx_ts_add_url_opt($opts, true, 'showinfo=' . $showinfo);
501
  $opts = wvrx_ts_add_url_opt($opts, $showsearch != '1', 'showsearch=0');
502
  $opts = wvrx_ts_add_url_opt($opts, $start, 'start='.$start);
503
+ $opts = wvrx_ts_add_url_opt($opts, $end, 'end='.$end);
504
  $opts = wvrx_ts_add_url_opt($opts, $theme != 'dark', 'theme=light');
505
  $opts = wvrx_ts_add_url_opt($opts, $wmode, 'wmode='.$wmode);
506
 
555
  if (!$share && !$id) return __('<strong>No share or id values provided for vimeo shortcode.</strong>','weaverx-theme-support' /*adm*/);
556
 
557
  if ($share) { // let the share override any id
558
+ $share = str_replace(array('http://vimeo.com/', 'https://vimeo.com/' ),'',$share); // fixed 3.1.9 - added https
559
  if ($share) $id = $share;
560
  }
561
 
699
 
700
  // =============== Utilities ======================
701
 
 
702
  ?>
readme.txt CHANGED
@@ -10,7 +10,7 @@ License URI: http://www.gnu.org/licenses/gpl-2.0.html
10
  Text Domain: weaverx-theme-support
11
  Requires at least: 4.5
12
  Tested up to: 4.8
13
- Stable tag: 3.1.8
14
 
15
  A useful shortcode and widget collection for Weaver Xtreme
16
 
@@ -75,6 +75,12 @@ Support for this plugin can best be found at our forum - http://forum.weaverthem
75
  See ChangeLog for changes to this version.
76
 
77
  == ChangeLog ==
 
 
 
 
 
 
78
  = 3.1.8 =
79
  * Fix: New editor style file no longer needs Weaver Xtreme Plus
80
  * New: Display message if need to save options to generate editor-style-wvrx.css file.
10
  Text Domain: weaverx-theme-support
11
  Requires at least: 4.5
12
  Tested up to: 4.8
13
+ Stable tag: 3.1.9
14
 
15
  A useful shortcode and widget collection for Weaver Xtreme
16
 
75
  See ChangeLog for changes to this version.
76
 
77
  == ChangeLog ==
78
+ - 3.1.9 =
79
+ * Fix: Recognize https: for vimeo link
80
+ * Tweak: Added 'end=nnn' option for [ you_tube ] shortcode
81
+ * Tweak: minor option wording change
82
+ * Tweak: Legacy options interface: style text box height for some option values (e.g., margins)
83
+
84
  = 3.1.8 =
85
  * Fix: New editor style file no longer needs Weaver Xtreme Plus
86
  * New: Display message if need to save options to generate editor-style-wvrx.css file.
weaverx-ts.php CHANGED
@@ -5,7 +5,7 @@ Plugin URI: http://weavertheme.com/plugins
5
  Description: Weaver Xtreme Theme Support - a package of useful shortcodes and widgets that integrates closely with the Weaver Xtreme and Weaver Foundation themes.
6
  Author: wpweaver
7
  Author URI: http://weavertheme.com/about/
8
- Version: 3.1.8
9
  License: GPL V3
10
 
11
  Weaver Xtreme Theme Support
@@ -43,7 +43,7 @@ function wvrx_is_user_logged_in() {
43
 
44
  if ( strpos( $theme, '/weaver-xtreme') !== false ) { // only load if Weaver Xtreme is the theme
45
 
46
- define ('WVRX_TS_VERSION','3.1.8');
47
  define ('WVRX_TS_MINIFY','.min'); // '' for dev, '.min' for production
48
  define ('WVRX_TS_APPEARANCE_PAGE', false );
49
 
@@ -242,4 +242,12 @@ function wvrx_ts_scan_section($what) {
242
 
243
  } // end only load if Weaver Xtreme installed
244
 
 
 
 
 
 
 
 
 
245
  ?>
5
  Description: Weaver Xtreme Theme Support - a package of useful shortcodes and widgets that integrates closely with the Weaver Xtreme and Weaver Foundation themes.
6
  Author: wpweaver
7
  Author URI: http://weavertheme.com/about/
8
+ Version: 3.1.9
9
  License: GPL V3
10
 
11
  Weaver Xtreme Theme Support
43
 
44
  if ( strpos( $theme, '/weaver-xtreme') !== false ) { // only load if Weaver Xtreme is the theme
45
 
46
+ define ('WVRX_TS_VERSION','3.1.9');
47
  define ('WVRX_TS_MINIFY','.min'); // '' for dev, '.min' for production
48
  define ('WVRX_TS_APPEARANCE_PAGE', false );
49
 
242
 
243
  } // end only load if Weaver Xtreme installed
244
 
245
+ add_action('plugins_loaded', 'wvrx_check_jetpack');
246
+ function wvrx_check_jetpack() {
247
+ if ( method_exists( 'Jetpack', 'is_module_active' ) && Jetpack::is_module_active( 'minileven' ) && is_admin() ) {
248
+ wvrx_ts_alert(__('**** IMPORTANT: The Jetpack Mobile theme is active. ****\nIt is NOT compatible with Weaver Xtreme, and will break the theme. Please deactivate it from the Jetpack control panel.\n\n**** This message will continue to be displayed until you deactivate the Jetpack Mobile Theme from the Jetpack settings panel. ****', 'weaverx-theme-support'));
249
+ }
250
+ }
251
+
252
+
253
  ?>