Commit 84d05cef

@@ -21,10 +21,10 @@
           <div style="margin-top:100px;">
             <%= form_for(resource, :as => resource_name, :url => session_path(resource_name)) do |f| %>
               <div class="grid_2 alpha">
-                <%= f.email_field :email, :style => "height:20px;", :size => 20 %>
+                <%= f.email_field :email, :style => "height:20px;", :placeholder => 'Email', :size => 20 %>
               </div>
               <div class="grid_2">
-                <%= f.password_field :password, :style => "height:20px;", :size => 20 %>
+                <%= f.password_field :password, :style => "height:20px;", :placeholder => 'Password',:size => 20 %>
               </div>
               <div class="grid_1">
                 <%= f.submit "Sign in", :style => "width:100%;height:28px;"%>
@@ -42,14 +42,15 @@
         </div>
         <div class="grid_5">
           <%# <%= yield %>
+          <h2>New to CakeSide? <em>Join Today!</em></h2>
           <%= form_for(resource, :as => resource_name, :url => registration_path(resource_name)) do |f| %>
-            <p><%= f.label :name %><br /> <%= f.text_field :name, :class => "forms", :style => 'width:100%' %></p>
-            <p><%= f.label :email %><br /> <%= f.email_field :email, :class => "forms", :style => 'width:100%' %></p>
-            <p><%= f.label :password %><br /> <%= f.password_field :password, :class => "forms", :style => 'width:100%' %></p>
-            <p><%= f.label :password_confirmation %><br /> <%= f.password_field :password_confirmation, :class => "forms", :style => 'width:100%'   %></p>
-            <p><%= f.submit "Sign up" %></p>
+            <p><%= f.text_field :name, :class => ['forms'], :placeholder => 'Full Name', :style => 'width:100%;height:20px;' %></p>
+            <p><%= f.email_field :email, :class => ['forms'], :placeholder => 'Email', :style => 'width:100%;height:20px;' %></p>
+            <p><%= f.password_field :password, :class => ['forms'], :placeholder => 'Password', :style => 'width:100%;height:20px;' %></p>
+            <p><%= f.password_field :password_confirmation, :class => ['forms'], :placeholder => 'Confirm Password', :style => 'width:100%;height:20px;' %></p>
+            <p><%= f.submit "Sign up", :style => "height:28px;" %></p>
           <% end %>
-          <%= render :partial => "devise/shared/links" %>
+          <%# <%= render :partial => "devise/shared/links" %>
         </div>
         <div class="grid_1 omega">
           &nbsp;
@@ -59,9 +60,11 @@
           <div class="grid_4 alpha">
             &nbsp;
           </div>
-          <div class="grid_4" style="color:pink;margin-top:180px;">
+          <div class="grid_4" style="margin-top:180px;">
             &nbsp;
-            contact us | terms and conditions | privacy policy
+            <a href="" style="color:pink;">Contact Us</a> | 
+            <a href="/terms.html" style="color:pink;">Terms and Conditions</a> | 
+            <a href="/privacy.html" style="color:pink;">Privacy Policy</a>
           </div>
           <div class="grid_4 omega">
             &nbsp;