rhodes 1.5.5 → 2.0.0.beta1

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

@@ -0,0 +1,35 @@
+<div id="pageTitle">
+    <h1>Login</h1>
+</div>
+
+<div id="toolbar">
+    <%=  link_to "Back", :action => :index %>
+</div>
+
+<div id="content">
+    <form method="POST" action="<%= url_for :action => :do_login %>">  
+
+        <% if @msg %>
+          <div class="alert" align="center"><%= @msg %></div>
+        <% end %>
+
+        <table>
+
+            <tr>
+                 <td width="125" class="fieldLabel">Login</td>
+                 <td><input type="text" maxlength="100" name="login"/></td>
+             </tr>
+
+             <tr>
+                 <td width="125" class="fieldLabel">Password</td>
+                 <td><input type="password" maxlength="100" name="password"/></td>
+             </tr>
+        </table>
+
+        <input type="submit" class="standardButton" value="Login" />
+    </form>
+</div>
+
+
+
+

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

@@ -1,32 +1,31 @@
-<div class="toolbar">
-  <h1 id="pageTitle">
-    Login
-  </h1>
+<div id="pageTitle">
+  <h1>Login</h1>
 </div>
 
-<form title="Login to Rhodes"
-      class="panel" 
-     id="user_edit_form" 
-   method="POST" 
-   action="<%=url_for(:action => 'do_login')%>" selected="true">  
-      
-  <% if @msg %>
-    <p style="color:#ff0000"><%= @msg %></p>
-  <% end %>
-  
-  <table class="grid">
-    <tr>
-      <td class="gridleft" style="color:#000000">Login</td>
-      <td class="gridright"><input type="text" maxlength="100" name="login"/></td>
-    </tr>
-    <tr>
-      <td class="gridleft" style="color:#000000">Password</td>
-      <td class="gridright"><input type="password" maxlength="100" name="password"/></td>
-    </tr>
-  </table>
- 
-  <p align="center">
-    <input type="submit" value="Login"/><br/>
-  </p>
- 
-</form>
+
+<div id="toolbar">
+    <div id="leftItem" class="regularButton"><%= link_to "Cancel", :action => :index %></div>
+</div>
+
+
+
+<div id="content">
+    <form method="POST" action="<%= url_for :action => :do_login %>">
+
+        <% if @msg %>
+            <p style="color:#ff0000"><%= @msg %></p>
+        <% end %>
+        <ul>
+            <li>
+                <label for="login" class="fieldLabel">Login</label>
+                <input type="text" name="login" <%= placeholder( "Login" ) %> />
+            </li>
+
+            <li>
+                <label for="password" class="fieldLabel">Password</label>
+                <input type="password" name="password" <%= placeholder( "Password" ) %> />
+            </li>
+        </ul>
+        <input type="submit" class="standardButton" value="Login" />
+    </form>
+</div>

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

@@ -0,0 +1,15 @@
+<div id="pageTitle">
+    <h1>Reset Database</h1>
+</div>
+
+<div id="toolbar">
+    <%= link_to "Confirm", :action => :do_reset %>
+    <%= link_to "Cancel", Rho::RhoConfig.options_path %>
+</div>
+
+<div id="content">
+     <div class="warning">
+         <h2>Are you sure?</h2>
+         <p> Resetting removes all objects from your device.</p>
+     </div>
+</div>

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

@@ -1,15 +1,18 @@
-<div class="toolbar">
-	<h1 id="pageTitle">
-		Reset Database
-	</h1>
+<div id="pageTitle">
+	<h1>Reset Database</h1>
 </div>
 
