diff --git a/app/controllers/admin/emails_controller.rb b/app/controllers/admin/emails_controller.rb index ba456efe..069b350a 100644 --- a/app/controllers/admin/emails_controller.rb +++ b/app/controllers/admin/emails_controller.rb @@ -22,6 +22,8 @@ module Admin @settings = @conference.email_settings end + def custom_email; end + private def email_params diff --git a/app/views/admin/emails/custom_email.html.haml b/app/views/admin/emails/custom_email.html.haml new file mode 100644 index 00000000..cc8765ac --- /dev/null +++ b/app/views/admin/emails/custom_email.html.haml @@ -0,0 +1,13 @@ +.row + .col-md-6.col-md-offset-2 + .panel.panel-default + .panel-heading + %h3.panel-title + Send an email + .panel-body + %p + %b Select/Enter Emails + = text_field_tag :to, '', class: 'form-control' + %br + %p.text-right + = link_to 'Send Email', '', class: 'btn btn-primary' diff --git a/app/views/layouts/_admin_sidebar.html.haml b/app/views/layouts/_admin_sidebar.html.haml index c6da29b0..c5611ced 100644 --- a/app/views/layouts/_admin_sidebar.html.haml +++ b/app/views/layouts/_admin_sidebar.html.haml @@ -126,6 +126,9 @@ = link_to(admin_conference_emails_path(@conference.short_title)) do %span.fa.fa-envelope E-Mails + %ul + %li{class: active_nav_li(admin_conference_custom_email_path(@conference.short_title))} + = link_to 'Send E-Mails', admin_conference_custom_email_path(@conference.short_title) %li{ class: active_nav_li(admin_conference_surveys_path(@conference.short_title)) } = link_to(admin_conference_surveys_path(@conference.short_title)) do %span.fa.fa-list-alt diff --git a/config/routes.rb b/config/routes.rb index 57bfa630..7ef295ff 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -119,6 +119,7 @@ Osem::Application.routes.draw do resources :sponsors, except: [:show] resources :lodgings, except: [:show] resources :emails, only: [:show, :update, :index] + get '/custom_email' => 'emails#custom_email' resources :physical_tickets, only: [:index] resources :roles, except: [:new, :create] do member do