Commit ad16255e

mo k <m@mokhan.ca>
2011-09-18 03:58:51
tidying up each of the views.
master
1 parent 0342f22
Changed files (11)
app
views
authentications
index.html.erb
categories
edit.html.erb
index.html.erb
new.html.erb
show.html.erb
creations
edit.html.erb
index.html.erb
mine.html.erb
new.html.erb
show.html.erb
home
index.html.erb
app/views/authentications/index.html.erb
@@ -2,41 +2,32 @@
   My Authentications
 <% end %>
 
-<% if @authentications %>
-  <% unless @authentications.empty? %>
-    <p><strong>You can sign in to this account using:</strong></p>
-    <div class="authentications">
-      <% for authentication in @authentications %>
-        <div class="authentication">
-          <%= image_tag "#{authentication.provider}_32.png", :size => "32x32" %>
-          <div class="provider"><%= authentication.provider_name %></div>
-          <div class="uid"><%= authentication.uid %></div>
-          <%= link_to "X", authentication, :confirm => 'Are you sure you want to remove this authentication option?', :method => :delete, :class => "remove" %>
-        </div>
-      <% end %>
-      <div class="clear"></div>
-    </div>
+
+<div class="grid_9 alpha omega">
+  <% if @authentications %>
+    <% unless @authentications.empty? %>
+      <p><strong>You can sign in to this account using:</strong></p>
+      <div class="authentications">
+        <% for authentication in @authentications %>
+          <div class="authentication">
+            <%= image_tag "#{authentication.provider}_32.png", :size => "32x32" %>
+            <div class="provider"><%= authentication.provider_name %></div>
+            <div class="uid"><%= authentication.uid %></div>
+            <%= link_to "X", authentication, :confirm => 'Are you sure you want to remove this authentication option?', :method => :delete, :class => "remove" %>
+          </div>
+        <% end %>
+        <div class="clear"></div>
+      </div>
+    <% end %>
+    <p><strong>Add another service to sign in with:</strong></p>
+  <% else %>
+    <p><strong>Sign in through one of these services:</strong></p>
   <% end %>
-  <p><strong>Add another service to sign in with:</strong></p>
-<% else %>
-  <p><strong>Sign in through one of these services:</strong></p>
-<% end %>
 
-<a href="/auth/twitter" class="auth_provider">
-  <%= image_tag "twitter_64.png", :size => "64x64", :alt => "Twitter" %>
-  Twitter
-</a>
-<a href="/auth/facebook" class="auth_provider">
-  <%= image_tag "facebook_64.png", :size => "64x64", :alt => "Facebook" %>
-  Facebook
-</a>
-<a href="/auth/google_apps" class="auth_provider">
-  <%= image_tag "google_64.png", :size => "64x64", :alt => "Google" %>
-  Google
-</a>
-<a href="/auth/open_id" class="auth_provider">
-  <%= image_tag "openid_64.png", :size => "64x64", :alt => "OpenID" %>
-  OpenID
-</a>
+  <a href="/auth/twitter" class="auth_provider"> <%= image_tag "twitter_64.png", :size => "64x64", :alt => "Twitter" %> Twitter </a>
+  <a href="/auth/facebook" class="auth_provider"> <%= image_tag "facebook_64.png", :size => "64x64", :alt => "Facebook" %> Facebook </a>
+  <a href="/auth/google_apps" class="auth_provider"> <%= image_tag "google_64.png", :size => "64x64", :alt => "Google" %> Google </a>
+  <a href="/auth/open_id" class="auth_provider"> <%= image_tag "openid_64.png", :size => "64x64", :alt => "OpenID" %> OpenID </a>
+</div>
 <div class="clear"></div>
app/views/categories/edit.html.erb
@@ -1,6 +1,16 @@
-<h1>Editing category</h1>
 
-<%= render 'form' %>
+<div class="grid_6 alpha">
+  <h1>Editing category</h1>
 
