rhodes 3.1.0.beta.2 → 3.1.0.beta.3

data/CHANGELOG

@@ -1,5 +1,5 @@
 ## 3.1
-* Symbian support
+* Symbian support(Beta)
 * Android: support latest SDK and NDK r6
 * Blackberry 7.0 support
 * Barcode: real time barcode reader for Android

data/Manifest.txt

@@ -52,6 +52,7 @@ lib/build/compileERB/default.rb
 lib/build/compileRB/compileRB.rb
 lib/build/jake.rb
 lib/build/rhodes-build.rb
+lib/extensions/barcode/Android.mk
 lib/extensions/barcode/ext/barcode/platform/android/additional_files/res/drawable/cancel_icon.png
 lib/extensions/barcode/ext/barcode/platform/android/additional_files/res/drawable/ok_icon.png
 lib/extensions/barcode/ext/barcode/platform/android/additional_files/res/drawable/retake_icon.png
@@ -659,6 +660,7 @@ lib/extensions/net-http/uri/ldap.rb
 lib/extensions/net-http/uri/ldaps.rb
 lib/extensions/net-http/uri/mailto.rb
 lib/extensions/net-http/uri.rb
+lib/extensions/nfc/Android.mk
 lib/extensions/nfc/ext/build
 lib/extensions/nfc/ext/build.bat
 lib/extensions/nfc/ext/nfc/platform/android/additional_files/res/xml/filter_nfc.xml
@@ -908,7 +910,6 @@ platform/android/build/libsqlite_build.files
 platform/android/build/libstlport_build.files
 platform/android/build/RhodesGEN_build.files
 platform/android/build/RhodesSRC_build.files
-platform/android/Rhodes/AndroidManifest.full.xml
 platform/android/Rhodes/AndroidManifest.xml
 platform/android/Rhodes/default.properties
 platform/android/Rhodes/gen/com/rhomobile/rhodes/R.java
@@ -941,6 +942,7 @@ platform/android/Rhodes/jni/include/rhodes/RhoClassFactory.h
 platform/android/Rhodes/jni/include/rhodes/rhocryptimpl.h
 platform/android/Rhodes/jni/include/rhodes/sslimpl.h
 platform/android/Rhodes/jni/include/rhodes.h
+platform/android/Rhodes/jni/rainbow_stab.cpp
 platform/android/Rhodes/jni/rhocaps.inc
 platform/android/Rhodes/jni/src/alert.cpp
 platform/android/Rhodes/jni/src/bluetooth.cpp
@@ -1909,11 +1911,20 @@ platform/osx/bin/RhoSimulator/RhoSimulator.app/Contents/Frameworks/QtWebKit.fram
 platform/osx/bin/RhoSimulator/RhoSimulator.app/Contents/Info.plist
 platform/osx/bin/RhoSimulator/RhoSimulator.app/Contents/MacOS/RhoSimulator
 platform/osx/bin/RhoSimulator/RhoSimulator.app/Contents/PkgInfo
+platform/osx/bin/RhoSimulator/RhoSimulator.app/Contents/PlugIns/accessible/libqtaccessiblewidgets.dylib
+platform/osx/bin/RhoSimulator/RhoSimulator.app/Contents/PlugIns/bearer/libqgenericbearer.dylib
+platform/osx/bin/RhoSimulator/RhoSimulator.app/Contents/PlugIns/codecs/libqcncodecs.dylib
+platform/osx/bin/RhoSimulator/RhoSimulator.app/Contents/PlugIns/codecs/libqjpcodecs.dylib
+platform/osx/bin/RhoSimulator/RhoSimulator.app/Contents/PlugIns/codecs/libqkrcodecs.dylib
+platform/osx/bin/RhoSimulator/RhoSimulator.app/Contents/PlugIns/codecs/libqtwcodecs.dylib
+platform/osx/bin/RhoSimulator/RhoSimulator.app/Contents/PlugIns/graphicssystems/libqtracegraphicssystem.dylib
 platform/osx/bin/RhoSimulator/RhoSimulator.app/Contents/PlugIns/imageformats/libqgif.dylib
 platform/osx/bin/RhoSimulator/RhoSimulator.app/Contents/PlugIns/imageformats/libqico.dylib
 platform/osx/bin/RhoSimulator/RhoSimulator.app/Contents/PlugIns/imageformats/libqjpeg.dylib
 platform/osx/bin/RhoSimulator/RhoSimulator.app/Contents/PlugIns/imageformats/libqmng.dylib
 platform/osx/bin/RhoSimulator/RhoSimulator.app/Contents/PlugIns/imageformats/libqtiff.dylib
