rhodes 1.5.5 → 2.0.0.beta1

data/res/generators/templates/model/controller.rb

@@ -1,6 +1,8 @@
 require 'rho/rhocontroller'
+require 'helpers/browser_helper'
 
 class <%= class_name %>Controller < Rho::RhoController
+  include BrowserHelper
 
   #GET /<%= class_name %>
   def index

data/res/generators/templates/model/edit.bb.erb

@@ -0,0 +1,24 @@
+<div id="pageTitle">
+		<h1>Edit <%%= @<%= name.downcase %>.<%= attributes[0] %>%></h1>
+</div>
+
+<div id="toolbar">
+    <%%= link_to "Back", :action => :show, :id => @<%= name.downcase %>.object %>
+    <%%= link_to "Delete", :action => :delete, :id => @<%= name.downcase %>.object %>
+</div>
+
+
+<div id="content">
+    <form method="POST" action="<%%= url_for :action => :update %>">
+    	<input type="hidden" name="id" value="<%%= @<%= name.downcase %>.object %>"/>
+            <table>
+        		<% attributes.each do |attribute| %>
+                    <tr>
+            			<td width="125" class="fieldLabel"><%= humanize(attribute) %>: </td>
+              			<td><input type="text" name="<%= name.downcase %>[<%= attribute %>]" value="<%%= @<%= name.downcase %>.<%= attribute %> %>"/></td>
+          		    </tr>
+        		<% end %>
+            </table>
+            <input type="submit" class="standardButton" value="Update" />
+    </form>
+</div>

data/res/generators/templates/model/edit.erb

@@ -1,27 +1,23 @@
-<div class="toolbar">
-	<h1 id="pageTitle">
-		Edit <%%=@<%=name.downcase%>.<%=attributes[0]%>%>
-	</h1>
+<div id="pageTitle">
+	<h1>Edit <%%= @<%= name.downcase %>.<%= attributes[0] %>%></h1>
 </div>
 
-<form title="Edit <%= class_name %>" 
-	  class="panel" 
-	  id="<%= name.downcase %>_edit_form" 
-	  method="POST" 
-	  action="<%%=url_for(:action => :update)%>" selected="true">
-	<fieldset>
-		<input type="hidden" name="id" value="<%%=@<%= name.downcase %>.object%>"/>
-		<% attributes.each do |attribute| %>
-		  <div class="row">
-			  <label><%=humanize(attribute)%>: </label>
-			  <input type="text" name="<%= name.downcase %>[<%= attribute %>]" value="<%%=@<%=name.downcase%>.<%=attribute%>%>"/>
-		  </div>
-		<% end %>
-	</fieldset>
-	<input type="submit" value="Update"/>
-	<p align="center">
-		<a href="<%%=url_for(:action => :delete, :id => @<%= name.downcase %>.object)%>">
-			<font color="#990000">Delete</font>
-		</a>
-	</p>
-</form>
+<div id="toolbar">
+    <div id="leftItem" class="backButton"><%%= link_to "Cancel", :action => :show, :id => @<%= name.downcase %>.object %></div>
+    <div id="rightItem" class="regularButton"><%%= link_to "Delete", :action => :delete, :id => @<%= name.downcase %>.object %></div>
+</div>
+
+<div id="content">
+    <form method="POST" action="<%%= url_for :action => :update %>">
+            <input type="hidden" name="id" value="<%%= @<%= name.downcase %>.object %>"/>
+            <ul>
+                <% attributes.each do |attribute| %>
+                <li>
+                    <label for="<%= name.downcase %>[<%= attribute %>]" class="fieldLabel"><%= humanize(attribute) %></label>
+                    <input type="text" name="<%= name.downcase %>[<%= attribute %>]" value="<%%= @<%= name.downcase %>.<%= attribute %>%>" <%%= placeholder( "<%= humanize(attribute) %>" ) %> />
+                </li>
+                <% end %>
+            </ul>
+            <input type="submit" class="standardButton" value="Update" />
+    </form>
+</div>

data/res/generators/templates/model/index.bb.erb

