WPtouch - Version 4.1.1

Version Description

Release Info

Developer	bravenewcode
Plugin	WPtouch
Version	4.1.1
Comparing to
See all releases

Code changes from version 4.1 to 4.1.1

Files changed (21) hide show

admin/css/wptouch-admin-4.css +3 -0
admin/customizer/wptouch-customizer.css +5 -2
admin/customizer/wptouch-customizer.php +4 -0
admin/images/team.jpg +0 -0
admin/js/wptouch-admin-4.js +52 -43
admin/settings/html/menus_in_menus.php +1 -1
admin/settings/html/theme-browser-item-detail.php +1 -1
core/admin-menu.php +4 -2
core/admin-themes.php +2 -2
core/class-wptouch-pro.php +15 -7
core/globals.php +5 -0
core/theme.php +3 -3
lang/wptouch.pot +79 -67
readme.txt +23 -12
themes/bauhaus/default/functions.php +10 -0
themes/bauhaus/default/header-bottom.php +4 -4
themes/bauhaus/default/style.css +16 -0
themes/bauhaus/readme.txt +5 -1
themes/bauhaus/root-functions.php +16 -1
themes/foundation/modules/custom-latest-posts/custom-latest-posts.php +1 -1
wptouch.php +2 -2

admin/css/wptouch-admin-4.css CHANGED Viewed

	@@ -446,6 +446,9 @@ a#preview-theme {
446
447	#wptouch-admin-menu ul li a.wptouch-addon-amp:before {
448	content: '\e822';



449	}
450
451	/* @end */


446
447	#wptouch-admin-menu ul li a.wptouch-addon-amp:before {
448	content: '\e822';
449	+ display: inline-block;
450	+ text-align: center;
451	+ width: 20px;
452	}
453
454	/* @end */

admin/customizer/wptouch-customizer.css CHANGED Viewed

	@@ -1,4 +1,3 @@
1	-
2	/* WPtouch Customizer Styling */
3
4	a:focus {
	@@ -81,6 +80,7 @@ li#customize-control-blogname, li#customize-control-blogdescription {
81	z-index: 0;
82	top: 50%;
83	margin-top: -340px;

84	}
85
86	#customize-preview iframe {
	@@ -106,6 +106,7 @@ li#customize-control-blogname, li#customize-control-blogdescription {
106	height: 374px;
107	margin-top: -240px;
108	top: 50%;

109	}
110
111	#customize-preview.landscape iframe {
	@@ -121,12 +122,13 @@ li#customize-control-blogname, li#customize-control-blogdescription {
121	#customize-preview.tablet {
122	margin-left: auto;
123	margin-right: auto;
124	- margin-top: -~~570px~~;
125	z-index: 0;
126	width: 800px;
127	-webkit-transform: scale(.8);
128	transform: scale(.8);
129	height: 1150px;

130	}
131
132	#customize-preview.tablet iframe {
	@@ -146,6 +148,7 @@ li#customize-control-blogname, li#customize-control-blogdescription {
146	height: 800px;
147	top: 50%;
148	margin-top: -450px;

149	}
150
151	#customize-preview.tablet.landscape iframe {



1	/* WPtouch Customizer Styling */
2
3	a:focus {

80	z-index: 0;
81	top: 50%;
82	margin-top: -340px;
83	+ background-color: transparent;
84	}
85
86	#customize-preview iframe {

106	height: 374px;
107	margin-top: -240px;
108	top: 50%;
109	+ left: -160px;
110	}
111
112	#customize-preview.landscape iframe {

122	#customize-preview.tablet {
123	margin-left: auto;
124	margin-right: auto;
125	+ margin-top: -500px;
126	z-index: 0;
127	width: 800px;
128	-webkit-transform: scale(.8);
129	transform: scale(.8);
130	height: 1150px;
131	+ left: -180px;
132	}
133
134	#customize-preview.tablet iframe {

148	height: 800px;
149	top: 50%;
150	margin-top: -450px;
151	+ left: -300px;
152	}
153
154	#customize-preview.tablet.landscape iframe {

admin/customizer/wptouch-customizer.php CHANGED Viewed

	@@ -3,6 +3,7 @@ global $wptouch_pro;
