Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged PR #81 into EUDI #94

Merged
merged 21 commits into from
Nov 27, 2023
Merged
Show file tree
Hide file tree
Changes from 17 commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
aafde36
new discovery and error page based on bootstrap-itali v2.6.1
MdreW Sep 1, 2023
8d77140
added id and class for errors
MdreW Sep 1, 2023
b228c15
chore: added dependency for django theme
Gartic99 Nov 13, 2023
e035a1c
Fix: remove of non existing field of user
Gartic99 Nov 13, 2023
b29f338
feat: implemented Django template for the example sp
Gartic99 Nov 13, 2023
6d88020
chore: created static folder with static files
Gartic99 Nov 14, 2023
2c732b7
fix: adding missing STATIC_ROOT
Gartic99 Nov 14, 2023
49caab0
fix: using {% static %} for static resources
Gartic99 Nov 14, 2023
9032c05
fix: removed unused code
Gartic99 Nov 14, 2023
5ca843b
Update example_sp/djangosaml2_sp/saml2_sp/views.py
Gartic99 Nov 14, 2023
d11bae2
Update example_sp/djangosaml2_sp/saml2_sp/views.py
Gartic99 Nov 14, 2023
c88f881
feat: dropdown for profile
Gartic99 Nov 18, 2023
b0016e1
Merge branch 'italia:eudi' into eudi
Gartic99 Nov 18, 2023
c6ed2c1
feat: dropdown for profile
Gartic99 Nov 18, 2023
e4f57de
Merge branch 'eudi' of github.com:Gartic99/Satosa-Saml2Spid into eudi
Gartic99 Nov 18, 2023
40b7d2a
fix: resolved merge conflicts
Gartic99 Nov 20, 2023
c97e1f5
Merge branch 'bootstrap-italia-v2' of github.com:italia/Satosa-Saml2S…
Gartic99 Nov 24, 2023
984ec83
chore: removed comments on disco.html file
Gartic99 Nov 27, 2023
7eaf526
feat: improved echo_attributes page
Gartic99 Nov 27, 2023
9185d7e
Update Docker-compose/docker-compose.yml
Gartic99 Nov 27, 2023
6c65086
Merge branch 'eudi' into eudi
Gartic99 Nov 27, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion Docker-compose/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@ services:
satosa-saml2spid:
#image: ghcr.io/italia/satosa-saml2spid:latest
image: satosa-saml2spid:latest
Gartic99 marked this conversation as resolved.
Show resolved Hide resolved
build: ../
container_name: satosa-saml2spid
depends_on:
- satosa-mongo
Expand Down
62 changes: 0 additions & 62 deletions example/static/cie/cie_black.svg

This file was deleted.

1 change: 0 additions & 1 deletion example/static/cie/cie_white.svg

This file was deleted.

3 changes: 3 additions & 0 deletions example/static/css/bootstrap-italia.min.css

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions example/static/css/ita-font.min.css
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
@font-face{font-family:Titillium Web;font-style:normal;font-weight:400;src:url(titillium-web-v4-latin-regular.woff2) format("woff2")}
1 change: 1 addition & 0 deletions example/static/css/ita.min.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file not shown.
43 changes: 30 additions & 13 deletions example/static/disco.html
Original file line number Diff line number Diff line change
@@ -1,20 +1,23 @@
<!DOCTYPE html>
<!doctype html>
<html lang="it">
<head>
<meta http-equiv="content-type" content="text/html; charset=UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
<title>Accedi</title>
<meta name="description" content="Accedi">
<link rel="shortcut icon" href="/static/spid/favicon-32x32.png">
<!--<link rel="shortcut icon" href="/static/spid/favicon-32x32.png">-->

Gartic99 marked this conversation as resolved.
Show resolved Hide resolved
<script src="/static/spid/spid-idps.js"></script>
<link rel="stylesheet" href="/static/bootstrap-italia/css/bootstrap-italia.min.css">
<!--<script src="/static/spid/spid-idps.js"></script>-->

<!-- <link rel="stylesheet" href="/static/spid/bootstrap-italia.css"> -->
<!-- <link type="text/css" rel="stylesheet" href="/static/eidas/css/eidas-sp-access-button.min.css"> -->

<link rel="stylesheet" href="/static/css/style.css">
<link type="text/css" rel="stylesheet" href="/static/spid/spid-sp-access-button.css">

