consul/grecia
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Unifies styles and views for admin sending of emails section

Browse Source
This commit is contained in:
decabeza
2018-07-19 17:29:43 +02:00
parent a72eb380a2
commit dd98375c67
6 changed files with 145 additions and 131 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
app/views/admin/admin_notifications/index.html.erb
View File

@@ -9,7 +9,7 @@
<th><%= t("admin.admin_notifications.index.title") %></th>
<th><%= t("admin.admin_notifications.index.segment_recipient") %></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>
</thead>
<tbody>
@@ -28,21 +28,29 @@
<%= l admin_notification.sent_at.to_date %>
<% end %>
</td>
<td class="text-right">
<td>
<% if admin_notification.draft? %>
<div class="small-4 column">
<%= link_to t("admin.admin_notifications.index.edit"),
edit_admin_admin_notification_path(admin_notification),
method: :get, class: "button hollow" %>
method: :get, class: "button expanded hollow" %>
</div>
<div class="small-4 column">
<%= link_to t("admin.admin_notifications.index.delete"),
admin_admin_notification_path(admin_notification),
method: :delete, class: "button hollow alert" %>
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" %>
class: "button expanded" %>
</div>
<% else %>
<div class="small-4 column">
<%= link_to t("admin.admin_notifications.index.view"),
admin_admin_notification_path(admin_notification),
class: "button" %>
class: "button expanded" %>
</div>
<% end %>
</td>
</tr>

18
app/views/admin/admin_notifications/show.html.erb
View File

@@ -2,9 +2,7 @@
<h2><%= t("admin.admin_notifications.show.section_title") %></h2>
<div class="small-12 column">
<div class="callout highlight">
<div class="row">
<div class="small-12 column callout highlight">
<div class="small-12 medium-6 column">
<strong><%= t("admin.admin_notifications.show.sent_at") %></strong><br>
<% if @admin_notification.draft? %>
@@ -13,23 +11,22 @@
<%= 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) %>
@@ -42,7 +39,6 @@
<% end %>
</div>
</div>
</div>
<p class="help-text" id="phase-description-help-text">
<% if @admin_notification.draft? %>
@@ -65,13 +61,15 @@
</ul>
</div>
<hr>
</div>
<% if @admin_notification.draft? && @admin_notification.valid_segment_recipient? %>
<div class="small-12 medium-6 large-3 column end">
<%= link_to t("admin.admin_notifications.show.send"),
deliver_admin_admin_notification_path(@admin_notification),
"data-alert": t("admin.admin_notifications.show.send_alert",
n: @admin_notification.list_of_recipients_count),
method: :post,
id: "js-send-admin_notification-alert",
class: "button success" %>
class: "button success expanded" %>
</div>
<% end %>

8
app/views/admin/emails_download/index.html.erb
View File

@@ -5,15 +5,13 @@
method: :get,
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">
<%= t('admin.emails_download.index.download_segment_help_text') %>
<%= t("admin.emails_download.index.download_segment_help_text") %>
</p>
<%= 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" %>
</div>
<%= submit_tag t("admin.emails_download.index.download_emails_button"), class: "button" %>
<% end %>
</div>

18
app/views/admin/newsletters/index.html.erb
View File

@@ -6,10 +6,10 @@
<table id="newsletters">
<thead>
<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.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>
</thead>
<tbody>
@@ -28,13 +28,19 @@
<%= l newsletter.sent_at.to_date %>
<% end %>
</td>
<td class="text-right">
<td>
<div class="small-4 column">
<%= 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),
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),
class: "button" %>
class: "button expanded" %>
</div>
</td>
</tr>
<% end %>

10
app/views/admin/newsletters/show.html.erb
View File

@@ -4,9 +4,7 @@
<% recipients_count = @newsletter.valid_segment_recipient? ? @newsletter.list_of_recipient_emails.count : 0 %>
<div class="small-12 column">
<div class="callout highlight">
<div class="row">
<div class="small-12 column callout highlight">
<div class="small-12 medium-2 column">
<strong><%= t("admin.newsletters.show.sent_at") %></strong><br>
<% if @newsletter.draft? %>
@@ -23,20 +21,20 @@
<strong><%= t("admin.newsletters.show.subject") %></strong><br>
<%= @newsletter.subject %>
</div>
</div>
<div class="row margin-top">
<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 class="small-12 column">
<strong><%= t("admin.newsletters.show.body") %></strong>
<p class="help-text" id="phase-description-help-text">
<%= t("admin.newsletters.show.body_help_text") %>
</p>
</div>
<div class="newsletter-body-content">
<%= render file: "app/views/layouts/_mailer_header.html.erb" %>

16
app/views/admin/system_emails/index.html.erb
View File

@@ -5,7 +5,7 @@
<tr>
<th><%= t("admin.shared.title") %></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>
</thead>
<tbody>
@@ -17,20 +17,26 @@
<td>
<%= t("admin.system_emails.#{system_email_title}.description") %>
</td>
<td class="text-right">
<td>
<% if system_email_actions.include?('view') %>
<div class="small-4 column">
<%= link_to t("admin.shared.view"), admin_system_email_view_path(system_email_title),
class: "button hollow" %>
class: "button hollow expanded" %>
</div>
<% end %>
<% if system_email_actions.include?('preview_pending') %>
<div class="small-4 column">
<%= link_to t("admin.system_emails.preview_pending.action"),
admin_system_email_preview_pending_path(system_email_title),
class: "button" %>
class: "button expanded" %>
</div>
<% end %>
<div class="small-4 column">
<%= link_to t("admin.system_emails.preview_pending.send_pending"),
admin_system_email_send_pending_path(system_email_title),
class: "button",
class: "button success expanded",
method: :put %>
</div>
</td>
</tr>
<% end %>