rhodes 5.5.0.3 → 5.5.0.7

data/res/generators/templates/application/app/Settings/err_sync.erb

@@ -1,11 +1,17 @@
-<div data-role="page">
+<div class="container-fluid">
 
-  <div data-role="header" data-position="inline">
-    <h1>Sync error</h1>
+  <div class="row">
+    <div class="col-xs-2 col-sm-2 col-md-2 col-lg-2">
+    </div>
+    <div class="col-xs-8 col-sm-8 col-md-8 col-lg-8">
+      <h3 class="text-center">Sync error</h3>
+    </div>
+    <div class="col-xs-2 col-sm-2 col-md-2 col-lg-2">
+    </div>
   </div>
 
-  <div data-role="content">
-        <div class="error-message"><%%= @params['msg'] %></div>
+  <div class="text-center alert alert-danger">
+    <%%= @params['msg'] %>
   </div>
 
-</div>
+</div>

data/res/generators/templates/application/app/Settings/home.erb

@@ -1,21 +1,36 @@
-<div data-role="page">
+<div class="container-fluid">
 
-<% if @rhoconnectclient_ext %>        
-  <div data-role="header" data-position="inline">
-    <h1>Home</h1>
-    <%% if SyncEngine::logged_in > 0 %>
-        <a href="<%%= url_for :action => :do_sync %>" class="ui-btn-left" data-icon="refresh">Sync</a>
-        <a href="<%%= url_for :action => :logout %>" class="ui-btn-right" data-icon="star">Logout</a>
-    <%% else %>
-        <a href="<%%= url_for :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 Links Here...</a></li>
-    </ul>
+  <% if @rhoconnectclient_ext %>
+      <div class="row">
+        <div class="col-xs-2 col-sm-2 col-md-2 col-lg-2">
+          <%% if SyncEngine::logged_in > 0 %>
+          <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">Home</h3>
+        </div>
+        <div class="col-xs-2 col-sm-2 col-md-2 col-lg-2">
+          <%% if SyncEngine::logged_in > 0 %>
+          <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-default 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/Settings/index.erb

@@ -1,33 +1,62 @@
-<div data-role="page">
+<div class="container-fluid">
 
-  <div data-role="header" data-position="inline">
-    <h1>Settings</h1>
+  <div class="row">
+    <div class="col-xs-2 col-sm-2 col-md-2 col-lg-2">
+    </div>
+    <div class="col-xs-8 col-sm-8 col-md-8 col-lg-8">
+      <h3 class="text-center">Settings</h3>
+    </div>
+    <div class="col-xs-2 col-sm-2 col-md-2 col-lg-2">
+    </div>
   </div>
 
-  <div data-role="content">
-    <ul data-role="listview">
+  <div class="row">
+    <div class="list-group">
+
       <%% if @msg %>
-          <li class="error-message"><%%= @msg %></li>
+      <div class="alert alert-danger"><%%= @msg %></div>
       <%% end %>
 
-<% if @rhoconnectclient_ext %>                  
-      <li>
-        <div class="itemLabel">
-          <span class="title">Client ID:</span>
-        </div>
-        <div class="itemValue">
-          <span class="clientID"><%%= Rhom::Rhom::client_id %></span>
-        </div>
-      </li>
-
-      <li><a href="<%%= url_for :action => :reset %>">Reset Database</a></li>
-      <li><a href="<%%= url_for :action => :do_sync %>">Perform Sync</a></li>
-      <%% if Rho::RhoConnectClient.isLoggedIn %>
-          <li><a href="<%%= url_for :action => :logout %>">Logout</a></li>
-      <%% else %>
-          <li><a href="<%%= url_for :action => :login %>">Login</a></li>
-      <%% end %>
- <% end %>          
-    </ul>
+      <% if @rhoconnectclient_ext %>
+
+          <li class="list-group-item">
+            <div class="row">
+              <div class="col-xs-4 col-sm-4 col-md-4 col-lg-4">
+                <span pull-right><strong>Client ID:</strong></span>
+              </div>
+              <div class="col-xs-8 col-sm-8 col-md-8 col-lg-8">
+                <%%= Rhom::Rhom::client_id %>
+              </div>
+            </div>
+          </li>
+
+          <a href="<%%= url_for :action => :reset %>" class="list-group-item">
+            <span class="glyphicon glyphicon-chevron-right pull-right" aria-hidden="true"></span>
+            Reset Database
+          </a>
+
+          <a href="<%%= url_for :action => :do_sync %>" class="list-group-item">
+            <span class="glyphicon glyphicon-chevron-right pull-right" aria-hidden="true"></span>
+            Perform Sync
+          </a>
+
+          <%% if Rho::RhoConnectClient.isLoggedIn %>
+          <a href="<%%= url_for :action => :logout %>" class="list-group-item">
+            <span class="glyphicon glyphicon-chevron-right pull-right" aria-hidden="true"></span>
+            Logout
+          </a>
+
+          <%% else %>
+          <a href="<%%= url_for :action => :login %>" class="list-group-item">
+            <span class="glyphicon glyphicon-chevron-right pull-right" aria-hidden="true"></span>
+            Login
+          </a>
+          <%% end %>
+
+      <% end %>
+
+    </div>
+
   </div>
