Commit a0483c05

@@ -15,7 +15,7 @@ class User < ActiveRecord::Base
   has_many :authentications
   has_and_belongs_to_many :interests, :join_table => 'users_interests', :uniq => true, :autosave => true
   devise :database_authenticatable, :registerable, :recoverable, :rememberable, :trackable, :validatable
-  attr_accessible :name, :email, :website, :twitter, :facebook, :password, :password_confirmation, :remember_me
+  attr_accessible :name, :email, :website, :twitter, :facebook, :city, :password, :password_confirmation, :remember_me
   has_many :creations, :dependent => :destroy
   has_many :favorites, :dependent => :destroy
 

@@ -5,7 +5,7 @@
   <script type="text/javascript" charset="utf-8">
   $(function(){
     $('#edit_user').validate();
-    $('#city').autocomplete({
+    $('#user_city').autocomplete({
       source: function(request, response){
         $.ajax({
           url: 'http://ws.geonames.org/searchJSON',
@@ -65,12 +65,10 @@
           <%= f.label :current_password, :class => "control-label" %> 
           <div class="controls"> <%= f.password_field :current_password, :class => "input-xlarge" %> </div>
         </div><!-- /control-group -->
-
         <div class="control-group">
-          <label class="control-label" for="city">City</label>
-          <div class="controls"> <input id="city" type="text" class="input-xlarge" /> </div>
+          <%= f.label :city, :class => 'control-label' %>
+          <div class="controls"> <%= f.text_field :city, :class => "input-xlarge" %> </div>
         </div><!-- /control-group -->
-
         <div class="control-group">
           <%= f.label :website, :class => "control-label" %> 
           <div class="controls"> <%= f.url_field :website, :class => "input-xlarge, url", :placeholder => "http://cakeside.com" %> </div>