Commit d6aca6d0

mo k <mo@mokhan.ca>
2013-01-26 14:52:12
switch back other pages to 3 and 9 grid
master
1 parent c799908
Changed files (8)
app
views
creations
index.html.erb
new.html.erb
profiles
favorites.html.erb
mine.html.erb
show.html.erb
registrations
edit.html.erb
shared
_a_9_column_gallery.html.erb
_creation_image_gallery.html.erb
app/views/creations/index.html.erb
@@ -2,6 +2,19 @@
 <% content_for(:page_header) do %>
   <h1>Recently added cake creations</h1>
 <% end %>
+<% content_for :javascript do -%>
+<script type="text/javascript">  
+  $(function(){
+    var container = $('#creations-div');
+    container.imagesLoaded(function(){
+      container.masonry({
+        itemSelector : '.span4',
+        isResizable: true
+      }); 
+    });
+  });
+</script>
+<% end -%>
 <% unless user_signed_in?  -%>
   <div class="row">
     <div class="span6">
@@ -58,4 +71,27 @@
     </div>
   </div>
 <% end -%>
-<%= render "shared/a_12_column_gallery" %>
+
+<div class="row">
+  <div class="span12">
+    <div id="creations-div" class="row">
+      <div class="span12">
+      <ul class="thumbnails">
+        <% @creations.each do |creation| %>
+          <div class="span4">
+            <div class="thumbnail">
+              <a href="<%= url_for creation %>"><img src="<%= creation.primary_image.image_url %>" /></a>
+              <div class="caption">
+                <h3><a href="<%= url_for creation %>"><%= creation.name %></a> <em><small>by <a href="<%= url_for profile_path(creation.user) %>"> <%= shrink(creation.user.name, 20) %></a></small></em></h3>
+                <p><%= creation.story %></p>
+                <p><a class="btn" href="<%= url_for creation %>">View</a></p>
+              </div>
+            </div>
+          </div>
+        <% end %>
+      </ul>
+      </div>
+    </div>
+    <%= render "shared/paging" %>
+  </div>
+</div>
app/views/creations/new.html.erb
@@ -3,7 +3,7 @@
   <h1>Share a new creation <small>(Step 1 of 2)</small></h1>
 <% end -%>
 <div class="row">
-  <div class="span4">
+  <div class="span3">
     <div class="thumbnail">
       <%= avatar_for(current_user) %>
       <div class="caption">
@@ -12,19 +12,13 @@
     </div>
     <div style="padding: 8px 0;" class="well">
       <ul class="nav nav-list">
-        <li class="nav-header">Creations</li>
-        <li><a href="<%= url_for root_path %>"><i class="icon-white icon-home"></i> Home</a></li>
-        <li><a href="<%= url_for profiles_favorites_path -%>"><i class="icon-book"></i> My Favorites</a></li>
-        <li class="active"><a href="<%= new_creation_path %>"><i class="icon-pencil"></i> Add Creation</a></li>
-        <li class="nav-header">Account</li>
         <li><a href="<%= url_for profiles_mine_path %>"><i class="icon-user"></i> Profile</a></li>
+        <li><a href="<%= url_for profiles_favorites_path -%>"><i class="icon-book"></i> Favorites</a></li>
         <li><a href="<%= url_for edit_user_registration_path %>"><i class="icon-cog"></i> Settings</a></li>
-        <li class="divider"></li>
-        <li><a href="http://cakeside.uservoice.com/"><i class="icon-flag"></i> Help</a></li>
       </ul>
     </div>
   </div>
-  <div class="span8">
+  <div class="span9">
     <%= render 'form' %>
   </div>
 </div>
app/views/profiles/favorites.html.erb
@@ -3,7 +3,7 @@
   <h1>My Favorites</h1>
 <% end -%>
 <div class="row">
-  <div class="span4">
+  <div class="span3">
     <div class="thumbnail">
       <%= avatar_for(current_user) %>
       <div class="caption">
@@ -12,19 +12,13 @@
     </div>
     <div style="padding: 8px 0;" class="well">
       <ul class="nav nav-list">
-        <li class="nav-header">Creations</li>
-        <li><a href="<%= url_for root_path %>"><i class="icon-white icon-home"></i> Home</a></li>
-        <li class="active"><a href="<%= url_for profiles_favorites_path -%>"><i class="icon-book"></i> My Favorites</a></li>
-        <li><a href="<%= new_creation_path %>"><i class="icon-pencil"></i> Add Creation</a></li>
-        <li class="nav-header">Account</li>
         <li><a href="<%= url_for profiles_mine_path %>"><i class="icon-user"></i> Profile</a></li>
+        <li><a href="<%= url_for profiles_favorites_path -%>"><i class="icon-book"></i> Favorites</a></li>
         <li><a href="<%= url_for edit_user_registration_path %>"><i class="icon-cog"></i> Settings</a></li>
-        <li class="divider"></li>
-        <li><a href="http://cakeside.uservoice.com/"><i class="icon-flag"></i> Help</a></li>
       </ul>
     </div>
   </div>
-  <div class="span8">
+  <div class="span9">
     <ul class="thumbnails">
       <% @creations.each do |creation| %>
         <li><a href="<%= url_for creation %>"><img class="thumbnail" src="<%= creation.primary_image.image.thumb.url %>" alt="<%= creation.name %>"></a></li>
app/views/profiles/mine.html.erb
@@ -1,6 +1,6 @@
 <% provide(:title, "My profile") -%>
 <div class="row">
-  <div class="span4">
+  <div class="span3">
     <div class="thumbnail">
       <%= avatar_for(current_user) %>
       <div class="caption">
