RubyGems - rhodes - Versions diffs - 5.5.0.3 → 5.5.0.7 - Mend

rhodes 5.5.0.3 → 5.5.0.7

Files changed (131) hide show

data/res/generators/templates/application/app/index.erb CHANGED

@@ -1,24 +1,36 @@
-<div data-role="page" data-url="<%%= Rho::Application.startURI %>/">
+<div class="container-fluid">
-<% if @rhoconnectclient_ext %>
-  <div data-role="header" data-position="inline">
-    <h1><%= class_name %></h1>
-    <%% if Rho::RhoConnectClient.isLoggedIn %>
-    <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>
-<% end %>
-  <div data-role="content">
-    <ul data-role="listview">
-      <li><a href="#">Add link here...</a></li>
-    </ul>
+  <% if @rhoconnectclient_ext %>
+      <div class="row page-title">
+        <div class="col-xs-2 col-sm-2 col-md-2 col-lg-2">
+          <%% if Rho::RhoConnectClient.isLoggedIn %>
+          <a href="<%%= url_for :controller => :Settings, :action => :do_sync %>" class="btn btn-default btn-sm pull-left">
+            Sync
+          </a>
+          <%% end %>
+        </div>
+        <div class="col-xs-8 col-sm-8 col-md-8 col-lg-8">
+          <h3 class="text-center"><%= class_name %></h3>
+        </div>
+        <div class="col-xs-2 col-sm-2 col-md-2 col-lg-2">
+            <%% if Rho::RhoConnectClient.isLoggedIn %>
+            <a href="<%%= url_for :controller => :Settings, :action => :logout %>" class="btn btn-default btn-sm pull-right">
+              Logout
+            </a>
+            <%% else %>
+            <a href="<%%= url_for :controller => :Settings, :action => :login %>" class="btn btn-primary btn-sm pull-right">Login</a>
+            <%% end %>
+        </div>
+      </div>
+  <% end %>
+  <div class="row">
+    <div class="list-group">
+      <a href="#" class="list-group-item">
+        <span class="glyphicon glyphicon-chevron-right pull-right" aria-hidden="true"></span>
+        Add link here...
+      </a>
+    </div>
   </div>
 </div>

data/res/generators/templates/application/app/javascript_index.html ADDED

@@ -0,0 +1,66 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+        "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+    <title><%= class_name %></title>
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0"/>
+    <link rel="stylesheet" href="/public/bootstrap-3.3.7/css/bootstrap.min.css">
+    <link rel="stylesheet" href="/public/css/style.css">
+    <script type="text/javascript" src="/public/jquery/jquery-3.1.1.min.js"></script>
+    <script type="text/javascript" src="/public/bootstrap-3.3.7/js/bootstrap.min.js"></script>
+    <script type="text/javascript" src="/public/api/rhoapi-modules.js"></script>
+    <script type="text/javascript" src="/public/api/rhoapi-modules-ORM.js"></script>
+    <script type="text/javascript" src="/public/api/rhoapi-modules-ORMHelper.js"></script>
+    <script type="text/javascript" src="/public/api/rhoapi-modules-Ruby-RunTime.js"></script>
+    <script type="text/javascript" src="index.js"></script>
+</head>
+<body>
+<div class="container-fluid">
+    <div class="row page-title">
+        <div class="col-xs-2 col-sm-2 col-md-2 col-lg-2">
+            <% if @rhoconnectclient_ext %>
+            <button id="syncBtn" class="btn btn-default btn-sm pull-left hidden"> Sync</button>
+            <% end %>
+        </div>
+        <div class="col-xs-8 col-sm-8 col-md-8 col-lg-8">
+            <h3 class="text-center"><%= class_name %></h3>
+        </div>
+        <div class="col-xs-2 col-sm-2 col-md-2 col-lg-2">
+            <% if @rhoconnectclient_ext %>
+            <button id="logoutBtn" class="btn btn-default btn-sm pull-right hidden"> Logout</button>
+            <a id="loginBtn" href="settings/login.html" class="btn btn-primary btn-sm pull-right hidden">Login</a>
+            <% end %>
+        </div>
+    </div>
+    <div id="alert" class="alert hidden">
+        <strong id="title"></strong>&nbsp;<span id="text"></span>
+    </div>
+    <div class="row">
+        <div class="list-group">
+            <a href="#" class="list-group-item">
+                <span class="glyphicon glyphicon-chevron-right pull-right" aria-hidden="true"></span>
+                Add link here...
+            </a>
+        </div>
+    </div>
+</div>
+<script>
+    window.addEventListener("load", function () {
+        var page = new App.IndexPage();
+        page.init();
+    });
+</script>
+</body>
+</html>

