Commit 7815f6bb

mo k <mo@mokhan.ca>
2012-05-31 13:53:56
split out 9 column and 12 column partials and update references.
master
1 parent 5c0446f
Changed files (12)
app
views
categories
show.html.erb
creations
index.html.erb
devise
passwords
new.html.erb
favorites
index.html.erb
profiles
index.html.erb
mine.html.erb
show.html.erb
registrations
new.html.erb
search
index.html.erb
shared
_a_12_column_gallery.html.erb
_a_9_column_gallery.html.erb
_creation_image_gallery.html.erb
app/views/categories/show.html.erb
@@ -3,8 +3,9 @@
 <% end %>
 
 <div class="row">
-  <div class="span16">
+  <div class="span12">
     <h1>Category <em><%= @category.name %></em></h1>
-    <%= render "shared/creation_image_gallery" %>
+    <hr />
   </div>
 </div>
+<%= render "shared/a_12_column_gallery" %>
app/views/creations/index.html.erb
@@ -42,4 +42,4 @@
     </div>	
   </div>
 <% end %>
-<%= render "shared/creation_image_gallery" %>
+<%= render "shared/a_12_column_gallery" %>
app/views/devise/passwords/new.html.erb
@@ -1,5 +1,5 @@
 <div class="row">
-  <div class="span16">
+  <div class="span12">
     <h1>Forgot your password? <small>don't worry, it happens</small></h1>
     <p> Type your email address below to reset your password. </p>
app/views/favorites/index.html.erb
@@ -9,7 +9,7 @@
   <% end %> 
 </div>
 <div class="row">
-  <div class="span16">
+  <div class="span12">
     <ul class="media-grid">
       <% @creation.favorites.each do |favorite| %>
         <a href="<%= url_for profile_path(favorite.user) %>">
app/views/profiles/index.html.erb
@@ -3,7 +3,7 @@
 <% end %>
 
 <div class="row">
-  <div class="span16">
+  <div class="span12">
     <h1><%= pluralize @profiles.length, "artist" %></h1>
     <table class="bordered-table zebra-striped">
       <thead>
app/views/profiles/mine.html.erb
@@ -1,14 +1,12 @@
 <% content_for :title do %>
   My profile
 <% end %>
-
 <ul class="nav nav-tabs">
   <li class="active"> <%= link_to "Profile", profiles_mine_path %></li>
   <li> <%= link_to "Favorites", profiles_favorites_path %></li>
   <li> <%= link_to "Add Creation", new_creation_path %></li>
   <li> <%= link_to "Settings", edit_user_registration_path %> </li>
 </ul>
-
 <div class="row">
   <div class="span3">
     <ul class="thumbnails">
@@ -18,16 +16,11 @@
     <a href="http://en.gravatar.com/" target="_blank">Change My Photo</a>
     <p>member since: <%= current_user.created_at.to_s :foomat %></p>
     <p>last signed in: <%= current_user.last_sign_in_at.to_s :foomat %></p>
-	<hr>
+    <hr>
     <p>Website or blog: <a  href="<%= current_user.website %>" target="_blank"><%= current_user.website %></a></p>
     <p>Twitter: <a href="https://twitter.com/<%= current_user.twitter %>" target="_blank" class="twitter-follow-button" data-show-count="false">@<%= current_user.twitter %></a></p>
-	<p>Facebook:<a  href="<%= current_user.facebook %>" target="_blank"> <%= current_user.facebook %></a></p>
-
-	<p><%= link_to "Change My Information", edit_user_registration_path %></p>
-
-
-  </div>
-  <div class="span9">
-    <%= render "shared/creation_image_gallery" %>
+    <p>Facebook:<a  href="<%= current_user.facebook %>" target="_blank"> <%= current_user.facebook %></a></p>
+    <p><%= link_to "Change My Information", edit_user_registration_path %></p>
   </div>
+  <%= render "shared/a_9_column_gallery" %>
 </div>
app/views/profiles/show.html.erb
@@ -1,7 +1,6 @@
 <% content_for :title do %>
   <%= @profile.name %>
 <% end %>
-
 <div class="row">
   <div class="span12">
     <h1>
@@ -10,23 +9,19 @@
     </h1>
   </div>
 </div>
-
 <div class="row">
   <div class="span3">
     <p><a href="<%= url_for profile_path(@profile) %>"><img src="<%= avatar_url @profile %>&amp;s=200" alt="<%= @profile.name %>" /></a></p>
     <% unless @profile.website.blank? %>
-		    <p><a  href="<%= @profile.website %>" target="_blank"><%= @profile.website %></a></p>
+      <p><a  href="<%= @profile.website %>" target="_blank"><%= @profile.website %></a></p>
     <% end %>
