Commit e86ca1d3

luu stiles <luuduong@gmail.com>
2012-02-14 06:44:01
changed share to 'add creation', and moved favorite button above main picture
1 parent a2fb0cd
Changed files (3)
app/views/creations/new.html.erb
@@ -5,7 +5,7 @@
 <ul class="nav nav-tabs">
   <li> <%= link_to "Profile", profiles_mine_path %></li>
   <li> <%= link_to "Favorites", profiles_favorites_path %></li>
-  <li class="active"> <%= link_to "Share", new_creation_path %></li>
+  <li class="active"> <%= link_to "Add Creation", new_creation_path %></li>
   <li> <%= link_to "Settings", edit_user_registration_path %> </li>
 </ul>
 
app/views/creations/show.html.erb
@@ -18,20 +18,26 @@
 </div>
 
 <div class="row">
-  <div class="span9">
+  <div class="span12">
     <p> 
     submitted on <%= @creation.created_at.to_s :foomat %> |
     <%= link_to 'fanclub (' + pluralize(@creation.favorites.length, 'fan') + ')', creation_favorites_path(:creation_id => @creation.id)%> 
     </p>
   </div>
-  <div class="span3">
-    <iframe src="http://www.facebook.com/plugins/like.php?href=<%= request.url %>" scrolling="no" frameborder="0" style="border:none; width:350px; height:30px"></iframe> 
-    <% if user_signed_in? %>
-      <% unless current_user == @creation.user || current_user.already_likes(@creation) %>
-        <%= button_to "Add to favorites", creation_favorites_path(:creation_id => @creation.id), :method => :post, :class => 'btn btn-success' %>
-      <% end %>
-    <% end %>
-  </div>
+</div>
+
+<div class="row">
+	<div class="span6"> 
+	    <iframe src="http://www.facebook.com/plugins/like.php?href=<%= request.url %>" scrolling="no" frameborder="0" style="border:none; width:350px; height:30px; float:left;">
+		</iframe>
+	  </div>
+	<div class="span2">
+		<% if user_signed_in? %>
+	      <% unless current_user == @creation.user || current_user.already_likes(@creation) %>
+	        <%= button_to "Add to favorites", creation_favorites_path(:creation_id => @creation.id), :method => :post, :class => 'btn btn-primary' %>
+	      <% end %>
+	    <% end %>
+	</div>
 </div>
 
 <div class="row">
app/views/layouts/application.html.erb
@@ -60,7 +60,7 @@
             <%# <input type="submit" value="search" />%>
           <% end %>
           <ul class="nav pull-right">
-            <li><%= link_to "Share", new_creation_path, :style => "color:#48ce62;" %></li>
+            <li><%= link_to "Add Creation", new_creation_path, :style => "color:#48ce62;" %></li>
             <li class="divider-vertical"></li>
           <% if user_signed_in? %>
             <li class="dropdown">