@@ -0,0 +1,21 @@
+<div id="pageTitle">
+	<h1><%= class_name.camelize.pluralize %></h1>
+</div>
+
+
+<div id="toolbar">
+    <%%= link_to "New", :action => :new %>
+    <%%= link_to "Home", RhoConfig::start_path %>
+</div>
+
+<div id="content">
+    <ul>
+    <%% @<%= name.downcase.pluralize %>.each do |obj| %>
+    	<% if self.attributes? %>
+    	    <li><%%= link_to "#{obj.<%= attributes[0] %>}", :action => :show, :id => obj.object %></li>
+    	<% else %>
+    	    <li>Some list entry...</li>
+    	<% end %>
+    <%% end %>
+    </ul>
+</div>

data/res/generators/templates/model/index.erb

@@ -1,16 +1,30 @@
-<div class="toolbar">
-	<h1 id="pageTitle">
-		<%= class_name.camelize.pluralize %>
-	</h1>
+<div id="pageTitle">
+	<h1><%= class_name.camelize.pluralize %></h1>
 </div>
 
-<ul id="<%= name.downcase.pluralize %>" title="<%= class_name.pluralize %>" selected="true">
-  	<a class="button right_button" href="<%= class_name%>/new" target="_self">New</a>
-	<%%@<%=name.downcase.pluralize%>.each do |x|%>
-	<%if self.attributes?%>
-	<li><%%=link_to "#{x.<%=attributes[0]%>}", :action => :show, :id => x.object%></li>
-	<%else%>
-	<li>Some list entry...</li>
-	<%end%>
-	<%%end%>
-</ul>
+<div id="toolbar">
+    <div id="leftItem" class="regularButton"><%%= link_to "Home", Rho::RhoConfig.start_path %></div>
+    <div id="rightItem" class="regularButton"><%%= link_to "New", :controller => :<%= name.camelize %>, :action => :new %></div>
+</div>
+
+<div id="content">
+    <ul>
+        <%% @<%= name.downcase.pluralize %>.each do |obj| %>
+            <% if self.attributes? %>
+            <li>
+                <a href="<%%= url_for :action => :show, :id => obj.object %>">
+                    <span class="title"><%%= obj.<%= attributes[0] %> %></span>
+                    <span class="disclosure_indicator"></span>
+                </a>
+            </li>
+            <% else %>
+            <li>
+                <a href="#">
+                    <span class="title">Some list entry...</span>
+                    <span class="disclosure_indicator"></span>
+                </a>
+            </li>
+            <% end %>
+        <%% end %>
+    </ul>
+</div>

data/res/generators/templates/model/new.bb.erb

@@ -0,0 +1,24 @@
+<div id="pageTitle">
+    <h1>New <%= class_name.camelize %></h1>
+</div>
+
+<div id="toolbar">
+    <%%= link_to "Back", :action => :index %>
+</div>
+
+
+<div id="content">
+
+    <form method="POST" action="<%%= url_for :action => :create %>">
+	    <input type="hidden" name="id" value="<%%= @<%= name.downcase %>.object %>"/>
+        <table>
+    		<% attributes.each do |attribute| %>
+    		  <tr>
+    			  <td width="125"><%= humanize(attribute) %>: </td>
+    			  <td><input type="text" name="<%= name.downcase %>[<%= attribute %>]"/></td>
+    		  </tr>
+    		<% end %>
+        </table>
+        <input type="submit" class="standardButton" value="Create" />
+    </form>
+</div>

data/res/generators/templates/model/new.erb

@@ -1,22 +1,22 @@
-<div class="toolbar">
-	<h1 id="pageTitle">
-		New <%= class_name %>
-	</h1>
+<div id="pageTitle">
+	<h1>New <%%= @<%= name.downcase %>.title %></h1>
 </div>
 
