diff --git a/app/views/admin/admin_notifications/index.html.erb b/app/views/admin/admin_notifications/index.html.erb index d16ee476e..986f1c077 100644 --- a/app/views/admin/admin_notifications/index.html.erb +++ b/app/views/admin/admin_notifications/index.html.erb @@ -9,7 +9,7 @@ <%= t("admin.admin_notifications.index.title") %> <%= t("admin.admin_notifications.index.segment_recipient") %> <%= t("admin.admin_notifications.index.sent") %> - <%= t("admin.admin_notifications.index.actions") %> + <%= t("admin.admin_notifications.index.actions") %> @@ -28,21 +28,29 @@ <%= l admin_notification.sent_at.to_date %> <% end %> - + <% if admin_notification.draft? %> - <%= link_to t("admin.admin_notifications.index.edit"), - edit_admin_admin_notification_path(admin_notification), - method: :get, class: "button hollow" %> - <%= link_to t("admin.admin_notifications.index.delete"), - admin_admin_notification_path(admin_notification), - method: :delete, class: "button hollow alert" %> - <%= link_to t("admin.admin_notifications.index.preview"), - admin_admin_notification_path(admin_notification), - class: "button" %> +
+ <%= link_to t("admin.admin_notifications.index.edit"), + edit_admin_admin_notification_path(admin_notification), + method: :get, class: "button expanded hollow" %> +
+
+ <%= link_to t("admin.admin_notifications.index.delete"), + admin_admin_notification_path(admin_notification), + method: :delete, class: "button expanded hollow alert" %> +
+
+ <%= link_to t("admin.admin_notifications.index.preview"), + admin_admin_notification_path(admin_notification), + class: "button expanded" %> +
<% else %> - <%= link_to t("admin.admin_notifications.index.view"), - admin_admin_notification_path(admin_notification), - class: "button" %> +
+ <%= link_to t("admin.admin_notifications.index.view"), + admin_admin_notification_path(admin_notification), + class: "button expanded" %> +
<% end %> diff --git a/app/views/admin/admin_notifications/show.html.erb b/app/views/admin/admin_notifications/show.html.erb index 92c0e37fc..77296e3ed 100644 --- a/app/views/admin/admin_notifications/show.html.erb +++ b/app/views/admin/admin_notifications/show.html.erb @@ -2,76 +2,74 @@

<%= t("admin.admin_notifications.show.section_title") %>

-
-
-
-
- <%= t("admin.admin_notifications.show.sent_at") %>
- <% if @admin_notification.draft? %> - <%= t("admin.admin_notifications.index.draft") %> - <% else %> - <%= l(@admin_notification.sent_at.to_date) %> - <% end %> -
-
- <%= t("admin.admin_notifications.show.title") %>
- <%= @admin_notification.title %> -
-
-
- -
- <%= t("admin.admin_notifications.show.body") %>
- <%= @admin_notification.body %> -
-
- <%= t("admin.admin_notifications.show.link") %>
- <%= @admin_notification.link %> -
-
-
-
- <%= t("admin.admin_notifications.show.segment_recipient") %>
- <%= 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 %> -
-
-
- -

+

+
+ <%= t("admin.admin_notifications.show.sent_at") %>
<% if @admin_notification.draft? %> - <%= t("admin.admin_notifications.show.preview_guide") %> + <%= t("admin.admin_notifications.index.draft") %> <% else %> - <%= t("admin.admin_notifications.show.sent_guide") %> + <%= l(@admin_notification.sent_at.to_date) %> + <% end %> +
+ +
+ <%= t("admin.admin_notifications.show.title") %>
+ <%= @admin_notification.title %> +
+ +
+ <%= t("admin.admin_notifications.show.body") %>
+ <%= @admin_notification.body %> +
+ +
+ <%= t("admin.admin_notifications.show.link") %>
+ <%= @admin_notification.link %> +
+ +
+ <%= t("admin.admin_notifications.show.segment_recipient") %>
+ <%= 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 %> -

-
-
-
    -
  • - <% 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 %> -
  • -
-
+ +

+ <% if @admin_notification.draft? %> + <%= t("admin.admin_notifications.show.preview_guide") %> + <% else %> + <%= t("admin.admin_notifications.show.sent_guide") %> + <% end %> +

+
+
+
    +
  • + <% 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 %> +
  • +
+
+
+ <% if @admin_notification.draft? && @admin_notification.valid_segment_recipient? %> - <%= 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" %> +
+ <%= 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 expanded" %> +
<% end %> diff --git a/app/views/admin/emails_download/index.html.erb b/app/views/admin/emails_download/index.html.erb index 7c82a6844..a8283bbc2 100644 --- a/app/views/admin/emails_download/index.html.erb +++ b/app/views/admin/emails_download/index.html.erb @@ -5,15 +5,13 @@ method: :get, id: "admin_download_emails" do %> - +

- <%= t('admin.emails_download.index.download_segment_help_text') %> + <%= t("admin.emails_download.index.download_segment_help_text") %>

