Commit 315fd2d1

mo k <m@mokhan.ca>
2011-12-01 06:17:11
started to tidy up show creationpage.
1 parent d7291ba
Changed files (3)
app/views/creations/show.html.erb
@@ -6,37 +6,40 @@
   <%= render "shared/their_profile_sidebar" %>
 <% end %>
 
-<div class="grid_9">
   <% if @creation.user == current_user %>
     <h1><%= @creation.name %> <%= link_to '(edit)', edit_creation_path(@creation), :class => 'smallFont' %> by <em> <%= link_to @creation.user.name, profile_path(@creation.user) %> </em> </h1>
   <% else %>
     <h1><%= @creation.name %> by <em> <%= link_to @creation.user.name, profile_path(@creation.user) %> </em> </h1>
   <% end %>
-</div>
-<div class="clear"></div>
-
-<div class="grid_9 alpha omega">
 
-  <%= image_tag @creation.image_url.to_s, :class => ['photo'], :alt => @creation.name %>
 
+<div class="row">
+  <div class="span12">
+  <ul class="media-grid">
+    <li>
+      <a href="#"> <img class="thumbnail" src="<%= @creation.image_url.to_s%>" alt="<%= @creation.name %>"> </a>
+    </li>
+  </ul>
+  </div>
+  <div class="span4">
+    <p><%= @creation.story %></p>
+  </div>
 </div>
-<div class="clear"></div>
-
-<div class="grid_9">
-  <div class="fright">
+<div class="row">
+  <div class="span8">
     <iframe src="http://www.facebook.com/plugins/like.php?href=<%= request.url %>" scrolling="no" frameborder="0" style="border:none; width:350px; height:30px"></iframe>
+    </p>
+  </div>
+  <div class="span6">
+    <p> submitted on: <%= @creation.created_at.to_s :foomat %>
+      <% @creation.categories.each do |category| %>
+        <span class="label notice"> <a href="/categories/<%= category.slug %>"><%= category.name %></a> </span>
+      <% end %> 
   </div>
-  <p> submitted on: <%= @creation.created_at.to_s :foomat %>
-    <% @creation.categories.each do |category| %>
-      <span class="label notice"> <a href="/categories/<%= category.slug %>"><%= category.name %></a> </span>
-    <% end %> 
-  </p>
-  <p><%= @creation.story %></p>
 </div>
-<div class="clear"></div>
 
-<div class="grid_9 alpha omega">
+<div class="row">
   <h3> other creations by <%= @creation.user.name.to_s %> <em><%= link_to 'view all', profile_path(@creation.user) %> </em> </h3>
-  <%= render "shared/creation_thumbs" %>
 </div>
-<div class="clear"></div>
+
+<%= render "shared/creation_thumbs" %>
app/views/home/index.html.erb
@@ -6,4 +6,9 @@
   <%= render "shared/categories_sidebar" %>
 <% end %>
 
+<div class="hero-unit">
+  <h1>Hello, cake eater!</h1>
+  <p>Vestibulum id ligula porta felis euismod semper. Integer posuere erat a ante venenatis dapibus posuere velit aliquet. Duis mollis, est non commodo luctus, nisi erat porttitor ligula, eget lacinia odio sem nec elit.</p>
+  <p><a class="btn primary large">Learn more &raquo;</a></p>
+</div>
 <%= render "shared/creation_thumbs" %>
app/views/layouts/application.html.erb
@@ -31,7 +31,7 @@
           <a class="brand" href="<%= url_for home_index_path %>">Cake<em>side</em></a>
           <ul class="nav">
             <li class="active"><a href="<%= url_for home_index_path %>">Home</a></li>
-            <li><%= link_to "Share", new_creation_path %></li>
+            <li><%= link_to "Share", new_creation_path, :style => "color:#48ce62;" %></li>
             <li><%= link_to "Artists", all_profiles_path  %></li>
             <li class="dropdown">
             <a href="#" class="dropdown-toggle">Help</a>
@@ -71,11 +71,11 @@
 
       <div class="content">
         <!-- Main hero unit for a primary marketing message or call to action -->
-        <div class="hero-unit">
-          <h1>Hello, cake eater!</h1>
-          <p>Vestibulum id ligula porta felis euismod semper. Integer posuere erat a ante venenatis dapibus posuere velit aliquet. Duis mollis, est non commodo luctus, nisi erat porttitor ligula, eget lacinia odio sem nec elit.</p>
-          <p><a class="btn primary large">Learn more &raquo;</a></p>
-        </div>
+        <%# <div class="hero-unit">%>
+        <%#   <h1>Hello, cake eater!</h1>%>
+        <%#   <p>Vestibulum id ligula porta felis euismod semper. Integer posuere erat a ante venenatis dapibus posuere velit aliquet. Duis mollis, est non commodo luctus, nisi erat porttitor ligula, eget lacinia odio sem nec elit.</p>%>
+        <%#   <p><a class="btn primary large">Learn more &raquo;</a></p>%>
+        <%# </div>%>
 
         <!-- Example row of columns -->
         <%# <div class="row">%>