@@ -17,19 +17,13 @@
     </div>
     <div style="padding: 8px 0;" class="well">
       <ul class="nav nav-list">
-        <li class="nav-header">Creations</li>
-        <li><a href="<%= url_for root_path %>"><i class="icon-white icon-home"></i> Home</a></li>
-        <li><a href="<%= url_for profiles_favorites_path -%>"><i class="icon-book"></i> My Favorites</a></li>
-        <li><a href="<%= new_creation_path %>"><i class="icon-pencil"></i> Add Creation</a></li>
-        <li class="nav-header">Account</li>
-        <li class="active"><a href="<%= url_for profiles_mine_path %>"><i class="icon-user"></i> Profile</a></li>
+        <li><a href="<%= url_for profiles_mine_path %>"><i class="icon-user"></i> Profile</a></li>
+        <li><a href="<%= url_for profiles_favorites_path -%>"><i class="icon-book"></i> Favorites</a></li>
         <li><a href="<%= url_for edit_user_registration_path %>"><i class="icon-cog"></i> Settings</a></li>
-        <li class="divider"></li>
-        <li><a href="http://cakeside.uservoice.com/"><i class="icon-flag"></i> Help</a></li>
       </ul>
     </div>
   </div>
-  <div class="span8">
+  <div class="span9">
   <%= render "shared/creation_image_gallery" %>
   </div>
 </div>
app/views/profiles/show.html.erb
@@ -3,7 +3,7 @@
     <h1><%= @profile.name %> <small>A member since <%= @profile.created_at.to_s :foomat %>, with <%= @profile.creations.length %> creations.</small> </h1>
 <% end -%>
 <div class="row">
-  <div class="span4">
+  <div class="span3">
     <div class="thumbnail">
       <%= avatar_for(@profile) %>
       <div class="caption">
app/views/registrations/edit.html.erb
@@ -8,7 +8,7 @@ $(function(){ DeviseUsers.Edit.initialize(jQuery); });
   <h1>Settings</h1>
 <% end -%>
   <div class="row">
-    <div class="span4">
+    <div class="span3">
       <div class="thumbnail">
         <%= avatar_for current_user %>
         <div class="caption">
@@ -22,21 +22,15 @@ $(function(){ DeviseUsers.Edit.initialize(jQuery); });
       </div>
       <div style="padding: 8px 0;" class="well">
         <ul class="nav nav-list">
-          <li class="nav-header">Creations</li>
-          <li><a href="<%= url_for root_path %>"><i class="icon-white icon-home"></i> Home</a></li>
-          <li><a href="<%= url_for profiles_favorites_path -%>"><i class="icon-book"></i> My Favorites</a></li>
-          <li><a href="<%= new_creation_path %>"><i class="icon-pencil"></i> Add Creation</a></li>
-          <li class="nav-header">Account</li>
           <li><a href="<%= url_for profiles_mine_path %>"><i class="icon-user"></i> Profile</a></li>
-          <li class="active"><a href="<%= url_for edit_user_registration_path %>"><i class="icon-cog"></i> Settings</a></li>
-          <li class="divider"></li>
-          <li><a href="http://cakeside.uservoice.com/"><i class="icon-flag"></i> Help</a></li>
+          <li><a href="<%= url_for profiles_favorites_path -%>"><i class="icon-book"></i> Favorites</a></li>
+          <li><a href="<%= url_for edit_user_registration_path %>"><i class="icon-cog"></i> Settings</a></li>
         </ul>
       </div>
       <h4>Cancel My Account</h4>
       <p>Unhappy? <%= button_to "Cancel my account", registration_path(resource_name), :confirm => "Are you sure?", :method => :delete, :class => "btn btn-danger" %></p>
     </div>
-    <div class="span8">
+    <div class="span9">
       <p> If you prefer not to change your password, then just leave it blank.  </p>
       <%= form_for(resource, :as => resource_name, :url => registration_path(resource_name), :html => { :method => :put, :class=> "form-horizontal" }) do |f| %>
         <fieldset>
app/views/shared/_a_9_column_gallery.html.erb
@@ -1,3 +1,3 @@
-<div class="span8">
+<div class="span9">
   <%= render "shared/creation_image_gallery" %>
 </div>
app/views/shared/_creation_image_gallery.html.erb
@@ -1,17 +1,3 @@
-<% content_for :javascript do -%>
-<script type="text/javascript">  
-  $(function(){
-    var container = $('#creations-div');
-    container.imagesLoaded(function(){
-      container.masonry({
-        itemSelector : '.span4',
-        isResizable: true
-      }); 
-    });
-  });
-</script>
-<% end -%>
-<!--
 <ul class="thumbnails">
   <% @creations.each do |creation| %>
     <li class="span3">
@@ -27,25 +13,4 @@
     </li>
   <% end %>
 </ul>
--->
-
-<div id="creations-div" class="row">
-  <div class="span12">
-  <ul class="thumbnails">
-    <% @creations.each do |creation| %>
-      <div class="span4">
-        <div class="thumbnail">
-          <a href="<%= url_for creation %>"><img src="<%= creation.primary_image.image_url %>" /></a>
-          <div class="caption">
-            <h3><a href="<%= url_for creation %>"><%= creation.name %></a> <em><small>by <a href="<%= url_for profile_path(creation.user) %>"> <%= shrink(creation.user.name, 20) %></a></small></em></h3>
-            <p><%= creation.story %></p>
-            <p><a class="btn" href="<%= url_for creation %>">View</a></p>
-          </div>
-        </div>
-      </div>
-    <% end %>
-  </ul>
-  </div>
-</div>
-
 <%= render "shared/paging" %>