<%= render "cards/container/image", card: card %>
diff --git a/app/views/cards/edit.html.erb b/app/views/cards/edit.html.erb
index a7efd21fe..1e81896a1 100644
--- a/app/views/cards/edit.html.erb
+++ b/app/views/cards/edit.html.erb
@@ -16,7 +16,7 @@
<% end %>
- <%= form.rich_textarea :description, class: "card__description rich-text-content",
+ <%= form.rich_textarea :description, class: "card__description lexxy-content",
placeholder: "Add some notes, context, pictures, or video about this…",
data: { local_save_target: "input", action: "lexxy:change->local-save#save turbo:morph-element->local-save#restoreContent keydown.ctrl+enter->form#submit:prevent keydown.meta+enter->form#submit:prevent keydown.esc->form#cancel:stop" } do %>
<%= general_prompts(@card.board) %>
diff --git a/app/views/cards/readings/create.turbo_stream.erb b/app/views/cards/readings/create.turbo_stream.erb
index 5d7fe7801..ebfcee900 100644
--- a/app/views/cards/readings/create.turbo_stream.erb
+++ b/app/views/cards/readings/create.turbo_stream.erb
@@ -1,3 +1 @@
-<% @notifications.each do |notification| %>
- <%= turbo_stream.remove notification %>
-<% end %>
+<%= turbo_stream.remove @notification if @notification %>
diff --git a/app/views/cards/show.html.erb b/app/views/cards/show.html.erb
index bfaa9c676..cf6d239db 100644
--- a/app/views/cards/show.html.erb
+++ b/app/views/cards/show.html.erb
@@ -9,6 +9,7 @@
+ <%= bridged_button_to_board(@card.board) %>
<% end %>
<%= turbo_stream_from @card %>
diff --git a/app/views/filters/_settings.html.erb b/app/views/filters/_settings.html.erb
index 66bbe3d54..d0a7d3d3e 100644
--- a/app/views/filters/_settings.html.erb
+++ b/app/views/filters/_settings.html.erb
@@ -1,4 +1,5 @@
<%= tag.details class: "expandable-on-native",
+ open: true,
data: {
controller: "expandable-on-native",
expandable_on_native_auto_expand_selector_value: "[data-filter-show=true]" } do %>
diff --git a/app/views/layouts/mailer.html.erb b/app/views/layouts/mailer.html.erb
index 51acf3ea0..40cf6191d 100644
--- a/app/views/layouts/mailer.html.erb
+++ b/app/views/layouts/mailer.html.erb
@@ -9,11 +9,12 @@
}
body {
+ color: #17233C;
font-family: system-ui, sans-serif;
font-size: 16px;
line-height: 1.3;
margin: 0;
- padding: 1rem;
+ padding: 16px;
}
img {
@@ -72,13 +73,13 @@
.footer {
border-top: 1px solid #ccc;
- margin-top: 3em;
+ margin-top: 32px;
padding-top: 1em;
}
.notification {
- margin-top: 1rem;
- margin-bottom: 1rem;
+ margin-top: 16px;
+ margin-bottom: 16px;
}
.notification__author {
@@ -88,12 +89,25 @@
}
.notification__board {
- font-size: 0.8em;
- font-weight: normal;
- margin-bottom: 0;
+ font-size: 1.4em;
+ font-weight: 900;
+ margin-bottom: 16px;
margin-top: 0;
- opacity: 0.66;
- text-transform: uppercase;
+ }
+
+ .notification__board a {
+ color: #17233C;
+ text-decoration: none;
+ }
+
+ .notification__board a:hover {
+ text-decoration: underline;
+ }
+
+ .notification__board-separator {
+ border: none;
+ border-top: 1px solid #ddd;
+ margin: 2em 0 1em;
}
.notification__details {
diff --git a/app/views/mailers/import_mailer/failed.html.erb b/app/views/mailers/import_mailer/failed.html.erb
index c7b6d9b5c..6aa9fab0a 100644
--- a/app/views/mailers/import_mailer/failed.html.erb
+++ b/app/views/mailers/import_mailer/failed.html.erb
@@ -1,8 +1,11 @@
Unfortunately, we couldn't import your Fizzy account.
-
-This may be due to corrupted export data or a conflict with existing data.
-Please try again with a fresh export, or reach out for help if the problem persists.
-
+<% if @import.failed_due_to_conflict? %>
+
It looks like the account you are trying to import already exists.
+<% elsif @import.failed_due_to_invalid_export? %>
+
The ZIP file isn't a Fizzy account export.
+<% else %>
+
This may be due to corrupted export data or a conflict with existing data. Please try again with a fresh export, or reach out for help if the problem persists.
+<% end %>
diff --git a/app/views/mailers/import_mailer/failed.text.erb b/app/views/mailers/import_mailer/failed.text.erb
index 82e3b772a..1895f0d5d 100644
--- a/app/views/mailers/import_mailer/failed.text.erb
+++ b/app/views/mailers/import_mailer/failed.text.erb
@@ -1,6 +1,11 @@
Unfortunately, we couldn't import your Fizzy account.
-This may be due to corrupted export data or a conflict with existing data.
-Please try again with a fresh export, or reach out for help if the problem persists.
+<% if @import.failed_due_to_conflict? -%>
+It looks like the account you are trying to import already exists.
+<% elsif @import.failed_due_to_invalid_export? -%>
+The ZIP file isn't a Fizzy account export.
+<% else -%>
+This may be due to corrupted export data or a conflict with existing data. Please try again with a fresh export, or reach out for help if the problem persists.
+<% end -%>
Need help? Send us an email at support@fizzy.do
diff --git a/app/views/mailers/notification/bundle_mailer/notification.html.erb b/app/views/mailers/notification/bundle_mailer/notification.html.erb
index e1fec4895..1545f8598 100644
--- a/app/views/mailers/notification/bundle_mailer/notification.html.erb
+++ b/app/views/mailers/notification/bundle_mailer/notification.html.erb
@@ -5,10 +5,13 @@
You have <%= link_to pluralize(@notifications.count, "new notification"), notifications_url %><%= " in #{ Current.account.name }" if @user.identity.accounts.many? %>.
- <% @notifications.group_by(&:card).each do |card, notifications| %>
-
<%= card.board.name %>
- <%= link_to "##{ card.number } #{ card.title }", card, class: "card__title" %>
- <%= render partial: "notification/bundle_mailer/notification", collection: notifications, as: :notification %>
+ <% @notifications.group_by { |n| n.card.board }.sort_by { |board, _| board.name.downcase }.each do |board, board_notifications| %>
+
+
<%= link_to board.name, board %>
+ <% board_notifications.group_by(&:card).each do |card, notifications| %>
+ <%= link_to card, class: "card__title" do %>#<%= card.number %> <%= card_html_title(card) %><% end %>
+ <%= render partial: "notification/bundle_mailer/notification", collection: notifications, as: :notification %>
+ <% end %>
<% end %>
diff --git a/app/views/notifications/index.json.jbuilder b/app/views/notifications/index.json.jbuilder
index 660bbb673..e8d9a93ed 100644
--- a/app/views/notifications/index.json.jbuilder
+++ b/app/views/notifications/index.json.jbuilder
@@ -1 +1 @@
-json.array! (@unread || []) + @page.records, partial: "notifications/notification", as: :notification
+json.array! (@unread || []) + @page.records, partial: "notifications/notification", as: :notification, cached: true
diff --git a/app/views/notifications/index/_notification.html.erb b/app/views/notifications/index/_notification.html.erb
deleted file mode 100644
index 90f3d45eb..000000000
--- a/app/views/notifications/index/_notification.html.erb
+++ /dev/null
@@ -1,6 +0,0 @@
-<%= notification_tag notification do %>
- <%= render "notifications/notification/header", notification: notification do %>
- <%= notification_toggle_read_button(notification, url: notification_reading_path(notification)) %>
- <% end %>
- <%= render "notifications/notification/body", notification: notification %>
-<% end %>
diff --git a/app/views/notifications/index/_read_notifications.html.erb b/app/views/notifications/index/_read_notifications.html.erb
index 04c2e3c48..c73d1d3c2 100644
--- a/app/views/notifications/index/_read_notifications.html.erb
+++ b/app/views/notifications/index/_read_notifications.html.erb
@@ -3,7 +3,7 @@
Previously seen
- <%= render partial: "notifications/index/notification", collection: page.records, cached: true %>
+ <%= render partial: "notifications/notification", collection: page.records, cached: true %>
<% end %>
diff --git a/app/views/notifications/index/_unread_notifications.html.erb b/app/views/notifications/index/_unread_notifications.html.erb
index 4890a4822..fed57dbb9 100644
--- a/app/views/notifications/index/_unread_notifications.html.erb
+++ b/app/views/notifications/index/_unread_notifications.html.erb
@@ -11,12 +11,12 @@
<% end %>
- <%= render partial: "notifications/index/notification", collection: unread, cached: true %>
+ <%= render partial: "notifications/notification", collection: unread, cached: true %>
<% if unread.any? %>
<% total_unread_count = Current.user.notifications.unread.count %>
- <% if Current.user.notifications.unread.count > NotificationsController::MAX_UNREAD_NOTIFICATIONS %>
+ <% if total_unread_count > NotificationsController::MAX_UNREAD_NOTIFICATIONS %>
Showing the <%= NotificationsController::MAX_UNREAD_NOTIFICATIONS %> most recent (<%= total_unread_count - NotificationsController::MAX_UNREAD_NOTIFICATIONS %> are hidden)
diff --git a/app/views/notifications/settings/_browser.html.erb b/app/views/notifications/settings/_browser.html.erb
index 67d86acfd..bc196d535 100644
--- a/app/views/notifications/settings/_browser.html.erb
+++ b/app/views/notifications/settings/_browser.html.erb
@@ -2,18 +2,18 @@
<% case
when platform.firefox? && platform.android? %>
-
Turn on notifications for <%= platform.browser.capitalize %>.
+
Turn on notifications for <%= platform.browser.capitalize %>.
- Tap <%= icon_tag "lock", alt: "the View site information button" %> in the address bar.
- Tap Notification to change to Allowed.
<% when platform.edge? && platform.desktop? %>
-
Turn on notifications for this website.
+
Turn on notifications for this website.
- Click <%= icon_tag "lock", alt: "the View site information button" %> left of the address bar.
- Under Permissions for this site > Notifications, choose Allow.
-
Turn on notifications for <%= platform.browser.capitalize %>.
+
Turn on notifications for <%= platform.browser.capitalize %>.
<% if platform.windows? %>
- Click Start, then Settings.
@@ -21,24 +21,24 @@
- Click <%= icon_tag "switch", alt: "the switch" %> ON for <%= platform.browser.capitalize %>.
<% else %>
- Click in the top left.
- - Click System Settings….
+ - Click System Settings…
- Click Notifications.
- Click <%= platform.browser.capitalize %>.
- Click <%= icon_tag "switch", alt: "the switch" %> to Allow notifications.
<% end %>
<% when platform.firefox? && platform.desktop? %>
-
Turn on notifications for this website.
+
Turn on notifications for this website.
- Click <%= platform.browser.capitalize %> in the top left.
- - Click Settings….
+ - Click Settings…
- Click Privacy & Security in the sidebar.
- Scroll down to Permissions.
- Click Settings next to Notifications.
- Select Allow next to <%= root_url %>.
-
Turn on notifications for <%= platform.browser.capitalize %>.
+
Turn on notifications for <%= platform.browser.capitalize %>.
<% if platform.windows? %>
- Click Start, then Settings.
@@ -46,21 +46,21 @@
- Click <%= icon_tag "switch", alt: "the toggle button" %> ON for <%= platform.browser.capitalize %>.
<% else %>
- Click in the top left.
- - Click System Settings….
+ - Click System Settings…
- Click Notifications.
- Click <%= platform.browser.capitalize %>.
- Click <%= icon_tag "switch", alt: "the switch" %> to Allow notifications.
<% end %>
<% when platform.chrome? && platform.desktop? %>
-
Turn on notifications for this website.
+
Turn on notifications for this website.
- Click the <%= icon_tag "sliders", alt: "View site information" %> icon in the address bar.
- Click Site Settings.
- Ensure notifications are Allowed.
-
Turn on notifications for <%= platform.browser.capitalize %>.
+
Turn on notifications for <%= platform.browser.capitalize %>.
<% if platform.windows? %>
- Click Start, then Settings.
@@ -68,14 +68,14 @@
- Click <%= icon_tag "switch", alt: "the switch" %> ON for <%= platform.browser.capitalize %>.
<% else %>
- Click in the top left.
- - Click System Settings….
+ - Click System Settings…
- Click Notifications.
- Click <%= platform.browser == "Chrome" ? "Google Chrome" : platform.browser.capitalize %>.
- Click <%= icon_tag "switch", alt: "the switch" %> to Allow notifications.
<% end %>
<% when platform.chrome? && platform.android? %>
-
Turn on notifications for <%= platform.browser.capitalize %>.
+
Turn on notifications for <%= platform.browser.capitalize %>.
- Tap the <%= icon_tag "menu-dots-vertical", alt: "More options" %> menu button.
- Tap Settings.
@@ -85,18 +85,18 @@
- Tap <%= icon_tag "bell-alert", alt: "the notification bell" %> and select Allow.
<% when platform.safari? && platform.desktop? %>
-
Turn on notifications for this website.
+
Turn on notifications for this website.
- Click in the top left.
- - Click System Settings….
+ - Click System Settings…
- Click Notifications.
- Click <%= request.base_url %> in the list.
- Click <%= icon_tag "switch", alt: "the switch" %> to Allow notifications.
-
Turn on notifications for <%= platform.browser.capitalize %>.
+
Turn on notifications for <%= platform.browser.capitalize %>.
- Click <%= platform.browser.capitalize %> in the top left.
- - Click Settings….
+ - Click Settings…
- Click the Websites tab.
- Click Notifications in the sidebar.
- Click <%= request.base_url %> in the list.
diff --git a/app/views/notifications/settings/_install.html.erb b/app/views/notifications/settings/_install.html.erb
index f8d664043..4c2f0d1ca 100644
--- a/app/views/notifications/settings/_install.html.erb
+++ b/app/views/notifications/settings/_install.html.erb
@@ -1,6 +1,6 @@
<% unless (platform.chrome? && !platform.ios?) || (platform.firefox? && !platform.android?) %>
-
<%= platform.safari? && platform.desktop? ? "…or install" : "Install " -%> Fizzy as a web app.
+
<%= platform.safari? && platform.desktop? ? "…or install" : "Install " -%> Fizzy as a web app.
<% case
when platform.edge? %>
@@ -20,7 +20,7 @@
<% when platform.safari? && platform.desktop? %>
- Click File in the top left.
- - Click Add to Dock….
+ - Click Add to Dock…
<% when (platform.safari? || platform.chrome?) && platform.ios? %>
To receive push notifications in <%= platform.browser.capitalize %> for <%= platform.operating_system %>, you must first install Fizzy as a web app.
diff --git a/app/views/notifications/settings/_system.html.erb b/app/views/notifications/settings/_system.html.erb
index afe0efd45..7630680d7 100644
--- a/app/views/notifications/settings/_system.html.erb
+++ b/app/views/notifications/settings/_system.html.erb
@@ -1,5 +1,5 @@
-
Check your <%= platform.operating_system %> settings
+
Check your <%= platform.operating_system %> settings
<% case
when platform.firefox? && platform.android? %>
@@ -22,7 +22,7 @@
- Click <%= icon_tag "switch", alt: "the toggle button" %> ON for Fizzy.
<% else %>
- Click in the top left.
- - Click System Settings….
+ - Click System Settings…
- Click Notifications.
- Click Fizzy.
- Click <%= icon_tag "switch", alt: "the allow notifications switch" %> to Allow notifications.
@@ -31,7 +31,7 @@
<% when platform.safari? && platform.desktop? %>
- Click in the top left.
- - Click System Settings….
+ - Click System Settings…
- Click Notifications.
- Click Fizzy.
- Click <%= icon_tag "switch", alt: "the allow notifications switch" %> to Allow notifications.
diff --git a/app/views/notifications/trays/show.html.erb b/app/views/notifications/trays/show.html.erb
index 278d97a4d..f61c52d51 100644
--- a/app/views/notifications/trays/show.html.erb
+++ b/app/views/notifications/trays/show.html.erb
@@ -1,4 +1,3 @@
<%= turbo_frame_tag "notifications" do %>
<%= render partial: "notifications/notification", collection: @notifications, cached: true %>
-
<% end %>
diff --git a/app/views/public/boards/show.html.erb b/app/views/public/boards/show.html.erb
index b73a17050..c4bd75861 100644
--- a/app/views/public/boards/show.html.erb
+++ b/app/views/public/boards/show.html.erb
@@ -20,7 +20,7 @@
<% end %>
<% if @board.public_description.present? %>
-
+
<%= @board.public_description %>
<% end %>
diff --git a/app/views/public/cards/show/_content.html.erb b/app/views/public/cards/show/_content.html.erb
index cbdf7603f..eb3ccd044 100644
--- a/app/views/public/cards/show/_content.html.erb
+++ b/app/views/public/cards/show/_content.html.erb
@@ -1,8 +1,8 @@
- <%= tag.span card.title, class: "card__title-link" %>
+ <%= tag.span card_html_title(card), class: "card__title-link" %>
-
+
<%= card.description %>
diff --git a/app/views/sessions/menus/show.html.erb b/app/views/sessions/menus/show.html.erb
index 914f35f32..fa84a579d 100644
--- a/app/views/sessions/menus/show.html.erb
+++ b/app/views/sessions/menus/show.html.erb
@@ -14,7 +14,7 @@
<% end %>
diff --git a/app/views/users/_data_export.html.erb b/app/views/users/_data_export.html.erb
index 566d41f0b..46e964483 100644
--- a/app/views/users/_data_export.html.erb
+++ b/app/views/users/_data_export.html.erb
@@ -10,7 +10,7 @@