ver 1.9.6.1

crowdfavorite-mirrors · Mar 27, 2013 · 3317a55 · 3317a55
1 parent ffff1a9
commit 3317a55
Show file tree

Hide file tree

Showing 7 changed files with 47 additions and 34 deletions.
diff --git a/admin-css/bnc-global.css b/admin-css/bnc-global.css
@@ -1,3 +1,5 @@
+/* @override http://www.bravenewcode.com/wordpress/wp-content/plugins/wptouch/admin-css/bnc-global.css */
+
 /* Global styles applied to BraveNewCode plugins */
 
 /* @group Global Plugin Styles */
@@ -11,7 +13,6 @@
 #bnc-global .postbox {
 	position: relative;
 	overflow: hidden;
-	background-color: #fff;
 	padding: 10px;
 }
 

diff --git a/admin-css/wptouch-admin.css b/admin-css/wptouch-admin.css
@@ -1,7 +1,9 @@
+/* @override http://www.bravenewcode.com/wordpress/wp-content/plugins/wptouch/admin-css/wptouch-admin.css */
+
 /* WPtouch 1.9.x Admin CSS */
 /* @group head-area.php */
 #wptouch-head.metabox-holder .postbox {
-	background: #fff url(../images/wptouch-icon.jpg) no-repeat 100% 74px;
+	background: #fff url(../images/wptouch-icon.jpg) no-repeat 100% 74px !important;
 	overflow: hidden;
 	position: relative;
 	min-height: 216px;
@@ -245,9 +247,9 @@ em.supported {
 }
 
 #bnc-global .custom ul.wptouch-iconblock li {
-	background-color: #e6f4fe;
 	border: 1px dashed #becbcf;
 	border-radius: 5px;
+	background-color: #fff;
 }
 
 #bnc-global .custom ul.wptouch-iconblock li:hover {
@@ -359,6 +361,7 @@ em.supported {
 	border: 2px solid #eee;
 	width: 100%;
 	padding: 10px;
+	background-color: #fff;
 }
 
 /* @end */
@@ -371,9 +374,10 @@ textarea#wptouch-stats {
 	margin-bottom: 15px;
 	color: #444;
 	font-size: 11px;
-	border-width: 2px;
+	border-width: 1px;
 	border-color: #a4c6d3;
-	background-color: #ebf1ff;
+	background-color: #fff;
+	box-shadow: inset rgba(0,0,0,.1) 0px 0px 6px;
 }
 
 /* @end */

diff --git a/html/advanced-area.php b/html/advanced-area.php
@@ -5,16 +5,27 @@
 		<h3><span class="advanced-options">&nbsp;</span><?php _e( "Advanced Options", "wptouch" ); ?></h3>
 
 		<div class="left-content">
+		 	<h4><?php _e( "Custom User-Agents", "wptouch" ); ?></h4>
+		 	<p><?php _e( "Enter a comma-separated list of user-agents to enable WPtouch for a device that isn't currently officially supported.", "wptouch" ); ?></p>
+		 	<br /><br /><br /><br /><br />
+		 	<h4><?php _e( "Advanced Settings", "wptouch" ); ?></h4>
 			<p><?php _e( "Choose to enable/disable advanced features &amp; options available for WPtouch.", "wptouch"); ?></p>	
 			<p><?php _e( "* WPtouch Restricted Mode attempts to fix issues where other plugins load scripts which interfere with WPtouch CSS and JavaScript.", "wptouch" ); ?></p>
 		 	<br />
-		 	<h4><?php _e( "Custom User-Agents", "wptouch" ); ?></h4>
-		 	<p><?php _e( "Enter a comma-separated list of user-agents to enable WPtouch for a device that isn't currently officially supported.", "wptouch" ); ?></p>
-		 	<p><?php echo sprintf( __( "The currently enabled user-agents are: <em class='supported'>%s</em>", "wptouch" ), implode( ", ", bnc_wptouch_get_user_agents() ) ); ?></p>
 		</div><!-- left-content -->
 
 	<div class="right-content">
 		<ul>
