[java-idp-plugin-totp] branch main updated: JTOTP-4 - Migrate view to new IdP example look and feel
Scott Cantor
cantor.2 at osu.edu
Mon Feb 28 20:48:02 UTC 2022
This is an automated email from the git hooks/post-receive script.
scantor pushed a commit to branch main
in repository java-idp-plugin-totp.
View the commit online:
http://git.shibboleth.net/view/?p=java-idp-plugin-totp.git;a=commit;h=08ceb9f3e85dd8216f3043a4e082326ae749b7d8
The following commit(s) were added to refs/heads/main by this push:
new 08ceb9f JTOTP-4 - Migrate view to new IdP example look and feel
08ceb9f is described below
commit 08ceb9f3e85dd8216f3043a4e082326ae749b7d8
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Mon Feb 28 15:47:59 2022 -0500
JTOTP-4 - Migrate view to new IdP example look and feel
https://shibboleth.atlassian.net/browse/JTOTP-4
---
.../idp/plugin/authn/totp/views/totp-error.vm | 4 +-
.../shibboleth/idp/plugin/authn/totp/views/totp.vm | 129 ++++++++++-----------
2 files changed, 60 insertions(+), 73 deletions(-)
diff --git a/totp-impl/src/main/resources/net/shibboleth/idp/plugin/authn/totp/views/totp-error.vm b/totp-impl/src/main/resources/net/shibboleth/idp/plugin/authn/totp/views/totp-error.vm
index 465666c..a58208d 100644
--- a/totp-impl/src/main/resources/net/shibboleth/idp/plugin/authn/totp/views/totp-error.vm
+++ b/totp-impl/src/main/resources/net/shibboleth/idp/plugin/authn/totp/views/totp-error.vm
@@ -22,7 +22,5 @@
#end
#if ($message)
- <section>
- <p class="form-element form-error">$encoder.encodeForHTML($message)</p>
- </section>
+ <h3 class="output-message output--error">$encoder.encodeForHTML($message)</h3>
#end
diff --git a/totp-impl/src/main/resources/net/shibboleth/idp/plugin/authn/totp/views/totp.vm b/totp-impl/src/main/resources/net/shibboleth/idp/plugin/authn/totp/views/totp.vm
index 301621b..de11123 100644
--- a/totp-impl/src/main/resources/net/shibboleth/idp/plugin/authn/totp/views/totp.vm
+++ b/totp-impl/src/main/resources/net/shibboleth/idp/plugin/authn/totp/views/totp.vm
@@ -21,83 +21,72 @@
<!DOCTYPE html>
<html>
<head>
- <meta charset="utf-8">
- <meta name="viewport" content="width=device-width,initial-scale=1.0">
<title>#springMessageText("idp.title", "Web Login Service")</title>
- <link rel="stylesheet" type="text/css" href="$request.getContextPath()/css/main.css">
+ <meta charset="UTF-8" />
+ <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+ <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=5.0">
+ <link rel="stylesheet" type="text/css" href="$request.getContextPath()#springMessageText("idp.css", "/css/placeholder.css")">
+ #parse("custom-styles.vm")
</head>
<body>
- <div class="wrapper">
- <div class="container">
- <header>
- <img src="$request.getContextPath()#springMessage("idp.logo")" alt="#springMessageText("idp.logo.alt-text", "logo")">
- </header>
-
- <div class="content">
- <div class="column one">
- #parse("totp-error.vm")
-
- <form action="$flowExecutionUrl" method="post">
- #parse("csrf/csrf.vm")
+ <main class="main">
+ <header>
+ <img class="main-logo" src="$request.getContextPath()#springMessageText("idp.logo", "/images/placeholder-logo.png")" alt="#springMessageText("idp.logo.alt-text", "logo")" />
+
#set ($serviceName = $rpUIContext.serviceName)
#if ($serviceName && !$rpContext.getRelyingPartyId().contains($serviceName))
- <legend>
- #springMessageText("idp.login.loginTo", "Login to") $encoder.encodeForHTML($serviceName)
- </legend>
+ <h2>#springMessageText("idp.login.loginTo", "Login to") $encoder.encodeForHTML($serviceName)</h2>
#end
-
- <div class="form-element-wrapper">
- <label for="tokencode">#springMessageText("idp.totp.field", "Token Code")</label>
- <input class="form-element form-field" id="tokencode" name="tokencode" type="text" value="" />
- </div>
-
-
- <div class="form-element-wrapper">
- <button class="form-element form-button" type="submit" name="_eventId_proceed"
- onClick="this.childNodes[0].nodeValue='#springMessageText("idp.login.pleasewait", "Logging in, please wait...")'"
- >#springMessageText("idp.login.login", "Login")</button>
- </div>
- </form>
+ </header>
+
+ <section>
+ <form action="$flowExecutionUrl" method="post">
+ #parse("csrf/csrf.vm")
+
+ #*
+ //
+ // SP Description & Logo (optional)
+ // These idpui lines will display added information (if available
+ // in the metadata) about the Service Provider (SP) that requested
+ // authentication. These idpui lines are "active" in this example
+ // (not commented out) - this extra SP info will be displayed.
+ // Remove or comment out these lines to stop the display of the
+ // added SP information.
+ //
+ *#
+ #set ($logo = $rpUIContext.getLogo())
+ #if ($logo)
+ <img class="service-logo" src= "$encoder.encodeForHTMLAttribute($logo)" alt="$encoder.encodeForHTMLAttribute($serviceName)">
+ #end
+ #set ($desc = $rpUIContext.getServiceDescription())
+ #if ($desc)
+ <p>$encoder.encodeForHTML($desc)</p>
+ #end
+
+ #parse("totp-error.vm")
+
+ <fieldset>
+ <label for="tokencode">#springMessageText("idp.totp.field", "Token Code")</label>
+ <input id="tokencode" name="tokencode" type="text" value="" />
+ </fieldset>
- #*
- //
- // SP Description & Logo (optional)
- // These idpui lines will display added information (if available
- // in the metadata) about the Service Provider (SP) that requested
- // authentication. These idpui lines are "active" in this example
- // (not commented out) - this extra SP info will be displayed.
- // Remove or comment out these lines to stop the display of the
- // added SP information.
- //
- *#
- #set ($logo = $rpUIContext.getLogo())
- #if ($logo)
- <img src= "$encoder.encodeForHTMLAttribute($logo)"
- alt="$encoder.encodeForHTMLAttribute($serviceName)">
- #end
- #set ($desc = $rpUIContext.getServiceDescription())
- #if ($desc)
- $encoder.encodeForHTML($desc)
- #end
-
- </div>
- <div class="column two">
- <ul class="list list-help">
- #if ($passwordEnabled)
- <li class="list-help-item"><a href="#springMessageText("idp.url.password.reset", '#')"><span class="item-marker">›</span> #springMessageText("idp.login.forgotPassword", "Forgot your password?")</a></li>
- #end
- <li class="list-help-item"><a href="#springMessageText("idp.url.helpdesk", '#')"><span class="item-marker">›</span> #springMessageText("idp.login.needHelp", "Need Help?")</a></li>
- </ul>
- </div>
- </div>
- </div>
+ <fieldset>
+ <button type="submit" name="_eventId_proceed"
+ onClick="this.childNodes[0].nodeValue='#springMessageText("idp.login.pleasewait", "Logging in, please wait...")'"
+ >#springMessageText("idp.login.login", "Login")</button>
+ </fieldset>
+ </form>
- <footer>
- <div class="container container-footer">
- <p class="footer-text">#springMessageText("idp.footer", "Insert your footer text here.")</p>
- </div>
- </footer>
- </div>
-
+ <ul>
+ <li><a href="#springMessageText("idp.url.password.reset", '#')">#springMessageText("idp.login.forgotPassword", "Forgot your password?")</a></li>
+ <li><a href="#springMessageText("idp.url.helpdesk", '#')">#springMessageText("idp.login.needHelp", "Need Help?")</a></li>
+ </ul>
+ </section>
+ </main>
+ <footer class="footer">
+ <div class="cc">
+ <p>#springMessageText("idp.footer", "Insert your footer text here.")</p>
+ </div>
+ </footer>
</body>
</html>
\ No newline at end of file
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list