Commit f112e911

mista mo <cake-eater@mokhan.ca>
2011-06-16 00:33:03
stripped out all the old html.
master
1 parent 8bfafc0
Changed files (19)
app
views
creations
edit.html.erb
index.html.erb
mine.html.erb
new.html.erb
show.html.erb
devise
confirmations
new.html.erb
passwords
edit.html.erb
new.html.erb
registrations
edit.html.erb
new.html.erb
sessions
new.html.erb
unlocks
new.html.erb
home
index.html.erb
layouts
application.html.erb
profiles
index.html.erb
show.html.erb
registrations
edit.html.erb
new.html.erb
search
index.html.erb
app/views/creations/edit.html.erb
@@ -1,19 +1,11 @@
 
-<div class="welcomeHolder">
-  <div class="welcome">
-    <%= image_tag "cakes/Camouflage_Truck.jpg", :alt=>"camouflage truck cake", :class=>"photo", :width=>"417px", :height=>"205px" %>
-    <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>
-    <p align="right">
-    <a href="<%= url_for my_creations_path %>"><input type="button" value="MY CREATIONS" class="view" /></a>
-    </p> 
-    <div class="clear"></div>
-  </div>
-  <div class="welcomeBottom"></div>
-</div>
+<%= image_tag "cakes/Camouflage_Truck.jpg", :alt=>"camouflage truck cake", :class=>"photo", :width=>"417px", :height=>"205px" %>
+<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>
+<a href="<%= url_for my_creations_path %>"> My Creations </a> 
 
-<div class="heading">Editing creation <%= @creation.name %></div>
+<div>Editing creation <%= @creation.name %></div>
 
 <div class="width100 floatLeft">
   <div class="width50 floatLeft">
@@ -21,15 +13,10 @@
   </div>
   <div class="width50 floatRight">
     <p>
-      <%= image_tag @creation.image_url.to_s, :class => 'photo' %>
+    <%= image_tag @creation.image_url.to_s, :class => 'photo' %>
     </p>
   </div>
 </div>
 
 <%= link_to 'Show', @creation %> |
 <%= link_to 'Back', creations_path %>
-
-<div class="space"></div>
-<div class="clear"></div>
-<div class="hr"></div>
-<div class="space"></div>
app/views/creations/index.html.erb
@@ -1,54 +1,28 @@
 
-<div class="welcomeHolder">
-  <div class="welcome">
-    <% if @creations.any? %>
-    <a href="<%= url_for @creations[0] %>">
-      <%= image_tag @creations[0].image_url.to_s, :width => 417, :height => 205, :class => 'photo' %>
-    </a>
-    <% else %>
-    <a href="<%= url_for @creations[0] %>">
-      <%= image_tag "cakes/Camouflage_Truck.jpg", :width => 417, :height => 205, :class => 'photo' %>
-    </a>
-    <% 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>
-    <p align="right">
-    <a href="<%= url_for my_creations_path %>"><input type="button" value="MY CREATIONS" class="view" /></a>
-    </p> 
-    <div class="clear"></div>
-  </div>
-  <div class="welcomeBottom"></div>
-</div>
-
-<div class="heading">The most recent creations</div>
+<% if @creations.any? %>
+  <a href="<%= url_for @creations[0] %>">
+    <%= image_tag @creations[0].image_url.to_s, :width => 417, :height => 205, :class => 'photo' %>
+  </a>
+<% else %>
+  <a href="<%= url_for @creations[0] %>">
+    <%= image_tag "cakes/Camouflage_Truck.jpg", :width => 417, :height => 205, :class => 'photo' %>
+  </a>
+<% end %>
 
-<div class="organic">
-<% @creations.reverse.each_with_index do |creation, index| %>
-    <div class="organicHolder">
-      <div class="organicContent">
-        <a href="<%= url_for creation %>">
-          <%= image_tag creation.image_url.to_s, :width => "285px", :height => "140px", :class => "photo", :alt => creation.name %>
-        </a>
-        <h2><%= creation.name %></h2>
-        <p><%= creation.story %> <%= link_to 'more...', creation %></p>
-      </div>
-    </div>
-    <% if (index +1) % 3 == 0 %>
-</div>
+<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>
+<a href="<%= url_for my_creations_path %>"> My Creations </a>
 
-<div class="space"></div>
-<div class="organic">
+<div>The most recent creations</div>
 
