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

users: reword ban notice messages.

Browse Source 
* Show the ban length instead of the ban expiration date in ban notices.
* Fix the ban notice to not say "Your account has been temporarily
  banned" when it's a permanent ban.
This commit is contained in:
evazion
2021-05-15 03:39:32 -05:00
parent 8ca757244a
commit 90a4ac3bf5
8 changed files with 24 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/views/bans/index.html.erb
View File

@@ -15,7 +15,7 @@
</div>
<% end %>
<% t.column "Duration" do |ban| %>
<%= humanized_duration(ban.created_at, ban.expires_at) %>
<%= humanized_duration(ban.duration) %>
<% end %>
<% t.column "Banner" do |ban| %>
<%= link_to_user ban.banner %>

2
app/views/bans/show.html.erb
View File

@@ -6,7 +6,7 @@
<h1>Show Ban</h1>
<ul style="margin-bottom: 1em;">
<li><strong>User</strong> <%= link_to_user(@ban.user) %></li>
<li><strong>Duration</strong> <%= humanized_duration(@ban.created_at, @ban.expires_at) %></li>
<li><strong>Duration</strong> <%= humanized_duration(@ban.duration) %></li>
<li>
<strong>Reason</strong>
<div class="prose">

4
app/views/layouts/default.html.erb
View File

@@ -81,9 +81,7 @@
<%= render "users/upgrade_notice" %>
<% end %>
<% if CurrentUser.user.is_banned? %>
<%= render "users/ban_notice" %>
<% end %>
<%= render "users/ban_notice" %>
<% if params[:controller] != "dmails" && has_unread_dmails?(CurrentUser.user) %>
<%= render "users/dmail_notice" %>

16
app/views/users/_ban_notice.html.erb
View File

@@ -1,5 +1,11 @@
<div class="notice notice-error notice-large" id="ban-notice">
<h2>Your account has been temporarily banned</h2>
<div>Reason: <span class="prose"><%= format_text CurrentUser.user.active_ban.reason, inline: true %></span></div>
<div>Your ban will expire in <%= time_ago_in_words(CurrentUser.user.active_ban.expires_at) %></div>
</div>
<% if CurrentUser.user.is_banned? %>
<% @active_ban = CurrentUser.user.active_ban %>
<div class="notice notice-error notice-large" id="ban-notice">
<h2>You have been banned <%= humanized_duration @active_ban.duration %></h2>
<div>
Reason: <span class="prose"><%= format_text @active_ban.reason, inline: true %></span>
</div>
</div>
<% end %>

5
app/views/users/_statistics.html.erb
View File

@@ -89,12 +89,13 @@
<td><%= presenter.permissions %></td>
</tr>
<% if user.is_banned? %>
<% if user.is_banned? && user.active_ban.present? %>
<tr>
<th>Ban reason</th>
<td>
<span class="prose">
<%= format_text presenter.ban_reason, inline: true %>
<%= format_text user.active_ban.reason, inline: true %>
(banned <%= humanized_duration(user.active_ban.duration) %>)
</span>
</td>
</tr>