rhodes 3.1.0.beta.3 → 3.1.0.beta.4

data/platform/wm/rhodes/bluetooth/Bluetooth.cpp

@@ -1050,8 +1050,8 @@ void rho_bluetooth_set_device_name(const char* device_name) {
 	RhoBluetoothManager::getInstance()->rho_bluetooth_set_device_name(device_name);
 }
 
-const char* rho_bluetooth_get_device_name() {
-	return RhoBluetoothManager::getInstance()->rho_bluetooth_get_device_name();
+VALUE rho_bluetooth_get_device_name() {
+	return rho_ruby_create_string(RhoBluetoothManager::getInstance()->rho_bluetooth_get_device_name());
 }
 
 const char* rho_bluetooth_get_last_error() {
@@ -1268,8 +1268,8 @@ void rho_bluetooth_off_bluetooth() {
 void rho_bluetooth_set_device_name(const char* device_name) {
 }
 
-const char* rho_bluetooth_get_device_name() {
-	return "ERROR";
+VALUE rho_bluetooth_get_device_name() {
+	return rho_ruby_create_string("ERROR");
 }
 
 const char* rho_bluetooth_get_last_error() {

data/platform/wm/rhodes/bluetooth/Bluetooth.h

@@ -322,7 +322,7 @@ extern "C" void rho_bluetooth_off_bluetooth();
 
 extern "C" void rho_bluetooth_set_device_name(const char* device_name);
 
-extern "C" const char* rho_bluetooth_get_device_name();
+extern "C" VALUE rho_bluetooth_get_device_name();
 
 extern "C" const char* rho_bluetooth_get_last_error();
 

data/res/generators/templates/application/app/Settings/controller.rb

@@ -39,6 +39,7 @@ class SettingsController < Rho::RhoController
     if @params['login'] and @params['password']
       begin
         SyncEngine.login(@params['login'], @params['password'], (url_for :action => :login_callback) )
+        @response['headers']['Wait-Page'] = 'true'
         render :action => :wait
       rescue Rho::RhoError => e
         @msg = e.message

data/res/generators/templates/application/app/layout.erb

@@ -21,7 +21,7 @@
     <%% if System::get_property('platform') == 'APPLE' || System::get_property('platform') == 'ANDROID' || is_bb6 || ( System::get_property('platform') == 'UNKNOWN' && System::get_property('webview_framework') =~ /^WEBKIT/) %>
         <script src="/public/jquery/jquery-1.6.2.min.js" type="text/javascript"></script>
 
-        <link rel="stylesheet" href="/public/jqmobile/jquery.mobile-1.0b1.min.css">
+        <link rel="stylesheet" href="/public/jqmobile/jquery.mobile-1.0b2.min.css">
         <link rel="stylesheet" href="/public/css/jqmobile-patch.css">
         <%% if System::get_property('platform') == 'APPLE' %>
             <link href="/public/jqmobile/jquery.mobile.iphone.css" type="text/css" rel="stylesheet"/>
@@ -32,11 +32,23 @@
                 // jQuery-Mobile init options initialization goes here. For example, you may
                 // enable automatically generated 'Back' buttons on headers this way:
                 //$.mobile.page.prototype.options.addBackBtn = true;
-                // Look for other init options here:
-                // http://jquerymobile.com/demos/1.0b1/#/demos/1.0b1/docs/api/globalconfig.html
+
+                // You can disable (with false value) or change page loading message
+                $.mobile.loadingMessage = false;
+                //$.mobile.loadingMessage = "loading"; // it is default value
+
+                // For documented init options look here:
+                // http://jquerymobile.com/demos/1.0b2/#/demos/1.0b2/docs/api/globalconfig.html
+
+                // For poorly documented options search for ".prototype.options"
+                // in the jQuery Mobile source code
+
+                // Rhodes custom option!
+                // how long to wait transition end before "loading.." message will be shown
+                $.mobile.loadingMessageDelay = 300; // in ms
             });
         </script>
-        <script type="text/javascript" charset="utf-8" src="/public/jqmobile/jquery.mobile-1.0b1.min.js"></script>
+        <script type="text/javascript" charset="utf-8" src="/public/jqmobile/jquery.mobile-1.0b2.min.js"></script>
         <script type="text/javascript" charset="utf-8" src="/public/js/jqmobile-patch.js"></script>
 
     <%% end %>

data/res/generators/templates/application/public/css/android.css

@@ -330,6 +330,15 @@ h1 {
     color: red;
 }
 
+.ui-content ul li div.itemLabel {
+    display: inline-block;
+}
+
+.ui-content ul li div.itemValue {
+    display: inline-block;
+    float: right;
+}
+
 .errorMessage {
     color: red;
     text-align: center

data/res/generators/templates/application/public/css/blackberry.css

@@ -114,6 +114,15 @@ div[data-role="content"] table tr td.itemValue {
     width:50%;
 }
 
+.ui-content ul li div.itemLabel {
+    display: inline-block;
+}
+
+.ui-content ul li div.itemValue {
+    display: inline-block;
+    float: right;
+}
+
 .errorMessage {
     color: red;
     text-align: center

data/res/generators/templates/application/public/css/iphone.css

@@ -462,49 +462,58 @@ h1 {
 	font-size:smaller;
 }
 
-	/* Include the .ls-button style on each button div. */
-	.switcher .ls-button {
-		background: -webkit-gradient(linear, left top, left bottom, color-stop(0, rgb(171,185,202)), color-stop(0.5, rgb(130,151,175)), color-stop(0.51, rgb(118,139,167)), color-stop(1, rgb(120,141,169)));
-		width:80px;  /* NOTE: If you only want to use 2 buttons, increase width to something more like 125px, and change margin to 0 -3px. */
-		height:15px;
-		display:inline-block;
-		padding-bottom:8px;
-		margin:0 -2px;
-		border:1px solid #000;
-		text-align:center;
-	}
-
-	/* Indicates the currently active (pressed) button. */
-	.switcher .ls-pressed {
-		background: -webkit-gradient(linear, left top, left bottom, color-stop(0, rgb(142,164,193)), color-stop(0.5, rgb(88,119,162)), color-stop(0.51, rgb(71,105,153)), color-stop(1, rgb(74,108,152)));
-	}
-
-	.switcher .ls-left {
-		-webkit-border-top-left-radius: 4px;
-		-webkit-border-bottom-left-radius: 4px;
-	}
-
-	.switcher .ls-center {
-		border-right:none;
-		border-left:none;
-	}
-
-	.switcher .ls-right {
-		-webkit-border-top-right-radius: 4px;
-		-webkit-border-bottom-right-radius: 4px;
-	}
-
-	/* If an option should not be available, you can use the .ls-disabled class to gray it out. */
-	.switcher .ls-disabled {
-		background:-webkit-gradient(linear, left bottom, left top, color-stop(0, rgb(158,158,158)), color-stop(0.95, rgb(204,204,204)))
-	}
-
-	/* However, even with disabled classes you must still include an <a> tag. Just have it go href="#" */
-	.switcher .ls-disabled a {
-		color:#f0f0f0;
-	}
-
-    .errorMessage {
-        color: red;
-        text-align: center
-    }
+/* Include the .ls-button style on each button div. */
+.switcher .ls-button {
+    background: -webkit-gradient(linear, left top, left bottom, color-stop(0, rgb(171,185,202)), color-stop(0.5, rgb(130,151,175)), color-stop(0.51, rgb(118,139,167)), color-stop(1, rgb(120,141,169)));
+    width:80px;  /* NOTE: If you only want to use 2 buttons, increase width to something more like 125px, and change margin to 0 -3px. */
+    height:15px;
+    display:inline-block;
+    padding-bottom:8px;
+    margin:0 -2px;
+    border:1px solid #000;
+    text-align:center;
+}
+
+/* Indicates the currently active (pressed) button. */
+.switcher .ls-pressed {
+    background: -webkit-gradient(linear, left top, left bottom, color-stop(0, rgb(142,164,193)), color-stop(0.5, rgb(88,119,162)), color-stop(0.51, rgb(71,105,153)), color-stop(1, rgb(74,108,152)));
+}
+
+.switcher .ls-left {
+    -webkit-border-top-left-radius: 4px;
+    -webkit-border-bottom-left-radius: 4px;
+}
+
+.switcher .ls-center {
+    border-right:none;
+    border-left:none;
+}
+
+.switcher .ls-right {
+    -webkit-border-top-right-radius: 4px;
+    -webkit-border-bottom-right-radius: 4px;
+}
+
+/* If an option should not be available, you can use the .ls-disabled class to gray it out. */
+.switcher .ls-disabled {
+    background:-webkit-gradient(linear, left bottom, left top, color-stop(0, rgb(158,158,158)), color-stop(0.95, rgb(204,204,204)))
+}
+
+/* However, even with disabled classes you must still include an <a> tag. Just have it go href="#" */
+.switcher .ls-disabled a {
+    color:#f0f0f0;
+}
+
+.ui-content ul li div.itemLabel {
+    display: inline-block;
+}
+
+.ui-content ul li div.itemValue {
+    display: inline-block;
+    float: right;
+}
+
+.errorMessage {
+    color: red;
+    text-align: center
+}

data/res/generators/templates/application/public/css/jqmobile-patch.css

@@ -1,22 +1,35 @@
+/* min-width has been changed from 450px to 320px */
 @media all and (min-width: 320px){
 	.ui-controlgroup-label { vertical-align: top; display: inline-block;  width: 20%;  margin: 0 2% 0 0;  }
-	.ui-controlgroup-controls { width: 60%; display: inline-block; } 
+	.ui-controlgroup-controls { width: 60%; display: inline-block; }
 }
 
+/* min-width has been changed from 450px to 320px */
 @media all and (min-width: 320px){
 	.ui-field-contain { border-width: 0; padding: 0; margin: 1em 0; }
 }
 
+/* min-width has been changed from 450px to 320px */
 @media all and (min-width: 320px){
 	label.ui-select { display: inline-block;  width: 20%;  margin: 0 2% 0 0; }
 	.ui-select { width: 60%; display: inline-block; }
 }	
 
+/* min-width has been changed from 450px to 320px */
 @media all and (min-width: 320px){
 	label.ui-input-text  { vertical-align: top; display: inline-block;  width: 20%;  margin: 0 2% 0 0 }
 	input.ui-input-text, 
 	textarea.ui-input-text, 
-	.ui-input-search { width: 60%; display: inline-block; } 
+	.ui-input-search { width: 60%; display: inline-block; }
 	.ui-input-search { width: 50%; }
 	.ui-input-search input.ui-input-text { width: 98%; /*echos rule from above*/ }
 }
+
+/* fields placement fix, because min-width has been changed from 450px to 320px */
+@media all and (min-width: 320px){
+    .ui-controlgroup-controls,
+    .ui-select,
+    input.ui-input-text,
+    textarea.ui-input-text,
+    .ui-input-search { margin-left: 20px; }
+}