From 18be2ea93a9c67337d1ccb46437bafb434f3856a Mon Sep 17 00:00:00 2001
From: Linus Gasser <linus.gasser@epfl.ch>
Date: Mon, 13 Oct 2025 08:29:27 +0200
Subject: [PATCH] Better bulk email function

---
 app/views/admin/emails/bulk.html.haml  |  2 ++
 app/views/admin/emails/index.html.haml | 13 +------------
 2 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/app/views/admin/emails/bulk.html.haml b/app/views/admin/emails/bulk.html.haml
index ce81c697..2af59547 100644
--- a/app/views/admin/emails/bulk.html.haml
+++ b/app/views/admin/emails/bulk.html.haml
@@ -1,5 +1,7 @@
 .row
   .col-md-12
+    .pull-right
+      = link_to '← Back to Email Settings', admin_conference_emails_path(@conference.short_title), class: 'btn btn-default'
     %h2 Bulk Email
     %p Send customized emails to users with advanced filtering and recipient selection.
 
diff --git a/app/views/admin/emails/index.html.haml b/app/views/admin/emails/index.html.haml
index dc4cd328..8376d060 100644
--- a/app/views/admin/emails/index.html.haml
+++ b/app/views/admin/emails/index.html.haml
@@ -17,7 +17,7 @@
               %li{ role: 'presentation' }
                 %a{ 'aria-controls' => 'booths', 'data-toggle' => 'tab', href: '#booth', role: 'tab' } Booth
               %li{ role: 'presentation' }
-                %a{ 'aria-controls' => 'bulk', 'data-toggle' => 'tab', href: '#bulk', role: 'tab' } Bulk Email
+                %a{ href: bulk_admin_conference_emails_path(@conference.short_title), role: 'tab' } Bulk Email
             / Tab panes
             .tab-content
               #onboarding.tab-pane.active{ role: 'tabpanel' }
@@ -213,17 +213,6 @@
                 'data-body-text' => "Dear {name},\n\nThank you for your #{t'booth'} request {booth_title} for the conference {conference}.\n\nUnfortunately, we are sorry to inform you that your request has been rejected.\n\n\nBest wishes\n\n{conference} Team" } Load Template
                 %a.btn.btn-link.control_label.template_help_link{ 'data-name' => 'booth_rejection_help' } Show help
                 =  render partial: 'help', locals: {id: 'booth_rejection_help', show_event_variables: false}
-              #bulk.tab-pane{ role: 'tabpanel' }
-                %p Send customized emails to registered users based on their registration status.
-                .form-group
-                  = link_to 'Go to Bulk Email', bulk_admin_conference_emails_path(@conference.short_title), class: 'btn btn-success'
-                %p
-                  %strong Available filters:
-                %ul
-                  %li All registered users
-                  %li Users who haven't answered any registration questions
-                  %li Users who answered some but not all questions
-                  %li Users who answered all questions
 
       .row
         .col-md-12