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

fixes #1833

Browse Source
This commit is contained in:
Toks
2013-07-05 20:47:07 -04:00
parent 23246f878b
commit 7d0bc1be29
4 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -16,7 +16,7 @@
<tr id="ban-<%= ban.id %>"> <tr id="ban-<%= ban.id %>">
<td><%= link_to_user(ban.user) %></td> <td><%= link_to_user(ban.user) %></td>
<td><%= ban.expires_at %></td> <td><%= ban.expires_at %></td>
<td><%= ban.reason %></td> <td><%= format_text ban.reason %></td>
<td> <td>
<% if CurrentUser.is_moderator? %> <% if CurrentUser.is_moderator? %>
<%= link_to "Edit", edit_ban_path(ban) %> <%= link_to "Edit", edit_ban_path(ban) %>

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

@@ -4,7 +4,7 @@
<ul style="margin-bottom: 1em;"> <ul style="margin-bottom: 1em;">
<li><strong>User</strong>: <%= link_to_user(@ban.user) %></li> <li><strong>User</strong>: <%= link_to_user(@ban.user) %></li>
<li><strong>Expires</strong>: <%= compact_time @ban.expires_at %></li> <li><strong>Expires</strong>: <%= compact_time @ban.expires_at %></li>
<li><strong>Reason</strong>: <%= @ban.reason %></li> <li><strong>Reason</strong>: <%= format_text @ban.reason %></li>
</ul> </ul>
<%= form_tag(ban_path(@ban), :method => :delete) do %> <%= form_tag(ban_path(@ban), :method => :delete) do %>

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

@@ -1,5 +1,5 @@
<div class="ui-corner-all ui-state-error" id="ban-notice"> <div class="ui-corner-all ui-state-error" id="ban-notice">
<h1>Your account has been temporarily banned</h1> <h1>Your account has been temporarily banned</h1>
<p>Reason: <%= CurrentUser.user.recent_ban.reason %></p> <p>Reason: <%= format_text CurrentUser.user.recent_ban.reason %></p>
<p>Your ban will expire in <%= time_ago_in_words(CurrentUser.user.recent_ban.expires_at) %></p> <p>Your ban will expire in <%= time_ago_in_words(CurrentUser.user.recent_ban.expires_at) %></p>
</div> </div>

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

@@ -20,7 +20,7 @@
<% if user.is_banned? %> <% if user.is_banned? %>
<tr> <tr>
<th>Ban reason</th> <th>Ban reason</th>
<td><%= presenter.ban_reason %></td> <td><%= format_text presenter.ban_reason %></td>
</tr> </tr>
<% end %> <% end %>