Permalink
Browse files

adding wptouch 1.9.40

  • Loading branch information...
1 parent 702119e commit ad12f23f2fe2f4439772dfd15872d3b1f077af5b @mospaw mospaw committed May 23, 2012
View
@@ -1,5 +1,3 @@
-/* @override http://beta.bravenewcode.com/wordpress/wp-content/plugins/wptouch/admin-css/bnc-global.css */
-
/* Global styles applied to BraveNewCode plugins */
/* @group Global Plugin Styles */
@@ -99,14 +97,14 @@
margin-right: 5px;
}
-#bnc-global input.checkbox {
+#bnc-global .right-content input.checkbox {
margin-right: 5px;
vertical-align: middle;
width: auto;
border-style: none;
}
-#bnc-global input {
+#bnc-global .right-content input {
-webkit-border-radius: 3px;
-moz-border-radius: 3px;
margin-right: 7px;
@@ -115,7 +113,7 @@
margin-left: 5px;
}
-#bnc-global input:focus {
+#bnc-global .right-content input:focus {
background-color: #fff;
}
@@ -180,27 +178,16 @@
/* @end */
-/* @group Save/Restore Button Area */
-
-#bnc-global input#bnc-button {
- color: #fff;
-}
+/* @group Save/Reset */
-#bnc-global input#bnc-button, #bnc-global input#bnc-button-reset {
- border: 2px solid #b2cfe4;
+input#bnc-button {
float: left;
- width: 12%;
- padding: 4px;
+ margin-right: 10px;
}
-#bnc-global input#bnc-button-reset:hover {
- border-color: red;
- color: red;
+input#bnc-button-reset {
}
-#bnc-global input#bnc-button:hover {
- border: 2px solid #305769;
- color: #cdebfd;
-}
+
/* @end */
@@ -1,9 +1,4 @@
-/* WPtouch 1.9 Admin CSS */
-
-.left-content p {
- color: #777;
- line-height: 1.4em;
-}
+/* WPtouch 1.9.x Admin CSS */
/* @group head-area.php */
@@ -39,14 +34,13 @@
#wptouch-head-links {
float: right;
position: relative;
- bottom: 6px;
+ bottom: 4px;
}
#wptouch-head-links a {
color: #62727c;
- font-weight: normal;
+ font-weight: bold;
text-shadow: rgba(255,255,255,.5) 0 1px 0;
- font-style: normal;
padding-right: 5px;
padding-left: 5px;
}
@@ -542,6 +536,11 @@ textarea#wptouch-stats {
/* @group New Styling */
+#bnc-global .left-content p {
+ color: #777;
+ line-height: 1.4em;
+}
+
#bnc-global .new-styles .right-content {
padding-bottom: 25px;
margin-top: 20px;
View
@@ -13,8 +13,7 @@
<ul class="wptouch-make-li-italic">
<li>
<select name="ad_service" id="ad_service">
- <option value="none"<?php if ( $wptouch_settings['ad_service'] == 'none') echo " selected"; ?>><?php _e( "None", "wptouch" ); ?></option>
- <option value="appstores"<?php if ( $wptouch_settings['ad_service'] == 'appstores') echo " selected"; ?>><?php _e( "Appstores", "wptouch" ); ?></option>
+ <option value="none"<?php if ( $wptouch_settings['ad_service'] == 'none') echo " selected"; ?>><?php _e( "None", "wptouch" ); ?></option>
<option value="adsense"<?php if ( $wptouch_settings['ad_service'] == 'adsense') echo " selected"; ?>><?php _e( "Google Adsense", "wptouch" ); ?></option>
</select>
@@ -23,35 +22,7 @@
</ul>
</div>
<div class="bnc-clearer"></div>
- </div>
-
- <div id="appstores">
- <div class="left-content">
- <h4><?php _e( 'Appstores App Ads', 'wptouch' ); ?></h4>
- <p>Monetizing your mobile traffic is easy using Appstores App Ads. By recommending apps that are relevant to your audience you make money when your users click and install apps.</p>
- <p><a href="http://www.bravenewcode.com/appstores"><?php _e( "Sign up now", "wptouch" ); ?> &rarr;</a></p>
- <br />
- <p><?php _e( "Enter your AppStores ID if you'd like use it to add support for mobile advertising in WPtouch posts.", "wptouch" ); ?></p>
- </div>
-
- <div class="right-content">
- <ul class="wptouch-make-li-italic">
- <li><input name="appstores_pub_id" type="text" value="<?php echo $wptouch_settings['appstores_pub_id']; ?>" /><?php _e( "Appstore Publisher ID", "wptouch" ); ?></li>
- <li>
- <select name="appstores_ad_pages" id="appstores_ad_pages">
- <option value="blog"<?php if ( $wptouch_settings['appstores_ad_pages'] == 'blog') echo " selected"; ?>><?php _e( "Blog Only", "wptouch" ); ?></option>
- <option value="single"<?php if ( $wptouch_settings['appstores_ad_pages'] == 'single') echo " selected"; ?>><?php _e( "Posts Only", "wptouch" ); ?></option>
- <option value="single_blog"<?php if ( $wptouch_settings['appstores_ad_pages'] == 'single_blog') echo " selected"; ?>><?php _e( "Posts + Blog", "wptouch" ); ?></option>
- <option value="single_page_blog"<?php if ( $wptouch_settings['appstores_ad_pages'] == 'single_page_blog') echo " selected"; ?>><?php _e( "Posts + Pages + Blog", "wptouch" ); ?></option>
-
-
- </select>
- <?php _e( 'Ad location', 'wptouch' ); ?>
- </li>
- </ul>
- </div>
- <div class="bnc-clearer"></div>
- </div>
+ </div>
<div id="google-adsense">
<div class="left-content">
@@ -12,6 +12,8 @@
<h4><?php _e( "Home Page Re-Direction", "wptouch" ); ?></h4>
<p><?php echo sprintf( __( "WPtouch by default follows your %sWordPress &raquo; Reading Options%s.", "wptouch"), '<a href="options-reading.php">', '</a>' ); ?></p>
+ <br /><br />
+
<h4><?php _e( "Site Title", "wptouch" ); ?></h4>
<p><?php _e( "You can change your site title (if needed) in WPtouch.", "wptouch" ); ?></p>
@@ -34,7 +36,7 @@
<p><?php _e( "Choose between calendar Icons, post thumbnails (WP 2.9) or none for your post listings.", "wptouch" ); ?></p>
<p><?php _e( "Select which meta items are shown below titles on main, search, &amp; archives pages.", "wptouch" ); ?></p>
- <br /><br />
+ <br /><br /><br /><br /><br /><br /><br /><br /><br />
<h4><?php _e( "Footer Message", "wptouch" ); ?></h4>
<p><?php _e( "Customize the default footer message shown in WPtouch here.", "wptouch" ); ?></p>
View
@@ -12,7 +12,8 @@
<ul>
<li><?php echo sprintf(__( "%sGet WPtouch Pro%s", "wptouch" ), '<a href="http://www.bravenewcode.com/store/plugins/wptouch-pro/?utm_source=wptouch&amp;utm_medium=web&amp;utm_campaign=top-' . str_replace( '.', '', $bnc_wptouch_version ) . '" target="_blank">','</a>'); ?> | </li>
<li><?php echo sprintf(__( "%sJoin our FREE Affiliate Program%s", "wptouch" ), '<a href="http://www.bravenewcode.com/affiliate-program/" target="_blank">','</a>'); ?></li> |
- <li><?php echo sprintf(__( "%sFollow Us on Twitter%s", "wordtwit" ), '<a href="http://www.twitter.com/bravenewcode" target="_blank">','</a>'); ?></li>
+ <li><?php echo sprintf(__( "%sFollow Us on Twitter%s", "wordtwit" ), '<a href="http://www.twitter.com/bravenewcode" target="_blank">','</a>'); ?></li> |
+ <li><?php echo sprintf(__( "%sFind Us on Facebook%s", "wordtwit" ), '<a href="http://www.facebook.com/bravenewcode" target="_blank">','</a>'); ?></li>
</ul>
</div>
<div class="bnc-clearer"></div>
@@ -14,7 +14,7 @@
echo '' . get_bloginfo('version') . '';
echo '</p><p class="wptv">';
echo sprintf( __( 'WPtouch %s support: ', 'wptouch' ), $bnc_wptouch_version );
- if ($version > 3.3) {
+ if ($version > 3.4) {
echo sprintf(__( "%sUnverified%s", "wptouch" ), '<span class="caution">','</span>');
} else if ($version >= 2.9) {
echo sprintf(__( "%sSupported.%s", "wptouch" ), '<span class="go">','</span>');
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
@@ -257,18 +257,6 @@
} else {
$a['ad_service'] = 'none';
}
-
- if ( isset( $_POST['appstores_pub_id'] ) ) {
- $a['appstores_pub_id'] = $_POST['appstores_pub_id'];
- } else {
- $a['appstores_pub_id'] = '';
- }
-
- if ( isset( $_POST['appstores_ad_pages'] ) ) {
- $a['appstores_ad_pages'] = $_POST['appstores_ad_pages'];
- } else {
- $a['appstores_ad_pages'] = '';
- }
foreach ($_POST as $k => $v) {
if ($k == 'enable_main_title') {
View
@@ -67,12 +67,7 @@ function wptouchHandleAdvertising() {
var selectValue = wpQuery( '#ad_service' ).attr( 'value' );
if ( selectValue == 'none' ) {
wpQuery( '#google-adsense' ).hide();
- wpQuery( '#appstores' ).hide();
} else if ( selectValue == 'adsense' ) {
- wpQuery( '#appstores' ).hide();
wpQuery( '#google-adsense' ).fadeIn( 250 );
- } else if ( selectValue == 'appstores' ) {
- wpQuery( '#google-adsense' ).hide();
- wpQuery( '#appstores' ).fadeIn( 250 );
- }
+ }
}
View
@@ -2,9 +2,9 @@
Contributors: bravenewcode, duanestorey, dalemugford
Donate link: https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=paypal%40bravenewcode%2ecom&item_name=WPtouch%20Beer%20Fund&no_shipping=0&no_note=1&tax=0&currency_code=CAD&lc=CA&bn=PP%2dDonationsBF&charset=UTF%2d8
Tags: wptouch, iphone, ipod, theme, apple, mac, bravenewcode, ajax, mobile, android, blackberry, smartphone,
-Requires at least: 3.0
-Tested up to: 3.3.1
-Stable tag: 1.9.38
+Requires at least: 3.1
+Tested up to: 3.3.2
+Stable tag: 1.9.40
WPtouch: A simple, powerful and elegant mobile theme for your website.
@@ -16,19 +16,29 @@ The admin panel allows you to customize many aspects of its appearance, and deli
The theme also includes the ability for visitors to switch between *WPtouch* view and your site's regular theme.
-*Now includes .pot file for translations (submit yours @ http://www.bravenwcode.com/contact)*
+*Now includes .pot file for translations (submit yours @ http://www.bravenewcode.com/contact)*
*Now Available: WPtouch Pro!*
Totally re-written top to bottom, with a slew of new features like more style, color and branding customizations, themes, 10 languages, more advertising options, Web-Application mode, and more!
-Awesome iPad theme support is now available in WPtouch Pro, now at version 2.5!
+Awesome iPad theme support is now available in WPtouch Pro, now at version 2.6!
For more information visit http://www.bravenewcode.com/wptouch-pro
'WPtouch' and 'WPtouch Pro' are trademarks of BraveNewCode Inc.
== Changelog ==
+= Version 1.9.40 =
+
+* Removed: AppStores support - please visit the AppStores website for the Javascript code to use if you'd like to continue using it
+* Changed: Updated fitvids() video script
+
+= Version 1.9.39 =
+
+* Fixed: Admin styling issues on some WordPress versions
+* Changed: File and image optimizations
+
= Version 1.9.38 =
* Added: Advertising integration with Appstores
@@ -1,7 +1,6 @@
<?php
-//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+
// WPtouch Core Header Functions
-//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
function wptouch_core_header_enqueue() {
$version = get_bloginfo('version');
@@ -140,9 +139,7 @@ function wptouch_ordered_tag_list( $num ) {
echo '</ul>';
}
-//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
// WPtouch Core Body Functions
-//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
function wptouch_core_body_background() {
$wptouch_settings = bnc_wptouch_get_settings();
@@ -172,10 +169,7 @@ function wptouch_core_body_result_text() {
}
}
-
-//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
// WPtouch Core Footer Functions
-//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
function wptouch_core_else_text() {
global $is_ajax; if (($is_ajax) && !is_search()) {
@@ -197,10 +191,7 @@ function wptouch_core_footer_switch_link() {
echo '' . __( "Mobile Theme", "wptouch" ) . ' <a id="switch-link" onclick="wptouch_switch_confirmation();" href="javascript:return false;"></a>';
}
-
-//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
// WPtouch Standard Functions
-//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
// Check if certain plugins are active
function wptouch_is_plugin_active($plugin_filename) {
@@ -272,10 +263,8 @@ function wptouch_idevice_classes() {
add_filter( 'show_admin_bar', '__return_false' );
}
-
-//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
// WPtouch Filters
-//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+
add_filter( 'post_thumbnail_size', 'wptouch_thumbnail_size' );
remove_action('wp_head', 'gigpress_head');
remove_filter('the_excerpt', 'do_shortcode');
@@ -25,4 +25,4 @@ function hideURLbar() { window.scrollTo(0,1); }
</script>
<?php } ?>
</head>
-<?php flush(); ?>
+<?php flush();
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
@@ -101,7 +101,6 @@ function doWPtouchReady() {
}
/* add dynamic automatic video resizing via fitVids */
- $wpt( '.post' ).fitVids();
var videoSelectors = [
"iframe[src^='http://player.vimeo.com']",
@@ -115,8 +114,11 @@ function doWPtouchReady() {
var allVideos = $wpt( '.post' ).find(videoSelectors.join(','));
$wpt( allVideos ).each( function(){
- $wpt( this ).addClass( 'wptouch-videos' ).parentsUntil( '.post', 'div:not(.fluid-width-video-wrapper)' ).removeAttr( 'width' ).removeAttr( 'height' ).removeAttr( 'style' );
+ $wpt( this ).unwrap().addClass( 'wptouch-videos' ).parentsUntil( '.content', 'div:not(.fluid-width-video-wrapper), span' ).removeAttr( 'width' ).removeAttr( 'height' ).removeAttr( 'style' );
});
+
+ $wpt( '.post' ).fitVids();
+
}
$wpt( document ).ready( function() { doWPtouchReady(); } );
@@ -172,7 +174,7 @@ $wpt( document ).ready( function() { doWPtouchReady(); } );
"iframe[src^='http://player.vimeo']",
"iframe[src^='http://www.youtube']",
"iframe[src^='http://www.kickstarter']",
- "iframe[src^='http://maps.google']",
+// "iframe[src^='http://maps.google']",
"object",
"embed",
"video"
@@ -209,4 +209,4 @@
</div>
<?php } ?>
</div>
-<?php wptouch_core_header_check_use(); ?>
+<?php wptouch_core_header_check_use();
View
@@ -169,4 +169,4 @@
<?php endif; ?>
<!-- Here we're establishing whether the page was loaded via Ajax or not, for dynamic purposes. If it's ajax, we're not bringing in footer.php -->
-<?php global $is_ajax; if (!$is_ajax) get_footer(); ?>
+<?php global $is_ajax; if (!$is_ajax) get_footer();
View
@@ -94,5 +94,4 @@
<?php endif; ?>
<!-- If it's ajax, we're not bringing in footer.php -->
-<?php global $is_ajax; if (!$is_ajax)
-get_footer();
+<?php global $is_ajax; if (!$is_ajax) get_footer();
@@ -102,5 +102,4 @@
<!-- Do the footer things -->
-<?php global $is_ajax; if (!$is_ajax)
-get_footer();
+<?php global $is_ajax; if (!$is_ajax) get_footer();
Oops, something went wrong.

0 comments on commit ad12f23

Please sign in to comment.