+				<ul class="wptouch-make-li-italic">
+					<li>
+						<input type="text" name="custom-user-agents" value="<?php if ( isset( $wptouch_settings['custom-user-agents'] ) ) echo implode( ', ', $wptouch_settings['custom-user-agents'] ); ?>" /><?php _e( "Custom user-agents", "wptouch" ); ?>
+						<?php if ( function_exists( 'wpsc_update_htaccess' ) ) { ?>
+							<br /><br /><?php _e( "After changing the user-agents, please visit the WP Super Cache admin page and update your rewrite rules.", "wptouch" ); ?>
+						<?php } ?>
+								 	<p><?php echo sprintf( __( "The currently enabled user-agents are: <em class='supported'>%s</em>", "wptouch" ), implode( ", ", bnc_wptouch_get_user_agents() ) ); ?></p>
+
+					</li>
+				</ul>
 			<li>
 				<input class="checkbox" type="checkbox" name="enable-zoom" <?php if ( isset( $wptouch_settings['enable-zoom']) && $wptouch_settings['enable-zoom'] == 1) echo('checked'); ?> />
 				<label class="label" for="enable-zoom"><?php _e( "Allow zooming on content", "wptouch" ); ?> <a href="#zoom-info" class="fancylink">?</a></label>
@@ -127,15 +138,6 @@
 						<p><?php _e( "Sometimes fixes incompatibilities and speeds up WPtouch.", "wptouch" ); ?></p>
 						<p><?php _e( "Some plugins load conflicting javascript, extra CSS style sheets, and other functional code into your theme to accomplish what they add to your site. As WPtouch works complete on its own without any other plugin installed, in some cases (where you have several plugins or find something doesn't work right with WPtouch) you may want to enable Restricted Mode to ensure that WPtouch works properly, and loads quickly for mobile users.", "wptouch" ); ?></p>
 					</div>
-
-	<ul class="wptouch-make-li-italic">
-					<li>
-						<input type="text" name="custom-user-agents" value="<?php if ( isset( $wptouch_settings['custom-user-agents'] ) ) echo implode( ', ', $wptouch_settings['custom-user-agents'] ); ?>" /><?php _e( "Custom user-agents", "wptouch" ); ?>
-						<?php if ( function_exists( 'wpsc_update_htaccess' ) ) { ?>
-							<br /><br /><?php _e( "After changing the user-agents, please visit the WP Super Cache admin page and update your rewrite rules.", "wptouch" ); ?>
-						<?php } ?>
-					</li>
-				</ul>
 				</li>
 			</ul>
 		</div><!-- right content -->

diff --git a/html/general-settings-area.php b/html/general-settings-area.php
@@ -19,24 +19,21 @@
 
 				<br /><br />
 
-				<h4><?php _e( "Excluded Categories", "wptouch" ); ?></h4>
-				<p><?php _e( "Categories by ID you want excluded everywhere in WPtouch.", "wptouch" ); ?></p>
+				<h4><?php _e( "Excluded Categories, Tags", "wptouch" ); ?></h4>
+				<p><?php _e( "Categories and/or Tags by ID you want excluded everywhere in WPtouch.", "wptouch" ); ?></p>
 
-				<h4><?php _e( "Excluded Tags", "wptouch" ); ?></h4>
-				<p><?php _e( "Tags by ID you want excluded everywhere in WPtouch.", "wptouch" ); ?></p>
-
-				<br /><br />
+				<br /><br /><br />
 
 				<h4><?php _e( "Text Justification Options", "wptouch" ); ?></h4>
 				<p><?php _e( "Set the alignment for text.", "wptouch" ); ?></p>
 
-				<br /><br />
+				<br /><br /><br /><br />
 
 				<h4><?php _e( "Post Listings Options", "wptouch" ); ?></h4>
 				<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 /><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>

diff --git a/include/submit.php b/include/submit.php
@@ -295,7 +295,10 @@
 	$a['prowl-api'] = $_POST['prowl-api'];
 
 	$values = serialize($a);
+
 	update_option('bnc_iphone_pages', $values);
+
+	do_action( 'wptouch_updated_user_agents' );
 } elseif ( isset( $_POST['reset'] ) ) {
 	update_option( 'bnc_iphone_pages', false );
 }