3	$current_theme = $wptouch_pro->get_current_theme_info();
4
5	if ( $current_theme && !defined( 'WPTOUCH_IS_FREE' ) ) {

6	add_action( 'admin_init', 'wptouch_initialize_customizer' );
7
8	// Executed during the Customizer parent window load.
	@@ -25,6 +26,9 @@ if ( $current_theme && !defined( 'WPTOUCH_IS_FREE' ) ) {
25
26	// If we're in the customizer and we're editing the mobile theme...
27	if ( wptouch_is_customizing_mobile() ) {



28	add_filter( 'validate_current_theme', 'wptouch_return_false' );
29
30	add_filter( 'wptouch_show_mobile_switch_link', 'wptouch_return_false' );


3	$current_theme = $wptouch_pro->get_current_theme_info();
4
5	if ( $current_theme && !defined( 'WPTOUCH_IS_FREE' ) ) {
6	+
7	add_action( 'admin_init', 'wptouch_initialize_customizer' );
8
9	// Executed during the Customizer parent window load.

26
27	// If we're in the customizer and we're editing the mobile theme...
28	if ( wptouch_is_customizing_mobile() ) {
29	+
30	+ add_filter( 'customize_previewable_devices', '__return_empty_array' );
31	+
32	add_filter( 'validate_current_theme', 'wptouch_return_false' );
33
34	add_filter( 'wptouch_show_mobile_switch_link', 'wptouch_return_false' );

admin/images/team.jpg CHANGED Viewed

Binary file

admin/js/wptouch-admin-4.js CHANGED Viewed

	@@ -600,24 +600,25 @@ function wptouchSetupFreeSettings(){
600	sharingCheckbox.nextAll( 'li' ).hide();
601	}
602	}).change();
603	-
604	// Featured Slider on/off
605	var featuredCheckbox = jQuery( '[id$=featured_enabled]' );

606	featuredCheckbox.on( 'change', 'input', function(){
607	if ( jQuery( this ).is( ':checked' ) ) {
608	- featuredCheckbox.nextAll( 'li' ).show();
609	} else {
610	- featuredCheckbox.nextAll( 'li' ).hide();
611	}
612	}).change();
613	-
614	// Featured slider source select
615	jQuery( '[id$="featured_type"]' ).on( 'change', 'select', function() {
616	var tagSetting = jQuery( '[id$=featured_tag]' );
617	var catSetting = jQuery( '[id$=featured_category]' );
618	var posttySetting = jQuery( '[id$=featured_post_type]' );
619	var postSetting = jQuery( '[id$=featured_post_ids]' );
620	-
621	switch( jQuery( this ).val() ) {
622	case 'tag':
623	tagSetting.show();
	@@ -652,7 +653,7 @@ function wptouchSetupFreeSettings(){
652	break;
653	}
654	}).change();
655	-
656	// Featured Thumbs on/off
657	var featuredThumb = jQuery( '[id$=use_thumbnails]' );
658	featuredThumb.on( 'change', 'select', function(){
	@@ -665,7 +666,7 @@ function wptouchSetupFreeSettings(){
665	default:
666	thumbType.show();
667	break;
668	-
669	}
670	}).change();
671
	@@ -681,26 +682,26 @@ function wptouchSetupFreeSettings(){
681	default:
682	thumbCustomType.hide();
683	break;
684	-
685	}
686	}).change();
687	}
688	}
689
690	function wptouchAdminMutisite(){
691	-
692	jQuery( '#multisite-select-all' ).on( 'click', function( e ){
693	jQuery( '#multisite-deploy-sites input:not(input:disabled)' ).prop( 'checked', 'checked' );
694	e.preventDefault();
695	});
696	-
697	jQuery( '#multisite-select-none' ).on( 'click', function( e ){
698	jQuery( '#multisite-deploy-sites input' ).prop( 'checked', '' );
699	e.preventDefault();
700	});
701	-
702	var deployment_modal = jQuery('[data-remodal-id=modal-deployment]').remodal();
703	-
704	jQuery( '#multisite-deploy' ).on( 'click', function( e ){
705	e.preventDefault();
706
	@@ -712,7 +713,7 @@ function wptouchAdminMutisite(){
712
713	}
714	});
715	-
716	jQuery( '#multisite_deployment_source' ).change( function(){
717	// what's the current selected site?
718	var currentSite = jQuery( this ).val();
	@@ -726,7 +727,7 @@ function wptouchAdminMutisite(){
726	jQuery( '.deploy-to-sites' ).on( 'click', function( e ){
727	jQuery( this ).hide();
728	e.preventDefault();
729	-
730	var sourceSite = jQuery( '#multisite_deployment_source' ).val();
731	var deployGeneral = jQuery( "#multisite_deploy_general_settings" ).is( ":checked" );
732	var deployCompat = jQuery( "#multisite_deploy_site_compat" ).is( ":checked" );
	@@ -737,15 +738,15 @@ function wptouchAdminMutisite(){
737	var deployColors = jQuery( "#multisite_deploy_colors" ).is( ":checked" );
738	var deploySocialMedia = jQuery( "#multisite_deploy_social_media" ).is( ":checked" );
739	var deploySocialSharing = jQuery( "#multisite_deploy_social_sharing" ).is( ":checked" );
740	-
741	var sites = [];
742	-
743	jQuery( '#multisite-deploy-sites input' ).each( function( index, value ) {
744	if ( jQuery( this ).is( ":checked" ) ) {
745	sites.push( jQuery( this ).attr( 'id' ) );
746	}
747	});
748	-
749	var ajaxParams = {
750	source_site: sourceSite,
751	deploy_general: deployGeneral ? '1' : '0',
	@@ -759,9 +760,9 @@ function wptouchAdminMutisite(){
759	deploy_social_sharing: deploySocialSharing ? '1' : '0',
760	deploy_sites: sites
761	};
762	-
763	jQuery( 'p.deploy-text' ).text( jQuery( 'p.deploy-text' ).attr( 'data-deploying-text' ) );
764	-
765	wptouchAdminAjax( 'multisite_deploy', ajaxParams, function( result ) {
766	alert( result );
767	setTimeout( function(){
	@@ -769,7 +770,7 @@ function wptouchAdminMutisite(){
769	.text( jQuery( 'p.deploy-text' ).attr( 'data-completed-text' ) )
770	.prepend( '<i class="icon-ok-circle"></i>' )
771	.append( '<br /><br /><button class="button button-close" data-remodal-action="cancel">Close</button>' );
772	- }, 1000 );
773	});
774	});
775
	@@ -930,32 +931,42 @@ function wptouchAdminDebounce( func, wait, immediate ) {
930	};
931	};
932
933	- ~~var~~ ~~wptouchPreviewWindow;~~

















934
935	// The Preview Pop-Up Window
936	function wptouchPreviewWindow(){
937
938	- ~~var previewEl =~~ jQuery( 'input#wptouch-preview-theme' );
939	-
940	- ~~previewEl.on( 'click', function( e ) {~~
941	- ~~var~~ ~~width =~~ '~~375~~', ~~height~~ ~~= '667'~~;
942	- ~~topPosition = ( screen.height ) ? ( screen.height - height ) / 2:0;~~
943	- ~~leftPosition~~ = ( ~~screen~~.~~width~~ ) ? ( ~~screen~~.~~width~~ - ~~width~~ ) / 2:0;
944	- ~~options = 'scrollbars=no, titlebar=no, status=no, menubar=no'~~;
945	- ~~previewUrl~~ = ~~jQuery( this ).attr( 'data-url' );~~
946	- ~~window.open~~( ~~previewUrl, 'preview', 'width=375, height=667,' + options + ', top=' + topPosition + ',left=' + leftPosition + ''~~ );
947	- ~~wptouchPreviewWindow = window.open( '', 'preview', '' );~~
948	- jQuery.cookie( 'wptouch-preview-window', 'open' );
949	e.preventDefault();
950	});
951	}
952
953	- function wptouchHandlePreviewWindow(){
954	- if ( wptouchPreviewWindow.closed ) {
955	- jQuery.cookie( 'wptouch-preview-window', null );
956	- }
957	- }
958	-
959	function wptouchAdminReady() {
960
961	wptouchDownloadUploadSettings();
	@@ -989,13 +1000,13 @@ function wptouchAdminReady() {
989	wptouchThemesExtensionsPanels();
990
991	wptouchHandleResetSettings();
992	-
993	wptouchAdminMutisite();
994
995	wptouchControlReturn();
996
997	wptouchSetupOldUploaders();
998	-
999	wptouchSetupFreeSettings();
1000
1001	wptouchSetupSettingsToggles();
	@@ -1003,10 +1014,8 @@ function wptouchAdminReady() {
1003	wptouchAdminSetupSave();
1004
1005	wptouchThemesAddonsAjaxInstall();
1006	-
1007	wptouchPreviewWindow();
1008	-
1009	- wptouchHandlePreviewWindow();
1010	}
1011
1012	jQuery( document ).ready( function() {


600	sharingCheckbox.nextAll( 'li' ).hide();
601	}
602	}).change();
603	+
604	// Featured Slider on/off
605	var featuredCheckbox = jQuery( '[id$=featured_enabled]' );
606	+ var ignoreItems = '#setting-featured_tag, #setting-featured_category, #setting-featured_post_ids';
607	featuredCheckbox.on( 'change', 'input', function(){
608	if ( jQuery( this ).is( ':checked' ) ) {
609	+ featuredCheckbox.nextAll( 'li' ).not( ignoreItems ).show();
610	} else {
611	+ featuredCheckbox.nextAll( 'li' ).not( ignoreItems ).hide();
612	}
613	}).change();
614	+
615	// Featured slider source select
616	jQuery( '[id$="featured_type"]' ).on( 'change', 'select', function() {
617	var tagSetting = jQuery( '[id$=featured_tag]' );
618	var catSetting = jQuery( '[id$=featured_category]' );
619	var posttySetting = jQuery( '[id$=featured_post_type]' );
620	var postSetting = jQuery( '[id$=featured_post_ids]' );
621	+
622	switch( jQuery( this ).val() ) {
623	case 'tag':
624	tagSetting.show();

653	break;
654	}
655	}).change();
656	+
657	// Featured Thumbs on/off
658	var featuredThumb = jQuery( '[id$=use_thumbnails]' );
659	featuredThumb.on( 'change', 'select', function(){

666	default:
667	thumbType.show();
668	break;
669	+
670	}
671	}).change();
672

682	default:
683	thumbCustomType.hide();
684	break;
685	+
686	}
687	}).change();
688	}
689	}
690
691	function wptouchAdminMutisite(){
692	+
693	jQuery( '#multisite-select-all' ).on( 'click', function( e ){
694	jQuery( '#multisite-deploy-sites input:not(input:disabled)' ).prop( 'checked', 'checked' );
695	e.preventDefault();
696	});
697	+
698	jQuery( '#multisite-select-none' ).on( 'click', function( e ){
699	jQuery( '#multisite-deploy-sites input' ).prop( 'checked', '' );
700	e.preventDefault();
701	});
702	+
703	var deployment_modal = jQuery('[data-remodal-id=modal-deployment]').remodal();
704	+
705	jQuery( '#multisite-deploy' ).on( 'click', function( e ){
706	e.preventDefault();
707

713
714	}
715	});
716	+
717	jQuery( '#multisite_deployment_source' ).change( function(){
718	// what's the current selected site?
719	var currentSite = jQuery( this ).val();

727	jQuery( '.deploy-to-sites' ).on( 'click', function( e ){
728	jQuery( this ).hide();
729	e.preventDefault();
730	+
731	var sourceSite = jQuery( '#multisite_deployment_source' ).val();
732	var deployGeneral = jQuery( "#multisite_deploy_general_settings" ).is( ":checked" );
733	var deployCompat = jQuery( "#multisite_deploy_site_compat" ).is( ":checked" );

738	var deployColors = jQuery( "#multisite_deploy_colors" ).is( ":checked" );
739	var deploySocialMedia = jQuery( "#multisite_deploy_social_media" ).is( ":checked" );
740	var deploySocialSharing = jQuery( "#multisite_deploy_social_sharing" ).is( ":checked" );
741	+
742	var sites = [];
743	+
744	jQuery( '#multisite-deploy-sites input' ).each( function( index, value ) {
745	if ( jQuery( this ).is( ":checked" ) ) {
746	sites.push( jQuery( this ).attr( 'id' ) );
747	}
748	});
749	+
750	var ajaxParams = {
751	source_site: sourceSite,
752	deploy_general: deployGeneral ? '1' : '0',

760	deploy_social_sharing: deploySocialSharing ? '1' : '0',
761	deploy_sites: sites
762	};
763	+
764	jQuery( 'p.deploy-text' ).text( jQuery( 'p.deploy-text' ).attr( 'data-deploying-text' ) );
765	+
766	wptouchAdminAjax( 'multisite_deploy', ajaxParams, function( result ) {
767	alert( result );
768	setTimeout( function(){

770	.text( jQuery( 'p.deploy-text' ).attr( 'data-completed-text' ) )
771	.prepend( '<i class="icon-ok-circle"></i>' )
772	.append( '<br /><br /><button class="button button-close" data-remodal-action="cancel">Close</button>' );
773	+ }, 1000 );
774	});
775	});
776

931	};
932	};
933
934	+ function showPreviewWindow(){
935	+ var width = '375', height = '667';
936	+ topPosition = ( screen.height ) ? ( screen.height - height ) / 2:0;
937	+ leftPosition = ( screen.width ) ? ( screen.width - width ) / 2:0;
938	+ options = 'scrollbars=no, titlebar=no, status=no, menubar=no';
939	+ previewUrl = jQuery( 'input#wptouch-preview-theme' ).attr( 'data-url' );
940	+ wptouchPreviewWindow = window.open( previewUrl, 'preview', 'width=' + width + ', height=' + height + ',' + options + ', top=' + topPosition + ',left=' + leftPosition + '' );
941	+ }
942	+
943	+ function showCustomizerWindow(){
944	+ var width = '800', height = '500';
945	+ topPosition = ( screen.height ) ? ( screen.height - height ) / 2:0;
946	+ leftPosition = ( screen.width ) ? ( screen.width - width ) / 2:0;
947	+ options = 'scrollbars=no, titlebar=no, status=no, menubar=no';
948	+ windowUrl = 'http://wptouch-pro-4.s3.amazonaws.com/free/free-customizer-promo.html';
949	+ wptouchCustomizerWindow = window.open( windowUrl, 'customizermsg', 'width=' + width + ', height=' + height + ',' + options + ', top=' + topPosition + ',left=' + leftPosition + '' );
950	+ }
951	+
952
953	// The Preview Pop-Up Window
954	function wptouchPreviewWindow(){
955
956	+ jQuery( 'input#wptouch-preview-theme' ).on( 'click', function( e ) {
957	+ var previewCounter = jQuery.cookie( 'wptouch-preview-count' );
958	+ previewCounter++;
959	+ jQuery.cookie( 'wptouch-preview-count', previewCounter );
960	+
961	+ if ( jQuery.cookie( 'wptouch-preview-count' ) == 5 \|\| jQuery.cookie( 'wptouch-preview-count' ) %25 == 0 ) {
962	+ showCustomizerWindow();
963	+ } else {
964	+ showPreviewWindow();
965	+ }

966	e.preventDefault();
967	});
968	}
969






970	function wptouchAdminReady() {
971
972	wptouchDownloadUploadSettings();

1000	wptouchThemesExtensionsPanels();
1001
1002	wptouchHandleResetSettings();
1003	+
1004	wptouchAdminMutisite();
1005
1006	wptouchControlReturn();
1007
1008	wptouchSetupOldUploaders();
1009	+
1010	wptouchSetupFreeSettings();
1011
1012	wptouchSetupSettingsToggles();

1014	wptouchAdminSetupSave();
1015
1016	wptouchThemesAddonsAjaxInstall();
1017	+
1018	wptouchPreviewWindow();


1019	}
1020
1021	jQuery( document ).ready( function() {

admin/settings/html/menus_in_menus.php CHANGED Viewed

	@@ -6,7 +6,7 @@
6
7	<img src="<?php echo WPTOUCH_ADMIN_URL; ?>/images/menu-setup-icon.jpg" alt="menu setup icon with phone and graphic" />
8	<?php
9	- echo '<p>' . sprintf( __( 'These settings are handled in the WordPress %s %sAppearance -> Menus%s settings', 'wptouch-pro' ), '<br />', '<em>', '</em>' ) . '</p>';
10	echo sprintf( __( '%sGo to Menu Settings%s', 'wptouch-pro' ), '<a href="' . admin_url( 'nav-menus.php' ) . '" class="button">', '</a>' );
11	?>
12	</div>


6
7	<img src="<?php echo WPTOUCH_ADMIN_URL; ?>/images/menu-setup-icon.jpg" alt="menu setup icon with phone and graphic" />
8	<?php
9	+ echo '<p>' . sprintf( __( 'These settings are handled in the WordPress %s %sAppearance -> Menus%s Menu Location settings', 'wptouch-pro' ), '<br />', '<em>', '</em>' ) . '</p>';
10	echo sprintf( __( '%sGo to Menu Settings%s', 'wptouch-pro' ), '<a href="' . admin_url( 'nav-menus.php' ) . '" class="button">', '</a>' );
11	?>
12	</div>

admin/settings/html/theme-browser-item-detail.php CHANGED Viewed

	@@ -35,7 +35,7 @@
35	<a class="button" href="<?php echo admin_url( 'customize.php' ); ?>"><?php _e( 'Customize', 'wptouch-pro' ); ?></a>
36	<?php } ?>
37
38	- <?php if ( current_user_can( 'install_plugins' ) && !defined( 'WPTOUCH_IS_FREE' ) ) { ?>
39	<?php if ( wptouch_get_theme_buy_url() ) { ?>
40	<?php if ( !is_multisite() \|\| is_network_admin() ) { ?>
41	<a class="button buynow" href="<?php wptouch_the_theme_buy_url(); ?>">


35	<a class="button" href="<?php echo admin_url( 'customize.php' ); ?>"><?php _e( 'Customize', 'wptouch-pro' ); ?></a>
36	<?php } ?>
37
38	+ <?php if ( ( ( wptouch_is_theme_in_cloud() && current_user_can( 'install_plugins' ) ) \|\| ( !wptouch_is_theme_in_cloud() && current_user_can( 'manage_options' ) ) ) && !defined( 'WPTOUCH_IS_FREE' ) ) { ?>
39	<?php if ( wptouch_get_theme_buy_url() ) { ?>
40	<?php if ( !is_multisite() \|\| is_network_admin() ) { ?>
41	<a class="button buynow" href="<?php wptouch_the_theme_buy_url(); ?>">

core/admin-menu.php CHANGED Viewed

	@@ -89,6 +89,10 @@ function wptouch_admin_get_predefined_menus( $network_admin = false ) {
89	}
90	}
91




92	return apply_filters( 'wptouch_available_menus', $available_menus );
93	}
94
	@@ -108,7 +112,6 @@ function wptouch_admin_get_root_slug( $network_admin = false ) {
108	return $menu[ WPTOUCH_PRO_ADMIN_WIZARD ]->slug;
109	} else {
110	return $menu[ WPTOUCH_PRO_ADMIN_GENERAL_SETTINGS ]->slug;
111	- return $menu[ WPTOUCH_PRO_ADMIN_LICENSE ]->slug;
112	}
113	} else {
114	if ( $show_wizard ) {
	@@ -118,7 +121,6 @@ function wptouch_admin_get_root_slug( $network_admin = false ) {
118	return $menu[ WPTOUCH_PRO_ADMIN_WIZARD ]->slug;
119	}
120	return $menu[ WPTOUCH_PRO_ADMIN_GENERAL_SETTINGS ]->slug;
121	- return $menu[ WPTOUCH_PRO_ADMIN_LICENSE ]->slug;
122	}
123	}
124	}


89	}
90	}
91
92	+ if ( defined( 'WPTOUCH_CLIENT_MODE' ) && WPTOUCH_CLIENT_MODE === true ) {
93	+ unset( $available_menus[ WPTOUCH_PRO_ADMIN_LICENSE ] );
94	+ }
95	+
96	return apply_filters( 'wptouch_available_menus', $available_menus );
97	}
98

