Skip to content

Commit 2289e58

Browse files
committed
Merge pull request #621 from Martii/eolGoogleDeprecationAndMigrationReminder
EOL Google Auth for OpenID deprecation and migration announcement banner Auto-merge
2 parents efe9da3 + 7974dbb commit 2289e58

2 files changed

Lines changed: 13 additions & 10 deletions

File tree

libs/muExpress.js

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,13 @@ function renderFile(aRes, aPath, aOptions) {
2020
aOptions.isDev = isDev;
2121
}
2222

23-
// Hide the Google OAuth migration reminder for logged-in users
24-
// that don't use Google for authentication
25-
if (aOptions.authedUser && aOptions.authedUser
26-
.strategies.indexOf('google') === -1) {
27-
aOptions.hideReminder = true;
28-
}
23+
// Hide task for any reminder... See #484
24+
// NOTE: This code structure and CSS is always active for future reminders
25+
// so please do not remove unless refactoring in a new issue as a whole.
26+
// Example Code task and sync UI with banner text/link at `./includes/headerReminders`:
27+
// if (aOptions.authedUser && aOptions.authedUser.strategies.indexOf('google') === -1) {
28+
// aOptions.hideThisReminder = true;
29+
// }
2930

3031
aRes.set('Content-Type', 'text/html; charset=UTF-8');
3132
mu.compileAndRender(aPath, aOptions).pipe(aRes);
Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
<div class="reminders">
2-
{{^hideReminder}}
3-
<div class="alert alert-danger alert-dismissible small fade in" role="alert">
2+
{{^hideThisReminder}}
3+
<!--
4+
<div class="alert alert-info alert-dismissible small fade in" role="alert">
45
<button type="button" class="close" data-dismiss="alert"><span aria-hidden="true">&times;</span><span class="sr-only">Close</span></button>
5-
<p><i class="fa fa-fw fa-exclamation-triangle"></i> <b>REMINDER:</b> Don't miss out reading the <a class="alert-link" href="/announcements/Google_Authentication_Deprecation">Google Authentication Deprecation</a> with migration announcement.</p>
6+
<p><i class="fa fa-fw fa-exclamation-triangle"></i> <b>REMINDER:</b> Don't miss out reading the <a class="alert-link" href="/">descriptive</a> announcement.</p>
67
</div>
7-
{{/hideReminder}}
8+
-->
9+
{{/hideThisReminder}}
810
</div>

0 commit comments

Comments
 (0)