+platform/osx/bin/RhoSimulator/RhoSimulator.app/Contents/PlugIns/phonon_backend/libphonon_qt7.dylib
+platform/osx/bin/RhoSimulator/RhoSimulator.app/Contents/PlugIns/qmltooling/libtcpserver.dylib
 platform/osx/bin/RhoSimulator/RhoSimulator.app/Contents/Resources/empty.lproj
 platform/osx/bin/RhoSimulator/RhoSimulator.app/Contents/Resources/qt.conf
 platform/osx/bin/RhoSimulator/RhoSimulator.app/Contents/Resources/rho.icns
@@ -2007,6 +2018,7 @@ platform/osx/Rhodes Launcher/rhorunner.app/Settings.bundle/en.lproj/Root.strings
 platform/osx/Rhodes Launcher/rhorunner.app/Settings.bundle/Root.plist
 platform/osx/Rhodes Launcher/unzipbundle.rb
 platform/osx/Rhodes Launcher/version.plist
+platform/shared/common/Android.mk
 platform/shared/common/app_build_capabilities.h
 platform/shared/common/app_build_configs.c
 platform/shared/common/app_build_configs.h
@@ -2067,6 +2079,7 @@ platform/shared/common/ThreadQueue.cpp
 platform/shared/common/ThreadQueue.h
 platform/shared/common/Tokenizer.cpp
 platform/shared/common/Tokenizer.h
+platform/shared/curl/Android.mk
 platform/shared/curl/include/curl/curl.h
 platform/shared/curl/include/curl/curlbuild.h
 platform/shared/curl/include/curl/curlrules.h
@@ -2221,6 +2234,7 @@ platform/shared/curl/lib/url.c
 platform/shared/curl/lib/url.h
 platform/shared/curl/lib/urldata.h
 platform/shared/curl/lib/version.c
+platform/shared/db/Android.mk
 platform/shared/db/DBAdapter.cpp
 platform/shared/db/DBAdapter.h
 platform/shared/db/DBAttrManager.cpp
@@ -2230,6 +2244,7 @@ platform/shared/db/DBResult.h
 platform/shared/db/res/db/syncdb.schema
 platform/shared/db/res/db/syncdb.triggers
 platform/shared/db/res/db/syncdb_java.triggers
+platform/shared/json/Android.mk
 platform/shared/json/arraylist.c
 platform/shared/json/arraylist.h
 platform/shared/json/AUTHORS
@@ -2254,6 +2269,7 @@ platform/shared/json/linkhash.h
 platform/shared/json/printbuf.c
 platform/shared/json/printbuf.h
 platform/shared/json/RJSONTokener.c
+platform/shared/logging/Android.mk
 platform/shared/logging/RhoATLTrace.h
 platform/shared/logging/RhoLog.cpp
 platform/shared/logging/RhoLog.h
@@ -2267,6 +2283,7 @@ platform/shared/logging/test/logconf.txt
 platform/shared/logging/test/main.cpp
 platform/shared/logging/test/TestLog.cpp
 platform/shared/logging/test/TestPlainLog.c
+platform/shared/net/Android.mk
 platform/shared/net/AsyncHttp.cpp
 platform/shared/net/AsyncHttp.h
 platform/shared/net/CompatWince.cpp
@@ -2334,6 +2351,7 @@ platform/shared/qt/rhodes/QtWebInspector.ui
 platform/shared/qt/rhodes/resources/rho.icns
 platform/shared/qt/rhodes/resources/rho.ico
 platform/shared/qt/rhodes/rhodes.pro
+platform/shared/qt/rhodes/RhoSimulator.h
 platform/shared/qt/rholib/rholib.pro
 platform/shared/qt/RhoSimulator.pro
 platform/shared/qt/rubylib/rubylib.pro
@@ -2342,6 +2360,7 @@ platform/shared/qt/syncengine/syncengine.pro
 platform/shared/RhoConnectClient/RhoConnectClient.cpp
 platform/shared/RhoConnectClient/RhoConnectClient.h
 platform/shared/RhoConnectClient/RhoError.h
+platform/shared/ruby/Android.mk
 platform/shared/ruby/array.c
 platform/shared/ruby/bignum.c
 platform/shared/ruby/blockinlining.c