112	return $menu[ WPTOUCH_PRO_ADMIN_WIZARD ]->slug;
113	} else {
114	return $menu[ WPTOUCH_PRO_ADMIN_GENERAL_SETTINGS ]->slug;

115	}
116	} else {
117	if ( $show_wizard ) {

121	return $menu[ WPTOUCH_PRO_ADMIN_WIZARD ]->slug;
122	}
123	return $menu[ WPTOUCH_PRO_ADMIN_GENERAL_SETTINGS ]->slug;

124	}
125	}
126	}

core/admin-themes.php CHANGED Viewed

	@@ -75,11 +75,11 @@ function wptouch_get_theme_classes( $extra_classes = array() ) {
75
76	$classes = $extra_classes;
77
78	- if ( !is_network_admin() && wptouch_is_theme_active() ) {
79	$classes[] = 'active';
80	}
81
82	- if ( wptouch_is_theme_in_cloud() ) {
83	$classes[] = 'cloud';
84	}
85


75
76	$classes = $extra_classes;
77
78	+ if ( !is_network_admin() && wptouch_is_theme_active() && !defined( 'WPTOUCH_IS_FREE' ) ) {
79	$classes[] = 'active';
80	}
81
82	+ if ( wptouch_is_theme_in_cloud() \|\| defined( 'WPTOUCH_IS_FREE' ) ) {
83	$classes[] = 'cloud';
84	}
85

core/class-wptouch-pro.php CHANGED Viewed

	@@ -413,16 +413,20 @@ class WPtouchProFour {
413	$content = wptexturize( $content );
414
415	// Enqueue missing scripts
416	- ~~foreach~~ ( $shortcode_data->scripts as $~~script~~ ) {
417	- ~~wp_enqueue_script~~( $~~script~~->~~handle,~~ ~~$script->src,~~ $script~~->deps,~~ ~~$script->ver~~ );
418	- if ( ~~is_array(~~ $script->~~extra~~ ) ~~&& isset(~~ $script->~~extra[~~ ~~'data' ]~~ ) ~~) {~~
419	- ~~wp_scripts~~(~~)->add_data~~( $script->~~handle,~~ ~~'data',~~ $script->extra[ 'data' ] );


420	}
421	}
422
423	// Enqueue missing styles
424	- ~~foreach~~ ( $shortcode_data->~~styles~~ as $~~style~~ ) {
425	- ~~wp_enqueue_style~~( $~~style~~->~~handle,~~ ~~$style->src,~~ $style~~->deps,~~ ~~$style->ver,~~ ~~$style->args );~~


426	}
427	}
428	}
	@@ -444,7 +448,11 @@ class WPtouchProFour {
444	$starting_assets = get_post_meta( $post_id, 'wptouch_sc_' . $type, true );
445	$queued_assets = $source_object->queue;
446	$registered_assets = $source_object->registered;
447	- ~~$missing_assets~~ = ~~array_diff~~( $~~queued_assets, $~~starting_assets );




448
449	$return_array = array();
450


413	$content = wptexturize( $content );
414
415	// Enqueue missing scripts
416	+ if ( isset( $shortcode_data->scripts ) && count( $shortcode_data->scripts ) > 0 ) {
417	+ foreach ( $shortcode_data->scripts as $script ) {
418	+ wp_enqueue_script( $script->handle, $script->src, $script->deps, $script->ver );
419	+ if ( is_array( $script->extra ) && isset( $script->extra[ 'data' ] ) ) {
420	+ wp_scripts()->add_data( $script->handle, 'data', $script->extra[ 'data' ] );
421	+ }
422	}
423	}
424
425	// Enqueue missing styles
426	+ if ( isset( $shortcode_data->scripts ) && count( $shortcode_data->styles ) > 0 ) {
427	+ foreach ( $shortcode_data->styles as $style ) {
428	+ wp_enqueue_style( $style->handle, $style->src, $style->deps, $style->ver, $style->args );
429	+ }
430	}
431	}
432	}