-<%= link_to 'Show', @category %> |
-<%= link_to 'Back', categories_path %>
+  <%= render 'form' %>
+
+  <%= link_to 'Show', @category %> |
+  <%= link_to 'Back', categories_path %>
+</div>
+<div class="grid_3 omega">
+  <div class="helpbox">
+    <h4>Did you know?</h4>
+    <ul><li>blah</li></ul>
+  </div>
+</div>
+<div class="clear"></div>
app/views/categories/index.html.erb
@@ -1,25 +1,28 @@
-<h1>Listing categories</h1>
 
-<table>
-  <tr>
-    <th>Name</th>
-    <th>Slug</th>
-    <th></th>
-    <th></th>
-    <th></th>
-  </tr>
+<div class="grid_9 alpha omega">
+  <h1>Listing categories</h1>
 
-<% @categories.each do |category| %>
-  <tr>
-    <td><%= category.name %></td>
-    <td><%= category.slug %></td>
-    <td><%= link_to 'Show', category %></td>
-    <td><%= link_to 'Edit', edit_category_path(category) %></td>
-    <td><%= link_to 'Destroy', category, :confirm => 'Are you sure?', :method => :delete %></td>
-  </tr>
-<% end %>
-</table>
+  <table>
+    <tr>
+      <th>Name</th>
+      <th>Slug</th>
+      <th></th>
+      <th></th>
+      <th></th>
+    </tr>
 
-<br />
+    <% @categories.each do |category| %>
+      <tr>
+        <td><%= category.name %></td>
+        <td><%= category.slug %></td>
+        <td><%= link_to 'Show', category %></td>
+        <td><%= link_to 'Edit', edit_category_path(category) %></td>
+        <td><%= link_to 'Destroy', category, :confirm => 'Are you sure?', :method => :delete %></td>
+      </tr>
+    <% end %>
+  </table>
 
-<%= link_to 'New category', new_category_path %>
+  <br />
+
+  <%= link_to 'New category', new_category_path %>
+</div>
app/views/categories/new.html.erb
@@ -1,5 +1,8 @@
-<h1>New category</h1>
 
-<%= render 'form' %>
+<div class="grid_9 alpha omega">
+  <h1>New category</h1>
 
-<%= link_to 'Back', categories_path %>
+  <%= render 'form' %>
+
+  <%= link_to 'Back', categories_path %>
+</div>
app/views/categories/show.html.erb
@@ -1,18 +1,19 @@
-<p id="notice"><%= notice %></p>
-
-
 <% content_for :title do %>
   All Creations in <%= @category.name %>
 <% end %>
-<h1>All Creations in <em><%= @category.name %></em></h1>
 
-<% @creations.reverse.each do |creation| %>
-<div class="product_box">
-  <h2><%= creation.name %></h2>
-  <a href="<%= url_for creation %>"> <%= image_tag creation.image_url.to_s,  :alt => creation.name %> </a>
-  <p><%= creation.short_story %> <%= link_to 'more', creation %></p>
-</div>
-<% end %>
+<div class="grid_9 alpha omega">
+  <h1>All Creations in <em><%= @category.name %></em></h1>
+
+  <% @creations.reverse.each do |creation| %>
+    <div class="product_box">
+      <h2><%= creation.name %></h2>
+      <a href="<%= url_for creation %>"> <%= image_tag creation.image_url.to_s,  :alt => creation.name %> </a>
+      <p><%= creation.short_story %> <%= link_to 'more', creation %></p>
+    </div>
+  <% end %>
 
-<hr class="clear" />
-<p> <%= paginate @creations %> </p>
+  <hr class="clear" />
+  <p> <%= paginate @creations %> </p>
+</div>
+<div class="clear"></div>
app/views/creations/edit.html.erb
@@ -6,9 +6,11 @@
   $('input[data-editable="false"]').addClass('hidden');
 <% end %>
 
-<%= link_to 'Show', @creation, :class => 'floatRight' %>
-<h1>Editing creation <em><%= @creation.name %></em></h1>
 