<!-- Bootstrap Italia CSS -->
<link href="css/bootstrap-italia.min.css" rel="stylesheet">
<!-- ita-buyyon CSS -->
<link href="css/ita.min.css" rel="stylesheet">
<link href="css/ita-font.min.css" rel="stylesheet">
</head>
<body>
<!-- Container - Body of page-->
Expand Down Expand Up @@ -75,8 +78,8 @@ <h3>SPID o CIE</h3>
</div>
</div>
<div class="row">
<div class="col-lg-12 text-center button-container ">
<!-- AGID - SPID IDP BUTTON SMALL "ENTRA CON SPID" * begin * -->
<!--<div class="col-lg-12 text-center button-container ">
AGID - SPID IDP BUTTON SMALL "ENTRA CON SPID" * begin *
<a href="#" class="btn btn-outline-primary btn-lg btn-me w-100" spid-idp-button="#spid-idp-button-xlarge-post" aria-haspopup="true" aria-expanded="false">
<span><img class="icon buttonicon" src="/static/spid/spid_icon.svg" onerror="this.src='img/spid-ico-circle-bb.png'; this.onerror=null;" alt=""></span>
<span>Entra con SPID</span>
Expand All @@ -88,7 +91,20 @@ <h3>SPID o CIE</h3>
<li class="spid-idp-support-link"><a href="https://www.spid.gov.it/serve-aiuto">Serve aiuto?</a></li>
</ul>
</div>
<!-- AGID - SPID IDP BUTTON SMALL "ENTRA CON SPID" * end * -->
AGID - SPID IDP BUTTON SMALL "ENTRA CON SPID" * end *
</div>-->
<div class="col-lg-12 text-center button-container ">
<div class='ita ita-dropdown ita-l ita-fixed mb-3'>
<!--<button class="ita-button">
<img src="img/spid.svg" alt="SPID logo">
Entra con SPID
</button>-->
<a href="#" class="btn btn-outline-primary btn-lg btn-me w-100" spid-idp-button="#spid-idp-button-xlarge-post" aria-haspopup="true" aria-expanded="false">
<span><img class="icon buttonicon" src="/static/spid/spid_icon.svg" onerror="this.src='img/spid-ico-circle-bb.png'; this.onerror=null;" alt=""></span>
<span>Entra con SPID</span>
</a>
<div class='ita-menu' role='menu' data-spid-remote></div>
</div>
</div>
</div>
<div class="row">
Expand All @@ -104,7 +120,7 @@ <h3>Altre identità digitali</h3>
<div class="col-lg-12 text-center button-container">
<!-- AGID - eIDAS IDP BUTTON SMALL "ENTRA CON EIDAS" * begin * -->
<a href="/Saml2/disco?entityID=https://sp-proxy.eid.gov.it/spproxy/idpit&return=https://localhost/Saml2/disco" class="btn btn-outline-primary btn-lg btn-me w-100" eidas-idp-button="#eidas-idp-button-xlarge-post" aria-haspopup="false" aria-expanded="false">
<span><img class="icon buttonicon" src="/static/eidas/img/ficep-it-eidas-lb.svg" onerror="this.src='eidas/img/ficep-it-eidas-lb.png'; this.onerror=null;" alt="" /></span>
<span><img class="icon buttonicon" src="/static/img/ficep.svg" onerror="this.src='eidas/img/ficep-it-eidas-lb.png'; this.onerror=null;" alt="" /></span>
<!-- <svg class="icon buttonicon"><use style="fill: #0065cc;" href="./bootstrap-italia/svg/sprites.svg#it-files" xlink:href="/bootstrap-italia/dist/svg/sprites.svg#it-files"></use></svg> -->
<span>Login with eIDAS</span>
</a>
Expand Down Expand Up @@ -304,8 +320,9 @@ <h3 class="sr-only">Sezione Link Utili</h3>
</div>
</div>
</footer> -->
<script src="/static/bootstrap-italia/js/bootstrap-italia.bundle.min.js"></script>
<script src="/static/spid/bootstrap-italia.js"></script>
<script src="/static/spid/spid-sp-access-button.js"></script>
<script src="js/ita.min.js"></script>
<script src="js/bootstrap-italia.bundle.min.js"></script>

<script>var spid_idps = new Ita;</script>
</body>
</html>
Loading
Loading