From 9484082598b7bc6a8fbbc88f5909f5fd940c9dec Mon Sep 17 00:00:00 2001 From: Marco Enrico Piras Date: Thu, 11 Jan 2024 10:38:37 +0100 Subject: [PATCH 1/6] fix(style): nav menu alignment on sm devices --- lifemonitor/auth/templates/auth/profile.j2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lifemonitor/auth/templates/auth/profile.j2 b/lifemonitor/auth/templates/auth/profile.j2 index 34da6724a..41a646414 100644 --- a/lifemonitor/auth/templates/auth/profile.j2 +++ b/lifemonitor/auth/templates/auth/profile.j2 @@ -40,7 +40,7 @@
-
    +
    • Account From a751e8ccb7916b307ada5dcf9e4ae58a08121f3d Mon Sep 17 00:00:00 2001 From: Marco Enrico Piras Date: Thu, 11 Jan 2024 11:55:47 +0100 Subject: [PATCH 2/6] style: enable responsive behaviour for accounts table --- .../auth/templates/auth/account_tab.j2 | 58 +------------------ 1 file changed, 1 insertion(+), 57 deletions(-) diff --git a/lifemonitor/auth/templates/auth/account_tab.j2 b/lifemonitor/auth/templates/auth/account_tab.j2 index 01a40627c..3a64a4529 100644 --- a/lifemonitor/auth/templates/auth/account_tab.j2 +++ b/lifemonitor/auth/templates/auth/account_tab.j2 @@ -8,63 +8,7 @@

      Connected accounts

-
- - - - - - - - - - - {% for user_identity in user_identities %} - - - - - {% if user_identity.identity %} - - {% else %} - - {% endif %} - - {% endfor %} - +
ProviderUser ID
- {{ macros.render_provider_fa_icon(user_identity.provider, color="black") }} - - {{user_identity.provider.name}} - - {% if user_identity.identity %} -
- {{ user_identity.identity.provider_user_id }} -
-
- - see {{user_identity.provider.name}} profile - -
- {% endif %} - 		- {% if current_user.oauth_identity|length > 1 or current_user.has_password %} - - CONNECTED - - - {% else %} - CONNECTED - {% endif %} - - - - CONNECT - - -
From e03ea856b58afac59edd364eb50bb2dcc521f9dc Mon Sep 17 00:00:00 2001 From: Marco Enrico Piras Date: Thu, 11 Jan 2024 11:58:40 +0100 Subject: [PATCH 3/6] style: enable table hover effect on accounts table --- lifemonitor/auth/templates/auth/account_tab.j2 | 1 + 1 file changed, 1 insertion(+) diff --git a/lifemonitor/auth/templates/auth/account_tab.j2 b/lifemonitor/auth/templates/auth/account_tab.j2 index 3a64a4529..02b614886 100644 --- a/lifemonitor/auth/templates/auth/account_tab.j2 +++ b/lifemonitor/auth/templates/auth/account_tab.j2 @@ -9,6 +9,7 @@
+
From 97576a350275f974fa2c4756ec9fa19ef55a1c0e Mon Sep 17 00:00:00 2001 From: Marco Enrico Piras Date: Thu, 11 Jan 2024 12:00:33 +0100 Subject: [PATCH 4/6] style: increase margin-top for external profile link --- lifemonitor/auth/templates/auth/account_tab.j2 | 1 + 1 file changed, 1 insertion(+) diff --git a/lifemonitor/auth/templates/auth/account_tab.j2 b/lifemonitor/auth/templates/auth/account_tab.j2 index 02b614886..843fc0b1a 100644 --- a/lifemonitor/auth/templates/auth/account_tab.j2 +++ b/lifemonitor/auth/templates/auth/account_tab.j2 @@ -10,6 +10,7 @@
+
From 91da16d945e8b3dfc9e576fabbabbe960ffa3828 Mon Sep 17 00:00:00 2001 From: Marco Enrico Piras Date: Thu, 11 Jan 2024 12:06:58 +0100 Subject: [PATCH 5/6] fix: always show anchor link for connected accounts. Even if the account cannot be disconnected, the link should still be displayed, perhaps in an inactive state. --- lifemonitor/auth/templates/auth/account_tab.j2 | 1 + 1 file changed, 1 insertion(+) diff --git a/lifemonitor/auth/templates/auth/account_tab.j2 b/lifemonitor/auth/templates/auth/account_tab.j2 index 843fc0b1a..3752c6701 100644 --- a/lifemonitor/auth/templates/auth/account_tab.j2 +++ b/lifemonitor/auth/templates/auth/account_tab.j2 @@ -11,6 +11,7 @@
+
From 753596c95df915a0c3b2565b0ec5b1099e75159b Mon Sep 17 00:00:00 2001 From: Marco Enrico Piras Date: Thu, 11 Jan 2024 12:14:17 +0100 Subject: [PATCH 6/6] style: reformat table of external accounts --- .../auth/templates/auth/account_tab.j2 | 52 +++++++++++++++++++ 1 file changed, 52 insertions(+) diff --git a/lifemonitor/auth/templates/auth/account_tab.j2 b/lifemonitor/auth/templates/auth/account_tab.j2 index 3752c6701..2cd4daec9 100644 --- a/lifemonitor/auth/templates/auth/account_tab.j2 +++ b/lifemonitor/auth/templates/auth/account_tab.j2 @@ -10,8 +10,60 @@
+ + + + + + + + + + {% for user_identity in user_identities %} + + + + + + + {% endfor %} +
ProviderUser ID
+ {{ macros.render_provider_fa_icon(user_identity.provider, color="black") }} + + {{user_identity.provider.name}} + + {% if user_identity.identity %} +
+ {{ user_identity.identity.provider_user_id }} +
+ + see {{user_identity.provider.name}} profile + +
+ {% endif %} + 		+ {% if user_identity.identity %} + {% if current_user.oauth_identity|length > 1 or current_user.has_password %} + + CONNECTED + + + {% else %} + CONNECTED + {% endif %} + {% else %} + + CONNECT + + + {% endif %} +