Skip to content

Commit

Permalink
Merge pull request #54 from UKHomeOffice/feat/PM-10791-rscas-theme
Browse files Browse the repository at this point in the history
feat: PM-10791 added rscas theme with changes to content
  • Loading branch information
David James authored Oct 18, 2021
2 parents a26d27e + a896e85 commit 8b8186f
Show file tree
Hide file tree
Showing 8 changed files with 115 additions and 2 deletions.
Binary file removed .DS_Store
Binary file not shown.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -47,5 +47,6 @@ package-lock.json

#IDE
.idea
.DS_Store


3 changes: 2 additions & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ mariadb:

keycloak:
container_name: keycloak
image: quay.io/ukhomeofficedigital/keycloak:v11.0.2-5
image: quay.io/ukhomeofficedigital/keycloak:v15.0.2
ports:
- "8080:8080"
links:
Expand All @@ -27,6 +27,7 @@ keycloak:
- ./hmpo-lev/:/opt/jboss/keycloak/themes/hmpo-lev/
- ./govuk-social-providers/:/opt/jboss/keycloak/themes/govuk-social-providers/
- ./govuk-drt/:/opt/jboss/keycloak/themes/govuk-drt/
- ./govuk-rscas/:/opt/jboss/keycloak/themes/govuk-rscas/
environment:
DB_VENDOR: "mariadb"
MARIADB_PORT: "3306"
Expand Down
35 changes: 35 additions & 0 deletions govuk-rscas/login/login-config-totp.ftl
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
<#import "template.ftl" as layout>
<@layout.registrationLayout displayInfo=true; section>
<#if section = "title">
${msg("loginTotpTitle")}
<#elseif section = "header">
${msg("loginTotpTitle")}
<#elseif section = "form">
<ol id="kc-totp-settings" class="list list-number">
<li>
<p>${msg("loginTotpStep1")}</p>
</li>
<li>
<p>${msg("loginTotpStep2")}</p>
<img id="kc-totp-secret-qr-code" src="data:image/png;base64, ${totp.totpSecretQrCode}" alt="Figure: Barcode"><br/>
<span class="code">${totp.totpSecretEncoded}</span>
</li>
<li>
<p>${msg("loginTotpStep3")}</p>
</li>
</ol>
<form action="${url.loginAction}" class="${properties.kcFormClass!}" id="kc-totp-settings-form" method="post">
<div class="${properties.kcFormGroupClass!}">
<div class="${properties.kcLabelWrapperClass!}">
<label for="totp" class="${properties.kcLabelClass!}">${msg("loginTotpOneTime")}</label>
</div>
<div class="${properties.kcInputWrapperClass!}">
<input type="text" id="totp" name="totp" autocomplete="off" class="${properties.kcInputClass!}" />
</div>
<input type="hidden" id="totpSecret" name="totpSecret" value="${totp.totpSecret}" />
</div>

<input class="${properties.kcButtonClass!} ${properties.kcButtonPrimaryClass!} ${properties.kcButtonLargeClass!}" type="submit" value="${msg("doSubmit")}"/>
</form>
</#if>
</@layout.registrationLayout>
71 changes: 71 additions & 0 deletions govuk-rscas/login/login-otp.ftl
Original file line number Diff line number Diff line change
@@ -0,0 +1,71 @@
<#import "template.ftl" as layout>
<@layout.registrationLayout; section>
<#if section="header">
${msg("doLogIn")}
<#elseif section="form">
<form id="kc-otp-login-form" class="${properties.kcFormClass!}" action="${url.loginAction}"
method="post">
<#if otpLogin.userOtpCredentials?size gt 1>
<div class="${properties.kcFormGroupClass!}">
<div class="${properties.kcInputWrapperClass!}">
<#list otpLogin.userOtpCredentials as otpCredential>
<div class="${properties.kcSelectOTPListClass!}">
<input type="hidden" value="${otpCredential.id}">
<div class="${properties.kcSelectOTPListItemClass!}">
<span class="${properties.kcAuthenticatorOtpCircleClass!}"></span>
<h2 class="${properties.kcSelectOTPItemHeadingClass!}">
${otpCredential.userLabel}
</h2>
</div>
</div>
</#list>
</div>
</div>
</#if>

