diff --git a/app/assets/stylesheets/common/paginator.css.scss b/app/assets/stylesheets/common/paginator.css.scss index 781864035..e0a6e3fb5 100644 --- a/app/assets/stylesheets/common/paginator.css.scss +++ b/app/assets/stylesheets/common/paginator.css.scss @@ -3,7 +3,7 @@ div.paginator { display: block; padding: 2em 0 1em 0; - font-size: 1.2em; + font-size: 2em; text-align: center; font-weight: bold; clear: both; diff --git a/app/assets/stylesheets/specific/users.css.scss b/app/assets/stylesheets/specific/users.css.scss index 6daeedca2..740882ef4 100644 --- a/app/assets/stylesheets/specific/users.css.scss +++ b/app/assets/stylesheets/specific/users.css.scss @@ -17,7 +17,7 @@ div#c-users { } div#a-new { - max-width: 50em; + max-width: 40em; p { font-size: 1.2em; @@ -44,7 +44,7 @@ div#c-users { } div#a-upgrade-information { - max-width: 55em; + max-width: 40em; font-size: 1.2em; form { @@ -63,7 +63,7 @@ div#c-users { margin-bottom: 1em; div.column { - width: 15em; + width: 11em; float: left; border: 1px solid #666; @include border-radius(4px); diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index c0aa9e511..d80c9b97f 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -41,6 +41,16 @@ class UsersController < ApplicationController @user.update_attributes(params[:user], :as => CurrentUser.role) respond_with(@user) end + + def upgrade + @user = User.find(params[:id]) + + if params[:email] =~ /paypal/ + UserMailer.upgrade_fail(params[:email]).deliver + else + UserMailer.upgrade(@user, params[:email]).deliver + end + end private def check_privilege(user) diff --git a/app/models/user_mailer.rb b/app/mailers/user_mailer.rb similarity index 58% rename from app/models/user_mailer.rb rename to app/mailers/user_mailer.rb index a85855731..10a96b392 100644 --- a/app/models/user_mailer.rb +++ b/app/mailers/user_mailer.rb @@ -5,4 +5,12 @@ class UserMailer < ActionMailer::Base @dmail = dmail mail(:to => dmail.to.email, :subject => "#{Danbooru.config.app_name} - Message received from #{dmail.from.name}") end + + def upgrade(user, email) + mail(:to => email, :subject => "#{Danbooru.config.app_name} account upgrade") + end + + def upgrade_fail(email) + mail(:to => email, :subject => "#{Danbooru.config.app_name} account upgrade") + end end diff --git a/app/views/user_mailer/upgrade.html.erb b/app/views/user_mailer/upgrade.html.erb new file mode 100644 index 000000000..24fa1b888 --- /dev/null +++ b/app/views/user_mailer/upgrade.html.erb @@ -0,0 +1 @@ +
You can upgrade your account by sending $10 USD via Paypal to <%= mail_to Danbooru.config.upgrade_account_email %>. Be sure to include your username.
diff --git a/app/views/user_mailer/upgrade_fail.html.erb b/app/views/user_mailer/upgrade_fail.html.erb new file mode 100644 index 000000000..4ec03acfd --- /dev/null +++ b/app/views/user_mailer/upgrade_fail.html.erb @@ -0,0 +1 @@ +Account upgrades are currently disabled.
\ No newline at end of file diff --git a/config/danbooru_default_config.rb b/config/danbooru_default_config.rb index 6eab69e1f..2a11b1d88 100644 --- a/config/danbooru_default_config.rb +++ b/config/danbooru_default_config.rb @@ -22,6 +22,10 @@ module Danbooru "webmaster@#{server_host}" end + def upgrade_account_email + contact_email + end + # Stripped of any special characters. def safe_app_name app_name.gsub(/[^a-zA-Z0-9_-]/, "_")