diff --git a/readme.txt b/readme.txt
@@ -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, responsive, design 
-Requires at least: 3.1
-Tested up to: 3.4.2
-Stable tag: 1.9.6
+Requires at least: 3.0
+Tested up to: 3.5.1
+Stable tag: 1.9.6.1
 
 WPtouch: A simple, powerful & elegant mobile theme for your website.
 
@@ -29,6 +29,12 @@ For more information visit http://www.bravenewcode.com/wptouch-pro
 
 == Changelog ==
 
+= Version 1.9.6.1 =
+
+* Added BlackBerry 10 device support
+* Changed: Verified support for WordPress 3.5
+* Changed: Updated admin layout and fixed admin styling issues
+
 = Version 1.9.6 =
 
 * Added: Catalan translation

diff --git a/wptouch.php b/wptouch.php
@@ -2,7 +2,7 @@
 /*
 Plugin Name: WPtouch
 Plugin URI: http://wordpress.org/extend/plugins/wptouch/
-Version: 1.9.6
+Version: 1.9.6.1
 Description: A plugin which formats your site with a mobile theme for visitors on Apple <a href="http://www.apple.com/iphone/">iPhone</a> / <a href="http://www.apple.com/ipodtouch/">iPod touch</a>, <a href="http://www.android.com/">Google Android</a>, <a href="http://www.blackberry.com/">Blackberry Storm and Torch</a>, <a href="http://www.palm.com/us/products/phones/pre/">Palm Pre</a> and other touch-based smartphones.
 Author: BraveNewCode Inc.
 Author URI: http://www.bravenewcode.com
@@ -18,7 +18,7 @@
 # the Push notification additions.
 # (http://codework.dk/referencer/wp-plugins/prowl-me/)
 
-# Copyright (c) 2008 - 2012 BraveNewCode Inc.
+# Copyright (c) 2008 - 2013 BraveNewCode Inc.
 
 # 'WPtouch' is an unregistered trademark of BraveNewCode Inc., 
 # and may not be used in conjuction with any redistribution 
@@ -28,12 +28,13 @@
 load_plugin_textdomain( 'wptouch', false, dirname( plugin_basename( __FILE__ ) ) );
 
 global $bnc_wptouch_version;
-$bnc_wptouch_version = '1.9.6';
+$bnc_wptouch_version = '1.9.6.1';
 
 require_once( 'include/plugin.php' );
 require_once( 'include/compat.php' );
 
 define( 'WPTOUCH_PROWL_APPNAME', 'WPtouch');
+define( 'WPTOUCH_INSTALLED', 1 );
 define( 'WPTOUCH_ATOM', 1 );
 
 //The WPtouch Settings Defaults
@@ -311,6 +312,7 @@ function bnc_wptouch_get_user_agents() {
 	'BlackBerry 9370', 	// Curve
 	'BlackBerry 9380', 	// Curve
 	'BlackBerry 9810', 	// Torch	
+	'BB10',	 					// BlackBerry 10 devices	
 	'webOS',					// Palm Pre/Pixi
 	's8000',					// Samsung s8000
 	'bada',						// Samsung Bada Phone
@@ -1090,10 +1092,8 @@ function bnc_wp_touch_page() {
 	</form>
 
 	<form method="post" action="">
-		<input type="submit" onclick="return confirm('<?php _e( 'Restore default WPtouch settings?', 'wptouch' ); ?>');" name="reset" value="<?php _e('Restore Defaults', 'wptouch' ); ?>" id="bnc-button-reset" class="button-highlighted" />
+		<input type="submit" onclick="return confirm('<?php _e( 'Restore default WPtouch settings?', 'wptouch' ); ?>');" name="reset" value="<?php _e('Restore Defaults', 'wptouch' ); ?>" id="bnc-button-reset" class="button-secondary" />
 	</form>
-
-	<?php // echo( '' . WPtouch( '<div class="bnc-plugin-version"> This is ','</div>' ) . '' ); ?>
 
 	<div class="bnc-clearer"></div>
 </div>