diff --git a/lib/AccountManager/L10N/fr.pm b/lib/AccountManager/L10N/fr.pm
index 8add8124cb350b701cf72f84d26625c3a7387563..ccc3c7a3ed1df8a38a96f31abeb23ffb3e38474e 100644
--- a/lib/AccountManager/L10N/fr.pm
+++ b/lib/AccountManager/L10N/fr.pm
@@ -76,7 +76,7 @@ our %Lexicon = (
"Select the federation corresponding to the service you want to test:" => "Sélectionner la fédération correspondant au service à tester:",
"As part of the GÉANT 2020 Framework Partnership Agreement (FPA), this project receives funding from the European Union’s Horizon 2020 research and innovation programme under Grant Agreement No. 731122 (GN4-2)." => "En tant que membre de l'accord GÉANT 2020 Framework Partnership Agreement (FPA), ce projet bénéficie d'un financement du programme de recherche de l'Union Européenne Horizon 2020 sous l'agrément No. 731122 (GN4-2).",
"Test another service" => "Tester un autre service",
- "This field is required" => "Ce champ est requis",
+ "This information is required" => "Cette information est nécessaire",
);
1;
diff --git a/resources/css/style.css b/resources/css/style.css
index 318ff06b314d6bf541cfd4480009304676dcafa7..e7b54d7029cadda4aa0a0bc95dc725204cf59fee 100644
--- a/resources/css/style.css
+++ b/resources/css/style.css
@@ -80,7 +80,7 @@ main form {
.wizard > .content .custom-combobox {
position: relative;
display: inline-block;
- width: 90%;
+ width: 95%;
}
.wizard > .content .custom-combobox-toggle {
position: absolute;
@@ -92,7 +92,7 @@ main form {
.wizard > .content .custom-combobox-input {
margin: 0;
padding: 5px 10px;
- width: 90%;
+ width: 100%;
}
.wizard > .content .ui-autocomplete {
@@ -101,6 +101,12 @@ main form {
/* prevent horizontal scrollbar */
overflow-x: hidden;
}
+.wizard > .content label.error {
+ display: block;
+ color: #FFFFFF;
+ width: 100%;
+ background: #F04124;
+}
.wizard > .actions {
position: relative;
display: block;
diff --git a/templates/web/complete_challenge.tt2.html b/templates/web/complete_challenge.tt2.html
index ee95b9a3f293a62efae409960325277f93c9ddef..dc5b39b1da1c19a030bf5c0d8889d13b550bbae8 100644
--- a/templates/web/complete_challenge.tt2.html
+++ b/templates/web/complete_challenge.tt2.html
@@ -15,12 +15,14 @@
[% 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>
- <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="federation" value="[% federation %]"/>
- <input type="hidden" name="entityid" value="[% entityid %]"/>
- <input type="hidden" name="email" value="[% email %]"/>
+ <fieldset>
+ <legend>[% lh.maketext("Please provide the validation token here:") %]</legend>
+ <input name="token" value="" id="token" type="text" class="required"/>
+ <label for="token" class="error"></label>
+ <input type="hidden" name="federation" value="[% federation %]"/>
+ <input type="hidden" name="entityid" value="[% entityid %]"/>
+ <input type="hidden" name="email" value="[% email %]"/>
+ </fieldset>
</div>
<div class="actions clearfix">
@@ -31,7 +33,7 @@
<script type="text/javascript">
$( document ).ready(function() {
- $.validator.messages.required = "[% lh.maketext("This field is required") %]";
+ $.validator.messages.required = "[% lh.maketext("This information is required") %]";
$("form").validate();
});
</script>
diff --git a/templates/web/select_email.tt2.html b/templates/web/select_email.tt2.html
index 80f965ea00e4fe0840388cd42a3b3adba1ee052e..55348857fcad451a45854d2ffc9a2bcdb6bf32b8 100644
--- a/templates/web/select_email.tt2.html
+++ b/templates/web/select_email.tt2.html
@@ -14,15 +14,18 @@
<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 %]
- <p>[% lh.maketext("Select the email address where an email challenge can be sent to validate your identity:") %]</p>
+ <fieldset>
+ <legend>[% lh.maketext("Select the email address where an email challenge can be sent to validate your identity:") %]</legend>
[% 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 %]
+ <label for="email" class="error"></label>
+ <input type="hidden" name="federation" value="[% federation %]"/>
+ <input type="hidden" name="entityid" value="[% sp.entityid %]"/>
+ </fieldset>
<div class="callout primary">[% lh.maketext("Those email addresses have been extracted from your service metadata.") %]</div>
- <input type="hidden" name="federation" value="[% federation %]"/>
- <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.") %]
@@ -39,7 +42,7 @@
<script type="text/javascript">
$( document ).ready(function() {
- $.validator.messages.required = "[% lh.maketext("This field is required") %]";
+ $.validator.messages.required = "[% lh.maketext("This information is required") %]";
$("form").validate();
});
</script>
diff --git a/templates/web/select_federation.tt2.html b/templates/web/select_federation.tt2.html
index bc65ca52d161136f0e385f65ef45c6a1dc0d49b2..c19432d3ac1a067bb8c6e908e956489e83c79400 100644
--- a/templates/web/select_federation.tt2.html
+++ b/templates/web/select_federation.tt2.html
@@ -12,12 +12,15 @@
<div class="content clearfix">
<h2>[% lh.maketext("Select a federation") %]</h2>
- <p>[% lh.maketext("Select the federation corresponding to the service you want to test::") %]</p>
+ <fieldset>
+ <legend>[% lh.maketext("Select the federation corresponding to the service you want to test:") %]</legend>
[% 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 %]
+ <label for="federation" class="error"></label>
+ </fieldset>
</div>
<div class="actions clearfix">
@@ -28,7 +31,7 @@
<script type="text/javascript">
$( document ).ready(function() {
- $.validator.messages.required = "[% lh.maketext("This field is required") %]";
+ $.validator.messages.required = "[% lh.maketext("This information is required") %]";
$("form").validate();
});
</script>
diff --git a/templates/web/select_sp.tt2.html b/templates/web/select_sp.tt2.html
index 08c5949bc1649172f49add23ec8bd678dd79dda9..1e28d39853f1e51fe46db2fa9024d36329a05c2e 100644
--- a/templates/web/select_sp.tt2.html
+++ b/templates/web/select_sp.tt2.html
@@ -16,16 +16,18 @@
[% lh.maketext("You must be an administrator of that service to continue afterwards.") %]
</p>
- <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>
+ <fieldset>
+ <legend for="entityid">[% lh.maketext("Type the name or entityID of service to test:") %]</legend>
+ <select id="entityid" name="entityid">
+ <option value=""></option>
[% FOREACH entity IN metadata.sort('display_name') %]
- <option value="[% entity.entityid %]">[% entity.display_name %]</option>
+ <option value="[% entity.entityid %]">[% entity.display_name %]</option>
[% END %]
- </select>
+ </select>
+ <label for="entityid_combobox" class="error"></label>
+ <input type="hidden" name="federation" value="[% federation %]"/>
+ </fieldset>
<div class="callout primary">[% lh.maketext("Those service providers have been extracted from the selected federation metadata.") %]</div>
- <input type="hidden" name="federation" value="[% federation %]"/>
</div>
<div class="actions clearfix">
@@ -49,13 +51,16 @@ $( document ).ready(function() {
_createAutocomplete: function() {
var selected = this.element.children( ":selected" ),
+ id = this.element.attr('id'),
value = selected.val() ? selected.text() : "";
this.input = $( "<input>" )
.appendTo( this.wrapper )
.val( value )
.attr( "title", "" )
- .addClass( "custom-combobox-input ui-widget ui-widget-content ui-state-default ui-corner-left error required" )
+ .attr('id', id + '_combobox')
+ .attr('name', id + '_combobox')
+ .addClass( "custom-combobox-input ui-widget ui-widget-content ui-state-default ui-corner-left required" )
.autocomplete({
delay: 0,
minLength: 0,
@@ -165,7 +170,7 @@ $( document ).ready(function() {
});
$( "#entityid" ).combobox();
- $.validator.messages.required = "[% lh.maketext("This field is required") %]";
+ $.validator.messages.required = "[% lh.maketext("This information is required") %]";
$("form").validate();
});
</script>