Merge branch 'master' of github.com:r888888888/danbooru

This commit is contained in:
Toks
2015-09-03 20:08:21 -04:00
9 changed files with 56 additions and 5 deletions

View File

@@ -0,0 +1 @@
<p>You have been unsubscribed from all email notifications.</p>

View File

@@ -0,0 +1,9 @@
<h1>Unsubscribe</h1>
<p>Do you wish to stop receiving all email notifications?</p>
<%= form_tag(maintenance_user_email_notification_path, :method => "delete") do %>
<%= hidden_field_tag "sig", params[:sig] %>
<%= hidden_field_tag "user_id", params[:user_id] %>
<%= submit_tag "Yes" %>
<% end %>

View File

@@ -1,8 +1,5 @@
<!doctype html>
<html>
<head>
<%= stylesheet_link_tag "application", :media => "screen" %>
</head>
<body>
<p><%= h @dmail.from.name %> said:</p>
@@ -10,6 +7,6 @@
<%= DText.parse(@dmail.body) %>
</div>
<p><%= link_to "View message", dmail_url(@dmail, :host => Danbooru.config.hostname, :only_path => false) %></p>
<p><%= link_to "View message", dmail_url(@dmail, :host => Danbooru.config.hostname, :only_path => false) %> | <%= link_to "Unsubscribe", maintenance_user_email_notification_url(:user_id => @dmail.owner.id, :sig => email_sig(@dmail.owner), :host => Danbooru.config.hostname, :only_path => false) %></p>
</body>
</html>

View File

@@ -10,4 +10,4 @@
<br>
<% end %>
<p><%= link_to "View topic", forum_topic_path(@forum_topic, :page => @forum_topic.last_page, :host => Danbooru.config.hostname, :only_path => false) %></p>
<p><%= link_to "View topic", forum_topic_path(@forum_topic, :page => @forum_topic.last_page, :host => Danbooru.config.hostname, :only_path => false) %> | <%= link_to "Unsubscribe", maintenance_user_email_notification_url(:user_id => @user.id, :sig => email_sig(@user), :host => Danbooru.config.hostname, :only_path => false) %></p>