Commit 91d1d4d2

@@ -25,14 +25,7 @@
           <%= image_tag creation.image_url.to_s, :width => "285px", :height => "140px", :class => "photo", :alt => creation.name %>
         </a>
         <h2><%= creation.name %></h2>
-        <p><%= creation.story %></p>
-        <p>
-        <%= link_to 'more...', creation %>
-        <% if creation.user == current_user %>
-          <%= link_to 'edit', edit_creation_path(creation) %> |
-          <%= button_to 'delete', creation, :method => :delete %>
-        <% end %>
-        </p>
+        <p><%= creation.story %> <%= link_to 'more...', creation %></p>
       </div>
     </div>
     <% if (index +1) % 3 == 0 %>

@@ -19,13 +19,9 @@
             <%= image_tag creation.image_url.to_s, :width => "285px", :height => "140px", :class => "photo" %>
           </a>
           <h2><%= creation.name %></h2>
-          <p><%= creation.story %></p>
+          <p><%= creation.story %> <%= link_to 'more...', creation %></p>
           <p>
-          <%= link_to 'more...', creation %>
-          <% if creation.user == current_user %>
-            <%= link_to 'edit', edit_creation_path(creation) %> |
-            <%= button_to 'delete', creation, :method => :delete %>
-          <% end %>
+          
           </p>
         </div>
       </div>

@@ -4,7 +4,7 @@
       <%= image_tag @creations[0].image_url.to_s, :width => 417, :height => 205, :class => 'photo' %>
     </a>
     <h1>Welcome to the CakeSide</h1>
-    <p><em>Introduce your company here. Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. </em></p>  
+    <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> 

@@ -23,12 +23,10 @@
           <div class="searchBt"><input type="button" value="search" /></div>
         </div>
         <% if user_signed_in? %>
-          welcome back <%= link_to current_user.email, edit_user_registration_path %>
           <div class="signOut">
-            <%= link_to "sign out", destroy_user_session_path, :class => 'blah' %> </p>
+            <%= link_to "sign out", destroy_user_session_path %> </p>
           </div>
         <% else %>
-          <%= link_to "sign up", new_user_registration_path %> or 
           <div class="signIn">
             <%= link_to "sign in", new_user_session_path %>
           </div>
@@ -39,7 +37,7 @@
         <ul id="menu">
           <li class="home"><%= link_to "home", home_index_path %></li>
           <li class="commit"><%= link_to "browse", creations_path %></li>
-          <li class="contact"><a href="#">contact us</a></li>
+          <li class="contact"><a href="#contact">contact us</a></li>
         </ul>
       </div>
       <div class="subs">
@@ -52,14 +50,22 @@
 
     <div id="contentTop"></div><!-- Content starts here -->
     <div id="content">
-
+      <p class="floatRight" style="padding: 0px 20px 0px 0px;">
+        <% if user_signed_in? %>
+          welcome back <%= link_to current_user.email, 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>
+
       <%= yield %>
 
       <footer>
       <div id="footer"><!-- Footer starts here -->
-
+        <a id="contact" href="#"></a>
         <div class="contactHeading">Contact Us</div>
         <div class="footerHolder">
           <div class="footerLeft">

@@ -1,7 +1,6 @@
 *{
 margin:0px;
 padding:0px;
-background-color: #f99cf9;
 }
 
 img {
@@ -30,6 +29,8 @@ body{
 	width:1200px;
 	margin:0px auto;
 	height:1400px;
+  background-color: #ff00ba;
+  /*background-color: #f99cf9; */
 }
 
 #header{
@@ -107,10 +108,12 @@ padding-left:20px;
 float:left;	
 margin-top:75px;
 width:auto;
+background: none;
 }
 
 .menu ul{
 	margin:0px 15px;
+  background: none;
 }
 
 .menu ul li{
@@ -119,6 +122,7 @@ width:auto;
 	font-size:15px;
 	color:#6b4916;
 	font-weight:bold;
+  background: none;
 }
 
 .menu ul li a{
@@ -360,7 +364,7 @@ z-index:100;
 }
 
 .footerHolder{
-	background:url(../images/footerBg.jpg) no-repeat center bottom;
+	background:url(../images/footerBg.png) no-repeat center bottom;
 	font-size:17px;
 	font-style:italic;
 	font-weight:bold;