jaculabilis/danbooru
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fixes for mailer config

Browse Source
This commit is contained in:
albert
2011-09-15 18:21:42 -04:00
parent 571110e9eb
commit a562d27a5f
8 changed files with 19 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
INSTALL.debian
View File

@@ -35,7 +35,7 @@ fi
# Install packages # Install packages
echo "Installing 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 # Install PostgreSQL 9.1
apt-get -y install python-software-properties apt-get -y install python-software-properties

2
app/helpers/application_helper.rb
View File

@@ -60,7 +60,7 @@ module ApplicationHelper
protected protected
def nav_link_match(controller, url) def nav_link_match(controller, url)
url =~ case controller url =~ case controller
when "sessions", "users" when "sessions", "users", "maintenance/user/login_reminders", "maintenance/user/password_resets"
/^\/(session|users)/ /^\/(session|users)/
when "forum_posts" when "forum_posts"

2
app/views/maintenance/user/login_reminders/new.html.erb
View File

@@ -14,5 +14,7 @@
<%= submit_tag "Submit" %> <%= submit_tag "Submit" %>
<% end %> <% end %>
<%= render "sessions/secondary_links" %>
</div> </div>
</div> </div>

2
app/views/maintenance/user/password_resets/edit.html.erb
View File

@@ -10,5 +10,7 @@
<% else %> <% else %>
<p>Invalid key</p> <p>Invalid key</p>
<% end %> <% end %>
<%= render "sessions/secondary_links" %>
</div> </div>
</div> </div>

2
app/views/maintenance/user/password_resets/new.html.erb
View File

@@ -13,5 +13,7 @@
</div> </div>
<%= submit_tag "Submit" %> <%= submit_tag "Submit" %>
<% end %> <% end %>
<%= render "sessions/secondary_links" %>
</div> </div>
</div> </div>

7
app/views/sessions/_secondary_links.html.erb Normal file
View File

@@ -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 %>

8
app/views/sessions/new.html.erb
View File

@@ -27,10 +27,4 @@
/login /login
<% end %> <% end %>
<% content_for(:secondary_links) do %> <%= render "secondary_links" %>
<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 %>

3
config/application.rb
View File

@@ -16,6 +16,9 @@ module Danbooru
config.autoload_paths += %W(#{config.root}/app/presenters #{config.root}/app/logical #{config.root}/app/mailers) config.autoload_paths += %W(#{config.root}/app/presenters #{config.root}/app/logical #{config.root}/app/mailers)
config.plugins = [:all] config.plugins = [:all]
config.time_zone = 'Eastern Time (US & Canada)' 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] = [ # config.action_view.javascript_expansions[:defaults] = [
# "src/lib/jquery-1.6.0.min.js", # "src/lib/jquery-1.6.0.min.js",
# "src/lib/jquery-ui-1.8.9.custom.min.js", # "src/lib/jquery-ui-1.8.9.custom.min.js",