@@ -2752,6 +2771,7 @@ platform/shared/ruby/wince/wince.h
 platform/shared/ruby/wince/wincemain.c
 platform/shared/ruby/wince/wincon.h
 platform/shared/ruby/wince/winsock2.c
+platform/shared/rubyext/Android.mk
 platform/shared/rubyext/GeoLocation.cpp
 platform/shared/rubyext/GeoLocation.h
 platform/shared/rubyext/NativeToolbarExt.h
@@ -2795,10 +2815,12 @@ platform/shared/shttpd/src/ssl.h
 platform/shared/shttpd/src/standalone.c
 platform/shared/shttpd/src/std_includes.h
 platform/shared/shttpd/src/string.c
+platform/shared/sqlite/Android.mk
 platform/shared/sqlite/crypto.c
 platform/shared/sqlite/sqlite3.c
 platform/shared/sqlite/sqlite3.h
 platform/shared/sqlite/sqlite3ext.h
+platform/shared/statistic/Android.mk
 platform/shared/statistic/RhoProfiler.cpp
 platform/shared/statistic/RhoProfiler.h
 platform/shared/statistic/test/TestProfiling.cpp
@@ -3677,6 +3699,7 @@ platform/shared/stlport/test/unit/vector_header_test.cpp
 platform/shared/stlport/test/unit/vector_test.cpp
 platform/shared/stlport/test/unit/wchar_header_test.c
 platform/shared/stlport/test/unit/wctype_header_test.c
+platform/shared/sync/Android.mk
 platform/shared/sync/ClientRegister.cpp
 platform/shared/sync/ClientRegister.h
 platform/shared/sync/ISyncProtocol.h
@@ -3766,6 +3789,7 @@ platform/shared/test/hippomocks/hippomocks.h
 platform/shared/test/test_helper.cpp
 platform/shared/test/test_helper.h
 platform/shared/test/Tests.cpp
+platform/shared/unzip/Android.mk
 platform/shared/unzip/unzip.cpp
 platform/shared/unzip/unzip.h
 platform/shared/wtl80/include/atlapp.h
@@ -4503,6 +4527,7 @@ res/generators/templates/application/icon/icon72.png
 res/generators/templates/application/public/css/android.css
 res/generators/templates/application/public/css/blackberry.css
 res/generators/templates/application/public/css/iphone.css
+res/generators/templates/application/public/css/jqmobile-patch.css
 res/generators/templates/application/public/css/windows_mobile.css
 res/generators/templates/application/public/images/android/btn_check_off.png
 res/generators/templates/application/public/images/android/btn_check_on.png

data/Rakefile

@@ -26,7 +26,7 @@
 
 require 'find'
 require 'erb'
-require 'rdoc/task'
+#require 'rdoc/task'
 require 'digest/sha2'
 require 'rexml/document'
 
@@ -985,18 +985,18 @@ task :switch_app => "config:common" do
 end
 
 
-Rake::RDocTask.new do |rd|
+#Rake::RDocTask.new do |rd|
 #RDoc::Task.new do |rd|
-  rd.main = "README.textile"
-  rd.rdoc_files.include("README.textile", "lib/framework/**/*.rb")
-end
-Rake::Task["rdoc"].comment=nil
-Rake::Task["rerdoc"].comment=nil
-
-task :rdocpush => :rdoc do
-  puts "Pushing RDOC. This may take a while"
-  `scp -r html/* dev@dev.rhomobile.com:dev.rhomobile.com/rhodes/`
-end
+#  rd.main = "README.textile"
+#  rd.rdoc_files.include("README.textile", "lib/framework/**/*.rb")
+#end
+#Rake::Task["rdoc"].comment=nil
+#Rake::Task["rerdoc"].comment=nil
+
+#task :rdocpush => :rdoc do
+#  puts "Pushing RDOC. This may take a while"
+#  `scp -r html/* dev@dev.rhomobile.com:dev.rhomobile.com/rhodes/`
+#end
 
 namespace "build" do
     #    desc "Build rhoconnect-client package"

data/doc/connect-to-web-services.txt

@@ -198,7 +198,13 @@ Below, a product model is created using the response from the web service and th
 	  end
 	end
 
