From 1285ba6fbb17f6d005d03513ef7cebd227e3e144 Mon Sep 17 00:00:00 2001 From: Jens Langhammer Date: Fri, 21 Feb 2020 18:00:09 +0100 Subject: [PATCH] ui: include font-awesome --- passbook/core/templates/base/skeleton.html | 1 + passbook/core/templates/user/base.html | 94 +++++++++++-------- passbook/core/templates/user/settings.html | 25 +++-- .../otp/templates/otp/user_settings.html | 84 ++++++++--------- passbook/sources/oauth/models.py | 2 +- .../oauth/templates/oauth_client/user.html | 28 +++--- passbook/static/static/package.json | 1 + passbook/static/static/yarn.lock | 5 + 8 files changed, 139 insertions(+), 101 deletions(-) diff --git a/passbook/core/templates/base/skeleton.html b/passbook/core/templates/base/skeleton.html index 6bc877f80..57944e7f3 100644 --- a/passbook/core/templates/base/skeleton.html +++ b/passbook/core/templates/base/skeleton.html @@ -13,6 +13,7 @@ + {% block head %} {% endblock %} diff --git a/passbook/core/templates/user/base.html b/passbook/core/templates/user/base.html index 953dd39e4..b434da056 100644 --- a/passbook/core/templates/user/base.html +++ b/passbook/core/templates/user/base.html @@ -6,44 +6,62 @@ {% load passbook_user_settings %} {% block content %} -
-
-
-

{% trans 'User Settings'%}

- +
+
+
+
+
+ +
+
+
+
+
+ {% block page %} + {% endblock %} +
-
- {% block page %} - {% endblock %} -
-
+ {% endblock %} diff --git a/passbook/core/templates/user/settings.html b/passbook/core/templates/user/settings.html index f10e9be41..09c8a2ec5 100644 --- a/passbook/core/templates/user/settings.html +++ b/passbook/core/templates/user/settings.html @@ -3,11 +3,22 @@ {% load i18n %} {% block page %} -

{% trans 'Update details' %}

-
- {% csrf_token %} - {% include 'partials/form.html' %} - - {% trans 'Delete user' %} -
+
+

{% trans 'Update details' %}

+
+
+
+ {% include 'partials/form_horizontal.html' with form=form %} + {% block beneath_form %} + {% endblock %} +
+
+
+ + {% trans "Delete account" %} +
+
+
+
+
{% endblock %} diff --git a/passbook/factors/otp/templates/otp/user_settings.html b/passbook/factors/otp/templates/otp/user_settings.html index c812c91d3..f095e4ad4 100644 --- a/passbook/factors/otp/templates/otp/user_settings.html +++ b/passbook/factors/otp/templates/otp/user_settings.html @@ -3,48 +3,46 @@ {% load utils %} {% load i18n %} -{% block title %} -{% title "OTP" %} -{% endblock %} - {% block page %} -

- {% trans "One-Time Passwords" %} -

-
-
-
-

- {% blocktrans with state=state|yesno:"Enabled,Disabled" %} - Status: {{ state }} - {% endblocktrans %} - {% if state %} - - {% else %} - - {% endif %} -

-

- {% if not state %} - {% trans "Enable OTP" %} - {% else %} - {% trans "Disable OTP" %} - {% endif %} -

-
-
-
-
-
- {% trans "Your Backup tokens:" %} -
-
- 
{% for token in static_tokens %}{{ token.token }}
-{% empty %}{% trans 'N/A' %}{% endfor %}
-
-
-
+
+

{% trans "One-Time Passwords" %}

-{% endblock %} +
+
+
+
+

+ {% blocktrans with state=state|yesno:"Enabled,Disabled" %} + Status: {{ state }} + {% endblocktrans %} + {% if state %} + + {% else %} + + {% endif %} +

+

+ {% if not state %} + {% trans "Enable OTP" %} + {% else %} + {% trans "Disable OTP" %} + {% endif %} +

+
+
+
+
+
+ {% trans "Your Backup tokens:" %} +
+
+ 
{% for token in static_tokens %}{{ token.token }}
+                        {% empty %}{% trans 'N/A' %}{% endfor %}
+
+
+
+
+
+ {% endblock %} diff --git a/passbook/sources/oauth/models.py b/passbook/sources/oauth/models.py index 4885ebb5c..765e87ba9 100644 --- a/passbook/sources/oauth/models.py +++ b/passbook/sources/oauth/models.py @@ -52,7 +52,7 @@ class OAuthSource(Source): icon_type = self.provider_type if icon_type == "azure ad": icon_type = "windows" - icon_class = f"fa fa-{icon_type}" + icon_class = f"fab fa-{icon_type}" view_name = "passbook_sources_oauth:oauth-client-user" return UIUserSettings( name=self.name, diff --git a/passbook/sources/oauth/templates/oauth_client/user.html b/passbook/sources/oauth/templates/oauth_client/user.html index c0f0ef4c7..b216a3849 100644 --- a/passbook/sources/oauth/templates/oauth_client/user.html +++ b/passbook/sources/oauth/templates/oauth_client/user.html @@ -3,16 +3,20 @@ {% load i18n %} {% block page %} -

{{ source.name }}

-{% if connections.exists %} -

{% trans 'Connected.' %}

- - {% trans 'Disconnect' %} - -{% else %} -

Not connected.

- - {% trans 'Connect' %} - -{% endif %} +
+

{{ source.name }}

+
+
+ {% if connections.exists %} +

{% trans 'Connected.' %}

+ + {% trans 'Disconnect' %} + + {% else %} +

Not connected.

+ + {% trans 'Connect' %} + + {% endif %} +
{% endblock %} diff --git a/passbook/static/static/package.json b/passbook/static/static/package.json index ccdf70f2f..3933336f5 100644 --- a/passbook/static/static/package.json +++ b/passbook/static/static/package.json @@ -1,6 +1,7 @@ { "license": "MIT", "dependencies": { + "@fortawesome/fontawesome-free": "^5.12.1", "@patternfly/patternfly": "^2.65.3", "codemirror": "^5.52.0" } diff --git a/passbook/static/static/yarn.lock b/passbook/static/static/yarn.lock index 22d15774a..c1922d7b4 100644 --- a/passbook/static/static/yarn.lock +++ b/passbook/static/static/yarn.lock @@ -2,6 +2,11 @@ # yarn lockfile v1 +"@fortawesome/fontawesome-free@^5.12.1": + version "5.12.1" + resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-free/-/fontawesome-free-5.12.1.tgz#2a98fea9fbb8a606ddc79a4680034e9d5591c550" + integrity sha512-ZtjIIFplxncqxvogq148C3hBLQE+W3iJ8E4UvJ09zIJUgzwLcROsWwFDErVSXY2Plzao5J9KUYNHKHMEUYDMKw== + "@patternfly/patternfly@^2.65.3": version "2.65.3" resolved "https://registry.yarnpkg.com/@patternfly/patternfly/-/patternfly-2.65.3.tgz#0856d6ca13d971f18b1d7889a60a73eb78cad3c8"