Commit 529e38f5

@@ -8,16 +8,16 @@
 <%= form_for(@creation, :html => {:multipart => true, :class => "form-horizontal"}) do |f| %>
   <fieldset>
     <div class="control-group">
-      <%= f.label :name, :class => "control-label" %>
+      <%= f.label :name, "Creation name", :class => "control-label" %>
       <div class="controls">
         <%= f.text_field :name, :class => "input-xlarge" %>
       </div>
     </div>
     <div class="control-group">
-      <%= f.label :watermark, "Brand This Image", :class => "control-label" %>
+      <%= f.label :watermark, "Brand this image", :class => "control-label" %>
       <div class="controls">
         <%= f.text_field :watermark, :class => "input-medium", :maxlength=> 30 %> on CakeSide.com
-        <a class="tooltip-item" data-placement="right" rel="tooltip" href="#" data-original-title="Add your name or company to the uploaded image" data-animation="true"><i class="icon-question-sign"></i></a>
+        <a class="tooltip-item" data-placement="right" rel="tooltip" href="#" data-original-title="Watermark your name or company to the uploaded image" data-animation="true"><i class="icon-question-sign"></i></a>
       </div>
     </div>
     <div class="control-group">
@@ -25,7 +25,7 @@
       <div class="controls">
         <%= f.text_area :story, :class =>"input-xlarge", :rows => "3" %>
         <p class="help-block">
-        Tell us the story or description of the creation.
+        Tell us the story or description about this creation.
         </p>
       </div>
     </div>

@@ -1,6 +1,6 @@
 <% provide(:title, "Editing creation #{@creation.name}") %>
 <% content_for :page_header do -%>
-  <h1><small>Edit</small> <%= @creation.name %></h1>
+  <h1><small>Edit</small> <%= @creation.name %> <small>(Step 1 of 2)</small></h1>
 <% end -%>
 <div class="row">
   <div class="span3">

@@ -1,6 +1,6 @@
 <% provide(:title, "Share my creation") -%>
 <% content_for :page_header do -%>
-  <h1>Share a new creation</h1>
+  <h1>Share a new creation <small>(Step 1 of 2)</small></h1>
 <% end -%>
 <div class="row">
   <div class="span3">

@@ -16,10 +16,6 @@
   <h1>
     <%= @creation.name %> 
     <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> 
   </h1>
@@ -30,9 +26,14 @@
 <hr />
 <% if @creation.user == current_user %>
  <div class="row" style="padding-bottom: 10px;">
-  <div class="span3 offset9">
-    <a href="<%= url_for new_creation_photo_path(@creation) %>" class="btn btn-info">Add images to this creation</a>
-  </div>
+  <div class="span12">
+
+      <% if @creation.user == current_user %>
+        <%= link_to '<i class="icon-edit"></i> <strong>Edit creation</strong>'.html_safe, edit_creation_path(@creation), :class => 'btn' %> 
+        <a class="btn" href="<%= url_for new_creation_photo_path(@creation) %>"><i class="icon-plus"></i> <strong>Add images to this creation</strong></a>
+        <%= link_to '<i class="icon-white icon-remove"></i> <strong>Delete</strong>'.html_safe, creation_path(@creation),:confirm => "Are you sure you want to permanently remove this creation?", :method => :delete, :class => 'btn btn-danger' %>
+      <% end %>
+</div>  
  </div>
   <% end %>
 <div class="row">

@@ -29,12 +29,12 @@
 <div>
   <%= form_for [@creation, @photo], :html => { :multipart => true, :id => "fileupload"  } do |f| %>
     <div class="row fileupload-buttonbar">
+      <div class="span2">
+        <span class="btn btn-success fileinput-button"><i class="icon-plus icon-white"></i><span> Add image... </span><%= f.file_field :image %></span>
+      </div>
       <div class="span10">
         <div class="progress progress-success progress-striped active fade"><div class="bar" style="width:0%;"></div></div>
       </div>
-      <div class="span2">
-        <span class="btn btn-success fileinput-button"><i class="icon-plus icon-white"></i><span> Add image...</span><%= f.file_field :image %></span>
-      </div>
     </div>
     <div class="fileupload-loading"></div>
     <br>
@@ -102,7 +102,7 @@
         <td class="delete">
             <button class="btn btn-danger" data-type="{%=file.delete_type%}" data-url="{%=file.delete_url%}">
                 <i class="icon-trash icon-white"></i>
-                <span>REMOVE</span>
+                <span>Remove</span>
             </button>
         </td>
     </tr>

@@ -1,21 +1,14 @@
-<% provide(:title, "Upload Images") -%>
+<% provide(:title, "Upload images for this creation") -%>
 <% content_for :page_header do -%>
   <% if(@creation.is_restricted) -%>
     <div style="float:right;">
       <%= image_tag "ratedr.jpg", :class => "span1" %>
     </div>
   <% end -%>
-  <h1> <%= @creation.name %> <small> submitted by <%= link_to @creation.user.name, profile_path(@creation.user) %> on <%= @creation.created_at.to_s :foomat %> </small> </h1>
-  <% @creation.categories.each do |category| %>
-    <a href="/categories/<%= category.slug %>"><span class="label"><%= category.name %></span></a>
-  <% end %> 
+  <h1>Upload images for this creation<small> (Step 2 of 2)</small></h1>
+ <h3>Creation name: <small><%= @creation.name %></small></h3>
+ <hr>
 <% end -%>
-<div class="row">
-  <div class="span12">
-    <hr />
-    <p><%= @creation.story %></p>
-  </div>
-</div>
 <div class="row">
   <div class="span12">
     <%= render 'form' %>