add just the cake edit view to make uploading photo button more prominent.

3 files changed, 17 insertions, 18 deletions

diff --git a/app/assets/javascripts/backbone/templates/cakes/cake.jst.ejs b/app/assets/javascripts/backbone/templates/cakes/cake.jst.ejs
index c20138b5..af2da9a5 100644
--- a/app/assets/javascripts/backbone/templates/cakes/cake.jst.ejs
+++ b/app/assets/javascripts/backbone/templates/cakes/cake.jst.ejs
@@ -4,18 +4,12 @@
     <img class="media-object" data-src="<%= photo.thumb_url %>" alt="64x64" style="width: 64px; height: 64px;" src="<%= photo.thumb_url %>">
   </a>
 <% } %>
-  <div class="media-body">
-    <h4 class="media-heading"><%= name %></h4>
-    <%= story %>
-    <p>
-    <a href="#cakes/<%= id %>/edit">
-      <i class="fa fa-edit"></i> edit
-    </a>
-    <a href="<%= Routes.cake_favorites_path(id) %>">
-      <i class="fa fa-heart"></i> fanclub
-    </a>
-    <span class="badge badge-warning">
-      <i class="fa fa-comment"> </i> <a href="/creations/<%= id %>#disqus_thread" data-disqus-identifier="c-<%= id %>"></a>
-      </span>
-    </p>
-  </div>
+<div class="media-body">
+  <h4 class="media-heading"><%= name %></h4>
+  <%= story %>
+  <p>
+    <a href="#cakes/<%= id %>/edit"><i class="fa fa-edit"></i>edit</a>
+    <a href="<%= Routes.cake_favorites_path(id) %>"><i class="fa fa-heart"></i>fanclub</a>
+    <span class="badge badge-warning"><i class="fa fa-comment"></i><a href="/creations/<%= id %>#disqus_thread" data-disqus-identifier="c-<%= id %>"></a></span>
+  </p>
+</div>
diff --git a/app/assets/javascripts/backbone/templates/cakes/edit.jst.ejs b/app/assets/javascripts/backbone/templates/cakes/edit.jst.ejs
index d462642f..e589075f 100644
--- a/app/assets/javascripts/backbone/templates/cakes/edit.jst.ejs
+++ b/app/assets/javascripts/backbone/templates/cakes/edit.jst.ejs
@@ -1,11 +1,16 @@
 <div class="row-fluid">
   <div class="span12">
-    <p class="pull-right"> <a class="btn btn-primary add-photo">Add Photo...</a> </p>
     <h1><small>Edit</small> <%= cake.name %></h1>
     <hr />
     <form id="edit-cake" name="cake" class="form-horizontal">
       <fieldset>
         <div class="control-group">
+          <label class="control-label"></label>
+          <div class="controls">
+            <a class="btn btn-primary add-photo">Upload Photo...</a>
+          </div>
+        </div>
+        <div class="control-group">
           <label class="control-label" for="cake_name">Name*</label>
           <div class="controls">
             <input class="input-xxlarge" id="cake_name" name="name" type="text" value="<%= cake.name %>" />
diff --git a/app/assets/javascripts/backbone/templates/photos/new-modal.jst.ejs b/app/assets/javascripts/backbone/templates/photos/new-modal.jst.ejs
index 66bbe946..7f7a7dfb 100644
--- a/app/assets/javascripts/backbone/templates/photos/new-modal.jst.ejs
+++ b/app/assets/javascripts/backbone/templates/photos/new-modal.jst.ejs
@@ -3,14 +3,14 @@
   <h4>Upload Photo</h4>
 </div>
 <div class="modal-body">
-  <img id="preview-image" src="#" alt="your image" class="hide hidden-phone" />
   <span class="btn btn-default btn-file">
     + Browse... <input id="photo-attachment" name="attachment" type="file" accept="image/*">
   </span>
-  <p>
+  <p class='pull-right'>
     <input id="watermark" name="watermark" maxlength="30" size="30" type="text" placeholder="watermark" /> on CakeSide.com
     <a class="tooltip-item" data-placement="right" rel="tooltip" href="#" data-original-title="Watermark your name or company on each uploaded image" data-animation="true"><i class="icon-question-sign"></i></a>
   </p>
+  <img id="preview-image" src="#" alt="your image" class="hide hidden-phone" />
 </div>
 <div class="modal-footer">
   <a href="#" class="btn" data-dismiss="modal">Cancel</a>