+<div>
+  <% @creations.reverse.each_with_index do |creation, index| %>
+    <a href="<%= url_for creation %>">
+      <%= image_tag creation.image_url.to_s, :width => "285px", :height => "140px", :class => "photo", :alt => creation.name %>
+    </a>
+    <h2><%= creation.name %></h2>
+    <p><%= creation.story %> <%= link_to 'more...', creation %></p>
   <% end %>
-
-<% end %>
 </div>
 
-
-<div class="space"></div>
-
-<div class="clear"></div>
-
-<div class="hr"></div>
-<div class="space"></div>
app/views/creations/mine.html.erb
@@ -1,47 +1,18 @@
-<div class="heading">My Creations</div>
+<div>My Creations</div>
 
 <div class="floatRight">
 <%= link_to "add creation", new_creation_path(@creation) %>
 </div>
 <% if @creations.length == 0 %>
-
   <div class="width100">
     <p> you have no creations.  </p>
   </div>
-
 <% else %>
-
-  <div class="organic">
   <% @creations.reverse.each_with_index do |creation, index| %>
-      <div class="organicHolder">
-        <div class="organicContent">
           <a href="<%= url_for creation %>">
             <%= image_tag creation.image_url.to_s, :width => "285px", :height => "140px", :class => "photo" %>
           </a>
           <h2><%= creation.name %></h2>
           <p><%= creation.story %> <%= link_to 'more...', creation %></p>
-          <p>
-          
-          </p>
-        </div>
-      </div>
-      <% if (index +1) % 3 == 0 %>
-  </div>
-
-  <div class="space"></div>
-  <div class="organic">
-
-    <% end %>
-
   <% end %>
-
-  </div>
 <% end %>
-
-
-<div class="space"></div>
-
-<div class="clear"></div>
-
-<div class="hr"></div>
-<div class="space"></div>
app/views/creations/new.html.erb
@@ -1,26 +1,12 @@
 
-<div class="welcomeHolder">
-  <div class="welcome">
-    <%= image_tag "cakes/Camouflage_Truck.jpg", :alt=>"camouflage truck cake", :class=>"photo", :width=>"417px", :height=>"205px" %>
-    <h1>Share your creation with other Cake artists, enthusiasts, and eaters!</h1>
-    <p>We&apos;re delighted that you're going to share you latest creation with us.<p>
-    <p align="right">
-    <a href="<%= url_for my_creations_path %>"><input type="button" value="MY CREATIONS" class="view" /></a>
-    </p> 
-    <div class="clear"></div>
-  </div>
-  <div class="welcomeBottom"></div>
-</div>
-
-<div class="heading">Add My Latest Creation</div>
-
+<%= image_tag "cakes/Camouflage_Truck.jpg", :alt=>"camouflage truck cake", :class=>"photo", :width=>"417px", :height=>"205px" %>
+<h1>Share your creation with other Cake artists, enthusiasts, and eaters!</h1>
+<p>We&apos;re delighted that you're going to share you latest creation with us.<p>
+<a href="<%= url_for my_creations_path %>"> my creations </a>
+<div>Add My Latest Creation</div>
 <div class="width100">
   <%= render 'form' %>
 </div>
 
 <%= link_to 'Back', creations_path %>
 
-<div class="space"></div>
-<div class="clear"></div>
-<div class="hr"></div>
-<div class="space"></div>
app/views/creations/show.html.erb
@@ -1,39 +1,34 @@
-<div class="heading"><%= @creation.name %></div>
+<div><%= @creation.name %></div>
 
 <div class="width100 floatLeft">
   <div class="width50 floatLeft">
     <p>
-      <%= image_tag @creation.image_url.to_s, :class => 'photo' %>
+    <%= image_tag @creation.image_url.to_s, :class => 'photo' %>
     </p>
     <p> submitted on: <%= @creation.created_at %> </p>
   </div>
   <div class="width50 floatRight">
     <p>
-      <strong>Story:</strong>
-      <%= @creation.story %>
+    <strong>Story:</strong>
+    <%= @creation.story %>
     </p>
     <p>
-      <strong>Artist:</strong>
-      <%= link_to @creation.user.name, profile_path(@creation.user) %>
+    <strong>Artist:</strong>
+    <%= link_to @creation.user.name, profile_path(@creation.user) %>
     </p>
-    <div class="space"></div>
     <p>