-<form title="New <%= class_name %>" 
-	  class="panel"
-	  id="<%= name.downcase %>_new_form" 
-	  method="POST" 
-	  action="<%%=url_for(:action => :create)%>" selected="true">
-	<fieldset>
-		<input type="hidden" name="id" value="<%%=@<%= name.downcase %>.object%>"/>
-		<% attributes.each do |attribute| %>
-		  <div class="row">
-			  <label><%=humanize(attribute)%>: </label>
-			  <input type="text" name="<%= name.downcase %>[<%= attribute %>]"/>
-		  </div>
-		<% end %>
-	</fieldset>
-	<input type="submit" value="Create"/>
-</form>
+<div id="toolbar">
+     <div id="leftItem" class="backButton"><%%= link_to "Cancel", :action => :index %></div>
+</div>
+
+<div id="content">
+    <form method="POST" action="<%%= url_for :action => :create %>">
+            <input type="hidden" name="id" value="<%%= @<%= name.downcase %>.object %>"/>
+            <ul>
+                <% attributes.each do |attribute| %>
+                <li>
+                    <label for="<%= name.downcase %>[<%= attribute %>]" class="fieldLabel"><%= humanize(attribute) %></label>
+                    <input type="text" name="<%= name.downcase %>[<%= attribute %>]" <%%= placeholder( "<%= humanize(attribute) %>" ) %> />
+                </li>
+                <% end %>
+            </ul>
+            <input type="submit" class="standardButton" value="Create" />
+    </form>
+</div>

data/res/generators/templates/model/show.bb.erb

@@ -0,0 +1,21 @@
+<div id="pageTitle">
+	<h1><%%= @<%= name.downcase %>.<%= attributes[0] %>%></h1>
+</div>
+
+<div id="toolbar">
+        <%%= link_to "Back", :action => :index %>
+        <%%= link_to "Edit", :action => :edit, :id => @<%= name.downcase %>.object %>
+</div>
+
+
+<div id="content">
+
+    <table>
+      <% attributes.each do |attribute| %>
+      <tr>
+    	<td><%= attribute.camelize %></td>
+        <td><%%= @<%= name.downcase %>.<%= attribute %>%></td>
+      </tr>
+      <% end %>
+    </table>
+</div>

data/res/generators/templates/model/show.erb

@@ -1,19 +1,19 @@
-<div class="toolbar">
-	<h1 id="pageTitle">
-		<%%=@<%=name.downcase%>.<%=attributes[0]%>%>
-	</h1>
+<div id="pageTitle">
+	<h1><%%= @<%= name.downcase %>.<%= attributes[0] %>%></h1>
 </div>
 
-<div class="panel" selected="true">
-
-<a class="button right_button" href="<%%=url_for(:action => :edit, :id => @<%=name.downcase%>.object)%>" target="_self">Edit</a>
+<div id="toolbar">
+    <div id="leftItem" class="backButton"><%%= link_to "Back", :action => :index %></div>
+    <div id="rightItem" class="regularButton"><%%= link_to "Edit", :action => :edit, :id => @<%= name.downcase %>.object %></div>
+</div>
 
-<table class="grid">
-  <% attributes.each do |attribute| %>
-  <tr>
-	<td class="gridleft"><%=attribute.camelize%></td>
-    <td class="gridright"><%%=@<%=name.downcase%>.<%=attribute%>%></td>
-  </tr>
-  <% end %>
-</table>
+<div id="content">
+    <ul>
+        <% attributes.each do |attribute| %>
+        <li>
+            <div class="itemLabel"><%= attribute.camelize %></div>
+            <div class="itemValue"><%%= @<%= name.downcase %>.<%= attribute %>%></div>
+        </li>
+        <% end %>
+    </ul>
 </div>

data/rhobuild.yml

@@ -0,0 +1,37 @@
+--- 
+env: 
+  app: /Users/lars/Dev/code/rhomobile/rhodes-system-api-samples
+  paths: 
+    android-ndk: /Users/lars/Dev/android-ndk-r3
+    java: /Library/Java/Home/bin
+    android: /Users/lars/Dev/android-sdk-mac_86
+    4.6: 
+      jde: 
+      sim: 9000
+      mds: 
+    cabwiz: 
+    4.2: 
+      jde: 
+      sim: 8100
+      mds: 
+excludedirs: 
+  bb: 
+  - public/js/iui
+  - public/js/jquery*
+  - public/js/prototype*
+  - public/css/iphone*
+  - public/iwebkit
+  - "**/*.db"
+  - "**/.*.swo"
+  - "**/.*.swn"
+  - "**/jquery*.js"
+  - "**/.DS_Store"
+android: 
+build: 
+  symbianpath: platform/symbian
+  bb: 
+  bbsignpwd: somepasswordhere
+  bbpath: platform/bb
+  wmpath: platform/wm
+  androidpath: platform/android
+  iphonepath: platform/iphone