-<ul id="reset_db" selected="true" title="Reset Database">
-  <h3>Are you sure (Resetting removes all objects from your device)?</h3>
-  <br/>
-  <br/>
-  <p class="whiteButton" align="center">
-	<%= link_to "Confirm", {:action => :do_reset}, "target=\"_self\""%><br/>
-  </p>
-  <a href="<%=Rho::RhoConfig.start_path%>" class="whiteButton" target="_self">Cancel</a><br/>
-</ul>
+
+
+<div id="toolbar">
+    <div id="leftItem" class="regularButton"><%= link_to "Cancel", :action => :index %></div>
+    <div id="rightItem" class="blueButton"><%= link_to "Confirm", :action => :do_reset %></div>
+</div>
+
+
+<div id="content">
+    <div id="reset">
+          <h4>Are you sure?<br/>
+              Resetting removes all objects from your device.</h4>
+    </div>
+</div>

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

@@ -0,0 +1,3 @@
+<div id="pageTitle">
+  <h1>Wait</h1>
+</div>

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

@@ -1,5 +1,5 @@
-<div class="toolbar">
-  <h1 id="pageTitle">
-    Wait
-  </h1>
+<div id="pageTitle">
+  <h1>Wait</h1>
 </div>
+
+<div id="toolbar"></div>

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

@@ -1,4 +1,12 @@
 require 'rho/rhoapplication'
 
 class AppApplication < Rho::RhoApplication
+  def initialize
+    # Tab items are loaded left->right, @tabs[0] is leftmost tab in the tab-bar
+    @tabs = nil
+
+    @@tabbar = nil
+    # Important to call super _after_ you define @tabs!
+    super
+  end
 end

data/res/generators/templates/application/app/helpers/browser_helper.rb

@@ -0,0 +1,13 @@
+module BrowserHelper
+  
+  def placeholder(label=nil)
+    "placeholder='#{label}'" if platform == 'apple'
+  end
+
+  
+  def platform
+    System::get_property('platform').downcase
+  end
+  
+  
+end

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

@@ -0,0 +1,26 @@
+<div id="pageTitle">
+    <h1><%= class_name.camelize %></h1>
+</div>
+
+<div id="toolbar">
+        <%%= link_to "Sync", :controller => :Settings, :action => :do_sync %>
+    	<%% if SyncEngine::logged_in > 0 %>
+    	    <%%= link_to "Logout", :controller => :Settings, :action => :logout %>
+    	<%% else %>
+            <%%= link_to "Login", :controller => :Settings, :action => :login %>
+    	<%% end %>
+</div>
+
+
+<div id="content">
+
+    <ul>
+    	<li>Add links here...</li>
+    </ul>
+
+</div>
+
+
+
+
+

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

@@ -1,14 +1,23 @@
-<div class="toolbar">
-	<h1 id="pageTitle">
-		<%= class_name %>
-	</h1>
+<div id="pageTitle">
+    <h1><%= class_name %></h1>
 </div>
 
-<ul id="home" selected="true" title="<%= class_name %>">
-	<li>Add links here...</li>
-	<%% if SyncEngine::logged_in > 0 %>
-	<li><%%=link_to "Logout", :controller => :Settings, :action => :logout%></li>
-	<%% else %>
-	<li><%%=link_to "Login", :controller => :Settings, :action => :login%></li>
-	<%% end %>
-</ul>
+<div id="toolbar">
+    <div id="leftItem" class="blueButton"><%%= link_to "Sync", :controller => :Settings, :action => :do_sync %></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>

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

@@ -3,22 +3,20 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 	<head>
 		<title><%= class_name %></title>
-		<link href="/public/css/base.css" type="text/css" rel="stylesheet"/>		
-			
+
 		<%% if System::get_property('platform') == 'APPLE' %>
 			<meta name="viewport" content="width=device-width; initial-scale=1.0; maximum-scale=1.0; user-scalable=0;"/>
-
-			<!-- <script src="/public/js/jquery-1.2.6.min.js"></script>
-			<script src="/public/js/rho.js"></script>
-			<script src="/public/js/application.js"></script> -->
+            <link href="/public/css/webkit.css" type="text/css" rel="stylesheet"/>
 			<link href="/public/css/iphone.css" type="text/css" rel="stylesheet"/>