-        <% if @creation.user == current_user %>
-          <%= link_to 'Edit', edit_creation_path(@creation) %> |
-          <%= button_to 'Delete', @creation, :method => :delete %>
-        <% end %>
-        <% if signed_in? %>
-          <%= link_to "Add Creation", new_creation_path %>
-        <% end %>
-        <div class="space"></div>
-        <%= link_to 'Back', creations_path %>
+    <% if @creation.user == current_user %>
+      <%= link_to 'Edit', edit_creation_path(@creation) %> |
+      <%= button_to 'Delete', @creation, :method => :delete %>
+    <% end %>
+    <% if signed_in? %>
+      <%= link_to "Add Creation", new_creation_path %>
+    <% end %>
+    <%= link_to 'Back', creations_path %>
     </p>
   </div>
 </div>
-<div class="space"></div>
-<div class="clear"></div>
-
-<div class="heading">
+<div>
   <%= @creation.user.name.to_s.pluralize %> other creations
   <%= link_to 'view more...', profile_path(@creation.user), :class=>"floatRight" %> 
 </div>
@@ -41,26 +36,14 @@
 <% other_creations = @creation.user.creations.last(4) %>
 
 <% if other_creations.length > 0 %>
-  <div class="organic">
-    <% other_creations.each do |creation| %>
-      <% if creation != @creation %>
-        <div class="organicHolder">
-          <div class="organicContent">
-            <a href="<%= url_for creation %>">
-              <%= image_tag creation.image_url.to_s, :width => "285px", :height => "140px", :class => "photo", :alt => creation.name %>
-            </a>
-            <h2><%= creation.name %></h2>
-            <p><%= creation.story %> <%= link_to 'more...', creation %></p>
-          </div>
-        </div>
-      <% end %>
+  <% other_creations.each do |creation| %>
+    <% if creation != @creation %>
+      <a href="<%= url_for creation %>">
+        <%= image_tag creation.image_url.to_s, :width => "285px", :height => "140px", :class => "photo", :alt => creation.name %>
+      </a>
+      <h2><%= creation.name %></h2>
+      <p><%= creation.story %> <%= link_to 'more...', creation %></p>
     <% end %>
-  </div>
+  <% end %>
 <% end %>
 <%= link_to 'view more...', profile_path(@creation.user), :class=>"floatRight" %> 
-
-
-<div class="space"></div>
-<div class="clear"></div>
-<div class="hr"></div>
-<div class="space"></div>
app/views/devise/confirmations/new.html.erb
@@ -1,14 +1,8 @@
-<div class="welcomeHolder">
-  <div class="welcome">
-    <%= image_tag "cakes/Haunted_House.jpg", :alt=>"camouflage truck cake", :class=>"photo", :width=>"417px", :height=>"205px" %>
-    <h1>C'mon In... </h1>
-    <p>&quot;You don't make friends with salad&quot; - Homer Simpson<p>
-    <div class="clear"></div>
-  </div>
-  <div class="welcomeBottom"></div>
-</div>
+<%= image_tag "cakes/Haunted_House.jpg", :alt=>"camouflage truck cake", :class=>"photo", :width=>"417px", :height=>"205px" %>
+<h1>C'mon In... </h1>
+<p>&quot;You don't make friends with salad&quot; - Homer Simpson<p>
 
-<div class="heading">Resend confirmation instructions</div>
+<div>Resend confirmation instructions</div>
 
 <%= form_for(resource, :as => resource_name, :url => confirmation_path(resource_name), :html => { :method => :post }) do |f| %>
   <%= devise_error_messages! %>
@@ -21,7 +15,3 @@
 
 <%= render :partial => "devise/shared/links" %>
 
-<div class="space"></div>
-<div class="clear"></div>
-<div class="hr"></div>
-<div class="space"></div>
app/views/devise/passwords/edit.html.erb
@@ -1,15 +1,8 @@
+<%= image_tag "cakes/Haunted_House.jpg", :alt=>"camouflage truck cake", :class=>"photo", :width=>"417px", :height=>"205px" %>
+<h1>C'mon In... </h1>
+<p>&quot;You don't make friends with salad&quot; - Homer Simpson<p>
 
-<div class="welcomeHolder">
-  <div class="welcome">
-    <%= image_tag "cakes/Haunted_House.jpg", :alt=>"camouflage truck cake", :class=>"photo", :width=>"417px", :height=>"205px" %>
-    <h1>C'mon In... </h1>
-    <p>&quot;You don't make friends with salad&quot; - Homer Simpson<p>
-    <div class="clear"></div>
-  </div>
-  <div class="welcomeBottom"></div>
-</div>
-
-<div class="heading">Change your password</div>
+<div>Change your password</div>
 
 <%= form_for(resource, :as => resource_name, :url => password_path(resource_name), :html => { :method => :put }) do |f| %>
   <%= devise_error_messages! %>
