diff --git a/app/views/bans/index.html.erb b/app/views/bans/index.html.erb index 870d32de5..ed973577f 100644 --- a/app/views/bans/index.html.erb +++ b/app/views/bans/index.html.erb @@ -28,7 +28,11 @@ <%= time_ago_in_words_tagged(ban.created_at) %> <%= humanized_duration(ban.created_at, ban.expires_at) %> - <%= format_text ban.reason %> + +
+ <%= format_text ban.reason %> +
+ <% if CurrentUser.is_moderator? %> <%= link_to "Edit", edit_ban_path(ban) %> diff --git a/app/views/bans/show.html.erb b/app/views/bans/show.html.erb index 501f1d92f..496943b2b 100644 --- a/app/views/bans/show.html.erb +++ b/app/views/bans/show.html.erb @@ -4,7 +4,12 @@ <%= form_tag(ban_path(@ban), :method => :delete) do %> diff --git a/app/views/bulk_update_requests/show.html.erb b/app/views/bulk_update_requests/show.html.erb index c4a3fc344..097b846d0 100644 --- a/app/views/bulk_update_requests/show.html.erb +++ b/app/views/bulk_update_requests/show.html.erb @@ -14,7 +14,9 @@

Script

- 
<%= format_text @bulk_update_request.script_with_links %>
+
+ <%= format_text @bulk_update_request.script_with_links %> +
<%= render "bur_edit_links", bur: @bulk_update_request %>
diff --git a/app/views/layouts/default.html.erb b/app/views/layouts/default.html.erb index 5437b03a7..6ce435b0a 100644 --- a/app/views/layouts/default.html.erb +++ b/app/views/layouts/default.html.erb @@ -136,7 +136,7 @@ <% end %>
"> - <%= format_text(flash[:notice], inline: true) %>. + <%= format_text(flash[:notice], inline: true) %>. close
diff --git a/app/views/mod_actions/index.html.erb b/app/views/mod_actions/index.html.erb index 97d4ab292..9b7a11daa 100644 --- a/app/views/mod_actions/index.html.erb +++ b/app/views/mod_actions/index.html.erb @@ -17,7 +17,11 @@ <%= compact_time mod_action.created_at %> <%= link_to_user mod_action.creator %> - <%= format_text(mod_action.filtered_description) %> + +
+ <%= format_text(mod_action.filtered_description) %> +
+ <% end %> diff --git a/app/views/moderator/dashboards/_activity_mod_action.html.erb b/app/views/moderator/dashboards/_activity_mod_action.html.erb index 9c89c19e9..293c899fa 100644 --- a/app/views/moderator/dashboards/_activity_mod_action.html.erb +++ b/app/views/moderator/dashboards/_activity_mod_action.html.erb @@ -10,7 +10,11 @@ <% @dashboard.mod_actions.each do |mod_action| %> <%= link_to_user mod_action.creator %> - <%= format_text(mod_action.description) %> + +
+ <%= format_text(mod_action.description) %> +
+ <% end %> diff --git a/app/views/moderator/dashboards/_activity_user_feedback.html.erb b/app/views/moderator/dashboards/_activity_user_feedback.html.erb index 5ac7ae6dd..1c4715de7 100644 --- a/app/views/moderator/dashboards/_activity_user_feedback.html.erb +++ b/app/views/moderator/dashboards/_activity_user_feedback.html.erb @@ -11,7 +11,11 @@ <% @dashboard.user_feedbacks.each do |record| %> <%= link_to_user(record.user) %> - <%= format_text(record.body) %> + +
+ <%= format_text(record.body) %> +
+ <%= time_ago_in_words_tagged(record.created_at) %> <% end %> diff --git a/app/views/moderator/post/disapprovals/index.html.erb b/app/views/moderator/post/disapprovals/index.html.erb index 7965a0052..ef36dd81b 100644 --- a/app/views/moderator/post/disapprovals/index.html.erb +++ b/app/views/moderator/post/disapprovals/index.html.erb @@ -29,7 +29,11 @@ <%= link_to "post ##{post_disapproval.post_id}", post_path(post_disapproval.post_id) %> <%= link_to "ยป", moderator_post_disapprovals_path(search: params[:search].merge(post_id: post_disapproval.post_id)) %> - <%= format_text(post_disapproval.message) %> + +
+ <%= format_text(post_disapproval.message) %> +
+ <%= link_to post_disapproval.reason.humanize, moderator_post_disapprovals_path(search: params[:search].merge(reason: post_disapproval.reason)) %> diff --git a/app/views/post_appeals/index.html.erb b/app/views/post_appeals/index.html.erb index 53ee9918b..7415b91ef 100644 --- a/app/views/post_appeals/index.html.erb +++ b/app/views/post_appeals/index.html.erb @@ -19,7 +19,11 @@ <% @post_appeals.each do |post_appeal| %> <%= PostPresenter.preview(post_appeal.post, :tags => "status:any") %> - <%= format_text post_appeal.reason %> + +
+ <%= format_text post_appeal.reason %> +
+ <%= link_to post_appeal.post.appeals.size, post_appeals_path(search: { post_id: post_appeal.post_id }) %> diff --git a/app/views/post_events/index.html.erb b/app/views/post_events/index.html.erb index 2e2f3248a..ef8a24f22 100644 --- a/app/views/post_events/index.html.erb +++ b/app/views/post_events/index.html.erb @@ -23,7 +23,11 @@ <% end %>
<%= time_ago_in_words_tagged event.created_at %> - <%= format_text event.reason %> + +
+ <%= format_text event.reason %> +
+ <%= event.is_resolved %> <% end %> diff --git a/app/views/post_flags/index.html.erb b/app/views/post_flags/index.html.erb index c5c098026..1c9806d75 100644 --- a/app/views/post_flags/index.html.erb +++ b/app/views/post_flags/index.html.erb @@ -21,7 +21,9 @@ <%= PostPresenter.preview(post_flag.post, :tags => "status:any") %> - <%= format_text post_flag.reason %> +
+ <%= format_text post_flag.reason %> +
<%= link_to post_flag.post.flags.size, post_flags_path(search: { post_id: post_flag.post_id }) %> diff --git a/app/views/tag_aliases/show.html.erb b/app/views/tag_aliases/show.html.erb index 80f77bf98..fb6d091e6 100644 --- a/app/views/tag_aliases/show.html.erb +++ b/app/views/tag_aliases/show.html.erb @@ -11,9 +11,14 @@
  • Creator <%= link_to_user @tag_alias.creator %>
  • Date <%= @tag_alias.created_at %>
    • <% if @tag_alias.respond_to?(:reason) && @tag_alias.reason.present? %> -
  • Reason <%= format_text @tag_alias.reason %>
    • +
  • + Reason +
    + <%= format_text @tag_alias.reason %> +
    +
    • <% end %> -
  • Status: <%= @tag_alias.status %>
    • +
  • Status <%= @tag_alias.status %>
    • <% if CurrentUser.is_admin? && @tag_alias.is_pending? %>
  • Commands <%= link_to "Approve", approve_tag_alias_path(@tag_alias), :method => :post %>
    • diff --git a/app/views/tag_implications/show.html.erb b/app/views/tag_implications/show.html.erb index ca0380c77..a2236267e 100644 --- a/app/views/tag_implications/show.html.erb +++ b/app/views/tag_implications/show.html.erb @@ -11,7 +11,12 @@
  • Creator <%= link_to_user @tag_implication.creator %>
  • Date <%= @tag_implication.created_at %>
    • <% if @tag_implication.respond_to?(:reason) && @tag_implication.reason.present? %> -
  • Reason <%= format_text @tag_implication.reason %>
    • +
  • + Reason +
    + <%= format_text @tag_implication.reason %> +
    +
    • <% end %>
  • Status: <%= @tag_implication.status %>
    • diff --git a/app/views/uploads/new.html.erb b/app/views/uploads/new.html.erb index 910812b0b..7c5c0a8f6 100644 --- a/app/views/uploads/new.html.erb +++ b/app/views/uploads/new.html.erb @@ -3,7 +3,7 @@

    Upload

    <% if CurrentUser.can_upload? %> -
    +
    <%= format_text(@upload_notice_wiki.try(&:body)) %>
    diff --git a/app/views/user_feedbacks/index.html.erb b/app/views/user_feedbacks/index.html.erb index 3c63ebce2..17c4a8d13 100644 --- a/app/views/user_feedbacks/index.html.erb +++ b/app/views/user_feedbacks/index.html.erb @@ -19,7 +19,9 @@ <%= link_to_user feedback.creator %> <%= compact_time(feedback.created_at) %> - <%= format_text(feedback.body) %> +
    + <%= format_text(feedback.body) %> +
    <%= render "application/update_notice", record: feedback, interval: 0.minutes %> diff --git a/app/views/user_feedbacks/show.html.erb b/app/views/user_feedbacks/show.html.erb index c7b88a6d4..88f6aa6c0 100644 --- a/app/views/user_feedbacks/show.html.erb +++ b/app/views/user_feedbacks/show.html.erb @@ -6,7 +6,12 @@
  • Creator <%= link_to_user @user_feedback.creator %>
  • Date <%= @user_feedback.created_at %>
  • Category <%= @user_feedback.category %>
    • -
  • Message <%= format_text @user_feedback.body %>
    • +
  • + Message +
    + <%= format_text @user_feedback.body %> +
    +
    • <% if @user_feedback.editable_by?(CurrentUser.user) %> diff --git a/app/views/users/_ban_notice.html.erb b/app/views/users/_ban_notice.html.erb index 14194123d..6e14081db 100644 --- a/app/views/users/_ban_notice.html.erb +++ b/app/views/users/_ban_notice.html.erb @@ -1,5 +1,5 @@

    Your account has been temporarily banned

    -

    Reason: <%= format_text CurrentUser.user.recent_ban.reason %>

    +

    Reason: <%= format_text CurrentUser.user.recent_ban.reason, inline: true %>

    Your ban will expire in <%= time_ago_in_words(CurrentUser.user.recent_ban.expires_at) %>

    diff --git a/app/views/users/_statistics.html.erb b/app/views/users/_statistics.html.erb index b2f971175..99d5a2997 100644 --- a/app/views/users/_statistics.html.erb +++ b/app/views/users/_statistics.html.erb @@ -38,7 +38,11 @@ <% if user.is_banned? && user.recent_ban %> Ban reason - <%= format_text presenter.ban_reason %> + +
    + <%= format_text presenter.ban_reason %> +
    + <% end %>