From 644754f48cb89743624b7bae4cf6f1992bb58305 Mon Sep 17 00:00:00 2001 From: Guillermo Ramos Date: Wed, 12 Feb 2020 09:55:11 +0100 Subject: Preserve newlines --- lib/waev_web/templates/exports/show.html.eex | 2 +- lib/waev_web/views/exports_view.ex | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/lib/waev_web/templates/exports/show.html.eex b/lib/waev_web/templates/exports/show.html.eex index 15a1360..052ced8 100644 --- a/lib/waev_web/templates/exports/show.html.eex +++ b/lib/waev_web/templates/exports/show.html.eex @@ -26,7 +26,7 @@ <% _ -> %> <% end %> -
<%= highlight_urls(message.text) %>
+
<%= message.text |> highlight_urls() |> nl_to_br() %>
<%= message.date %>
diff --git a/lib/waev_web/views/exports_view.ex b/lib/waev_web/views/exports_view.ex index f0cfa0d..d4b8a11 100644 --- a/lib/waev_web/views/exports_view.ex +++ b/lib/waev_web/views/exports_view.ex @@ -39,6 +39,11 @@ defmodule WaevWeb.ExportsView do end) end + def nl_to_br(text) do + String.replace(text, "\n", "
") + |> raw() + end + def pagination_bar(assigns, page, size) do prev = if page == 0, do: 0, else: page - 1 # TODO max -- cgit v1.2.3