Skip to content
This repository was archived by the owner on Jun 25, 2024. It is now read-only.

Commit 5893726

Browse files
author
Baggerone
authored
Merge pull request #117 from silinternational/develop
Release 7.6.2 Add Logo Caption to IdP cards on IdP selection page
2 parents 1911494 + 1655dba commit 5893726

File tree

3 files changed

+89
-42
lines changed

3 files changed

+89
-42
lines changed

‎development/hub1/saml20-idp-remote.php‎

Lines changed: 27 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
'en' => 'IdP 1'
99
],
1010
'IDPNamespace' => 'IDP-1',
11+
'logoCaption' => 'IDP-1 staff',
1112
'SingleSignOnService' => 'http://ssp-idp1.local:8085/saml2/idp/SSOService.php',
1213
'SingleLogoutService' => 'http://ssp-idp1.local:8085/saml2/idp/SingleLogoutService.php',
1314
'certData' => 'MIIDzzCCAregAwIBAgIJAPlZYTAQSIbHMA0GCSqGSIb3DQEBCwUAMH4xCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJOQzEPMA0GA1UEBwwGV2F4aGF3MQwwCgYDVQQKDANTSUwxDTALBgNVBAsMBEdUSVMxDjAMBgNVBAMMBVN0ZXZlMSQwIgYJKoZIhvcNAQkBFhVzdGV2ZV9iYWd3ZWxsQHNpbC5vcmcwHhcNMTYxMDE3MTIzMTQ1WhcNMjYxMDE3MTIzMTQ1WjB+MQswCQYDVQQGEwJVUzELMAkGA1UECAwCTkMxDzANBgNVBAcMBldheGhhdzEMMAoGA1UECgwDU0lMMQ0wCwYDVQQLDARHVElTMQ4wDAYDVQQDDAVTdGV2ZTEkMCIGCSqGSIb3DQEJARYVc3RldmVfYmFnd2VsbEBzaWwub3JnMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEArssOaeKbdOQFpN6bBolwSJ/6QFBXA73Sotg60anx9v6aYdUTmi+b7SVtvOmHDgsD5X8pN/6Z11QCZfTYg2nW3ZevGZsj8W/R6C8lRLHzWUr7e7DXKfj8GKZptHlUs68kn0ndNVt9r/+irJe9KBdZ+4kAihykomNdeZg06bvkklxVcvpkOfLTQzEqJAmISPPIeOXes6hXORdqLuRNTuIKarcZ9rstLnpgAs2TE4XDOrSuUg3XFnM05eDpFQpUb0RXWcD16mLCPWw+CPrGoCfoftD5ZGfll+W2wZ7d0kQ4TbCpNyxQH35q65RPVyVNPgSNSsFFkmdcqP9DsFqjJ8YC6wIDAQABo1AwTjAdBgNVHQ4EFgQUD6oyJKOPPhvLQpDCC3027QcuQwUwHwYDVR0jBBgwFoAUD6oyJKOPPhvLQpDCC3027QcuQwUwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAQEAA6tCLHJQGfXGdFerQ3J0wUu8YDSLb0WJqPtGdIuyeiywR5ooJf8G/jjYMPgZArepLQSSi6t8/cjEdkYWejGnjMG323drQ9M1sKMUhOJF4po9R3t7IyvGAL3fSqjXA8JXH5MuGuGtChWxaqhduA0dBJhFAtAXQ61IuIQF7vSFxhTwCvJnaWdWD49sG5OqjCfgIQdY/mw70e45rLnR/bpfoigL67sTJxy+Kx2ogbvMR6lITByOEQFMt7BYpMtXrwvKUM7k9NOo1jREmJacC8PTx//jRhCWwzUj1RsfIri24BuITrawwqMsYl8DZiiwMpjUf9m4NPaf4E7+QRpzo+MCcg==',
@@ -32,45 +33,50 @@
3233
'en' => 'IdP 4'
3334
],
3435
'IDPNamespace' => 'IDP-4',
36+
'logoCaption' => 'IDP-4 staff',
3537
'SingleSignOnService' => 'http://ssp-idp4.local:8088/saml2/idp/SSOService.php',
3638
'SingleLogoutService' => 'http://ssp-idp4.local:8088/saml2/idp/SingleLogoutService.php',
3739
'certData' => 'MIIDzzCCAregAwIBAgIJAPlZYTAQSIbHMA0GCSqGSIb3DQEBCwUAMH4xCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJOQzEPMA0GA1UEBwwGV2F4aGF3MQwwCgYDVQQKDANTSUwxDTALBgNVBAsMBEdUSVMxDjAMBgNVBAMMBVN0ZXZlMSQwIgYJKoZIhvcNAQkBFhVzdGV2ZV9iYWd3ZWxsQHNpbC5vcmcwHhcNMTYxMDE3MTIzMTQ1WhcNMjYxMDE3MTIzMTQ1WjB+MQswCQYDVQQGEwJVUzELMAkGA1UECAwCTkMxDzANBgNVBAcMBldheGhhdzEMMAoGA1UECgwDU0lMMQ0wCwYDVQQLDARHVElTMQ4wDAYDVQQDDAVTdGV2ZTEkMCIGCSqGSIb3DQEJARYVc3RldmVfYmFnd2VsbEBzaWwub3JnMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEArssOaeKbdOQFpN6bBolwSJ/6QFBXA73Sotg60anx9v6aYdUTmi+b7SVtvOmHDgsD5X8pN/6Z11QCZfTYg2nW3ZevGZsj8W/R6C8lRLHzWUr7e7DXKfj8GKZptHlUs68kn0ndNVt9r/+irJe9KBdZ+4kAihykomNdeZg06bvkklxVcvpkOfLTQzEqJAmISPPIeOXes6hXORdqLuRNTuIKarcZ9rstLnpgAs2TE4XDOrSuUg3XFnM05eDpFQpUb0RXWcD16mLCPWw+CPrGoCfoftD5ZGfll+W2wZ7d0kQ4TbCpNyxQH35q65RPVyVNPgSNSsFFkmdcqP9DsFqjJ8YC6wIDAQABo1AwTjAdBgNVHQ4EFgQUD6oyJKOPPhvLQpDCC3027QcuQwUwHwYDVR0jBBgwFoAUD6oyJKOPPhvLQpDCC3027QcuQwUwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAQEAA6tCLHJQGfXGdFerQ3J0wUu8YDSLb0WJqPtGdIuyeiywR5ooJf8G/jjYMPgZArepLQSSi6t8/cjEdkYWejGnjMG323drQ9M1sKMUhOJF4po9R3t7IyvGAL3fSqjXA8JXH5MuGuGtChWxaqhduA0dBJhFAtAXQ61IuIQF7vSFxhTwCvJnaWdWD49sG5OqjCfgIQdY/mw70e45rLnR/bpfoigL67sTJxy+Kx2ogbvMR6lITByOEQFMt7BYpMtXrwvKUM7k9NOo1jREmJacC8PTx//jRhCWwzUj1RsfIri24BuITrawwqMsYl8DZiiwMpjUf9m4NPaf4E7+QRpzo+MCcg==',
3840
],
39-
'jaars-idp'=> [
41+
'sil-idp'=> [
4042
'enabled' => true,
4143
'metadata-set' => 'saml20-idp-remote',
42-
'entityid' => 'jaars-idp',
44+
'entityid' => 'sil-idp',
4345
'name' => [
44-
'en' => 'jaars'
46+
'en' => 'sil'
4547
],
46-
'logoURL' => 'https://static.gtis.guru/idp-logo/jaars-logo.png'
48+
'logoCaption' => 'SIL staff',
49+
'logoURL' => 'https://static.gtis.guru/idp-logo/sil-logo.png'
4750
],
48-
'sil-idp'=> [
51+
'partners-idp'=> [
4952
'enabled' => true,
5053
'metadata-set' => 'saml20-idp-remote',
51-
'entityid' => 'sil-idp',
54+
'entityid' => 'partners-idp',
5255
'name' => [
53-
'en' => 'sil'
56+
'en' => 'SIL Partners'
5457
],
55-
'logoURL' => 'https://static.gtis.guru/idp-logo/sil-logo.png'
58+
'logoCaption' => 'Partners of SIL',
59+
'logoURL' => 'https://static.gtis.guru/idp-logo/partners-logo-v3.png'
5660
],
57-
'usa-idp'=> [
61+
'jaars-idp'=> [
5862
'enabled' => true,
5963
'metadata-set' => 'saml20-idp-remote',
60-
'entityid' => 'usa-idp',
64+
'entityid' => 'jaars-idp',
6165
'name' => [
62-
'en' => 'usa'
66+
'en' => 'jaars'
6367
],
64-
'logoURL' => 'https://static.gtis.guru/idp-logo/usa-logo.png'
68+
'logoCaption' => 'JAARS staff',
69+
'logoURL' => 'https://static.gtis.guru/idp-logo/jaars-logo.png'
6570
],
66-
'wga-idp'=> [
71+
'usa-idp'=> [
6772
'enabled' => true,
6873
'metadata-set' => 'saml20-idp-remote',
69-
'entityid' => 'wga-idp',
74+
'entityid' => 'usa-idp',
7075
'name' => [
71-
'en' => 'wga'
76+
'en' => 'usa'
7277
],
73-
'logoURL' => 'https://static.gtis.guru/idp-logo/wga-logo.png'
78+
'logoCaption' => 'Wycliffe USA staff',
79+
'logoURL' => 'https://static.gtis.guru/idp-logo/usa-logo.png'
7480
],
7581
'collaborate-idp'=> [
7682
'enabled' => true,
@@ -79,6 +85,7 @@
7985
'name' => [
8086
'en' => 'collaborate'
8187
],
88+
'logoCaption' => 'Collaborate partners',
8289
'logoURL' => 'https://static.gtis.guru/idp-logo/collaborate-logo.png'
8390
],
8491
'mock-jaars-idp'=> [
@@ -88,6 +95,7 @@
8895
'name' => [
8996
'en' => 'jaars'
9097
],
98+
'logoCaption' => 'MockJaars staff',
9199
'logoURL' => 'https://static.gtis.guru/idp-logo/jaars-logo.png'
92100
],
93101
'mock-sil-idp'=> [
@@ -97,6 +105,7 @@
97105
'name' => [
98106
'en' => 'sil'
99107
],
108+
'logoCaption' => 'MockSIL staff',
100109
'logoURL' => 'https://static.gtis.guru/idp-logo/sil-logo.png'
101110
],
102111
'mock-usa-idp'=> [
@@ -106,6 +115,7 @@
106115
'name' => [
107116
'en' => 'usa'
108117
],
118+
'logoCaption' => 'MockUSA staff',
109119
'logoURL' => 'https://static.gtis.guru/idp-logo/usa-logo.png'
110120
],
111121
'mock-wga-idp'=> [
@@ -115,6 +125,7 @@
115125
'name' => [
116126
'en' => 'wga'
117127
],
128+
'logoCaption' => 'MockWGA staff',
118129
'logoURL' => 'https://static.gtis.guru/idp-logo/wga-logo.png'
119130
],
120131
];

‎development/hub2/saml20-idp-remote.php‎

Lines changed: 12 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
'en' => 'IdP 3'
88
],
99
'IDPNamespace' => 'IDP-3',
10+
'logoCaption' => 'IDP-3 staff',
1011
'SingleSignOnService' => 'http://ssp-idp3.local:8087/saml2/idp/SSOService.php',
1112
'SingleLogoutService' => 'http://ssp-idp3.local:8087/saml2/idp/SingleLogoutService.php',
1213
'certData' => 'MIIDzzCCAregAwIBAgIJAPlZYTAQSIbHMA0GCSqGSIb3DQEBCwUAMH4xCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJOQzEPMA0GA1UEBwwGV2F4aGF3MQwwCgYDVQQKDANTSUwxDTALBgNVBAsMBEdUSVMxDjAMBgNVBAMMBVN0ZXZlMSQwIgYJKoZIhvcNAQkBFhVzdGV2ZV9iYWd3ZWxsQHNpbC5vcmcwHhcNMTYxMDE3MTIzMTQ1WhcNMjYxMDE3MTIzMTQ1WjB+MQswCQYDVQQGEwJVUzELMAkGA1UECAwCTkMxDzANBgNVBAcMBldheGhhdzEMMAoGA1UECgwDU0lMMQ0wCwYDVQQLDARHVElTMQ4wDAYDVQQDDAVTdGV2ZTEkMCIGCSqGSIb3DQEJARYVc3RldmVfYmFnd2VsbEBzaWwub3JnMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEArssOaeKbdOQFpN6bBolwSJ/6QFBXA73Sotg60anx9v6aYdUTmi+b7SVtvOmHDgsD5X8pN/6Z11QCZfTYg2nW3ZevGZsj8W/R6C8lRLHzWUr7e7DXKfj8GKZptHlUs68kn0ndNVt9r/+irJe9KBdZ+4kAihykomNdeZg06bvkklxVcvpkOfLTQzEqJAmISPPIeOXes6hXORdqLuRNTuIKarcZ9rstLnpgAs2TE4XDOrSuUg3XFnM05eDpFQpUb0RXWcD16mLCPWw+CPrGoCfoftD5ZGfll+W2wZ7d0kQ4TbCpNyxQH35q65RPVyVNPgSNSsFFkmdcqP9DsFqjJ8YC6wIDAQABo1AwTjAdBgNVHQ4EFgQUD6oyJKOPPhvLQpDCC3027QcuQwUwHwYDVR0jBBgwFoAUD6oyJKOPPhvLQpDCC3027QcuQwUwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAQEAA6tCLHJQGfXGdFerQ3J0wUu8YDSLb0WJqPtGdIuyeiywR5ooJf8G/jjYMPgZArepLQSSi6t8/cjEdkYWejGnjMG323drQ9M1sKMUhOJF4po9R3t7IyvGAL3fSqjXA8JXH5MuGuGtChWxaqhduA0dBJhFAtAXQ61IuIQF7vSFxhTwCvJnaWdWD49sG5OqjCfgIQdY/mw70e45rLnR/bpfoigL67sTJxy+Kx2ogbvMR6lITByOEQFMt7BYpMtXrwvKUM7k9NOo1jREmJacC8PTx//jRhCWwzUj1RsfIri24BuITrawwqMsYl8DZiiwMpjUf9m4NPaf4E7+QRpzo+MCcg==',
@@ -18,6 +19,7 @@
1819
'name' => [
1920
'en' => 'jaars'
2021
],
22+
'logoCaption' => 'JAARS staff',
2123
'logoURL' => 'https://static.gtis.guru/idp-logo/jaars-logo.png'
2224
];
2325
$metadata['sil-idp'] = [
@@ -27,25 +29,27 @@
2729
'name' => [
2830
'en' => 'sil'
2931
],
32+
'logoCaption' => 'SIL staff',
3033
'logoURL' => 'https://static.gtis.guru/idp-logo/sil-logo.png'
3134
];
32-
$metadata['usa-idp'] = [
35+
$metadata['partners-idp'] = [
3336
'enabled' => true,
3437
'metadata-set' => 'saml20-idp-remote',
35-
'entityid' => 'usa-idp',
38+
'entityid' => 'partners-idp',
3639
'name' => [
37-
'en' => 'usa'
40+
'en' => 'SIL Partners'
3841
],
39-
'logoURL' => 'https://static.gtis.guru/idp-logo/usa-logo.png'
42+
'logoCaption' => 'Partners of SIL',
43+
'logoURL' => 'https://static.gtis.guru/idp-logo/partners-logo-v3.png'
4044
];
41-
$metadata['wga-idp'] = [
45+
$metadata['usa-idp'] = [
4246
'enabled' => true,
4347
'metadata-set' => 'saml20-idp-remote',
44-
'entityid' => 'wga-idp',
48+
'entityid' => 'usa-idp',
4549
'name' => [
46-
'en' => 'wga'
50+
'en' => 'usa'
4751
],
48-
'logoURL' => 'https://static.gtis.guru/idp-logo/wga-logo.png'
52+
'logoURL' => 'https://static.gtis.guru/idp-logo/usa-logo.png'
4953
];
5054
$metadata['mock-jaars-idp'] = [
5155
'enabled' => false,
@@ -74,12 +78,3 @@
7478
],
7579
'logoURL' => 'https://static.gtis.guru/idp-logo/usa-logo.png'
7680
];
77-
$metadata['mock-wga-idp'] = [
78-
'enabled' => false,
79-
'metadata-set' => 'saml20-idp-remote',
80-
'entityid' => 'mock-wga-idp',
81-
'name' => [
82-
'en' => 'wga'
83-
],
84-
'logoURL' => 'https://static.gtis.guru/idp-logo/wga-logo.png'
85-
];

‎themes/material/default/selectidp-links.php‎

Lines changed: 50 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -81,10 +81,14 @@ function clickedAnyway(idpName) {
8181
?>
8282
<div class="mdl-card mdl-shadow--8dp row-aware" title="<?= $hoverText ?>">
8383
<div class="mdl-card__media white-bg fixed-height">
84-
<button class="mdl-button fill-parent" onclick="setSelectedIdp('<?= $idpId ?>')">
85-
<img class="scale-to-parent" id="<?= $idpId ?>"
86-
src="<?= empty($idp['logoURL']) ? 'default-logo.png'
87-
: $idp['logoURL'] ?>">
84+
<button class="mdl-button logo-container fill-parent" onclick="setSelectedIdp('<?= $idpId ?>')">
85+
<div class="image-wrapper">
86+
<img class="logo" id="<?= $idpId ?>"
87+
src="<?= empty($idp['logoURL']) ? 'default-logo.png'
88+
: $idp['logoURL'] ?>">
89+
</div>
90+
91+
<span class="mdl-color-text--grey-600 logo-caption clickable-caption"><?= empty($idp['logoCaption']) ? '<br>': htmlentities($idp['logoCaption']) ?> </span>
8892
</button>
8993
</div>
9094
</div>
@@ -100,11 +104,15 @@ function clickedAnyway(idpName) {
100104
?>
101105
<div class="mdl-card mdl-shadow--2dp disabled row-aware" title="<?= $hoverText ?>"
102106
onclick="clickedAnyway('<?= $name ?>')">
103-
<div class="mdl-card__media white-bg fixed-height" layout-children="row"
104-
child-spacing="center">
105-
<img class="scale-to-parent" id="<?= $idpId ?>"
106-
src="<?= empty($idp['logoURL']) ? 'default-logo.png'
107-
: $idp['logoURL'] ?>">
107+
<div class="mdl-card__media white-bg fixed-height" layout-children="row" child-spacing="center">
108+
<div class="logo-container fill-parent">
109+
<div class="image-wrapper">
110+
<img class="logo" id="<?= $idpId ?>"
111+
src="<?= empty($idp['logoURL']) ? 'default-logo.png'
112+
: $idp['logoURL'] ?>">
113+
</div>
114+
<span class="mdl-color-text--grey-600 logo-caption" ><?= empty($idp['logoCaption']) ? '<br>': htmlentities($idp['logoCaption']) ?> </span>
115+
</div>
108116
</div>
109117
</div>
110118
<?php
@@ -120,4 +128,37 @@ function clickedAnyway(idpName) {
120128
<?php include __DIR__ . '/../common-footer.php' ?>
121129
</div>
122130
</body>
131+
<style>
132+
.image-wrapper {
133+
display: flex;
134+
align-items: center;
135+
justify-content: center;
136+
height: 130px;
137+
}
138+
.logo-caption {
139+
font-size: 1.5rem;
140+
}
141+
@media only screen and (max-width: 1200px) {
142+
.logo-caption {
143+
font-size: 1.2rem;
144+
}
145+
}
146+
.logo-container {
147+
display: flex;
148+
flex-direction: column;
149+
align-items: center;
150+
justify-content: space-around;
151+
}
152+
.mdl-button:hover > .clickable-caption {
153+
color: #004F9E !important;
154+
}
155+
.mdl-card {
156+
border-radius: 8px;
157+
}
158+
.logo {
159+
max-height: 130px;
160+
max-width: 90%;
161+
padding-top: 4px;
162+
}
163+
</style>
123164
</html>

0 commit comments

Comments
 (0)