data/res/generators/templates/application/app/javascript_index.js ADDED

@@ -0,0 +1,250 @@
+var App = {
+    rhoClientErrorByCode: function (aString) {
+        var code = parseInt(aString);
+        if (code === 0) {
+            return "ERR_NONE";
+        }
+        if (code === 1) {
+            return "ERR_NETWORK";
+        }
+        if (code === 2) {
+            return "ERR_REMOTESERVER";
+        }
+        if (code === 3) {
+            return "ERR_RUNTIME";
+        }
+        if (code === 4) {
+            return "ERR_UNEXPECTEDSERVERRESPONSE";
+        }
+        if (code === 5) {
+            return "ERR_DIFFDOMAINSINSYNCSRC";
+        }
+        if (code === 6) {
+            return "ERR_NOSERVERRESPONSE";
+        }
+        if (code === 7) {
+            return "ERR_CLIENTISNOTLOGGEDIN";
+        }
+        if (code === 8) {
+            return "ERR_CUSTOMSYNCSERVER";
+        }
+        if (code === 9) {
+            return "ERR_UNATHORIZED";
+        }
+        return "Unknown error " + code;
+    },
+    IndexPage: function () {
+        var messageTimeout;
+        var that = this;
+        this.syncNotify = function (result) {
+            if (result.error_code) {
+                that.showWarning("Error.", App.rhoClientErrorByCode(result.error_code));
+            } else {
+                that.showInfo("Success!", "Database has been synced");
+            }
+        };
+        this.showWarning = function (title, text) {
+            var duration = 5000;
+            var alertElement = $("#alert");
+            alertElement.addClass("alert-warning");
+            $("#alert > #title").text(title);
+            $("#alert > #text").text(text);
+            alertElement.removeClass("hidden");
+            if (messageTimeout != null) {
+                clearTimeout(messageTimeout);
+            }
+            messageTimeout = setTimeout(function () {
+                alertElement.removeClass("alert-warning");
+                alertElement.addClass("hidden");
+            }, duration);
+        };
+        this.showInfo = function (title, text) {
+            var duration = 5000;
+            var alertElement = $("#alert");
+            alertElement.addClass("alert-info");
+            $("#alert > #title").text(title);
+            $("#alert > #text").text(text);
+            alertElement.removeClass("hidden");
+            if (messageTimeout != null) {
+                clearTimeout(messageTimeout);
+            }
+            messageTimeout = setTimeout(function () {
+                alertElement.removeClass("alert-info");
+                alertElement.addClass("hidden");
+            }, duration);
+        };
+        this.updateRhoClientControlButtons = function () {
+            if (Rho.RhoConnectClient == null) {
+                return;
+            }
+            var loggedIn = Rho.RhoConnectClient.isLoggedIn();
+            $("#logoutBtn").toggleClass("hidden", !loggedIn);
+            $("#syncBtn").toggleClass("hidden", !loggedIn);
+            $("#loginBtn").toggleClass("hidden", loggedIn);
+        };
+        this.init = function () {
+            Rho.NativeToolbar.create([
+                {action: "back"},
+                {action: "separator"},
+                {action: "home"},
+                {action: "options"},
+                {action: "refresh"}
+            ], {});
+            if (Rho.RhoConnectClient != null) {
+                Rho.RhoConnectClient.setNotification("*", that.syncNotify);
+            }
+            $("#logoutBtn").on("click", function () {
+                Rho.RhoConnectClient.logout();
+                that.updateRhoClientControlButtons();
+            });
+            $("#syncBtn").on("click", function () {
+                Rho.RhoConnectClient.doSync();
+                that.showInfo("Please wait.", "Sync has been triggered.");
+            });
+            that.updateRhoClientControlButtons();
+        }
+    },
+    SettingsPage: function () {
+        var messageTimeout;
+        var that = this;
+        this.showWarning = function (title, text) {
+            var duration = 5000;
+            var alertElement = $("#alert");
+            alertElement.addClass("alert-warning");
+            $("#alert > #title").text(title);
+            $("#alert > #text").text(text);
+            alertElement.removeClass("hidden");
+            if (messageTimeout != null) {
+                clearTimeout(messageTimeout);
+            }
+            messageTimeout = setTimeout(function () {
+                alertElement.removeClass("alert-warning");
+                alertElement.addClass("hidden");
+            }, duration);
+        };
+        this.showInfo = function (title, text) {
+            var duration = 5000;
+            var alertElement = $("#alert");
+            alertElement.addClass("alert-info");
+            $("#alert > #title").text(title);
+            $("#alert > #text").text(text);
+            alertElement.removeClass("hidden");
+            if (messageTimeout != null) {
+                clearTimeout(messageTimeout);
+            }
+            messageTimeout = setTimeout(function () {
+                alertElement.removeClass("alert-info");
+                alertElement.addClass("hidden");
+            }, duration);
+        };
+        this.syncNotify = function (result) {
+            if (result.error_code) {
+                that.showWarning("Error.", App.rhoClientErrorByCode(result.error_code));
+            } else {
+                that.showInfo("Success!", "Database has been synced");
+            }
+        };
+        this.updateUI = function () {
+            if (Rho.RhoConnectClient == null) {
+                return;
+            }
+            var loggedIn = Rho.RhoConnectClient.isLoggedIn();
+            $("#logoutItem").toggleClass("hidden", !loggedIn);
+            $("#performSyncItem").toggleClass("hidden", !loggedIn);
+            $("#loginItem").toggleClass("hidden", loggedIn);
+        };
+        this.init = function () {
+            if (Rho.RhoConnectClient != null) {
+                Rho.RhoConnectClient.setNotification("*", that.syncNotify);
+            }
+            that.updateUI();
+            $("#back").on("click", function () {
+                history.back();
+            });
+            $("#clientId").text(Rho.ORM.getClientId());
+            $("#resetDatabaseItem").on("click", function () {
+                $('#resetDatabaseModalDialog').modal('show');
+            });
+            $('#resetDatabaseModalDialog').on('hidden.bs.modal', function () {
+                Rho.ORM.databaseFullReset();
+                that.showInfo("", "Database has been reset.");
+                Rho.RhoConnectClient.doSync();
+            });
+            $("#performSyncItem").on("click", function () {
+                Rho.RhoConnectClient.doSync();
+                that.showInfo("Please wait.", "Sync has been triggered.");
+            });
+            $("#logoutItem").on("click", function () {
+                Rho.RhoConnectClient.logout();
+                that.updateUI();
+                that.showInfo("", "You have been logged out.");
+            });
+        }
+    },
+    LoginPage: function () {
+        var messageTimeout;
+        var that = this;
+        this.showWarning = function (title, text) {
+            var duration = 5000;
+            var alertElement = $("#alert");
+            alertElement.addClass("alert-warning");
+            $("#alert > #title").text(title);
+            $("#alert > #text").text(text);
+            alertElement.removeClass("hidden");
+            if (messageTimeout != null) {
+                clearTimeout(messageTimeout);
+            }
+            messageTimeout = setTimeout(function () {
+                alertElement.removeClass("alert-warning");
+                alertElement.addClass("hidden");
+            }, duration);
+        };
+        this.init = function () {
+            $("#back").on("click", function () {
+                history.back();
+            });
+            $("#loginBtn").on("click", function () {
+                var username = $("#username").val();
+                var password = $("#password").val();
+                Rho.RhoConnectClient.login(username, password, function (err) {
+                    //The operation has been failed
+                    if (err.error_code != 0) {
+                        var errorText = err.error_message != "" ? err.error_message : "Unknown error with code: " + err.error_code;
+                        that.showWarning("Login error.", errorText);
+                    }
+                    else {
+                        //the operation has been completed successfully
+                        history.back();
+                    }
+                });
+            });
+        }
+    }
+}

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

