Unifies styles and views for admin sending of emails section
This commit is contained in:
decabeza
@@ -9,7 +9,7 @@
|
|||||||
<th><%= t("admin.admin_notifications.index.title") %></th>
|
<th><%= t("admin.admin_notifications.index.title") %></th>
|
||||||
<th><%= t("admin.admin_notifications.index.segment_recipient") %></th>
|
<th><%= t("admin.admin_notifications.index.segment_recipient") %></th>
|
||||||
<th><%= t("admin.admin_notifications.index.sent") %></th>
|
<th><%= t("admin.admin_notifications.index.sent") %></th>
|
||||||
<th class="small-5 text-right"><%= t("admin.admin_notifications.index.actions") %></th>
|
<th class="small-5"><%= t("admin.admin_notifications.index.actions") %></th>
|
||||||
</tr>
|
</tr>
|
||||||
</thead>
|
</thead>
|
||||||
<tbody>
|
<tbody>
|
||||||
@@ -28,21 +28,29 @@
|
|||||||
<%= l admin_notification.sent_at.to_date %>
|
<%= l admin_notification.sent_at.to_date %>
|
||||||
<% end %>
|
<% end %>
|
||||||
</td>
|
</td>
|
||||||
<td class="text-right">
|
<td>
|
||||||
<% if admin_notification.draft? %>
|
<% if admin_notification.draft? %>
|
||||||
<%= link_to t("admin.admin_notifications.index.edit"),
|
<div class="small-4 column">
|
||||||
edit_admin_admin_notification_path(admin_notification),
|
<%= link_to t("admin.admin_notifications.index.edit"),
|
||||||
method: :get, class: "button hollow" %>
|
edit_admin_admin_notification_path(admin_notification),
|
||||||
<%= link_to t("admin.admin_notifications.index.delete"),
|
method: :get, class: "button expanded hollow" %>
|
||||||
admin_admin_notification_path(admin_notification),
|
</div>
|
||||||
method: :delete, class: "button hollow alert" %>
|
<div class="small-4 column">
|
||||||
<%= link_to t("admin.admin_notifications.index.preview"),
|
<%= link_to t("admin.admin_notifications.index.delete"),
|
||||||
admin_admin_notification_path(admin_notification),
|
admin_admin_notification_path(admin_notification),
|
||||||
class: "button" %>
|
method: :delete, class: "button expanded hollow alert" %>
|
||||||
|
</div>
|
||||||
|
<div class="small-4 column">
|
||||||
|
<%= link_to t("admin.admin_notifications.index.preview"),
|
||||||
|
admin_admin_notification_path(admin_notification),
|
||||||
|
class: "button expanded" %>
|
||||||
|
</div>
|
||||||
<% else %>
|
<% else %>
|
||||||
<%= link_to t("admin.admin_notifications.index.view"),
|
<div class="small-4 column">
|
||||||
admin_admin_notification_path(admin_notification),
|
<%= link_to t("admin.admin_notifications.index.view"),
|
||||||
class: "button" %>
|
admin_admin_notification_path(admin_notification),
|
||||||
|
class: "button expanded" %>
|
||||||
|
</div>
|
||||||
<% end %>
|
<% end %>
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
|
|||||||
@@ -2,76 +2,74 @@
|
|||||||
|
|
||||||
<h2><%= t("admin.admin_notifications.show.section_title") %></h2>
|
<h2><%= t("admin.admin_notifications.show.section_title") %></h2>
|
||||||
|
|
||||||
<div class="small-12 column">
|
<div class="small-12 column callout highlight">
|
||||||
<div class="callout highlight">
|
<div class="small-12 medium-6 column">
|
||||||
<div class="row">
|
<strong><%= t("admin.admin_notifications.show.sent_at") %></strong><br>
|
||||||
<div class="small-12 medium-6 column">
|
|
||||||
<strong><%= t("admin.admin_notifications.show.sent_at") %></strong><br>
|
|
||||||
<% if @admin_notification.draft? %>
|
|
||||||
<%= t("admin.admin_notifications.index.draft") %>
|
|
||||||
<% else %>
|
|
||||||
<%= l(@admin_notification.sent_at.to_date) %>
|
|
||||||
<% end %>
|
|
||||||
</div>
|
|
||||||
<div class="small-12 medium-6 column">
|
|
||||||
<strong><%= t("admin.admin_notifications.show.title") %></strong><br>
|
|
||||||
<%= @admin_notification.title %>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div class="row">
|
|
||||||
|
|
||||||
<div class="small-12 medium-6 column">
|
|
||||||
<strong><%= t("admin.admin_notifications.show.body") %></strong><br>
|
|
||||||
<%= @admin_notification.body %>
|
|
||||||
</div>
|
|
||||||
<div class="small-12 medium-6 column">
|
|
||||||
<strong><%= t("admin.admin_notifications.show.link") %></strong><br>
|
|
||||||
<%= @admin_notification.link %>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div class="row">
|
|
||||||
<div class="small-12 column">
|
|
||||||
<strong><%= t("admin.admin_notifications.show.segment_recipient") %></strong><br>
|
|
||||||
<%= segment_name(@admin_notification.segment_recipient) %>
|
|
||||||
<% if @admin_notification.draft? %>
|
|
||||||
<%= t("admin.admin_notifications.show.will_get_notified",
|
|
||||||
n: @admin_notification.list_of_recipients_count) %>
|
|
||||||
<% else %>
|
|
||||||
<%= t("admin.admin_notifications.show.got_notified",
|
|
||||||
n: @admin_notification.recipients_count) %>
|
|
||||||
<% end %>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<p class="help-text" id="phase-description-help-text">
|
|
||||||
<% if @admin_notification.draft? %>
|
<% if @admin_notification.draft? %>
|
||||||
<%= t("admin.admin_notifications.show.preview_guide") %>
|
<%= t("admin.admin_notifications.index.draft") %>
|
||||||
<% else %>
|
<% else %>
|
||||||
<%= t("admin.admin_notifications.show.sent_guide") %>
|
<%= l(@admin_notification.sent_at.to_date) %>
|
||||||
|
<% end %>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="small-12 medium-6 column">
|
||||||
|
<strong><%= t("admin.admin_notifications.show.title") %></strong><br>
|
||||||
|
<%= @admin_notification.title %>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="small-12 medium-6 column">
|
||||||
|
<strong><%= t("admin.admin_notifications.show.body") %></strong><br>
|
||||||
|
<%= @admin_notification.body %>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="small-12 medium-6 column">
|
||||||
|
<strong><%= t("admin.admin_notifications.show.link") %></strong><br>
|
||||||
|
<%= @admin_notification.link %>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="small-12 column">
|
||||||
|
<strong><%= t("admin.admin_notifications.show.segment_recipient") %></strong><br>
|
||||||
|
<%= segment_name(@admin_notification.segment_recipient) %>
|
||||||
|
<% if @admin_notification.draft? %>
|
||||||
|
<%= t("admin.admin_notifications.show.will_get_notified",
|
||||||
|
n: @admin_notification.list_of_recipients_count) %>
|
||||||
|
<% else %>
|
||||||
|
<%= t("admin.admin_notifications.show.got_notified",
|
||||||
|
n: @admin_notification.recipients_count) %>
|
||||||
<% end %>
|
<% end %>
|
||||||
</p>
|
|
||||||
<hr>
|
|
||||||
<div class="admin_notification-body-content">
|
|
||||||
<ul class="no-bullet clear notifications-list">
|
|
||||||
<li class="notification unread">
|
|
||||||
<% locals = { notification: nil,
|
|
||||||
title: @admin_notification.title,
|
|
||||||
body: @admin_notification.body,
|
|
||||||
timestamp: Time.current } %>
|
|
||||||
<% link_text = render partial: '/notifications/notification_body', locals: locals %>
|
|
||||||
<%= link_to_if @admin_notification.link.present?, link_text, @admin_notification.link %>
|
|
||||||
</li>
|
|
||||||
</ul>
|
|
||||||
</div>
|
</div>
|
||||||
<hr>
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
<p class="help-text" id="phase-description-help-text">
|
||||||
|
<% if @admin_notification.draft? %>
|
||||||
|
<%= t("admin.admin_notifications.show.preview_guide") %>
|
||||||
|
<% else %>
|
||||||
|
<%= t("admin.admin_notifications.show.sent_guide") %>
|
||||||
|
<% end %>
|
||||||
|
</p>
|
||||||
|
<hr>
|
||||||
|
<div class="admin_notification-body-content">
|
||||||
|
<ul class="no-bullet clear notifications-list">
|
||||||
|
<li class="notification unread">
|
||||||
|
<% locals = { notification: nil,
|
||||||
|
title: @admin_notification.title,
|
||||||
|
body: @admin_notification.body,
|
||||||
|
timestamp: Time.current } %>
|
||||||
|
<% link_text = render partial: '/notifications/notification_body', locals: locals %>
|
||||||
|
<%= link_to_if @admin_notification.link.present?, link_text, @admin_notification.link %>
|
||||||
|
</li>
|
||||||
|
</ul>
|
||||||
|
</div>
|
||||||
|
<hr>
|
||||||
|
|
||||||
<% if @admin_notification.draft? && @admin_notification.valid_segment_recipient? %>
|
<% if @admin_notification.draft? && @admin_notification.valid_segment_recipient? %>
|
||||||
<%= link_to t("admin.admin_notifications.show.send"),
|
<div class="small-12 medium-6 large-3 column end">
|
||||||
deliver_admin_admin_notification_path(@admin_notification),
|
<%= link_to t("admin.admin_notifications.show.send"),
|
||||||
"data-alert": t("admin.admin_notifications.show.send_alert",
|
deliver_admin_admin_notification_path(@admin_notification),
|
||||||
n: @admin_notification.list_of_recipients_count),
|
"data-alert": t("admin.admin_notifications.show.send_alert",
|
||||||
method: :post,
|
n: @admin_notification.list_of_recipients_count),
|
||||||
id: "js-send-admin_notification-alert",
|
method: :post,
|
||||||
class: "button success" %>
|
id: "js-send-admin_notification-alert",
|
||||||
|
class: "button success expanded" %>
|
||||||
|
</div>
|
||||||
<% end %>
|
<% end %>
|
||||||
|
|||||||
@@ -5,15 +5,13 @@
|
|||||||
method: :get,
|
method: :get,
|
||||||
id: "admin_download_emails" do %>
|
id: "admin_download_emails" do %>
|
||||||
|
|
||||||
<label><%= t('admin.emails_download.index.download_segment') %></label>
|
<label><%= t("admin.emails_download.index.download_segment") %></label>
|
||||||
<p class="help-text" id="emails-help-text">
|
<p class="help-text" id="emails-help-text">
|
||||||
<%= t('admin.emails_download.index.download_segment_help_text') %>
|
<%= t("admin.emails_download.index.download_segment_help_text") %>
|
||||||
</p>
|
</p>
|
||||||
|
|
||||||
<%= select_tag :users_segment, options_for_select(user_segments_options) %>
|
<%= select_tag :users_segment, options_for_select(user_segments_options) %>
|
||||||
|
|
||||||
<div class="margin-top">
|
<%= submit_tag t("admin.emails_download.index.download_emails_button"), class: "button" %>
|
||||||
<%= submit_tag t('admin.emails_download.index.download_emails_button'), class: "button" %>
|
|
||||||
</div>
|
|
||||||
<% end %>
|
<% end %>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -6,10 +6,10 @@
|
|||||||
<table id="newsletters">
|
<table id="newsletters">
|
||||||
<thead>
|
<thead>
|
||||||
<tr>
|
<tr>
|
||||||
<th><%= t("admin.newsletters.index.subject") %></th>
|
<th class="small-2"><%= t("admin.newsletters.index.subject") %></th>
|
||||||
<th><%= t("admin.newsletters.index.segment_recipient") %></th>
|
<th><%= t("admin.newsletters.index.segment_recipient") %></th>
|
||||||
<th><%= t("admin.newsletters.index.sent") %></th>
|
<th><%= t("admin.newsletters.index.sent") %></th>
|
||||||
<th class="small-5 text-right"><%= t("admin.newsletters.index.actions") %></th>
|
<th class="small-4"><%= t("admin.newsletters.index.actions") %></th>
|
||||||
</tr>
|
</tr>
|
||||||
</thead>
|
</thead>
|
||||||
<tbody>
|
<tbody>
|
||||||
@@ -28,13 +28,19 @@
|
|||||||
<%= l newsletter.sent_at.to_date %>
|
<%= l newsletter.sent_at.to_date %>
|
||||||
<% end %>
|
<% end %>
|
||||||
</td>
|
</td>
|
||||||
<td class="text-right">
|
<td>
|
||||||
|
<div class="small-4 column">
|
||||||
<%= link_to t("admin.newsletters.index.edit"), edit_admin_newsletter_path(newsletter),
|
<%= link_to t("admin.newsletters.index.edit"), edit_admin_newsletter_path(newsletter),
|
||||||
method: :get, class: "button hollow" %>
|
method: :get, class: "button hollow expanded" %>
|
||||||
|
</div>
|
||||||
|
<div class="small-4 column">
|
||||||
<%= link_to t("admin.newsletters.index.delete"), admin_newsletter_path(newsletter),
|
<%= link_to t("admin.newsletters.index.delete"), admin_newsletter_path(newsletter),
|
||||||
method: :delete, class: "button hollow alert" %>
|
method: :delete, class: "button hollow alert expanded" %>
|
||||||
|
</div>
|
||||||
|
<div class="small-4 column">
|
||||||
<%= link_to t("admin.newsletters.index.preview"), admin_newsletter_path(newsletter),
|
<%= link_to t("admin.newsletters.index.preview"), admin_newsletter_path(newsletter),
|
||||||
class: "button" %>
|
class: "button expanded" %>
|
||||||
|
</div>
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
<% end %>
|
<% end %>
|
||||||
|
|||||||
@@ -4,39 +4,37 @@
|
|||||||
|
|
||||||
<% recipients_count = @newsletter.valid_segment_recipient? ? @newsletter.list_of_recipient_emails.count : 0 %>
|
<% recipients_count = @newsletter.valid_segment_recipient? ? @newsletter.list_of_recipient_emails.count : 0 %>
|
||||||
|
|
||||||
<div class="small-12 column">
|
<div class="small-12 column callout highlight">
|
||||||
<div class="callout highlight">
|
<div class="small-12 medium-2 column">
|
||||||
<div class="row">
|
<strong><%= t("admin.newsletters.show.sent_at") %></strong><br>
|
||||||
<div class="small-12 medium-2 column">
|
<% if @newsletter.draft? %>
|
||||||
<strong><%= t("admin.newsletters.show.sent_at") %></strong><br>
|
<%= t("admin.newsletters.index.draft") %>
|
||||||
<% if @newsletter.draft? %>
|
<% else %>
|
||||||
<%= t("admin.newsletters.index.draft") %>
|
<%= l @newsletter.sent_at.to_date %>
|
||||||
<% else %>
|
<% end %>
|
||||||
<%= l @newsletter.sent_at.to_date %>
|
|
||||||
<% end %>
|
|
||||||
</div>
|
|
||||||
<div class="small-12 medium-6 column">
|
|
||||||
<strong><%= t("admin.newsletters.show.from") %></strong><br>
|
|
||||||
<%= @newsletter.from %>
|
|
||||||
</div>
|
|
||||||
<div class="small-12 medium-4 column">
|
|
||||||
<strong><%= t("admin.newsletters.show.subject") %></strong><br>
|
|
||||||
<%= @newsletter.subject %>
|
|
||||||
</div>
|
|
||||||
</div>
|
</div>
|
||||||
<div class="row margin-top">
|
<div class="small-12 medium-6 column">
|
||||||
<div class="small-12 column">
|
<strong><%= t("admin.newsletters.show.from") %></strong><br>
|
||||||
<strong><%= t("admin.newsletters.show.segment_recipient") %></strong><br>
|
<%= @newsletter.from %>
|
||||||
<%= segment_name(@newsletter.segment_recipient) %>
|
</div>
|
||||||
<%= t("admin.newsletters.show.affected_users", n: recipients_count) %>
|
<div class="small-12 medium-4 column">
|
||||||
</div>
|
<strong><%= t("admin.newsletters.show.subject") %></strong><br>
|
||||||
|
<%= @newsletter.subject %>
|
||||||
|
</div>
|
||||||
|
<div class="small-12 column">
|
||||||
|
<strong><%= t("admin.newsletters.show.segment_recipient") %></strong><br>
|
||||||
|
<%= segment_name(@newsletter.segment_recipient) %>
|
||||||
|
<%= t("admin.newsletters.show.affected_users", n: recipients_count) %>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<strong><%= t("admin.newsletters.show.body") %></strong>
|
<div class="small-12 column">
|
||||||
<p class="help-text" id="phase-description-help-text">
|
<strong><%= t("admin.newsletters.show.body") %></strong>
|
||||||
<%= t("admin.newsletters.show.body_help_text") %>
|
<p class="help-text" id="phase-description-help-text">
|
||||||
</p>
|
<%= t("admin.newsletters.show.body_help_text") %>
|
||||||
|
</p>
|
||||||
|
</div>
|
||||||
|
|
||||||
<div class="newsletter-body-content">
|
<div class="newsletter-body-content">
|
||||||
<%= render file: "app/views/layouts/_mailer_header.html.erb" %>
|
<%= render file: "app/views/layouts/_mailer_header.html.erb" %>
|
||||||
|
|
||||||
|
|||||||
@@ -5,7 +5,7 @@
|
|||||||
<tr>
|
<tr>
|
||||||
<th><%= t("admin.shared.title") %></th>
|
<th><%= t("admin.shared.title") %></th>
|
||||||
<th><%= t("admin.shared.description") %></th>
|
<th><%= t("admin.shared.description") %></th>
|
||||||
<th class="small-7 text-right"><%= t("admin.shared.actions") %></th>
|
<th class="small-7"><%= t("admin.shared.actions") %></th>
|
||||||
</tr>
|
</tr>
|
||||||
</thead>
|
</thead>
|
||||||
<tbody>
|
<tbody>
|
||||||
@@ -17,20 +17,26 @@
|
|||||||
<td>
|
<td>
|
||||||
<%= t("admin.system_emails.#{system_email_title}.description") %>
|
<%= t("admin.system_emails.#{system_email_title}.description") %>
|
||||||
</td>
|
</td>
|
||||||
<td class="text-right">
|
<td>
|
||||||
<% if system_email_actions.include?('view') %>
|
<% if system_email_actions.include?('view') %>
|
||||||
<%= link_to t("admin.shared.view"), admin_system_email_view_path(system_email_title),
|
<div class="small-4 column">
|
||||||
class: "button hollow" %>
|
<%= link_to t("admin.shared.view"), admin_system_email_view_path(system_email_title),
|
||||||
|
class: "button hollow expanded" %>
|
||||||
|
</div>
|
||||||
<% end %>
|
<% end %>
|
||||||
<% if system_email_actions.include?('preview_pending') %>
|
<% if system_email_actions.include?('preview_pending') %>
|
||||||
<%= link_to t("admin.system_emails.preview_pending.action"),
|
<div class="small-4 column">
|
||||||
admin_system_email_preview_pending_path(system_email_title),
|
<%= link_to t("admin.system_emails.preview_pending.action"),
|
||||||
class: "button" %>
|
admin_system_email_preview_pending_path(system_email_title),
|
||||||
|
class: "button expanded" %>
|
||||||
|
</div>
|
||||||
<% end %>
|
<% end %>
|
||||||
<%= link_to t("admin.system_emails.preview_pending.send_pending"),
|
<div class="small-4 column">
|
||||||
admin_system_email_send_pending_path(system_email_title),
|
<%= link_to t("admin.system_emails.preview_pending.send_pending"),
|
||||||
class: "button",
|
admin_system_email_send_pending_path(system_email_title),
|
||||||
method: :put %>
|
class: "button success expanded",
|
||||||
|
method: :put %>
|
||||||
|
</div>
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
<% end %>
|
<% end %>
|
||||||
|
|||||||
Reference in New Issue
Block a user