[#923] Removed <br> elements from auth forms, adjusted docs, minor auth settings refactoring.

This commit is contained in:
Ivan Tashkinov 2019-04-07 11:08:37 +03:00
commit e3328bc138
4 changed files with 16 additions and 17 deletions

View file

@ -31,12 +31,15 @@ defmodule Pleroma.Web.Auth.Authenticator do
@callback auth_template() :: String.t() | nil
def auth_template do
implementation().auth_template() || Pleroma.Config.get(:auth_template, "show.html")
# Note: `config :pleroma, :auth_template, "..."` support is deprecated
implementation().auth_template() ||
Pleroma.Config.get([:auth, :auth_template], Pleroma.Config.get(:auth_template)) ||
"show.html"
end
@callback oauth_consumer_template() :: String.t() | nil
def oauth_consumer_template do
implementation().oauth_consumer_template() ||
Pleroma.Config.get(:oauth_consumer_template, "consumer.html")
Pleroma.Config.get([:auth, :oauth_consumer_template], "consumer.html")
end
end

View file

@ -1,5 +1,3 @@
<br>
<br>
<h2>Sign in with external provider</h2>
<%= form_for @conn, o_auth_path(@conn, :prepare_request), [method: "get"], fn f -> %>

View file

@ -7,10 +7,7 @@
<h2>Registration Details</h2>
<p>If you'd like to register a new account,
<br>
please provide the details below.</p>
<br>
<p>If you'd like to register a new account, please provide the details below.</p>
<%= form_for @conn, o_auth_path(@conn, :register), [], fn f -> %>
@ -25,9 +22,6 @@ please provide the details below.</p>
<%= submit "Proceed as new user", name: "op", value: "register" %>
<br>
<br>
<br>
<p>Alternatively, sign in to connect to existing account.</p>
<div class="input">