Commit 82c88f25

@@ -1,7 +1,6 @@
 class User < ActiveRecord::Base
   validates :name,  :presence => true
   validates :website, :format => URI::regexp(%w(http https)), :allow_blank => true
-  validates :city, :presence => true
   devise :database_authenticatable, :registerable, :recoverable, :rememberable, :trackable, :validatable
   attr_accessible :name, :email, :website, :twitter, :facebook, :city, :latitude, :longitude, :password, :password_confirmation, :current_password, :remember_me, :interest_ids
   has_many :creations, :dependent => :destroy

@@ -68,33 +68,33 @@
                 <legend>New to CakeSide? Join Us!</legend>
               </fieldset>
               <div class="control-group">
-                <%= f.label :name, 'Full Name', :class => "control-label" %>
+                <%= f.label :name, 'Full name', :class => "control-label" %>
                 <div class="controls">
-                  <%= f.text_field :name, :placeholder => 'Full Name' %>
+                  <%= f.text_field :name, :placeholder => 'required' %>
                 </div>
               </div>
               <div class="control-group">
                 <%= f.label :city, 'City', :class => "control-label" %>
                 <div class="controls">
-                  <%= f.text_field :city, :placeholder => 'City' %>
+                  <%= f.text_field :city, :placeholder => 'optional' %>
                 </div>
               </div>
               <div class="control-group">
                 <%= f.label :email, 'Email', :class => "control-label" %>
                 <div class="controls">
-                  <%= f.email_field :email, :placeholder => 'Email' %>
+                  <%= f.email_field :email, :placeholder => 'required' %>
                 </div>
               </div>
               <div class="control-group">
                 <%= f.label :password, 'Password', :class => "control-label" %>
                 <div class="controls">
-                  <%= f.password_field :password, :placeholder => 'Password' %>
+                  <%= f.password_field :password, :placeholder => 'required' %>
                 </div>
               </div>
               <div class="control-group">
-                <%= f.label :password_confirmation, 'Password Confirmation', :class => "control-label" %>
+                <%= f.label :password_confirmation, 'Confirm password', :class => "control-label" %>
                 <div class="controls">
-                  <%= f.password_field :password_confirmation, :placeholder => 'Password Confirmation' %>
+                  <%= f.password_field :password_confirmation, :placeholder => 'required' %>
                 </div>
               </div>
               <div class="control-group">

@@ -68,33 +68,33 @@
             <legend>New to CakeSide? Join Us!</legend>
           </fieldset>
           <div class="control-group">
-            <%= f.label :name, 'Full Name', :class => "control-label" %>
+            <%= f.label :name, 'Full name', :class => "control-label" %>
             <div class="controls">
-              <%= f.text_field :name, :placeholder => 'Full Name' %>
+              <%= f.text_field :name, :placeholder => 'required' %>
             </div>
           </div>
           <div class="control-group">
             <%= f.label :city, 'City', :class => "control-label" %>
             <div class="controls">
-              <%= f.text_field :city, :placeholder => 'City' %>
+              <%= f.text_field :city, :placeholder => 'optional' %>
             </div>
           </div>
           <div class="control-group">
             <%= f.label :email, 'Email', :class => "control-label" %>
             <div class="controls">
-              <%= f.email_field :email, :placeholder => 'Email' %>
+              <%= f.email_field :email, :placeholder => 'required' %>
             </div>
           </div>
           <div class="control-group">
             <%= f.label :password, 'Password', :class => "control-label" %>
             <div class="controls">
-              <%= f.password_field :password, :placeholder => 'Password' %>
+              <%= f.password_field :password, :placeholder => 'required' %>
             </div>
           </div>
           <div class="control-group">
-            <%= f.label :password_confirmation, 'Password Confirmation', :class => "control-label" %>
+            <%= f.label :password_confirmation, 'Confirm password', :class => "control-label" %>
             <div class="controls">
-              <%= f.password_field :password_confirmation, :placeholder => 'Password Confirmation' %>
+              <%= f.password_field :password_confirmation, :placeholder => 'required' %>
             </div>
           </div>
           <div class="control-group">

@@ -12,9 +12,9 @@ cupcake_promote.png: cupcake_promote-b2fc6aa8716b5b4794cfef24299f8264.png
 cupcake_share.png: cupcake_share-5a0f175d06ce3bd85774feb4697bb450.png
 f_logo_16x16x32.png: f_logo_16x16x32-97848b8f46b946e956b584876378a0df.png
 facebook.png: facebook-84d3bbf0b8c3e023823f20e77395f597.png
-fallback/default.png: fallback/default-d33764ac1162d608bea5c4beea0a7c58.png
-fallback/large_default.png: fallback/large_default-d33764ac1162d608bea5c4beea0a7c58.png
-fallback/thumb_default.png: fallback/thumb_default-d33764ac1162d608bea5c4beea0a7c58.png
+fallback/default.png: fallback/default-96781a7ba5ba46be196c7868c1f1babe.png
+fallback/large_default.png: fallback/large_default-96781a7ba5ba46be196c7868c1f1babe.png
+fallback/thumb_default.png: fallback/thumb_default-96781a7ba5ba46be196c7868c1f1babe.png
 favicon.ico: favicon-83d0a0befcc312f540b641a62e6cfb57.ico
 favorite_16x16.png: favorite_16x16-f1ae30ad595afe30f02dce67d51a25ce.png
 glyphicons-halflings-white.png: glyphicons-halflings-white-ef3d5b8d6a297804352b4a46fdb5466d.png