Weaver Xtreme Theme Support

Version Description

New: Weaver Xtreme 3.0 compatibility
New: Added style

Release Info

Developer	wpweaver
Plugin	Weaver Xtreme Theme Support
Version	3.0
Comparing to
See all releases

Code changes from version 2.1.3 to 3.0

Files changed (17) hide show

admin/add-weaverx-sapi-options.php +1 -1
admin/admin-advancedopts.php +6 -2
admin/admin-lib-ts-2.php +153 -68
admin/admin-lib-ts.php +6 -0
admin/admin-mainopts.php +222 -21
admin/admin-saverestore.php +10 -5
admin/admin-subthemes.php +19 -7
admin/assets/css/admin-style.css +2 -0
admin/assets/css/admin-style.min.css +5 -5
includes/wvrx-ts-admin-page-posts.php +328 -41
includes/wvrx-ts-runtime-lib.php +120 -4
includes/wvrx-ts-shortcodes.php +6 -2
includes/wvrx-ts-widgets.php +3 -3
readme.txt +9 -2
weaverx-ts-admin-style.css +3 -0
weaverx-ts-admin-style.min.css +2 -2
weaverx-ts.php +33 -11

admin/add-weaverx-sapi-options.php CHANGED Viewed

	@@ -23,7 +23,7 @@ function weaverx_admin_ts_head() { // action definition
23
24
25	}
26	- // admin actions function ~~definitons~~
27
28	function weaverx_ts_weaverx_admin_subthemes() {
29	require_once( dirname(__FILE__ ) . '/admin-subthemes.php');


23
24
25	}
26	+ // admin actions function definitions
27
28	function weaverx_ts_weaverx_admin_subthemes() {
29	require_once( dirname(__FILE__ ) . '/admin-subthemes.php');

admin/admin-advancedopts.php CHANGED Viewed

	@@ -238,7 +238,7 @@ Technically, these features are not part of the theme styling, but cover other a
238
239	<label><input type="checkbox" name="<?php weaverx_sapi_main_name('_inline_style'); ?>" id="_inline_style" <?php checked(weaverx_getopt_checked( '_inline_style' )); ?> />
240	<?php _e('Generate inline CSS code rather than using style-weaverxt.css file.
241	- By default, ~~Weaverx~~ Xtreme Plus will use the style-weaverxt.css file. &diams;', 'weaver-xtreme' /adm/);?>
242	</label><br /><br />
243	<?php
244	}
	@@ -246,7 +246,7 @@ By default, Weaverx Xtreme Plus will use the style-weaverxt.css file. &diams;',
246
247	<h3><?php _e('Include Widget Areas in Print', 'weaver-xtreme' /adm/);?></h3>
248
249	- <label><input type="checkbox" name="<?php weaverx_sapi_main_name('~~_inline_style~~'); ?>" id="_inline_style" <?php checked(weaverx_getopt_checked( '_print_show_widgets' )); ?> />
250	<?php _e('Include all widget areas and full Footer content on browser Print page operation. &diams;', 'weaver-xtreme' /adm/);?>
251	</label><br /><br />
252
	@@ -353,6 +353,10 @@ function weaverx_admin_admin_ts() {
353	<?php _e('<strong>Disable Weaver Xtreme Customizer Interface</strong> - If you have a slow host or slow computer, checking this option will disable loading the Weaver Xtreme Customizer interface. &diams;', 'weaver-xtreme' /adm/); ?>
354	</label><br /><br />
355




356	<label><input type="checkbox" name="<?php weaverx_sapi_main_name('_hide_donate'); ?>" id="hide_donate" <?php checked(weaverx_getopt_checked( '_hide_donate' )); ?> />
357	<?php _e('I\'ve Donated - <small>Thank you for donating to the Weaver Xtreme theme.
358	This will hide the Donate button. Purchasing Weaver Xtreme Plus also hides the Donate button.</small> &diams;', 'weaver-xtreme' /adm/); ?>


238
239	<label><input type="checkbox" name="<?php weaverx_sapi_main_name('_inline_style'); ?>" id="_inline_style" <?php checked(weaverx_getopt_checked( '_inline_style' )); ?> />
240	<?php _e('Generate inline CSS code rather than using style-weaverxt.css file.
241	+ By default, Weaver Xtreme Plus will use the style-weaverxt.css file. &diams;', 'weaver-xtreme' /adm/);?>
242	</label><br /><br />
243	<?php
244	}

246
247	<h3><?php _e('Include Widget Areas in Print', 'weaver-xtreme' /adm/);?></h3>
248
249	+ <label><input type="checkbox" name="<?php weaverx_sapi_main_name('_print_show_widgets'); ?>" id="_inline_style" <?php checked(weaverx_getopt_checked( '_print_show_widgets' )); ?> />
250	<?php _e('Include all widget areas and full Footer content on browser Print page operation. &diams;', 'weaver-xtreme' /adm/);?>
251	</label><br /><br />
252

353	<?php _e('<strong>Disable Weaver Xtreme Customizer Interface</strong> - If you have a slow host or slow computer, checking this option will disable loading the Weaver Xtreme Customizer interface. &diams;', 'weaver-xtreme' /adm/); ?>
354	</label><br /><br />
355
356	+ <label><input type="checkbox" name="<?php weaverx_sapi_main_name('_ignore_PHP_memory'); ?>" id="disable_customizer" <?php checked(weaverx_getopt_checked( '_ignore_PHP_memory' )); ?> />
357	+ <?php _e('<strong>Ignore Customizer PHP Minimum Memory</strong> - If your host PHP memory is too low, it will cause an error message for using the Customizer. If your configuration still works properly with low PHP memory, check this option to disable the error messages. &diams;', 'weaver-xtreme' /adm/); ?>
358	+ </label><br /><br />
359	+
360	<label><input type="checkbox" name="<?php weaverx_sapi_main_name('_hide_donate'); ?>" id="hide_donate" <?php checked(weaverx_getopt_checked( '_hide_donate' )); ?> />
361	<?php _e('I\'ve Donated - <small>Thank you for donating to the Weaver Xtreme theme.
362	This will hide the Donate button. Purchasing Weaver Xtreme Plus also hides the Donate button.</small> &diams;', 'weaver-xtreme' /adm/); ?>

admin/admin-lib-ts-2.php CHANGED Viewed

	@@ -164,6 +164,7 @@ function weaverx_form_link($value) {
164	$id_strong = $id . '_strong';
165	$id_em = $id . '_em';
166	$id_u = $id . '_u';

167	?>
168	<tr><td><small style="float:right;"><?php _e('Link Attributes:', 'weaver-xtreme' /adm/); ?></small></td><td colspan="2">
169
	@@ -174,17 +175,32 @@ function weaverx_form_link($value) {
174	<small><em><?php _e('Italic', 'weaver-xtreme' /adm/); ?></em></small>
175	<?php weaverx_form_font_bold_italic(array('id' => $id_em)); ?>
176
177	-  <small><u><?php _e('Underline', 'weaver-xtreme' /adm/); ?></u></small>
178	<input type="checkbox" name="<?php weaverx_sapi_main_name($id_u); ?>" id="<?php echo $id_u; ?>"
179	<?php checked(weaverx_getopt_checked( $id_u )); ?> >
180
181	- <?php


182

183	weaverx_form_ctext($hover, true);



184	echo '</td></tr>';
185	}
186
187









188	function weaverx_form_note($value) {
189	?>
190	<tr>
	@@ -201,6 +217,7 @@ function weaverx_form_note($value) {
201	<?php
202	}
203

204	function weaverx_form_info($value) {
205	if ($value['info'] != '') {
206	echo('<td style="padding-left: 10px"><small>'); echo $value['info']; echo("</small></td>");
	@@ -219,7 +236,7 @@ function weaverx_form_widget_area( $value, $submit = false ) {
219
220	// defaults - these are determined by the =Padding section of style-weaverx.css
221	$default_tb = array(
222	- 'infobar' => '5px', 'content' => 'T:4px, B:8px', '~~post' => '0', '~~footer' => '8px',
223	'footer_sb' => '8px', 'primary' => '8px',
224	'secondary' => '8px', 'extra' => '8px', 'top' => '8px', 'bottom' => '8px'
225	);
	@@ -234,7 +251,7 @@ function weaverx_form_widget_area( $value, $submit = false ) {
234	'infobar' => '5px', 'content' => 'T:0, B:0', 'footer' => 'T:0, B:0',
235	'footer_sb' => 'T:0, B:10', 'primary' => 'T:0, B:10', 'widget' => '0, Auto - First: T:0, Last: B:0',
236	'secondary' => 'T:0, B:10', 'extra' => 'T:0, B:10', 'top' => 'T:10, B:10', 'bottom' => 'T:10, B:10',
237	- 'wrapper' => 'T:0, B:0'
238	);
239
240	$id = $value['id'];
	@@ -343,7 +360,7 @@ function weaverx_form_widget_area( $value, $submit = false ) {
343
344	if ( $id == 'wrapper' ) { // setting #wrapper sets theme width.
345
346	- $info = __('<em>Change Theme Width.</em> Standard width is ~~940px~~. Use ~~9999~~ for full ~~screen~~ ~~width~~. Widths less than 768px may give unexpected results on mobile devices. Weaver Xtreme can not create a fixed-width site.', 'weaver-xtreme' /adm/);
347
348	weaverx_form_val( array(
349	'name' => '<span class="i-left" style="font-size:150%;">↔</span><em style="color:red;">' . __('Theme Width', 'weaver-xtreme' /adm/) . '</em>',
	@@ -359,16 +376,6 @@ function weaverx_form_widget_area( $value, $submit = false ) {
359	'id' => $id . '_max_width_int', 'type' => '+val_px',
360	'info' => '<em>' . $name . '</em>' . __(': Set Max Width of Area for Desktop View. Advanced Option. (&starf;Plus)', 'weaver-xtreme' /adm/),
361	'value' => array() ),
362	- array(
363	- 'name' => '<small>' . __('Full-width BG', 'weaver-xtreme' /adm/) . '</small>', 'id' => $id . '_extend_bgcolor', 'type' => '+color',
364	- 'info' => '<em>' . $name . '</em>' . __(': Extend BG color to full theme width on Desktop View (&starf;Plus)', 'weaver-xtreme' /adm/),
365	- 'value' => array() ),
366	-
367	- array(
368	- 'name' => '<span class="i-left" style="font-size:150%;">↔</span><small>' . __('Extend BG Attributes', 'weaver-xtreme' /adm/) . '</small>',
369	- 'id' => $id . '_extend_width', 'type' => 'checkbox',
370	- 'info' => '<em>' . $name . '</em>' . __(': Extend all BG Attributes to full width. Overrides Full-width BG color.', 'weaver-xtreme' /adm/)),
371	-
372	);
373
374	weaverx_form_show_options($opts_max, false, false);
	@@ -461,16 +468,84 @@ function weaverx_form_widget_area( $value, $submit = false ) {
461
462
463	function weaverx_form_menu_opts( $value, $submit = false ) {
464	- // build the rows for area ~~settings~~







465
466	//echo '<table><tr><td>';
467	$name = $value['name'];
468	$id = $value['id'];
469
470	- $opts = array(
471


472	array( 'name' => $name, 'id' => '-menu', 'type' => 'header_area',
473	'info' => $value['info']),




























































474
475	array( 'name' => __('Menu Bar', 'weaver-xtreme' /adm/),
476	'id' => $id, 'type' => 'titles_menu', // includes color, font size, font family
	@@ -512,26 +587,7 @@ function weaverx_form_menu_opts( $value, $submit = false ) {
512	'id' => $id . '_sub_hover_color', 'type' => 'color',
513	'info' => '<em>' . $name . '</em>' . __(': Submenu Hover Text Color (Default: Inherit Top Level)', 'weaver-xtreme' /adm/) ),
514
515	- // ~~can~~'t ~~get~~ to ~~font~~ ~~properties~~ ~~for~~ ~~the~~ ~~submenus~~ ~~because no way to add the classes~~
516	-
517	- array(
518	- 'name' => '<small>' . __('Full-width BG', 'weaver-xtreme' /adm/) . '</small>', 'id' => $id . '_extend_bgcolor', 'type' => '+color',
519	- 'info' => '<em>' . $name . '</em>' . __(': Extend BG color to full theme width on Desktop View (&starf;Plus)', 'weaver-xtreme' /adm/),
520	- 'value' => array() ),
521	- array(
522	- 'name' => '<span class="i-left" style="font-size:150%;">↔</span><small>' . __('Extend BG Attributes', 'weaver-xtreme' /adm/) . '</small>',
523	- 'id' => $id . '_extend_width', 'type' => 'checkbox',
524	- 'info' => '<em>' . $name . '</em>' . __(': Extend all BG Attributes to full width. Overrides Full-width BG color.', 'weaver-xtreme' /adm/)),
525	-
526	-
527	- array ('name' => '<span class="i-left dashicons dashicons-editor-alignleft"></span>' . __('Align Menu', 'weaver-xtreme' /adm/),
528	- 'id' => $id . '_align', 'type' => 'select_id',
529	- 'info' => __('Align this menu on desktop view. Mobile, accordion, and vertical menus always left aligned.', 'weaver-xtreme' /adm/),
530	- 'value' => array(
531	- array('val' => 'left', 'desc' => 'Left'),
532	- array('val' => 'center', 'desc' => 'Center'),
533	- array('val' => 'right', 'desc' => 'Right')
534	- )),
535
536	array( 'name' => '<span class="i-left" style="font-size:200%;margin-left:4px;">□</span><small>' . __('Add Border', 'weaver-xtreme' /adm/) . '</small>',
537	'id' => $id . '_border', 'type' => 'checkbox',
	@@ -541,47 +597,42 @@ function weaverx_form_menu_opts( $value, $submit = false ) {
541	'id' => $id . '_sub_border', 'type' => 'checkbox',
542	'info' => '<em>' . $name . '</em>' . ': Add the "standard" border to Submenus' ),
543
544	- array( 'name' => '<span class="i-left dashicons dashicons-marker"></span><small>' . __('Rounded Submenu Corners', 'weaver-xtreme' /adm/) . '</small>',
545	- 'id' => $id . '_sub_rounded', 'type' => 'checkbox',
546	- 'info' => '<em>' . $name . '</em>' . ': Add rounded corners to Submenus' ),
547	-
548	array( 'name' => '<span class="i-left dashicons dashicons-admin-page"></span><small>' . __('Shadow', 'weaver-xtreme' /adm/) . '</small>',
549	'id' => $id .'_shadow', 'type' => 'shadows',
550	'info' => '<em>' . $name . '</em>' . __(': Wrap Menu Bar with Shadow.', 'weaver-xtreme' /adm/) ),
551	array( 'name' => '<span class="i-left dashicons dashicons-marker"></span><small>' . __('Rounded Corners', 'weaver-xtreme' /adm/) . '</small>',
552	'id' => $id .'_rounded', 'type' => 'rounded',
553	'info' => '<em>' . $name . '</em>' . __(': Add rounded corners to menu. <em>You might need to set overlapping corners Header/Wrapper areas also!</em>', 'weaver-xtreme' /adm/) ),



554
555	);
556
557	weaverx_form_show_options($opts, false, false);
558
559

560	if ( $id == 'm_primary' ) {
561	- ~~weaverx_form_checkbox(array(~~
562	- ~~'name'~~ => '~~<small>~~' ~~. __('Move Primary Menu to Top', 'weaver-xtreme' /adm/) . '</small>',~~
563	- ~~'id' =>~~ $id . '~~_move~~',
564	- ~~'info'~~ => ~~'<em>' . $name . '</em>' . __(': Move Primary Menu at Top of Header Area (Default: Bottom)', 'weaver-xtreme' /adm/),~~
565	- ~~'value'~~ => '' ~~) )~~;
566	- ~~} elseif (~~ $id == '~~m_secondary~~' ){
567	- ~~weaverx_form_checkbox(array(~~
568	- 'name' => '<small>' . __('Move Secondary Menu to Bottom', 'weaver-xtreme' /adm/) . '</small>',
569	- 'id' => $id . '_move',
570	- 'info' => '<em>' . $name . '</em>' . __(': Move Secondary Menu at Bottom of Header Area (Default: Top)', 'weaver-xtreme' /adm/),
571	- 'value' => '' ) );
572	}
573
574	$opts2 = array(
575	- ~~array( 'name' => '<span class="i-left dashicons dashicons-visibility"></span><small>' . __('Hide Area', 'weaver-xtreme' /adm/) . '</small>',~~
576	- 'id' => $id .'_hide', 'type' => 'select_hide',
577	- 'info' => '<em>' . $name . '</em>' . __(': Hide menu on different display devices', 'weaver-xtreme' /adm/) ),
578	array( 'name' => '<span class="i-left dashicons dashicons-visibility"></span><small>' . __('Hide Arrows', 'weaver-xtreme' /adm/) . '</small>',
579	'id' => $id . '_hide_arrows', 'type' => 'checkbox',
580	'info' => '<em>' . $name . '</em>' . __(': Hide Arrows on Desktop Menu', 'weaver-xtreme' /adm/)),



581
582	- array( 'name' => ~~'<span class="i-left dashicons dashicons-align-none"></span><small>' .~~ __('~~Desktop~~ Menu ~~Vertical~~ ~~Padding~~', 'weaver-xtreme' ~~/adm/~~) . '~~</small>~~',
583	- 'id' => $id .'_menu_pad_dec', 'type' => 'val_em',
584	- 'info' => '<em>' . $name . '</em>' . __(': Add vertical padding to Desktop menu bar and submenus (Default: 0.6em)', 'weaver-xtreme' /adm/) ),
585
586	array( 'name' => '<span class="i-left dashicons dashicons-align-none"></span><small>' . __('Menu Top Margin', 'weaver-xtreme' /adm/) . '</small>',
587	'id' => $id .'_top_margin_dec', 'type' => 'val_px',
	@@ -590,14 +641,23 @@ function weaverx_form_menu_opts( $value, $submit = false ) {
590	'id' => $id .'_bottom_margin_dec', 'type' => 'val_px',
591	'info' => '<em>' . $name . '</em>' . __(': Bottom margin for menu bar.', 'weaver-xtreme' /adm/) ),
592









593
594	array( 'name' => '<span class="i-left" style="font-size:150%;">↔</span><small>' . __('Desktop Menu Spacing. (not on Smart Menus)', 'weaver-xtreme' /adm/) . '</small>',
595	'id' => $id .'_right_padding_dec' , 'type' => 'val_em',
596	'info' => '<em>' . $name . '</em>' . __(': Add space between desktop menu bar items (Use value > 1.0)', 'weaver-xtreme' /adm/) ),
597
598	- array( 'name' => '~~<span~~ ~~class="i-left">{~~ ~~}</span>~~ ~~<small>~~' ~~. __(~~'~~Add Classes','~~weaver-xtreme' ~~/adm/~~) . '~~</small>~~',
599	- ~~'id' => $id . '_add_class', 'type' => '+widetext',~~
600	- ~~'info' => '<em>' . $name . '</em>' . __(': Space separated class names to add to this area (<em>Advanced option</em>) (&starf;Plus)', 'weaver-xtreme' /adm/) ),~~
601	array('name' => '<span class="i-left dashicons dashicons-editor-code"></span><small>' . __('Left HTML', 'weaver-xtreme' /adm/) . '</small>',
602	'id' => $id . '_html_left', 'type' => '+textarea',
603	'placeholder' => __('Any HTML, including shortcodes.', 'weaver-xtreme' /adm/),
	@@ -605,19 +665,27 @@ function weaverx_form_menu_opts( $value, $submit = false ) {
605	array( 'name' => '<span class="i-left dashicons dashicons-visibility"></span><small>' . __('Hide Area', 'weaver-xtreme' /adm/) . '</small>',
606	'id' => $id .'_hide_left', 'type' => '+select_hide',
607	'info' => '<em>' . $name . '</em>' . __(': Hide Left HTML', 'weaver-xtreme' /adm/) ),


608	array('name' => '<span class="i-left dashicons dashicons-editor-code"></span><small>' . __('Right HTML', 'weaver-xtreme' /adm/) . '</small>',
609	- 'id' => $id . '_html_right', 'type' => ~~'+textarea'~~,
610	'placeholder' => __('Any HTML, including shortcodes.', 'weaver-xtreme' /adm/),
611	- 'info' => __('Add HTML to Menu on Right (Works best with Centered Menu) (&diams;)~~(&starf;Plus)~~', 'weaver-xtreme' /adm/)),


612	array( 'name' => '<span class="i-left dashicons dashicons-visibility"></span><small>' . __('Hide Area', 'weaver-xtreme' /adm/) . '</small>',
613	- 'id' => $id .'_hide_right', 'type' => ~~'+select_hide'~~,
614	'info' => '<em>' . $name . '</em>' . __(': Hide Right HTML', 'weaver-xtreme' /adm/) ),


615	array( 'name' => '<small>' . __('HTML: Text Color', 'weaver-xtreme' /adm/) . '</small>',
616	'id' => $id .'_html_color', 'type' => 'ctext',
617	'info' => '<em>' . $name . '</em>' . __(': Text Color for Left/Right Menu Bar HTML', 'weaver-xtreme' /adm/) ),
618	array( 'name' => '<span class="i-left dashicons dashicons-align-none"></span><small>' . __('HTML: Top Margin', 'weaver-xtreme' /adm/) . '</small>',
619	'id' => $id .'_html_margin_dec', 'type' => 'val_em',
620	- 'info' => '<em>' . $name . '</em>' . __(': Margin above Added Menu HTML (Used to adjust for Desktop menu. Negative values can help.)', 'weaver-xtreme' /adm/) ),


621
622	);
623
	@@ -657,11 +725,14 @@ for most other areas, including Header, Container, Content, Widgets, and more.',
657	echo "</p></td></tr>\n";
658	}
659


660	weaverx_form_ctext( array(
661	'name' => $name . ' BG',
662	'id' => $id_colorbg,
663	'info' => '<em>' . $info . __(':</em> Background Color (use CSS+ to specify custom CSS for area)', 'weaver-xtreme' /adm/)));
664

665	if ( $type == 'menu' \|\| $id == 'post_title' )
666	weaverx_form_ctext( array(
667	'name' => $name . ' ' . __('Text Color', 'weaver-xtreme' /adm/),
	@@ -726,11 +797,15 @@ function weaverx_from_fi_location( $value, $is_post = false ) {
726	array('val' => 'content-top', 'desc' => __('With Content - top', 'weaver-xtreme' /adm/) ),
727	array('val' => 'content-bottom', 'desc' => __('With Content - bottom', 'weaver-xtreme' /adm/) ),
728	array('val' => 'title-before', 'desc' => __('With Title', 'weaver-xtreme' /adm/) ),

729	array('val' => 'header-image', 'desc' => $is_post ? __('Hide on Blog View', 'weaver-xtreme' /adm/) :
730	__('Header Image Replacement', 'weaver-xtreme' /adm/) ),
731	- array('val' => 'post-before', 'desc' => __('~~Outside~~ of Page/Post', 'weaver-xtreme' /adm/) )
732	- );
733




734
735	weaverx_form_select_id($value);
736	}
	@@ -746,6 +821,15 @@ function weaverx_form_align( $value ) {
746	weaverx_form_select_id($value);
747	}
748









749
750	function weaverx_form_fi_align( $value ) {
751	$value['value'] = array(
	@@ -893,7 +977,8 @@ to create rules for specific devices.
893	<em>!important</em> with your rules to force the style override.
894	It is possible that other plugins might generate CSS that comes after these rules.', 'weaver-xtreme' /adm/); ?>
895	</p>
896	- <?php weaverx_textarea(weaverx_getopt('add_css'), 'add_css', 12, ' ', 'width:95%;'); ?>

897	</td></tr>
898	<?php
899	}


164	$id_strong = $id . '_strong';
165	$id_em = $id . '_em';
166	$id_u = $id . '_u';
167	+ $id_uh = $id. '_u_h';
168	?>
169	<tr><td><small style="float:right;"><?php _e('Link Attributes:', 'weaver-xtreme' /adm/); ?></small></td><td colspan="2">
170

175	<small><em><?php _e('Italic', 'weaver-xtreme' /adm/); ?></em></small>
176	<?php weaverx_form_font_bold_italic(array('id' => $id_em)); ?>
177
178	+  <small><u><?php _e('Link Underline', 'weaver-xtreme' /adm/); ?></u></small>
179	<input type="checkbox" name="<?php weaverx_sapi_main_name($id_u); ?>" id="<?php echo $id_u; ?>"
180	<?php checked(weaverx_getopt_checked( $id_u )); ?> >
181
182	+  \|  <small><u><?php _e('Hover Underline', 'weaver-xtreme' /adm/); ?></u></small>
183	+ <input type="checkbox" name="<?php weaverx_sapi_main_name($id_uh); ?>" id="<?php echo $id_uh; ?>"
184	+ <?php checked(weaverx_getopt_checked( $id_uh )); ?> >
185
186	+ <?php
187	weaverx_form_ctext($hover, true);
188	+ ?>
189	+
190	+ <?php
191	echo '</td></tr>';
192	}
193
194
195	+ function weaverx_form_break($value) {
196	+ $lim = isset( $value['value'] ) ? $value['value'] : 1 ;
197	+ $label = isset( $value['name'] ) ? "<em style='color:blue;'><strong>{$value['name']}</strong></em>" : ' ' ;
198	+ for ( $n = 1 ; $n <= $lim ; ++$n ) {
199	+ echo "<tr><td style='text-align:right;'>{$label}</td></tr>";
200	+ $label = ' ';
201	+ }
202	+ }
203	+
204	function weaverx_form_note($value) {
205	?>
206	<tr>

217	<?php
218	}
219
220	+
221	function weaverx_form_info($value) {
222	if ($value['info'] != '') {
223	echo('<td style="padding-left: 10px"><small>'); echo $value['info']; echo("</small></td>");

236
237	// defaults - these are determined by the =Padding section of style-weaverx.css
238	$default_tb = array(
239	+ 'infobar' => '5px', 'content' => 'T:4px, B:8px', 'footer' => '8px',
240	'footer_sb' => '8px', 'primary' => '8px',
241	'secondary' => '8px', 'extra' => '8px', 'top' => '8px', 'bottom' => '8px'
242	);

251	'infobar' => '5px', 'content' => 'T:0, B:0', 'footer' => 'T:0, B:0',
252	'footer_sb' => 'T:0, B:10', 'primary' => 'T:0, B:10', 'widget' => '0, Auto - First: T:0, Last: B:0',
253	'secondary' => 'T:0, B:10', 'extra' => 'T:0, B:10', 'top' => 'T:10, B:10', 'bottom' => 'T:10, B:10',
254	+ 'wrapper' => 'T:0, B:0', 'post' => 'T:0, B:15',
255	);
256
257	$id = $value['id'];

360
361	if ( $id == 'wrapper' ) { // setting #wrapper sets theme width.
362
363	+ $info = __('<em>Change Theme Width.</em> Standard width is 1100px. Use the options on the "Full Width" tab for full width designs, but leave this value set. Widths less than 768px may give unexpected results on mobile devices. Weaver Xtreme can not create a fixed-width site.', 'weaver-xtreme' /adm/);
364
365	weaverx_form_val( array(
366	'name' => '<span class="i-left" style="font-size:150%;">↔</span><em style="color:red;">' . __('Theme Width', 'weaver-xtreme' /adm/) . '</em>',

376	'id' => $id . '_max_width_int', 'type' => '+val_px',
377	'info' => '<em>' . $name . '</em>' . __(': Set Max Width of Area for Desktop View. Advanced Option. (&starf;Plus)', 'weaver-xtreme' /adm/),
378	'value' => array() ),










379	);
380
381	weaverx_form_show_options($opts_max, false, false);

468
469
470	function weaverx_form_menu_opts( $value, $submit = false ) {
471	+ // build the rows for area
472	+ $wp_logo = weaverx_get_wp_custom_logo_url();
473	+
474	+
475	+ if ($wp_logo)
476	+ $wp_logo_html = "<img src='{$wp_logo}' style='max-height:16px;margin-left:10px;' />";
477	+ else
478	+ $wp_logo_html = __('Not set', 'weaver-xtreme');
479
480	//echo '<table><tr><td>';
481	$name = $value['name'];
482	$id = $value['id'];
483

484
485	+
486	+ $opts = array (
487	array( 'name' => $name, 'id' => '-menu', 'type' => 'header_area',
488	'info' => $value['info']),
489	+ array( 'name' => __('Menu Bar Layout', 'weaver-xtreme'), 'type' => 'break'),
490	+
491	+ array ('name' => '<span class="i-left dashicons dashicons-editor-alignleft"></span>' . __('Align Menu', 'weaver-xtreme' /adm/),
492	+ 'id' => $id . '_align', 'type' => 'select_id',
493	+ 'info' => __('Align this menu on desktop view. Mobile, accordion, and vertical menus always left aligned.', 'weaver-xtreme' /adm/),
494	+ 'value' => array(
495	+ array('val' => 'left', 'desc' => 'Left'),
496	+ array('val' => 'center', 'desc' => 'Center'),
497	+ array('val' => 'right', 'desc' => 'Right')
498	+ )),
499	+
500	+ array( 'name' => '<span class="i-left dashicons dashicons-visibility"></span><small>' . __('Hide Menu', 'weaver-xtreme' /adm/) . '</small>',
501	+ 'id' => $id .'_hide', 'type' => 'select_hide',
502	+ 'info' => '<em>' . $name . '</em>' . __(': Hide menu on different display devices', 'weaver-xtreme' /adm/) ),
503	+
504	+ );
505	+
506	+ if ( $id != 'm_extra' ) {
507	+ $opts[] = array( 'name' => '<span class="i-left dashicons dashicons-editor-kitchensink"></span>' . __('Fixed-Top Menu', 'weaver-xtreme' /adm/),
508	+ 'id' => $id . '_fixedtop', 'type' => 'fixedtop',
509	+ 'info' => '<em>' . $name . '</em>' . __(': Fix menu to top of page. Note: the "Fix to Top on Scroll" does not play well with other "Fixed-Top" areas. Use the <em>Expand/Extend BG Attributes</em> on the Full Width tab to make a full width menu.', 'weaver-xtreme' /adm/));
510	+
511	+ }
512	+
513	+ if ( $id == 'm_primary' ) {
514	+ $opts[] = array(
515	+ 'name' => '<small>' . __('Move Primary Menu to Top', 'weaver-xtreme' /adm/) . '</small>',
516	+ 'id' => $id . '_move', 'type' => 'checkbox',
517	+ 'info' => '<em>' . $name . '</em>' . __(': Move Primary Menu at Top of Header Area (Default: Bottom)', 'weaver-xtreme' /adm/),
518	+ 'value' => '' );
519	+
520	+
521	+ $opts[] = array('name' => '<span class="i-left dashicons dashicons-heart"></span><small>' . __('Add Site Logo to Left', 'weaver-xtreme' /adm/) . '</small>', 'id' => 'm_primary_logo_left', 'type' => 'checkbox',
522	+ 'info' => __('Add the Site Logo to the primary menu. Add custom CSS for <em>.custom-logo-on-menu</em> to style. (Use Customize : Site Identity to set Site Logo.) Logo: ', 'weaver-xtreme' /adm/) . $wp_logo_html);
523	+
524	+ $opts[] = array( 'name' => '<span class="i-left dashicons dashicons-align-none"></span><small>' . __('Height of Logo on Menu', 'weaver-xtreme' /adm/) . '</small>',
525	+ 'id' => 'm_primary_logo_height_dec', 'type' => 'val_em',
526	+ 'info' => __('Set height of Logo on Menu. Will interact with padding. (Default: 2.0em, the standard Menu Bar height.)', 'weaver-xtreme' /adm/) );
527	+
528	+
529	+ $opts[] = array('name' => '<small>' . __('No Home Menu Item', 'weaver-xtreme' /adm/) . '</small>', 'id' => 'menu_nohome', 'type' => 'checkbox',
530	+ 'info' => __('Don\'t automatically add Home menu item for home page (as defined in Settings->Reading)', 'weaver-xtreme' /adm/));
531	+
532	+
533	+ } elseif ( $id == 'm_secondary' ) {
534	+ $opts[] = array(
535	+ 'name' => '<small>' . __('Move Secondary Menu to Bottom', 'weaver-xtreme' /adm/) . '</small>',
536	+ 'id' => $id . '_move', 'type' => 'checkbox',
537	+ 'info' => '<em>' . $name . '</em>' . __(': Move Secondary Menu at Bottom of Header Area (Default: Top)', 'weaver-xtreme' /adm/),
538	+ 'value' => '' );
539	+ }
540	+
541	+ weaverx_form_show_options($opts, false, false);
542	+
543	+
544	+
545	+
546	+ $opts = array(
547	+
548	+ array( 'name' => __('Menu Bar Colors', 'weaver-xtreme'), 'type' => 'break','value' => 1),
549
550	array( 'name' => __('Menu Bar', 'weaver-xtreme' /adm/),
551	'id' => $id, 'type' => 'titles_menu', // includes color, font size, font family

587	'id' => $id . '_sub_hover_color', 'type' => 'color',
588	'info' => '<em>' . $name . '</em>' . __(': Submenu Hover Text Color (Default: Inherit Top Level)', 'weaver-xtreme' /adm/) ),
589
590	+ array( 'name' => __('Menu Bar Style', 'weaver-xtreme'), 'type' => 'break'),



















591
592	array( 'name' => '<span class="i-left" style="font-size:200%;margin-left:4px;">□</span><small>' . __('Add Border', 'weaver-xtreme' /adm/) . '</small>',
593	'id' => $id . '_border', 'type' => 'checkbox',

597	'id' => $id . '_sub_border', 'type' => 'checkbox',
598	'info' => '<em>' . $name . '</em>' . ': Add the "standard" border to Submenus' ),
599




600	array( 'name' => '<span class="i-left dashicons dashicons-admin-page"></span><small>' . __('Shadow', 'weaver-xtreme' /adm/) . '</small>',
601	'id' => $id .'_shadow', 'type' => 'shadows',
602	'info' => '<em>' . $name . '</em>' . __(': Wrap Menu Bar with Shadow.', 'weaver-xtreme' /adm/) ),
603	array( 'name' => '<span class="i-left dashicons dashicons-marker"></span><small>' . __('Rounded Corners', 'weaver-xtreme' /adm/) . '</small>',
604	'id' => $id .'_rounded', 'type' => 'rounded',
605	'info' => '<em>' . $name . '</em>' . __(': Add rounded corners to menu. <em>You might need to set overlapping corners Header/Wrapper areas also!</em>', 'weaver-xtreme' /adm/) ),
606	+ array( 'name' => '<span class="i-left dashicons dashicons-marker"></span><small>' . __('Rounded Submenu Corners', 'weaver-xtreme' /adm/) . '</small>',
607	+ 'id' => $id . '_sub_rounded', 'type' => 'checkbox',
608	+ 'info' => '<em>' . $name . '</em>' . ': Add rounded corners to Submenus' ),
609
610	);
611
612	weaverx_form_show_options($opts, false, false);
613
614
615	+
616	if ( $id == 'm_primary' ) {
617	+ $right_plus = '';
618	+ $right_text = 'textarea';
619	+ $right_hide = 'select_hide';
620	+ } else {
621	+ $right_plus = '(&starf;Plus)';
622	+ $right_text = '+textarea';
623	+ $right_hide = '+select_hide';




624	}
625
626	$opts2 = array(
627	+


628	array( 'name' => '<span class="i-left dashicons dashicons-visibility"></span><small>' . __('Hide Arrows', 'weaver-xtreme' /adm/) . '</small>',
629	'id' => $id . '_hide_arrows', 'type' => 'checkbox',
630	'info' => '<em>' . $name . '</em>' . __(': Hide Arrows on Desktop Menu', 'weaver-xtreme' /adm/)),
631	+ array( 'name' => '<span class="i-left">{ }</span> <small>' . __('Add Classes','weaver-xtreme' /adm/) . '</small>',
632	+ 'id' => $id . '_add_class', 'type' => '+widetext',
633	+ 'info' => '<em>' . $name . '</em>' . __(': Space separated class names to add to this area (<em>Advanced option</em>) (&starf;Plus)', 'weaver-xtreme' /adm/) ),
634
635	+ array( 'name' => __('Menu Bar Spacing', 'weaver-xtreme'), 'type' => 'break'),


636
637	array( 'name' => '<span class="i-left dashicons dashicons-align-none"></span><small>' . __('Menu Top Margin', 'weaver-xtreme' /adm/) . '</small>',
638	'id' => $id .'_top_margin_dec', 'type' => 'val_px',

641	'id' => $id .'_bottom_margin_dec', 'type' => 'val_px',
642	'info' => '<em>' . $name . '</em>' . __(': Bottom margin for menu bar.', 'weaver-xtreme' /adm/) ),
643
644	+ array( 'name' => '<span class="i-left dashicons dashicons-align-none"></span><small>' . __('Desktop Item Vertical Padding', 'weaver-xtreme' /adm/) . '</small>',
645	+ 'id' => $id .'_menu_pad_dec', 'type' => 'val_em',
646	+ 'info' => '<em>' . $name . '</em>' . __(': Add vertical padding to Desktop menu bar items and submenus. This option is NOT RECOMMENDED as it does not work with Left and Right HTML areas. (Default: 0.6em)', 'weaver-xtreme' /adm/) ),
647	+
648	+ array( 'name' => '<span class="i-left dashicons dashicons-align-none"></span><small>' . __('Desktop Menu Bar Padding', 'weaver-xtreme' /adm/) . '</small>',
649	+ 'id' => $id .'_menu_bar_pad_dec', 'type' => 'val_em',
650	+ 'info' => '<em>' . $name . '</em>' . __(': Add padding to menu bar top and bottom for Desktop devices. (Default: 0 em)', 'weaver-xtreme' /adm/) ),
651	+
652	+
653
654	array( 'name' => '<span class="i-left" style="font-size:150%;">↔</span><small>' . __('Desktop Menu Spacing. (not on Smart Menus)', 'weaver-xtreme' /adm/) . '</small>',
655	'id' => $id .'_right_padding_dec' , 'type' => 'val_em',
656	'info' => '<em>' . $name . '</em>' . __(': Add space between desktop menu bar items (Use value > 1.0)', 'weaver-xtreme' /adm/) ),
657
658	+ array( 'name' => __('Menu Bar Left/Right HTML', 'weaver-xtreme'), 'type' => 'break'),
659	+
660	+
661	array('name' => '<span class="i-left dashicons dashicons-editor-code"></span><small>' . __('Left HTML', 'weaver-xtreme' /adm/) . '</small>',
662	'id' => $id . '_html_left', 'type' => '+textarea',
663	'placeholder' => __('Any HTML, including shortcodes.', 'weaver-xtreme' /adm/),

665	array( 'name' => '<span class="i-left dashicons dashicons-visibility"></span><small>' . __('Hide Area', 'weaver-xtreme' /adm/) . '</small>',
666	'id' => $id .'_hide_left', 'type' => '+select_hide',
667	'info' => '<em>' . $name . '</em>' . __(': Hide Left HTML', 'weaver-xtreme' /adm/) ),
668	+
669	+
670	array('name' => '<span class="i-left dashicons dashicons-editor-code"></span><small>' . __('Right HTML', 'weaver-xtreme' /adm/) . '</small>',
671	+ 'id' => $id . '_html_right', 'type' => $right_text,
672	'placeholder' => __('Any HTML, including shortcodes.', 'weaver-xtreme' /adm/),
673	+ 'info' => __('Add HTML to Menu on Right (Works best with Centered Menu) (&diams;)', 'weaver-xtreme' /adm/) . $right_plus),
674	+
675	+
676	array( 'name' => '<span class="i-left dashicons dashicons-visibility"></span><small>' . __('Hide Area', 'weaver-xtreme' /adm/) . '</small>',
677	+ 'id' => $id .'_hide_right', 'type' => $right_hide,
678	'info' => '<em>' . $name . '</em>' . __(': Hide Right HTML', 'weaver-xtreme' /adm/) ),
679	+
680	+
681	array( 'name' => '<small>' . __('HTML: Text Color', 'weaver-xtreme' /adm/) . '</small>',
682	'id' => $id .'_html_color', 'type' => 'ctext',
683	'info' => '<em>' . $name . '</em>' . __(': Text Color for Left/Right Menu Bar HTML', 'weaver-xtreme' /adm/) ),
684	array( 'name' => '<span class="i-left dashicons dashicons-align-none"></span><small>' . __('HTML: Top Margin', 'weaver-xtreme' /adm/) . '</small>',
685	'id' => $id .'_html_margin_dec', 'type' => 'val_em',
686	+ 'info' => '<em>' . $name . '</em>' . __(': Margin above Added Menu HTML (Used to adjust for Desktop menu. Negative values can help.)', 'weaver-xtreme' /adm/) )
687	+
688	+
689
690	);
691

725	echo "</p></td></tr>\n";
726	}
727
728	+ //echo "\n<!-- ************************* weaverx_form_text_props ID: {$id} *************************** -->\n";
729	+
730	weaverx_form_ctext( array(
731	'name' => $name . ' BG',
732	'id' => $id_colorbg,
733	'info' => '<em>' . $info . __(':</em> Background Color (use CSS+ to specify custom CSS for area)', 'weaver-xtreme' /adm/)));
734
735	+
736	if ( $type == 'menu' \|\| $id == 'post_title' )
737	weaverx_form_ctext( array(
738	'name' => $name . ' ' . __('Text Color', 'weaver-xtreme' /adm/),

797	array('val' => 'content-top', 'desc' => __('With Content - top', 'weaver-xtreme' /adm/) ),
798	array('val' => 'content-bottom', 'desc' => __('With Content - bottom', 'weaver-xtreme' /adm/) ),
799	array('val' => 'title-before', 'desc' => __('With Title', 'weaver-xtreme' /adm/) ),
800	+ array('val' => 'title-banner' , 'desc' => __('Banner above Title', 'weaver-xtreme') ),
801	array('val' => 'header-image', 'desc' => $is_post ? __('Hide on Blog View', 'weaver-xtreme' /adm/) :
802	__('Header Image Replacement', 'weaver-xtreme' /adm/) ),
803	+ array('val' => 'post-before', 'desc' => __('Beside Page/Post, no wrap', 'weaver-xtreme' /adm/) ),

804
805	+ array('val' => 'post-bg', 'desc' => __('As BG Image, Tile', 'weaver-xtreme' /adm/) ),
806	+ array('val' => 'post-bg-cover', 'desc' => __('As BG Image, Cover', 'weaver-xtreme' /adm/) ),
807	+ array('val' => 'post-bg-parallax', 'desc' => __('As BG Image, Parallax', 'weaver-xtreme' /adm/) ),
808	+ );
809
810	weaverx_form_select_id($value);
811	}

821	weaverx_form_select_id($value);
822	}
823
824	+ function weaverx_form_fixedtop( $value ) {
825	+ $value['value'] = array(
826	+ array('val' => 'none', 'desc' => __('Standard Position : Not Fixed', 'weaver-xtreme' /adm/) ),
827	+ array('val' => 'fixed-top', 'desc' => __('Fixed to Top', 'weaver-xtreme' /adm/) ),
828	+ array('val' => 'scroll-fix', 'desc' => __('Fix to Top on Scroll', 'weaver-xtreme' /adm/) )
829	+ );
830	+
831	+ weaverx_form_select_id($value);
832	+ }
833
834	function weaverx_form_fi_align( $value ) {
835	$value['value'] = array(

977	<em>!important</em> with your rules to force the style override.
978	It is possible that other plugins might generate CSS that comes after these rules.', 'weaver-xtreme' /adm/); ?>
979	</p>
980	+ <?php weaverx_textarea(weaverx_getopt('add_css'), 'add_css', 12, '' , 'width:95%;', 'wvrx-edit wvrx-edit-dir'); ?>
981	+
982	</td></tr>
983	<?php
984	}

admin/admin-lib-ts.php CHANGED Viewed

	@@ -164,6 +164,9 @@ function weaverx_form_show_options($weaverx_olist, $begin_table = true, $end_tab
164	case 'align':
165	weaverx_form_align($value);
166	break;



167	case 'checkbox':
168	weaverx_form_checkbox($value);
169	break;
	@@ -188,6 +191,9 @@ function weaverx_form_show_options($weaverx_olist, $begin_table = true, $end_tab
188	case 'fi_location_post':
189	weaverx_from_fi_location($value, true);
190	break;



191	case 'header':
192	weaverx_form_header($value);
193	break;


164	case 'align':
165	weaverx_form_align($value);
166	break;
167	+ case 'break':
168	+ weaverx_form_break($value);
169	+ break;
170	case 'checkbox':
171	weaverx_form_checkbox($value);
172	break;

191	case 'fi_location_post':
192	weaverx_from_fi_location($value, true);
193	break;
194	+ case 'fixedtop':
195	+ weaverx_form_fixedtop($value);
196	+ break;
197	case 'header':
198	weaverx_form_header($value);
199	break;

admin/admin-mainopts.php CHANGED Viewed

@@ -6,9 +6,11 @@ if ( !defined('ABSPATH')) exit; // Exit if accessed directly
              * This function will start the main sapi form, which will be closed in admin-adminopts
              */
-            -
             // ======================== Main Options > Top Level ========================
             function weaverx_admin_mainopts() {
             ?>
             <div id="tabwrap_main" style="padding-left:4px;">
@@ -17,6 +19,7 @@ function weaverx_admin_mainopts() {
             	<?php
             	weaverx_elink('#asp_genappear' , __('Wrapping background colors, rounded corners, borders, fade, shadow', 'weaver-xtreme' /*adm*/), __('Wrapping Areas', 'weaver-xtreme' /*adm*/),'<li>','</li>');
             	weaverx_elink('#asp_widgets' , __('Settings for Sidebars and Sidebar Layout', 'weaver-xtreme' /*adm*/), __('Sidebars &amp; Layout', 'weaver-xtreme' /*adm*/),'<li>', '</li>');
             	weaverx_elink('#asp_headeropts' , __('Site Title/Tagline properties, Header Image', 'weaver-xtreme' /*adm*/), __('Header', 'weaver-xtreme' /*adm*/),'<li>', '</li>');
             	weaverx_elink('#asp_menus' , __('Menu text and bg colors and other properties; Info Bar properties', 'weaver-xtreme' /*adm*/), __('Menus','weaver-xtreme'  /*adm*/),'<li>', '</li>');
             	weaverx_elink('#asp_content' , __('Text colors and bg, image borders, featured image, other properties related to all content', 'weaver-xtreme' /*adm*/), __('Content Areas', 'weaver-xtreme' /*adm*/),'<li>', '</li>');
@@ -39,6 +42,12 @@ function weaverx_admin_mainopts() {
             		?>
             	</div>
             	<div id="asp_headeropts" class="tab_mainopt" >
             	<?php weaverx_mainopts_header(); ?>
             	</div>
@@ -132,7 +141,12 @@ With <em>Weaver Xtreme Plus</em>, you can also specify background images for var
             	do_action('weaverxplus_admin','general_appearance');
+            }
-            -
             // ======================== Main Options > Custom ========================
@@ -229,9 +243,121 @@ function weaverx_mainopts_custom() {
             	do_action('weaverxplus_admin','fonts');
+            }
             // ======================== Main Options > Header ========================
             function weaverx_mainopts_header() {
             	$opts = array(
             	array( 'type' => 'submit'),
             	array('name' => __('Header Options', 'weaver-xtreme' /*adm*/), 'id' => '-admin-generic', 'type' => 'header',
@@ -240,7 +366,9 @@ function weaverx_mainopts_header() {
             	array('name' => __('Header Area', 'weaver-xtreme' /*adm*/), 'id' => 'header', 'type' => 'widget_area',
-            -
            		'info' => __('Wraps the Header Area: menu bars, standard header image, title, tagline, header widget area', 'weaver-xtreme' /*adm*/)),
             	array('name' => '<span class="i-left dashicons dashicons-visibility"></span>' . __('Hide Search on Header', 'weaver-xtreme' /*adm*/),
             		'id' => 'header_search_hide', 'type' => 'select_hide',
@@ -259,7 +387,19 @@ function weaverx_mainopts_header() {
             	array('name' => '<small>' . __('Suggested Header Image Height', 'weaver-xtreme' /*adm*/) . '</small>',
             		'id' => 'header_image_height_int', 'type' => 'val_px',
-            -
            		'info' => __('Change the suggested height of the Header Image. Standard size is 188. This only affects the clipping window on the Appearance:Header page. Header images will be responsively sized. (Default header image width: theme width)', 'weaver-xtreme' /*adm*/)),
             	array('name' => '<span class="i-left" style="font-size:120%;">&harr;</span><small>' . __('Maximum Image Width', 'weaver-xtreme' /*adm*/) . '</small>',
             		'id' => 'header_image_max_width_dec', 'type' => '+val_percent',
@@ -287,6 +427,34 @@ function weaverx_mainopts_header() {
             	array('name' => '<small>' . __('Alternate Header Images:', 'weaver-xtreme' /*adm*/) . '</small>', 'type' => 'note',
             		'info' => __('Specify alternate header images using the <em>Featured Image Location</em> options on the <em>Content Areas</em> tab for pages, or the <em>Post Specifics</em> tab for single post views.', 'weaver-xtreme' /*adm*/)),
             	array( 'type' => 'submit'),
@@ -309,6 +477,9 @@ function weaverx_mainopts_header() {
             		'id' => 'hide_site_title', 'type' => 'select_hide',
             		'info' => __('Hide Site Title (Uses "display:none;" : SEO friendly.)', 'weaver-xtreme' /*adm*/)),
             	array('name' => __('Site Tagline', 'weaver-xtreme' /*adm*/), 'id' => 'tagline', 'type' => 'titles',
             		'info' => __("The site's tagline (blog description)", 'weaver-xtreme' /*adm*/)),
@@ -327,22 +498,30 @@ function weaverx_mainopts_header() {
             	array('name' => __('Title/Tagline Area BG', 'weaver-xtreme' /*adm*/), 'id' => 'title_tagline_bgcolor', 'type' => 'ctext',
             		'info' => __('BG Color for the Title, Tagline, Search, Logo/HTML and Mini-Menu area.', 'weaver-xtreme' /*adm*/)),
-            -
            	array('name' => '<span class="i-left dashicons dashicons-editor-code"></span><small>' . __('Site Logo/HTML', 'weaver-xtreme' /*adm*/) . '</small>',
             				'id' => '_site_logo', 'type' => '+textarea',
-            -
            				'info' => __('HTML for Site Title area. (example: &lt;img src="url" style="position:absolute;top:20px;left:20px;"&nbsp;/&gt; + Custom CSS: #site-logo{min-height:123px;} (&starf;Plus) (&diams;)', 'weaver-xtreme' /*adm*/)),
             	array('name' => '<span class="i-left dashicons dashicons-visibility"></span><small>' . __('Hide Site Logo/HTML', 'weaver-xtreme' /*adm*/) . '</small>',
             		'id' => '_hide_site_logo', 'type' => '+select_hide',
-            -
            		'info' => __('Hide Site Logo/HTML by device (&starf;Plus) (&diams;)', 'weaver-xtreme' /*adm*/)),
             	array( 'name' => '<span class="i-left">{ }</span> <small>' . __('Add Classes', 'weaver-xtreme' /*adm*/) . '</small>',
             			'id' => 'site_title_add_class',  'type' => '+widetext',
             			'info' => '<em>' . __('Title/Tagline', 'weaver-xtreme' /*adm*/) . '</em>' . __(': Space separated class names to add to this area (<em>Advanced option</em>) (&starf;Plus)', 'weaver-xtreme' /*adm*/) ),
-            -
            	array('name' => '<small>' . __('Move Title/Tagline over Image', 'weaver-xtreme' /*adm*/) . '</small>', 'id' => 'title_over_image', 'type' => 'checkbox',
-            -
            		'info' => __('Move the Title, Tagline, Search, Logo/HTML and Mini-Menu over the Header Image.', 'weaver-xtreme' /*adm*/)),
-            -
-            -
             	array( 'type' => 'submit'),
@@ -354,6 +533,9 @@ function weaverx_mainopts_header() {
             	array('name' => __('Header Widget Area', 'weaver-xtreme' /*adm*/), 'id' => 'header_sb', 'type' => 'widget_area',
             		'info' => __('Horizontal Header Widget Area', 'weaver-xtreme' /*adm*/)),
             	array('name' => '<small>' . __('Header Widget Area Position', 'weaver-xtreme' /*adm*/) . '</small>',
             		'id' => 'header_sb_position', 'type' => '+select_id',	//code
             		'info' => __('Change where Header Widget Area is displayed. (Default: Top) (&starf;Plus)', 'weaver-xtreme' /*adm*/),
@@ -367,6 +549,10 @@ function weaverx_mainopts_header() {
             			array('val' => 'post_header', 'desc' => __('Post-#header &lt;div&gt;', 'weaver-xtreme' /*adm*/)),
             			)),
             	array( 'type' => 'submit'),
             	array('name' => __('Header HTML', 'weaver-xtreme' /*adm*/), 'id' => 'header_html', 'type' => 'widget_area', __('Header Widget Area', 'weaver-xtreme' /*adm*/),
@@ -403,6 +589,8 @@ function weaverx_mainopts_header() {
             // ======================== Main Options > Menus ========================
             function weaverx_mainopts_menus() {
             	$opts = array(
             	array( 'type' => 'submit'),
             	array('name' => __('Menu &amp; Info Bars', 'weaver-xtreme' /*adm*/), 'id' => '-menu', 'type' => 'header',
@@ -423,13 +611,9 @@ function weaverx_mainopts_menus() {
             		'info' => __('Weaver Xtreme Plus allows you to define Mega Menu style dropdown menu items with arbitrary HTML content. (&starf;Plus)', 'weaver-xtreme' /*adm*/)),
-            -
             	array('name' => __('Primary Menu Bar', 'weaver-xtreme' /*adm*/), 'id' => 'm_primary', 'type' => 'menu_opts',
             		'info' => __('Attributes for the Primary Menu Bar (Default Location: Bottom of Header)', 'weaver-xtreme' /*adm*/)),
-            -
            	array('name' => '<small>' . __('No Home Menu Item', 'weaver-xtreme' /*adm*/) . '</small>', 'id' => 'menu_nohome', 'type' => 'checkbox',
-            -
            		'info' => __('Don\'t automatically add Home menu item for home page (as defined in Settings->Reading)', 'weaver-xtreme' /*adm*/)),
-            -
             //	array('name' => '<span class="i-left" style="font-size:150%;">&harr;</span><small> ' . __('Mobile Menu Trigger', 'weaver-xtreme' /*adm*/). '</small>',
             //		'id' => 'menu_primary_trigger_int', 'type' => 'val_px',
@@ -471,11 +655,22 @@ function weaverx_mainopts_menus() {
             		'info' => __('Retain the menu bar hover BG color when sub-menus are opened.', 'weaver-xtreme' /*adm*/)),
-            -
            	array( 'name' => '<small>' . __('Placeholder Hover Cursor', 'weaver-xtreme' /*adm*/) . '</small>',
-            -
            			'id' => 'placeholder_cursor',  'type' => 'widetext',
-            -
            		'info' => __('CSS cursor :hover attribute for placeholder menus (e.g., Custom Menus with URL==#).
-            -
            (Default: pointer. Suggested: context-menu or text.)', 'weaver-xtreme' /*adm*/)),
             	array( 'type' => 'submit'),
@@ -652,6 +847,9 @@ function weaverx_mainopts_content() {
             	array('name' => '<span class="i-left" style=font-size:120%;">&nbsp;&#10538;</span>' . __('Featured Image Location', 'weaver-xtreme' /*adm*/),
             		'id' => 'page_fi_location', 'type' => 'fi_location',
             		'info' => __('Where to display Featured Image for Pages','weaver-xtreme' /*adm*/)),
             	array('name' => '<span class="i-left dashicons dashicons-editor-alignleft"></span><small>' . __('Featured Image Alignment<small>', 'weaver-xtreme' /*adm*/), 'id' => 'page_fi_align', 'type' => 'fi_align',
             		'info' => __('How to align the Featured Image', 'weaver-xtreme' /*adm*/)),
@@ -806,7 +1004,7 @@ function weaverx_mainopts_posts() {
             		'info' => __('Layout of Posts', 'weaver-xtreme' /*adm*/)),
             	array('name' => '<span class="i-left" style=font-size:120%;">&nbsp;&#9783;</span>' . __('Post Content Columns', 'weaver-xtreme' /*adm*/), 'id' => 'post_cols', 'type' => 'select_id',	//code
-            -
            		'info' => __('Automatically split all post content into columns for both blog and single page views. <em>This is post content only.</em> This is not the same as "Columns of Posts". (Always 1 column on IE&lt;=9.)', 'weaver-xtreme' /*adm*/),
             		'value' => array(
             			array('val' => '1', 'desc' => __('1 Column', 'weaver-xtreme' /*adm*/)),
             			array('val' => '2', 'desc' => __('2 Columns', 'weaver-xtreme' /*adm*/)),
@@ -832,7 +1030,7 @@ function weaverx_mainopts_posts() {
             		'info' => __("Display opening Sticky Posts in one column. If First Post One Column also checked, then first non-sticky post will be one column.", 'weaver-xtreme' /*adm*/)),
             	array('name' => '<span class="i-left" style=font-size:120%;">&nbsp;&#9783;</span><small>' . __('Use <em>Masonry</em> for Posts', 'weaver-xtreme' /*adm*/) . '</small>',
             		'id' => 'masonry_cols', 'type' => 'select_id',	//code
-            -
            		'info' => __('Use the <em>Masonry</em> blog layout option to show dynamically packed posts on blog and archive-like pages. Overrides "Columns of Posts" setting.', 'weaver-xtreme' /*adm*/),
             		'value' => array(
             			array('val' => '0', 'desc' => ''),
             			array('val' => '2', 'desc' => __('2 Columns', 'weaver-xtreme' /*adm*/)),
@@ -981,6 +1179,9 @@ function weaverx_mainopts_posts() {
             	array('name' => __('Featured Image - Posts', 'weaver-xtreme' /*adm*/), 'id' => '-id', 'type' => 'subheader_alt',
             		'info' => __('Display of Post Featured Images', 'weaver-xtreme' /*adm*/)),
             	array('name' => '<span class="i-left" style=font-size:120%;">&nbsp;&#10538;</span>' . __('FI Location - Full Post', 'weaver-xtreme' /*adm*/),
             		'id' => 'post_full_fi_location', 'type' => 'fi_location_post',
             		'info' => __('Where to display Featured Image for full blog posts.', 'weaver-xtreme' /*adm*/)),


6	* This function will start the main sapi form, which will be closed in admin-adminopts
7	*/
8

9	// ======================== Main Options > Top Level ========================
10	function weaverx_admin_mainopts() {
11	+ if (!function_exists('weaverx_get_wp_custom_logo_url')) {
12	+ weaverx_alert(__(' ** WARNING! **\r\n\r\nYou are using a new Version 3 of the Weaver Xtreme Theme Support Plugin with an older version of the Weaver Xtreme Theme. Please update to the latest Version 3 of the Weaver Xtreme Theme.\r\n\r\nTHIS VERSION DOES NOT WORK WITH OLD VERSIONS OF WEAVER XTREME!'));
13	+ }
14	?>
15	<div id="tabwrap_main" style="padding-left:4px;">
16

19	<?php
20	weaverx_elink('#asp_genappear' , __('Wrapping background colors, rounded corners, borders, fade, shadow', 'weaver-xtreme' /adm/), __('Wrapping Areas', 'weaver-xtreme' /adm/),'<li>','</li>');
21	weaverx_elink('#asp_widgets' , __('Settings for Sidebars and Sidebar Layout', 'weaver-xtreme' /adm/), __('Sidebars & Layout', 'weaver-xtreme' /adm/),'<li>', '</li>');
22	+ weaverx_elink('#asp_full' , __('Settings to create full width sites', 'weaver-xtreme' /adm/), __('Full Width', 'weaver-xtreme' /adm/),'<li>', '</li>');
23	weaverx_elink('#asp_headeropts' , __('Site Title/Tagline properties, Header Image', 'weaver-xtreme' /adm/), __('Header', 'weaver-xtreme' /adm/),'<li>', '</li>');
24	weaverx_elink('#asp_menus' , __('Menu text and bg colors and other properties; Info Bar properties', 'weaver-xtreme' /adm/), __('Menus','weaver-xtreme' /adm/),'<li>', '</li>');
25	weaverx_elink('#asp_content' , __('Text colors and bg, image borders, featured image, other properties related to all content', 'weaver-xtreme' /adm/), __('Content Areas', 'weaver-xtreme' /adm/),'<li>', '</li>');

42	?>
43	</div>
44
45	+ <div id="asp_full" class="tab_mainopt" >
46	+ <?php
47	+ weaverx_mainopts_fullwidth();
48	+ ?>
49	+ </div>
50	+
51	<div id="asp_headeropts" class="tab_mainopt" >
52	<?php weaverx_mainopts_header(); ?>
53	</div>

141	do_action('weaverxplus_admin','general_appearance');
142	}
143
144	+ function wvrx_ts_new_xp_opt($opt) {
145	+ // don't support new xp opts in old xp
146	+ if ( !function_exists('weaverxplus_plugin_installed') \|\| version_compare( WEAVER_XPLUS_VERSION, '2.90', '>=') )
147	+ return $opt;
148	+ return array('name' => $opt['name'], 'info' => __('This option requires X-Plus Version 3.0','weaver-xtreme'), 'type' => 'note' );
149	+ }
150
151	// ======================== Main Options > Custom ========================
152

243	do_action('weaverxplus_admin','fonts');
244	}
245
246	+ // ======================== Main Options > Full Width ========================
247	+
248	+ function weaverx_mainopts_fullwidth() {
249	+
250	+ $opts = array(
251	+ array( 'type' => 'submit'),
252	+ array('name' => __('Full Width Site', 'weaver-xtreme' /adm/), 'id' => '-editor-justify', 'type' => 'header',
253	+ 'info' => __('Options to easily create full width site designs', 'weaver-xtreme' /adm/),
254	+ 'help' => 'help.html#FullWidth'),
255	+
256	+ array('name' => __('Expand Areas', 'weaver-xtreme' /adm/), 'id' => '-editor-expand', 'type' => 'header_area',
257	+ 'info' => __('This section has options that let you expand selected content areas of your site to the full browser width. The content will be responsively displayed - and fully occupy the browser window.', 'weaver-xtreme' /adm/)),
258	+ array('name' => '<span class="i-left dashicons dashicons-editor-expand"></span>' . __('Entire Site Full Width', 'weaver-xtreme' /adm/), 'id' => 'wrapper_fullwidth', 'type' => 'checkbox',
259	+ 'info' => __('Checking this option will display the <strong>ENTIRE SITE</strong> in the full width of the browser. This option overrides the <em>Theme Width</em> option on the <em>Wrapping Areas : Wrapper Area</em> menu.', 'weaver-xtreme' /adm/)),
260	+ );
261	+
262	+ $expand = array (
263	+ 'header' => array( __('Header Area Expand', 'weaver-xtreme'), __('Expand Header Area to full width. This will include all other Header Area sub-areas as well.','weaver-xtreme' )),
264	+ 'header-image' => array( __('Header Image Expand', 'weaver-xtreme'), __('Expand Header Image to full width.','weaver-xtreme' )),
265	+ 'site_title' => array( __('Site Title/Tagline Expand', 'weaver-xtreme'), __('This option includes the Site Title, Tagline, Search Button, and MiniMenu.','weaver-xtreme' )),
266	+ 'header-widget-area' => array( __('Header Widget Area Expand', 'weaver-xtreme'), __('Expand Header Widget Area to full width.','weaver-xtreme' )),
267	+ 'header-html' => array( __('Header HTML Area Expand', 'weaver-xtreme'), __('Expand Header HTML Area to full width.','weaver-xtreme' )),
268	+ 'm_primary' => array( __('Primary Menu Expand', 'weaver-xtreme'), __('Expand Primary Menu to full width.','weaver-xtreme' )),
269	+ 'm_secondary' => array( __('Secondary Menu Expand', 'weaver-xtreme'), __('Expand Secondary Menu to full width.','weaver-xtreme' )),
270	+ 'container' => array( __('Container Area Expand', 'weaver-xtreme'), __('Expand Container Area to full width.','weaver-xtreme' )),
271	+ 'infobar' => array( __('Info Bar Expand', 'weaver-xtreme'), __('Expand Info Bar to full width.','weaver-xtreme' )),
272	+ 'post' => array( __('Post Area Expand', 'weaver-xtreme'), __('Expand Info Bar to full width.','weaver-xtreme' )),
273	+ 'footer' => array( __('Footer Area Expand', 'weaver-xtreme'), __('Checking this option will automatically include the other Footer Area Expand options as well.','weaver-xtreme' )),
274	+ 'footer_sb' => array( __('Footer Widget Area Expand', 'weaver-xtreme'), __('Expand Footer Widget Area to full width.','weaver-xtreme' )),
275	+ 'footer_html' => array( __('Footer HTML Area Expand', 'weaver-xtreme'), __('Expand Footer HTML Area to full width.','weaver-xtreme' )),
276	+ 'site-ig-wrap' => array( __('Footer Copyright Area Expand', 'weaver-xtreme'), __('Expand Footer Copyright Area to full width.','weaver-xtreme' )),
277	+
278	+ );
279	+
280	+ foreach ($expand as $id => $vals) {
281	+ $opts[] = array('name' => '<span class="i-left dashicons dashicons-editor-expand"></span>' . $vals[0], 'id' => 'expand_' . $id, 'type' => 'checkbox',
282	+ 'info' => $vals[1]);
283	+ }
284	+
285	+
286	+
287	+ $opts[] = array('name' => __('Extend BG Attributes', 'weaver-xtreme' /adm/), 'id' => '-editor-code', 'type' => 'header_area',
288	+ 'info' => __('The Extend BG Attributes options in this section allow you to retain the original content width, while extending its Background attributes to full width. These includes BG color, BG image, and borders, for example.', 'weaver-xtreme' /adm/));
289	+
290	+ $extend = array (
291	+ 'container' => array( __('Container Area Extend BG', 'weaver-xtreme'), __('Extend Container Area BG Attributes to full width.','weaver-xtreme' )),
292	+ 'header' => array( __('Header Area Extend BG', 'weaver-xtreme'), __('Extend Header Area BG Attributes to full width.','weaver-xtreme' )),
293	+ 'header_sb' => array( __('Header Widget Area Extend BG', 'weaver-xtreme'), __('Extend Header Widget Area BG Attributes to full width.','weaver-xtreme' )),
294	+ 'header_html' => array( __('Header HTML Area Extend BG', 'weaver-xtreme'), __('Extend Header HTML Area BG Attributes to full width.','weaver-xtreme' )),
295	+ 'm_primary' => array( __('Primary Menu Extend BG', 'weaver-xtreme'), __('Extend Primary Menu BG Attributes to full width.','weaver-xtreme' )),
296	+ 'm_secondary' => array( __('Secondary Menu Extend BG', 'weaver-xtreme'), __('Extend Secondary Menu BG Attributes to full width.','weaver-xtreme' )),
297	+ 'infobar' => array( __('Info Bar Extend BG', 'weaver-xtreme'), __('Extend Info Bar BG Attributes to full width.','weaver-xtreme' )),
298	+ //'content' => array( __('Content Area Extend BG', 'weaver-xtreme'), __('Extend Content Area BG Attributes to full width.','weaver-xtreme' )),
299	+ 'post' => array( __('Post Area Extend BG', 'weaver-xtreme'), __('Extend each Post Area BG Attributes to full width.','weaver-xtreme' )),
300	+ 'footer' => array( __('Footer Area Extend BG', 'weaver-xtreme'), __('Extend Footer Area BG Attributes to full width.','weaver-xtreme' )),
301	+ 'footer_sb' => array( __('Footer Widget Area Extend BG', 'weaver-xtreme'), __('Extend Footer Widget Area BG Attributes to full width.','weaver-xtreme' )),
302	+ 'footer_html' => array( __('Footer HTML Area Extend BG', 'weaver-xtreme'), __('Extend Footer HTML Area BG Attributes to full width.','weaver-xtreme' )),
303	+
304	+ );
305	+
306	+ foreach ($extend as $id => $vals) {
307	+ $type = 'checkbox';
308	+ if ($id == 'm_extra')
309	+ $type = '+checkbox';
310	+ $opts[] = array('name' => '<span class="i-left" style="font-size:150%;">↔</span><small>' . $vals[0], 'id' => $id . '_extend_width', 'type' => $type,
311	+ 'info' => $vals[1]);
312	+ }
313	+
314	+
315	+
316	+
317	+ $opts[] = array('name' => __('Extend BG Color', 'weaver-xtreme' /adm/), 'id' => '-admin-appearance', 'type' => 'header_area',
318	+ 'info' => __('These options, available with Weaver Xtreme Plus, allow you to stretch the BG color of various area to full width. This is different than the Extend BG Attributes in that only the color is extended, and that color can be different than the content. (&starf;Plus)', 'weaver-xtreme' /adm/));
319	+
320	+
321	+
322	+ $extend = array (
323	+
324	+ 'header' => array( __('Header Area Extend BG Color', 'weaver-xtreme'), __('Extend Header Area BG Color to full width.','weaver-xtreme' )),
325	+ 'm_primary' => array( __('Primary Menu Extend BG', 'weaver-xtreme'), __('Extend Primary Menu BG Color to full width.','weaver-xtreme' )),
326	+ 'm_secondary' => array( __('Secondary Menu Extend BG', 'weaver-xtreme'), __('Extend Secondary Menu BG Color to full width.','weaver-xtreme' )),
327	+ 'm_extra' => array( __('Secondary Menu Extend BG', 'weaver-xtreme'), __('Extend Secondary Menu BG Color to full width.','weaver-xtreme' )),
328	+ 'container' => array( __('Container Extend BG', 'weaver-xtreme'), __('Extend Container Area BG Color to full width.','weaver-xtreme' )),
329	+ 'content' => array( __('Content Extend BG', 'weaver-xtreme'), __('Extend Content Area BG Color to full width.','weaver-xtreme' )),
330	+ 'footer' => array( __('Footer Extend BG', 'weaver-xtreme'), __('Extend Footer Area BG Color to full width.','weaver-xtreme' )),
331	+ );
332	+
333	+ foreach ($extend as $id => $vals) {
334	+ $opts[] = array('name' => $vals[0], 'id' => $id . '_extend_bgcolor', 'type' => '+color',
335	+ 'info' => $vals[1] . ' (&starf;Plus)');
336	+ }
337	+
338	+
339	+ ?>
340	+ <div class="options-intro">
341	+ <?php _e('<strong>Full Width:</strong> Options to create full width sites.', 'weaver-xtreme' /adm/); ?><p>
342	+ <?php _e('','weaver-xtreme'); ?>
343	+ </p></div>
344	+ <?php
345	+ weaverx_form_show_options($opts);
346	+
347	+
348	+ }
349
350	// ======================== Main Options > Header ========================
351	function weaverx_mainopts_header() {
352	+
353	+ $wp_logo = weaverx_get_wp_custom_logo_url();
354	+
355	+ if ($wp_logo)
356	+ $wp_logo_html = "<img src='{$wp_logo}' style='max-height:16px;margin-left:10px;' />";
357	+ else
358	+ $wp_logo_html = __('Not set', 'weaver-xtreme');
359	+
360	+
361	$opts = array(
362	array( 'type' => 'submit'),
363	array('name' => __('Header Options', 'weaver-xtreme' /adm/), 'id' => '-admin-generic', 'type' => 'header',

366
367
368	array('name' => __('Header Area', 'weaver-xtreme' /adm/), 'id' => 'header', 'type' => 'widget_area',
369	+ 'info' => __('The Header Area includes: menu bars, standard header image, title, tagline, header widget area, header HTML area', 'weaver-xtreme' /adm/)),
370	+
371	+ array( 'name' => __('Header Other options', 'weaver-xtreme'), 'type' => 'break'),
372
373	array('name' => '<span class="i-left dashicons dashicons-visibility"></span>' . __('Hide Search on Header', 'weaver-xtreme' /adm/),
374	'id' => 'header_search_hide', 'type' => 'select_hide',

387
388	array('name' => '<small>' . __('Suggested Header Image Height', 'weaver-xtreme' /adm/) . '</small>',
389	'id' => 'header_image_height_int', 'type' => 'val_px',
390	+ 'info' => __('Change the suggested height of the Header Image. This only affects the clipping window on the Appearance:Header page. Header images will be responsively sized. If used with <em>Header Image Rendering</em>, this value will be used to set the minimum height of the BG image. (Default: 188px)', 'weaver-xtreme' /adm/)),
391	+
392	+ wvrx_ts_new_xp_opt(
393	+ array('name' => __('Header Image Rendering', 'weaver-xtreme' /adm/) . '</small>',
394	+ 'id' => 'header_image_render', 'type' => '+select_id', //code
395	+ 'info' => __('How to render header image: as img in header or as header area bg image. When rendered as a BG image, other options such as moving Title/Tagline or having image link to home page are not meaningful. (Default: <img> in header div) (&starf;Plus)', 'weaver-xtreme' /adm/),
396	+ 'value' => array(
397	+ array('val' => 'header-as-img', 'desc' => __('As img in header', 'weaver-xtreme' /adm/)),
398	+ array('val' => 'header-as-bg', 'desc' => __('As static BG image', 'weaver-xtreme' /adm/)),
399	+ array('val' => 'header-as-bg-responsive', 'desc' => __('As responsive BG image', 'weaver-xtreme' /adm/)),
400	+ array('val' => 'header-as-bg-parallax', 'desc' => __('As parallax BG image', 'weaver-xtreme' /adm/))
401	+
402	+ )) ),
403
404	array('name' => '<span class="i-left" style="font-size:120%;">↔</span><small>' . __('Maximum Image Width', 'weaver-xtreme' /adm/) . '</small>',
405	'id' => 'header_image_max_width_dec', 'type' => '+val_percent',

427	array('name' => '<small>' . __('Alternate Header Images:', 'weaver-xtreme' /adm/) . '</small>', 'type' => 'note',
428	'info' => __('Specify alternate header images using the <em>Featured Image Location</em> options on the <em>Content Areas</em> tab for pages, or the <em>Post Specifics</em> tab for single post views.', 'weaver-xtreme' /adm/)),
429
430	+ array('name' => '<span class="i-left dashicons dashicons-editor-code"></span>' . __('Image HTML Replacement', 'weaver-xtreme' /adm/),
431	+ 'id' => 'header_image_html_text', 'type' => 'textarea',
432	+ 'placeholder' => __('Any HTML, including shortcodes', 'weaver-xtreme' /adm/),
433	+ 'info' => __('Replace Header image with arbitrary HTML. Useful for slider shortcodes in place of image. FI as Header Image has priority over HTML replacement. Extreme Plus also supports this option on a Per Page/Post basis.', 'weaver-xtreme' /adm/), 'val' => 1 ),
434	+
435	+ array('name' => '<small>' . __('Show On Home Page Only', 'weaver-xtreme' /adm/) . '</small>', 'id' => 'header_image_html_home_only', 'type' => 'checkbox',
436	+ 'info' => __('Check to use the Image HTML Replacement only on your Front/Home page.', 'weaver-xtreme' /adm/)),
437	+
438	+ wvrx_ts_new_xp_opt(
439	+ array('name' => '<small>' . __('Also show BG Header Image', 'weaver-xtreme' /adm/) . '</small>', 'id' => 'header_image_html_plus_bg', 'type' => '+checkbox',
440	+ 'info' => __('If you have Image HTML Replacement defined - including Per Page/Post - and also have have set the standard Header Image to display as a BG image, then show <em>both</em> the BG image and the replacement HTML. (&starf;Plus)', 'weaver-xtreme' /adm/)) ),
441	+
442	+
443	+
444	+ array('name' => __('Custom Logo', 'weaver-xtreme' /adm/), 'id' => '-menu', 'type' =>'subheader',
445	+ 'info' => __('The native WP Custom Logo, set on the Site Identity Customizer menu.', 'weaver-xtreme' /adm/)),
446	+
447	+ array('name' => '<small>' . __('Replace Title with Site Logo', 'weaver-xtreme' /adm/) . '</small>', 'id' => 'wplogo_for_title', 'type' => 'checkbox',
448	+ 'info' => __('Replace the Site Title text with the WP Custom Logo Image. Logo: ', 'weaver-xtreme' /adm/) . $wp_logo_html),
449	+
450	+ array('name' => '<span class="i-left dashicons dashicons-visibility"></span><small>' . __('Hide WP Custom Logo', 'weaver-xtreme' /adm/) . '</small>',
451	+ 'id' => 'hide_wp_site_logo', 'type' => 'select_hide',
452	+ 'info' => __('Hide native WP Custom Site Logo in Header, by device. (This is not the Weaver Logo/HTML!)', 'weaver-xtreme' /adm/)),
453	+
454	+ array( 'name' => '<span class="i-left dashicons dashicons-align-none"></span><small>' . __('Logo for Title Height', 'weaver-xtreme' /adm/) . '</small>',
455	+ 'id' => 'header_logo_height_dec', 'type' => 'val_px',
456	+ 'info' => __('Set maximum height of Logo when used to replace Site Title. Default 0 uses the actual image size. This is the maximum height. If the actual image height is smaller, the smaller value is used.', 'weaver-xtreme' /adm/) ),
457	+
458
459	array( 'type' => 'submit'),
460

477	'id' => 'hide_site_title', 'type' => 'select_hide',
478	'info' => __('Hide Site Title (Uses "display:none;" : SEO friendly.)', 'weaver-xtreme' /adm/)),
479
480	+ array('name' => __('Move Title/Tagline over Image', 'weaver-xtreme' /adm/), 'id' => 'title_over_image', 'type' => 'checkbox',
481	+ 'info' => __('Move the Title, Tagline, Search, Logo/HTML and Mini-Menu over the Header Image. This can make a very attractive header,', 'weaver-xtreme' /adm/)),
482	+
483	array('name' => __('Site Tagline', 'weaver-xtreme' /adm/), 'id' => 'tagline', 'type' => 'titles',
484	'info' => __("The site's tagline (blog description)", 'weaver-xtreme' /adm/)),
485

498	array('name' => __('Title/Tagline Area BG', 'weaver-xtreme' /adm/), 'id' => 'title_tagline_bgcolor', 'type' => 'ctext',
499	'info' => __('BG Color for the Title, Tagline, Search, Logo/HTML and Mini-Menu area.', 'weaver-xtreme' /adm/)),
500
501	+
502	+ array('name' => '<span class="i-left font-bold" style="font-size:120%;">⇌</span><small>' . __('Title/Tagline Padding', 'weaver-xtreme' /adm/) . '</small>',
503	+ 'id' => 'title_tagline_xy', 'type' => 'text_tb',
504	+ 'info' => __('Add Top/Bottom Padding to the Site Title/Tagline block. This option is especially useful if the Header Image is a BG image. (Default: 0,0)', 'weaver-xtreme' /adm/)),
505	+
506	+
507	+
508	+ array('name' => '<span class="i-left" style="font-size:150%;">↔</span><small>' . __('Tagline Max Width', 'weaver-xtreme' /adm/) . '</small>',
509	+ 'id' => 'tagline_max_w', 'type' => 'val_percent',
510	+ 'info' => __("Maximum width of Tagline in header area (Default: 90%)", 'weaver-xtreme' /adm/)),
511	+
512	+ array('name' => '<span class="i-left dashicons dashicons-editor-code"></span><small>' . __('Weaver Site Logo/HTML', 'weaver-xtreme' /adm/) . '</small>',
513	'id' => '_site_logo', 'type' => '+textarea',
514	+ 'info' => __('HTML for Site Title area. (example: <img src="url" style="position:absolute;top:20px;left:20px;" /> + Custom CSS: #site-logo{min-height:123px;} (This is not the WP Custom Logo!) (&starf;Plus) (&diams;)', 'weaver-xtreme' /adm/)),
515	+
516	array('name' => '<span class="i-left dashicons dashicons-visibility"></span><small>' . __('Hide Site Logo/HTML', 'weaver-xtreme' /adm/) . '</small>',
517	'id' => '_hide_site_logo', 'type' => '+select_hide',
518	+ 'info' => __('Hide Weaver Site Logo/HTML by device. (This is not the WP Custom Logo!) (&starf;Plus) (&diams;)', 'weaver-xtreme' /adm/)),
519
520	array( 'name' => '<span class="i-left">{ }</span> <small>' . __('Add Classes', 'weaver-xtreme' /adm/) . '</small>',
521	'id' => 'site_title_add_class', 'type' => '+widetext',
522	'info' => '<em>' . __('Title/Tagline', 'weaver-xtreme' /adm/) . '</em>' . __(': Space separated class names to add to this area (<em>Advanced option</em>) (&starf;Plus)', 'weaver-xtreme' /adm/) ),
523
524




525
526	array( 'type' => 'submit'),
527

533
534	array('name' => __('Header Widget Area', 'weaver-xtreme' /adm/), 'id' => 'header_sb', 'type' => 'widget_area',
535	'info' => __('Horizontal Header Widget Area', 'weaver-xtreme' /adm/)),
536	+
537	+ array( 'name' => __('Other Widget Area Options', 'weaver-xtreme'), 'type' => 'break'),
538	+
539	array('name' => '<small>' . __('Header Widget Area Position', 'weaver-xtreme' /adm/) . '</small>',
540	'id' => 'header_sb_position', 'type' => '+select_id', //code
541	'info' => __('Change where Header Widget Area is displayed. (Default: Top) (&starf;Plus)', 'weaver-xtreme' /adm/),

549	array('val' => 'post_header', 'desc' => __('Post-#header <div>', 'weaver-xtreme' /adm/)),
550	)),
551
552	+ array('name' => '<span class="i-left dashicons dashicons-editor-kitchensink"></span>' . __('Fixed-Top Header Widget Area', 'weaver-xtreme' /adm/) ,
553	+ 'id' => 'header_sb_fixedtop', 'type' => 'checkbox',
554	+ '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/)),
555	+
556	array( 'type' => 'submit'),
557
558	array('name' => __('Header HTML', 'weaver-xtreme' /adm/), 'id' => 'header_html', 'type' => 'widget_area', __('Header Widget Area', 'weaver-xtreme' /adm/),

589
590	// ======================== Main Options > Menus ========================
591	function weaverx_mainopts_menus() {
592	+
593	+
594	$opts = array(
595	array( 'type' => 'submit'),
596	array('name' => __('Menu & Info Bars', 'weaver-xtreme' /adm/), 'id' => '-menu', 'type' => 'header',

611	'info' => __('Weaver Xtreme Plus allows you to define Mega Menu style dropdown menu items with arbitrary HTML content. (&starf;Plus)', 'weaver-xtreme' /adm/)),
612
613

614	array('name' => __('Primary Menu Bar', 'weaver-xtreme' /adm/), 'id' => 'm_primary', 'type' => 'menu_opts',
615	'info' => __('Attributes for the Primary Menu Bar (Default Location: Bottom of Header)', 'weaver-xtreme' /adm/)),
616



617
618	// array('name' => '<span class="i-left" style="font-size:150%;">↔</span><small> ' . __('Mobile Menu Trigger', 'weaver-xtreme' /adm/). '</small>',
619	// 'id' => 'menu_primary_trigger_int', 'type' => 'val_px',

655	'info' => __('Retain the menu bar hover BG color when sub-menus are opened.', 'weaver-xtreme' /adm/)),
656
657
658	+ array('name' => '<small>' . __('Placeholder Hover Cursor', 'weaver-xtreme' /adm/) . '</small>',
659	+ 'id' => 'placeholder_cursor', 'type' => 'select_id', //code
660	+ 'info' => __('CSS cursor :hover attribute for placeholder menus (e.g., Custom Menus with URL==#). (Default: pointer)', 'weaver-xtreme' /adm/),
661	+ 'value' => array(
662	+ array('val' => 'pointer', 'desc' => __('Pointer (indicates link)', 'weaver-xtreme' /adm/)),
663	+ array('val' => 'context-menu', 'desc' => __('Context Menu available', 'weaver-xtreme' /adm/)),
664	+ array('val' => 'text', 'desc' => __('Text', 'weaver-xtreme' /adm/)),
665	+ array('val' => 'none', 'desc' => __('No pointer', 'weaver-xtreme' /adm/)),
666	+ array('val' => 'not-allowed', 'desc' => __('Action not allowed', 'weaver-xtreme' /adm/)),
667	+ array('val' => 'default', 'desc' => __('The default cursor', 'weaver-xtreme' /adm/))
668	+ )),
669
670	+
671	+ array( 'name' => '<small>' . __('Mobile Menu "Hamburger" Label', 'weaver-xtreme' /adm/) . '</small>',
672	+ 'id' => 'mobile_alt_label', 'type' => 'widetext',
673	+ 'info' => __('Alternative label for the default mobile "Hamburger" icon. HTML allowed: <span> or <img> suggested.', 'weaver-xtreme' /adm/)),
674
675
676	array( 'type' => 'submit'),

847	array('name' => '<span class="i-left" style=font-size:120%;"> ⤪</span>' . __('Featured Image Location', 'weaver-xtreme' /adm/),
848	'id' => 'page_fi_location', 'type' => 'fi_location',
849	'info' => __('Where to display Featured Image for Pages','weaver-xtreme' /adm/)),
850	+ array('name' => __('Full Width FI BG Image:', 'weaver-xtreme' /adm/),
851	+ 'info' => __('To create full width Page BG images from the FI, check the <em>Container Area Extend BG Attributes</em> box on the <em>Full Width</em> tab.', 'weaver-xtreme' /adm/),
852	+ 'type' => 'note'), // ,'help' => 'help.html#PhotoBlog'),
853	array('name' => '<span class="i-left dashicons dashicons-editor-alignleft"></span><small>' . __('Featured Image Alignment<small>', 'weaver-xtreme' /adm/), 'id' => 'page_fi_align', 'type' => 'fi_align',
854	'info' => __('How to align the Featured Image', 'weaver-xtreme' /adm/)),
855

1004	'info' => __('Layout of Posts', 'weaver-xtreme' /adm/)),
1005
1006	array('name' => '<span class="i-left" style=font-size:120%;"> ☷</span>' . __('Post Content Columns', 'weaver-xtreme' /adm/), 'id' => 'post_cols', 'type' => 'select_id', //code
1007	+ 'info' => __('Automatically split all post content into columns for both blog and single page views. <em>This is post content only.</em> This is not the same as "Columns of Posts". (IE<=9 will display 1 col.)', 'weaver-xtreme' /adm/),
1008	'value' => array(
1009	array('val' => '1', 'desc' => __('1 Column', 'weaver-xtreme' /adm/)),
1010	array('val' => '2', 'desc' => __('2 Columns', 'weaver-xtreme' /adm/)),

1030	'info' => __("Display opening Sticky Posts in one column. If First Post One Column also checked, then first non-sticky post will be one column.", 'weaver-xtreme' /adm/)),
1031	array('name' => '<span class="i-left" style=font-size:120%;"> ☷</span><small>' . __('Use <em>Masonry</em> for Posts', 'weaver-xtreme' /adm/) . '</small>',
1032	'id' => 'masonry_cols', 'type' => 'select_id', //code
1033	+ 'info' => __('Use the <em>Masonry</em> blog layout option to show dynamically packed posts on blog and archive-like pages. Overrides "Columns of Posts" setting. <em>Not compatible with full width FI BG images.</em>', 'weaver-xtreme' /adm/),
1034	'value' => array(
1035	array('val' => '0', 'desc' => ''),
1036	array('val' => '2', 'desc' => __('2 Columns', 'weaver-xtreme' /adm/)),

1179	array('name' => __('Featured Image - Posts', 'weaver-xtreme' /adm/), 'id' => '-id', 'type' => 'subheader_alt',
1180	'info' => __('Display of Post Featured Images', 'weaver-xtreme' /adm/)),
1181
1182	+ array('name' => __('Full Width FI BG Image:', 'weaver-xtreme' /adm/), 'type' => 'note',
1183	+ 'info' => __('To create full width Post BG images from the FI, check the <em>Post Area Extend BG Attributes</em> box at <em>Full Width</em> tab.', 'weaver-xtreme' /adm/)),
1184	+
1185	array('name' => '<span class="i-left" style=font-size:120%;"> ⤪</span>' . __('FI Location - Full Post', 'weaver-xtreme' /adm/),
1186	'id' => 'post_full_fi_location', 'type' => 'fi_location_post',
1187	'info' => __('Where to display Featured Image for full blog posts.', 'weaver-xtreme' /adm/)),

admin/admin-saverestore.php CHANGED Viewed

	@@ -24,11 +24,11 @@ function weaverx_ts_admin_saverestore() {
24	<?php _e('<p>This option allows you to save and restore all current theme settings using your host\'s WordPress database. Your options will be preserved across Weaver Xtreme theme upgrades, as well when you change to different themes. There is only one saved backup available. You can also download your setting to your computer with the options below.</p>
25	<p>Note: This save option saves <strong>all</strong> settings, including those marked with &diams;.</p>', 'weaver-xtreme' /adm/);?>
26	<form name="save_mysave_form" method="post">
27	- <~~span~~ class="~~submit~~"~~><input~~ type="submit" name="save_mytheme" value="<?php _e('Save Current Theme Settings', 'weaver-xtreme' /adm/);?>"~~/></span>~~
28	<strong><?php _e('Backup all current theme settings using the WordPress database.', 'weaver-xtreme' /adm/);?></strong>
29	<?php weaverx_nonce_field('save_mytheme'); ?>
30	<br /><br />
31	- <~~span~~ class="~~submit~~"~~><input~~ type="submit" name="restore_mytheme" value="<?php _e('Restore Settings', 'weaver-xtreme' /adm/);?>"~~/></span>~~
32	<strong><?php _e('Restore from saved settings.', 'weaver-xtreme' /adm/);?></strong> <em><?php _e('Last save date:', 'weaver-xtreme' /adm/);?> <?php echo $style_date; ?></em>
33	<?php
34	weaverx_nonce_field('restore_mytheme');
	@@ -51,8 +51,10 @@ function weaverx_ts_admin_saverestore() {
51	<?php _e('You should use the "Download Current Settings To Your Computer" option above to save a copy of your current settings before clearing!
52	If you have Weaver Xtreme Plus installed, you should also save shortcode settings from the Xtreme Plus Save/Restore tab.', 'weaver-xtreme' /adm/); ?>
53	<br />
54	- <~~span~~ class="~~submit~~"~~><input~~ type="submit" name="reset_weaverx" value="<?php _e('Clear All Weaver Xtreme Settings', 'weaver-xtreme' /adm/); ?>"~~/></span>~~
55	- <?php ~~weaverx_nonce_field('reset_weaverx'); ?>~~


56	</form> <!-- resetweaverx_form -->
57	<br /><hr />
58
	@@ -73,11 +75,14 @@ function weaverx_process_options_admin_standard( $processed ) {
73	global $weaverx_opts_cache;
74	$weaverx_opts_cache = false; // clear the cache
75	weaverx_init_opts('reset_weaverx');

76	delete_option( apply_filters('weaverx_options','weaverx_settings_backup') );
77
78	do_action('weaverxplus_admin','reset_weaverxplus');
79
80	update_user_meta( get_current_user_id(), 'tgmpa_dismissed_notice', 0 ); // reset the dismiss on the plugin loader


81	return true;
82	}
83
	@@ -138,7 +143,7 @@ Setting files from Weaver Xtreme Plus can be uploaded to the Free Weaver Xtreme
138	</tr>
139
140	<tr><td><span class='submit'>
141	- <input name="uploadtheme" type="submit" value="<?php _e('Upload theme/backup', 'weaver-xtreme' /adm/); ?>" /></span>
142	<small><?php _e('<strong>Upload and Restore</strong> a theme/backup from file on your computer. Will become current settings.', 'weaver-xtreme' /adm/); ?>
143	</small></td></tr>
144


24	<?php _e('<p>This option allows you to save and restore all current theme settings using your host\'s WordPress database. Your options will be preserved across Weaver Xtreme theme upgrades, as well when you change to different themes. There is only one saved backup available. You can also download your setting to your computer with the options below.</p>
25	<p>Note: This save option saves <strong>all</strong> settings, including those marked with &diams;.</p>', 'weaver-xtreme' /adm/);?>
26	<form name="save_mysave_form" method="post">
27	+ <input class="button-primary" type="submit" name="save_mytheme" value="<?php _e('Save Current Theme Settings', 'weaver-xtreme' /adm/);?>"/>
28	<strong><?php _e('Backup all current theme settings using the WordPress database.', 'weaver-xtreme' /adm/);?></strong>
29	<?php weaverx_nonce_field('save_mytheme'); ?>
30	<br /><br />
31	+ <input class="button-primary" type="submit" name="restore_mytheme" value="<?php _e('Restore Settings', 'weaver-xtreme' /adm/);?>"/>
32	<strong><?php _e('Restore from saved settings.', 'weaver-xtreme' /adm/);?></strong> <em><?php _e('Last save date:', 'weaver-xtreme' /adm/);?> <?php echo $style_date; ?></em>
33	<?php
34	weaverx_nonce_field('restore_mytheme');

51	<?php _e('You should use the "Download Current Settings To Your Computer" option above to save a copy of your current settings before clearing!
52	If you have Weaver Xtreme Plus installed, you should also save shortcode settings from the Xtreme Plus Save/Restore tab.', 'weaver-xtreme' /adm/); ?>
53	<br />
54	+ <input class="button-primary" type="submit" name="reset_weaverx" value="<?php _e('Clear All Weaver Xtreme Settings', 'weaver-xtreme' /adm/); ?>"/> &nbsp
55	+ <?php
56	+ _e('Note: after clearing, settings will be reset to the default subtheme. This is required by WordPress.org standards.', 'weaver-xtreme');
57	+ weaverx_nonce_field('reset_weaverx'); ?>
58	</form> <!-- resetweaverx_form -->
59	<br /><hr />
60

75	global $weaverx_opts_cache;
76	$weaverx_opts_cache = false; // clear the cache
77	weaverx_init_opts('reset_weaverx');
78	+ set_theme_mod('_options_level',0);
79	delete_option( apply_filters('weaverx_options','weaverx_settings_backup') );
80
81	do_action('weaverxplus_admin','reset_weaverxplus');
82
83	update_user_meta( get_current_user_id(), 'tgmpa_dismissed_notice', 0 ); // reset the dismiss on the plugin loader
84	+
85	+
86	return true;
87	}
88

143	</tr>
144
145	<tr><td><span class='submit'>
146	+ <input class="button-primary" name="uploadtheme" type="submit" value="<?php _e('Upload theme/backup', 'weaver-xtreme' /adm/); ?>" /></span>
147	<small><?php _e('<strong>Upload and Restore</strong> a theme/backup from file on your computer. Will become current settings.', 'weaver-xtreme' /adm/); ?>
148	</small></td></tr>
149

admin/admin-subthemes.php CHANGED Viewed

	@@ -57,7 +57,7 @@ function weaverx_st_pick_theme($list_in) {
57	$cur_theme = weaverx_getopt('theme_filename');
58	if ( !$cur_theme ) $cur_theme = WEAVERX_DEFAULT_THEME; // the default theme
59	?>
60	- <form enctype="multipart/form-data" name='pick_theme' method='post'>
61	<strong><?php _e('Click a Radio Button below to select a subtheme:', 'weaver-xtreme' /adm/);?>  </strong>
62	<span style="padding-left:100px;"><?php _e('Current theme:', 'weaver-xtreme' /adm/);?> <strong>
63	<?php
	@@ -71,13 +71,17 @@ function weaverx_st_pick_theme($list_in) {
71	?>
72	</strong></span>
73
74	- <br /><br ~~/><span class='submit'><input name="set_subtheme" type="submit" value="<?php _e('Set to Selected Subtheme', 'weaver-xtreme' /adm/);?>" /></span>~~
75	- ~~<small style="color:#b00;"><br /><?~~php ~~_e('<strong>Note:</strong> Selecting a <em>non-Demo</em> subtheme will change only theme related settings.~~
76	- ~~Options labelled with~~ (~~&diams~~;~~) will be retained. You can use the Save/Restore tab to save a copy of all your current settings first.', 'weaver-xtreme' /adm/);?></small><br /><br />~~




77	<?php
78	weaverx_nonce_field('set_subtheme');
79
80	- $thumbs = weaverx_relative_url('/subthemes/');
81
82	foreach ($list as $addon) {
83	$name = ucwords(str_replace('-',' ',$addon));
	@@ -96,7 +100,7 @@ function weaverx_st_pick_theme($list_in) {
96	if (! weaverx_getopt_checked('_hide_theme_thumbs')) {
97	weaverx_clear_both();
98	?>
99	- <span class='submit' style='padding-top:6px;'><input name="set_subtheme" type="submit" value="<?php _e('Set to Selected Subtheme', 'weaver-xtreme' /adm/);?>" /></span>
100	<?php
101	}
102	?>
	@@ -109,7 +113,7 @@ function weaverx_st_pick_theme($list_in) {
109	$hide_msg = (weaverx_getopt('_hide_theme_thumbs')) ? __('Show Subtheme Thumbnails', 'weaver-xtreme' /adm/) :
110	__('Hide Subtheme Thumbnails', 'weaver-xtreme' /adm/);
111	?>
112	- <input name="hide_thumbs" type="submit" value="<?php echo $hide_msg; ?>" />
113	<?php weaverx_nonce_field('hide_thumbs'); ?>
114	</form>
115	<div style="clear:both;"></div>
	@@ -119,4 +123,12 @@ function weaverx_st_pick_theme($list_in) {
119	do_action('weaverxplus_admin','show_subthemes');
120	}
121








122	?>


57	$cur_theme = weaverx_getopt('theme_filename');
58	if ( !$cur_theme ) $cur_theme = WEAVERX_DEFAULT_THEME; // the default theme
59	?>
60	+ <form enctype="multipart/form-data" name='pick_theme' method='post' onSubmit="return confirm('<?php _e('Are you sure you want select a new theme?\r\n\r\nSelecting a new subtheme will overwrite your existing theme settings. You should save your existing settings on the Save/Restore menu if you have made changes.', 'weaver-xtreme'); ?>');" >
61	<strong><?php _e('Click a Radio Button below to select a subtheme:', 'weaver-xtreme' /adm/);?>  </strong>
62	<span style="padding-left:100px;"><?php _e('Current theme:', 'weaver-xtreme' /adm/);?> <strong>
63	<?php

71	?>
72	</strong></span>
73
74	+ <br /><br />
75	+ <?php
76	+ //weaverx_confirm_select_theme();
77	+ ?>
78	+ <input class="button-primary" name="set_subtheme" type="submit" value="<?php _e('Set to Selected Subtheme', 'weaver-xtreme' );?>" />
79	+
80	+ <p style="color:#b00;font-weight:bold;font-size:120%"><br /><?php _e('<em>Note:</em> Before switching to any subtheme, you must Save and download a copy of your settings using the Save / Restore page, in order to be able to go back to them if required.', 'weaver-xtreme' /adm/);?></p>
81	<?php
82	weaverx_nonce_field('set_subtheme');
83
84	+ $thumbs = weaverx_relative_url('subthemes/');
85
86	foreach ($list as $addon) {
87	$name = ucwords(str_replace('-',' ',$addon));

100	if (! weaverx_getopt_checked('_hide_theme_thumbs')) {
101	weaverx_clear_both();
102	?>
103	+ <span class='submit' style='padding-top:6px;'><input class="button-primary" name="set_subtheme" type="submit" value="<?php _e('Set to Selected Subtheme', 'weaver-xtreme' /adm/);?>" /></span>
104	<?php
105	}
106	?>

113	$hide_msg = (weaverx_getopt('_hide_theme_thumbs')) ? __('Show Subtheme Thumbnails', 'weaver-xtreme' /adm/) :
114	__('Hide Subtheme Thumbnails', 'weaver-xtreme' /adm/);
115	?>
116	+ <input class="button-primary" name="hide_thumbs" type="submit" value="<?php echo $hide_msg; ?>" />
117	<?php weaverx_nonce_field('hide_thumbs'); ?>
118	</form>
119	<div style="clear:both;"></div>

123	do_action('weaverxplus_admin','show_subthemes');
124	}
125
126	+ function weaverx_confirm_select_theme() {
127	+ ?>
128	+
129	+ <br />
130	+ <input class="button-primary" type="submit" onSubmit="return confirm('<?php _e('Are you sure you want select a new theme? This will overwrite you existing theme settings.', 'weaver-xtreme'); ?>');" name="set_subtheme" value="<?php _e('Set to Selected Subtheme', 'weaver-xtreme' /adm/); ?>" />
131	+ <?php weaverx_nonce_field('set_subtheme');
132	+ }
133	+
134	?>

admin/assets/css/admin-style.css CHANGED Viewed

	@@ -1,6 +1,8 @@
1	/* Weaver Xtreme admin style */
2	.hide_me {display:none;}
3


4	.wvr-green {font-weight:bold;color:green;}
5	.wvr-yellow {font-weight:bold;color:orange;}
6	.wvr-red {font-weight:bold;color:red;}


1	/* Weaver Xtreme admin style */
2	.hide_me {display:none;}
3
4	+ textarea.wvrx-edit-dir {background-color:yellow !important; direction: rtl !important;}
5	+
6	.wvr-green {font-weight:bold;color:green;}
7	.wvr-yellow {font-weight:bold;color:orange;}
8	.wvr-red {font-weight:bold;color:red;}

admin/assets/css/admin-style.min.css CHANGED Viewed

@@ -1,7 +1,7 @@
-            -
            .hide_me{display:none}.wvr-green{font-weight:bold;color:green}.wvr-yellow{font-weight:bold;color:orange}.wvr-red{font-weight:bold;color:red}.wvr-blue{font-weight:bold;color:blue}.a-plus{background-color:#f5fbef;border:1px solid #ccc;padding-left:20px;padding-right:20px;margin-left:20px;margin-right:20%}.i-left{float:left;font-size:14px}.i-left-bg{float:left;font-size:16px;color:#70ff29}.i-left-fg{float:left;font-size:16px;color:#290bbd}a.anchorx{display:block;position:relative;top:-40px;visibility:hidden}.options-intro{text-align:center;margin:-10px auto -5px auto;font-size:90%;background-color:ivory;padding:4px 10px 4px 10px;border:1px solid green;max-width:90%}.options-intro a{font-weight:bold;text-decoration:none;color:blue}.options-intro-menu{text-align:center}#wpcontent{background-color:#fffff8;color:black}input.color{border:1px solid #2bff1c}select{font-size:12px}.font-bold{font-weight:bold}.font-bold-title{font-weight:900}.font-italic a,.font-italic{font-style:italic!important}.font-sans-serif{font-family:sans-serif}
-            -
            .font-arial{font-family:Arial,"Helvetica Neue",Helvetica,sans-serif}.font-arialNarrow{font-family:"Arial Narrow",Arial,sans-serif}.font-impact{font-family:Impact,Haettenschweiler,Charcoal,"Arial Narrow Bold",sans-serif}.font-lucidaSans{font-family:"Lucida Sans",Geneva,Tahoma,sans-serif}.font-trebuchetMS{font-family:"Trebuchet MS","Lucida Grande","Lucida Sans Unicode","Lucida Sans",Tahoma,sans-serif}.font-verdana{font-family:Verdana,Geneva,Candara,sans-serif}.font-serif{font-family:TimesNewRoman,"Times New Roman",Times,Baskerville,Georgia,serif}.font-garamond{font-family:Garamond,Baskerville,"Baskerville Old Face","Hoefler Text","Times New Roman",serif}.font-georgia{font-family:Georgia,Times,"Times New Roman",serif}.font-lucidaBright{font-family:"Lucida Bright","Book Antiqua",Georgia,serif}
-            -
            .font-palatino{font-family:"Palatino Linotype",Palatino,"Lucida Bright","Book Antiqua",serif}.font-timesNewRoman{font-family:TimesNewRoman,"Times New Roman",Times,Baskerville,Georgia,serif}.font-monospace{font-family:monospace}.font-consolas{font-family:Consolas,monaco,"Andale Mono",AndaleMono,monospace}.font-courier{font-family:"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",monospace}.font-lucidaConsole{font-family:"Lucida Console","Lucida Sans Typewriter",Monaco,"Bitstream Vera Sans Mono",monospace}.font-papyrus{font-family:Papyrus,fantasy,cursive,serif}.font-comicSans{font-family:"Comic Sans MS",cursive,serif}p{margin-right:5%}.submit input{background:#f8f8f8;background-image:linear-gradient(#a8ddff,#88b3cf);border-radius:4px}.atw-help ul{list-style:disc;margin-left:30px}
-            -
            .atw-option-section{font-weight:bold;font-size:120%;color:blue}.tab ul{margin-left:1.15em;list-style:disc outside none}.tab ol{list-style-position:outside;margin-left:1.4em;margin-bottom:.6em}.js_button{background:#eee!important;font-weight:600!important;color:#585858!important}div.yetii{width:95%;margin:0 0 20px 0}ul.yetii{list-style-type:none;width:100%;float:left;border-bottom:4px ridge #ddd;margin-bottom:8px}ul.yetii li{margin:0 2px 0 0;float:left}ul.yetii a{float:left;display:block;padding:4px 8px;border:1px solid #ddd;border-bottom:0;color:#666;background:#eee;text-decoration:none;font-weight:bold;background-image:linear-gradient(#f0f0f0,#c8c8c8);border-top-left-radius:6px;border-top-right-radius:6px}ul.yetii a:hover{background:#fff}ul.yetii a.active{background:#fff;color:#00f;background-image:linear-gradient(#f8f8f8,#eee)}div.yetiisub{width:100%;margin:0 0 20px 0}ul.yetiisub{list-style-type:none;width:100%;float:left;margin-bottom:8px}ul.yetiisub li{margin:0 2px 2px 0;float:left}
-            -
            ul.yetiisub a{float:left;padding:4px 8px;border:1px solid #ccc;color:#666;background:#f0f0f0;text-decoration:none;font-style:italic;font-weight:bold;background-image:linear-gradient(#f8f8f8,#c8c8c8);border-top-left-radius:6px;border-top-right-radius:6px}ul.yetiisub a:hover{background:#fefefe!important}ul.yetiisub a.active{background:#fff;color:#00f;background-image:linear-gradient(#fff,#e8e8e8)}.atw-small-submit{padding:1.0em 0;margin:1px 0;font-size:90%}.atw-option-header{background:#d0d0d8;line-height:1.8em;width:95%;color:blue;font-size:large;font-weight:bold;padding-left:12px;border-radius:6px;box-shadow:3px 3px 10px #aaa;background-image:linear-gradient(#eee,#ccc)}.atw-option-subheader{background:#eaeaea;line-height:1.8em;width:95%;color:blue;font-size:larger;font-weight:bold;padding-left:18px;border-radius:6px;box-shadow:3px 3px 10px #ccc;background-image:linear-gradient(#fff,#ddd)}.atw-row-header{background:#d0d0d8;line-height:1.8em;padding-left:4px;background-image:linear-gradient(#eee,#ccc)}
             .atw-row-subheader{background:#eaeaea;padding-left:4px;background:linear-gradient(#f8f8f8,#ddd)}.atw-row-subheader-alt{background:#f4f4f4;padding-left:4px;background-image:linear-gradient(#f8f8f8,#dadada)}.atw-row-subheader-area{background:#e8ffee;background:linear-gradient(#e8ffee,#95e8b7)}.l_layout{display:block;width:140px;height:110px;float:left;margin-right:10px;margin-bottom:10px;display:inline;border:1px solid #888;color:black;text-align:center;font:15px arial,sans-serif}.l_layout span{display:block}.l_header{width:140px;height:20px;background:#CCF;line-height:20px}.l_content{width:100px;height:70px;background:beige;float:left;display:inline;line-height:70px}.l_contentcenter{width:60px;height:70px;background:beige;float:left;display:inline;line-height:70px}.l_content2{width:80px;height:70px;background:beige;float:left;display:inline;line-height:70px}.l_contentw{width:140px;height:70px;background:beige;float:left;display:inline;line-height:70px}.l_stdbar{width:40px;height:70px;float:left;display:inline}
             .l_widebar{width:60px;height:70px;float:left;display:inline}.l_righttop{width:40px;height:20px;background:#FE8;float:left;display:inline;line-height:20px}.l_righttopwide{width:60px;height:20px;background:#FE8;float:left;display:inline;line-height:20px}.l_rightup{width:40px;height:25px;margin:0;background:#FAA;float:left;display:inline;line-height:25px}.l_rightright{width:40px;height:50px;margin:0;background:#FAA;float:left;display:inline;line-height:50px}.l_rightdown{width:40px;height:25px;margin:0;background:#AFA;float:left;display:inline;line-height:25px}.l_leftleft{width:40px;height:70px;margin:0;background:#AFA;float:left;display:inline;line-height:70px}.l_leftshort{width:30px;height:50px;margin:0;background:#AFA;float:left;display:inline;line-height:50px}.l_skinny{width:30px;height:50px;margin:0;background:#FAA;float:left;display:inline;line-height:50px}.l_footer{clear:left;width:140px;height:20px;background:#DDF;color:#000;line-height:20px}


1	+ .hide_me{display:none}textarea.wvrx-edit-dir{background-color:yellow!important;direction:rtl!important}.wvr-green{font-weight:bold;color:green}.wvr-yellow{font-weight:bold;color:orange}.wvr-red{font-weight:bold;color:red}.wvr-blue{font-weight:bold;color:blue}.a-plus{background-color:#f5fbef;border:1px solid #ccc;padding-left:20px;padding-right:20px;margin-left:20px;margin-right:20%}.i-left{float:left;font-size:14px}.i-left-bg{float:left;font-size:16px;color:#70ff29}.i-left-fg{float:left;font-size:16px;color:#290bbd}a.anchorx{display:block;position:relative;top:-40px;visibility:hidden}.options-intro{text-align:center;margin:-10px auto -5px auto;font-size:90%;background-color:ivory;padding:4px 10px 4px 10px;border:1px solid green;max-width:90%}.options-intro a{font-weight:bold;text-decoration:none;color:blue}.options-intro-menu{text-align:center}#wpcontent{background-color:#fffff8;color:black}input.color{border:1px solid #2bff1c}select{font-size:12px}.font-bold{font-weight:bold}.font-bold-title{font-weight:900}
2	+ .font-italic a,.font-italic{font-style:italic!important}.font-sans-serif{font-family:sans-serif}.font-arial{font-family:Arial,"Helvetica Neue",Helvetica,sans-serif}.font-arialNarrow{font-family:"Arial Narrow",Arial,sans-serif}.font-impact{font-family:Impact,Haettenschweiler,Charcoal,"Arial Narrow Bold",sans-serif}.font-lucidaSans{font-family:"Lucida Sans",Geneva,Tahoma,sans-serif}.font-trebuchetMS{font-family:"Trebuchet MS","Lucida Grande","Lucida Sans Unicode","Lucida Sans",Tahoma,sans-serif}.font-verdana{font-family:Verdana,Geneva,Candara,sans-serif}.font-serif{font-family:TimesNewRoman,"Times New Roman",Times,Baskerville,Georgia,serif}.font-garamond{font-family:Garamond,Baskerville,"Baskerville Old Face","Hoefler Text","Times New Roman",serif}.font-georgia{font-family:Georgia,Times,"Times New Roman",serif}
3	+ .font-lucidaBright{font-family:"Lucida Bright","Book Antiqua",Georgia,serif}.font-palatino{font-family:"Palatino Linotype",Palatino,"Lucida Bright","Book Antiqua",serif}.font-timesNewRoman{font-family:TimesNewRoman,"Times New Roman",Times,Baskerville,Georgia,serif}.font-monospace{font-family:monospace}.font-consolas{font-family:Consolas,monaco,"Andale Mono",AndaleMono,monospace}.font-courier{font-family:"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",monospace}.font-lucidaConsole{font-family:"Lucida Console","Lucida Sans Typewriter",Monaco,"Bitstream Vera Sans Mono",monospace}.font-papyrus{font-family:Papyrus,fantasy,cursive,serif}.font-comicSans{font-family:"Comic Sans MS",cursive,serif}p{margin-right:5%}.submit input{background:#f8f8f8;background-image:linear-gradient(#a8ddff,#88b3cf);border-radius:4px}
4	+ .atw-help ul{list-style:disc;margin-left:30px}.atw-option-section{font-weight:bold;font-size:120%;color:blue}.tab ul{margin-left:1.15em;list-style:disc outside none}.tab ol{list-style-position:outside;margin-left:1.4em;margin-bottom:.6em}.js_button{background:#eee!important;font-weight:600!important;color:#585858!important}div.yetii{width:95%;margin:0 0 20px 0}ul.yetii{list-style-type:none;width:100%;float:left;border-bottom:4px ridge #ddd;margin-bottom:8px}ul.yetii li{margin:0 2px 0 0;float:left}ul.yetii a{float:left;display:block;padding:4px 8px;border:1px solid #ddd;border-bottom:0;color:#666;background:#eee;text-decoration:none;font-weight:bold;background-image:linear-gradient(#f0f0f0,#c8c8c8);border-top-left-radius:6px;border-top-right-radius:6px}ul.yetii a:hover{background:#fff}ul.yetii a.active{background:#fff;color:#00f;background-image:linear-gradient(#f8f8f8,#eee)}div.yetiisub{width:100%;margin:0 0 20px 0}ul.yetiisub{list-style-type:none;width:100%;float:left;margin-bottom:8px}
5	+ ul.yetiisub li{margin:0 2px 2px 0;float:left}ul.yetiisub a{float:left;padding:4px 8px;border:1px solid #ccc;color:#666;background:#f0f0f0;text-decoration:none;font-style:italic;font-weight:bold;background-image:linear-gradient(#f8f8f8,#c8c8c8);border-top-left-radius:6px;border-top-right-radius:6px}ul.yetiisub a:hover{background:#fefefe!important}ul.yetiisub a.active{background:#fff;color:#00f;background-image:linear-gradient(#fff,#e8e8e8)}.atw-small-submit{padding:1.0em 0;margin:1px 0;font-size:90%}.atw-option-header{background:#d0d0d8;line-height:1.8em;width:95%;color:blue;font-size:large;font-weight:bold;padding-left:12px;border-radius:6px;box-shadow:3px 3px 10px #aaa;background-image:linear-gradient(#eee,#ccc)}.atw-option-subheader{background:#eaeaea;line-height:1.8em;width:95%;color:blue;font-size:larger;font-weight:bold;padding-left:18px;border-radius:6px;box-shadow:3px 3px 10px #ccc;background-image:linear-gradient(#fff,#ddd)}.atw-row-header{background:#d0d0d8;line-height:1.8em;padding-left:4px;background-image:linear-gradient(#eee,#ccc)}
6	.atw-row-subheader{background:#eaeaea;padding-left:4px;background:linear-gradient(#f8f8f8,#ddd)}.atw-row-subheader-alt{background:#f4f4f4;padding-left:4px;background-image:linear-gradient(#f8f8f8,#dadada)}.atw-row-subheader-area{background:#e8ffee;background:linear-gradient(#e8ffee,#95e8b7)}.l_layout{display:block;width:140px;height:110px;float:left;margin-right:10px;margin-bottom:10px;display:inline;border:1px solid #888;color:black;text-align:center;font:15px arial,sans-serif}.l_layout span{display:block}.l_header{width:140px;height:20px;background:#CCF;line-height:20px}.l_content{width:100px;height:70px;background:beige;float:left;display:inline;line-height:70px}.l_contentcenter{width:60px;height:70px;background:beige;float:left;display:inline;line-height:70px}.l_content2{width:80px;height:70px;background:beige;float:left;display:inline;line-height:70px}.l_contentw{width:140px;height:70px;background:beige;float:left;display:inline;line-height:70px}.l_stdbar{width:40px;height:70px;float:left;display:inline}
7	.l_widebar{width:60px;height:70px;float:left;display:inline}.l_righttop{width:40px;height:20px;background:#FE8;float:left;display:inline;line-height:20px}.l_righttopwide{width:60px;height:20px;background:#FE8;float:left;display:inline;line-height:20px}.l_rightup{width:40px;height:25px;margin:0;background:#FAA;float:left;display:inline;line-height:25px}.l_rightright{width:40px;height:50px;margin:0;background:#FAA;float:left;display:inline;line-height:50px}.l_rightdown{width:40px;height:25px;margin:0;background:#AFA;float:left;display:inline;line-height:25px}.l_leftleft{width:40px;height:70px;margin:0;background:#AFA;float:left;display:inline;line-height:70px}.l_leftshort{width:30px;height:50px;margin:0;background:#AFA;float:left;display:inline;line-height:50px}.l_skinny{width:30px;height:50px;margin:0;background:#FAA;float:left;display:inline;line-height:50px}.l_footer{clear:left;width:140px;height:20px;background:#DDF;color:#000;line-height:20px}

includes/wvrx-ts-admin-page-posts.php CHANGED Viewed

@@ -10,21 +10,44 @@ if ( !defined('ABSPATH')) exit; // Exit if accessed directly
             // Admin panel that gets added to the page edit page for per page options
-            -
            if ( ! function_exists( 'weaverxplus_plugin_installed' ) ) {
             function wvrx_ts_isp_true($val) {
             	if ($val) return true;
             	return false;
+            }
-            -
            function wvrx_ts_page_checkbox($opt, $msg, $width = 33, $br = 0) {
             	global $post;
             ?>
-            -
            	<div style="float:left;width:<?php echo $width; ?>%"><label><input type="checkbox" id="<?php echo($opt); ?>" name="<?php echo($opt); ?>"
-            -
            <?php checked(wvrx_ts_isp_true(get_post_meta($post->ID, $opt, true))); ?> />
-            -
            <?php 	echo($msg . '</label></div>');
             	for ($i = 0 ; $i < $br ; $i++)
             		echo '<br class="page_checkbox" style="clear:both;" />';
+            }
             function wvrx_ts_page_layout( $page = 'page' ) {
@@ -119,7 +142,7 @@ if ( function_exists( 'atw_showposts_installed' ) ) {
             	echo '</select>&nbsp;' .
             __('Use a Filter from <em>Weaver Show Posts Plugin</em> <strong>instead</strong> of above post selection options.','weaverx-theme-support' /*adm*/) .
             '<br /> <span style="margin-left:8em;"><span>' .
-            -
            __('(Note: Weaver Show Posts <em>Post Display</em> options and <em>Use Paging</em> option <strong>not</strong> used for posts using this filter.)','weaverx-theme-support' /*adm*/) .
             '<br />' . '<br />';
             } else {
             _e('<strong>Want More Post Filtering Options?</strong> Install the <em>Aspen Themeworks Show Posts</em> plugin for more filtering options.','weaverx-theme-support' /*adm*/); ?>
@@ -177,7 +200,7 @@ function wvrx_ts_pwp_cols() {
             	weaverx_html_br();
             	$opts2 = array( 'name' => __('Use <em>Masonry</em> columns:','weaverx-theme-support' /*adm*/), 'id' => '_pp_pwp_masonry',
-            -
            		'info' => __('Use <em>Masonry</em> for multi-column display','weaverx-theme-support' /*adm*/),
             		'value' => array(
             			array('val' => '', 'desc' => '&nbsp;' ),
             			array('val' => '1', 'desc' => __('1 Column','weaverx-theme-support' /*adm*/) ),
@@ -195,6 +218,8 @@ function wvrx_ts_pwp_cols() {
             	wvrx_ts_page_checkbox('_pp_pwp_compact_posts', __('For regular, <em>non-PostFormats</em> posts, show <em>title + first image</em> on blog pages.','weaverx-theme-support' /*adm*/),90,1);
+            }
             function wvrx_ts_page_extras() {
             	global $post;
             	$opts = get_option( apply_filters('weaverx_options','weaverx_settings') , array());	// need to fetch Weaver Xtreme options
@@ -204,7 +229,13 @@ function wvrx_ts_page_extras() {
             		|| (current_user_can('edit_pages') && !isset($opts['_hide_editor_per']))	// Editor
             		|| (current_user_can('edit_posts') && !isset($opts['_hide_author_per'])))    // Author/Contributor
             	) {
-            -
            		echo '<p>' . __('Weaver Xtreme Per Page Options not available for your User Role.','weaverx-theme-support' /*adm*/) . '</p>';
             		return;	// don't show per post panel
+            	   }
@@ -240,8 +271,9 @@ the <em></em>&mdash; Select &mdash;</em> default value.','weaverx-theme-support'
             	$template = !empty($post->page_template) ? $post->page_template : "Default Template";
             	$raw_template = in_array($template, array('paget-raw.php'));
-            -
            	echo '<strong>' . __('Per Page Options','weaverx-theme-support' /*adm*/) . '</strong>';
-            -
            	weaverx_help_link('help.html#optsperpage', __('Help for Per Page Options','weaverx-theme-support' /*adm*/));
             	weaverx_html_br();
@@ -264,14 +296,12 @@ the <em></em>&mdash; Select &mdash;</em> default value.','weaverx-theme-support'
             	wvrx_ts_page_cols();
             	} // not raw
-            -
            	_e('<em>Note:</em> the following options work with the default menu - not custom menus.','weaverx-theme-support' /*adm*/);
-            -
            	weaverx_html_br();
             	wvrx_ts_page_checkbox('_pp_hide_on_menu',__('Hide Page on the default Primary Menu','weaverx-theme-support' /*adm*/),90,1);
-            -
-            -
            	wvrx_ts_page_checkbox('_pp_stay_on_page',__('Menu "Placeholder" page. Useful for top-level menu item - don\'t go anywhere when menu item is clicked.','weaverx-theme-support' /*adm*/),90,2);
-            -
             	wvrx_ts_page_checkbox('_pp_hide_visual_editor',__('Disable Visual Editor for this page. Useful if you enter simple HTML or other code.','weaverx-theme-support' /*adm*/),90,1);
             	if (weaverx_allow_multisite()) {
@@ -286,7 +316,7 @@ the <em></em>&mdash; Select &mdash;</em> default value.','weaverx-theme-support'
             	wvrx_ts_page_layout();
             ?>
             <br />
-            -
            	<input type="text" size="4" id="_pp_category" name="_pp_sidebar_width"
             	value="<?php echo esc_textarea(get_post_meta($post->ID, "_pp_sidebar_width", true)); ?>" />
             	<?php _e('% &nbsp;- <em>Sidebar Width</em> - Per Page Sidebar width (applies to all layouts)','weaverx-theme-support' /*adm*/); ?> <br /><br />
             <?php
@@ -327,12 +357,17 @@ To add areas to the widget area lists below, you <strong>must</strong> first def
             	$opts3 = array(  'id' => '_pp_fi_location',
             		'info' => __('How to display Page FI on this page','weaverx-theme-support' /*adm*/),
             		'value' => array(
-            -
            			array('val' => '', 'desc' => __('Default Page FI','weaverx-theme-support' /*adm*/) ),
             			array('val' => 'content-top', 'desc' => __('With Content - top','weaverx-theme-support' /*adm*/) ),
             			array('val' => 'content-bottom', 'desc' => __('With Content - bottom','weaverx-theme-support' /*adm*/) ),
-            -
            			array('val' => 'title-before', 'desc' => __('Before Title','weaverx-theme-support' /*adm*/) ),
             			array('val' => 'header-image', 'desc' => __('Header Image Replacement','weaverx-theme-support' /*adm*/) ),
-            -
            			array('val' => 'hide', 'desc' => __('Hide FI on this Page','weaverx-theme-support' /*adm*/) )
+            			)
             		);
             	wvrx_ts_pp_select_id($opts3);
@@ -349,21 +384,29 @@ To add areas to the widget area lists below, you <strong>must</strong> first def
             	<?php _e('<em>Per Page body Class</em> - CSS class name to add to HTML &lt;body&gt; block. Allows Per Page custom styling.','weaverx-theme-support' /*adm*/); ?>
             	<br />
             </p>
             <p>
             <?php
-            -
            	_e('<strong>Settings for "Page with Posts" Template</strong>','weaverx-theme-support' /*adm*/);
             	weaverx_help_link('help.html#PerPostTemplate',__('Help for Page with Posts Template','weaverx-theme-support' /*adm*/) );
             	$template = !empty($post->page_template) ? $post->page_template : "Default Template";
             	if (in_array($template, apply_filters('weaverx_paget_posts', array('paget-posts.php'))) ) {
             	?>
-            -
            	<br />
             <?php _e('These settings are optional, and can filter which posts are displayed when you use the "Page with Posts" template.
             Use commas to separate items in lists.
             The settings will be combined for the final filtered list of posts displayed.
             (If you make mistakes in your settings, it won\'t be apparent until you display the page.)','weaverx-theme-support' /*adm*/); ?>
-            -
            <br />
             	<input type="text" size="30" id="_pp_category" name="_pp_category"
             	value="<?php echo esc_textarea(get_post_meta($post->ID, "_pp_category", true)); ?>" />
@@ -376,7 +419,7 @@ The settings will be combined for the final filtered list of posts displayed.
             	<input type="text" size="30" id="_pp_onepost" name="_pp_onepost"
             	value="<?php echo esc_textarea(get_post_meta($post->ID, "_pp_onepost", true)); ?>" />
-            -
            	<?php _e("<em>Single Post</em> - Enter post slug of a single post to display.",'weaverx-theme-support' /*adm*/); ?> <br />
             	<input type="text" size="30" id="_pp_orderby" name="_pp_orderby"
             	value="<?php echo esc_textarea(get_post_meta($post->ID, "_pp_orderby", true)); ?>" />
@@ -419,14 +462,17 @@ Useful with plugin that will display first n posts using a shortcode. (e.g., Pos
             	<?php wvrx_ts_page_checkbox('_pp_hide_infobottom',__('Hide bottom info line','weaverx-theme-support' /*adm*/), 40, 1); ?>
             	<?php wvrx_ts_page_checkbox('_pp_hide_sticky',__('No special treatment for Sticky Posts','weaverx-theme-support' /*adm*/), 40); ?>
             </p>
             <?php
             	} else {	// NOT a page with posts
             ?>	<p>
             <?php _e('<strong>Note:</strong> After you choose the "Page with Posts" template from the <em>Template</em>
             option in the <em>Page Attributes</em> box, <strong>and</strong> <em>Publish</em> or <em>Save Draft</em>,
-            -
            settings for "Page with Posts" will be displayed here. Current page template:','weaverx-theme-support' /*adm*/); ?>
-            -
            <?php echo $template; ?>
             	</p>
             <?php
+            	}
             	} else { // raw page template handling
@@ -436,10 +482,20 @@ settings for "Page with Posts" will be displayed here. Current page template:','
             unchecked, you will get the WP paragraph and texturize processing.</li>
             <li>You can add custom HTML code to include in the &lt;head&gt; block by defining a Custom Field named <em>page-head-code</em>
             and including that HTML code in the Value for that field.</li></ol>', 'weaverx-theme-support');
-            -
            		echo '<p>';
+            	}
-            -
            		do_action('weaverxplus_add_per_page');
             ?>
             	<input type='hidden' id='post_meta' name='post_meta' value='post_meta'/>
             	</div>
             <?php
@@ -494,13 +550,11 @@ function wvrx_ts_post_extras() {
             	wvrx_ts_page_checkbox('_pp_masonry_span2',__('For <em>Masonry</em> multi-columns: make this post span two columns.','weaverx-theme-support' /*adm*/),90,1);
             	wvrx_ts_page_checkbox('_pp_post_add_link',__('Show a "link to single page" icon at bottom of post - useful with compact posts','weaverx-theme-support' /*adm*/),90);
-            -
            	echo('<br style="clear:both;"/><br /><strong>Per Post Style</strong> (&starf;Plus)' /*a*/ );
-            -
            	weaverx_help_link('help.html#perpoststyle', __('Help for Per Post Style','weaverx-theme-support' /*adm*/ ));
-            -
            	echo '<br />' .
-            -
            __('Weaver Xtreme Plus supports optional per post CSS style rules.','weaverx-theme-support' /*adm*/); ?>
-            -
            <br />
             <br />
             <p><strong><?php _e('<em>Single Page View:</em> Sidebars','weaverx-theme-support' /*adm*/); ?></strong></p>
@@ -540,19 +594,45 @@ To add areas to the widget area lists below, you <strong>must</strong> first def
             	wvrx_ts_pp_replacement( 'Sitewide Top Widget Area' , 'sitewide-top-widget-area' );
             	wvrx_ts_pp_replacement( 'Sitewide Bottom Widget Area' , 'sitewide-bottom-widget-area' );
             ?>
             <br style="clear:both;" /><p><strong><?php _e('<em>Single Page View:</em> Featured Image','weaverx-theme-support' /*adm*/); ?></strong></p>
             <?php
             	$opts3 = array(  'id' => '_pp_fi_location',
             		'info' => __('Override <em>Single Page</em> setting for where to display FI','weaverx-theme-support' /*adm*/),
             		'value' => array(
-            -
            			array('val' => '', 'desc' => __('Default Single Page FI','weaverx-theme-support' /*adm*/) ),
             			array('val' => 'content-top', 'desc' => __('With Content - top','weaverx-theme-support' /*adm*/) ),
             			array('val' => 'content-bottom', 'desc' => __('With Content - bottom','weaverx-theme-support' /*adm*/) ),
-            -
            			array('val' => 'title-before', 'desc' => __('Before Title','weaverx-theme-support' /*adm*/) ),
             			array('val' => 'header-image', 'desc' => __('Header Image Replacement','weaverx-theme-support' /*adm*/) ),
-            -
            			array('val' => 'post-before', 'desc' => __('Outside of Post','weaverx-theme-support' /*adm*/) ),
-            -
            			array('val' => 'hide', 'desc' => __('Hide FI on Single Page','weaverx-theme-support' /*adm*/) )
+            			)
             		);
             	wvrx_ts_pp_select_id($opts3);
@@ -573,15 +653,28 @@ To add areas to the widget area lists below, you <strong>must</strong> first def
+            	}
             	?>
             </p>
             <p>
             	<?php echo('<strong>Post Format</strong>');
             	weaverx_help_link('help.html#gallerypost', __('Help for Per Post Format','weaverx-theme-support' /*adm*/));
             	weaverx_html_br();
-            -
            	_e('Weaver Xtreme supports Post Formats. Click the ? for more info.','weaverx-theme-support' /*adm*/);
-            -
            	weaverx_html_br();
             	weaverx_html_br();
-            -
            	do_action('weaverxplus_add_per_post'); ?>
             </p>
             	<input type='hidden' id='post_meta' name='post_meta' value='post_meta'/>
             </div>
@@ -595,7 +688,7 @@ function wvrx_ts_save_post_fields($post_id) {
             	'_pp_top-widget-area','_pp_bottom-widget-area','_pp_sitewide-top-widget-area', '_pp_sitewide-bottom-widget-area',
             	'_pp_post_type', '_pp_hide_page_title','_pp_hide_site_title','_pp_hide_menus','_pp_hide_header_image',
             	'_pp_hide_footer','_pp_hide_header','_pp_hide_sticky', '_pp_force_post_full','_pp_force_post_excerpt',
-            -
            	'_pp_show_post_avatar', '_pp_bodyclass', '_pp_fi_link', '_pp_fi_location', '_pp_post_styles',
             	'_pp_hide_top_post_meta','_pp_hide_bottom_post_meta', '_pp_stay_on_page', '_pp_hide_on_menu', '_pp_show_featured_img',
             	'_pp_hide_infotop','_pp_hide_infobottom', '_pp_hide_visual_editor', '_pp_masonry_span2', '_show_post_bubble',
             	'_pp_hide_post_title', '_pp_post_add_link', '_pp_hide_post_format_label', '_pp_page_layout', '_pp_wvrx_pwp_type',
@@ -603,7 +696,12 @@ function wvrx_ts_save_post_fields($post_id) {
             	'_pp_hide_page_infobar', '_pp_hide_n_posts','_pp_fullposts', '_pp_pwp_masonry','_pp_pwp_compact','_pp_pwp_compact_posts',
             	'_primary-widget-area', '_secondary-widget-area', '_header-widget-area', '_footer-widget-area', '_sitewide-top-widget-area',
             	'_sitewide-bottom-widget-area', '_page-top-widget-area', '_page-bottom-widget-area', '_pp_full_browser_height',
-            -
            	'_pp_page_cols'
             	);
             if (weaverx_allow_multisite()) {
@@ -636,5 +734,194 @@ if (weaverx_allow_multisite()) {
             add_action("save_post", "wvrx_ts_save_post_fields");
             add_action("publish_post", "wvrx_ts_save_post_fields");
+            }
             ?>


10	// Admin panel that gets added to the page edit page for per page options
11
12
13	+ //if ( ! defined('WEAVER_XPLUS_VERSION') \|\| version_compare( WEAVER_XPLUS_VERSION, '2.1.90', '>=') ) {
14	+
15
16	function wvrx_ts_isp_true($val) {
17	if ($val) return true;
18	return false;
19	}
20
21	+ function wvrx_ts_page_color($opt, $msg) { // used by XPlus
22	+ global $post;
23	+
24	+ $pclass = 'color {hash:true, adjust:false}'; // starting with V 1.3, allow text in color pickers
25	+ //echo '<span class="dashicons dashicons-admin-appearance"></span>&nbsp';
26	+
27	+ ?>
28	+ <label><input class="<?php echo $pclass; ?>" id="<?php echo($opt); ?>" name="<?php echo($opt); ?>" type="text" style="width:90px"
29	+ value="<?php echo esc_textarea(get_post_meta($post->ID, $opt, true)); ?>"/>
30	+ <?php
31	+ echo '</label> ' . $msg ;
32	+ }
33	+
34	+ function wvrx_ts_simple_checkbox($opt, $msg) {
35	global $post;
36	?>
37	+ <label><input type="checkbox" id="<?php echo($opt); ?>" name="<?php echo($opt); ?>"
38	+ <?php checked(wvrx_ts_isp_true(get_post_meta($post->ID, $opt, true))); ?> /><?php echo $msg;?></label>
39	+ <?php
40	+ }
41	+
42	+ function wvrx_ts_page_checkbox($opt, $msg, $width = 33, $br = 0) {
43	+ if ( $width != 'auto')
44	+ $width = "{$width}%";
45	+ ?>
46	+ <div style="float:left;width:<?php echo $width; ?>"><?php wvrx_ts_simple_checkbox($opt,$msg);
47	+ echo '</div>';
48	for ($i = 0 ; $i < $br ; $i++)
49	echo '<br class="page_checkbox" style="clear:both;" />';
50	+
51	}
52
53	function wvrx_ts_page_layout( $page = 'page' ) {

142	echo '</select> ' .
143	__('Use a Filter from <em>Weaver Show Posts Plugin</em> <strong>instead</strong> of above post selection options.','weaverx-theme-support' /adm/) .
144	'<br /> <span style="margin-left:8em;"><span>' .
145	+ __('(Note: Weaver Show Posts <em>Post Display</em> options and <em>Use Paging</em> option <strong>not</strong> used for posts when using this filter.)','weaverx-theme-support' /adm/) .
146	'<br />' . '<br />';
147	} else {
148	_e('<strong>Want More Post Filtering Options?</strong> Install the <em>Aspen Themeworks Show Posts</em> plugin for more filtering options.','weaverx-theme-support' /adm/); ?>

200	weaverx_html_br();
201
202	$opts2 = array( 'name' => __('Use <em>Masonry</em> columns:','weaverx-theme-support' /adm/), 'id' => '_pp_pwp_masonry',
203	+ 'info' => __('Use <em>Masonry</em> for multi-column display. <em>Not compatible with FI BG images.</em>','weaverx-theme-support' /adm/),
204	'value' => array(
205	array('val' => '', 'desc' => ' ' ),
206	array('val' => '1', 'desc' => __('1 Column','weaverx-theme-support' /adm/) ),

218	wvrx_ts_page_checkbox('_pp_pwp_compact_posts', __('For regular, <em>non-PostFormats</em> posts, show <em>title + first image</em> on blog pages.','weaverx-theme-support' /adm/),90,1);
219	}
220
221	+
222	+
223	function wvrx_ts_page_extras() {
224	global $post;
225	$opts = get_option( apply_filters('weaverx_options','weaverx_settings') , array()); // need to fetch Weaver Xtreme options

229	\|\| (current_user_can('edit_pages') && !isset($opts['_hide_editor_per'])) // Editor
230	\|\| (current_user_can('edit_posts') && !isset($opts['_hide_author_per']))) // Author/Contributor
231	) {
232	+ if (isset($opts['_show_per_post_all']) && $opts['_show_per_post_all'])
233	+ echo '<p>' .
234	+ __('You can enable Weaver Xtreme Per Page Options for Custom Post Types on the Weaver Xtreme:Advanced Options:Admin Options tab.','weaverx-theme-support' /adm/) .
235	+ '</p>';
236	+ else
237	+ echo '<p>' . __('Weaver Xtreme Per Page Options not available for your User Role.','weaverx-theme-support' /adm/) . '</p>';
238	+
239	return; // don't show per post panel
240	}
241

271	$template = !empty($post->page_template) ? $post->page_template : "Default Template";
272	$raw_template = in_array($template, array('paget-raw.php'));
273
274	+ echo '<br /><strong>' . __('Per Page Options','weaverx-theme-support' /adm/) . '</strong>';
275	+ weaverx_help_link('help.html#optsperpage', __('Help for Per Page Options','weaverx-theme-support' /adm/)) ;
276	+
277	weaverx_html_br();
278
279

296	wvrx_ts_page_cols();
297	} // not raw
298
299	+ _e('<h4>Per Page Menu Options</h4>','weaverx-theme-support');

300	wvrx_ts_page_checkbox('_pp_hide_on_menu',__('Hide Page on the default Primary Menu','weaverx-theme-support' /adm/),90,1);
301
302	+ wvrx_ts_page_checkbox('_pp_stay_on_page',__('Menu "Placeholder" page. Useful for top-level menu item - don\'t go anywhere when menu item is clicked.','weaverx-theme-support' /adm/),90,1);
303
304	+ _e('<h4>Per Page Visual Editor Options</h4>', 'weaverx-theme-support');


305	wvrx_ts_page_checkbox('_pp_hide_visual_editor',__('Disable Visual Editor for this page. Useful if you enter simple HTML or other code.','weaverx-theme-support' /adm/),90,1);
306
307	if (weaverx_allow_multisite()) {

316	wvrx_ts_page_layout();
317	?>
318	<br />
319	+ <input type="text" size="4" id="_pp_sidebar_width" name="_pp_sidebar_width"
320	value="<?php echo esc_textarea(get_post_meta($post->ID, "_pp_sidebar_width", true)); ?>" />
321	<?php _e('%  - <em>Sidebar Width</em> - Per Page Sidebar width (applies to all layouts)','weaverx-theme-support' /adm/); ?> <br /><br />
322	<?php

357	$opts3 = array( 'id' => '_pp_fi_location',
358	'info' => __('How to display Page FI on this page','weaverx-theme-support' /adm/),
359	'value' => array(
360	+ array('val' => '', 'desc' => __('Default Blog FI','weaverx-theme-support' /adm/) ),
361	array('val' => 'content-top', 'desc' => __('With Content - top','weaverx-theme-support' /adm/) ),
362	array('val' => 'content-bottom', 'desc' => __('With Content - bottom','weaverx-theme-support' /adm/) ),
363	+ array('val' => 'title-before', 'desc' => __('With Title','weaverx-theme-support' /adm/) ),
364	+ array('val' => 'title-banner', 'desc' => __('Banner above Title','weaverx-theme-support' /adm/) ),
365	array('val' => 'header-image', 'desc' => __('Header Image Replacement','weaverx-theme-support' /adm/) ),
366	+ array('val' => 'post-before', 'desc' => __('Beside Page, no wrap', 'weaver-xtreme' /adm/) ),
367	+ array('val' => 'post-bg', 'desc' => __('As BG Image, Tile', 'weaver-xtreme' /adm/) ),
368	+ array('val' => 'post-bg-cover', 'desc' => __('As BG Image, Cover', 'weaver-xtreme' /adm/) ),
369	+ array('val' => 'post-bg-parallax', 'desc' => __('As BG Image, Parallax', 'weaver-xtreme' /adm/) ),
370	+ array('val' => 'hide', 'desc' => __('Hide FI for this Post','weaverx-theme-support' /adm/) )
371	)
372	);
373	wvrx_ts_pp_select_id($opts3);

384	<?php _e('<em>Per Page body Class</em> - CSS class name to add to HTML <body> block. Allows Per Page custom styling.','weaverx-theme-support' /adm/); ?>
385	<br />
386	</p>
387	+ <?php
388	+ } // not raw - break for XPlus
389	+
390	+
391	+ if (!$raw_template) { // resume raw handling
392	+ ?>
393	+ <div style="border:1px solid black; padding:0 1em 1em 1em;">
394	<p>
395	+ <span style="font-weight:bold;font-size:120%;">
396	<?php
397
398	+ _e('Settings for "Page with Posts" Template','weaverx-theme-support' /adm/); echo "</span>";
399	weaverx_help_link('help.html#PerPostTemplate',__('Help for Page with Posts Template','weaverx-theme-support' /adm/) );
400
401	$template = !empty($post->page_template) ? $post->page_template : "Default Template";
402	if (in_array($template, apply_filters('weaverx_paget_posts', array('paget-posts.php'))) ) {
403	?>
404	+ <p>
405	<?php _e('These settings are optional, and can filter which posts are displayed when you use the "Page with Posts" template.
406	Use commas to separate items in lists.
407	The settings will be combined for the final filtered list of posts displayed.
408	(If you make mistakes in your settings, it won\'t be apparent until you display the page.)','weaverx-theme-support' /adm/); ?>
409	+ </p>
410
411	<input type="text" size="30" id="_pp_category" name="_pp_category"
412	value="<?php echo esc_textarea(get_post_meta($post->ID, "_pp_category", true)); ?>" />

419
420	<input type="text" size="30" id="_pp_onepost" name="_pp_onepost"
421	value="<?php echo esc_textarea(get_post_meta($post->ID, "_pp_onepost", true)); ?>" />
422	+ <?php _e("<em>Single Post</em> - Enter post slug of a single post to display. (Use [show_posts] filter to include specific list of posts.)",'weaverx-theme-support' /adm/); ?> <br />
423
424	<input type="text" size="30" id="_pp_orderby" name="_pp_orderby"
425	value="<?php echo esc_textarea(get_post_meta($post->ID, "_pp_orderby", true)); ?>" />

462	<?php wvrx_ts_page_checkbox('_pp_hide_infobottom',__('Hide bottom info line','weaverx-theme-support' /adm/), 40, 1); ?>
463	<?php wvrx_ts_page_checkbox('_pp_hide_sticky',__('No special treatment for Sticky Posts','weaverx-theme-support' /adm/), 40); ?>
464	</p>
465	+ </div>
466	<?php
467	} else { // NOT a page with posts
468	?> <p>
469	<?php _e('<strong>Note:</strong> After you choose the "Page with Posts" template from the <em>Template</em>
470	option in the <em>Page Attributes</em> box, <strong>and</strong> <em>Publish</em> or <em>Save Draft</em>,
471	+ settings for "Page with Posts" will be displayed here. Current page template:','weaverx-theme-support' /adm/);
472	+ echo $template; ?>
473	</p>
474	+ </div>
475	+
476	<?php
477	}
478	} else { // raw page template handling

482	unchecked, you will get the WP paragraph and texturize processing.</li>
483	<li>You can add custom HTML code to include in the <head> block by defining a Custom Field named <em>page-head-code</em>
484	and including that HTML code in the Value for that field.</li></ol>', 'weaverx-theme-support');
485	+ echo '</p>';
486	}
487	+
488	+ echo '<br /><br /><div style="clear:both;border:2px solid #aaa;padding:0 1em .5em 1em;">';
489	+ echo '<h3>Weaver Xtreme Plus Per Page Options (&starf;Plus)</h3>';
490	+ echo '<strong>' . __('Per Page Style','weaver-xtreme-plus') . '</strong> (&starf;Plus)' /a/ ;
491	+
492	+ do_action('wvrx_ts_xp_perpage_style', $raw_template);
493	+
494	+ echo '</div>';
495	+
496	+
497	?>
498	+ <div style="clear:both;"></div>
499	<input type='hidden' id='post_meta' name='post_meta' value='post_meta'/>
500	</div>
501	<?php

550	wvrx_ts_page_checkbox('_pp_masonry_span2',__('For <em>Masonry</em> multi-columns: make this post span two columns.','weaverx-theme-support' /adm/),90,1);
551
552	wvrx_ts_page_checkbox('_pp_post_add_link',__('Show a "link to single page" icon at bottom of post - useful with compact posts','weaverx-theme-support' /adm/),90);
553	+ echo '<br style="clear:both;"/>';
554
555
556	+
557	+ ?>



558	<br />
559	<p><strong><?php _e('<em>Single Page View:</em> Sidebars','weaverx-theme-support' /adm/); ?></strong></p>
560

594
595	wvrx_ts_pp_replacement( 'Sitewide Top Widget Area' , 'sitewide-top-widget-area' );
596	wvrx_ts_pp_replacement( 'Sitewide Bottom Widget Area' , 'sitewide-bottom-widget-area' );
597	+ ?>
598	+ <br style="clear:both;" /><p><strong><?php _e('<em>Post Blog/Archive View:</em> Featured Image','weaverx-theme-support' /adm/); ?></strong></p>
599	+ <?php
600	+ $opts3 = array( 'id' => '_pp_post_fi_location',
601	+ 'info' => __('Override <em>Post</em> setting for where to display FI (for both excerpt and full content)','weaverx-theme-support' /adm/),
602	+ 'value' => array(
603	+ array('val' => '', 'desc' => __('Default Blog FI','weaverx-theme-support' /adm/) ),
604	+ array('val' => 'content-top', 'desc' => __('With Content - top','weaverx-theme-support' /adm/) ),
605	+ array('val' => 'content-bottom', 'desc' => __('With Content - bottom','weaverx-theme-support' /adm/) ),
606	+ array('val' => 'title-before', 'desc' => __('With Title','weaverx-theme-support' /adm/) ),
607	+ array('val' => 'title-banner', 'desc' => __('Banner above Title','weaverx-theme-support' /adm/) ),
608	+ array('val' => 'header-image', 'desc' => __('Header Image Replacement','weaverx-theme-support' /adm/) ),
609	+ array('val' => 'post-before', 'desc' => __('Beside Post, no wrap', 'weaver-xtreme' /adm/) ),
610	+ array('val' => 'post-bg', 'desc' => __('As BG Image, Tile', 'weaver-xtreme' /adm/) ),
611	+ array('val' => 'post-bg-cover', 'desc' => __('As BG Image, Cover', 'weaver-xtreme' /adm/) ),
612	+ array('val' => 'post-bg-parallax', 'desc' => __('As BG Image, Parallax', 'weaver-xtreme' /adm/) ),
613	+ array('val' => 'hide', 'desc' => __('Hide FI for this Post','weaverx-theme-support' /adm/) )
614	+ )
615	+ );
616	+ wvrx_ts_pp_select_id($opts3);
617	+
618	+
619	?>
620	<br style="clear:both;" /><p><strong><?php _e('<em>Single Page View:</em> Featured Image','weaverx-theme-support' /adm/); ?></strong></p>
621	<?php
622	$opts3 = array( 'id' => '_pp_fi_location',
623	'info' => __('Override <em>Single Page</em> setting for where to display FI','weaverx-theme-support' /adm/),
624	'value' => array(
625	+ array('val' => '', 'desc' => __('Default Blog FI','weaverx-theme-support' /adm/) ),
626	array('val' => 'content-top', 'desc' => __('With Content - top','weaverx-theme-support' /adm/) ),
627	array('val' => 'content-bottom', 'desc' => __('With Content - bottom','weaverx-theme-support' /adm/) ),
628	+ array('val' => 'title-before', 'desc' => __('With Title','weaverx-theme-support' /adm/) ),
629	+ array('val' => 'title-banner', 'desc' => __('Banner above Title','weaverx-theme-support' /adm/) ),
630	array('val' => 'header-image', 'desc' => __('Header Image Replacement','weaverx-theme-support' /adm/) ),
631	+ array('val' => 'post-before', 'desc' => __('Beside Page, no wrap', 'weaver-xtreme' /adm/) ),
632	+ array('val' => 'post-bg', 'desc' => __('As BG Image, Tile', 'weaver-xtreme' /adm/) ),
633	+ array('val' => 'post-bg-cover', 'desc' => __('As BG Image, Cover', 'weaver-xtreme' /adm/) ),
634	+ array('val' => 'post-bg-parallax', 'desc' => __('As BG Image, Parallax', 'weaver-xtreme' /adm/) ),
635	+ array('val' => 'hide', 'desc' => __('Hide FI for this Post','weaverx-theme-support' /adm/) )
636	)
637	);
638	wvrx_ts_pp_select_id($opts3);

653	}
654	?>
655	</p>
656	+ <?php
657	+ echo '<div style="clear:both;border:2px solid #aaa;padding:0 1em .5em 1em;">';
658	+ echo('<h3>Weaver Xtreme Plus Per Post Options (&starf;Plus)</h3><strong>Per Post Style</strong>' /a/ );
659	+ weaverx_help_link('help.html#perpoststyle', __('Help for Per Post Style','weaverx-theme-support' /adm/ ));
660	+ echo '<br />' .
661	+ __('Weaver Xtreme Plus supports optional per post CSS style rules.','weaverx-theme-support' /adm/);
662	+ echo '<br />';
663	+
664	+ do_action('wvrx_ts_xp_perpoststyle');
665	+ weaverx_html_br();
666	+
667	+ do_action('weaverxplus_add_per_post');
668	+ echo '</div>';
669	+ ?>
670	<p>
671	<?php echo('<strong>Post Format</strong>');
672	weaverx_help_link('help.html#gallerypost', __('Help for Per Post Format','weaverx-theme-support' /adm/));
673	weaverx_html_br();
674	+ _e('Weaver Xtreme supports Post Formats. Click the ? for more info. Post Formats are set in the "Formats" option box.','weaverx-theme-support' /adm/);

675	weaverx_html_br();
676	+ ?>
677

678	</p>
679	<input type='hidden' id='post_meta' name='post_meta' value='post_meta'/>
680	</div>

688	'_pp_top-widget-area','_pp_bottom-widget-area','_pp_sitewide-top-widget-area', '_pp_sitewide-bottom-widget-area',
689	'_pp_post_type', '_pp_hide_page_title','_pp_hide_site_title','_pp_hide_menus','_pp_hide_header_image',
690	'_pp_hide_footer','_pp_hide_header','_pp_hide_sticky', '_pp_force_post_full','_pp_force_post_excerpt',
691	+ '_pp_show_post_avatar', '_pp_bodyclass', '_pp_fi_link', '_pp_fi_location', '_pp_post_fi_location', '_pp_post_styles',
692	'_pp_hide_top_post_meta','_pp_hide_bottom_post_meta', '_pp_stay_on_page', '_pp_hide_on_menu', '_pp_show_featured_img',
693	'_pp_hide_infotop','_pp_hide_infobottom', '_pp_hide_visual_editor', '_pp_masonry_span2', '_show_post_bubble',
694	'_pp_hide_post_title', '_pp_post_add_link', '_pp_hide_post_format_label', '_pp_page_layout', '_pp_wvrx_pwp_type',

696	'_pp_hide_page_infobar', '_pp_hide_n_posts','_pp_fullposts', '_pp_pwp_masonry','_pp_pwp_compact','_pp_pwp_compact_posts',
697	'_primary-widget-area', '_secondary-widget-area', '_header-widget-area', '_footer-widget-area', '_sitewide-top-widget-area',
698	'_sitewide-bottom-widget-area', '_page-top-widget-area', '_page-bottom-widget-area', '_pp_full_browser_height',
699	+ '_pp_page_cols',
700	+ // Plus options
701	+ '_pp_bgcolor','_pp_color','_pp_bg_fullwidth', '_pp_lr_padding', '_pp_tb_padding', '_pp_margin', '_pp_post_class',
702	+ '_pp_bgimg', '_pp_mobile_bgimg', '_pp_parallax_height', '_pp_use_parallax', '_pp_parallax_not_wide',
703	+ '_pp_footer_add_class', '_pp_container_add_class', '_pp_content_add_class', '_pp_post_add_class',
704	+ '_pp_infobar_add_class', '_pp_wrapper_add_class', '_pp_header_add_class', '_pp_header_image_html_text'
705	);
706
707	if (weaverx_allow_multisite()) {

734
735	add_action("save_post", "wvrx_ts_save_post_fields");
736	add_action("publish_post", "wvrx_ts_save_post_fields");
737	+
738	+ // } end of former XP check
739	+
740	+ // XP
741	+
742	+ if (function_exists('weaverxplus_plugin_installed') ) :
743	+
744	+ add_action('wvrx_ts_xp_perpage_style','wvrx_ts_xp_perpage_style_action');
745	+
746	+ function wvrx_ts_xp_perpage_style_action($raw_template) {
747	+
748	+ global $post;
749	+
750	+
751	+ weaverx_help_link('help.html#perpoststyle', __('Help for Per Page Style','weaver-xtreme-plus' /adm/ ));
752	+ if (!$raw_template) {
753	+ echo '<p><br /><small>' .
754	+ __('Enter optional per page CSS style rules. <strong>Do not</strong> include the <style> and </style> tags.
755	+ Include the complete "selector {}" for each rule you define.
756	+ Custom styles will not be displayed by the Page Editor.
757	+ Example - full width page with centered, indented header, container, and footer:<br />
758	+ <code>#wrapper{max-width:100%;}
759	+ #header{width:80%;margin-left:auto;margin-right:auto;}
760	+ #container{width:80%;margin-left:auto;margin-right:auto;}
761	+ #colophon{width:80%;margin-left:auto;margin-right:auto;}</code>','weaver-xtreme-plus' /adm/);
762	+ } else {
763	+ echo '<p><br /><small>' .
764	+ __('Enter optional per page CSS style rules. <strong>Do not</strong> include the <style> and </style> tags.
765	+ Include the complete "selector {}" for each rule you define. Rules with no selector apply to entire page.
766	+ Custom styles will not be displayed by the Page Editor.'
767	+ ,'weaver-xtreme-plus' /adm/);
768	+ }
769	+ ?>
770	+ <br /><br />
771	+ <textarea class="wvrx-edit" placeholder=" " name="_pp_post_styles" rows=2 style="width: 95%"><?php echo(get_post_meta($post->ID, "_pp_post_styles", true)); ?></textarea>
772	+ </small><br />
773	+ <?php
774	+
775	+ if (!$raw_template) {
776	+ _e('<em>Per Page Area Added Classes</em><br />Add classes to selected wrapping areas for this page only. Useful for full width layouts - e.g. Parallax.','weaver-xtreme-plus' /adm/);
777	+ // 'footer', 'container', 'content', 'post', 'infobar', 'wrapper', 'header' as "_pp_{$area}_add_class"
778	+ $areas = array ('wrapper', 'header', 'infobar', 'container', 'content', 'post', 'footer');
779	+
780	+ $afters = array ('<br />', '<span style="margin-left:4em;"></span>');
781	+ $count = 0;
782	+
783	+ weaverx_html_br();
784	+
785	+ foreach ( $areas as $area ) {
786	+ if ( ($count++) % 2 == 0)
787	+ $after = $afters[1];
788	+ else
789	+ $after = $afters[0];
790	+
791	+ wvrx_ts_xp_text_option( $post->ID, "_pp_{$area}_add_class",
792	+ " <strong>{$area}</strong>", '', $after);
793	+ }
794	+ weaverx_html_br();
795	+
796	+ // Weaver X Plus options for making horizontal bar layouts
797	+ wvrx_ts_page_color('_pp_bgcolor',__('Page BG Color','weaver-xtreme-plus'));
798	+
799	+ echo '<hr /><br style="clear:both;"/><strong>' . __('Header Image Replacement HTML','weaver-xtreme-plus') . '</strong> (&starf;Plus)' /a/ ;
800	+ ?>
801	+ </p><p>
802	+ <?php
803	+ if (version_compare( WEAVER_XPLUS_VERSION, '2.90', '>=')) :
804	+ _e('Replace Header image with arbitrary HTML for this page only. Useful for slider shortcodes in place of image. FI as Header Image has priority over HTML replacement. This will work with [show_slider] or almost any other slider that supports a shortcode.', 'weaver-xtreme' /adm/)
805	+ ?>
806	+ <textarea class="wvrx-edit" placeholder=" " name="_pp_header_image_html_text" rows=1 style="width: 95%"><?php echo(get_post_meta($post->ID, '_pp_header_image_html_text', true)); ?></textarea>
807	+ <?php endif; // new version ?>
808	+ </p>
809	+ <hr />
810	+
811	+ <div style="clear:both"></div>
812	+ <hr />
813	+ <p style="line-height:1.3em;">
814	+ <?php echo('<strong>Per Page Code Insertion</strong>' /a/ );
815	+ weaverx_help_link('help.html#ExtraPP', 'Help for Extra Per Page Options');
816	+ ?>
817	+ Weaver Xtreme Plus supports code and HTML insertion for some areas. To add code, manually define the specified
818	+ <em>Custom Field Name</em> and <em>Value</em>. Click the help ? for more details.
819	+ </p>
820	+
821	+ <?php
822	}
823	+ } // end of action function
824	+
825	+ add_action( 'wvrx_ts_xp_perpoststyle', 'wvrx_ts_xp_perpoststyle_action' );
826	+
827	+ function wvrx_ts_xp_perpoststyle_action() {
828	+ global $post;
829	+
830	+ echo '<br />' .
831	+ __('Enter optional per post CSS style rules. <strong>Do not</strong> include the <style> and </style> tags.
832	+ Include the {}\'s. Don\'t use class names if rules apply to whole post, but do include class names
833	+ (e.g., <em>.entry-title a</em>) for specific elements. Custom styles will not be displayed by the Post Editor.','weaver-xtreme-plus' /adm/); ?>
834	+ <br />
835	+ <textarea placeholder=" " class="wvrx-edit" name="_pp_post_styles" rows=2 style="width: 95%"><?php echo(get_post_meta($post->ID, "_pp_post_styles", true)); ?></textarea>
836	+
837	+ <br /><input type="text" size="24" id="_pp_post_class" name="_pp_post_class"
838	+ value="<?php echo esc_textarea(get_post_meta($post->ID, "_pp_post_class", true)); ?>" />
839	+ <?php _e('Add Classes to this post','weaver-xtreme-plus' /adm/); ?>
840	+ <br />
841	+ <?php
842	+ // Weaver X Plus options for making horizontal bar layouts
843	+ echo '<small>';
844	+ _e('<em>Note:</em> The following options are especially useful for creating full-width stacked posts with different BG colors using the RAW page template and the Weaver Show Posts plugin.', 'weaver-xtreme-plus' /adm/); echo '</small><br />';
845	+ wvrx_ts_page_color('_pp_bgcolor',__('Post BG Color','weaver-xtreme-plus')); echo '<span style="margin-left:40px;"></span>';
846	+ wvrx_ts_page_color('_pp_bg_fullwidth',__('Extend BG color to full theme width on Desktop View','weaver-xtreme-plus' /adm/));
847	+ echo '<br />';
848	+ wvrx_ts_page_color('_pp_color',__('Post Text Color','weaver-xtreme-plus'));
849	+ ?>
850	+ <br />
851	+ <input type="text" size="4" id="_pp_lr_padding" name="_pp_lr_padding"
852	+ value="<?php echo esc_textarea(get_post_meta($post->ID, "_pp_lr_padding", true)); ?>" />
853	+ <?php _e('em  - Left and Right Padding for post','weaver-xtreme-plus' /adm/); ?>
854	+
855	+ <input style="margin-left:3em;" type="text" size="4" id="_pp_tb_padding" name="_pp_tb_padding"
856	+ value="<?php echo esc_textarea(get_post_meta($post->ID, "_pp_tb_padding", true)); ?>" />
857	+ <?php _e('em  - Top and Bottom Padding for post','weaver-xtreme-plus' /adm/); ?>
858	+ <br /><input type="text" size="11" id="_pp_margin" name="_pp_margin"
859	+ value="<?php echo esc_textarea(get_post_meta($post->ID, "_pp_margin", true)); ?>" />
860	+ <?php _e('Margins - Use CSS "margin:t r b l" notation. Recommended 0 for stacked posts.','weaver-xtreme-plus' /adm/); ?>
861	+ <br /><br />
862	+
863	+
864	+ <?php _e('<em><strong>Background Image</strong></em> - Full URL for BG image - add <code>background: position/size repeat origin clip attachment</code> options to Per Post Style above in class-less {} rule. Example: <code>{background-repeat: no-repeat;}</code>','weaver-xtreme-plus' /adm/); ?><br />
865	+ <input type="text" size="70" id='_pp_bgimg' name='_pp_bgimg'
866	+ value="<?php echo esc_textarea(get_post_meta($post->ID, '_pp_bgimg', true)); ?>" />
867	+  : <?php _e('<strong>Desktop BG Image URL</strong>','weaver-xtreme-plus' /adm/); ?><br />
868	+ <input type="text" size="70" id='_pp_mobile_bgimg' name='_pp_mobile_bgimg'
869	+ value="<?php echo esc_textarea(get_post_meta($post->ID, '_pp_mobile_bgimg', true)); ?>" />
870	+  : <?php _e('<strong>Mobile BG Image URL</strong> - optional','weaver-xtreme-plus' /adm/); ?><br />
871	+
872	+ <p><strong><?php _e('<em>Parallax</em> ','weaver-xtreme-plus' /adm/); ?></strong>
873	+ <?php weaverxplus_help_link('plus-help.html#parallax', __('Help for Parallax','weaver-xtreme-plus' /adm/ )); ?><br />
874	+ <?php _e('You can make a set of posts into a great looking Parallax page using a common tag/category,
875	+ custom BG images, and Page with Posts or [show_posts]. Create custom content to be displayed
876	+ over the BG image by creating a Manual Excerpt for this post. Do <em>not</em> specify any background
877	+ CSS options for the Parallax BG image. See Parallax Help!','weaver-xtreme-plus' /adm/) ?>
878	+ <br />
879	+ <?php
880	+ wvrx_ts_page_checkbox('_pp_use_parallax',__('Make this Post a Parallax post','weaver-xtreme-plus' /adm/));
881	+ wvrx_ts_page_checkbox('_pp_parallax_not_wide',__('Do <em>not</em> make BG image full width of enclosing area.','weaver-xtreme-plus' /adm/),'auto',1);
882	+
883	+ ?>
884	+
885	+ <input type="text" size="4" id="_pp_parallax_height" name="_pp_parallax_height"
886	+ value="<?php echo esc_textarea(get_post_meta($post->ID, "_pp_parallax_height", true)); ?>" />
887	+ <?php _e('px  - Specify visible height of Parallax image. (Default:400px)','weaver-xtreme-plus' /adm/); ?>
888	+ </p>
889	+ <?php
890	+
891	+ if (version_compare( WEAVER_XPLUS_VERSION, '2.90', '>=')) :
892	+
893	+ echo '<hr /><br style="clear:both;"/><strong>' . __('Header Image Replacement HTML','weaver-xtreme-plus') . '</strong> (&starf;Plus)' /a/ ;
894	+ ?>
895	+ </p><p>
896	+ <?php
897	+ _e('Replace Header image with arbitrary HTML for this post single page view only. Useful for slider shortcodes in place of image. FI as Header Image has priority over HTML replacement. This will work with [show_slider] or almost any other slider that supports a shortcode.', 'weaver-xtreme' /adm/)
898	+ ?>
899	+ <textarea class="wvrx-edit" placeholder=" " name="_pp_header_image_html_text" rows=1 style="width: 95%"><?php echo(get_post_meta($post->ID, '_pp_header_image_html_text', true)); ?></textarea>
900	+ </p>
901	+ <?php endif; // new version ?>
902	+ <hr />
903	+ <p style="line-height:1.3em;">
904	+ <?php echo('<strong>Per Page Code Insertion for Single Page View</strong>' /a/ );
905	+ weaverx_help_link('help.html#ExtraPP', 'Help for Extra Per Page Options');
906	+ ?>
907	+ Weaver Xtreme Plus supports code and HTML insertion for some areas of the Post Single View page. To add code, manually define the specified
908	+ <em>Custom Field Name</em> and <em>Value</em>. Click the help ? for more details.
909	+ </p>
910	+
911	+ <?php
912	+ }
913	+
914	+
915	+ //-----------------------------------
916	+
917	+
918	+
919	+ // ---- functions for XP only
920	+
921	+ function wvrx_ts_xp_text_option( $postid, $optid, $msg, $before = '', $after = '' ) {
922	+ $val = esc_textarea(get_post_meta($postid, $optid, true));
923	+ echo "{$before}<input type='text' size='20' id='{$optid}' name='{$optid}' value='{$val}' />  {$msg}{$after}";
924	+ }
925	+ endif;
926	+
927	?>

includes/wvrx-ts-runtime-lib.php CHANGED Viewed

@@ -78,9 +78,9 @@ Click the<span style="color:red; vertical-align: middle; margin-left:.25em;" cla
                     <?php wvrx_ts_help_link('help.html#sciframe',__('Help for iframe','weaverx-theme-support' /*adm*/));?><br />
                     <code><?php wvrx_ts_fix_short($prefix, __("[iframe src='//example.com' height=600 percent=100 style='style']",'weaverx-theme-support' /*adm*/)); ?></code>
                 </li>
-            -
            	<li><?php wvrx_ts_fix_short($prefix, __('<span class="wvr-blue">Login - [login]</span> - Show simple Login/Logout link','weaverx-theme-support' /*adm*/)); ?>
                     <?php wvrx_ts_help_link('help.html#sclogin',__('Help for login','weaverx-theme-support' /*adm*/));?><br />
-            -
                    <code><?php wvrx_ts_fix_short($prefix, __("[login]",'weaverx-theme-support' /*adm*/)); ?></code>
                 </li>
                 <li><?php wvrx_ts_fix_short($prefix, __('<span class="wvr-blue">Show If- [show_if]</span> - Show content only if args meet specified conditions','weaverx-theme-support' /*adm*/)); ?>
@@ -126,7 +126,7 @@ Click the<span style="color:red; vertical-align: middle; margin-left:.25em;" cla
             			$button = __("Add 'wvrx_' to shortcode names: [ wvrx_bloginfo ], etc.", 'weaverx-theme-support');
             	?>
             		<div style="clear:both;"></div>
-            -
            			<span class='submit'><input name="toggle_shortcode_prefix" type="submit" value="<?php echo $button; ?>" /></span>
             			<br /><small> <?php _e("To avoid conflicts with other plugins, you can add a 'wvrx_' prefix to these shortcodes.", 'weaver-xtreme /*adm*/'); ?> </small>
             			<?php weaverx_nonce_field('toggle_shortcode_prefix'); ?>
             			</form>
@@ -153,7 +153,7 @@ Click the<span style="color:red; vertical-align: middle; margin-left:.25em;" cla
             	<p> <?php _e("Click the following button to produce a list of links to all pages and posts that have Per Page or Per Post settings.", 'weaver-xtreme /*adm*/'); ?></p>
             	<div style="clear:both;"></div>
             		<form enctype="multipart/form-data" name='toggle_shortcode' action="<?php echo $_SERVER["REQUEST_URI"]; ?>" method='post'>
-            -
                    <span class='submit'><input name="show_per_page_report" type="submit" value="<?php _e('Show Pages and Posts with Per Page/Post Settings', 'weaver-xtreme /*adm*/'); ?>" /></span>
                     <?php weaverx_nonce_field('show_per_page_report'); ?>
             		</form><br /><br />
             <?php } ?>
@@ -161,4 +161,120 @@ Click the<span style="color:red; vertical-align: middle; margin-left:.25em;" cla
             <?php
+            }
             ?>


78	<?php wvrx_ts_help_link('help.html#sciframe',__('Help for iframe','weaverx-theme-support' /adm/));?><br />
79	<code><?php wvrx_ts_fix_short($prefix, __("[iframe src='//example.com' height=600 percent=100 style='style']",'weaverx-theme-support' /adm/)); ?></code>
80	</li>
81	+ <li><?php wvrx_ts_fix_short($prefix, __('<span class="wvr-blue">Login - [login style="CSS Style"]</span> - Show simple Login/Logout link','weaverx-theme-support' /adm/)); ?>
82	<?php wvrx_ts_help_link('help.html#sclogin',__('Help for login','weaverx-theme-support' /adm/));?><br />
83	+ <code><?php wvrx_ts_fix_short($prefix, __("[login style=\"CSS Style\"]",'weaverx-theme-support' /adm/)); ?></code>
84	</li>
85
86	<li><?php wvrx_ts_fix_short($prefix, __('<span class="wvr-blue">Show If- [show_if]</span> - Show content only if args meet specified conditions','weaverx-theme-support' /adm/)); ?>

126	$button = __("Add 'wvrx_' to shortcode names: [ wvrx_bloginfo ], etc.", 'weaverx-theme-support');
127	?>
128	<div style="clear:both;"></div>
129	+ <span class='submit'><input class="button-primary" name="toggle_shortcode_prefix" type="submit" value="<?php echo $button; ?>" /></span>
130	<br /><small> <?php _e("To avoid conflicts with other plugins, you can add a 'wvrx_' prefix to these shortcodes.", 'weaver-xtreme /adm/'); ?> </small>
131	<?php weaverx_nonce_field('toggle_shortcode_prefix'); ?>
132	</form>

153	<p> <?php _e("Click the following button to produce a list of links to all pages and posts that have Per Page or Per Post settings.", 'weaver-xtreme /adm/'); ?></p>
154	<div style="clear:both;"></div>
155	<form enctype="multipart/form-data" name='toggle_shortcode' action="<?php echo $_SERVER["REQUEST_URI"]; ?>" method='post'>
156	+ <span class='submit'><input class="button-primary" name="show_per_page_report" type="submit" value="<?php _e('Show Pages and Posts with Per Page/Post Settings', 'weaver-xtreme /adm/'); ?>" /></span>
157	<?php weaverx_nonce_field('show_per_page_report'); ?>
158	</form><br /><br />
159	<?php } ?>

161
162	<?php
163	}
164	+
165	+ add_action('weaverx_more_help', 'weaverx_ts_more_help');
166	+ function weaverx_ts_more_help() {
167	+ ?>
168	+ <hr />
169	+ <script>jQuery(document).ready(function(){jQuery('#wvrx-sysinfo').click(function(){jQuery('#wvrx-sysinfo').copyme();});
170	+ jQuery('#btn-sysinfo').click(function(){jQuery('#wvrx-sysinfo').copyme();}); });</script>
171	+
172	+ <h3><?php _e('Your System and Configuration Info','weaverx-theme-support' /adm/); ?></h3>
173	+ <?php
174	+ $sys = weaverx_ts_get_sysinfo();
175	+ ?>
176	+ <div style="float:left;max-width:60%;"><textarea id="wvrx-sysinfo" readonly class="wvrx-sysinfo no-autosize" style="font-family:monospace;" rows="12" cols="50"><?php echo $sys;?></textarea></div>
177	+ <div style="margin-left:20px;max-width:40%;float:left;"><?php _e('<p>This information can be used to help us diagnose issues you might be having with Weaver Xtreme.
178	+ If you are asked by a moderator on the <a href="//forum.weavertheme.com" target="_blank">Weaver Xtreme Support Forum</a>, please use the "Copy to Clipboard"
179	+ button and then Paste the Sysinfo report directly into a Forum post.</p>
180	+ <p>Please note that there is no personally identifying data in this report except your site\'s URL. Having your site URL is important to help us
181	+ diagnose the problem, but you can delete it from your forum post right after you paste if you need to.</p>','weaverx-theme-support');?></div>
182	+ <div style="clear:both;margin-bottom:20px;"></div>
183	+
184	+ <button id="btn-sysinfo" class="button-primary">Copy To Clipboard</button>
185	+ <?php
186	+ }
187	+
188	+ function weaverx_ts_get_sysinfo() {
189	+
190	+ global $wpdb;
191	+
192	+ $theme = wp_get_theme()->Name . ' (' . wp_get_theme()->Version .')';
193	+ $frontpage = get_option( 'page_on_front' );
194	+ $frontpost = get_option( 'page_for_posts' );
195	+ $fr_page = $frontpage ? get_the_title( $frontpage ).' (ID# '.$frontpage.')'.'' : 'n/a';
196	+ $fr_post = $frontpage ? get_the_title( $frontpost ).' (ID# '.$frontpost.')'.'' : 'n/a';
197	+ $jquchk = wp_script_is( 'jquery', 'registered' ) ? $GLOBALS['wp_scripts']->registered['jquery']->ver : 'n/a';
198	+
199	+ $return = '### Weaver System Info ###' . "\n\n";
200	+
201	+ // Basic site info
202	+ $return .= ' -- WordPress Configuration --' . "\n\n";
203	+ $return .= 'Site URL: ' . site_url() . "\n";
204	+ $return .= 'Home URL: ' . home_url() . "\n";
205	+ $return .= 'Multisite: ' . ( is_multisite() ? 'Yes' : 'No' ) . "\n";
206	+ $return .= 'Version: ' . get_bloginfo( 'version' ) . "\n";
207	+ $return .= 'Language: ' . get_locale() . "\n";
208	+ //$return .= 'Table Prefix: ' . 'Length: ' . strlen( $wpdb->prefix ) . "\n";
209	+ $return .= 'WP_DEBUG: ' . ( defined( 'WP_DEBUG' ) ? WP_DEBUG ? 'Enabled' : 'Disabled' : 'Not set' ) . "\n";
210	+ $return .= 'WP Memory Limit: ' . WP_MEMORY_LIMIT . "\n";
211	+ $return .= 'Permalink: ' . get_option( 'permalink_structure' ) ."\n";
212	+ $return .= 'Show On Front: ' . get_option( 'show_on_front' ) . "\n";
213	+ $return .= 'Page On Front: ' . $fr_page . "\n";
214	+ $return .= 'Page For Posts: ' . $fr_post . "\n";
215	+ $return .= 'Current Theme: ' . $theme . "\n";
216	+ $return .= 'Post Types: ' . implode( ', ', get_post_types( '', 'names' ) )."\n";
217	+
218	+ // Plugin Configuration
219	+ $return .= "\n" . ' -- Weaver Xtreme Configuration --' . "\n\n";
220	+ $return .= 'Weaver Xtreme Version: ' . WEAVERX_VERSION . "\n";
221	+ $return .= ' Theme Support Version: ' . WVRX_TS_VERSION . "\n";
222	+ if ( defined( 'WEAVER_XPLUS_VERSION' ) )
223	+ $return .= ' Xtreme Plus Version: ' . WEAVER_XPLUS_VERSION . "\n";
224	+
225	+ // Server Configuration
226	+ $return .= "\n" . ' -- Server Configuration --' . "\n\n";
227	+ $return .= 'Operating System: ' . php_uname( 's' ) . "\n";
228	+ $return .= 'PHP Version: ' . PHP_VERSION . "\n";
229	+ $return .= 'MySQL Version: ' . $wpdb->db_version() . "\n";
230	+ $return .= 'jQuery Version: ' . $jquchk . "\n";
231	+
232	+ $return .= 'Server Software: ' . $_SERVER['SERVER_SOFTWARE'] . "\n";
233	+
234	+ // PHP configs... now we're getting to the important stuff
235	+ $return .= "\n" . ' -- PHP Configuration --' . "\n\n";
236	+ //$return .= 'Safe Mode: ' . ( ini_get( 'safe_mode' ) ? 'Enabled' : 'Disabled' . "\n" );
237	+ $return .= 'Local Memory Limit: ' . ini_get( 'memory_limit' ) . "\n";
238	+ $return .= 'Server Memory Limit: ' . get_cfg_var('memory_limit') . "\n";
239	+ $return .= 'Post Max Size: ' . ini_get( 'post_max_size' ) . "\n";
240	+ $return .= 'Upload Max Filesize: ' . ini_get( 'upload_max_filesize' ) . "\n";
241	+ $return .= 'Time Limit: ' . ini_get( 'max_execution_time' ) . "\n";
242	+ $return .= 'Max Input Vars: ' . ini_get( 'max_input_vars' ) . "\n";
243	+ $return .= 'Display Errors: ' . ( ini_get( 'display_errors' ) ? 'On (' . ini_get( 'display_errors' ) . ')' : 'N/A' ) . "\n";
244	+
245	+ // WordPress active plugins
246	+ $return .= "\n" . ' -- WordPress Active Plugins --' . "\n\n";
247	+ $plugins = get_plugins();
248	+ $active_plugins = get_option( 'active_plugins', array() );
249	+ foreach( $plugins as $plugin_path => $plugin ) {
250	+ if( !in_array( $plugin_path, $active_plugins ) )
251	+ continue;
252	+ $return .= $plugin['Name'] . ': ' . $plugin['Version'] . "\n";
253	+ }
254	+
255	+ // WordPress inactive plugins
256	+ $return .= "\n" . ' -- WordPress Inactive Plugins --' . "\n\n";
257	+ foreach( $plugins as $plugin_path => $plugin ) {
258	+ if( in_array( $plugin_path, $active_plugins ) )
259	+ continue;
260	+ $return .= $plugin['Name'] . ': ' . $plugin['Version'] . "\n";
261	+ }
262	+
263	+ if( is_multisite() ) {
264	+ // WordPress Multisite active plugins
265	+ $return .= "\n" . ' -- Network Active Plugins --' . "\n\n";
266	+ $plugins = wp_get_active_network_plugins();
267	+ $active_plugins = get_site_option( 'active_sitewide_plugins', array() );
268	+ foreach( $plugins as $plugin_path ) {
269	+ $plugin_base = plugin_basename( $plugin_path );
270	+ if( !array_key_exists( $plugin_base, $active_plugins ) )
271	+ continue;
272	+ $plugin = get_plugin_data( $plugin_path );
273	+ $return .= $plugin['Name'] . ': ' . $plugin['Version'] . "\n";
274	+ }
275	+ }
276	+
277	+ $return .= "\n" . '### End System Info ###' . "\n";
278	+ return $return;
279	+ }
280	?>

includes/wvrx-ts-shortcodes.php CHANGED Viewed

	@@ -198,7 +198,7 @@ function wvrx_ts_sc_header_image($args = '') {
198	return '';
199	$hdr = str_replace(array('http://', 'https://'),'//', $hdr);
200
201	- $width = weaverx_getopt_default('theme_width_int',~~940~~);
202	$custom_header_sizes = apply_filters( 'weaverx_custom_header_sizes', "(max-width: {$width}px) 100vw, 1920px" );
203
204	$width = $w ? $w : get_custom_header()->width;
	@@ -297,9 +297,13 @@ function wvrx_ts_sc_iframe($args = '') {
297	// =============== [iframe src='address' height=nnn] ======================
298	function wvrx_ts_sc_login($args = '') {
299	extract(shortcode_atts(array(

300	), $args));
301
302	- ~~return~~ ~~'<span~~ ~~class="wvrx-loginout">'~~ ~~. wp_loginout(~~ ''~~, false~~ ) ~~. '</span>';~~



303	}
304
305	// =============== [tab_group ] ======================


198	return '';
199	$hdr = str_replace(array('http://', 'https://'),'//', $hdr);
200
201	+ $width = weaverx_getopt_default('theme_width_int',1100);
202	$custom_header_sizes = apply_filters( 'weaverx_custom_header_sizes', "(max-width: {$width}px) 100vw, 1920px" );
203
204	$width = $w ? $w : get_custom_header()->width;

297	// =============== [iframe src='address' height=nnn] ======================
298	function wvrx_ts_sc_login($args = '') {
299	extract(shortcode_atts(array(
300	+ 'style' => ''
301	), $args));
302
303	+ if ($style != '')
304	+ return '<span class="wvrx-loginout" style="' . esc_attr($style) . '">' . wp_loginout( '', false ) . '</span>';
305	+ else
306	+ return '<span class="wvrx-loginout">' . wp_loginout( '', false ) . '</span>';
307	}
308
309	// =============== [tab_group ] ======================

includes/wvrx-ts-widgets.php CHANGED Viewed

	@@ -5,7 +5,7 @@
5
6	class WeaverX_Widget_Text extends WP_Widget {
7
8	- function ~~WeaverX_Widget_Text~~() {
9	$widget_ops = array('classname' => 'WeaverX_Widget_Text',
10	'description' => __('Text Widget with Two Columns - with HTML and shortcode support. Also adds shortcodes to standard Text widget.','weaverx-theme-support' /adm/));
11	$control_ops = array('width' => 400, 'height' => 350);
	@@ -71,7 +71,7 @@ class WeaverX_Widget_Text extends WP_Widget {
71	*/
72	class WeaverX_Widget_PPText extends WP_Widget {
73
74	- function ~~WeaverX_Widget_PPText~~() {
75	$widget_ops = array('classname' => 'wvrx_widget_pptext', 'description' =>
76	__('Display text on a Per Page basis. Add to Widget area to see instructions.','weaverx-theme-support' /adm/) );
77	parent::__construct('wvrx_pptext', __('Weaver X Per Page Text','weaverx-theme-support' /adm/), $widget_ops);
	@@ -114,7 +114,7 @@ fields are defined when that page is displayed. (This widget won\'t display on t
114	*/
115	class WeaverX_Widget_Login extends WP_Widget {
116
117	- function ~~WeaverX_Widget_Login~~() {
118	$widget_ops = array('classname' => 'wvrx_widget_login', 'description' => __( "Log in/out, admin", 'weaverx-theme-support' /adm/ ) );
119	parent::__construct('wvrx_login', __('Weaver X Login','weaverx-theme-support' /adm/), $widget_ops);
120	}


5
6	class WeaverX_Widget_Text extends WP_Widget {
7
8	+ function __construct() {
9	$widget_ops = array('classname' => 'WeaverX_Widget_Text',
10	'description' => __('Text Widget with Two Columns - with HTML and shortcode support. Also adds shortcodes to standard Text widget.','weaverx-theme-support' /adm/));
11	$control_ops = array('width' => 400, 'height' => 350);

71	*/
72	class WeaverX_Widget_PPText extends WP_Widget {
73
74	+ function __construct() {
75	$widget_ops = array('classname' => 'wvrx_widget_pptext', 'description' =>
76	__('Display text on a Per Page basis. Add to Widget area to see instructions.','weaverx-theme-support' /adm/) );
77	parent::__construct('wvrx_pptext', __('Weaver X Per Page Text','weaverx-theme-support' /adm/), $widget_ops);

114	*/
115	class WeaverX_Widget_Login extends WP_Widget {
116
117	+ function __construct() {
118	$widget_ops = array('classname' => 'wvrx_widget_login', 'description' => __( "Log in/out, admin", 'weaverx-theme-support' /adm/ ) );
119	parent::__construct('wvrx_login', __('Weaver X Login','weaverx-theme-support' /adm/), $widget_ops);
120	}

readme.txt CHANGED Viewed

	@@ -9,8 +9,8 @@ License: GPLv2 or later
9	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.5
13	- Stable tag: 2.~~1.3~~
14
15	A useful shortcode and widget collection for Weaver Xtreme
16
	@@ -75,6 +75,13 @@ 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	= 2.1.3 =
79	* New: Weaver Xtreme now requires WP 4.5 - seriously, you should not run old versions of WP!
80	* Fix: show per post options for custom post types now works correctly


9	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.7
13	+ Stable tag: 3.0
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.0 =
79	+ * New: Weaver Xtreme 3.0 compatibility
80	+ * New: Added style= to [login]
81	+ * Tweak: Minor changes to option order in some tabs
82	+ * Update: update for WP 4.6 compatibility check
83	+ * Fix: PHP 7 compatibility tweaks
84	+
85	= 2.1.3 =
86	* New: Weaver Xtreme now requires WP 4.5 - seriously, you should not run old versions of WP!
87	* Fix: show per post options for custom post types now works correctly

weaverx-ts-admin-style.css CHANGED Viewed

	@@ -1,6 +1,9 @@
1	/* Weaver admin style */

2	.hide_me {display:none;}
3


4	.wvrx_ts_green {font-weight:bold;color:green;}
5	.wvrx_ts_yellow {font-weight:bold;color:orange;}
6	.wvrx_ts_red {font-weight:bold;color:red;}


1	/* Weaver admin style */
2	+
3	.hide_me {display:none;}
4
5	+ textarea.wvrx-edit-dir {direction: ltr !important;}
6	+
7	.wvrx_ts_green {font-weight:bold;color:green;}
8	.wvrx_ts_yellow {font-weight:bold;color:orange;}
9	.wvrx_ts_red {font-weight:bold;color:red;}

weaverx-ts-admin-style.min.css CHANGED Viewed

	@@ -1,4 +1,4 @@
1	- .hide_me{display:none}.wvrx_ts_green{font-weight:bold;color:green}.wvrx_ts_yellow{font-weight:bold;color:orange}.wvrx_ts_red{font-weight:bold;color:red}.wvr-help ul{list-style:disc;margin-left:30px}.wvr-option-section{font-weight:bold;font-size:120%;color:blue}.wvr-wrap{max-width:95%}.tab ul{margin-left:1.15em;list-style:disc outside none}.tab ol{list-style-position:outside;margin-left:1.4em;margin-bottom:.6em}.js_button{background:#eee!important;font-weight:600!important;color:#585858!important}div.yetii{width:95%;margin:0 0 20px 0}ul.yetii{list-style-type:none;width:100%;float:left;border-bottom:4px ridge #ddd;margin-bottom:8px}ul.yetii li{margin:0 2px 0 0;float:left}ul.yetii a{float:left;display:block;padding:4px 8px;border:1px solid #ddd;border-bottom:0;color:#666;background:#eee;text-decoration:none;font-weight:bold}ul.yetii a:hover{background:#fff}ul.yetii a.active{background:#fff;border-color:#00c;color:#00f}div.yetiisub{width:100%;margin:0 0 20px 0}~~ul.yetiisub{list-style-type:none;width:100%;float:left;margin-bottom:8px}~~
2	- ul.yetiisub li{margin:0 2px 2px 0;float:left}ul.yetiisub a{float:left;padding:4px 8px;border:1px solid #ccc;color:#666;background:#f0f0f0;text-decoration:none;font-style:italic;font-weight:bold}ul.yetiisub a:hover{background:#fefefe!important}ul.yetiisub a.active{background:#fff;border-color:#00c;color:#00f}.wvr-small-submit{padding:1.0em 0;margin:1px 0;font-size:90%}.wvr-option-header{background:#d0d0d8;line-height:1.8em;width:95%;color:blue;font-size:large;font-weight:bold;padding-left:4px}.wvr-option-subheader{background:#eaeaea;line-height:1.8em;width:95%;color:blue;font-size:larger;font-weight:bold;padding-left:4px}.wvr-row-header{background:#d0d0d8;line-height:1.8em;padding-left:4px}.wvr-row-subheader{background:#eaeaea;padding-left:4px}.wvr-row-subheader-alt{background:#f4f4f4;padding-left:4px}.l_layout{display:block;width:140px;height:110px;float:left;margin-right:10px;margin-bottom:10px;display:inline;border:1px solid #888;color:black;text-align:center;font:15px arial,sans-serif}
3	.l_layout span{display:block}.l_header{width:140px;height:20px;background:#CCF;line-height:20px}.l_content{width:100px;height:70px;background:beige;float:left;display:inline;line-height:70px}.l_contentcenter{width:60px;height:70px;background:beige;float:left;display:inline;line-height:70px}.l_content2{width:80px;height:70px;background:beige;float:left;display:inline;line-height:70px}.l_contentw{width:140px;height:70px;background:beige;float:left;display:inline;line-height:70px}.l_stdbar{width:40px;height:70px;float:left;display:inline}.l_widebar{width:60px;height:70px;float:left;display:inline}.l_righttop{width:40px;height:20px;background:#FE8;float:left;display:inline;line-height:20px}.l_righttopwide{width:60px;height:20px;background:#FE8;float:left;display:inline;line-height:20px}.l_rightup{width:40px;height:25px;margin:0;background:#FAA;float:left;display:inline;line-height:25px}.l_rightright{width:40px;height:50px;margin:0;background:#FAA;float:left;display:inline;line-height:50px}
4	.l_rightdown{width:40px;height:25px;margin:0;background:#AFA;float:left;display:inline;line-height:25px}.l_leftleft{width:40px;height:70px;margin:0;background:#AFA;float:left;display:inline;line-height:70px}.l_leftshort{width:30px;height:50px;margin:0;background:#AFA;float:left;display:inline;line-height:50px}.l_skinny{width:30px;height:50px;margin:0;background:#FAA;float:left;display:inline;line-height:50px}.l_footer{clear:left;width:140px;height:20px;background:#DDF;color:#000;line-height:20px}


1	+ .hide_me{display:none}textarea.wvrx-edit-dir{direction:ltr!important}.wvrx_ts_green{font-weight:bold;color:green}.wvrx_ts_yellow{font-weight:bold;color:orange}.wvrx_ts_red{font-weight:bold;color:red}.wvr-help ul{list-style:disc;margin-left:30px}.wvr-option-section{font-weight:bold;font-size:120%;color:blue}.wvr-wrap{max-width:95%}.tab ul{margin-left:1.15em;list-style:disc outside none}.tab ol{list-style-position:outside;margin-left:1.4em;margin-bottom:.6em}.js_button{background:#eee!important;font-weight:600!important;color:#585858!important}div.yetii{width:95%;margin:0 0 20px 0}ul.yetii{list-style-type:none;width:100%;float:left;border-bottom:4px ridge #ddd;margin-bottom:8px}ul.yetii li{margin:0 2px 0 0;float:left}ul.yetii a{float:left;display:block;padding:4px 8px;border:1px solid #ddd;border-bottom:0;color:#666;background:#eee;text-decoration:none;font-weight:bold}ul.yetii a:hover{background:#fff}ul.yetii a.active{background:#fff;border-color:#00c;color:#00f}div.yetiisub{width:100%;margin:0 0 20px 0}
2	+ ul.yetiisub{list-style-type:none;width:100%;float:left;margin-bottom:8px}ul.yetiisub li{margin:0 2px 2px 0;float:left}ul.yetiisub a{float:left;padding:4px 8px;border:1px solid #ccc;color:#666;background:#f0f0f0;text-decoration:none;font-style:italic;font-weight:bold}ul.yetiisub a:hover{background:#fefefe!important}ul.yetiisub a.active{background:#fff;border-color:#00c;color:#00f}.wvr-small-submit{padding:1.0em 0;margin:1px 0;font-size:90%}.wvr-option-header{background:#d0d0d8;line-height:1.8em;width:95%;color:blue;font-size:large;font-weight:bold;padding-left:4px}.wvr-option-subheader{background:#eaeaea;line-height:1.8em;width:95%;color:blue;font-size:larger;font-weight:bold;padding-left:4px}.wvr-row-header{background:#d0d0d8;line-height:1.8em;padding-left:4px}.wvr-row-subheader{background:#eaeaea;padding-left:4px}.wvr-row-subheader-alt{background:#f4f4f4;padding-left:4px}.l_layout{display:block;width:140px;height:110px;float:left;margin-right:10px;margin-bottom:10px;display:inline;border:1px solid #888;color:black;text-align:center;font:15px arial,sans-serif}
3	.l_layout span{display:block}.l_header{width:140px;height:20px;background:#CCF;line-height:20px}.l_content{width:100px;height:70px;background:beige;float:left;display:inline;line-height:70px}.l_contentcenter{width:60px;height:70px;background:beige;float:left;display:inline;line-height:70px}.l_content2{width:80px;height:70px;background:beige;float:left;display:inline;line-height:70px}.l_contentw{width:140px;height:70px;background:beige;float:left;display:inline;line-height:70px}.l_stdbar{width:40px;height:70px;float:left;display:inline}.l_widebar{width:60px;height:70px;float:left;display:inline}.l_righttop{width:40px;height:20px;background:#FE8;float:left;display:inline;line-height:20px}.l_righttopwide{width:60px;height:20px;background:#FE8;float:left;display:inline;line-height:20px}.l_rightup{width:40px;height:25px;margin:0;background:#FAA;float:left;display:inline;line-height:25px}.l_rightright{width:40px;height:50px;margin:0;background:#FAA;float:left;display:inline;line-height:50px}
4	.l_rightdown{width:40px;height:25px;margin:0;background:#AFA;float:left;display:inline;line-height:25px}.l_leftleft{width:40px;height:70px;margin:0;background:#AFA;float:left;display:inline;line-height:70px}.l_leftshort{width:30px;height:50px;margin:0;background:#AFA;float:left;display:inline;line-height:50px}.l_skinny{width:30px;height:50px;margin:0;background:#FAA;float:left;display:inline;line-height:50px}.l_footer{clear:left;width:140px;height:20px;background:#DDF;color:#000;line-height:20px}

weaverx-ts.php CHANGED Viewed

	@@ -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: 2.~~1.3~~
9	License: GPL V3
10
11	Weaver Xtreme Theme Support
	@@ -31,12 +31,23 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
31	*/
32	$theme = get_template_directory();
33
34	- if ( ~~strpos(~~ $~~theme, '/weaver-xtreme'~~) ~~!== false \|\| strpos( $theme, '/weaver-foundation') !== false)~~ { ~~// only load if Weaver Xtreme is the theme~~








35
36	- ~~define~~ (~~'WVRX_TS_VERSION'~~,'~~2.1.3~~');


37	define ('WVRX_TS_MINIFY','.min'); // '' for dev, '.min' for production
38	define ('WVRX_TS_APPEARANCE_PAGE', false );
39

40	function wvrx_ts_installed() {
41	return true;
42	}
	@@ -58,6 +69,13 @@ function wvrx_ts_enqueue_scripts() { // action definition
58
59	add_action('wp_enqueue_scripts', 'wvrx_ts_enqueue_scripts' );
60







61	require_once(dirname( __FILE__ ) . '/includes/wvrx-ts-runtime-lib.php'); // NOW - load the basic library
62	require_once(dirname( __FILE__ ) . '/includes/wvrx-ts-widgets.php'); // widgets runtime library
63	require_once(dirname( __FILE__ ) . '/includes/wvrx-ts-shortcodes.php'); // load the shortcode definitions
	@@ -65,8 +83,6 @@ require_once(dirname( __FILE__ ) . '/includes/wvrx-ts-shortcodes.php'); // load
65
66	// load traditional Weaver Xtreme Options
67
68	- if ( strpos( $theme, '/weaver-xtreme') !== false ) { // Weaver Xtreme only
69	-
70	function weaver_xtreme_load_admin_action() {
71	require_once(dirname( __FILE__ ) . '/admin/add-weaverx-sapi-options.php'); // NOW - load the traditional opions admin
72
	@@ -74,13 +90,19 @@ function weaver_xtreme_load_admin_action() {
74
75	add_action('weaver_xtreme_load_admin','weaver_xtreme_load_admin_action');
76
77	- ~~if ( ! function_exists( 'weaverxplus_plugin_installed' ) ) {~~



78
79	add_action('admin_menu', 'wvrx_ts_add_page_fields',11); // allow X-Plus to override us
80
81	function wvrx_ts_add_page_fields() {
82	- ~~add_meta_box~~('~~page-box~~', __('~~Weaver~~ ~~Xtreme Options For This Page~~ (~~Theme~~ ~~Support~~ ~~Per~~ ~~Page~~ Options)','weaverx-theme-support'), ~~'wvrx_ts_page_extras_load',~~ '~~page~~'~~, 'normal', 'high')~~;
83	- add_meta_box('~~post~~-box', __('Weaver Xtreme Options For This ~~Post (Theme Support Per Post Options)~~','weaverx-theme-support'), ~~'wvrx_ts_post_extras_load',~~ ~~'post',~~ ~~'normal'~~, ~~'high');~~



84	global $post;
85	$opts = get_option( apply_filters('weaverx_options','weaverx_settings') , array()); // need to fetch Weaver Xtreme options
86
	@@ -88,7 +110,8 @@ function wvrx_ts_add_page_fields() {
88	$args=array( 'public' => true, '_builtin' => false );
89	$post_types = get_post_types($args,'names','and');
90	foreach ($post_types as $post_type ) {
91	- add_meta_box('post-box' . $i, __('Weaver Xtreme Options For This Post Type ~~(Theme Support Per Post Options)~~','weaverx-theme-support'), ~~'wvrx_ts_post_extras_pt',~~ $~~post_type~~, ~~'normal', 'high');~~

92	$i++;
93	}
94
	@@ -104,7 +127,7 @@ function wvrx_ts_post_extras_load() {
104	wvrx_ts_post_extras();
105	}
106
107	- } // x-plus installed
108
109	// ======================================== subthemes ========================================
110	add_action('weaverx_child_show_extrathemes','wvrx_ts_child_show_extrathemes_action');
	@@ -215,7 +238,6 @@ function wvrx_ts_scan_section($what) {
215	echo '</ul>';
216	}
217
218	- } // end of load for Weaver Xtreme only - not Weaver Foundation
219	} // end only load if Weaver Xtreme installed
220
221	?>


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.0
9	License: GPL V3
10
11	Weaver Xtreme Theme Support

31	*/
32	$theme = get_template_directory();
33
34	+ function wvrx_ts_alert($msg) {
35	+ echo "<script> alert('" . esc_html($msg) . "'); </script>";
36	+ }
37	+
38	+ function wvrx_is_user_logged_in() {
39	+ $user = wp_get_current_user();
40	+
41	+ return $user->exists();
42	+ }
43
44	+ if ( strpos( $theme, '/weaver-xtreme') !== false ) { // only load if Weaver Xtreme is the theme
45	+
46	+ define ('WVRX_TS_VERSION','3.0');
47	define ('WVRX_TS_MINIFY','.min'); // '' for dev, '.min' for production
48	define ('WVRX_TS_APPEARANCE_PAGE', false );
49
50	+
51	function wvrx_ts_installed() {
52	return true;
53	}

69
70	add_action('wp_enqueue_scripts', 'wvrx_ts_enqueue_scripts' );
71
72	+ /* not compatible with pre 2.2 XPlus
73	+ function wvrx_ts_admin_enqueue_scripts() {
74	+ wp_enqueue_script('wvrxtsJSLib', wvrx_ts_plugins_url('/admin/assets/js/jscolor/jscolor','.js'),array('jquery'),WVRX_TS_VERSION,true);
75	+ }
76	+
77	+ add_action( 'admin_enqueue_scripts', 'wvrx_ts_admin_enqueue_scripts' ); */
78	+
79	require_once(dirname( __FILE__ ) . '/includes/wvrx-ts-runtime-lib.php'); // NOW - load the basic library
80	require_once(dirname( __FILE__ ) . '/includes/wvrx-ts-widgets.php'); // widgets runtime library
81	require_once(dirname( __FILE__ ) . '/includes/wvrx-ts-shortcodes.php'); // load the shortcode definitions

83
84	// load traditional Weaver Xtreme Options
85


86	function weaver_xtreme_load_admin_action() {
87	require_once(dirname( __FILE__ ) . '/admin/add-weaverx-sapi-options.php'); // NOW - load the traditional opions admin
88

90
91	add_action('weaver_xtreme_load_admin','weaver_xtreme_load_admin_action');
92
93	+
94	+
95	+ //if (!defined('WEAVER_XPLUS_VERSION') \|\| version_compare( WEAVER_XPLUS_VERSION, '2.90', '>=') ) {
96	+
97
98	add_action('admin_menu', 'wvrx_ts_add_page_fields',11); // allow X-Plus to override us
99
100	function wvrx_ts_add_page_fields() {
101	+ $per_post_label = defined('WEAVER_XPLUS_VERSION') ? __(' (with Weaver Xtreme Plus Options)','weaverx-theme-support') : '';
102	+ add_meta_box('page-box', __('Weaver Xtreme Options For This Page','weaverx-theme-support') . $per_post_label ,
103	+ 'wvrx_ts_page_extras_load', 'page', 'normal', 'high');
104	+ add_meta_box('post-box', __('Weaver Xtreme Options For This Post' . $per_post_label,
105	+ 'weaverx-theme-support'), 'wvrx_ts_post_extras_load', 'post', 'normal', 'high');
106	global $post;
107	$opts = get_option( apply_filters('weaverx_options','weaverx_settings') , array()); // need to fetch Weaver Xtreme options
108

110	$args=array( 'public' => true, '_builtin' => false );
111	$post_types = get_post_types($args,'names','and');
112	foreach ($post_types as $post_type ) {
113	+ add_meta_box('post-box' . $i, __('Weaver Xtreme Options For This Post Type','weaverx-theme-support') . $per_post_label,
114	+ 'wvrx_ts_post_extras_pt', $post_type, 'normal', 'high');
115	$i++;
116	}
117

127	wvrx_ts_post_extras();
128	}
129
130	+ //} // x-plus installed - as of V3, this is no longer needed
131
132	// ======================================== subthemes ========================================
133	add_action('weaverx_child_show_extrathemes','wvrx_ts_child_show_extrathemes_action');

238	echo '</ul>';
239	}
240

241	} // end only load if Weaver Xtreme installed
242
243	?>

Weaver Xtreme Theme Support - Version 3.0

Version Description

Release Info

Code changes from version 2.1.3 to 3.0