From 91d1afe296447e87fd24f379c47a894fd3a4950c Mon Sep 17 00:00:00 2001
From: Guillaume Rousse <guillaume.rousse@renater.fr>
Date: Thu, 24 May 2018 16:41:52 +0200
Subject: [PATCH] move forms buttons at bottom right, as originally
---
resources/css/style.css | 6 +++++
templates/web/complete_challenge.tt2.html | 24 ++++++++---------
templates/web/select_email.tt2.html | 25 ++++++++---------
templates/web/select_federation.tt2.html | 21 ++++++++-------
templates/web/select_sp.tt2.html | 33 ++++++++++++-----------
5 files changed, 59 insertions(+), 50 deletions(-)
diff --git a/resources/css/style.css b/resources/css/style.css
index 5c5956c..318ff06 100644
--- a/resources/css/style.css
+++ b/resources/css/style.css
@@ -101,6 +101,12 @@ main form {
/* prevent horizontal scrollbar */
overflow-x: hidden;
}
+.wizard > .actions {
+ position: relative;
+ display: block;
+ text-align: right;
+ width: 100%;
+}
/* Accounts profile */
.accounts {
diff --git a/templates/web/complete_challenge.tt2.html b/templates/web/complete_challenge.tt2.html
index b484012..373d256 100644
--- a/templates/web/complete_challenge.tt2.html
+++ b/templates/web/complete_challenge.tt2.html
@@ -1,5 +1,5 @@
[% WRAPPER index.tt2.html %]
-<div class="wizard clearfix vertical">
+<form class="wizard clearfix" action="[% app.url %]" method="get">
<div class="steps clearfix">
<ol>
<li class="done">[% lh.maketext("Select your federation") %]</li>
@@ -15,16 +15,16 @@
[% lh.maketext("An email challenge including a validation token has been emailed to you at [_1].", email) %]
[% lh.maketext("Please copy and paste the validation token in the form below to proof that you are administrator of this service.") %]
</p>
- <form action="[% app.url %]" method="get">
- <label for="token">[% lh.maketext("Please provide the validation token here:") %]</label>
- <br/>
- <input name="token" value="" id="token" type="text" class="required error"/>
- <br/>
- <input type="hidden" name="entityid" value="[% entityid %]"/>
- <input type="hidden" name="email" value="[% email %]"/>
- <button class="button" type="submit" name="action" value="select_email">[% lh.maketext("Previous") %]</button>
- <button class="button" type="submit" name="action" value="create_accounts">[% lh.maketext("Next") %]</button>
- </form>
+ <label for="token">[% lh.maketext("Please provide the validation token here:") %]</label>
+ <br/>
+ <input name="token" value="" id="token" type="text" class="required error"/>
+ <input type="hidden" name="entityid" value="[% entityid %]"/>
+ <input type="hidden" name="email" value="[% email %]"/>
</div>
-</div>
+
+ <div class="actions clearfix">
+ <button type="submit" class="button" name="action" value="select_email">[% lh.maketext("Previous") %]</button>
+ <button type="submit" class="button" name="action" value="create_accounts">[% lh.maketext("Next") %]</button>
+ </div>
+</form>
[% END %]
diff --git a/templates/web/select_email.tt2.html b/templates/web/select_email.tt2.html
index e4b0187..e7d198f 100644
--- a/templates/web/select_email.tt2.html
+++ b/templates/web/select_email.tt2.html
@@ -1,5 +1,5 @@
[% WRAPPER index.tt2.html %]
-<div class="wizard clearfix">
+<form class="wizard clearfix" action="[% app.url %]" method="get">
<div class="steps clearfix">
<ol>
<li class="done">[% lh.maketext("Select your federation") %]</li>
@@ -14,18 +14,14 @@
<p>[% lh.maketext("Before you can create test accounts at this Identity Provider, we need to ensure you are a legitimate administrator of '[_1]'.", sp.displayname) %]</p>
[% IF sp.contacts.defined %]
- <form action="[% app.url %]" method="get">
- <p>[% lh.maketext("Select the email address where an email challenge can be sent to validate your identity:") %]</p>
+ <p>[% lh.maketext("Select the email address where an email challenge can be sent to validate your identity:") %]</p>
[% FOREACH email IN sp.contacts.sort %]
- <input id="[% email %]" name="email" value="[% email %]" type="radio" class="required"/>
- <label for="[% email %]">[% email %]</label>
- <br/>
+ <input id="[% email %]" name="email" value="[% email %]" type="radio" class="required"/>
+ <label for="[% email %]">[% email %]</label>
+ <br/>
[% END %]
- <div class="callout primary">[% lh.maketext("Those email addresses have been extracted from your service metadata.") %]</div>
- <input type="hidden" name="entityid" value="[% sp.entityid %]"/>
- <button class="button" type="submit" name="action" value="select_sp">[% lh.maketext("Previous") %]</button>
- <button class="button" type="submit" name="action" value="complete_challenge">[% lh.maketext("Next") %]</button>
- </form>
+ <div class="callout primary">[% lh.maketext("Those email addresses have been extracted from your service metadata.") %]</div>
+ <input type="hidden" name="entityid" value="[% sp.entityid %]"/>
[% ELSE %]
<p>
[% lh.maketext("No ContactPerson element could be found in your service metadata, therefore we are unable to provide test accounts for this service.") %]
@@ -33,5 +29,10 @@
</p>
[% END %]
</div>
-</div>
+
+ <div class="actions clearfix">
+ <button type="submit" class="button" name="action" value="select_sp">[% lh.maketext("Previous") %]</button>
+ <button type="submit" class="button" name="action" value="complete_challenge">[% lh.maketext("Next") %]</button>
+ </div>
+</form>
[% END %]
diff --git a/templates/web/select_federation.tt2.html b/templates/web/select_federation.tt2.html
index acf9783..de7fd7e 100644
--- a/templates/web/select_federation.tt2.html
+++ b/templates/web/select_federation.tt2.html
@@ -1,5 +1,5 @@
[% WRAPPER index.tt2.html %]
-<div class="wizard clearfix">
+<form class="wizard clearfix" action="[% app.url %]" method="get">
<div class="steps clearfix">
<ol>
<li class="current">[% lh.maketext("Select your federation") %]</li>
@@ -12,16 +12,17 @@
<div class="content clearfix">
<h2>[% lh.maketext("Select your federation") %]</h2>
- <form action="[% app.url %]" method="get">
- <p>[% lh.maketext("Select the federation corresponding to the service you want to test::") %]</p>
+ <p>[% lh.maketext("Select the federation corresponding to the service you want to test::") %]</p>
[% FOREACH federation IN federations.sort %]
- <input id="[% federation %]" name="federation" value="[% federation %]" type="radio" class="required"/>
- <label for="[% federation %]">[% federation %]</label>
- <br/>
+ <input id="[% federation %]" name="federation" value="[% federation %]" type="radio" class="required"/>
+ <label for="[% federation %]">[% federation %]</label>
+ <br/>
[% END %]
- <button class="button disabled" type="submit" name="action" value="">[% lh.maketext("Previous") %]</button>
- <button class="button" type="submit" name="action" value="select_sp">[% lh.maketext("Next") %]</button>
- </form>
</div>
-</div>
+
+ <div class="actions clearfix">
+ <button type="submit" class="button" name="action" value="">[% lh.maketext("Previous") %]</button>
+ <button type="submit" class="button" name="action" value="select_sp">[% lh.maketext("Next") %]</button>
+ </div>
+</form>
[% END %]
diff --git a/templates/web/select_sp.tt2.html b/templates/web/select_sp.tt2.html
index 4962f79..353bceb 100644
--- a/templates/web/select_sp.tt2.html
+++ b/templates/web/select_sp.tt2.html
@@ -1,5 +1,5 @@
[% WRAPPER index.tt2.html %]
-<div class="wizard clearfix">
+<form class="wizard clearfix" action="[% app.url %]" method="get">
<div class="steps clearfix">
<ol>
<li class="done">[% lh.maketext("Select your federation") %]</li>
@@ -16,22 +16,23 @@
[% lh.maketext("You must be an administrator of that service to continue afterwards.") %]
</p>
- <form action="[% app.url %]" method="get">
- <label for="entityid">[% lh.maketext("Type the name or entityID of service to test:") %]</label>
- <br/>
- <select id="entityid" name="entityid" class="required">
- <option value=""></option>
- [% FOREACH entity IN metadata.sort('display_name') %]
- <option value="[% entity.entityid %]">[% entity.display_name %]</option>
- [% END %]
- </select>
- <p>[% lh.maketext("Only Service Providers included in eduGAIN metadata are included in the list.") %]</p>
- <input type="hidden" name="federation" value="[% federation %]"/>
- <button type="submit" class="button" name="action" value="select_federation">[% lh.maketext("Previous") %]</button>
- <button type="submit" class="button" name="action" value="select_email">[% lh.maketext("Next") %]</button>
- </form>
+ <label for="entityid">[% lh.maketext("Type the name or entityID of service to test:") %]</label>
+ <br/>
+ <select id="entityid" name="entityid" class="required">
+ <option value=""></option>
+ [% FOREACH entity IN metadata.sort('display_name') %]
+ <option value="[% entity.entityid %]">[% entity.display_name %]</option>
+ [% END %]
+ </select>
+ <p>[% lh.maketext("Only Service Providers included in eduGAIN metadata are included in the list.") %]</p>
+ <input type="hidden" name="federation" value="[% federation %]"/>
</div>
-</div>
+
+ <div class="actions clearfix">
+ <button type="submit" class="button" name="action" value="select_federation">[% lh.maketext("Previous") %]</button>
+ <button type="submit" class="button" name="action" value="select_email">[% lh.maketext("Next") %]</button>
+ </div>
+</form>
<script type="text/javascript">
$( document ).ready(function() {
--
GitLab