Updated collapsible

2 files changed, 24 insertions, 44 deletions

diff --git a/app/views/admin/abuse_reports/_abuse_report.html.haml b/app/views/admin/abuse_reports/_abuse_report.html.haml
index 0dd3904dfa9..f7183bf6a98 100644
--- a/app/views/admin/abuse_reports/_abuse_report.html.haml
+++ b/app/views/admin/abuse_reports/_abuse_report.html.haml
@@ -3,10 +3,17 @@
 
 .panel.panel-default
   .panel-heading{ id: "heading#{ abuse_report_counter }", role: 'tab' }
-    %h4.panel-title
-      %a{ role: 'button', href: "#collapse#{ abuse_report_counter }", data: { toggle: 'collapse', parent: '#accordion' }, aria: { expanded: 'true', controls: "collapse#{ abuse_report_counter }" } }
-        Collapsible Group Item #
-        = abuse_report_counter.to_s
+    .panel-title
+      - if user
+        = link_to user.name, user
+      - else
+        (removed)
+      -# %a{ role: 'button', href: "#collapse#{ abuse_report_counter }", data: { toggle: 'collapse', parent: '#accordion' }, aria: { expanded: 'true', controls: "collapse#{ abuse_report_counter }" } }
+      reported by
+      - if reporter
+        = link_to reporter.name, reporter
+      - else
+        (removed)
       .btn-group.pull-right
         - if user
           = link_to 'Remove user & report', admin_abuse_report_path(abuse_report, remove_user: true),
@@ -20,21 +27,12 @@
       .clearfix
   .panel-collapse.collapse{ id: "collapse#{ abuse_report_counter }", class: (abuse_report_counter == 0 ? 'in' : ''), role: 'tabpanel', aria: { labelledby: "heading#{ abuse_report_counter }" } }
     .panel-body
-      Anim pariatur cliche reprehenderit, enim eiusmod high life accusamus terry richardson ad squid. 3 wolf moon officia aute, non cupidatat skateboard dolor brunch. Food truck quinoa nesciunt laborum eiusmod. Brunch 3 wolf moon tempor, sunt aliqua put a bird on it squid single-origin coffee nulla assumenda shoreditch et. Nihil anim keffiyeh helvetica, craft beer labore wes anderson cred nesciunt sapiente ea proident. Ad vegan excepteur butcher vice lomo. Leggings occaecat craft beer farm-to-table, raw denim aesthetic synth nesciunt you probably haven't heard of them accusamus labore sustainable VHS.
+      = markdown(abuse_report.message.squish!, pipeline: :single_line, author: reporter)
 
 -# %tr
 -#   %td
--#     - if user
--#       = link_to user.name, user
--#       .light.small
--#         Joined #{time_ago_with_tooltip(user.created_at)}
--#     - else
--#       (removed)
+
 -#   %td
--#     - if reporter
--#       = link_to reporter.name, reporter
--#     - else
--#       (removed)
 -#     .light.small
 -#       = time_ago_with_tooltip(abuse_report.created_at)
 -#   %td
diff --git a/app/views/admin/abuse_reports/index.html.haml b/app/views/admin/abuse_reports/index.html.haml
index 93ea82c7454..c426559c4c3 100644
--- a/app/views/admin/abuse_reports/index.html.haml
+++ b/app/views/admin/abuse_reports/index.html.haml
@@ -1,32 +1,14 @@
 - page_title 'Abuse Reports'
 %h3.page-title Abuse Reports
 %hr
--# - if @abuse_reports.present?
-- if false
-  .panel-group#accordion{ role: 'tablist', aria: { multiselectable: 'true' } }
-    = render @abuse_reports
-  = paginate @abuse_reports
-- else
-  .no-reports
-    .pull-left
-      There are no abuse reports!
-    .pull-left
-      = emoji_icon 'tada'
-
-  -# .panel.panel-default
-  -#   .panel-heading#headingOne{ role: 'tab' }
-  -#     %h4.panel-title
-  -#       %a{ role: 'button', href: '#collapseOne', data: { toggle: 'collapse', parent: '#accordion' }, aria: { expanded: 'true', controls: 'collapseOne' } }
-  -#         Collapsible Group Item #1
-  -#   .panel-collapse.collapse.in#collapseOne{ role: 'tabpanel', aria: { labelledby: 'headingOne' } }
-  -#     .panel-body
-  -#       Anim pariatur cliche reprehenderit, enim eiusmod high life accusamus terry richardson ad squid. 3 wolf moon officia aute, non cupidatat skateboard dolor brunch. Food truck quinoa nesciunt laborum eiusmod. Brunch 3 wolf moon tempor, sunt aliqua put a bird on it squid single-origin coffee nulla assumenda shoreditch et. Nihil anim keffiyeh helvetica, craft beer labore wes anderson cred nesciunt sapiente ea proident. Ad vegan excepteur butcher vice lomo. Leggings occaecat craft beer farm-to-table, raw denim aesthetic synth nesciunt you probably haven't heard of them accusamus labore sustainable VHS.
-
-  -# .panel.panel-default
-  -#   .panel-heading#headingTwo{ role: 'tab' }
-  -#     %h4.panel-title
-  -#       %a.collapsed{ role: 'button', href: '#collapseTwo', data: { toggle: 'collapse', parent: '#accordion' }, aria: { expanded: 'false', controls: 'collapseTwo' } }
-  -#         Collapsible Group Item #2
-  -#   .panel-collapse.collapse#collapseTwo{ role: 'tabpanel', aria: { labelledby: 'headingTwo' } }
-  -#     .panel-body
-  -#       Anim pariatur cliche reprehenderit, enim eiusmod high life accusamus terry richardson ad squid. 3 wolf moon officia aute, non cupidatat skateboard dolor brunch. Food truck quinoa nesciunt laborum eiusmod. Brunch 3 wolf moon tempor, sunt aliqua put a bird on it squid single-origin coffee nulla assumenda shoreditch et. Nihil anim keffiyeh helvetica, craft beer labore wes anderson cred nesciunt sapiente ea proident. Ad vegan excepteur butcher vice lomo. Leggings occaecat craft beer farm-to-table, raw denim aesthetic synth nesciunt you probably haven't heard of them accusamus labore sustainable VHS.
+.abuse-reports
+  - if @abuse_reports.present?
+    .panel-group#accordion{ role: 'tablist', aria: { multiselectable: 'true' } }
+      = render @abuse_reports
+    = paginate @abuse_reports
+  - else
+    .no-reports
+      %span.pull-left
+        There are no abuse reports!
+      .pull-left
+        = emoji_icon 'tada'