448	$starting_assets = get_post_meta( $post_id, 'wptouch_sc_' . $type, true );
449	$queued_assets = $source_object->queue;
450	$registered_assets = $source_object->registered;
451	+ if ( is_array( $starting_assets ) ) {
452	+ $missing_assets = array_diff( $queued_assets, $starting_assets );
453	+ } else {
454	+ $missing_assets = $queued_assets;
455	+ }
456
457	$return_array = array();
458

core/globals.php CHANGED Viewed

	@@ -370,6 +370,11 @@ function wptouch_get_bloginfo( $setting_name ) {
370	} else {
371	$setting = get_bloginfo( 'home' );
372	}





373	break;
374	default:
375	// proxy other values to the original get_bloginfo function


370	} else {
371	$setting = get_bloginfo( 'home' );
372	}
373	+
374	+ if ( $wptouch_pro->is_previewing_mobile_theme() ) {
375	+ $setting = $setting . '?wptouch_preview_theme=enabled';
376	+ }
377	+
378	break;
379	default:
380	// proxy other values to the original get_bloginfo function

core/theme.php CHANGED Viewed

	@@ -402,9 +402,9 @@ function wptouch_hex_to_luma( $hex ) {
402	$green_hex = substr( $hex, 2, 2 );
403	$blue_hex = substr( $hex, 4, 2);
404	} else {
405	- $red_hex = substr( $hex, 0, 1 ) . '0';
406	- $green_hex = substr( $hex, 1, 1 ) . ~~'0'~~;
407	- $blue_hex = substr( $hex, 2, 1) . ~~'0'~~;
408	}
409
410	$red = wptouch_hex_to_num( $red_hex );


402	$green_hex = substr( $hex, 2, 2 );
403	$blue_hex = substr( $hex, 4, 2);
404	} else {
405	+ $red_hex = substr( $hex, 0, 1 ) . substr( $hex, 0, 1 );
406	+ $green_hex = substr( $hex, 1, 1 ) . substr( $hex, 1, 1 );
407	+ $blue_hex = substr( $hex, 2, 1) . substr( $hex, 2, 1);
408	}
409
410	$red = wptouch_hex_to_num( $red_hex );

lang/wptouch.pot CHANGED Viewed

	@@ -2,9 +2,9 @@
2	# This file is distributed under the same license as the WPtouch Mobile Plugin package.
3	msgid ""
4	msgstr ""
5	- "Project-Id-Version: WPtouch Mobile Plugin 4.1\n"
6	"Report-Msgid-Bugs-To: http://wordpress.org/tag/wptouch\n"
7	- "POT-Creation-Date: 2016-03-29 19:19:14+00:00\n"
8	"MIME-Version: 1.0\n"
9	"Content-Type: text/plain; charset=UTF-8\n"
10	"Content-Transfer-Encoding: 8bit\n"
	@@ -12,15 +12,15 @@ msgstr ""
12	"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
13	"Language-Team: LANGUAGE <LL@li.org>\n"
14
15	- #: admin/customizer/wptouch-customizer.php:~~559~~
16	msgid "Device + Orientation"
17	msgstr ""
18
19	- #: admin/customizer/wptouch-customizer.php:~~584~~
20	msgid "Switch to Mobile Theme"
21	msgstr ""
22
23	- #: admin/customizer/wptouch-customizer.php:~~585~~
24	msgid "Switch to Desktop Theme"
25	msgstr ""
26
	@@ -374,7 +374,7 @@ msgstr ""
374	#: admin/pages/custom/wptouch-admin-wizard.php:179
375	#: admin/settings/html/theme-browser-item-detail.php:52
376	#: admin/settings/html/updates-available.php:35
377	- #: admin/settings/html/updates-available.php:71 core/class-wptouch-pro.php:~~918~~
378	msgid "Download"
379	msgstr ""
380
	@@ -384,7 +384,7 @@ msgstr ""
384	#: admin/settings/html/installed_icon_sets_ajax.php:13
385	#: admin/settings/html/installed_icon_sets_ajax.php:26
386	#: admin/settings/html/theme-browser-item.php:12
387	- #: core/class-wptouch-pro.php:~~917~~
388	msgid "Installed"
389	msgstr ""
390
	@@ -802,7 +802,7 @@ msgstr ""
802
803	#: admin/pages/wptouch-admin-general-settings.php:591
804	#: admin/settings/html/installed_icon_sets_ajax.php:4
805	- #: core/class-wptouch-pro.php:~~2103~~ core/class-wptouch-pro.php:~~2104~~
806	#: core/config.php:54
807	msgid "Custom Icons"
808	msgstr ""
	@@ -909,7 +909,7 @@ msgstr ""
909	msgid "No extensions available"
910	msgstr ""
911
912	- #: admin/settings/html/image-upload.php:7 core/class-wptouch-pro.php:~~910~~
913	msgid "Upload Complete!"
914	msgstr ""
915
	@@ -928,13 +928,13 @@ msgid ""
928	msgstr ""
929
930	#: admin/settings/html/installed_icon_sets_ajax.php:25
931	- #: core/class-wptouch-pro.php:~~916~~
932	msgid "Installing"
933	msgstr ""
934
935	#: admin/settings/html/installed_icon_sets_ajax.php:25
936	#: admin/settings/html/theme-browser-item-detail.php:3
937	- #: core/admin-extensions.php:363 core/class-wptouch-pro.php:~~915~~
938	msgid "Install"
939	msgstr ""
940
	@@ -944,8 +944,8 @@ msgstr ""
944
945	#: admin/settings/html/menus_in_menus.php:9
946	msgid ""
947	- "These settings are handled in the WordPress %s %sAppearance -> Menus%s "
948	- "settings"
949	msgstr ""
950
951	#: admin/settings/html/menus_in_menus.php:10
	@@ -1146,7 +1146,7 @@ msgstr ""
1146	msgid "Setup Wizard"
1147	msgstr ""
1148
1149	- #: core/admin-menu.php:48 core/class-wptouch-pro.php:~~1585~~
1150	msgid "Settings"
1151	msgstr ""
1152
	@@ -1247,131 +1247,131 @@ msgstr ""