-**NOTE: For disable jQTouch caching (by default jQTouch cached your async HTTP request result and will show saved content instead of new requested content), change creation of jQTouch object in layout.erb to next line : <script>jQT = $.jQTouch({cacheGetRequests: false});</script>**
+**NOTE: To disable jQuery Mobile page caching (by default jQuery Mobile cachepages in the DOM) globally, look for cache control options in jQuery Mobile documentation**
+
+You can disable page caching globally by using jQuery Mobile initialization option in layout.erb file:
+
+    $.mobile.page.prototype.options.domCache = true;
+
+Also, you can disable caching on exact page transition with `data-dom-cache` attribute, like that: *<a href="foo/bar/baz" data-dom-cache="false">link text</a>*
 
 
 ### Note About Animated Transitions

data/doc/css-framework.txt

@@ -4,7 +4,7 @@
 
 The Rhodes framework includes stylesheets customized for each device to give your applications a native look and feel. These stylesheets are included by default in all generated Rhodes applications (public/css/), and are included in the application layout file (app/layout.erb).
 
-The default styles will automatically be applied to all supported content found in the "toolbar", "pageTitle", and "content" divs.  If you prefer using different names for any of these divs, you will need to update your stylesheets to reflect the new names in order to retain native styling.  Conversely, if you prefer not to use any of the customized styles in your applications, you can either delete the links to the default stylesheets from your application, or simply place any content you wish to create custom styles for in a div that does not descend from "toolbar", "pageTitle", or "content".
+The default styles will automatically be applied to all supported content found in the ["header", "footer", and "content"](standard-css) divs.  If you prefer using different names for any of these divs, you will need to update your stylesheets to reflect the new names in order to retain native styling.  Conversely, if you prefer not to use any of the customized styles in your applications, you can either delete the links to the default stylesheets from your application, or simply place any content you wish to create custom styles for in a div that does not descend from "header", "footer", or "content".
 
 
 ## On designing for multiple browsers... 
@@ -76,7 +76,7 @@ Please refer to [Blackberry HTML and CSS](bb-css) for a discussion of the styles
 
 ## Standard Smartphone CSS/HTML Architecture
 
-With the exception of the <code>pageTitle</code> div, the following sections describe the styles available on iPhone, Android and Windows Mobile devices, which will generally be referred to as standard smartphones. 
+With the exception of the <code>header</code> div, the following sections describe the styles available on iPhone, Android and Windows Mobile devices, which will generally be referred to as standard smartphones.
 
 Please refer to [Standard Smartphone CSS/HTML Architecture](standard-css) for a discussion of the html markup and styles available for standard smartphones.
 
@@ -86,7 +86,7 @@ If you prefer to generate your own custom styles for your application, you can d
 
 <ol type="A">
 
-<li><p>Locate content outside of the pageTitle, toolbar and content divs.</p>  With the exception of some styles applied to the body, h1 and a tags,  the platform-specific stylesheets only apply style to content inside the pageTitle, toolbar and content divs.
+<li><p>Locate content outside of the header, footer and content divs.</p>  With the exception of some styles applied to the body, h1 and a tags,  the platform-specific stylesheets only apply style to content inside the header, footer and content divs.
 This option provides the most flexibility in the event you wish to eventually use some of the pre-defined styles.</li>
 
 <li><p>Create custom stylesheets </p> You can create custom stylesheets for your application which override some or all of the predefined styles in the generated stylesheets.  Make sure these stylesheets are included in the layout after the generated stylesheets to ensure that they fall last in the chain of inheritance.</li>

data/doc/device-caps.txt

@@ -13,26 +13,27 @@ Rhodes provide access to device specific capabilities such as GPS, PIM, camera,
 		<th>BlackBerry</th>
 		<th>Android</th>
 		<th>RhoSimulator</th>
+		<th>Symbian</th>
 	</tr>