@@ -25,8 +18,3 @@
 <% end %>
 
 <%= render :partial => "devise/shared/links" %>
-
-<div class="space"></div>
-<div class="clear"></div>
-<div class="hr"></div>
-<div class="space"></div>
app/views/devise/passwords/new.html.erb
@@ -1,14 +1,10 @@
-<div class="welcomeHolder">
-  <div class="welcome">
-    <%= image_tag "cakes/Haunted_House.jpg", :alt=>"camouflage truck cake", :class=>"photo", :width=>"417px", :height=>"205px" %>
-    <h1>C'mon In... </h1>
-    <p>&quot;You don't make friends with salad&quot; - Homer Simpson<p>
-    <div class="clear"></div>
-  </div>
-  <div class="welcomeBottom"></div>
+<div>
+  <%= image_tag "cakes/Haunted_House.jpg", :alt=>"camouflage truck cake", :class=>"photo", :width=>"417px", :height=>"205px" %>
+  <h1>C'mon In... </h1>
+  <p>&quot;You don't make friends with salad&quot; - Homer Simpson<p>
 </div>
 
-<div class="heading">Forgot your password?</div>
+<div>Forgot your password?</div>
 
 <%= form_for(resource, :as => resource_name, :url => password_path(resource_name), :html => { :method => :post }) do |f| %>
   <%= devise_error_messages! %>
@@ -20,8 +16,3 @@
 <% end %>
 
 <%= render :partial => "devise/shared/links" %>
-
-<div class="space"></div>
-<div class="clear"></div>
-<div class="hr"></div>
-<div class="space"></div>
app/views/devise/registrations/edit.html.erb
@@ -1,15 +1,9 @@
 
-<div class="welcomeHolder">
-  <div class="welcome">
     <%= image_tag "cakes/Haunted_House.jpg", :alt=>"camouflage truck cake", :class=>"photo", :width=>"417px", :height=>"205px" %>
     <h1>C'mon In... </h1>
     <p>&quot;You don't make friends with salad&quot; - Homer Simpson<p>
-    <div class="clear"></div>
-  </div>
-  <div class="welcomeBottom"></div>
-</div>
 
-<div class="heading">Edit <%= resource_name.to_s.humanize %></div>
+<div>Edit <%= resource_name.to_s.humanize %></div>
 
 <%= form_for(resource, :as => resource_name, :url => registration_path(resource_name), :html => { :method => :put }) do |f| %>
   <%= devise_error_messages! %>
@@ -32,14 +26,8 @@
   <p><%= f.submit "Update" %></p>
 <% end %>
 
-<div class="heading">Cancel my account</div>
+<div>Cancel my account</div>
 
 <p>Unhappy? <%= button_to "Cancel my account", registration_path(resource_name), :confirm => "Are you sure?", :method => :delete %>.</p>
 
-<div class="space"></div>
-<div class="space"></div>
 <%= link_to "Back", :back %>
-<div class="space"></div>
-<div class="clear"></div>
-<div class="hr"></div>
-<div class="space"></div>
app/views/devise/registrations/new.html.erb
@@ -1,16 +1,9 @@
+<%= image_tag "cakes/Haunted_House.jpg", :alt=>"camouflage truck cake", :class=>"photo", :width=>"417px", :height=>"205px" %>
+<h1>C'mon In... </h1>
+<p>&quot;You don't make friends with salad&quot; - Homer Simpson<p>
+<p>Already have an account. Then <%= link_to "sign in", new_user_session_path %>.</p>
 
-<div class="welcomeHolder">
-  <div class="welcome">
-    <%= image_tag "cakes/Haunted_House.jpg", :alt=>"camouflage truck cake", :class=>"photo", :width=>"417px", :height=>"205px" %>
-    <h1>C'mon In... </h1>
-    <p>&quot;You don't make friends with salad&quot; - Homer Simpson<p>
-    <p>Already have an account. Then <%= link_to "sign in", new_user_session_path %>.</p>
-    <div class="clear"></div>
-  </div>
-  <div class="welcomeBottom"></div>
-</div>
-
-<div class="heading">Sign up</div>
+<div>Sign up</div>
 
 <%= form_for(resource, :as => resource_name, :url => registration_path(resource_name)) do |f| %>
   <%= devise_error_messages! %>
@@ -31,8 +24,3 @@
 <% end %>
 
 <%= render :partial => "devise/shared/links" %>