-<%= image_tag @creation.image_url.to_s, :class => ['photo'] %>
-<%= render 'form' %>
+<div class="grid_9 alpha omega">
+  <%= link_to 'Show', @creation, :class => 'fright' %>
+  <h1>Editing creation <em><%= @creation.name %></em></h1>
 
+  <%= image_tag @creation.image_url.to_s, :class => ['photo'] %>
+  <%= render 'form' %>
+</div>
app/views/creations/index.html.erb
@@ -1,19 +1,18 @@
 <% content_for :title do %>
   Browse All Creations
 <% end %>
-<h1>Browse All Creations</h1>
-<p><em>What time is it? Nana, nana, naaaaana caake time!</em></p>  
-<p>Check out our communities most recent cake work.</p>
 
-<% @creations.reverse.each do |creation| %>
-<div class="product_box">
-  <h2><%= creation.name %></h2>
-  <a href="<%= url_for creation %>">
-    <%= image_tag creation.image_url.to_s, :class => "photo", :alt => creation.name %>
-  </a>
-  <p><%= creation.short_story %> <%= link_to 'more', creation %></p>
-</div>
-<% end %>
+<div class="grid_9 alpha omega">
+  <h1>Browse All Creations</h1>
+  <p><em>What time is it? Nana, nana, naaaaana caake time!</em></p>  
+  <p>Check out our communities most recent cake work.</p>
 
-<hr class="clear" />
-<p> <%= paginate @creations %> </p>
+  <% @creations.reverse.each do |creation| %>
+    <h2><%= creation.name %></h2>
+    <a href="<%= url_for creation %>"><%= image_tag creation.image_url.to_s, :class => "photo", :alt => creation.name %></a>
+    <p><%= creation.short_story %> <%= link_to 'more', creation %></p>
+  <% end %>
+
+  <p> <%= paginate @creations %> </p>
+</div>
+<div class="clear" />
app/views/creations/mine.html.erb
@@ -1,21 +1,27 @@
 <% content_for :title do %>
   My Creations
 <% end %>
-<%= link_to "share my creation", new_creation_path(@creation), :class => 'fright' %>
-<h1>My Creations</h1>
 
-<% if @creations.length == 0 %>
-  <p> 
-  You have no creations. Would you like to <%= link_to "share your creation?", new_creation_path(@creation) %>
- </p>
-<% else %>
-  <% @creations.reverse.each do |creation| %>
-    <div class="product_box">
+<div class="grid_6 alpha">
+  <h1>My Creations</h1>
+  <% if @creations.length == 0 %>
+    <p> 
+    You have no creations. Would you like to <%= link_to "share your creation?", new_creation_path(@creation) %>
+    </p>
+  <% else %>
+    <% @creations.reverse.each do |creation| %>
       <h2><%= creation.name %></h2>
-      <a href="<%= url_for creation %>">
-        <%= image_tag creation.image_url.to_s, :class => "photo" %>
-      </a>
+      <a href="<%= url_for creation %>"><%= image_tag creation.image_url.to_s, :class => "photo" %></a>
       <p><%= creation.short_story %> <%= link_to 'more', creation %></p>
-    </div>
+    <% end %>
   <% end %>
-<% end %>
+</div>
+<div class="grid_3 omega">
+  <div class="helpbox">
+    <h4>Secondary</h4>
+    <ul>
+      <li><%= link_to "share my creation", new_creation_path %></li>
+    </ul>
+  </div>
+</div>
+<div class="clear" />
app/views/creations/new.html.erb
@@ -1,9 +1,10 @@
 <% content_for :title do %>
   Share my creation
 <% end %>
-<h1>Share your creation with other Cake artists, enthusiasts, and eaters!</h1>
-<p>We&apos;re delighted that you're going to share your latest creation with us.<p>
-<h2>Share My Latest Creation</h2>
-<div class="width100">
+<div class="grid_9 alpha omega">
+  <h1>Share your creation with other Cake artists, enthusiasts, and eaters!</h1>
+  <p>We&apos;re delighted that you're going to share your latest creation with us.<p>
+  <h2>Share My Latest Creation</h2>
   <%= render 'form' %>
 </div>
