bits

diff --git a/app/controllers/user_controller.rb b/app/controllers/user_controller.rb
index 42460b4e0d15872a1569f7d1529601ccea93e5b6..7a0c8b3d70c8cf6837ebe8f8fa2afb492550f2d4 100644 (file)
--- a/app/controllers/user_controller.rb
+++ b/app/controllers/user_controller.rb
@@ -1,8 +1,9 @@
 class UserController < ApplicationController
 
 class UserController < ApplicationController
 

-  def create
-    # do some checks, find the user then send the mail
-    Notifier::deliver_confirm_signup(user)
+  def save
+    @user = User.new(params[:user])
+#    @user.save
+    #Notifier::deliver_confirm_signup(user)

   end
   
   def new
   end
   
   def new

diff --git a/app/models/user.rb b/app/models/user.rb
index 6bedfbeb34669c707d6e023bf1fb004db5206a2e..72752078e3aa441fec1f51b4bfa5a14bef41f8ba 100644 (file)
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -3,17 +3,20 @@ require 'digest/md5'
 class User < ActiveRecord::Base
   has_many :traces
 
 class User < ActiveRecord::Base
   has_many :traces
 

-  def passwd=(str) 
-    write_attribute("pass_crypt", Digest::MD5.hexdigest(str)) 
-  end 
+  validates_confirmation_of :pass_crypt

 
 

-  def passwd
-    return self.pass_crypt
-  end 
+#  def password=(str) 
+#    write_attribute("pass_crypt", Digest::MD5.hexdigest(str)) 
+#  end 

 
 

-  def self.authenticate(username, passwd) 
-    find_first([ "display_name = ? AND pass_crypt =?", 
-               username, 
-               Digest::MD5.hexdigest(passwd) ]) 
-  end 
+
+#  def password
+#    return self.pass_crypt
+#  end 
+
+#  def self.authenticate(username, passwd) 
+#    find_first([ "display_name = ? AND pass_crypt =?", 
+#               username, 
+#               Digest::MD5.hexdigest(passwd) ]) 
+#  end 

 end
 end

diff --git a/app/views/user/new.rhtml b/app/views/user/new.rhtml
index b67ad1f586ac05b4fd0cfa9860822d14a7d90316..00ab2c7d8bf55fc54834d64ac148606f2f83406c 100644 (file)
--- a/app/views/user/new.rhtml
+++ b/app/views/user/new.rhtml
@@ -3,12 +3,12 @@ Fill in the form and we'll send you a quick email to activate your account.<br><
 
 By creating an account, you agree that all work uploaded to openstreetmap.org and all data created by use of any tools on openstreetmap.org is to be licensed under <a href="http://creativecommons.org/licenses/by-sa/2.0/">this</a> Creative Commons license.<br><br>
 
 
 By creating an account, you agree that all work uploaded to openstreetmap.org and all data created by use of any tools on openstreetmap.org is to be licensed under <a href="http://creativecommons.org/licenses/by-sa/2.0/">this</a> Creative Commons license.<br><br>
 

-<%= start_form_tag :action => 'signup' %>
+<%= start_form_tag :action => 'save' %>

 <table>
   <tr><td>email address:</td><td><%= text_field('user', 'email',{:size => 50, :maxlength => 255}) %></td></tr>
   <tr><td>Login name</td><td><%= text_field('user', 'display_name',{:size => 50, :maxlength => 255}) %></td></tr>
 <table>
   <tr><td>email address:</td><td><%= text_field('user', 'email',{:size => 50, :maxlength => 255}) %></td></tr>
   <tr><td>Login name</td><td><%= text_field('user', 'display_name',{:size => 50, :maxlength => 255}) %></td></tr>

-  <tr><td>password:</td><td><%= password_field('user', 'password',{:size => 50, :maxlength => 255}) %></td></tr>
-  <tr><td>retype password:</td><td><%= password_field('user', 'password_confirm',{:size => 50, :maxlength => 255}) %></td></tr>
+  <tr><td>password:</td><td><%= password_field('user', 'pass_crypt',{:size => 50, :maxlength => 255}) %></td></tr>
+  <tr><td>retype password:</td><td><%= password_field('user', 'pass_crypt_confirmation',{:size => 50, :maxlength => 255}) %></td></tr>

 </table>
 
 <br>
 </table>
 
 <br>

diff --git a/app/views/user/signup.rhtml b/app/views/user/signup.rhtml
index 907b308167f0880fb2a5c0e1614bb0c7620f9dc3..6e9163c01d21520f599290916a08b039a2812bec 100644 (file)
--- a/app/views/user/signup.rhtml
+++ b/app/views/user/signup.rhtml
@@ -1 +1,3 @@
 blah
 blah

+
+<%= @user.email %>

diff --git a/config/database.yml b/config/database.yml
index d366bc96b3922ed66c0e3f9037044c99932783ae..1fe4d9880030befcca52870dee65ee62f69eb3ed 100644 (file)
--- a/config/database.yml
+++ b/config/database.yml
@@ -12,7 +12,7 @@
 #   http://dev.mysql.com/doc/refman/5.0/en/old-client.html
 development:
   adapter: mysql
 #   http://dev.mysql.com/doc/refman/5.0/en/old-client.html
 development:
   adapter: mysql

-  database: osm
+  database: openstreetmap

   username: openstreetmap
   password: openstreetmap
   host: localhost
   username: openstreetmap
   password: openstreetmap
   host: localhost

diff --git a/db/README b/db/README
index 72a57d241c506fc97f6de1996eb51029d7ad2aef..68fc8e6ceb571b44bb02672a7ffd8bb8612d4285 100644 (file)
--- a/db/README
+++ b/db/README
@@ -1,4 +1,4 @@
-you want to
+you want to do something like this

 
 $ su
 # mysqladmin create openstreetmap
 
 $ su
 # mysqladmin create openstreetmap

diff --git a/public/images/rails.png b/public/images/rails.png
deleted file mode 100644 (file)
index b8441f1..0000000
Binary files a/public/images/rails.png and /dev/null differ