From 3e10ff259f718718231b8bf66b70248f6b5ff289 Mon Sep 17 00:00:00 2001 From: Andrea Ranaldi Date: Wed, 11 Aug 2021 15:31:01 +0200 Subject: [PATCH 1/3] Updated MarkupSafe, fix #33 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index f3d487e1..b6f27562 100644 --- a/requirements.txt +++ b/requirements.txt @@ -17,7 +17,7 @@ importlib-metadata==1.5.0 jinja2>=2.11.3 ldap3==2.7 Mako==1.1.2 -MarkupSafe==1.1.1 +MarkupSafe==2.0.1 more-itertools==8.2.0 oic==1.2.1 packaging==20.1 From 8d130ae9ed8b005f708499c4f07bace43cb937d1 Mon Sep 17 00:00:00 2001 From: Andrea Ranaldi Date: Wed, 11 Aug 2021 15:38:39 +0200 Subject: [PATCH 2/3] reindent templates, removed unclosed p tag, fix #38 --- example/templates/spid_base.html | 618 ++++++++++++------------ example/templates/spid_login_error.html | 26 +- 2 files changed, 321 insertions(+), 323 deletions(-) diff --git a/example/templates/spid_base.html b/example/templates/spid_base.html index b8b7a4b6..e7d40f14 100644 --- a/example/templates/spid_base.html +++ b/example/templates/spid_base.html @@ -1,360 +1,360 @@ - - - - - - + + + + + + - {% block page_title %}{% endblock page_title %} + {% block page_title %}{% endblock page_title %} - - - - + + + + - + - + - {% block extra_head %} {% endblock %} + {% block extra_head %} {% endblock %} - - + + -
+
- + -
-
-
-
-
- +
+
+
+
+
+ -Nome Organizzazione + Nome Organizzazione - -
- +
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
-
- -
- +
+
+
+
+
+
+ +
+ -
- SPID Logo -
+
+ SPID Logo +
-
-

+
+

-

-

+

+

-

-
- -

+ +
+ +
- + -
+
-
+
-
-
-
-
-
+
+
+
+
+
- + -
-
-
-
-
+
+ +
+
+
+
-
-
- -

Sezione Link Utili

- - -
-
+
+
- - - - - - {% block extra_scripts %} {% endblock %} + +
+
+ {% block container %} {% endblock %} +
+
- + + + + + + + + + + + {% block extra_scripts %} {% endblock %} + + diff --git a/example/templates/spid_login_error.html b/example/templates/spid_login_error.html index ef45f092..20ec8c55 100644 --- a/example/templates/spid_login_error.html +++ b/example/templates/spid_login_error.html @@ -1,21 +1,19 @@ {% extends 'spid_base.html' %} - -{% block page_title %} + {% block page_title %} - Errore SPID + Errore SPID -{% endblock page_title %} + {% endblock page_title %} {% block container %} -
-
- Errore di autenticazione -
-

-

{{ message }}

- {% if troubleshoot %} -

{{ troubleshoot }}

- {% endif %} -

+
+
+ Errore di autenticazione
+

{{ message }}

+ {% if troubleshoot %} +

{{ troubleshoot }}

+ {% endif %} +

+
{% endblock %} From 8bcfb5038fff72eaf616cd46aadaf93de4bd188f Mon Sep 17 00:00:00 2001 From: Andrea Ranaldi Date: Wed, 11 Aug 2021 15:44:24 +0200 Subject: [PATCH 3/3] Added SPID and AGID logos, fix #37 --- example/static/disco.html | 1 + example/static/spid/spid-agid-logo-lb.png | Bin 0 -> 6011 bytes 2 files changed, 1 insertion(+) create mode 100644 example/static/spid/spid-agid-logo-lb.png diff --git a/example/static/disco.html b/example/static/disco.html index 63502d49..bc5861d2 100644 --- a/example/static/disco.html +++ b/example/static/disco.html @@ -270,6 +270,7 @@

Benvenuto in Nome Organizzazione Spid Discovery Service

+

logo SPID e AGID

diff --git a/example/static/spid/spid-agid-logo-lb.png b/example/static/spid/spid-agid-logo-lb.png new file mode 100644 index 0000000000000000000000000000000000000000..44b841623f0d0aed40e5de7e8d9ffbb225f5e3fc GIT binary patch literal 6011 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