-
-<div class="space"></div>
-<div class="clear"></div>
-<div class="hr"></div>
-<div class="space"></div>
app/views/devise/sessions/new.html.erb
@@ -1,16 +1,10 @@
 
-<div class="welcomeHolder">
-  <div class="welcome">
-    <%= image_tag "cakes/Haunted_House.jpg", :alt=>"camouflage truck cake", :class=>"photo", :width=>"417px", :height=>"205px" %>
-    <h1>C'mon In... </h1>
-    <p>&quot;You don't make friends with salad&quot; - Homer Simpson<p>
-    <p>Don&apos;t have an account. Then <%= link_to "sign up", new_user_registration_path %>.</p>
-    <div class="clear"></div>
-  </div>
-  <div class="welcomeBottom"></div>
-</div>
-
-<div class="heading">Sign in</div>
+<%= image_tag "cakes/Haunted_House.jpg", :alt=>"camouflage truck cake", :class=>"photo", :width=>"417px", :height=>"205px" %>
+<h1>C'mon In... </h1>
+<p>&quot;You don't make friends with salad&quot; - Homer Simpson<p>
+<p>Don&apos;t have an account. Then <%= link_to "sign up", new_user_registration_path %>.</p>
+
+<div>Sign in</div>
 
 <%= form_for(resource, :as => resource_name, :url => session_path(resource_name)) do |f| %>
   <p><%= f.label :email %><br />
@@ -45,11 +39,6 @@
   <%= image_tag "openid_64.png", :size => "64x64", :alt => "OpenID" %>
   OpenID
 </a>
-<div class="clear"></div>
 
 <%= render :partial => "devise/shared/links" %>
 
-<div class="space"></div>
-<div class="clear"></div>
-<div class="hr"></div>
-<div class="space"></div>
app/views/devise/unlocks/new.html.erb
@@ -1,14 +1,8 @@
-<div class="welcomeHolder">
-  <div class="welcome">
-    <%= image_tag "cakes/Haunted_House.jpg", :alt=>"camouflage truck cake", :class=>"photo", :width=>"417px", :height=>"205px" %>
-    <h1>C'mon In... </h1>
-    <p>&quot;You don't make friends with salad&quot; - Homer Simpson<p>
-    <div class="clear"></div>
-  </div>
-  <div class="welcomeBottom"></div>
-</div>
+<%= image_tag "cakes/Haunted_House.jpg", :alt=>"camouflage truck cake", :class=>"photo", :width=>"417px", :height=>"205px" %>
+<h1>C'mon In... </h1>
+<p>&quot;You don't make friends with salad&quot; - Homer Simpson<p>
 
-<div class="heading">Resend unlock instructions</div>
+<div>Resend unlock instructions</div>
 
 <%= form_for(resource, :as => resource_name, :url => unlock_path(resource_name), :html => { :method => :post }) do |f| %>
   <%= devise_error_messages! %>
@@ -20,8 +14,3 @@
 <% end %>
 
 <%= render :partial => "devise/shared/links" %>
-
-<div class="space"></div>
-<div class="clear"></div>
-<div class="hr"></div>
-<div class="space"></div>
app/views/home/index.html.erb
@@ -1,56 +1,20 @@
-<div class="welcomeHolder">
-  <div class="welcome">
-    <% if @creations.any? %>
-    <a href="<%= url_for @creations[0] %>">
-      <%= image_tag @creations[0].image_url.to_s, :width => 417, :height => 205, :class => 'photo' %>
-    </a>
-    <% else %>
-    <a href="<%= url_for @creations[0] %>">
-      <%= image_tag "cakes/Camouflage_Truck.jpg", :width => 417, :height => 205, :class => 'photo' %>
-    </a>
-    <% end %>
-    <h1>Welcome to the CakeSide</h1>
-    <p><em>An online community for cake artists, enthusiasists and eaters.</em></p>
-    <p align="right">
-    <a href="<%= url_for my_creations_path %>"><input type="button" value="MY CREATIONS" class="view" /></a>
-    </p> 
-    <div class="clear"></div>
-  </div>
-  <div class="welcomeBottom"></div>
-</div>
-
-<div class="heading">Mmm... Cake!</div>
+<% if @creations.any? %>
+  <a href="<%= url_for @creations[0] %>">
+    <%= image_tag @creations[0].image_url.to_s, :width => 417, :height => 205, :class => 'photo' %>
+  </a>
+<% else %>
+  <a href="<%= url_for @creations[0] %>">
+    <%= image_tag "cakes/Camouflage_Truck.jpg", :width => 417, :height => 205, :class => 'photo' %>
+  </a>
+<% end %>
+<h1>Welcome to the CakeSide</h1>
+<p><em>An online community for cake artists, enthusiasists and eaters.</em></p>
+<a href="<%= url_for my_creations_path %>"> My Creations </a>
 
