diff --git a/.htaccess b/.htaccess index cb431fdb..4db1c833 100644 --- a/.htaccess +++ b/.htaccess @@ -2,7 +2,7 @@ Options +FollowSymLinks RewriteEngine On -RewriteRule ^css/all combine.php?type=css +RewriteRule ^themes/([a-zA-Z\-\_\0-9]+)\/$ combine.php?type=css&theme=$1 RewriteRule ^js/all combine.php?type=javascript # Turn on Expires and set default to 0 diff --git a/README.md b/README.md index b30381c1..d25f4816 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ Usage Early documentation: https://github.com/jquery/jquery-mobile/wiki/_pages -For now, I've set things up with a little combinator script to concat all the css and js files into one request and gzip. (js/all and css/all) +For now, I've set things up with a little combinator script to concat all the css and js files into one request and gzip. (js/all and themes/default) You'll need to point your local apache & php webserver at this root directory in order to preview things. If you don't currently have a webserver running locally, a quick way to get up and running is to download and install Mamp for Mac OSX. Once installed, just open Mamp, click preferences, go to the Apache tab, and select your local jQuery Mobile folder as the root. Then you can open a browser to http://localhost:8888 to preview the code. diff --git a/combine.php b/combine.php index 0e0e00a6..0938e714 100644 --- a/combine.php +++ b/combine.php @@ -27,8 +27,9 @@ $cache = true; $pullfromcache = false; + $theme = $_GET['theme']; $cachedir = dirname(__FILE__) . '/cache'; - $cssdir = dirname(__FILE__) . '/css'; + $cssdir = dirname(__FILE__) . '/themes/' . $theme; $jsdir = dirname(__FILE__) . '/js'; // Determine the directory and type we should use @@ -52,7 +53,16 @@ // Determine last modification date of the files $lastmodified = 0; while (list(,$element) = each($elements)) { - $path = realpath($base . '/' . $element); + $thisbase = $base; + $thiselement = $element; + if( strpos($thiselement, "../") === 0 ){ + $thiselement = str_replace("../","",$thiselement); + $thisbase = explode("/", $thisbase); + array_pop($thisbase); + $thisbase = implode("/", $thisbase); + } + $path = realpath($thisbase . '/' . $thiselement); + //echo $path; if (($type == 'javascript' && substr($path, -3) != '.js') || ($type == 'css' && substr($path, -4) != '.css')) { @@ -60,7 +70,7 @@ exit; } - if (substr($path, 0, strlen($base)) != $base || !file_exists($path)) { + if (substr($path, 0, strlen($thisbase)) != $thisbase || !file_exists($path)) { header ("HTTP/1.0 404 Not Found"); exit; } diff --git a/docs/buttons.html b/docs/buttons.html index 87a2a590..5e2b3d74 100755 --- a/docs/buttons.html +++ b/docs/buttons.html @@ -2,7 +2,7 @@ jQuery Mobile Docs - Buttons - + diff --git a/docs/buttons/api-buttons.html b/docs/buttons/api-buttons.html index e11a955f..41e6d579 100755 --- a/docs/buttons/api-buttons.html +++ b/docs/buttons/api-buttons.html @@ -2,7 +2,7 @@ jQuery Mobile Docs - Buttons - + diff --git a/docs/buttons/buttons-grouped.html b/docs/buttons/buttons-grouped.html index 15ba5cff..dc9f7042 100755 --- a/docs/buttons/buttons-grouped.html +++ b/docs/buttons/buttons-grouped.html @@ -2,7 +2,7 @@ jQuery Mobile Docs - Buttons - + diff --git a/docs/buttons/buttons-icons.html b/docs/buttons/buttons-icons.html index 6cb251b6..94ae5488 100755 --- a/docs/buttons/buttons-icons.html +++ b/docs/buttons/buttons-icons.html @@ -2,7 +2,7 @@ jQuery Mobile Docs - Buttons - + diff --git a/docs/buttons/buttons-inline.html b/docs/buttons/buttons-inline.html index 0bc97f7e..45f2bbb1 100755 --- a/docs/buttons/buttons-inline.html +++ b/docs/buttons/buttons-inline.html @@ -2,7 +2,7 @@ jQuery Mobile Docs - Buttons - + diff --git a/docs/buttons/buttons-themes.html b/docs/buttons/buttons-themes.html index 3beced4a..0333b17e 100755 --- a/docs/buttons/buttons-themes.html +++ b/docs/buttons/buttons-themes.html @@ -2,7 +2,7 @@ jQuery Mobile Docs - Buttons - + diff --git a/docs/buttons/buttons-types.html b/docs/buttons/buttons-types.html index 25a31e52..18b842d9 100755 --- a/docs/buttons/buttons-types.html +++ b/docs/buttons/buttons-types.html @@ -2,7 +2,7 @@ jQuery Mobile Docs - Lists - + diff --git a/docs/buttons/docs-buttons.html b/docs/buttons/docs-buttons.html index badfc562..6cebf1b9 100755 --- a/docs/buttons/docs-buttons.html +++ b/docs/buttons/docs-buttons.html @@ -2,7 +2,7 @@ jQuery Mobile Docs - Lists - + diff --git a/docs/buttons/index.html b/docs/buttons/index.html index f9922f25..9bf7c90e 100755 --- a/docs/buttons/index.html +++ b/docs/buttons/index.html @@ -2,7 +2,7 @@ jQuery Mobile Docs - Buttons - + diff --git a/docs/events.html b/docs/events.html index 04be3dcf..cb05ab2a 100755 --- a/docs/events.html +++ b/docs/events.html @@ -2,7 +2,7 @@ jQuery Mobile Docs - Events - + diff --git a/docs/forms.html b/docs/forms.html index d4da382b..fd587d7a 100755 --- a/docs/forms.html +++ b/docs/forms.html @@ -2,7 +2,7 @@ jQuery Mobile Docs - Forms - + diff --git a/docs/forms/api-forms.html b/docs/forms/api-forms.html index 6b954168..a9940d85 100755 --- a/docs/forms/api-forms.html +++ b/docs/forms/api-forms.html @@ -2,7 +2,7 @@ jQuery Mobile Docs - Forms - + diff --git a/docs/forms/buttons-themes.html b/docs/forms/buttons-themes.html index e53ee657..bbab5c2a 100755 --- a/docs/forms/buttons-themes.html +++ b/docs/forms/buttons-themes.html @@ -2,7 +2,7 @@ jQuery Mobile Docs - Forms - + diff --git a/docs/forms/docs-forms.html b/docs/forms/docs-forms.html index 8c9e5a5e..1cfd6751 100755 --- a/docs/forms/docs-forms.html +++ b/docs/forms/docs-forms.html @@ -2,7 +2,7 @@ jQuery Mobile Docs - Forms - + diff --git a/docs/forms/forms-all.html b/docs/forms/forms-all.html index be268cc4..71d864b2 100755 --- a/docs/forms/forms-all.html +++ b/docs/forms/forms-all.html @@ -2,7 +2,7 @@ jQuery Mobile Docs - Forms - + diff --git a/docs/forms/index.html b/docs/forms/index.html index cc4bb5c0..13185139 100755 --- a/docs/forms/index.html +++ b/docs/forms/index.html @@ -2,7 +2,7 @@ jQuery Mobile Docs - Forms - + diff --git a/docs/index.html b/docs/index.html index 2f1af000..e5c05f93 100755 --- a/docs/index.html +++ b/docs/index.html @@ -2,7 +2,7 @@ jQuery UI Mobile Framework - Documentation - + diff --git a/docs/intro.html b/docs/intro.html index 077e447a..937a3092 100755 --- a/docs/intro.html +++ b/docs/intro.html @@ -2,7 +2,7 @@ jQuery Mobile Docs - Intro - + diff --git a/docs/links.html b/docs/links.html index 77e6671c..950b1d22 100755 --- a/docs/links.html +++ b/docs/links.html @@ -2,7 +2,7 @@ jQuery Mobile Docs - Links - + diff --git a/docs/lists/api-lists.html b/docs/lists/api-lists.html index 76bbec5d..15b8914d 100755 --- a/docs/lists/api-lists.html +++ b/docs/lists/api-lists.html @@ -2,7 +2,7 @@ jQuery Mobile Docs - Lists - + diff --git a/docs/lists/docs-lists.html b/docs/lists/docs-lists.html index 4f8d3239..6ada4e48 100755 --- a/docs/lists/docs-lists.html +++ b/docs/lists/docs-lists.html @@ -2,7 +2,7 @@ jQuery Mobile Docs - Lists - + diff --git a/docs/lists/index.html b/docs/lists/index.html index b5c61f3e..adc9bd31 100755 --- a/docs/lists/index.html +++ b/docs/lists/index.html @@ -2,7 +2,7 @@ jQuery Mobile Docs - Lists - + diff --git a/docs/lists/lists-count.html b/docs/lists/lists-count.html index 8ebd4c4c..a6aecb1c 100755 --- a/docs/lists/lists-count.html +++ b/docs/lists/lists-count.html @@ -2,7 +2,7 @@ jQuery Mobile Docs - Lists - + diff --git a/docs/lists/lists-divider.html b/docs/lists/lists-divider.html index d92edf8e..800e03c3 100755 --- a/docs/lists/lists-divider.html +++ b/docs/lists/lists-divider.html @@ -2,7 +2,7 @@ jQuery Mobile Docs - Lists - + diff --git a/docs/lists/lists-formatting.html b/docs/lists/lists-formatting.html index 27a366b7..8c0fbf23 100755 --- a/docs/lists/lists-formatting.html +++ b/docs/lists/lists-formatting.html @@ -2,7 +2,7 @@ jQuery Mobile Docs - Lists - + diff --git a/docs/lists/lists-icons.html b/docs/lists/lists-icons.html index f1a63499..850caf0c 100755 --- a/docs/lists/lists-icons.html +++ b/docs/lists/lists-icons.html @@ -2,7 +2,7 @@ jQuery Mobile Docs - Lists - + diff --git a/docs/lists/lists-inset.html b/docs/lists/lists-inset.html index da8eb337..e8264209 100755 --- a/docs/lists/lists-inset.html +++ b/docs/lists/lists-inset.html @@ -2,7 +2,7 @@ jQuery Mobile Docs - Lists - + diff --git a/docs/lists/lists-nested.html b/docs/lists/lists-nested.html index cf764f17..b5796764 100755 --- a/docs/lists/lists-nested.html +++ b/docs/lists/lists-nested.html @@ -2,7 +2,7 @@ jQuery Mobile Docs - Lists - + diff --git a/docs/lists/lists-ol.html b/docs/lists/lists-ol.html index e2ca155d..86f4603f 100755 --- a/docs/lists/lists-ol.html +++ b/docs/lists/lists-ol.html @@ -2,7 +2,7 @@ jQuery Mobile Docs - Lists - + diff --git a/docs/lists/lists-readonly.html b/docs/lists/lists-readonly.html index 9fe1bf83..e805de07 100755 --- a/docs/lists/lists-readonly.html +++ b/docs/lists/lists-readonly.html @@ -2,7 +2,7 @@ jQuery Mobile Docs - Lists - + diff --git a/docs/lists/lists-search.html b/docs/lists/lists-search.html index 974a4f30..8f96be69 100755 --- a/docs/lists/lists-search.html +++ b/docs/lists/lists-search.html @@ -2,7 +2,7 @@ jQuery Mobile Docs - Lists - + diff --git a/docs/lists/lists-split.html b/docs/lists/lists-split.html index ed85eb16..a75c83d5 100755 --- a/docs/lists/lists-split.html +++ b/docs/lists/lists-split.html @@ -2,7 +2,7 @@ jQuery Mobile Docs - Lists - + diff --git a/docs/lists/lists-themes.html b/docs/lists/lists-themes.html index bc411c37..17011ca3 100755 --- a/docs/lists/lists-themes.html +++ b/docs/lists/lists-themes.html @@ -2,7 +2,7 @@ jQuery Mobile Docs - Lists - + diff --git a/docs/lists/lists-thumbnails.html b/docs/lists/lists-thumbnails.html index 6196eb98..d87d40e6 100755 --- a/docs/lists/lists-thumbnails.html +++ b/docs/lists/lists-thumbnails.html @@ -2,7 +2,7 @@ jQuery Mobile Docs - Lists - + diff --git a/docs/lists/lists-ul.html b/docs/lists/lists-ul.html index 777e6340..0ce3653a 100755 --- a/docs/lists/lists-ul.html +++ b/docs/lists/lists-ul.html @@ -2,7 +2,7 @@ jQuery Mobile Docs - Lists - + diff --git a/docs/page.html b/docs/page.html index 4631a3ca..a3057e60 100755 --- a/docs/page.html +++ b/docs/page.html @@ -2,7 +2,7 @@ jQuery Mobile Docs - Intro - + diff --git a/docs/pages/api-pages.html b/docs/pages/api-pages.html index 8a020553..c1f4e525 100755 --- a/docs/pages/api-pages.html +++ b/docs/pages/api-pages.html @@ -2,7 +2,7 @@ jQuery Mobile Docs - Buttons - + diff --git a/docs/pages/dialog.html b/docs/pages/dialog.html index 1cd7b312..de2a77d5 100644 --- a/docs/pages/dialog.html +++ b/docs/pages/dialog.html @@ -2,7 +2,7 @@ jQuery Mobile Framework - Dialog Example - + diff --git a/docs/pages/docs-dialogs.html b/docs/pages/docs-dialogs.html index 01d79fcc..d7c79a55 100755 --- a/docs/pages/docs-dialogs.html +++ b/docs/pages/docs-dialogs.html @@ -2,7 +2,7 @@ jQuery Mobile Docs - Pages - + diff --git a/docs/pages/docs-links.html b/docs/pages/docs-links.html index 6d34265e..6dce1457 100755 --- a/docs/pages/docs-links.html +++ b/docs/pages/docs-links.html @@ -2,7 +2,7 @@ jQuery Mobile Docs - Pages - + diff --git a/docs/pages/docs-navmodel.html b/docs/pages/docs-navmodel.html index 14341972..bdd8dbce 100755 --- a/docs/pages/docs-navmodel.html +++ b/docs/pages/docs-navmodel.html @@ -2,7 +2,7 @@ jQuery Mobile Docs - Pages - + diff --git a/docs/pages/docs-pages.html b/docs/pages/docs-pages.html index 22c96621..0f4a0e97 100755 --- a/docs/pages/docs-pages.html +++ b/docs/pages/docs-pages.html @@ -2,7 +2,7 @@ jQuery Mobile Docs - Pages - + diff --git a/docs/pages/index.html b/docs/pages/index.html index 74ffdd46..aeab9bd7 100755 --- a/docs/pages/index.html +++ b/docs/pages/index.html @@ -2,7 +2,7 @@ jQuery Mobile Docs - Pages - + diff --git a/docs/pages/pages-themes.html b/docs/pages/pages-themes.html index 34923337..220a9287 100755 --- a/docs/pages/pages-themes.html +++ b/docs/pages/pages-themes.html @@ -2,7 +2,7 @@ jQuery Mobile Docs - Pages - + diff --git a/docs/themes.html b/docs/themes.html index be910d5c..8e594a6e 100755 --- a/docs/themes.html +++ b/docs/themes.html @@ -2,7 +2,7 @@ jQuery Mobile Framework - Static Containers, States - + diff --git a/docs/toolbars/api-bars.html b/docs/toolbars/api-bars.html index 386271d9..b592835e 100755 --- a/docs/toolbars/api-bars.html +++ b/docs/toolbars/api-bars.html @@ -2,7 +2,7 @@ jQuery Mobile Docs - Toolbars - + diff --git a/docs/toolbars/bars-fixed.html b/docs/toolbars/bars-fixed.html index a8389cf4..a8bad86b 100755 --- a/docs/toolbars/bars-fixed.html +++ b/docs/toolbars/bars-fixed.html @@ -2,7 +2,7 @@ jQuery Mobile Framework - Toolbars demo - + diff --git a/docs/toolbars/bars-fullscreen.html b/docs/toolbars/bars-fullscreen.html index 03f0bed7..4ea552d5 100755 --- a/docs/toolbars/bars-fullscreen.html +++ b/docs/toolbars/bars-fullscreen.html @@ -2,7 +2,7 @@ jQuery Mobile Framework - Fixed toolbars variation - + diff --git a/docs/toolbars/bars-inline.html b/docs/toolbars/bars-inline.html index 3af8f5a4..7ea446f5 100755 --- a/docs/toolbars/bars-inline.html +++ b/docs/toolbars/bars-inline.html @@ -2,7 +2,7 @@ jQuery Mobile Framework - Toolbars demo - + diff --git a/docs/toolbars/bars-themes.html b/docs/toolbars/bars-themes.html index b0ecaef8..f4191167 100755 --- a/docs/toolbars/bars-themes.html +++ b/docs/toolbars/bars-themes.html @@ -2,7 +2,7 @@ jQuery Mobile Framework - Toolbars demo - + diff --git a/docs/toolbars/docs-bars.html b/docs/toolbars/docs-bars.html index 1bcd3c76..436259d9 100755 --- a/docs/toolbars/docs-bars.html +++ b/docs/toolbars/docs-bars.html @@ -2,7 +2,7 @@ jQuery Mobile Docs - Toolbars - + diff --git a/docs/toolbars/docs-footers.html b/docs/toolbars/docs-footers.html index c226b3d0..81c20c2f 100755 --- a/docs/toolbars/docs-footers.html +++ b/docs/toolbars/docs-footers.html @@ -2,7 +2,7 @@ jQuery Mobile Docs - Toolbars - + diff --git a/docs/toolbars/docs-headers.html b/docs/toolbars/docs-headers.html index d6dccbfe..bb27db5a 100755 --- a/docs/toolbars/docs-headers.html +++ b/docs/toolbars/docs-headers.html @@ -2,7 +2,7 @@ jQuery Mobile Docs - Toolbars - + diff --git a/docs/toolbars/docs-navbars.html b/docs/toolbars/docs-navbars.html index a74b18dc..20baac47 100755 --- a/docs/toolbars/docs-navbars.html +++ b/docs/toolbars/docs-navbars.html @@ -2,7 +2,7 @@ jQuery Mobile Docs - Toolbars - + diff --git a/docs/toolbars/footer-persist-result.html b/docs/toolbars/footer-persist-result.html index 0b584b38..5e86375d 100755 --- a/docs/toolbars/footer-persist-result.html +++ b/docs/toolbars/footer-persist-result.html @@ -2,7 +2,7 @@ jQuery Mobile Framework - Persistent footer demo - + diff --git a/docs/toolbars/footer-persist.html b/docs/toolbars/footer-persist.html index c591a1ab..163bbbd9 100755 --- a/docs/toolbars/footer-persist.html +++ b/docs/toolbars/footer-persist.html @@ -2,7 +2,7 @@ jQuery Mobile Framework - Persistent footer demo - + diff --git a/docs/toolbars/index.html b/docs/toolbars/index.html index 132bd1c7..b0c078ad 100755 --- a/docs/toolbars/index.html +++ b/docs/toolbars/index.html @@ -2,7 +2,7 @@ jQuery Mobile Docs - Toolbars - + diff --git a/docs/toolbars/navbar.html b/docs/toolbars/navbar.html index 48444670..2317ff50 100755 --- a/docs/toolbars/navbar.html +++ b/docs/toolbars/navbar.html @@ -2,7 +2,7 @@ jQuery Mobile Framework - navbar Example - + diff --git a/experiments/ajax-search/_search-results.html b/experiments/ajax-search/_search-results.html index b6dc4a51..58b902ff 100644 --- a/experiments/ajax-search/_search-results.html +++ b/experiments/ajax-search/_search-results.html @@ -2,7 +2,7 @@ jQuery Mobile Framework - Search Results - + diff --git a/experiments/ajax-search/_search.html b/experiments/ajax-search/_search.html index 19d98ccf..1fdfaa02 100644 --- a/experiments/ajax-search/_search.html +++ b/experiments/ajax-search/_search.html @@ -2,7 +2,7 @@ jQuery Mobile Framework - Search Example - + diff --git a/experiments/api-viewer/index.html b/experiments/api-viewer/index.html index 9372c37e..77fd7f53 100644 --- a/experiments/api-viewer/index.html +++ b/experiments/api-viewer/index.html @@ -2,7 +2,7 @@ jQuery Mobile Framework - Listview Examples - + diff --git a/experiments/converter/cache.manifest b/experiments/converter/cache.manifest index 045a4b6b..f4898be8 100644 --- a/experiments/converter/cache.manifest +++ b/experiments/converter/cache.manifest @@ -1,5 +1,5 @@ CACHE MANIFEST index.html -../../css/all +../../themes/default ../../js/all jquery.tmpl.js \ No newline at end of file diff --git a/experiments/converter/index.html b/experiments/converter/index.html index 713accb6..4a69ffe0 100644 --- a/experiments/converter/index.html +++ b/experiments/converter/index.html @@ -3,7 +3,7 @@ jQuery Mobile Framework - Converter Demo Application - + diff --git a/experiments/navbar-glyphish/index.html b/experiments/navbar-glyphish/index.html index 8f40444b..313915ee 100644 --- a/experiments/navbar-glyphish/index.html +++ b/experiments/navbar-glyphish/index.html @@ -2,7 +2,7 @@ jQuery Mobile Framework - navbar Example - + diff --git a/experiments/photos/_photo1.html b/experiments/photos/_photo1.html index d1e357a7..7f3f65f2 100644 --- a/experiments/photos/_photo1.html +++ b/experiments/photos/_photo1.html @@ -2,7 +2,7 @@ jQuery Mobile Framework - Photo 1 - + diff --git a/experiments/photos/_photo2.html b/experiments/photos/_photo2.html index 2c1bc867..0828bc0a 100644 --- a/experiments/photos/_photo2.html +++ b/experiments/photos/_photo2.html @@ -2,7 +2,7 @@ jQuery Mobile Framework - Photo 1 - + diff --git a/experiments/photos/_photo3.html b/experiments/photos/_photo3.html index af7dcaf8..a1d93e77 100644 --- a/experiments/photos/_photo3.html +++ b/experiments/photos/_photo3.html @@ -2,7 +2,7 @@ jQuery Mobile Framework - Photo 1 - + diff --git a/experiments/photos/_photo4.html b/experiments/photos/_photo4.html index 2930c50c..33cc0c4d 100644 --- a/experiments/photos/_photo4.html +++ b/experiments/photos/_photo4.html @@ -2,7 +2,7 @@ jQuery Mobile Framework - Photo 1 - + diff --git a/experiments/photos/_photo5.html b/experiments/photos/_photo5.html index 995e6183..dd0899a9 100644 --- a/experiments/photos/_photo5.html +++ b/experiments/photos/_photo5.html @@ -2,7 +2,7 @@ jQuery Mobile Framework - Photo 1 - + diff --git a/experiments/photos/_photo6.html b/experiments/photos/_photo6.html index b91d1832..9c03d506 100644 --- a/experiments/photos/_photo6.html +++ b/experiments/photos/_photo6.html @@ -2,7 +2,7 @@ jQuery Mobile Framework - Photo 1 - + diff --git a/experiments/progressbar/_progressbar-static.html b/experiments/progressbar/_progressbar-static.html index 6131a053..38a35939 100644 --- a/experiments/progressbar/_progressbar-static.html +++ b/experiments/progressbar/_progressbar-static.html @@ -2,7 +2,7 @@ jQuery Mobile Framework - Static Progressbar Example - + diff --git a/experiments/ui-datepicker/index.html b/experiments/ui-datepicker/index.html index 3b182ef8..9b7ca443 100644 --- a/experiments/ui-datepicker/index.html +++ b/experiments/ui-datepicker/index.html @@ -2,7 +2,7 @@ jQuery Mobile Framework - Datepicker - + diff --git a/index.html b/index.html index 8f6d571c..32839bb8 100755 --- a/index.html +++ b/index.html @@ -2,7 +2,7 @@ jQuery UI Mobile Framework - Documentation - + diff --git a/speed/basic-page.html b/speed/basic-page.html index 461e7c36..f817b01a 100644 --- a/speed/basic-page.html +++ b/speed/basic-page.html @@ -2,7 +2,7 @@ Basic Page - +