<div class="${properties.kcFormGroupClass!}">
<div class="${properties.kcLabelWrapperClass!}">
<label for="otp" class="${properties.kcLabelClass!}">${msg("loginOtpOneTime")}</label>
</div>
<p>The one-time code is available in the Google Authenticator application, which you downloaded to your mobile phone when you set up this account</p>

<div class="${properties.kcInputWrapperClass!}">
<input id="otp" name="otp" autocomplete="off" type="text" class="${properties.kcInputClass!}"
autofocus/>
</div>
</div>

<div class="${properties.kcFormGroupClass!}">
<div id="kc-form-options" class="${properties.kcFormOptionsClass!}">
<div class="${properties.kcFormOptionsWrapperClass!}">
</div>
</div>

<div id="kc-form-buttons" class="${properties.kcFormButtonsClass!}">
<input
class="${properties.kcButtonClass!} ${properties.kcButtonPrimaryClass!} ${properties.kcButtonBlockClass!} ${properties.kcButtonLargeClass!}"
name="login" id="kc-login" type="submit" value="${msg("doLogIn")}" />
</div>
</div>
</form>
<script type="text/javascript" src="${url.resourcesCommonPath}/node_modules/jquery/dist/jquery.min.js"></script>
<script type="text/javascript">
$(document).ready(function() {
// Card Single Select
$('.card-pf-view-single-select').click(function() {
if ($(this).hasClass('active'))
{ $(this).removeClass('active'); $(this).children().removeAttr('name'); }
else
{ $('.card-pf-view-single-select').removeClass('active');
$('.card-pf-view-single-select').children().removeAttr('name');
$(this).addClass('active'); $(this).children().attr('name', 'selectedCredentialId'); }
});
var defaultCred = $('.card-pf-view-single-select')[0];
if (defaultCred) {
defaultCred.click();
}
});
</script>
</#if>
</@layout.registrationLayout>
3 changes: 3 additions & 0 deletions govuk-rscas/login/messages/messages_en.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@

loginTotpStep1=Install the Google Authenticator application on your mobile phone
loginTotpOneTime=Code from Google Authenticator
1 change: 1 addition & 0 deletions govuk-rscas/login/theme.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
parent=govuk
3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,14 +21,15 @@
"build:sass:govuk_elements-ie8": "npm-sass sass/govuk_elements-ie8.scss > govuk/login/resources/css/govuk_elements-ie8.css",
"build:sass:govuk-internal": "npm-sass sass/govuk-internal/govuk-internal.scss > govuk-internal/login/resources/css/govuk-internal.css",
"build:sass:govuk-cop": "npm-sass sass/govuk-cop/govuk-cop.scss > govuk-cop/login/resources/css/govuk-cop.css",
"dist": "mkdir -p dist && npm-run-all dist:govuk dist:govuk-social-providers dist:govuk-internal dist:govuk-cop dist:hmpo-lev dist:govuk-drt dist:govuk-internal-dq dist:govuk-internal-cba",
"dist": "mkdir -p dist && npm-run-all dist:govuk dist:govuk-social-providers dist:govuk-internal dist:govuk-cop dist:hmpo-lev dist:govuk-drt dist:govuk-internal-dq dist:govuk-internal-cba dist:govuk-rscas",
"dist:govuk": "tar -czf dist/govuk.tar.gz govuk/",
"dist:govuk-social-providers": "tar -czf dist/govuk-social-providers.tar.gz govuk-social-providers/",
"dist:govuk-internal": "tar -czf dist/govuk-internal.tar.gz govuk-internal/",
"dist:govuk-cop": "tar -czf dist/govuk-cop.tar.gz govuk-cop/",
"dist:hmpo-lev": "tar -czf dist/hmpo-lev.tar.gz hmpo-lev/",
"dist:govuk-drt": "tar -czf dist/govuk-drt.tar.gz govuk-drt/",
"dist:govuk-internal-dq": "tar -czf dist/govuk-internal-dq.tar.gz govuk-internal-dq/",
"dist:govuk-rscas": "tar -czf dist/govuk-rscas.tar.gz govuk-rscas/",
"dist:govuk-internal-cba": "tar -czf dist/govuk-internal-cba.tar.gz govuk-internal-cba/",
"clean": "rm -rf govuk/login/resources/ govuk-internal/login/resources govuk-cop/login/resources/css dist/"
}
Expand Down

0 comments on commit 8b8186f

Please sign in to comment.