-</div>
+
+</div>

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

@@ -0,0 +1,111 @@
+<!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">
+            <a id="back" href="#" class="btn btn-default btn-sm pull-left">Back</a>
+        </div>
+        <div class="col-xs-8 col-sm-8 col-md-8 col-lg-8">
+            <h3 class="text-center">Settings</h3>
+        </div>
+        <div class="col-xs-2 col-sm-2 col-md-2 col-lg-2">
+        </div>
+    </div>
+
+    <div id="alert" class="alert hidden">
+        <strong id="title"></strong>&nbsp;<span id="text"></span>
+    </div>
+
+    <div class="row">
+        <% if @rhoconnectclient_ext %>
+        <div id="rhoconnectClientOptions" class="list-group">
+
+            <li class="list-group-item">
+                <div class="row">
+                    <div class="col-xs-4 col-sm-4 col-md-4 col-lg-4">
+                        <span pull-right><strong>Client ID:</strong></span>
+                    </div>
+                    <div id="clientId" class="col-xs-8 col-sm-8 col-md-8 col-lg-8">
+                    </div>
+                </div>
+            </li>
+
+            <li id="resetDatabaseItem" class="list-group-item">
+                <span class="glyphicon glyphicon-chevron-right pull-right" aria-hidden="true"></span>
+                <span class=" text-danger">Reset Database</span>
+            </li>
+
+            <li id="performSyncItem" class="list-group-item">
+                <span class="glyphicon glyphicon-chevron-right pull-right" aria-hidden="true"></span>
+                Perform Sync
+            </li>
+
+            <li id="logoutItem" class="list-group-item">
+                <span class="glyphicon glyphicon-chevron-right pull-right" aria-hidden="true"></span>
+                Logout
+            </li>
+
+            <a id="loginItem" href="login.html" class="list-group-item">
+                <span class="glyphicon glyphicon-chevron-right pull-right" aria-hidden="true"></span>
+                Login
+            </a>
+
+        </div>
+        <% end %>
+    </div>
+
+</div>
+
+<div class="modal" id="resetDatabaseModalDialog" tabindex="-1" role="dialog" aria-labelledby="myModalLabel">
+    <div class="modal-dialog" role="document">
+        <div class="modal-content">
+            <div class="modal-header">
+                <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span
+                        aria-hidden="true">&times;</span></button>
+                <h4 class="modal-title" id="myModalLabel">Reset Database</h4>
+            </div>
+            <div class="modal-body">
+                <div class="text-center alert alert-warning">
+                    <h4 class="text-center">Are you sure?</h4>
+
+                    <p>Resetting removes all objects from your device.</p>
+                </div>
+            </div>
+            <div class="modal-footer">
+                <button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button>
+                <button type="button" class="btn btn-warning" data-dismiss="modal">Confirm</button>
+            </div>
+        </div>
+    </div>
+</div>
+
+<script>
+    window.addEventListener("load", function () {
+        var page = new App.SettingsPage();
+        page.init();
+    });
+</script>
+</body>
+</html>

data/res/generators/templates/application/app/Settings/javascript_login.html

@@ -0,0 +1,65 @@
+<!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">
+            <a id="back" href="#" class="btn btn-default btn-sm pull-left">Back</a>
+        </div>
+        <div class="col-xs-8 col-sm-8 col-md-8 col-lg-8">
+            <h3 class="text-center">Login</h3>
+        </div>
+        <div class="col-xs-2 col-sm-2 col-md-2 col-lg-2">
+        </div>
+    </div>
+
+    <div id="alert" class="alert hidden">
+        <strong id="title"></strong>&nbsp;<span id="text"></span>
+    </div>
+
+    <form class="form">
+        <div class="form-group">
+            <label for="username">Login</label>
+            <input type="text" id="username" name="username" placeholder="username" class="form-control"/>
+        </div>
+
+        <div class="form-group">
+            <label for="password">Password</label>
+            <input type="password" id="password" name="password" placeholder="Password" class="form-control"/>
+        </div>
+
+        <button id="loginBtn" type="button" class="btn btn-success btn-block">Login</button>
+    </form>
+
+</div>
+
+<script>
+    window.addEventListener("load", function () {
+        var page = new App.LoginPage();
+        page.init();
+    });
+</script>
+
+</body>
+
+</html>