@@ -3,77 +3,22 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
+  <title><%= class_name %></title>
+  <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0"/>
+  <link rel="stylesheet" href="/public/bootstrap-3.3.7/css/bootstrap.min.css">
+  <link rel="stylesheet" href="/public/css/style.css">
+  <script src="/public/jquery/jquery-3.1.1.min.js" type="text/javascript"></script>
+  <script src="/public/bootstrap-3.3.7/js/bootstrap.min.js" type="text/javascript"></script>
+  <%% if Rho::System.getProperty('platform') == 'APPLE' || Rho::System.getProperty('platform') == 'ANDROID' ||
+  ( Rho::System.getProperty('platform') != 'WINDOWS' && Rho::System.getProperty('webviewFramework') =~ /^WEBKIT/) %>
+  <script src="/public/api/rhoapi-modules.js" type="text/javascript"></script>
+  <%% end %>
-    <title><%= class_name %></title>
-    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0"/>
-    <%% if Rho::System.getProperty('platform') == 'APPLE' || Rho::System.getProperty('platform') == 'ANDROID' ||
-        ( Rho::System.getProperty('platform') != 'WINDOWS' && Rho::System.getProperty('webviewFramework') =~ /^WEBKIT/) %>
-        <script src="/public/api/rhoapi-modules.js" type="text/javascript"></script>
-        <script src="/public/jquery/jquery-1.9.1.min.js" type="text/javascript"></script>
-        <link rel="stylesheet" href="/public/jqmobile/jquery.mobile-1.4.5.min.css">
-        <!--<link rel="stylesheet" href="/public/css/jqmobile-patch.css">-->
-        <script type="text/javascript">
-            $(document).bind("mobileinit", function(){
-                // 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;
-                // 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.3.1/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
-                // Uncomment these options in case of performance problem in pages transition
-                //$.mobile.defaultPageTransition = 'none';
-                //$.mobile.defaultDialogTransition = 'none';
-                //$.mobile.ajaxEnabled = false;
-                //$.mobile.pushStateEnabled = false;
-                $.mobile.loadingMessageDelay = 50; // in ms
-            });
-            function ScaleContentToDevice(){
-                scroll(0, 0);
-                var height = $.mobile.getScreenHeight() - $(".ui-header").outerHeight() - $(".ui-footer").outerHeight() - $(".ui-content").outerHeight() + $(".ui-content").height();
-                $(".ui-content").height(height);
-            }
-            $(document).on( "pagecontainershow", function(){
-                ScaleContentToDevice();
-            });
-            $(window).on("resize orientationchange", function(){
-                ScaleContentToDevice();
-            });
-        </script>
-        <script type="text/javascript" charset="utf-8" src="/public/jqmobile/jquery.mobile-1.4.5.min.js"></script>
-        <!--<script type="text/javascript" charset="utf-8" src="/public/js/jqmobile-patch.js"></script>-->
-    <%% end %>
-    <%% if Rho::System.getProperty('platform') == 'APPLE' %>
-        <link href="/public/css/iphone.css" type="text/css" rel="stylesheet"/>
-    <%% elsif Rho::System.getProperty('platform') == 'ANDROID' %>
-        <link href="/public/css/android.css" type="text/css" rel="stylesheet"/>
-    <%% elsif Rho::System.getProperty('webviewFramework') =~ /^WEBKIT/ %>
-        <link href="/public/css/re_webkit.css" type="text/css" rel="stylesheet"/>
-    <%% elsif Rho::System.getProperty('platform') == 'WINDOWS' %>
-	    <link href="/public/css/windows_mobile.css" type="text/css" rel="stylesheet"/>
-    <%% end %>
 </head>
 <body data-platform="<%%= Rho::System.getProperty('platform') %>">
-    <%%= @content %>
+<%%= @content %>
 </body>
 </html>