+		<%% elsif System::get_property('platform') == 'Blackberry' %>
+			<link href="/public/css/blackberry.css" type="text/css" rel="stylesheet"/>	
+		<%% elsif  System::get_property('platform') == 'ANDROID' %>
+            <link href="/public/css/webkit.css" type="text/css" rel="stylesheet"/>
+			<link href="/public/css/android.css" type="text/css" rel="stylesheet"/>
 		<%% else %>
-			<%% if System::get_property('platform') == 'Blackberry' %>
-				<link href="/public/css/blackberry.css" type="text/css" rel="stylesheet"/>	
-			<%% else %>	
-				<link href="/public/css/xhtml.css" type="text/css" rel="stylesheet"/>	
-			<%% end %>
+			<link href="/public/css/windows_mobile.css" type="text/css" rel="stylesheet"/>
 		<%% end %>	
+			
 				
 	</head>
 	<body>

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

@@ -0,0 +1,285 @@
+/* Common css */
+
+body {
+    margin: 0;
+    height: 100%;
+    width: inherit;
+    font-family: "Droid",sans-serif;
+    background: white;
+    color: black;
+}
+h1 {
+    font-size: 1em;
+}
+
+div#content {
+	background-color:#ffffff;
+	width: 100%;
+	padding:0;
+	margin:0;
+}
+
+/* Toolbar */
+
+div#toolbar {
+  	height: 60px;
+    width: 100%;
+    background: -webkit-gradient(linear, left top, left bottom, color-stop(0.0, #2B2B2B),color-stop(0.2, #585858),color-stop(1.0, #2B2B2B));
+    display: table;
+    text-align: center;
+    border-spacing: 10px;
+}
+
+div#toolbar div#leftItem,
+div#toolbar div#centerItem, 
+div#toolbar div#rightItem {
+    display: table-cell;
+}
+
+div#toolbar a {
+    line-height: 40px;
+    color: black;
+    display: block;
+}
+
+div#toolbar .deleteButton, 
+div#toolbar .regularButton, 
+div#toolbar .blueButton, 
+div#toolbar .backButton {
+    background: -webkit-gradient(linear, left top, left bottom, color-stop(0.0, white),color-stop(0.5, #ccc), color-stop(1.0, #bdbebd));
+    -webkit-border-radius: 1px;
+    font-size: .9em;
+    border: 1px solid white;
+}
+
+
+/* Header */
+
+div#pageTitle {
+    height: 25px;
+		margin:0;
+    width: 100%;
+    display:none;
+}
+
+div#pageTitle h1 {
+    position: absolute;
+    top: 0;
+    text-align: left;
+    width: 100%;
+    margin: 0;
+    padding-left: 5px;
+    color: white;
+    text-shadow: 1px 1px 1px #000;
+    line-height: 25px;
+    background: -webkit-gradient(linear, left top, left bottom, color-stop(0.0, #999),color-stop(0.5, #848684));
+}
+
+
+/* lists */
+
+div#content ul {
+	background: white;
+}
+
+div#content ul li {
+    border-bottom: 1px solid #000;
+    font-size: 20px;
+}
+
+div#content ul li a {
+    display: block;
+    text-decoration: none;
+    color: black;
+    font-size: 20px;
+    height: 100%;
+    width: 100%;
+    padding: 15px 0 15px 0;
+}
+
+div#content ul li a img {
+    float: left;
+    height: 100%;
+    max-width: 100px;
+}
+
+div#content ul li span.title {
+    padding: 0 10px 0 10px;
+}
+
+div#content ul li span.disclosure_indicator {
+    display: none;
+}
+
+div#content ul li div.itemLabel {
+    float: left;
+    width: 45%;
+    padding: 15px 0 15px 10px;
+}
+
+div#content ul li div.itemValue {
+    float: right;
+    width: 45%;
+    padding: 15px 10px 15px 0;
+}
+
+
+/* Forms */
+
+div#content form button {
+    -webkit-appearance:push-button;
+    width: 300px;
+    height: 40px;
+    margin-left: 10px;
+}
+
+div#content form ul {
+    font-size: 20px;
+    list-style-type: none;
+    padding: 0;
+    margin: 0;
+}
+
+div#content form ul li {
+    border-bottom: 1px solid black;
+    display: block;
+    list-style-type: none;
+}
+
+div#content form label {
+    float: left;
+    display:block;
+    color: black;
+    line-height: 64px;
+    padding: 0 10px 0 5px;
+    margin: 0;
+    width: 40%;
+    overflow: hidden;
+	text-overflow: ellipsis;
+	white-space: nowrap;
+}
+
+div#content h2 {
+	 margin: 0;
+}
+
+div#content h2.groupTitle{
+	width:inherit;
+	margin: 0;
+	padding: 8px 0 8px 8px;
+	font-size:10px;
+	color:white;
+	background-color:black;
+}
+
+div#content form input[type="checkbox"] {
+    -webkit-appearance: none;
+    background: url(/public/images/android/btn_check_off.png) no-repeat;
+    float: right;
+    height: 31px;
+    width: 31px;
+    margin-top:15px;
+    margin-right: 20px;
+}
+div#content form input[type="checkbox"]:checked {
+    background: url(/public/images/android/btn_check_on.png) no-repeat;
+    float: right;
+    height: 31px;
+    width: 31px;
+    margin-top:15px;
+    margin-right: 20px;
+}
+
+div#content form input[type="radio"] {
+    background: url(/public/images/android/btn_radio_off.png) no-repeat;
+    -webkit-appearance: none;
+    -webkit-box-sizing: border-box;
+    border: none;
+    height: 32px;
+    margin: 0px;
+    width: 32px;
+    float: right;
+    margin-right: 20px;
+    margin-top: 15px;
+}
+div#content form input[type="radio"]:checked {
+    background: url(/public/images/android/btn_radio_on.png) no-repeat;
+    margin-top:15px;
+    margin-right: 20px;
+}
+
+div#content form select {
+    -webkit-appearance: none;
+    border: 0px;
+    width: 100%;
+    padding-left: 20px;
+    height: 60px;
+    background: url('/public/images/android/ic_menu_more.png') no-repeat center right;
+}
+
+div#content form textarea {
+    -webkit-appearance: none;
+    background: -webkit-gradient(linear, left top, left bottom, color-stop(0.0125, #d6d7d6),color-stop(0.25, #efefef),color-stop(0.95, #f7f7f7),color-stop(1.0, #f7f3f7));
+    border: 1px solid #d6d7d6;
+    -webkit-border-radius: 4px;
+    margin: 10px 0 2px 10px;
+    font-size: 0.9em;
+    padding: 5px 0 2px 2px;
+    box-shadow:0 -1px 3px #000000;
+}
+
+div#content form input[type="text"], 
+div#content form input[type="password"] {
+    float: right;
+    height: 40px;
+    margin: 10px 10px 10px 0;
+    padding-left: 5px;
+    font-size:26px;
+    width: 150px;
+    -webkit-appearance: none;
+    background: -webkit-gradient(linear, left top, left bottom, color-stop(0.0125, #d6d7d6),color-stop(0.25, #efefef),color-stop(0.95, #f7f7f7),color-stop(1.0, #f7f3f7));
+    border: 1px solid #d6d7d6;
+    -webkit-border-radius: 4px;
+    box-shadow:0 -1px 3px #000000;
+}
+
+div#content form button.standardButton {
+    height: 45px;
+    margin-top: 2px;
+    margin-bottom: 2px;
+    -webkit-border: 2px;
+}
+
+/* Settings */
+
+div#content ul#settings {
+    padding: 0;
+    margin: 0;
+}
+
+div#content div#reset h4 {
+    margin:20px;
+}
+
+div#content div.standardButton {
+    margin: 10px 10px 10px 10px;
+    height: 45px;
+    width: 284px;
+    line-height: 45px;
+    -webkit-appearance:push-button;
+}
+
+div#content div.standardButton a {
+    display: block;
+    width: 100%;
+    color: black;
+    text-align: center;
+}
+
+div#content ul#settings li.alertMessage{
+    text-align: center;
+}
+
+div#content ul#settings li.alertMessage span.message{
+    color: red;
+}