1247	msgid "Reset Settings"
1248	msgstr ""
1249
1250	- #: core/class-wptouch-pro.php:~~597~~
1251	msgid ""
1252	"Automatic theme migration from wp-content/uploads/wptouch-data directory "
1253	"failed. Please manually move these folders to wp-content/wptouch-data: %s"
1254	msgstr ""
1255
1256	- #: core/class-wptouch-pro.php:~~616~~
1257	msgid ""
1258	"%sWPtouch: %s was recently disabled, but is still affecting your website and "
1259	"caching pages.%s"
1260	msgstr ""
1261
1262	- #: core/class-wptouch-pro.php:~~617~~
1263	msgid ""
1264	"%sPlease reactivate the plugin, disable page caching, then deactivate the "
1265	"plugin again to correct this issue.%s"
1266	msgstr ""
1267
1268	- #: core/class-wptouch-pro.php:~~618~~ core/class-wptouch-pro.php:~~627~~
1269	msgid ""
1270	"%sFixing this issue prevents cached desktop pages being served to mobile "
1271	"devices and vice-versa.%s"
1272	msgstr ""
1273
1274	- #: core/class-wptouch-pro.php:~~619~~ core/class-wptouch-pro.php:~~628~~
1275	msgid ""
1276	"%sOnce fixed, this message will be dismissed automatically. Until fixed, %"
1277	"sWPtouch will not be shown%s to mobile visitors, and cannot be previewed.%s"
1278	msgstr ""
1279
1280	- #: core/class-wptouch-pro.php:~~626~~
1281	msgid "%sWPtouch: %s needs to be configured to work correctly with WPtouch.%s"
1282	msgstr ""
1283
1284	- #: core/class-wptouch-pro.php:~~629~~
1285	msgid ""
1286	"%sTo fix the issue, follow our %sstep-by-step setup guide%s on support."
1287	"wptouch.com%s"
1288	msgstr ""
1289
1290	- #: core/class-wptouch-pro.php:~~641~~
1291	msgid "WPtouch Repair Required"
1292	msgstr ""
1293
1294	- #: core/class-wptouch-pro.php:~~648~~
1295	msgid "Your mobile theme was either broken or missing."
1296	msgstr ""
1297
1298	- #: core/class-wptouch-pro.php:~~649~~
1299	msgid "We downloaded a fresh copy for you."
1300	msgstr ""
1301
1302	- #: core/class-wptouch-pro.php:~~650~~ core/class-wptouch-pro.php:~~660~~
1303	msgid "OK"
1304	msgstr ""
1305
1306	- #: core/class-wptouch-pro.php:~~653~~
1307	msgid ""
1308	"We were unable to install your WPtouch Pro theme from the Cloud. %s Please "
1309	"visit %sthis article%s for more information."
1310	msgstr ""
1311
1312	- #: core/class-wptouch-pro.php:~~656~~
1313	msgid "WPtouch Server Issue"
1314	msgstr ""
1315
1316	- #: core/class-wptouch-pro.php:~~658~~
1317	msgid ""
1318	"Your server setup is preventing WPtouch Pro from installing from the Cloud. %"
1319	"s Please visit %sthis article%s for more information on how to fix it."
1320	msgstr ""
1321
1322	- #: core/class-wptouch-pro.php:~~905~~
1323	msgid ""
1324	"This will reset all WPtouch Pro settings.\n"
1325	"Are you sure?"
1326	msgstr ""
1327
1328	- #: core/class-wptouch-pro.php:~~906~~
1329	msgid ""
1330	"This will reset all WPtouch Pro settings and delete the wptouch-data "
1331	"folder.\n"
1332	"Are you sure?"
1333	msgstr ""
1334
1335	- #: core/class-wptouch-pro.php:~~907~~
1336	msgid ""
1337	"This will reset all WPtouch Pro settings, delete the wptouch-data folder, "
1338	"and deactivate the plugin. Are you sure?"
1339	msgstr ""
1340
1341	- #: core/class-wptouch-pro.php:~~908~~
1342	msgid "The item failed to download for this reason: %reason%"
1343	msgstr ""
1344
1345	- #: core/class-wptouch-pro.php:~~909~~
1346	msgid "You are about to reset your license information. Proceed?"
1347	msgstr ""
1348
1349	- #: core/class-wptouch-pro.php:~~911~~
1350	msgid "Upload Failed: Not a valid image."
1351	msgstr ""
1352
1353	- #: core/class-wptouch-pro.php:~~912~~
1354	msgid ""
1355	"WPtouch is saving settings. Please do not refresh the page while saving."
1356	msgstr ""
1357
1358	- #: core/class-wptouch-pro.php:~~913~~
1359	msgid "Install Themes"
1360	msgstr ""
1361
1362	- #: core/class-wptouch-pro.php:~~914~~
1363	msgid "Install Extensions"
1364	msgstr ""
1365
1366	- #: core/class-wptouch-pro.php:~~1622~~
1367	msgid "%s Changelog"
1368	msgstr ""
1369
1370	- #: core/class-wptouch-pro.php:~~3030~~
1371	msgid "Directory Problem"
1372	msgstr ""
1373
1374	- #: core/class-wptouch-pro.php:~~3031~~
1375	msgid "One or more required directories could not be created"
1376	msgstr ""
1377
	@@ -1387,7 +1387,7 @@ msgstr ""
1387	msgid "tablet"
1388	msgstr ""
1389
1390	- #: core/globals.php:~~447~~
1391	msgid "Auto-detect"
1392	msgstr ""
1393
	@@ -1802,107 +1802,119 @@ msgstr ""
1802	msgid "desktop"
1803	msgstr ""
1804
1805	- #: themes/bauhaus/root-functions.php:~~118~~
1806	msgid "Header Menu"
1807	msgstr ""
1808
1809	- #: themes/bauhaus/root-functions.php:~~120~~
1810	msgid "Choose a menu"
1811	msgstr ""
1812
1813	- #: themes/bauhaus/root-functions.php:~~121~~
1814	msgid "Main menu selection"
1815	msgstr ""
1816
1817	- #: themes/bauhaus/root-functions.php:~~128~~
1818	msgid "Theme background"
1819	msgstr ""
1820
1821	- #: themes/bauhaus/root-functions.php:~~129~~
1822	msgid "Header & Menu"
1823	msgstr ""
1824
1825	- #: themes/bauhaus/root-functions.php:~~130~~
1826	msgid "Links"
1827	msgstr ""
1828
1829	- #: themes/bauhaus/root-functions.php:~~131~~
1830	msgid "Post/Page Headers"
1831	msgstr ""
1832
1833	- #: themes/bauhaus/root-functions.php:~~224~~
1834	msgid "Menu animation style"
1835	msgstr ""
1836
1837	- #: themes/bauhaus/root-functions.php:~~229~~
1838	msgid "Off-canvas"
1839	msgstr ""
1840
1841	- #: themes/bauhaus/root-functions.php:~~230~~
1842	msgid "Drop-down"
1843	msgstr ""
1844
1845	- #: themes/bauhaus/root-functions.php:~~238~~












1846	msgid "Show search in header"
1847	msgstr ""
1848
1849	- #: themes/bauhaus/root-functions.php:~~255~~
1850	msgid "Post thumbnails"
1851	msgstr ""
1852
1853	- #: themes/bauhaus/root-functions.php:~~260~~
1854	msgid "No thumbnails"
1855	msgstr ""
1856
1857	- #: themes/bauhaus/root-functions.php:~~261~~
1858	msgid "Blog listing only"
1859	msgstr ""
1860
1861	- #: themes/bauhaus/root-functions.php:~~262~~
1862	msgid "Blog listing, single posts"
1863	msgstr ""
1864
1865	- #: themes/bauhaus/root-functions.php:~~263~~
1866	msgid "Blog listing, single posts & pages"
1867	msgstr ""
1868
1869	- #: themes/bauhaus/root-functions.php:~~264~~
1870	msgid "All (blog, single, pages, search & archive)"
1871	msgstr ""
1872
1873	- #: themes/bauhaus/root-functions.php:~~272~~
1874	msgid "Thumbnail Type"
1875	msgstr ""
1876
1877	- #: themes/bauhaus/root-functions.php:~~277~~
1878	msgid "Post featured images"
1879	msgstr ""
1880
1881	- #: themes/bauhaus/root-functions.php:~~278~~
1882	msgid "Post custom field"
1883	msgstr ""
1884
1885	- #: themes/bauhaus/root-functions.php:~~286~~
1886	msgid "Thumbnail custom field name"
1887	msgstr ""
1888
1889	- #: themes/bauhaus/root-functions.php:~~297~~
1890	msgid "Show post categories and tags"
1891	msgstr ""
1892
1893	- #: themes/bauhaus/root-functions.php:~~308~~
1894	msgid "Show post date"
1895	msgstr ""
1896
1897	- #: themes/bauhaus/root-functions.php:~~319~~
1898	msgid "Show post author"
1899	msgstr ""
1900
1901	- #: themes/bauhaus/root-functions.php:~~330~~
1902	msgid "Show comment bubbles on posts"
1903	msgstr ""
1904
1905	- #: themes/bauhaus/root-functions.php:~~341~~
1906	msgid "Use infinite scrolling for blog"
1907	msgstr ""
1908


2	# This file is distributed under the same license as the WPtouch Mobile Plugin package.
3	msgid ""
4	msgstr ""
5	+ "Project-Id-Version: WPtouch Mobile Plugin 4.1.1\n"
6	"Report-Msgid-Bugs-To: http://wordpress.org/tag/wptouch\n"
7	+ "POT-Creation-Date: 2016-04-12 20:01:01+00:00\n"
8	"MIME-Version: 1.0\n"
9	"Content-Type: text/plain; charset=UTF-8\n"
10	"Content-Transfer-Encoding: 8bit\n"

12	"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
13	"Language-Team: LANGUAGE <LL@li.org>\n"
14
15	+ #: admin/customizer/wptouch-customizer.php:563
16	msgid "Device + Orientation"
17	msgstr ""
18
19	+ #: admin/customizer/wptouch-customizer.php:588
20	msgid "Switch to Mobile Theme"
21	msgstr ""
22
23	+ #: admin/customizer/wptouch-customizer.php:589
24	msgid "Switch to Desktop Theme"
25	msgstr ""
26

374	#: admin/pages/custom/wptouch-admin-wizard.php:179
375	#: admin/settings/html/theme-browser-item-detail.php:52
376	#: admin/settings/html/updates-available.php:35
377	+ #: admin/settings/html/updates-available.php:71 core/class-wptouch-pro.php:926
378	msgid "Download"
379	msgstr ""
380

384	#: admin/settings/html/installed_icon_sets_ajax.php:13
385	#: admin/settings/html/installed_icon_sets_ajax.php:26
386	#: admin/settings/html/theme-browser-item.php:12
387	+ #: core/class-wptouch-pro.php:925
388	msgid "Installed"
389	msgstr ""
390

802
803	#: admin/pages/wptouch-admin-general-settings.php:591
804	#: admin/settings/html/installed_icon_sets_ajax.php:4
805	+ #: core/class-wptouch-pro.php:2111 core/class-wptouch-pro.php:2112
806	#: core/config.php:54
807	msgid "Custom Icons"
808	msgstr ""

909	msgid "No extensions available"
910	msgstr ""
911
912	+ #: admin/settings/html/image-upload.php:7 core/class-wptouch-pro.php:918
913	msgid "Upload Complete!"
914	msgstr ""
915

