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

Commit 24e4f03

Browse files
longrunningprocesslongrunningprocess
authored
Merge pull request #57 from silinternational/develop
cross-browsers fixes for "get new codes here"
2 parents 9b38f8f + 40a2755 commit 24e4f03

File tree

6 files changed

+71
-48
lines changed

6 files changed

+71
-48
lines changed

‎dictionaries/login.definition.json‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
{
22
"title": {
3-
"en": "Login with your {idpName} account",
4-
"es": "Inicie sesión con su cuenta {idpName}",
5-
"fr": "Connectez-vous avec votre compte {idpName}",
6-
"ko": "{idpName} 계정으로 로그인하십시오."
3+
"en": "Login with your {idpName} identity",
4+
"es": "Inicie sesión con su identidad de {idpName}",
5+
"fr": "Connectez-vous avec votre identité {idpName}",
6+
"ko": "{idpName} 신원 계정으로 로그인하십시오."
77
},
88
"header": {
9-
"en": "Login with your {idpName} account",
10-
"es": "Inicie sesión con su cuenta {idpName}",
11-
"fr": "Connectez-vous avec votre compte {idpName}",
12-
"ko": "{idpName} 계정으로 로그인하십시오."
9+
"en": "Login with your {idpName} identity",
10+
"es": "Inicie sesión con su identidad de {idpName}",
11+
"fr": "Connectez-vous avec votre identité {idpName}",
12+
"ko": "{idpName} 신원 계정으로 로그인하십시오."
1313
},
1414
"label_username": {
1515
"en": "Username",

‎dictionaries/mfa.definition.json‎

Lines changed: 17 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -115,10 +115,10 @@
115115
"ko": "자기 보호"
116116
},
117117
"nag_info": {
118-
"en": "Did you know you could easily increase the security of your account by enabling 2-Step Verification?",
119-
"es": "¿Sabía que podría aumentar fácilmente la seguridad de su cuenta al habilitar la verificación en dos pasos?",
120-
"fr": "Savez-vous que vous pouvez facilement augmenter la sécurité de votre compte en activant la vérification en deux étapes?",
121-
"ko": "2 단계 인증을 사용하여 계정의 보안성을 쉽게 높일 수 있다는 사실을 알고 계셨습니까?"
118+
"en": "Did you know you could easily increase the security of your identity account by enabling 2-Step Verification?",
119+
"es": "¿Sabía que podría aumentar fácilmente la seguridad de su cuenta de identidad al habilitar la verificación en dos pasos?",
120+
"fr": "Savez-vous que vous pouvez facilement augmenter la sécurité de votre compte d'identité en activant la vérification en deux étapes?",
121+
"ko": "2 단계 인증을 사용하여 신원 계정의 보안을 쉽게 높일 수 있다는 사실을 알고 계셨습니까?"
122122
},
123123
"required_header": {
124124
"en": "Protect this account",
@@ -127,10 +127,10 @@
127127
"ko": "이 계정 보호"
128128
},
129129
"required_info": {
130-
"en": "Your account requires additional security, you must set up 2-Step Verification at this time.",
131-
"es": "Su cuenta requiere seguridad adicional, debe configurar la verificación en dos pasos en este momento",
132-
"fr": "Votre compte nécessite une sécurité supplémentaire, vous devez configurer la vérification en deux étapes en ce moment",
133-
"ko": "계정에 대한 추가 보안이 필요하므로 지금 2 단계 인증을 설정해야합니다."
130+
"en": "Your identity account requires additional security, you must set up 2-Step Verification at this time.",
131+
"es": "Su cuenta de identidad requiere seguridad adicional, debe configurar la verificación en dos pasos en este momento.",
132+
"fr": "Votre compte d'identité nécessite une sécurité supplémentaire, vous devez configurer la vérification en deux étapes en ce moment.",
133+
"ko": "신원 계정에 추가 보안이 필요하므로 현재 2 단계 인증을 설정해야합니다."
134134
},
135135
"running_out_header": {
136136
"en": "Almost out of printable codes",
@@ -181,10 +181,10 @@
181181
"ko": "새로운 인쇄 가능한 코드를 만드는 동안 문제가 발생했습니다. 불편을 끼쳐 드려 죄송합니다. 계속 진행 한 후 다음 주소로 구성을 확인하십시오. "
182182
},
183183
"account": {
184-
"en": "{idpName} account",
185-
"es": "Cuenta de {idpName}",
186-
"fr": "Compte {idpName}",
187-
"ko": "{idpName} 계정"
184+
"en": "{idpName} identity account",
185+
"es": "Cuenta de identidad de {idpName}",
186+
"fr": "Compte d'identité {idpName}",
187+
"ko": "{idpName} 신원 계정"
188188
},
189189
"has_options_besides_codes": {
190190
"en": "Thankfully you do have other 2-Step Verification options set up but you should create more Printable codes if you plan to need them in the future.",
@@ -300,16 +300,10 @@
300300
"fr": "Se rappeler de ce navigatuer pour 30 jours",
301301
"ko": "이 브라우저를 30일간 기억"
302302
},
303-
"remember_this_computer": {
304-
"en": "Remember this computer for 30 days",
305-
"es": "Recuerde esta computadora por 30 días",
306-
"fr": "Se rappeler de cet ordinatuer pour 30 jours",
307-
"ko": "이 컴퓨터를 30일간 기억"
308-
},
309-
"remember_this_browser": {
310-
"en": "Remember this browser for 30 days",
311-
"es": "Recuerde esta navegador por 30 días",
312-
"fr": "Se rappeler de ce navigatuer pour 30 jours",
313-
"ko": "이 브라우저를 30일간 기억"
303+
"unsupported": {
304+
"en": "Not supported in this browser",
305+
"es": "No compatible con este navegador",
306+
"fr": "Non pris en charge dans ce navigateur",
307+
"ko": "이 브라우저에서는 지원되지 않습니다."
314308
}
315309
}

‎dictionaries/selectidp.definition.json‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,22 @@
11

22
{
33
"title": {
4-
"en": "Login account",
5-
"es": "Cuenta de inicio de sesión",
6-
"fr": "Compte de connexion",
7-
"ko": "로그인 계정"
4+
"en": "Choose an identity account",
5+
"es": "Elige una cuenta de identidad",
6+
"fr": "Choisissez un compte d'identité",
7+
"ko": "ID 계정 선택"
88
},
99
"header": {
10-
"en": "Choose an account",
11-
"es": "elige una cuenta",
12-
"fr": "Choisissez un compte",
13-
"ko": "계정 선택"
10+
"en": "Choose an identity account",
11+
"es": "Elige una cuenta de identidad",
12+
"fr": "Choisissez un compte d'identité",
13+
"ko": "ID 계정 선택"
1414
},
1515
"enabled": {
16-
"en": "Login with your {idpName} account",
17-
"es": "Inicie sesión con su cuenta de {idpName}",
18-
"fr": "Connectez-vous avec votre compte {idpName}",
19-
"ko": "{idpName} 계정으로 로그인하십시오."
16+
"en": "Login with your {idpName} identity account",
17+
"es": "Inicie sesión con su cuenta de identidad {idpName}",
18+
"fr": "Connectez-vous avec votre compte d'identité {idpName}",
19+
"ko": "{idpName} 신원 계정으로 로그인하십시오."
2020
},
2121
"disabled": {
2222
"en": "{idpName} coming soon",

‎themes/material/common-head-elements.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
$colors = htmlentities($this->configuration->getValue('theme.color-scheme') ?: 'indigo-purple');
3333
?>
3434
<link rel="stylesheet" href="material.<?= $colors ?>.1.2.1.min.css">
35-
<link rel="stylesheet" href="styles.2.3.0.css">
35+
<link rel="stylesheet" href="styles.2.3.1.css">
3636

3737
<script async src="material.1.2.1.min.js"></script>
3838

‎themes/material/mfa/new-backup-codes.php‎

Lines changed: 27 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,32 @@
44
<title><?= $this->t('{material:mfa:title}') ?></title>
55

66
<?php include __DIR__ . '/../common-head-elements.php' ?>
7+
8+
<script src="bowser.1.8.0.min.js"></script>
9+
<script>
10+
function disableUnsupportedFeatures() {
11+
if (bowser.msie) {
12+
disablePrint();
13+
disableDownload();
14+
} else if (bowser.msedge) {
15+
disableDownload();
16+
}
17+
}
18+
19+
function disablePrint() {
20+
document.querySelector('button#print').disabled = true;
21+
document.querySelector('button#print').classList.add('not-allowed');
22+
document.querySelector('button#print').title = <?= json_encode($this->t('{material:mfa:unsupported}')) ?>;
23+
}
24+
25+
function disableDownload() {
26+
document.querySelector('a[download]').href = '';
27+
document.querySelector('a[download]').classList.add('mdl-button--disabled', 'not-allowed');
28+
document.querySelector('a[download]').title = <?= json_encode($this->t('{material:mfa:unsupported}')) ?>;
29+
}
30+
</script>
731
</head>
8-
<body class="gradient-bg">
32+
<body class="gradient-bg" onload="disableUnsupportedFeatures()">
933
<div class="mdl-layout mdl-layout--fixed-header fill-viewport">
1034
<header class="mdl-layout__header">
1135
<div class="mdl-layout__header-row">
@@ -32,7 +56,7 @@
3256
</p>
3357

3458
<div class="mdl-card mdl-shadow--8dp">
35-
<div class="mdl-card__supporting-text" layout-children="column" id="code-card">
59+
<div class="mdl-card__supporting-text ff-temp-flexbug-fix" layout-children="column" id="code-card">
3660
<?php
3761
$idpName = htmlentities($this->configuration->getValue('idp_display_name', $this->configuration->getValue('idp_name', '—')));
3862
?>
@@ -71,7 +95,7 @@ function printElement(selector) {
7195
window.print();
7296
}
7397
</script>
74-
<button class="mdl-button mdl-button--primary" type="button" onclick="printElement('#code-card')">
98+
<button class="mdl-button mdl-button--primary" type="button" onclick="printElement('#code-card')" id="print">
7599
<?= $this->t('{material:mfa:button_print}') ?>
76100
</button>
77101

‎www/styles.2.3.0.css‎ renamed to ‎www/styles.2.3.1.css‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,11 @@ pre {
3232
align-items: center;
3333
}
3434

35+
/* FF was only displaying 4 codes per column (even though there were 5) as a result of this bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1043520 */
36+
.ff-temp-flexbug-fix {
37+
padding-top: 0.5em;
38+
}
39+
3540
.code-container {
3641
display: flex;
3742
flex-direction: column;
@@ -181,7 +186,7 @@ i.material-icons.mdl-typography--display-4 {
181186
}
182187
}
183188

184-
.mdl-card.disabled {
189+
.mdl-card.disabled, .mdl-button[disabled].not-allowed, a[href=''][download].mdl-button--disabled.not-allowed {
185190
cursor: not-allowed;
186191
}
187192

0 commit comments

Comments
 (0)