-<div class="organic">
 <% @creations.reverse.each_with_index do |creation, index| %>
-    <div class="organicHolder">
-      <div class="organicContent">
-        <a href="<%= url_for creation %>">
-          <%= image_tag creation.image_url.to_s, :width => "285px", :height => "140px", :class => "photo", :alt => creation.name %>
-        </a>
-        <h2><%= creation.name %></h2>
-        <p><%= creation.story %> <%= link_to 'more...', creation %></p>
-      </div>
-    </div>
-    <% if index == 4 %>
-  <div class="organicHolder">
-    <div class="vegetable">
-      <h3>Learn About Our Cakes</h3>
-    </div>
-  </div>
-    <% end %>
-    <% if (index +1) % 3 == 0 %>
-</div>
-
-<div class="space"></div>
-<div class="organic">
-
-  <% end %>
-
+  <a href="<%= url_for creation %>">
+    <%= image_tag creation.image_url.to_s, :width => "285px", :height => "140px", :class => "photo", :alt => creation.name %>
+  </a>
+  <h2><%= creation.name %></h2>
+  <p><%= creation.story %> <%= link_to 'more...', creation %></p>
 <% end %>
-</div>
-
-<div class="clear"></div>
-
-<div class="hr"></div>
-<div class="space"></div>
app/views/layouts/application.html.erb
@@ -14,88 +14,29 @@
 <%= yield :head %>
 </head>
 <body>
-  <div id="main"><!-- Main starts here -->
-    <header>
-    <div id="header"><!-- Header starts here -->
-      <div class="searchBar">
-        <div class="search">
-          <% form_tag(search_index_path, :method => "get") do %>
-            <div class="txt">
-              <%= text_field_tag(:q) %>
-            </div>
-            <div class="searchBt">
-              <%= submit_tag("search") %>
-            </div>
-          <% end %>
-        </div>
-        <% if user_signed_in? %>
-          <div class="signOut">
-            <%= link_to "sign out", destroy_user_session_path %> </p>
-          </div>
-        <% else %>
-          <div class="signIn">
-            <%= link_to "sign in", new_user_session_path %>
-          </div>
-        <% end %>
-      </div>
 
-      <div class="menu">
-        <ul id="menu">
-          <li class="small"><%= link_to "home", home_index_path %></li>
-          <li class="medium"><%= link_to "browse", creations_path %></li>
-          <li class="large"><a href="#contact">contact us</a></li>
-        </ul>
-      </div>
-      <div class="subs">
-        <a href="<%= url_for home_index_path %>.xml"><p>SUBCRIBE to RSS</p><img src="/images/rss.png" alt="" /></a>
-      </div>
-    </div><!-- Header ends here -->
-    </header>
+<% form_tag(search_index_path, :method => "get") do %>
+    <%= text_field_tag(:q) %>
+    <%= submit_tag("search") %>
+<% end %>
 
-    <div class="clear"></div>
+<% if user_signed_in? %>
+    <%= link_to "sign out", destroy_user_session_path %> </p>
+<% else %>
+    <%= link_to "sign in", new_user_session_path %>
+<% end %>
 
-    <div id="contentTop"></div><!-- Content starts here -->
-    <div id="content">
-      <p class="floatRight" style="padding: 0px 20px 0px 0px;">
-        <% if user_signed_in? %>
-          signed in as <%= link_to current_user.name, edit_user_registration_path %>
-        <% else %>
-          <%= link_to "sign up", new_user_registration_path %> or <%= link_to "sign in", new_user_session_path %>
-        <% end %>
-      </p>
-      <p class="notice"><%= notice %></p>
-      <p class="alert"><%= alert %></p>
-      <div class="clear"></div>
+<%= link_to "home", home_index_path %>
+<%= link_to "browse", creations_path %>
+<a href="<%= url_for home_index_path %>.xml"><p>SUBCRIBE to RSS</p></a>
 
-      <%= yield %>
+<% if user_signed_in? %>
+  signed in as <%= link_to current_user.name, edit_user_registration_path %>
+<% else %>
+  <%= link_to "sign up", new_user_registration_path %> or <%= link_to "sign in", new_user_session_path %>
+<% end %>
 
