enable flash[:notice] drawing in application.rhtml

fs · Jul 10, 2008 · a2a2374 · a2a2374
1 parent 5e0b8a6
commit a2a2374
Show file tree

Hide file tree

Showing 6 changed files with 3,311 additions and 30 deletions.
diff --git a/app/controllers/subscribers_controller.rb b/app/controllers/subscribers_controller.rb
@@ -5,11 +5,6 @@ class SubscribersController < ApplicationController
     def new
         @subscriber = Subscriber.new
         @subscriber.referrer = request.referer
-
-        respond_to do |format|
-            format.html # new.html.erb
-            format.xml  { render :xml => @subscriber }
-        end
     end
 
     # POST /subscribers
@@ -19,18 +14,15 @@ def create
 
         @subscriber.ip = request.remote_ip
         @subscriber.user_agent = request.user_agent
-
-        #respond_to do |format|
-            if @subscriber.save
-                flash[:notice] = 'Subscriber was successfully created.'
-                #redirect_to ( :action => 'new')
-                #format.html { redirect_to(@subscriber) }
-                #format.xml  { render :xml => @subscriber, :status => :created, :location => @subscriber }
-            else
-                #flash[:notice] = 'error'           
-                render( :action => 'new' )
-            end
-        #end
+
+        if @subscriber.save
+            flash[:notice] = 'thank you'
+            redirect_to (:action => 'new')
+        else
+            flash[:notice] = 'error'           
+            render(:action => 'new')
+        end
+
     end
 
 end
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
@@ -12,6 +12,9 @@
         <title> Test </title>
     </head>
     <body>
+        <% unless flash[:notice].blank? %>
+            <div id="notification"> <%= flash[:notice] %> </div>
+        <% end %>
         <div class="header">
             <%= editable_area('header') %>
         </div>

diff --git a/app/views/subscribers/new.html.erb b/app/views/subscribers/new.html.erb
@@ -1,5 +1,6 @@
-<h1>New subscriber</h1>
+<h1>Welcome to our site</h1>
 
+<h2>   </h2>
 <% form_for(@subscriber) do |f| %>
     <%= f.error_messages %>
     <%= f.hidden_field :referrer, :value => @subscriber.referrer  %>
@@ -8,7 +9,7 @@
     E-mail: <%= f.text_field :email %>
   </p>
   <p>
-    <%= f.submit "Create" %>
+    <%= f.submit "Ok" %>
   </p>
 <% end %>
 
diff --git a/config/environment.rb b/config/environment.rb
@@ -67,16 +67,5 @@
   # Activate observers that should always be running
   # config.active_record.observers = :cacher, :garbage_collector
 
-  config.action_mailer.delivery_method = :test
-
-
-  config.action_mailer.smtp_settings = {
-      :address    => "domain.of.smtp.host.net" ,
-      :port       => 25,
-      :domain     => "domain.of.sender.net" ,
-      :authentication => :login,
-      :user_name => "dave" ,
-      :password   => "secret"
-  }
 
 end
diff --git a/db/development.sqlite3 b/db/development.sqlite3