Default cook and prep time to zero on new. Flushed out views. Removed…

… recipe variations from views for now.
quattro004 · Sep 18, 2010 · 20295b8 · 20295b8
1 parent 0b7a448
commit 20295b8
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 16 deletions.
diff --git a/app/controllers/recipes_controller.rb b/app/controllers/recipes_controller.rb
@@ -31,6 +31,8 @@ def new
     @recipe = Recipe.new
 
     1.times { @recipe.ingredient.build }
+    @recipe.cook_time_in_minutes = 0
+    @recipe.prep_time_in_minutes = 0
 
     respond_to do |format|
       format.html # new.html.erb

diff --git a/app/views/recipes/_form.html.erb b/app/views/recipes/_form.html.erb
@@ -22,7 +22,7 @@
         <p><%= link_to_add_fields 'Add Ingredient', f, :ingredient %></p>
       </fieldset>
       <div class="field">
-        <%= f.label :instructions %><br />
+        <%= f.label :instructions %> <small><i>(separate each by pressing Enter)</i></small><br />
         <%= f.text_area :instructions, :size => '60x7' %>
       </div>
       <div class="field">
@@ -43,19 +43,19 @@
       </div>
       <div class="field">
         <%= f.label :prep_time_in_minutes %><br />
-        <%= f.text_field :prep_time_in_minutes, :size => 5 %>
+        <%= f.text_field :prep_time_in_minutes, :size => 3 %>
       </div>
       <div class="field">
         <%= f.label :cook_time_in_minutes %><br />
-        <%= f.text_field :cook_time_in_minutes, :size => 5 %>
+        <%= f.text_field :cook_time_in_minutes, :size => 3 %>
       </div>
-     <div class="field">
+      <div class="field">
         <%= f.label :yield %><br />
         <%= f.text_field :yield, :size => 25 %>
       </div>
       <div class="field">
-        <%= f.label :variations %><br />
-        <%= f.text_area :variations, :size => '60x3' %>
+        Public<%= f.check_box :is_public %>
+        Secret<%= f.check_box :is_secret %>
       </div>
       <div class="actions">
         <%= f.submit nil, :class => 'input' %>

diff --git a/app/views/recipes/index.html.erb b/app/views/recipes/index.html.erb
@@ -6,7 +6,6 @@
     <th>Author</th>
     <th>Picture</th>
     <th>Comment</th>
-    <th>Variations</th>
     <th>Category</th>
     <th>Ingredients</th>
     <th>Instructions</th>
@@ -21,7 +20,6 @@
     <td><%= recipe.title %></td>
     <td><%= recipe.author %></td>
     <td><%= recipe.comment %></td>
-    <td><%= recipe.variations %></td>
     <td><%= recipe.category_id %></td>
     <td><%= recipe.instructions %></td>
     <td><%= recipe.keywords %></td>
@@ -34,4 +32,5 @@
 
 <br />
 
-<%= link_to 'New Recipe', new_recipe_path %>
+<%= link_to 'New Recipe', new_recipe_path %> |
+<%= link_to 'Home', root_path %>
diff --git a/app/views/recipes/show.html.erb b/app/views/recipes/show.html.erb
@@ -21,12 +21,6 @@
   </p>
 <% end %>
 
-<% unless @recipe.variations.empty? %>
-  <p>
-    <b>Variations:</b>
-    <%= @recipe.variations %>
-  </p>
-<% end %>
 <p>
   <b>Category:</b>
   <%= @recipe.category_id %>
@@ -67,5 +61,15 @@
   <%= @recipe.cook_time_in_minutes %>
 </p>
 
+<!-- TODO: display picture -->
+
+<p>
+  <b>Public:</b>
+  <%= @recipe.is_public %>
+  <b>Secret:</b>
+  <%= @recipe.is_secret %>
+</p>
+
 <%= link_to 'Edit', edit_recipe_path(@recipe) %> |
-<%= link_to 'Back', recipes_path %>
+<%= link_to 'Back', recipes_path %> |
+<%= link_to 'Home', root_path %>