-      <footer>
-      <div id="footer"><!-- Footer starts here -->
-        <a id="contact" href="#"></a>
-        <div class="contactHeading">Contact Us</div>
-        <div class="footerHolder">
-          <div class="footerLeft">
-            <p class="left">Address:</p>
-            <p class="right">123 Street St<br /> Calgary AB<br /> Canada</p>
-          </div>
-
-          <div class="footerRight">
-            <p class="left">Phone: <br /> Fax: <br />Email: <br /> Twitter:</p>
-            <p class="right">1 800 600 0000 <br /> 1 800 600 0000 <br /> cake@cakeside.com <br /> @cakeside</p>
-          </div>
-          <div class="clear"></div>
-        </div>
-
-      </div><!-- Footer ends here -->
-      </footer>
-    </div>
-    <div id="contentBottom"></div><!-- Content ends here -->
-
-  </div><!-- Main ends here -->
-    <div class="bottomHolder">
-      <div class="copy"><p>&copy; 2011 CakeSide Inc.</p></div>
-      <div class="design"><a href="#">SuLuMo</a></div>
-    </div>
+<%= yield %>
 
 <script src="http://ajax.googleapis.com/ajax/libs/jquery/1.5.2/jquery.min.js"></script>
 <%= javascript_include_tag :all %>
app/views/profiles/index.html.erb
@@ -1,5 +1,5 @@
 
-<div class="heading">All <%= @profiles.length %> profiles</div>
+<div>All <%= @profiles.length %> profiles</div>
 
 <table class="simple-table">
   <thead>
@@ -20,7 +20,3 @@
   </tbody>
 </table>
 
-<div class="clear"></div>
-
-<div class="hr"></div>
-<div class="space"></div>
app/views/profiles/show.html.erb
@@ -1,39 +1,14 @@
+<img src="" width="417px" heigh="205px" alt="" class="photo" />
+<h1><%= @profile.name %></h1>
+<p><em>A member since <%= @profile.created_at %>, with <%= @profile.creations.length %> creations.</em></p>
 
-<div class="welcomeHolder">
-  <div class="welcome">
-    <img src="" width="417px" heigh="205px" alt="" class="photo" />
-    <h1><%= @profile.name %></h1>
-    <p><em>A member since <%= @profile.created_at %>, with <%= @profile.creations.length %> creations.</em></p>
-    <div class="clear"></div>
-  </div>
-  <div class="welcomeBottom"></div>
-</div>
+<div><%= @profile.name %></div>
 
-<div class="heading"><%= @profile.name %></div>
+<% @profile.creations.reverse.each_with_index do |creation, index| %>
+  <a href="<%= url_for creation %>">
+    <%= image_tag creation.image_url.to_s, :width => "285px", :height => "140px", :class => "photo", :alt => creation.name %>
+  </a>
+  <h2><%= creation.name %></h2>
+  <p><%= creation.story %> <%= link_to 'more...', creation %></p>
+<% end %>
 
-<div class="organic">
-  <% @profile.creations.reverse.each_with_index do |creation, index| %>
-      <div class="organicHolder">
-        <div class="organicContent">
-          <a href="<%= url_for creation %>">
-            <%= image_tag creation.image_url.to_s, :width => "285px", :height => "140px", :class => "photo", :alt => creation.name %>
-          </a>
-          <h2><%= creation.name %></h2>
-          <p><%= creation.story %> <%= link_to 'more...', creation %></p>
-        </div>
-      </div>
-      <% if (index +1) % 3 == 0 %>
-</div>
-
-<div class="space"></div>
-<div class="organic">
-
-    <% end %>
-
-  <% end %>
-</div>
-
-<div class="clear"></div>
-
-<div class="hr"></div>
-<div class="space"></div>
app/views/registrations/edit.html.erb
@@ -1,16 +1,10 @@
-<div class="welcomeHolder">
-  <div class="welcome">
-    <%= image_tag "cakes/Haunted_House.jpg", :alt=>"camouflage truck cake", :class=>"photo", :width=>"417px", :height=>"205px" %>
-    <h1>C'mon In... </h1>
-    <p>&quot;You don't make friends with salad&quot; - Homer Simpson<p>
-    <div class="clear"></div>
-  </div>
-  <div class="welcomeBottom"></div>
-</div>
+<%= image_tag "cakes/Haunted_House.jpg", :alt=>"camouflage truck cake", :class=>"photo", :width=>"417px", :height=>"205px" %>
+<h1>C'mon In... </h1>
+<p>&quot;You don't make friends with salad&quot; - Homer Simpson<p>
 