<%= select_tag :users_segment, options_for_select(user_segments_options) %> -
- <%= submit_tag t('admin.emails_download.index.download_emails_button'), class: "button" %> -
+ <%= submit_tag t("admin.emails_download.index.download_emails_button"), class: "button" %> <% end %>
diff --git a/app/views/admin/newsletters/index.html.erb b/app/views/admin/newsletters/index.html.erb index 00a94e336..5fcd2d967 100644 --- a/app/views/admin/newsletters/index.html.erb +++ b/app/views/admin/newsletters/index.html.erb @@ -6,10 +6,10 @@ - + - + @@ -28,13 +28,19 @@ <%= l newsletter.sent_at.to_date %> <% end %> - <% end %> diff --git a/app/views/admin/newsletters/show.html.erb b/app/views/admin/newsletters/show.html.erb index 64b1d7725..c6b043c12 100644 --- a/app/views/admin/newsletters/show.html.erb +++ b/app/views/admin/newsletters/show.html.erb @@ -4,39 +4,37 @@ <% recipients_count = @newsletter.valid_segment_recipient? ? @newsletter.list_of_recipient_emails.count : 0 %> -
-
-
-
- <%= t("admin.newsletters.show.sent_at") %>
- <% if @newsletter.draft? %> - <%= t("admin.newsletters.index.draft") %> - <% else %> - <%= l @newsletter.sent_at.to_date %> - <% end %> -
-
- <%= t("admin.newsletters.show.from") %>
- <%= @newsletter.from %> -
-
- <%= t("admin.newsletters.show.subject") %>
- <%= @newsletter.subject %> -
+
+
+ <%= t("admin.newsletters.show.sent_at") %>
+ <% if @newsletter.draft? %> + <%= t("admin.newsletters.index.draft") %> + <% else %> + <%= l @newsletter.sent_at.to_date %> + <% end %>
-
-
- <%= t("admin.newsletters.show.segment_recipient") %>
- <%= segment_name(@newsletter.segment_recipient) %> - <%= t("admin.newsletters.show.affected_users", n: recipients_count) %> -
+
+ <%= t("admin.newsletters.show.from") %>
+ <%= @newsletter.from %> +
+
+ <%= t("admin.newsletters.show.subject") %>
+ <%= @newsletter.subject %> +
+
+ <%= t("admin.newsletters.show.segment_recipient") %>
+ <%= segment_name(@newsletter.segment_recipient) %> + <%= t("admin.newsletters.show.affected_users", n: recipients_count) %>
- <%= t("admin.newsletters.show.body") %> -

- <%= t("admin.newsletters.show.body_help_text") %> -

+
+ <%= t("admin.newsletters.show.body") %> +

+ <%= t("admin.newsletters.show.body_help_text") %> +

+
+
- + @@ -17,20 +17,26 @@ - <% end %>
<%= t("admin.newsletters.index.subject") %><%= t("admin.newsletters.index.subject") %> <%= t("admin.newsletters.index.segment_recipient") %> <%= t("admin.newsletters.index.sent") %><%= t("admin.newsletters.index.actions") %><%= t("admin.newsletters.index.actions") %>
+ +
<%= link_to t("admin.newsletters.index.edit"), edit_admin_newsletter_path(newsletter), - method: :get, class: "button hollow" %> + method: :get, class: "button hollow expanded" %> +
+
<%= link_to t("admin.newsletters.index.delete"), admin_newsletter_path(newsletter), - method: :delete, class: "button hollow alert" %> + method: :delete, class: "button hollow alert expanded" %> +
+
<%= link_to t("admin.newsletters.index.preview"), admin_newsletter_path(newsletter), - class: "button" %> + class: "button expanded" %> +
<%= t("admin.shared.title") %> <%= t("admin.shared.description") %><%= t("admin.shared.actions") %><%= t("admin.shared.actions") %>
<%= t("admin.system_emails.#{system_email_title}.description") %> + <% if system_email_actions.include?('view') %> - <%= link_to t("admin.shared.view"), admin_system_email_view_path(system_email_title), - class: "button hollow" %> +
+ <%= link_to t("admin.shared.view"), admin_system_email_view_path(system_email_title), + class: "button hollow expanded" %> +
<% end %> <% if system_email_actions.include?('preview_pending') %> - <%= link_to t("admin.system_emails.preview_pending.action"), - admin_system_email_preview_pending_path(system_email_title), - class: "button" %> +
+ <%= link_to t("admin.system_emails.preview_pending.action"), + admin_system_email_preview_pending_path(system_email_title), + class: "button expanded" %> +
<% end %> - <%= link_to t("admin.system_emails.preview_pending.send_pending"), - admin_system_email_send_pending_path(system_email_title), - class: "button", - method: :put %> +
+ <%= link_to t("admin.system_emails.preview_pending.send_pending"), + admin_system_email_send_pending_path(system_email_title), + class: "button success expanded", + method: :put %> +