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

diff --git a/docs/config.md b/docs/config.md
index 36d7f1273ce05e435bee3854b432f9f22e681ed2..686f1f36b063ac99e74a3f91f53fafa58b0e3e93 100644 (file)
--- a/docs/config.md
+++ b/docs/config.md
@@ -390,6 +390,11 @@ config :auto_linker,
   ]
 ```
 
   ]
 ```
 

+## Pleroma.Web.Auth.Authenticator
+
+* `Pleroma.Web.Auth.PleromaAuthenticator`: default database authenticator
+* `Pleroma.Web.Auth.LDAPAuthenticator`: LDAP authentication
+

 ## :ldap
 
 Use LDAP for user authentication.  When a user logs in to the Pleroma
 ## :ldap
 
 Use LDAP for user authentication.  When a user logs in to the Pleroma


@@ -408,16 +413,15 @@ Pleroma account will be created with the same name as the LDAP user name.
 * `base`: LDAP base, e.g. "dc=example,dc=com"
 * `uid`: LDAP attribute name to authenticate the user, e.g. when "cn", the filter will be "cn=username,base"
 
 * `base`: LDAP base, e.g. "dc=example,dc=com"
 * `uid`: LDAP attribute name to authenticate the user, e.g. when "cn", the filter will be "cn=username,base"
 

-## Pleroma.Web.Auth.Authenticator
-
-* `Pleroma.Web.Auth.PleromaAuthenticator`: default database authenticator
-* `Pleroma.Web.Auth.LDAPAuthenticator`: LDAP authentication
-

 ## :auth
 
 Authentication / authorization settings.
 
 ## :auth
 
 Authentication / authorization settings.
 

-* `oauth_consumer_strategies`: lists enabled OAuth consumer strategies; by default it's set by OAUTH_CONSUMER_STRATEGIES environment variable.
+* `auth_template`: authentication form template. By default it's `show.html` which corresponds to `lib/pleroma/web/templates/o_auth/o_auth/show.html.eex`. 
+* `oauth_consumer_template`: OAuth consumer mode authentication form template. By default it's `consumer.html` which corresponds to `lib/pleroma/web/templates/o_auth/o_auth/consumer.html.eex`.
+* `oauth_consumer_strategies`: the list of enabled OAuth consumer strategies; by default it's set by OAUTH_CONSUMER_STRATEGIES environment variable.
+
+# OAuth consumer mode

 
 OAuth consumer mode allows sign in / sign up via external OAuth providers (e.g. Twitter, Facebook, Google, Microsoft, etc.).
 Implementation is based on Ueberauth; see the list of [available strategies](https://github.com/ueberauth/ueberauth/wiki/List-of-Strategies).
 
 OAuth consumer mode allows sign in / sign up via external OAuth providers (e.g. Twitter, Facebook, Google, Microsoft, etc.).
 Implementation is based on Ueberauth; see the list of [available strategies](https://github.com/ueberauth/ueberauth/wiki/List-of-Strategies).

diff --git a/lib/pleroma/web/auth/authenticator.ex b/lib/pleroma/web/auth/authenticator.ex
index 4eeef5034d90a5f16435555ea3adec9fd0f10cc7..89d88af3299a018763d0dd81aee19f4810f3e47c 100644 (file)
--- a/lib/pleroma/web/auth/authenticator.ex
+++ b/lib/pleroma/web/auth/authenticator.ex
@@ -31,12 +31,15 @@ defmodule Pleroma.Web.Auth.Authenticator do
 
   @callback auth_template() :: String.t() | nil
   def auth_template 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() ||
   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
   end
 end

diff --git a/lib/pleroma/web/templates/o_auth/o_auth/consumer.html.eex b/lib/pleroma/web/templates/o_auth/o_auth/consumer.html.eex
index 9365c7c441b714d9134ffd6bb280882522ef7814..85f62ca640c08161392c36eeb6d53bf418a34fa5 100644 (file)
--- a/lib/pleroma/web/templates/o_auth/o_auth/consumer.html.eex
+++ b/lib/pleroma/web/templates/o_auth/o_auth/consumer.html.eex
@@ -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 -> %>
 <h2>Sign in with external provider</h2>
 
 <%= form_for @conn, o_auth_path(@conn, :prepare_request), [method: "get"], fn f -> %>

diff --git a/lib/pleroma/web/templates/o_auth/o_auth/register.html.eex b/lib/pleroma/web/templates/o_auth/o_auth/register.html.eex
index 2e806e5fbf9cb151989e239e8fa830615fe1e1f9..126390391e04ab9fadd6df8be2fa7456d55fef37 100644 (file)
--- a/lib/pleroma/web/templates/o_auth/o_auth/register.html.eex
+++ b/lib/pleroma/web/templates/o_auth/o_auth/register.html.eex
@@ -7,10 +7,7 @@
 
 <h2>Registration Details</h2>
 
 
 <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 -> %>
 
 
 <%= 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" %>
 
 
 <%= 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">
 <p>Alternatively, sign in to connect to existing account.</p>
 
 <div class="input">