928	msgstr ""
929
930	#: admin/settings/html/installed_icon_sets_ajax.php:25
931	+ #: core/class-wptouch-pro.php:924
932	msgid "Installing"
933	msgstr ""
934
935	#: admin/settings/html/installed_icon_sets_ajax.php:25
936	#: admin/settings/html/theme-browser-item-detail.php:3
937	+ #: core/admin-extensions.php:363 core/class-wptouch-pro.php:923
938	msgid "Install"
939	msgstr ""
940

944
945	#: admin/settings/html/menus_in_menus.php:9
946	msgid ""
947	+ "These settings are handled in the WordPress %s %sAppearance -> Menus%s Menu "
948	+ "Location settings"
949	msgstr ""
950
951	#: admin/settings/html/menus_in_menus.php:10

1146	msgid "Setup Wizard"
1147	msgstr ""
1148
1149	+ #: core/admin-menu.php:48 core/class-wptouch-pro.php:1593
1150	msgid "Settings"
1151	msgstr ""
1152

1247	msgid "Reset Settings"
1248	msgstr ""
1249
1250	+ #: core/class-wptouch-pro.php:605
1251	msgid ""
1252	"Automatic theme migration from wp-content/uploads/wptouch-data directory "
1253	"failed. Please manually move these folders to wp-content/wptouch-data: %s"
1254	msgstr ""
1255
1256	+ #: core/class-wptouch-pro.php:624
1257	msgid ""
1258	"%sWPtouch: %s was recently disabled, but is still affecting your website and "
1259	"caching pages.%s"
1260	msgstr ""
1261
1262	+ #: core/class-wptouch-pro.php:625
1263	msgid ""
1264	"%sPlease reactivate the plugin, disable page caching, then deactivate the "
1265	"plugin again to correct this issue.%s"
1266	msgstr ""
1267
1268	+ #: core/class-wptouch-pro.php:626 core/class-wptouch-pro.php:635
1269	msgid ""
1270	"%sFixing this issue prevents cached desktop pages being served to mobile "
1271	"devices and vice-versa.%s"
1272	msgstr ""
1273
1274	+ #: core/class-wptouch-pro.php:627 core/class-wptouch-pro.php:636
1275	msgid ""
1276	"%sOnce fixed, this message will be dismissed automatically. Until fixed, %"
1277	"sWPtouch will not be shown%s to mobile visitors, and cannot be previewed.%s"
1278	msgstr ""
1279
1280	+ #: core/class-wptouch-pro.php:634
1281	msgid "%sWPtouch: %s needs to be configured to work correctly with WPtouch.%s"
1282	msgstr ""
1283
1284	+ #: core/class-wptouch-pro.php:637
1285	msgid ""
1286	"%sTo fix the issue, follow our %sstep-by-step setup guide%s on support."
1287	"wptouch.com%s"
1288	msgstr ""
1289
1290	+ #: core/class-wptouch-pro.php:649
1291	msgid "WPtouch Repair Required"
1292	msgstr ""
1293
1294	+ #: core/class-wptouch-pro.php:656
1295	msgid "Your mobile theme was either broken or missing."
1296	msgstr ""
1297
1298	+ #: core/class-wptouch-pro.php:657
1299	msgid "We downloaded a fresh copy for you."
1300	msgstr ""
1301
1302	+ #: core/class-wptouch-pro.php:658 core/class-wptouch-pro.php:668
1303	msgid "OK"
1304	msgstr ""
1305
1306	+ #: core/class-wptouch-pro.php:661
1307	msgid ""
1308	"We were unable to install your WPtouch Pro theme from the Cloud. %s Please "
1309	"visit %sthis article%s for more information."
1310	msgstr ""
1311
1312	+ #: core/class-wptouch-pro.php:664
1313	msgid "WPtouch Server Issue"
1314	msgstr ""
1315
1316	+ #: core/class-wptouch-pro.php:666
1317	msgid ""
1318	"Your server setup is preventing WPtouch Pro from installing from the Cloud. %"
1319	"s Please visit %sthis article%s for more information on how to fix it."
1320	msgstr ""
1321
1322	+ #: core/class-wptouch-pro.php:913
1323	msgid ""
1324	"This will reset all WPtouch Pro settings.\n"
1325	"Are you sure?"
1326	msgstr ""
1327
1328	+ #: core/class-wptouch-pro.php:914
1329	msgid ""
1330	"This will reset all WPtouch Pro settings and delete the wptouch-data "
1331	"folder.\n"
1332	"Are you sure?"
1333	msgstr ""
1334
1335	+ #: core/class-wptouch-pro.php:915
1336	msgid ""
1337	"This will reset all WPtouch Pro settings, delete the wptouch-data folder, "
1338	"and deactivate the plugin. Are you sure?"
1339	msgstr ""
1340
1341	+ #: core/class-wptouch-pro.php:916
1342	msgid "The item failed to download for this reason: %reason%"
1343	msgstr ""
1344
1345	+ #: core/class-wptouch-pro.php:917
1346	msgid "You are about to reset your license information. Proceed?"
1347	msgstr ""
1348
1349	+ #: core/class-wptouch-pro.php:919
1350	msgid "Upload Failed: Not a valid image."
1351	msgstr ""
1352
1353	+ #: core/class-wptouch-pro.php:920
1354	msgid ""
1355	"WPtouch is saving settings. Please do not refresh the page while saving."
1356	msgstr ""
1357
1358	+ #: core/class-wptouch-pro.php:921
1359	msgid "Install Themes"
1360	msgstr ""
1361
1362	+ #: core/class-wptouch-pro.php:922
1363	msgid "Install Extensions"
1364	msgstr ""
1365
1366	+ #: core/class-wptouch-pro.php:1630
1367	msgid "%s Changelog"
1368	msgstr ""
1369
1370	+ #: core/class-wptouch-pro.php:3038
1371	msgid "Directory Problem"
1372	msgstr ""
1373
1374	+ #: core/class-wptouch-pro.php:3039
1375	msgid "One or more required directories could not be created"
1376	msgstr ""
1377

1387	msgid "tablet"
1388	msgstr ""
1389
1390	+ #: core/globals.php:452
1391	msgid "Auto-detect"
1392	msgstr ""
1393

1802	msgid "desktop"
1803	msgstr ""
1804
1805	+ #: themes/bauhaus/root-functions.php:119
1806	msgid "Header Menu"
1807	msgstr ""
1808
1809	+ #: themes/bauhaus/root-functions.php:121
1810	msgid "Choose a menu"
1811	msgstr ""
1812
1813	+ #: themes/bauhaus/root-functions.php:122
1814	msgid "Main menu selection"
1815	msgstr ""
1816
1817	+ #: themes/bauhaus/root-functions.php:129
1818	msgid "Theme background"
1819	msgstr ""
1820
1821	+ #: themes/bauhaus/root-functions.php:130
1822	msgid "Header & Menu"
1823	msgstr ""
1824
1825	+ #: themes/bauhaus/root-functions.php:131
1826	msgid "Links"
1827	msgstr ""
1828
1829	+ #: themes/bauhaus/root-functions.php:132
1830	msgid "Post/Page Headers"
1831	msgstr ""
1832
1833	+ #: themes/bauhaus/root-functions.php:225
1834	msgid "Menu animation style"
1835	msgstr ""
1836
1837	+ #: themes/bauhaus/root-functions.php:230
1838	msgid "Off-canvas"
1839	msgstr ""
1840
1841	+ #: themes/bauhaus/root-functions.php:231
1842	msgid "Drop-down"
1843	msgstr ""
1844
1845	+ #: themes/bauhaus/root-functions.php:239
1846	+ msgid "Menu position"
1847	+ msgstr ""
1848	+
1849	+ #: themes/bauhaus/root-functions.php:244
1850	+ msgid "Left side"
1851	+ msgstr ""
1852	+
1853	+ #: themes/bauhaus/root-functions.php:245
1854	+ msgid "Right side"
1855	+ msgstr ""
1856	+
1857	+ #: themes/bauhaus/root-functions.php:253
1858	msgid "Show search in header"
1859	msgstr ""
1860
1861	+ #: themes/bauhaus/root-functions.php:270
1862	msgid "Post thumbnails"
1863	msgstr ""
1864
1865	+ #: themes/bauhaus/root-functions.php:275
1866	msgid "No thumbnails"
1867	msgstr ""
1868
1869	+ #: themes/bauhaus/root-functions.php:276
1870	msgid "Blog listing only"
1871	msgstr ""
1872
1873	+ #: themes/bauhaus/root-functions.php:277
1874	msgid "Blog listing, single posts"
1875	msgstr ""
1876
1877	+ #: themes/bauhaus/root-functions.php:278
1878	msgid "Blog listing, single posts & pages"
1879	msgstr ""
1880
1881	+ #: themes/bauhaus/root-functions.php:279
1882	msgid "All (blog, single, pages, search & archive)"
1883	msgstr ""
1884
1885	+ #: themes/bauhaus/root-functions.php:287
1886	msgid "Thumbnail Type"
1887	msgstr ""
1888
1889	+ #: themes/bauhaus/root-functions.php:292
1890	msgid "Post featured images"
1891	msgstr ""
1892
1893	+ #: themes/bauhaus/root-functions.php:293
1894	msgid "Post custom field"
1895	msgstr ""
1896
1897	+ #: themes/bauhaus/root-functions.php:301
1898	msgid "Thumbnail custom field name"
1899	msgstr ""
1900
1901	+ #: themes/bauhaus/root-functions.php:312
1902	msgid "Show post categories and tags"
1903	msgstr ""
1904
1905	+ #: themes/bauhaus/root-functions.php:323
1906	msgid "Show post date"
1907	msgstr ""
1908
1909	+ #: themes/bauhaus/root-functions.php:334
1910	msgid "Show post author"
1911	msgstr ""
1912
1913	+ #: themes/bauhaus/root-functions.php:345
1914	msgid "Show comment bubbles on posts"
1915	msgstr ""
1916
1917	+ #: themes/bauhaus/root-functions.php:356
1918	msgid "Use infinite scrolling for blog"
1919	msgstr ""
1920