-	<tr><td class='cap'>GeoLocation</td><td>0.3</td><td>0.3</td><td class='tbd'>TBD</td><td>0.3</td><td>1.0</td><td class='tbd'>3.5</td></tr>
-	<tr><td class='cap'>PIM Contacts</td><td>0.3</td><td>0.3</td><td class='tbd'>TBD</td><td>0.3</td><td>1.0</td><td class='tbd'>3.5</td></tr>
-	<tr><td class='cap'>PIM Calendar</td><td>2.2</td><td>2.2</td><td class='tbd'>TBD</td><td>2.2</td><td>2.2</td><td class='tbd'>3.5</td></tr>
-	<tr><td class='cap'>Camera</td><td>1.0</td><td>1.0</td><td class='tbd'>TBD</td><td>1.0</td><td>1.0</td><td>3.0</td></tr>
-	<tr><td class='cap'>Barcode</td><td>2.1</td><td>2.1</td><td class='tbd'>TBD</td><td>2.1</td><td>2.1</td><td class='tbd'>4.0</td></tr>
-	<tr><td class='cap'>Date/Time picker</td><td>1.2.2</td><td>2.0</td><td class='tbd'>TBD</td><td>1.2</td><td>1.2</td><td>3.0</td></tr>
-	<tr><td class='cap'>Menu</td><td>1.2.2</td><td>2.0</td><td>3.0</td><td>1.2</td><td>1.5</td><td>3.0</td></tr>
-	<tr><td class='cap'>Toolbar</td><td>1.2.2</td><td>2.3</td><td>3.0</td><td class='tbd'>n/a</td><td>1.5</td><td>3.0</td></tr>
-	<tr><td class='cap'>Tab Bar</td><td>1.2.2</td><td class='tbd'>3.5</td><td class='tbd'>TBD</td><td class='tbd'>n/a</td><td>1.5</td><td class='tbd'>3.5</td></tr>
-	<tr><td class='cap'>Nav Bar</td><td>2.0</td><td class='tbd'>3.5</td><td class='tbd'>TBD</td><td class='tbd'>n/a</td><td>2.0</td><td class='tbd'>4.0</td></tr>
-	<tr><td class='cap'>Signature Capture</td><td>2.1</td><td>3.0</td><td class='tbd'>TBD</td><td class='tbd'>3.5</td><td>2.1</td><td class='tbd'>4.0</td></tr>
-	<tr class='tbd'><td class='cap'>Audio/Video capture</td><td>4.0</td><td>4.0</td><td class='tbd'>TBD</td><td>4.0</td><td>4.0</td><td>4.0</td></tr>
-	<tr><td class='cap'>Bluetooth</td><td>2.2</td><td>2.2</td><td class='tbd'>TBD</td><td>2.2</td><td>2.2</td><td class='tbd'>4.0</td></tr>
-	<tr><td class='cap'>NFC</td><td class='tbd'>TBD</td><td class='tbd'>TBD</td><td class='tbd'>TBD</td><td class='tbd'>TBD</td><td>3.0</td><td class='tbd'>4.0</td></tr>
-	<tr><td class='cap'>Push</td><td>1.2</td><td class='tbd'>4.0</td><td class='tbd'>TBD</td><td>1.2</td><td>2.2</td><td class='tbd'>3.5</td></tr>
-	<tr><td class='cap'>Screen rotation</td><td>2.1</td><td class='tbd'>3.5</td><td class='tbd'>TBD</td><td>2.0</td><td>2.1</td><td class='tbd'>3.5</td></tr>
-	<tr><td class='cap'>Native Maps</td><td>1.4</td><td class='tbd'>3.5</td><td class='tbd'>TBD</td><td>1.4</td><td>1.5</td><td class='tbd'>3.5</td></tr>
-	<tr><td class='cap'>Alerts/Audio File Playback</td><td>1.2</td><td>1.5</td><td class='tbd'>TBD</td><td>1.2</td><td>1.2</td><td class='tbd'>3.5</td></tr>
-	<tr><td class='cap'>Ringtones</td><td>3.5</td><td>1.5</td><td class='tbd'>TBD</td><td>1.5</td><td>1.5</td><td class='tbd'>3.5</td></tr>
+	<tr><td class='cap'>GeoLocation</td><td>0.3</td><td>0.3</td><td class='tbd'>TBD</td><td>0.3</td><td>1.0</td><td class='tbd'>3.5</td><td class='tbd'>TBD</td></tr>
+	<tr><td class='cap'>PIM Contacts</td><td>0.3</td><td>0.3</td><td class='tbd'>TBD</td><td>0.3</td><td>1.0</td><td class='tbd'>3.5</td><td>3.1</td></tr>
+	<tr><td class='cap'>PIM Calendar</td><td>2.2</td><td>2.2</td><td class='tbd'>TBD</td><td>2.2</td><td>2.2</td><td class='tbd'>3.5</td><td class='tbd'>TBD</td></tr>
+	<tr><td class='cap'>Camera</td><td>1.0</td><td>1.0</td><td class='tbd'>TBD</td><td>1.0</td><td>1.0</td><td>3.0</td><td class='tbd'>TBD</td></tr>
+	<tr><td class='cap'>Barcode</td><td>2.1</td><td>2.1</td><td class='tbd'>TBD</td><td>2.1</td><td>2.1</td><td class='tbd'>4.0</td><td class='tbd'>TBD</td></tr>
+	<tr><td class='cap'>Date/Time picker</td><td>1.2.2</td><td>2.0</td><td class='tbd'>TBD</td><td>1.2</td><td>1.2</td><td>3.0</td><td class='tbd'>TBD</td></tr>
+	<tr><td class='cap'>Menu</td><td>1.2.2</td><td>2.0</td><td>3.0</td><td>1.2</td><td>1.5</td><td>3.0</td><td>3.1</td></tr>
+	<tr><td class='cap'>Toolbar</td><td>1.2.2</td><td>2.3</td><td>3.0</td><td class='tbd'>n/a</td><td>1.5</td><td>3.0</td><td>3.1</td></tr>
+	<tr><td class='cap'>Tab Bar</td><td>1.2.2</td><td class='tbd'>3.5</td><td>3.0</td><td class='tbd'>n/a</td><td>1.5</td><td>3.1</td><td>3.1</td></tr>
+	<tr><td class='cap'>Nav Bar</td><td>2.0</td><td class='tbd'>3.5</td><td class='tbd'>TBD</td><td class='tbd'>n/a</td><td>2.0</td><td class='tbd'>4.0</td><td class='tbd'>TBD</td></tr>
+	<tr><td class='cap'>Signature Capture</td><td>2.1</td><td>3.0</td><td class='tbd'>TBD</td><td class='tbd'>3.5</td><td>2.1</td><td class='tbd'>4.0</td><td class='tbd'>TBD</td></tr>
+	<tr class='tbd'><td class='cap'>Audio/Video capture</td><td>4.0</td><td>4.0</td><td class='tbd'>TBD</td><td>4.0</td><td>4.0</td><td>4.0</td><td class='tbd'>TBD</td></tr>
+	<tr><td class='cap'>Bluetooth</td><td>2.2</td><td>2.2</td><td class='tbd'>TBD</td><td>2.2</td><td>2.2</td><td class='tbd'>4.0</td><td class='tbd'>TBD</td></tr>
+	<tr><td class='cap'>NFC</td><td class='tbd'>TBD</td><td class='tbd'>TBD</td><td class='tbd'>TBD</td><td class='tbd'>TBD</td><td>3.0</td><td class='tbd'>4.0</td><td class='tbd'>TBD</td></tr>
+	<tr><td class='cap'>Push</td><td>1.2</td><td class='tbd'>4.0</td><td class='tbd'>TBD</td><td>1.2</td><td>2.2</td><td class='tbd'>3.5</td><td class='tbd'>TBD</td></tr>
+	<tr><td class='cap'>Screen rotation</td><td>2.1</td><td class='tbd'>3.5</td><td class='tbd'>TBD</td><td>2.0</td><td>2.1</td><td class='tbd'>3.5</td><td class='tbd'>TBD</td></tr>
+	<tr><td class='cap'>Native Maps</td><td>1.4</td><td class='tbd'>3.5</td><td class='tbd'>TBD</td><td>1.4</td><td>1.5</td><td class='tbd'>3.5</td><td class='tbd'>TBD</td></tr>
+	<tr><td class='cap'>Alerts/Audio File Playback</td><td>1.2</td><td>1.5</td><td class='tbd'>TBD</td><td>1.2</td><td>1.2</td><td>3.1</td><td class='tbd'>TBD</td></tr>
+	<tr><td class='cap'>Ringtones</td><td>3.5</td><td>1.5</td><td class='tbd'>TBD</td><td>1.5</td><td>1.5</td><td class='tbd'>3.5</td><td class='tbd'>TBD</td></tr>
 </table>	
 
 ## System class
