From a562d27a5f82a2e716ef264cd4026293a77e1f82 Mon Sep 17 00:00:00 2001
From: albert <r888888888@gmail.com>
Date: Thu, 15 Sep 2011 18:21:42 -0400
Subject: [PATCH] fixes for mailer config

---
 INSTALL.debian                                           | 2 +-
 app/helpers/application_helper.rb                        | 2 +-
 app/views/maintenance/user/login_reminders/new.html.erb  | 2 ++
 app/views/maintenance/user/password_resets/edit.html.erb | 2 ++
 app/views/maintenance/user/password_resets/new.html.erb  | 2 ++
 app/views/sessions/_secondary_links.html.erb             | 7 +++++++
 app/views/sessions/new.html.erb                          | 8 +-------
 config/application.rb                                    | 3 +++
 8 files changed, 19 insertions(+), 9 deletions(-)
 create mode 100644 app/views/sessions/_secondary_links.html.erb

diff --git a/INSTALL.debian b/INSTALL.debian
index 4fb2ac5f3..905298222 100644
--- a/INSTALL.debian
+++ b/INSTALL.debian
@@ -35,7 +35,7 @@ fi
 
 # Install packages
 echo "Installing packages..."
-apt-get -y install build-essential automake openssl libssl-dev libyaml-dev libxml2-dev libxslt-dev autoconf ncurses-dev sudo gcc g++ libreadline-dev zlib1g-dev flex bison libgd2-noxpm libgd2-noxpm-dev bzip2 ragel memcached libmemcache-dev git curl libcurl4-openssl-dev emacs-nox
+apt-get -y install build-essential automake openssl libssl-dev libyaml-dev libxml2-dev libxslt-dev autoconf ncurses-dev sudo gcc g++ libreadline-dev zlib1g-dev flex bison libgd2-noxpm libgd2-noxpm-dev bzip2 ragel memcached libmemcache-dev git curl libcurl4-openssl-dev emacs-nox postfix
 
 # Install PostgreSQL 9.1
 apt-get -y install python-software-properties
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index b4d6671fb..9d1209b20 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -60,7 +60,7 @@ module ApplicationHelper
 protected
   def nav_link_match(controller, url)
     url =~ case controller
-    when "sessions", "users"
+    when "sessions", "users", "maintenance/user/login_reminders", "maintenance/user/password_resets"
       /^\/(session|users)/
       
     when "forum_posts"
diff --git a/app/views/maintenance/user/login_reminders/new.html.erb b/app/views/maintenance/user/login_reminders/new.html.erb
index 51a2877b8..461a02d68 100644
--- a/app/views/maintenance/user/login_reminders/new.html.erb
+++ b/app/views/maintenance/user/login_reminders/new.html.erb
@@ -14,5 +14,7 @@
       
       <%= submit_tag "Submit" %>
     <% end %>
+    
+    <%= render "sessions/secondary_links" %>
   </div>
 </div>
diff --git a/app/views/maintenance/user/password_resets/edit.html.erb b/app/views/maintenance/user/password_resets/edit.html.erb
index d5757696b..e2aaed7b9 100644
--- a/app/views/maintenance/user/password_resets/edit.html.erb
+++ b/app/views/maintenance/user/password_resets/edit.html.erb
@@ -10,5 +10,7 @@
     <% else %>
       <p>Invalid key</p>
     <% end %>
+    
+    <%= render "sessions/secondary_links" %>
   </div>
 </div>
\ No newline at end of file
diff --git a/app/views/maintenance/user/password_resets/new.html.erb b/app/views/maintenance/user/password_resets/new.html.erb
index 4eb8a77c8..b3eb04e59 100644
--- a/app/views/maintenance/user/password_resets/new.html.erb
+++ b/app/views/maintenance/user/password_resets/new.html.erb
@@ -13,5 +13,7 @@
       </div>
       <%= submit_tag "Submit" %>
     <% end %>
+
+    <%= render "sessions/secondary_links" %>
   </div>
 </div>
\ No newline at end of file
diff --git a/app/views/sessions/_secondary_links.html.erb b/app/views/sessions/_secondary_links.html.erb
new file mode 100644
index 000000000..d96c21518
--- /dev/null
+++ b/app/views/sessions/_secondary_links.html.erb
@@ -0,0 +1,7 @@
+<% content_for(:secondary_links) do %>
+  <menu>
+    <li><%= link_to "Signup", new_user_path %></li>
+    <li><%= link_to "Reset Password", new_maintenance_user_password_reset_path %></li>
+    <li><%= link_to "Login Reminder", new_maintenance_user_login_reminder_path %></li>
+  </menu>
+<% end %>
diff --git a/app/views/sessions/new.html.erb b/app/views/sessions/new.html.erb
index 01dac73fe..45b95dfb1 100644
--- a/app/views/sessions/new.html.erb
+++ b/app/views/sessions/new.html.erb
@@ -27,10 +27,4 @@
  /login
 <% end %>
 
-<% content_for(:secondary_links) do %>
-  <menu>
-    <li><%= link_to "Signup", new_user_path %></li>
-    <li><%= link_to "Reset Password", new_maintenance_user_password_reset_path %></li>
-    <li><%= link_to "Login Reminder", new_maintenance_user_login_reminder_path %></li>
-  </menu>
-<% end %>
+<%= render "secondary_links" %>
\ No newline at end of file
diff --git a/config/application.rb b/config/application.rb
index 3a8640d4a..7fc124ade 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -16,6 +16,9 @@ module Danbooru
     config.autoload_paths += %W(#{config.root}/app/presenters #{config.root}/app/logical #{config.root}/app/mailers)
     config.plugins = [:all]
     config.time_zone = 'Eastern Time (US & Canada)'
+    config.action_mailer.delivery_method = :smtp
+    config.action_mailer.perform_deliveries = true
+    
     # config.action_view.javascript_expansions[:defaults] = [
     #   "src/lib/jquery-1.6.0.min.js",
     #   "src/lib/jquery-ui-1.8.9.custom.min.js",