readme.txt CHANGED Viewed

	@@ -1,8 +1,8 @@
1	=== Plugin Name ===
2	Contributors: bravenewcode, duanestorey, dalemugford, mkuplens
3	Tags: wptouch, iphone, ipod, bravenewcode, mobile, mobile-friendly, android, blackberry, smartphone, responsive, design, mobile plugin, ios, mobile theme
4	- Requires at least: 4.0
5	- Stable tag: 4.1
6	Tested up to: 4.5
7	License: GPLv2
8
	@@ -33,35 +33,46 @@ For more information visit [WPtouch.com](http://www.wptouch.com/?utm_campaign=wp
33
34	== Changelog ==
35











36	= Version 4.1 (March 24, 2016) =
37
38	- * ~~New~~: New filters to support AMP extension in WPtouch Pro
39	* Changed: Streamlined wizard experience
40	* Fixed: Case where featured posts would always be repeated in listing if featured slider was set to show only 1 post
41	* Fixed: Error when page was not found
42
43	= Version 4.0.4 (February 29, 2016) =
44
45	- * ~~New~~: Featured slider settings to control display of # of comments
46	- * ~~New~~: Featured slider option for more minimal slider appearance
47	* Changed: Added styling for some rarer html elements, and updated others (ol, code, pre etc.)
48	* Changed: Minor styling enhancements and fixes

49	* Fixed: Load more posts on custom posts page did not load posts in certain configurations
50	* Fixed: Retain WPML language parameter when redirecting to mobile landing page
51	* Fixed: Minor styling issues
52	* Fixed: Toggle fields not saving on some server configurations
53	- * Updated: Opera users agents to better specify supported opera versions and platforms
54
55	= Version 4.0.3 (January 19, 2016) =
56

57	* Fixed: Menu icon selection when using relative-protocol media URLs
58	* Fixed: Black field on blog index when featured slider is disabled.
59	- * Changed: Restored homepage redirect setting - thanks for your feedback!
60
61	= Version 4.0.2 (December 29, 2015) =
62
63	- * Fixed: Custom Latest Posts Page handling
64	* Added: On upgrade, migrate sites using the old "WordPress Pages" menu option to a custom WordPress menu

65
66	= Version 4.0.1 (December 22, 2015) =
67
	@@ -71,10 +82,10 @@ For more information visit [WPtouch.com](http://www.wptouch.com/?utm_campaign=wp
71	= Version 4.0 (December 22, 2015) =
72
73	* A whole new WPtouch that makes getting your WordPress website mobile-friendly easier than ever before
74	- * ~~New~~: Settings panel has been re-written and simplified into a single page, now much faster
75	- * ~~New~~: Settings auto-save— no need to click a settings save button (how 2013 of us)
76	- * ~~New~~: Settings types are easier to control, with toggles and elegant drop-downs to switch settings
77	- * ~~New~~: Added new options and controls (like controlling the devices WPtouch is active for)
78	* Changed: Removed visible but inactive Pro settings
79	* Changed: Simplified a few settings, you'll probably be mad at us but we really want this plugin to be easy to use for everyone!
80	* Changed: Now using the WP color picker


1	=== Plugin Name ===
2	Contributors: bravenewcode, duanestorey, dalemugford, mkuplens
3	Tags: wptouch, iphone, ipod, bravenewcode, mobile, mobile-friendly, android, blackberry, smartphone, responsive, design, mobile plugin, ios, mobile theme
4	+ Requires at least: 4.2
5	+ Stable tag: 4.1.1
6	Tested up to: 4.5
7	License: GPLv2
8

33
34	== Changelog ==
35
36	+ = Version 4.1.1 (April 12, 2016) =
37	+
38	+ * Added: Compatibility with WordPress 4.5
39	+ * Added: Setting to control which side the Bauhaus menu is shown on
40	+ * Changed: Adjusted colour conversion for Luma-based colouring, ensuring true value is used
41	+ * Changed: Re-added 'show login' setting for sites that require users to be registered to comment.
42	+ * Fixed: Bug with custom latest posts page when not set to the same as WordPress homepage
43	+ * Fixed: Search forms now allow searching while in preview mode
44	+ * Fixed: Eliminated PHP warnings
45	+ * Fixed: Display of featured slider settings when slider is first enabled
46	+
47	= Version 4.1 (March 24, 2016) =
48
49	+ * Added: New filters to support AMP extension in WPtouch Pro
50	* Changed: Streamlined wizard experience
51	* Fixed: Case where featured posts would always be repeated in listing if featured slider was set to show only 1 post
52	* Fixed: Error when page was not found
53
54	= Version 4.0.4 (February 29, 2016) =
55
56	+ * Added: Featured slider settings to control display of # of comments
57	+ * Added: Featured slider option for more minimal slider appearance
58	* Changed: Added styling for some rarer html elements, and updated others (ol, code, pre etc.)
59	* Changed: Minor styling enhancements and fixes
60	+ * Updated: Opera users agents to better specify supported opera versions and platforms
61	* Fixed: Load more posts on custom posts page did not load posts in certain configurations
62	* Fixed: Retain WPML language parameter when redirecting to mobile landing page
63	* Fixed: Minor styling issues
64	* Fixed: Toggle fields not saving on some server configurations

65
66	= Version 4.0.3 (January 19, 2016) =
67
68	+ * Changed: Restored homepage redirect setting - thanks for your feedback!
69	* Fixed: Menu icon selection when using relative-protocol media URLs
70	* Fixed: Black field on blog index when featured slider is disabled.

71
72	= Version 4.0.2 (December 29, 2015) =
73

74	* Added: On upgrade, migrate sites using the old "WordPress Pages" menu option to a custom WordPress menu
75	+ * Fixed: Custom Latest Posts Page handling
76
77	= Version 4.0.1 (December 22, 2015) =
78

82	= Version 4.0 (December 22, 2015) =
83
84	* A whole new WPtouch that makes getting your WordPress website mobile-friendly easier than ever before
85	+ * Added: Settings panel has been re-written and simplified into a single page, now much faster
86	+ * Added: Settings auto-save— no need to click a settings save button (how 2013 of us)
87	+ * Added: Settings types are easier to control, with toggles and elegant drop-downs to switch settings
88	+ * Added: Added new options and controls (like controlling the devices WPtouch is active for)
89	* Changed: Removed visible but inactive Pro settings
90	* Changed: Simplified a few settings, you'll probably be mad at us but we really want this plugin to be easy to use for everyone!
91	* Changed: Now using the WP color picker

themes/bauhaus/default/functions.php CHANGED Viewed

@@ -80,4 +80,14 @@ function bauhaus_should_show_comment_bubbles(){
             	} else {
             		return false;
+            	}
+            }


80	} else {
81	return false;
82	}
83	+ }
84	+
85	+ function bauhaus_is_menu_position_default(){
86	+ $settings = bauhaus_get_settings();
87	+
88	+ if ( $settings->bauhaus_menu_position == 'left-side' ) {
89	+ return true;
90	+ } else {
91	+ return false;
92	+ }
93	}

themes/bauhaus/default/header-bottom.php CHANGED Viewed

	@@ -1,8 +1,8 @@
