fix my/cakes#show

2 files changed, 10 insertions, 34 deletions

diff --git a/app/assets/javascripts/backbone/templates/cakes/edit.jst.ejs b/app/assets/javascripts/backbone/templates/cakes/edit.jst.ejs
index 5f73d117..cab7fc92 100644
--- a/app/assets/javascripts/backbone/templates/cakes/edit.jst.ejs
+++ b/app/assets/javascripts/backbone/templates/cakes/edit.jst.ejs
@@ -34,6 +34,6 @@
       <button id='save-button' type="submit" class="btn btn-primary">Publish</button>
       <a href="#cakes/<%= cake.id %>" class="btn btn-secondary">Cancel</a>
     </form>
-    <div class="card-columns"></div>
   </div>
 </div>
+<div class="card-columns"></div>
diff --git a/app/assets/javascripts/backbone/templates/cakes/show.jst.ejs b/app/assets/javascripts/backbone/templates/cakes/show.jst.ejs
index 1ff0b01a..45fb0cd8 100644
--- a/app/assets/javascripts/backbone/templates/cakes/show.jst.ejs
+++ b/app/assets/javascripts/backbone/templates/cakes/show.jst.ejs
@@ -1,50 +1,26 @@
 <div class="row">
   <div class="col">
-    <a id="remove-cake-button" class="btn btn-danger float-right">
-      <i class="icon-white icon-remove"></i> <strong>Delete this cake</strong>
-    </a>
-    <ul class="nav nav-tabs">
-      <li class="nav-item">
-        <a href="#cakes/<%= id %>/edit" class="nav-link active">Edit</a>
-      </li>
-      <li class="nav-item">
-        <a class="nav-link add-photo">Add Photo</a>
-      </li>
-      <li class="nav-item">
-        <a href="<%= Routes.cake_favorites_path(id) %>" class="nav-link">Fan Club</a>
-      </li>
-    </ul>
-  </div>
-</div>
-<div class="row">
-  <div class="col-6">
-    <% if (hasImage()) { %>
-    <% photo = randomPhoto()%>
-    <a href="#cakes/<%= id %>/photos/<%= photo.id %>">
-      <img class="img-fluid" src="<%= photo.large_url %>" alt="<%= name %>" />
-    </a>
-    <% } %>
-  </div>
-  <div class="col-6">
     <h1><a href="#cakes/<%= id %>"><%= name %></a></h1>
-    <span> <i class="icon-tags"></i> </span>
+    <hr />
     <% if (typeof(tags) === "string") { %>
       <% _.each(tags.split(','), function(tag){ %>
         <a href="<%= Routes.creation_tag_path(tag) %>">
-          <span class="label"><%= tag %></span>
+          <span class="badge badge-info"><%= tag %></span>
         </a>
       <% }); %>
     <% } else { %>
       <% _.each(tags, function(tag){ %>
         <a href="<%= Routes.creation_tag_path(tag.name) %>">
-          <span class="label"><%= tag.name %></span>
+          <span class="badge badge-info"><%= tag.name %></span>
         </a>
       <% }); %>
     <% } %>
-    <hr />
+    <div class="float-right">
+      <a href="#cakes/<%= id %>/edit" class="btn btn-primary">Edit</a>
+      <a class="add-photo btn btn-secondary">Add Photo</a>
+      <a id="remove-cake-button" class="btn btn-danger">Delete this cake</a>
+    </div>
     <p><%= story %></p>
   </div>
 </div>
-<div class="row">
-  <ul class="card-columns"></ul>
-</div>
+<div class="card-columns"></div>