-	<% unless @profile.twitter.blank? %>
+    <% unless @profile.twitter.blank? %>
       <p><a href="https://twitter.com/<%= @profile.twitter %>" target="_blank" class="twitter-follow-button" data-show-count="false">Follow @<%= @profile.twitter %></a></p>
       <script src="//platform.twitter.com/widgets.js" type="text/javascript"></script>
     <% end %>
     <% unless @profile.facebook.blank? %>
-		    <p><a  href="<%= @profile.facebook %>" target="_blank"><img src="/assets/f_logo_16x16x32.png" alt="Like on Facebook"/> Like on Facebook</a></p>
+      <p><a  href="<%= @profile.facebook %>" target="_blank"><img src="/assets/f_logo_16x16x32.png" alt="Like on Facebook"/> Like on Facebook</a></p>
     <% end %>
-
-  </div>
-  <div class="span9">
-    <%= render "shared/creation_image_gallery" %>
   </div>
 </div>
+<%= render "shared/a_9_column_gallery" %>
app/views/registrations/new.html.erb
@@ -3,7 +3,7 @@
 <% end %>
 
 <div class="row">
-  <div class="span16">
+  <div class="span12">
     <h1>Sign up</h1>
     <%= form_for(resource, :as => resource_name, :url => registration_path(resource_name)) do |f| %>
       <% if resource.errors.messages.any? %>
app/views/search/index.html.erb
@@ -1,24 +1,24 @@
 <% content_for :title do %>
   Search Results for <%= @search %>
 <% end %>
-
 <div class="row">
-  <div class="span16">
+  <div class="span12">
     <h1>Search Results for <em><%= @search %></em></h1>
-
-    <%= render "shared/creation_image_gallery" %>
-
+    <hr />
+  </div>
+</div>
+<%= render "shared/a_12_column_gallery" %>
+<div class="row">
+  <div class="span12">
     <div class="media-grid">
       <% @members.each do |artist| %>
         <a href="<%= url_for profile_path(artist) %>"><img src="<%= avatar_url artist %>&amp;s=210" alt="<%= artist.name %>" /></a>
       <% end %>
     </div>
-
     <div class="row">
       <div class="span3"> &nbsp;</div>
       <div class="span10"> <p> <%= paginate @members %> </p> </div>
       <div class="span3">&nbsp;</div>
     </div>
-
   </div>
 </div>
app/views/shared/_a_12_column_gallery.html.erb
@@ -0,0 +1,5 @@
+<div class="row">
+  <div class="span12">
+    <%= render "shared/creation_image_gallery" %>
+  </div>
+</div>
app/views/shared/_a_9_column_gallery.html.erb
@@ -0,0 +1,3 @@
+<div class="span9">
+  <%= render "shared/creation_image_gallery" %>
+</div>
app/views/shared/_creation_image_gallery.html.erb
@@ -1,26 +1,22 @@
-<div class="row">
-  <div class="span12">
-    <ul class="thumbnails">
-      <% @creations.each do |creation| %>
-        <li class="span3">
-        <div class="thumbnail">
-          <div class="caption">
-            <h5><a href="<%= url_for creation %>"><%= short_name(creation, 20) %></a></h5>
-            <h6><a href="<%= url_for profile_path(creation.user) %>"><%= creation.user.name %></a></h6>
-            <a href="<%= url_for creation %>"><img src="<%= creation.image.thumb.url %>" alt="<%= creation.name %>" /></a>
-            <p>
-            <% if creation.favorites.count > 0 %>
-              <a href="<%= url_for creation_favorites_path(:creation_id => creation.id) %>"><%= creation.favorites.count %><i class="icon-heart"></i></a>
-            <% else %>
-              &nbsp;
-            <% end %>
-            </p>
-          </div>
-        </div>
-        </li>
-      <% end %>
-    </ul>
-  </div>
-</div>
+<ul class="thumbnails">
+  <% @creations.each do |creation| %>
+    <li class="span3">
+    <div class="thumbnail">
+      <div class="caption">
+        <h5><a href="<%= url_for creation %>"><%= short_name(creation, 20) %></a></h5>
+        <h6><a href="<%= url_for profile_path(creation.user) %>"><%= creation.user.name %></a></h6>
+        <a href="<%= url_for creation %>"><img src="<%= creation.image.thumb.url %>" alt="<%= creation.name %>" /></a>
+        <p>
+        <% if creation.favorites.count > 0 %>
+          <a href="<%= url_for creation_favorites_path(:creation_id => creation.id) %>"><%= creation.favorites.count %><i class="icon-heart"></i></a>
+        <% else %>
+          &nbsp;
+        <% end %>
+        </p>
+      </div>
+    </div>
+    </li>
+  <% end %>
+</ul>
 
 <%= render "shared/paging" %>