1	- <div class="pushit pushit-left">
2	<div id="menu" class="wptouch-menu show-hide-menu">
3	<?php if ( wptouch_has_menu( 'primary_menu' ) ) { wptouch_show_menu( 'primary_menu' ); } ?>
4
5	- <?php if ( wptouch_fdn_show_login() ) { ?>
6	<ul class="menu-tree login-link">
7	<li>
8	<?php if ( !is_user_logged_in() ) { ?>
	@@ -28,7 +28,7 @@
28
29	<header id="header-title-logo">
30	<?php if ( bauhaus_should_show_search() ) { ?>
31	- <div id="search-toggle" class="search-toggle tappable" role="button"><!--icon-search--></div>
32	<?php } ?>
33	<a href="<?php wptouch_bloginfo( 'url' ); ?>" class="header-center tappable">
34	<?php if ( foundation_has_logo_image() ) { ?>
	@@ -37,7 +37,7 @@
37	<h1 class="heading-font"><?php wptouch_bloginfo( 'site_title' ); ?></h1>
38	<?php } ?>
39	</a>
40	- <div id="menu-toggle" class="menu-btn tappable show-hide-toggle" data-effect-target="menu" data-menu-target="menu" role="button"><!--icon-reorder--></div>
41	</header>
42
43	<?php if ( bauhaus_should_show_search() ) { ?>


1	+ <div class="pushit <?php if ( bauhaus_is_menu_position_default() ) { echo 'pushit-left'; } else { echo 'pushit-right'; } ?>">
2	<div id="menu" class="wptouch-menu show-hide-menu">
3	<?php if ( wptouch_has_menu( 'primary_menu' ) ) { wptouch_show_menu( 'primary_menu' ); } ?>
4
5	+ <?php if ( function_exists( 'wptouch_fdn_show_login' ) && wptouch_fdn_show_login() ) { ?>
6	<ul class="menu-tree login-link">
7	<li>
8	<?php if ( !is_user_logged_in() ) { ?>

28
29	<header id="header-title-logo">
30	<?php if ( bauhaus_should_show_search() ) { ?>
31	+ <div id="search-toggle" class="search-toggle tappable <?php if ( bauhaus_is_menu_position_default() ) { echo 'search-right'; } else { echo 'search-left'; } ?>" role="button"><!--icon-search--></div>
32	<?php } ?>
33	<a href="<?php wptouch_bloginfo( 'url' ); ?>" class="header-center tappable">
34	<?php if ( foundation_has_logo_image() ) { ?>

37	<h1 class="heading-font"><?php wptouch_bloginfo( 'site_title' ); ?></h1>
38	<?php } ?>
39	</a>
40	+ <div id="menu-toggle" class="menu-btn tappable show-hide-toggle <?php if ( bauhaus_is_menu_position_default() ) { echo 'menu-left'; } else { echo 'menu-right'; } ?>" data-effect-target="menu" data-menu-target="menu" role="button"><!--icon-reorder--></div>
41	</header>
42
43	<?php if ( bauhaus_should_show_search() ) { ?>

themes/bauhaus/default/style.css CHANGED Viewed

	@@ -76,6 +76,14 @@ header img {
76	position: absolute;
77	bottom: 0;
78	left: 0;








79	}
80
81	#menu-toggle:after {
	@@ -88,6 +96,14 @@ header img {
88	#search-toggle {
89	position: absolute;
90	bottom: 0;








91	right: 0;
92	}
93


76	position: absolute;
77	bottom: 0;
78	left: 0;
79	+ right: auto;
80	+ }
81	+
82	+ #menu-toggle.menu-right {
83	+ position: absolute;
84	+ bottom: 0;
85	+ left: auto;
86	+ right: 0;
87	}
88
89	#menu-toggle:after {

96	#search-toggle {
97	position: absolute;
98	bottom: 0;
99	+ left: 0;
100	+ right: auto;
101	+ }
102	+
103	+ #search-toggle.search-right {
104	+ position: absolute;
105	+ bottom: 0;
106	+ left: auto;
107	right: 0;
108	}
109

themes/bauhaus/readme.txt CHANGED Viewed

	@@ -2,7 +2,7 @@ Theme Name: Bauhaus
2	Theme URI: http://www.wptouch.com/themes/bauhaus
3	Author: BraveNewCode Inc.
4	Description: Clean, modern, functional design. Great for all types of WordPress sites.
5	- Version: 1.6.4
6	Depends on: 4.0
7	Framework: 2.0
8	Tags: smartphone
	@@ -23,6 +23,10 @@ Bauhaus is one of our more flexible themes, and is designed to easily take on th
23
24	== Changelog ==
25




26	= Version 1.6.4 =
27
28	* Added: Support for the new AMP extension


2	Theme URI: http://www.wptouch.com/themes/bauhaus
3	Author: BraveNewCode Inc.
4	Description: Clean, modern, functional design. Great for all types of WordPress sites.
5	+ Version: 1.6.5
6	Depends on: 4.0
7	Framework: 2.0
8	Tags: smartphone

23
24	== Changelog ==
25
26	+ = Version 1.6.5 =
27	+
28	+ * Added: New menu position setting to control which side the menu is on (and consequently the search icon flips over as well)
29	+
30	= Version 1.6.4 =
31
32	* Added: Support for the new AMP extension

themes/bauhaus/root-functions.php CHANGED Viewed

	@@ -1,6 +1,6 @@
1	<?php
2
3	- define( 'BAUHAUS_THEME_VERSION', '1.6.4' );
4	define( 'BAUHAUS_SETTING_DOMAIN', 'bauhaus' );
5	define( 'BAUHAUS_DIR', wptouch_get_bloginfo( 'theme_root_directory' ) );
6	define( 'BAUHAUS_URL', wptouch_get_bloginfo( 'theme_parent_url' ) );
	@@ -53,6 +53,7 @@ function bauhaus_setting_defaults( $settings ) {
53
54	// Bauhaus menu default
55	$settings->bauhaus_menu_style = 'off-canvas';

56
57
58	// Theme colors
	@@ -232,6 +233,20 @@ function bauhaus_header_settings( $header_settings ) {
232	BAUHAUS_SETTING_DOMAIN
233	);
234














235	$header_settings[] = wptouch_add_setting(
236	'checkbox',
237	'bauhaus_show_search',


1	<?php
2
3	+ define( 'BAUHAUS_THEME_VERSION', '1.6.5' );
4	define( 'BAUHAUS_SETTING_DOMAIN', 'bauhaus' );
5	define( 'BAUHAUS_DIR', wptouch_get_bloginfo( 'theme_root_directory' ) );
6	define( 'BAUHAUS_URL', wptouch_get_bloginfo( 'theme_parent_url' ) );

53
54	// Bauhaus menu default
55	$settings->bauhaus_menu_style = 'off-canvas';
56	+ $settings->bauhaus_menu_position = 'left-side';
57
58
59	// Theme colors

233	BAUHAUS_SETTING_DOMAIN
234	);
235
236	+ $header_settings[] = wptouch_add_setting(
237	+ 'list',
238	+ 'bauhaus_menu_position',
239	+ __( 'Menu position', 'wptouch-pro' ),
240	+ false,
241	+ WPTOUCH_SETTING_BASIC,
242	+ '1.6.4',
243	+ array(
244	+ 'left-side' => __( 'Left side', 'wptouch-pro' ),
245	+ 'right-side' => __( 'Right side', 'wptouch-pro' )
246	+ ),
247	+ BAUHAUS_SETTING_DOMAIN
248	+ );
249	+
250	$header_settings[] = wptouch_add_setting(
251	'checkbox',
252	'bauhaus_show_search',

themes/foundation/modules/custom-latest-posts/custom-latest-posts.php CHANGED Viewed

	@@ -11,7 +11,7 @@ function wptouch_custom_latest_post_filter( $query_vars ) {
11	$dummy_query = new WP_Query(); // the query isn't run if we don't pass any query vars
12	$dummy_query->parse_query( $query_vars );
13
14	- if ( $dummy_query->is_page && ( count( $query_vars ) == 0 \|\| ( count( $query_vars == 1 ) && isset( $query_vars[ 'paged' ] ) ) ) ) { // Front page
15	$front_option = get_option( 'show_on_front', false );
16	if ( $front_option == 'page' ) {
17	$front_page = get_option( 'page_on_front' );


11	$dummy_query = new WP_Query(); // the query isn't run if we don't pass any query vars
12	$dummy_query->parse_query( $query_vars );
13
14	+ if ( $dummy_query->is_page && ( count( $query_vars ) == 0 \|\| ( count( $query_vars ) == 1 && isset( $query_vars[ 'paged' ] ) ) ) ) { // Front page
15	$front_option = get_option( 'show_on_front', false );
16	if ( $front_option == 'page' ) {
17	$front_page = get_option( 'page_on_front' );

wptouch.php CHANGED Viewed

	@@ -2,7 +2,7 @@
2	/*
3	Plugin Name: WPtouch Mobile Plugin
4	Plugin URI: http://www.wptouch.com/
5	- Version: 4.1
6	Description: Make a beautiful mobile-friendly version of your website with just a few clicks
7	Author: BraveNewCode Inc.
8	Author URI: http://www.bravenewcode.com/
	@@ -14,7 +14,7 @@
14
15	function wptouch_create_four_object() {
16	if ( !defined( 'WPTOUCH_IS_PRO' ) ) {
17	- define( 'WPTOUCH_VERSION', '4.1' );
18
19	define( 'WPTOUCH_BASE_NAME', basename( __FILE__, '.php' ) . '.php' );
20	define( 'WPTOUCH_DIR', WP_PLUGIN_DIR . DIRECTORY_SEPARATOR . basename( __FILE__, '.php' ) );


2	/*
3	Plugin Name: WPtouch Mobile Plugin
4	Plugin URI: http://www.wptouch.com/
5	+ Version: 4.1.1
6	Description: Make a beautiful mobile-friendly version of your website with just a few clicks
7	Author: BraveNewCode Inc.
8	Author URI: http://www.bravenewcode.com/

14
15	function wptouch_create_four_object() {
16	if ( !defined( 'WPTOUCH_IS_PRO' ) ) {
17	+ define( 'WPTOUCH_VERSION', '4.1.1' );
18
19	define( 'WPTOUCH_BASE_NAME', basename( __FILE__, '.php' ) . '.php' );
20	define( 'WPTOUCH_DIR', WP_PLUGIN_DIR . DIRECTORY_SEPARATOR . basename( __FILE__, '.php' ) );