+<div class="clear" />
app/views/creations/show.html.erb
@@ -2,48 +2,45 @@
   <%= @creation.name %> by <%= @creation.user.name %>
 <% end %>
 
-<% if signed_in? %>
-  <div class="fright">
-    <%= link_to "share my creation", new_creation_path %>
-  </div>
-<% end %>
-<% 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 class="grid_9 alpha omega">
+  <% 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 class="width100 fleft">
-    <p> 
-    <%= image_tag @creation.image_url.to_s, :class => ['photo','fright'], :alt => @creation.name %>
-    <%= @creation.story %> 
-    <% if @creation.user == current_user %>
-      <%= link_to '(edit)', edit_creation_path(@creation), :class => 'smallFont' %>
+  <div class="grid_5 alpha">
+    <p><%= @creation.story %></p>
+    <h3>categories</h3>
+    <ul>
+      <% @creation.categories.each do |category| %>
+        <li><%= category.name %></li>
+      <% end %>
+    </ul>
+    <h3> other creations by <%= @creation.user.name.to_s %> <em><%= link_to 'view all', profile_path(@creation.user) %> </em> </h3>
+    <% other_creations = @creation.user.creations.last(4).reverse %>
+    <% other_creations.each do |creation| %>
+      <% if creation != @creation %>
+        <h2><%= @creation.name %></h2>
+        <a href="<%= url_for creation %>"><%= image_tag creation.image_url.to_s, :alt => creation.name %></a>
+        <p><%= creation.short_story %> <%= link_to 'more', creation %></p>
+      <% end %>
     <% end %>
-    </p>
-    <p> submitted on: <%= @creation.created_at %> </p>
-    <% if @creation.user == current_user %>
-      <%= button_to 'Delete', @creation, :method => :delete %>
-    <% end %>
-    <p>categories</p>
-    <% @creation.categories.each do |category| %>
-      <p><%= category.name %></p>
-    <% end %>
-</div>
-
-<hr />
-<hr class="clear" />
+  </div>
 
-<h3> other creations by <%= @creation.user.name.to_s %> <em><%= link_to 'view all', profile_path(@creation.user) %> </em> </h3>
-<% other_creations = @creation.user.creations.last(4).reverse %>
-<% other_creations.each do |creation| %>
-  <% if creation != @creation %>
-  <div class="product_box">
-    <h2><%= @creation.name %></h2>
-    <a href="<%= url_for creation %>">
-      <%= image_tag creation.image_url.to_s, :width => "285px", :height => "140px", :alt => creation.name %>
-    </a>
-    <p><%= creation.short_story %> <%= link_to 'more', creation %></p>
+  <div class="grid_4 omega">
+    <%= image_tag @creation.image_url.to_s, :class => ['photo'], :alt => @creation.name %>
+    <div class="grid_3 alpha">
+      <p> submitted on: <%= @creation.created_at %> </p>
+    </div>
+    <div class="grid_1 omega">
+      <% if @creation.user == current_user %>
+        <%= button_to 'Delete', @creation, :method => :delete %>
+      <% else %>
+        &nbsp;
+      <% end %>
+    </div>
   </div>
-  <% end %>
-<% end %>
+</div>
+
+<div class="clear" />
app/views/home/index.html.erb
@@ -4,8 +4,8 @@
 <% content_for :script do %>
 <% end %>
 
-<h1>Welcome to the CakeSide</h1>
 <div class="grid_6 alpha">
+  <h1>Welcome to the CakeSide</h1>
   <p><em>An online community for cake artists, enthusiasists and eaters.</em></p>
   <p> Lorem ipsum dolor sit amet, consectetur adipiscing elit. Donec malesuada facilisis erat, id sollicitudin leo sollicitudin in. Quisque quis elit eget neque convallis imperdiet in ut odio. Nunc vel lectus turpis, nec tincidunt ipsum. Pellentesque turpis tellus, pulvinar vehicula sodales a, sollicitudin egestas mauris. </p>
   <% @creations.each do |creation| %>