data/res/generators/templates/application/app/Settings/login.erb

@@ -1,25 +1,31 @@
-<div data-role="page" data-add-back-btn="true">
+<div class="container-fluid">
 
-  <div data-role="header" data-position="inline">
-    <h1>Login</h1>
+  <div class="row">
+    <div class="col-xs-2 col-sm-2 col-md-2 col-lg-2">
+    </div>
+    <div class="col-xs-8 col-sm-8 col-md-8 col-lg-8">
+      <h3 class="text-center">Login</h3>
+    </div>
+    <div class="col-xs-2 col-sm-2 col-md-2 col-lg-2">
+    </div>
   </div>
 
-  <div data-role="content">
-    <form method="POST" action="<%%= url_for :action => :do_login %>">
-      <%% if @msg %>
-          <div class="error-message"><%%= @msg %></div>
-      <%% end %>
+  <form method="POST" action="<%%= url_for :action => :do_login %>">
+    <%% if @msg %>
+    <div class="alert alert-warning"><%%= @msg %></div>
+    <%% end %>
 
-      <div data-role="fieldcontain">
-        <label for="login" class="itemLabel">Login</label>
-        <input type="text" id="login" name="login" class="itemValue" <%%= placeholder("Login") %> />
-      </div>
-      <div data-role="fieldcontain">
-        <label for="password">Password</label>
-        <input type="password" id="password" name="password" class="itemValue" <%%= placeholder("Password") %> />
-      </div>
-      <input type="submit" value="Login"/>
-    </form>
-  </div>
+    <div class="form-group">
+      <label for="login">Login</label>
+      <input type="text" id="login" name="login" <%%= placeholder("Login") %> class="form-control" />
+    </div>
+
+    <div class="form-group">
+      <label for="password">Password</label>
+      <input type="password" id="password" name="password" <%%= placeholder("Password") %> class="form-control" />
+    </div>
+
+   <button type="submit" class="btn btn-success btn-block">Login</button>
+  </form>
 
 </div>

data/res/generators/templates/application/app/Settings/reset.erb

@@ -1,14 +1,23 @@
-<div data-role="page">
+<div class="container-fluid">
 
-  <div data-role="header" data-position="inline">
-    <h1>Reset Database</h1>
-    <a href="<%%= url_for :action => :index %>" class="ui-btn-left" data-icon="back" data-direction="reverse">Cancel</a>
-    <a href="<%%= url_for :action => :do_reset %>" class="ui-btn-right" data-icon="check" data-direction="reverse">Confirm</a>
+  <div class="row">
+    <div class="col-xs-2 col-sm-2 col-md-2 col-lg-2">
+      <h3><a href="<%%= url_for :action => :index %>" class="btn btn-default btn-sm pull-left">Cancel</a></h3>
+    </div>
+    <div class="col-xs-8 col-sm-8 col-md-8 col-lg-8">
+      <h3 class="text-center">Reset Database</h3>
+    </div>
+    <div class="col-xs-2 col-sm-2 col-md-2 col-lg-2">
+      <h3><a href="<%%= url_for :action => :do_reset %>" class="btn btn-danger btn-sm pull-right">Confirm</a></h3>
+    </div>
   </div>
 
-  <div data-role="content">
-    <h3>Are you sure?</h3>
-    <div style="margin: 10px;">Resetting removes all objects from your device.</div>
+
+  <div class="text-center alert alert-danger">
+    <h4 class="text-center">Are you sure?</h4>
+
+    <p>Resetting removes all objects from your device.</p>
   </div>
 
-</div>
+
+</div>

data/res/generators/templates/application/app/Settings/wait.erb

@@ -1,10 +1,13 @@
-<div data-role="page" data-rho-wait-page="true">
+<div class="container-fluid">
 
-  <div data-role="header" data-position="inline">
-    <h1>Wait</h1>
+  <div class="row">
+    <div class="col-xs-2 col-sm-2 col-md-2 col-lg-2">
+    </div>
+    <div class="col-xs-8 col-sm-8 col-md-8 col-lg-8">
+      <h3 class="text-center">Wait</h3>
+    </div>
+    <div class="col-xs-2 col-sm-2 col-md-2 col-lg-2">
+    </div>
   </div>
 
-  <div data-role="content">
-  </div>
-
-</div>
+</div>