tidy up the creations#show page to be able to add new photos.

@@ -8,8 +8,7 @@ class CreationsController < ApplicationController
   # GET /creations/1
   def show
     @creation = Creation.find(params[:id])
-    @primary_photo = @creation.photos.first
-    @profile = @creation.user
+    @primary_photo = @creation.primary_image
   end
 
   # GET /creations/new

@@ -53,7 +53,7 @@
       </div>
     </div>
     <div class="form-actions">
-      <button type="submit" class="btn btn-primary">Save changes</button>
+      <button type="submit" class="btn btn-primary">NEXT STEP</button>
       <a href="<%= url_for @creation %>" class="btn">Cancel</a>
     </div>
   </fieldset>

@@ -11,41 +11,7 @@
       </div>
     </div>
   </div>
-  <div class="span6">
+  <div class="span9">
     <%= render 'form' %>
-    <ul class="thumbnails">
-      <% @creation.photos.each do |photo| %>
-        <li>
-          <div class="thumbnail">
-            <%= image_tag photo.image_url(:thumb) %>
-            <div class="caption">
-              <p><%= link_to "Delete", creation_photo_path(@creation, photo), :class => 'btn btn-danger', :method => :delete, :confirm => "Are you sure?" %></p>
-            </div>
-          </div>
-        </li>
-      <% end %>
-    </ul>
-  </div>
-  <div class="span3">
-    <ul class="thumbnails">
-      <li>
-      <a href="<%= url_for creation_path(@creation) %>">
-        <%= image_tag @creation.image_url.to_s, :class => "thumbnail", :style => "width:235px;" %>
-      </a>
-      </li>
-    </ul>
-    <p>Second thoughts? <%= link_to 'Delete', creation_path(@creation),:confirm => "Are you sure", :method => :delete, :class => 'btn btn-danger' %> </p>
-    <hr />
-    <% if @creation.photos.length < 4 %>
-      <h3>Add another photo</h3>
-      <% unless @creation.new_record? %>
-        <%= form_tag(creation_photos_path(@creation), :method => "post", :multipart => true) do |f| %>
-          <%= fields_for Photo.new do |f| %>
-            <%= f.file_field :image, :rel => creation_photos_path(@creation) %>
-            <input type="submit" class="btn primary" value="Add photo" />
-          <% end %>
-        <% end %>
-      <% end %>
-    <% end %>
   </div>
 </div>

@@ -18,6 +18,7 @@
     <small>
       <% if @creation.user == current_user %>
         <%= link_to '(edit)', edit_creation_path(@creation) %> 
+        <%= link_to 'DELETE', creation_path(@creation),:confirm => "Are you sure you want to permanently remove this creation?", :method => :delete, :class => 'btn btn-danger' %>
       <% end %>
       submitted by <%= link_to @creation.user.name, profile_path(@creation.user) %> on <%= @creation.created_at.to_s :foomat %>
     </small> 
@@ -28,11 +29,16 @@
 <% end -%>
 <hr />
 <div class="row">
+  <% if @creation.user == current_user %>
+  <div class="span3 offset9">
+    <a href="<%= url_for new_creation_photo_path(@creation) %>" class="btn btn-info">Add another photo of this creation</a>
+  </div>
+  <% end %>
   <div class="span12">
     <ul class="thumbnails">
       <li class="span6"><a class="thumbnail gallery" href="<%= @primary_photo.image.large.url %>"><img src="<%= @primary_photo.image.large.url %>" alt="<%= @creation.name %>" /></a></li>
       <% @creation.photos.each do |photo| %>
-      <li class="span3"><img src="<%= photo.image.thumb.url.to_s %>" alt="<%= @creation.name %>" class="thumbnail" /></li>
+        <li class="span3"><a class="thumbnail gallery" href="<%= photo.image.large.url %>"><img src="<%= photo.image.thumb.url.to_s %>" alt="<%= @creation.name %>" class="thumbnail" /></a></li>
       <% end %>
     </ul>
   </div>

@@ -20,12 +20,11 @@
     <div class="row fileupload-buttonbar">
       <div class="span7">
         <span class="btn btn-success fileinput-button"><i class="icon-plus icon-white"></i><span>Add files...</span><%= f.file_field :image %></span>
-        <%= link_to "View", creation_path(@creation), :class => "btn" %>
       </div>
       <div class="span5">
-        <button type="submit" class="btn btn-primary start"><i class="icon-upload icon-white"></i><span>Start upload</span></button>
-        <button type="reset" class="btn btn-warning cancel"><i class="icon-ban-circle icon-white"></i><span>Cancel upload</span></button>
-        <button type="button" class="btn btn-danger delete"><i class="icon-trash icon-white"></i><span>Delete</span></button>
+        <button type="submit" class="btn btn-primary start"><i class="icon-upload icon-white"></i><span> Start upload</span></button>
+        <button type="reset" class="btn btn-warning cancel"><i class="icon-ban-circle icon-white"></i><span> Cancel upload</span></button>
+        <button type="button" class="btn btn-danger delete"><i class="icon-trash icon-white"></i><span> Delete</span></button>
         <input type="checkbox" class="toggle">
       </div>
     </div>
@@ -39,6 +38,13 @@
     <table class="table table-striped"><tbody class="files" data-toggle="modal-gallery" data-target="#modal-gallery"></tbody></table>
   <% end %>
 </div>
+<div class="row">
+  <div class="form-actions">
+    <div class="span3 offset9">
+      <%= link_to "DONE", creation_path(@creation), :class => "btn" %>
+    </div>
+  </div>
+</div>
 
 <!-- The template to display files available for upload -->
 <script id="template-upload" type="text/x-tmpl">

@@ -1,2 +0,0 @@
-<h1>Photos#create</h1>
-<p>Find me in app/views/photos/create.html.erb</p>

@@ -1,2 +0,0 @@
-<h1>Photos#destroy</h1>
-<p>Find me in app/views/photos/destroy.html.erb</p>

@@ -1,6 +1,6 @@
 <% provide(:title, "upload photo") -%>
 <% content_for :page_header do -%>
-  <h1>Share a new creation</h1>
+  <h1>Upload Photos</h1>
 <% end -%>
 <div class="row">
   <div class="span12">

Commit 963eb92c

Commit `963eb92c`