-<div class="heading">Edit <%= resource_name.to_s.humanize %></div>
+<div>Edit <%= resource_name.to_s.humanize %></div>
 <div class="floatRight">
-<%= link_to "my other authentications", authentications_path %>
+  <%= link_to "my other authentications", authentications_path %>
 </div>
 
 <%= form_for(resource, :as => resource_name, :url => registration_path(resource_name), :html => { :method => :put }) do |f| %>
@@ -34,14 +28,8 @@
   <p><%= f.submit "Update" %></p>
 <% end %>
 
-<div class="heading">Cancel my account</div>
+<div>Cancel my account</div>
 
 <p>Unhappy? <%= button_to "Cancel my account", registration_path(resource_name), :confirm => "Are you sure?", :method => :delete %>.</p>
 
-<div class="space"></div>
-<div class="space"></div>
 <%= link_to "Back", :back %>
-<div class="space"></div>
-<div class="clear"></div>
-<div class="hr"></div>
-<div class="space"></div>
app/views/registrations/new.html.erb
@@ -1,15 +1,9 @@
-<div class="welcomeHolder">
-  <div class="welcome">
-    <%= image_tag "cakes/Haunted_House.jpg", :alt=>"camouflage truck cake", :class=>"photo", :width=>"417px", :height=>"205px" %>
-    <h1>C'mon In... </h1>
-    <p>&quot;You don't make friends with salad&quot; - Homer Simpson<p>
-    <p>Already have an account. Then <%= link_to "sign in", new_user_session_path %>.</p>
-    <div class="clear"></div>
-  </div>
-  <div class="welcomeBottom"></div>
-</div>
-
-<div class="heading">Sign up</div>
+<%= image_tag "cakes/Haunted_House.jpg", :alt=>"camouflage truck cake", :class=>"photo", :width=>"417px", :height=>"205px" %>
+<h1>C'mon In... </h1>
+<p>&quot;You don't make friends with salad&quot; - Homer Simpson<p>
+<p>Already have an account. Then <%= link_to "sign in", new_user_session_path %>.</p>
+
+<div>Sign up</div>
 
 <%= form_for(resource, :as => resource_name, :url => registration_path(resource_name)) do |f| %>
   <%= devise_error_messages! %>
@@ -48,7 +42,3 @@
   <%= image_tag "openid_64.png", :size => "64x64", :alt => "OpenID" %>
   OpenID
 </a>
-<div class="space"></div>
-<div class="clear"></div>
-<div class="hr"></div>
-<div class="space"></div>
app/views/search/index.html.erb
@@ -1,44 +1,14 @@
-<div class="welcomeHolder">
-  <div class="welcome">
-    <h1>Search Results</h1>
-    <p><em>What time is it? Nana, nana, naaaaana caake time!</em></p>  
-    <p>Check out our communities most recent cake work.</p>
-    <p align="right">
-    <a href="<%= url_for my_creations_path %>"><input type="button" value="MY CREATIONS" class="view" /></a>
-    </p> 
-    <div class="clear"></div>
-  </div>
-  <div class="welcomeBottom"></div>
-</div>
+<h1>Search Results</h1>
+<p><em>What time is it? Nana, nana, naaaaana caake time!</em></p>  
+<p>Check out our communities most recent cake work.</p>
+<a href="<%= url_for my_creations_path %>"> my creations </a>
 
-<div class="heading">The most recent creations</div>
+<div>The most recent creations</div>
 
-<div class="organic">
 <% @creations.reverse.each_with_index do |creation, index| %>
-    <div class="organicHolder">
-      <div class="organicContent">
-        <a href="<%= url_for creation %>">
-          <%= image_tag creation.image_url.to_s, :width => "285px", :height => "140px", :class => "photo", :alt => creation.name %>
-        </a>
-        <h2><%= creation.name %></h2>
-        <p><%= creation.story %> <%= link_to 'more...', creation %></p>
-      </div>
-    </div>
-    <% if (index +1) % 3 == 0 %>
-</div>
-
-<div class="space"></div>
-<div class="organic">
-
-  <% end %>
-
+  <a href="<%= url_for creation %>">
+    <%= image_tag creation.image_url.to_s, :width => "285px", :height => "140px", :class => "photo", :alt => creation.name %>
+  </a>
+  <h2><%= creation.name %></h2>
+  <p><%= creation.story %> <%= link_to 'more...', creation %></p>
 <% end %>
-</div>
-
-
-<div class="space"></div>
-
-<div class="clear"></div>
-
-<div class="hr"></div>
-<div class="space"></div>