alyssa
/
pleroma
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Render errors in HTML, not with JS.

This commit is contained in:
Phil Hagelberg 2019-11-05 22:00:19 -08:00
parent e27c61218d
commit b0080fa730
3 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/pleroma/web/static_fe/static_fe_controller.ex
View File

@ -78,7 +78,7 @@ def show(%{assigns: %{notice_id: notice_id}} = conn, _params) do
_ -> _ ->
conn conn
|> put_status(404) |> put_status(404)
|> render_error(:not_found, "Notice not found") |> render("error.html", %{message: "Post not found.", meta: ""})
end end
end end
@ -108,7 +108,7 @@ def show(%{assigns: %{username_or_id: username_or_id}} = conn, params) do
_ -> _ ->
conn conn
|> put_status(404) |> put_status(404)
|> render_error(:not_found, "User not found") |> render("error.html", %{message: "User not found.", meta: ""})
end end
end end

2
lib/pleroma/web/templates/layout/static_fe.html.eex
View File

@ -4,7 +4,7 @@
<meta charset="utf-8" /> <meta charset="utf-8" />
<meta name="viewport" content="width=device-width,initial-scale=1,minimal-ui" /> <meta name="viewport" content="width=device-width,initial-scale=1,minimal-ui" />
<title><%= Pleroma.Config.get([:instance, :name]) %></title> <title><%= Pleroma.Config.get([:instance, :name]) %></title>
<%= Phoenix.HTML.raw(@meta || "") %> <%= Phoenix.HTML.raw(assigns[:meta] || "") %>
<link rel="stylesheet" href="/static/static-fe.css"> <link rel="stylesheet" href="/static/static-fe.css">
</head> </head>
<body> <body>

7
lib/pleroma/web/templates/static_fe/static_fe/error.html.eex Normal file
View File

@ -0,0 +1,7 @@
<header>
<h1><%= gettext("Oops") %></h1>
</header>
<main>
<p><%= @message %></p>
</main>