From 8c0e2168dffde8a6091be5da870a5aee5d99b943 Mon Sep 17 00:00:00 2001 From: Ryan Lerch Date: Mar 15 2021 10:27:24 +0000 Subject: Update fedora theme This updates the fedora theme for ipsilon, removing references to FAS, and replacing with Fedora Accounts. Also adds themes for OIDC, and a redo of most of the templates. Signed-off-by: Ryan Lerch --- diff --git a/setup.py b/setup.py index 02d6c6c..2d1e52e 100755 --- a/setup.py +++ b/setup.py @@ -77,6 +77,8 @@ setup( glob('themes/Fedora/templates/openid/*.html')), (DATA+'themes/Fedora/templates/openid', glob('themes/Fedora/templates/openid/*.xml')), + (DATA+'themes/Fedora/templates/openidc', + glob('themes/Fedora/templates/openidc/*.html')), (DATA+'themes/Fedora/templates/persona', glob('themes/Fedora/templates/persona/*.html')), (DATA+'themes/openSUSE/res', diff --git a/themes/Fedora/res/fedora-authn-logo-white.png b/themes/Fedora/res/fedora-authn-logo-white.png index 555fe59..a3b8ae0 100644 Binary files a/themes/Fedora/res/fedora-authn-logo-white.png and b/themes/Fedora/res/fedora-authn-logo-white.png differ diff --git a/themes/Fedora/res/login.css b/themes/Fedora/res/login.css index 58eda39..f284974 100644 --- a/themes/Fedora/res/login.css +++ b/themes/Fedora/res/login.css @@ -1,7 +1,14 @@ -html, body, .bodycontent { - height: 100vh; - max-width: 100vw; - margin: 0; - display: flex; - flex-flow: column; +.masthead{ + border-bottom: 1px solid #ccc; + box-shadow: 0 0 10px 2px #ddd; + position: relative; +} + +.min-height-50{ + min-height: 50vh; +} + +.footer a{ + color:rgba(255,255,255,0.5); + border-bottom: 1px dotted rgba(255,255,255,0.2) } diff --git a/themes/Fedora/res/redhat.png b/themes/Fedora/res/redhat.png new file mode 100644 index 0000000..5215f5c Binary files /dev/null and b/themes/Fedora/res/redhat.png differ diff --git a/themes/Fedora/templates/badrequest.html b/themes/Fedora/templates/badrequest.html new file mode 100644 index 0000000..96e895c --- /dev/null +++ b/themes/Fedora/templates/badrequest.html @@ -0,0 +1,10 @@ +{% extends "layout.html" %} +{% block maincontent %} +

400 - Bad Request

+{% if message: %} +

{{ message }}

+{% else %} +

Your client made a request that could not be understood.

+{% endif %} +

If the error persists and if you think this is an error, contact Fedora Infra to resolve the problem.

+{% endblock %} diff --git a/themes/Fedora/templates/index.html b/themes/Fedora/templates/index.html index 1385877..4a2fa98 100644 --- a/themes/Fedora/templates/index.html +++ b/themes/Fedora/templates/index.html @@ -1,7 +1,11 @@ {% extends "layout.html" %} -{% block maintitle %} -Federated Open Authentication -{% endblock %} -{% block main %} -You will be redirected to this application whenever another application requires you to authenticate. +{% block maincontent %} +

Nothing to Authenticate

+

+ You will be redirected to this service when an application requires authentication against your Fedora Account +

+

+ Visit Fedora Accounts to create or modify your Fedora Account +

{% endblock %} + diff --git a/themes/Fedora/templates/internalerror.html b/themes/Fedora/templates/internalerror.html index 4c7f6d0..d9c7267 100644 --- a/themes/Fedora/templates/internalerror.html +++ b/themes/Fedora/templates/internalerror.html @@ -1,15 +1,12 @@ {% extends "layout.html" %} -{% block maintitle %} -500 - Internal Server Error -{% endblock %} -{% block main %} +{% block maincontent %} +

500 - Internal Server Error

{% if message: %} -

{{ message }}

+

{{ message }}

{% else %} -

Ipsilon encountered an unexpected internal error while trying to +

The Fedora Accounts Ipsilon encountered an unexpected internal error while trying to fulfill your request.

{% endif %} -

Please retry again.

-

If the error persists, contact the server administrator to resolve - the problem.

+

Please retry again.

+

If the error persists, contact Fedora Infra to resolve the problem.

{% endblock %} diff --git a/themes/Fedora/templates/layout.html b/themes/Fedora/templates/layout.html index c0648a2..1b494b4 100644 --- a/themes/Fedora/templates/layout.html +++ b/themes/Fedora/templates/layout.html @@ -8,7 +8,7 @@ href="//fedoraproject.org/static/images/favicon.ico"/> - + @@ -22,31 +22,91 @@
-
- logo +
+ logo +
+ {% if user.name %} + Log Out + {% endif %} +
-
-
+
+
+ {% if error %} +
+
+
{{error}}
+
+
+ {% endif %} + {% block maincontent %}{% endblock %} +
+
+ + + {#
{% block toptext %}{% endblock %}
+ {% if self.maintitle() %}
{% block maintitle %}{% endblock %}
+ {% endif %}
{% block main %}{% endblock %}
{% block after_card %}{% endblock %}
-
-
+
#} -
-
- Fedora FAS Login uses OpenID powered by Ipsilon -
+
+
+
+
+ +
+
+ +
+
+ +
+
+
+
+

Fedora is sponsored by Red Hat. Learn more about the relationship between Red Hat and Fedora »

+
+

© 2021 Red Hat, Inc. and others.

+
+
+
diff --git a/themes/Fedora/templates/login/form.html b/themes/Fedora/templates/login/form.html index 5ea6c90..2f56654 100644 --- a/themes/Fedora/templates/login/form.html +++ b/themes/Fedora/templates/login/form.html @@ -1,32 +1,39 @@ {% extends "layout.html" %} -{% block title %}Login{% endblock %} -{% block toptext %} +{% block maincontent %} +
+
+

{{ login_target }} wants to use your Fedora Account

+

enter your Fedora Account credentials below to authorise {{ login_target }}

+
+
+
+
+
+ -
{{ login_target }} wants to use your Fedora Account System (FAS) credentials
-{% endblock %} -{% block cardwidths %}col-md-6 col-sm-8{% endblock %} -{% block maintitle %} - Log in with FAS -{% endblock %} -{% block main %} - {% if error %}

{{error}}

{% endif %} - - +
+
+
By using a Fedora account, you agree to follow the Fedora Code of Conduct.
+
+
- - Forgot password? +
-
- -
- -{% endblock %} - -{% block after_card %} - -
Don't have a FAS account? Sign up now.
- +
+
+ Forgot password? + +
+
+ +
+
+
+
+
Don't have a Fedora Account? Sign up now.
+
+
{% endblock %} diff --git a/themes/Fedora/templates/login/index.html b/themes/Fedora/templates/login/index.html index 14ec837..5011cb7 100644 --- a/themes/Fedora/templates/login/index.html +++ b/themes/Fedora/templates/login/index.html @@ -1,11 +1,6 @@ {% extends "layout.html" %} -{% block title %}Login{% endblock %} -{% block toptext %} -{{ login_target }} is asking to authenticate using Ipsilon -{% endblock %} -{% block main %} -
- Redirecting... {{ redirect }} -
+{% block maincontent %} +

{{ login_target }} wants to use your Fedora Account

+

Redirecting... {{ redirect }}

{% endblock %} diff --git a/themes/Fedora/templates/logout.html b/themes/Fedora/templates/logout.html index aec445c..1924296 100644 --- a/themes/Fedora/templates/logout.html +++ b/themes/Fedora/templates/logout.html @@ -1,13 +1,11 @@ {% extends "layout.html" %} -{% block maintitle %} -Logged out -{% endblock %} -{% block main %} +{% block maincontent %} +
{% if user.name %} -

Something prevented a successful logout

+

Something prevented a successful logout

You are still logged in as {{ user.fullname }}

{% else %} -

Successfully logged out.

-

Return to Home page

+

Successfully logged out.

{% endif %} +
{% endblock %} diff --git a/themes/Fedora/templates/notfound.html b/themes/Fedora/templates/notfound.html index 123328e..29cf7df 100644 --- a/themes/Fedora/templates/notfound.html +++ b/themes/Fedora/templates/notfound.html @@ -1,13 +1,10 @@ {% extends "layout.html" %} -{% block maintitle %} -404 - Not Found -{% endblock %} -{% block main %} +{% block maincontent %} +

404 - Not Found

{% if message: %} -

{{ message }}

+

{{ message }}

{% else %} -

This page does not exist.

+

This page does not exist.

{% endif %} -

If you think this is an error, contact the server administrator to resolve - the problem.

+

If you think this is an error, contact Fedora Infra to resolve the problem.

{% endblock %} diff --git a/themes/Fedora/templates/openid/consent_form.html b/themes/Fedora/templates/openid/consent_form.html index b47a0a7..62f8d1a 100644 --- a/themes/Fedora/templates/openid/consent_form.html +++ b/themes/Fedora/templates/openid/consent_form.html @@ -1,37 +1,55 @@ {% extends "layout.html" %} -{% block toptext %} -

{{trustroot}} requests to use the following details from your FAS Account

-{% endblock %} -{% block cardwidths %}col-md-10 col-md-offset-1{% endblock %} -{% block maintitle %}Review the authorization details{% endblock %} -{% block main %} -
-
- - {% for entry in authz_details|dictsort %} -
-
{{ entry[0] }}
- {%- if entry[1] is iterable and not entry[1] is string -%} -
{{ entry[1] | join(', ') }}
- {%- else -%} -
{{ entry[1] }}
- {%- endif -%} +{% block maincontent %} +
+
+

{{trustroot}} requests to use the following details from your Fedora Account

+
+
+
+
+ + +
+
+
+ {% for entry in authz_details|dictsort %} +
+
+
{{ entry[0] }}
+ {%- if entry[1] is iterable and not entry[1] is string -%} +
{{ entry[1] | join(', ') }}
+ {%- else -%} +
{{ entry[1] }}
+ {%- endif -%} +
+
+ {% endfor %} +
+
+
Remember approval
+
+ +
+
+
- {% endfor %} - -
-
Remember approval
-
+
+
+
+ +
-
- - -

- +
+ + + + +
+
{% endblock %} diff --git a/themes/Fedora/templates/openid/userpage.html b/themes/Fedora/templates/openid/userpage.html index 74ae88a..2d70321 100644 --- a/themes/Fedora/templates/openid/userpage.html +++ b/themes/Fedora/templates/openid/userpage.html @@ -1,7 +1,7 @@ {% extends "layout.html" %} {% block toptext %} -This is the OpenID page for {{username}}. {% endblock %} -{% block main %} -This page is primarily used internally +{% block maincontent %} +

This is the OpenID page for {{username}}.

+

This page is primarily used internally

{% endblock %} diff --git a/themes/Fedora/templates/openidc/consent_form.html b/themes/Fedora/templates/openidc/consent_form.html new file mode 100644 index 0000000..9dc29d4 --- /dev/null +++ b/themes/Fedora/templates/openidc/consent_form.html @@ -0,0 +1,73 @@ +{% extends "layout.html" %} +{% block maincontent %} +
+
+

+ + {% if client['homepage'] %} + {{ client['name'] }} + {% else %} + {{ client['name'] }} + {% endif %} + + is asking Fedora Accounts to authorize access for {{ username }}. +

+ {%- if client['policy'] %} +

Client privacy policy

+ {% endif %} + {%- if client['tos'] %} +

Client terms of service

+ {%- endif %} +
+
+
+
+ +
+
+{% endblock %} diff --git a/themes/Fedora/templates/openidc/form_response.html b/themes/Fedora/templates/openidc/form_response.html new file mode 100644 index 0000000..b73732b --- /dev/null +++ b/themes/Fedora/templates/openidc/form_response.html @@ -0,0 +1,22 @@ +{% extends "layout.html" %} +{% block maincontent %} +
+

If you are not redirected automatically, please click Continue.

+
+ + + + +{% endblock %} diff --git a/themes/Fedora/templates/unauthorized.html b/themes/Fedora/templates/unauthorized.html index 9762691..6ea12a3 100644 --- a/themes/Fedora/templates/unauthorized.html +++ b/themes/Fedora/templates/unauthorized.html @@ -1,12 +1,10 @@ {% extends "layout.html" %} -{% block maintitle %} -401 - Unauthorized -{% endblock %} -{% block main %} +{% block maincontent %} +

401 - Unauthorized

{% if message: %} -

{{ message }}

+

{{ message }}

{% else %} -

Authentication was not succesful

+

Authentication was not succesful

{% endif %} -

Try to login again

+

Try to login again

{% endblock %}