@@ -135,7 +136,7 @@ as more precise data.
 
 The Rhodes framework provides a simple HTML tag for accessing Geolocation information. To use it, include the appropriate javascript library on your page:
 
-* For iPhone, Android: `/public/js/jquery-1.2.6.min.js` and `/public/js/rhogeolocation.js`
+* For iPhone, Android: `/public/jquery/jquery-1.6.2.min.js` and `/public/js/rhogeolocation.js`
 * For Windows Mobile: `/public/js/rhogeolocation-wm.js`
 * For BlackBerry: Unsupported. The BlackBerry webview control doesn't support Ajax. 
 
@@ -1032,7 +1033,7 @@ Use System.open_url : you can provide any url with any schema(http, file etc), d
 	:::ruby
 	System.open_url('http://www.rhomobile.com')
 
-Use rho_open_target=_blank in html link. Note that jqtouch or other javascript library may disable this attribute.
+Use rho_open_target=_blank in html link. Note that jQuery Mobile or other javascript library may disable this attribute.
 	:::html
 	<a href="http://www.google.com/?rho_open_target=_blank">Open Google in external browser</a>
 
@@ -1275,8 +1276,8 @@ Open link in external application (browser for http:// links):
 
 Open appstore on iphone: [http://wiki.akosma.com/IPhone_URL_Schemes#App_Store](http://wiki.akosma.com/IPhone_URL_Schemes#App_Store)
 
-### jQuery/JQtouch
-When using jQuery/JQtouch in application code, you cannot use usual html links for hyperlinks. You need to call controller action and call WebView.navigate from there:
+### jQuery/jQuery Mobile
+When using jQuery and/or jQuery Mobile in application code, you cannot use usual html links for hyperlinks. You need to call controller action and call WebView.navigate from there:
 
     #Ajax call of controller method:
     $.get("/app/TestController/send_mail",function(data) {});

data/doc/generator.txt

@@ -65,8 +65,10 @@ The generated application has the following directory structure and files.
 	   	<default set of css for different platforms>
 	./public/images:
 		<default images used by js libraries>
-	./public/jqtouch:
-		<jqtouch js script with some rhomobile fixes>
+	./public/jquery:
+		<jQuery js script with some rhomobile fixes>
+	./public/jqmobile:
+		<jQuery Mobile js script with some rhomobile fixes>
 	./public/js:
 	   	<default js libraries>
 

data/doc/standard-css.txt

@@ -2,23 +2,24 @@
 
 ## HTML Structure 
 
-### pageTitle (\<div id="pageTitle"\>)
+### header and toolbar (\<div data-role="header"\>)
 
-The pageTitle div contains the title of the current page, wrapped in an <code>h1</code> tag.  The page title will be displayed in the appropriate location for each device. 
+The header div contains the title of the current page, wrapped in an <code>h1</code> tag and toolbar as set of <code>a</code> tags.  The page title will be displayed in the appropriate location for each device.
 
-The pageTitle div is not displayed on Windows Mobile devices.
-	:::html
-	<div id="pageTitle">
-          <h1>Things</h1>
-	</div>
+The header div is not displayed on Windows Mobile devices.
 
-### toolbar (\<div id="toolbar"\>)
+	:::html
+    <div data-role="header" data-position="inline">
+        <h1>Things</h1>
+        <a href="#" class="ui-btn-left">Left button</a>
+        <a href="#" class="ui-btn-right">Right button</a>
+    </div>
 
-The toolbar <code>div</code> contains contains interaction elements that allow users to perform actions and navigate through the application.  Most frequently, these elements are links styled as buttons.  
+The toolbar contains interaction elements that allow users to perform actions and navigate through the application.  Most frequently, these elements are links styled as buttons.
+The toolbar <code>div</code> is displayed at the top of the page on standard smartphones.
 
-The toolbar <code>div</code> is displayed at the top of the page on standard smartphones.  
 <ul>
-<li>On the iPhone, the content of the toolbar is overlaid on top of the <code>pageTitle</code> div.</li>
+<li>On the iPhone, the content of the toolbar is overlaid on top of the <code>header</code> div.</li>
 <li>On Android, the application toolbar is typically displayed at the bottom of the screen.  However, the <code>position:fixed</code> attribute does not exhibit the expected behavior in webkit-based mobile browsers.  To ensure that the view is rendered at the appropriate resolution, mobile webkit-based browsers use a viewport to determine which content is displayed. </li>
 </ul>
 
@@ -32,12 +33,12 @@ You can read more about the conflict between viewports and fixed positioning at
 
 The toolbar div supports three positions:
 <ul>
-<li><code>#leftItem</code></li>
-<li><code>#rightItem</code></li>
-<li><code>#centerItem</code></li>
+<li><code>class="ui-btn-left"</code></li>
+<li><code>class="ui-btn-center"</code></li>
+<li><code>class="ui-btn-right"</code></li>
 </ul>
 
-Note that placing an item in the <code>#centerItem</code> div will prevent the page title from being displayed on the iPhone, and is not in compliance with Apple's human interface guidelines.
+Note that placing an item as the <code><a class="ui-btn-center>"</code> tag will prevent the page title from being displayed on the iPhone, and is not in compliance with Apple's human interface guidelines.
 If you wish to include more than two items in an application targeting iPhone, you may wish to add a secondary toolbar directly below the application toolbar.
 
 #### Toolbar Button Styles
@@ -80,7 +81,7 @@ Four button styles are supported for the toolbar.  Note that variation in height
 
 **NOTE: the variation in width of the buttons for Android is due to the length of the text in the button, and should not be attributed to the classes described in this section. **
 
-### Content (\<div id="content"\>)
+### Content (\<div data-role="content"\>)
  
 The features described below are only accessible when used inside the content div.  
 
@@ -107,32 +108,6 @@ Sample: no current example
 	   	<li><%= link_to :controller => :Purchase %></li>
 	</ul>
 
-Sample: none
-
-##### List with disclosure indicators (">")
-
-	:::html
-	<ul>            
-	   <li>
-	      <a href="<%= url_for :action => :show, :id => obj.object %>">
-	         <span class="title">Product</span>
-	         <span class="disclosure_indicator"></span>
-	      </a>
-	   </li>
-	   <li>
-	      <a href="<%= url_for :action => :show, :id => obj.object %>">
-	         <span class="title"> Inventory </span>
-	         <span class="disclosure_indicator"></span>
-	      </a>
-	   </li>
-	   <li>
-	      <a href="<%= url_for :action => :show, :id => obj.object %>">
-	         <span class="title"> Location </span>
-	         <span class="disclosure_indicator"></span>
-	      </a>
-	   </li>
-	</ul>
-
 Sample: generated application index.erb page
 
 **NOTE: Disclosure indicators are only displayed on iPhone, and are not displayed on Android or Windows Mobile. **

data/doc/tutorial.txt

@@ -64,44 +64,38 @@ You can edit the generated ERB files to customize the HTML as you see fit.  Typi
 
 
     :::ruby
-    <div id="pageTitle">
-      <h1>Storemanager</h1>
-    </div>
+    <div data-role="page">
+
+      <div data-role="header" data-position="inline">
+        <h1>Storemanager</h1>
+        <% if SyncEngine::logged_in > 0 %>
+            <a href="<%= url_for :controller => :Settings, :action => :do_sync %>" class="ui-btn-left" data-icon="refresh">Sync</a>
+            <a href="<%= url_for :controller => :Settings, :action => :logout %>" class="ui-btn-right" data-icon="star">Logout</a>
+        <% else %>
+            <a href="<%= url_for :controller => :Settings, :action => :login %>" class="ui-btn-right" data-icon="star">Login</a>
+        <% end %>
+      </div>
 
-    <div id="toolbar">
-      <div id="leftItem" class="blueButton">
-        <%= link_to "Sync", :controller => :Settings, :action => :do_sync %>
+      <div data-role="content">
+        <ul data-role="listview">
+          <li>
+            <a href="#">Add Links Here...</a>
+          </li>
+        </ul>
+      </div>
+
+      <div data-role="footer" data-position="inline">
+        <p>it is optional part of page..</p>
       </div>
-      <% if SyncEngine::logged_in > 0 %>
-        <div id="rightItem" class="regularButton">
-          <%= link_to "Logout", :controller => :Settings, :action => :logout %>
-        </div>
-      <% else %>
-        <div id="rightItem" class="regularButton">
-          <%= link_to "Login", :controller => :Settings, :action => :login %>
-        </div>
-      <% end %>
-    </div>
 
-    <div id="content">
-      <ul>
-        <li>
-          <a href="#">
-            <span class="title">Add Links Here...</span>
-            <span class="disclosure_indicator"></span>
-          </a>
-        </li>
-      </ul>
     </div>
 
+
 To provide a link to the Product model's index page and templates you can replace the list item with the title "Add links here" with:
 
     :::ruby
     <li>
-      <a href="Product">
-        <span class="title">Products</span>
-        <span class="disclosure_indicator"></span>
-      </a>
+        <a href="Product">Products</a>
     </li>
 
 <img src="http://img.skitch.com/20100512-grk9ymqwj66jypdckthmm5484n.png"/>