Changeset 370910

Timestamp:

04/09/2011 02:22:30 PM (15 years ago)

Author:

federico_jacobi

Message:

0.21

Location:

theme-to-browser-t2b-control/trunk

Files:

• readme.txt (modified) (5 diffs)
• t2b.php (modified) (5 diffs)

theme-to-browser-t2b-control/trunk/readme.txt

@@ -4 +4 @@
 Tags: themes, browser, design, control, browser control, mobile, blackberry
 Requires at least: 2.0.2
-Tested up to: 3.1
+Tested up to: 3.1.1
 Stable tag: trunk
 
@@ -15 +15 @@
 PLEASE vote and/or rate if it works for you or let me know if there's a fix needed at web[at]federicojacobi.com.
 
-Supported browsers for now: Internet Explorer, FireFox, Opera, iPhone/iPod, Safari, BlackBerry8310 specifically, and other BlackBerry models (non-specific). All of them modern versions, however, version specific detection will come in future upgrades of the plugin.
+Supported browsers for now: Internet Explorer, FireFox, Opera, iPad/iPhone/iPod, Safari, BlackBerry8310 specifically, and other BlackBerry models (non-specific). All of them modern versions, however, version specific detection will come in future upgrades of the plugin.
+
+Thanks to Nicholas McQuillin and Paul Gregory for their help.
 
 == Installation ==
@@ -25 +27 @@
 == Frequently Asked Questions ==
 What browsers are detected?
-Internet Explorer, FireFox, Opera, iPhone/iPod, Safari, BlackBerry8310, BlackBerry
+Internet Explorer, FireFox, Opera, iPad/iPhone/iPod, Safari, BlackBerry8310, BlackBerry
 
 What about browser versions (ie5, ie6, operamini) ?
@@ -46 +48 @@
 
 == Changelog ==
+= 0.21 =
+Child themes now supported. Important fix. iPad added to browser list.
+
 = 0.2 =
 BlackBerry8310 and All BlackBerry models added.
@@ -53 +58 @@
 
 == Upgrade Notice ==
+= 0.21 =
+The plugin wasn't working with child themes, now it is! Important fix. iPad added to browser list.
+
 = 0.2 =
 Non critical update. It adds support for BlackBerry phones.

theme-to-browser-t2b-control/trunk/t2b.php

@@ -3 +3 @@
 Plugin Name: Theme to Browser (T2B) Control
 Plugin URI: http://www.federicojacobi.com/wp/work/t2b-control/
-Description: Display a different theme depending on the users browser. It is perfect for a quick way out of CSS annoyances and also for customization on mobile devices. Supports: Internet Explorer, FireFox, Opera, iPhone/iPod, Safari. Now supporting BlackBerry 8310, and all BlackBerries.
-Version: 0.2
+Description: Display a different theme depending on the users browser. It is perfect for a quick way out of CSS annoyances and also for customization on mobile devices. Supports: Internet Explorer, FireFox, Opera, iPhone/iPod, iPad, Safari. Now supporting BlackBerry 8310, and all BlackBerries.
+Version: 0.21
 Author: Federico Jacobi
 Author URI: http://www.federicojacobi.com
@@ -14 +14 @@
     '|Opera/([0-9].[0-9]{1,2})|' => array('opera','Opera'),
     '/\(iPhone|iPod/' => array('iphone','iPhone, iPod'),
+    '/\(iPad/' => array('ipad','iPad'),
     '|Safari/([0-9\.]+)|' => array('safari','Safari'),
     '/BlackBerry8310/' => array('blackberry8310','BlackBerry 8310'),
     '/BlackBerry/' => array('blackberry','All BlackBerry')
 );
-$lzt_version = '0.1';
+$lzt_version = '0.21';
 $useragent = $_SERVER['HTTP_USER_AGENT'];
 $browser_version = 0;
@@ -34 +35 @@
 // Check for a valid theme directory, and set the template and stylesheet directory
 if($lzt_theme && file_exists(get_theme_root() . "/$lzt_theme")) {
+
+    $theme_data = get_theme_data(get_theme_root()."/$lzt_theme/style.css");
+    if ($theme_data['Template'] == '') {
+        $theme_parent = $lzt_theme;
+    } else {
+        $theme_parent = $theme_data['Template'];
+    }
     add_filter('template','lzt_set_theme');
-    add_filter('stylesheet','lzt_set_theme');
+    add_filter('stylesheet','lzt_set_css');
+//  add_action('wp_footer','echoresult');   // Triggers debug at the footer
+}
+
+// Debug function ... just to make sure the right stuff is loaded
+function echoresult() {
+    global $theme_parent, $lzt_theme;
+    global $theme_data;
+    echo "ThemeParent:".$theme_parent."<br>";
+    echo "ThemeCss:".$lzt_theme;    
+}
+
+
+function lzt_set_theme() {
+    global $theme_parent;
+    return $theme_parent;
+}
+function lzt_set_css() {
+    global $lzt_theme;
+    return $lzt_theme;
 }
 
@@ -88 +115 @@
                     foreach($themes as $theme) {
                 ?>
-                <input type="radio" name="<?php echo $browser_name[0]?>" value="<?php echo $theme['Template']; ?>" <?php 
+                <input type="radio" name="<?php echo $browser_name[0]?>" value="<?php echo $theme['Stylesheet']; ?>" <?php 
                     // IF este es el seleccionado THEN echo SELECTED
-                    if ((get_option('lzt_'.$browser_name[0]) == $theme['Template']) || ($first)) {
+                    if ((get_option('lzt_'.$browser_name[0]) == $theme['Stylesheet']) || ($first)) {
                         echo 'checked="checked"';
                         $first = false;
@@ -134 +161 @@
 }
 
-function lzt_set_theme($themename) {
-    global $lzt_theme;
-    return $lzt_theme;
-}
-
 
 add_action('admin_menu','lzt_modify_menu');