Author: coudot
Date: 2010-07-27 18:50:52 +0200 (Tue, 27 Jul 2010)
New Revision: 105
Modified:
self-service-password/trunk/lang/en.inc.php
self-service-password/trunk/pages/change.php
Log:
Better action choice (references #258)
Modified: self-service-password/trunk/lang/en.inc.php
===================================================================
--- self-service-password/trunk/lang/en.inc.php 2010-07-27 16:50:09 UTC (rev
104)
+++ self-service-password/trunk/lang/en.inc.php 2010-07-27 16:50:52 UTC (rev
105)
@@ -70,7 +70,9 @@
$messages['answernomatch'] = "Your answer is not correct";
$messages['resetbyquestionshelp'] = "Choose a question and answer it to reset
your password. This requires to have already <a
href=\"?action=setquestions\">register an answer</a>.";
$messages['changehelp'] = "Enter your old password and choose a new one.";
-$messages['changehelpquestions'] = "If you forgot your old password, you can
try to <a href=\"?action=resetbyquestions\">reset your password by answering
questions</a>.";
+$messages['changehelpreset'] = "If you forgot your old password, you can try:";
+$messages['changehelpquestions'] = "to <a
href=\"?action=resetbyquestions\">reset your password by answering
questions</a>";
+$messages['changehelptoken'] = "to <a href=\"?action=resetbytoken\">reset your
password with a mail challenge</a>";
$messages['resetmessage'] = "Hello {login},\n\nClick here to reset your
password:\n{url}\n\nIf your are not the issuer of this request, please ignore
it.";
$messages['resetsubject'] = "Reset your password";
$messages['sendtokenhelp'] = "Enter your login and your password to reset your
password. Then click on the link in sent mail.";
Modified: self-service-password/trunk/pages/change.php
===================================================================
--- self-service-password/trunk/pages/change.php 2010-07-27 16:50:09 UTC
(rev 104)
+++ self-service-password/trunk/pages/change.php 2010-07-27 16:50:52 UTC
(rev 105)
@@ -142,10 +142,19 @@
if ( $show_help ) {
echo "<div class=\"help\"><p>";
echo $messages["changehelp"];
- if ( $use_questions ) {
- echo " " . $messages["changehelpquestions"];
+ echo "</p>";
+ if ( $use_questions or $use_tokens ) {
+ echo "<p>". $messages["changehelpreset"] . "</p>";
+ echo "<ul>";
+ if ( $use_questions ) {
+ echo "<li>" . $messages["changehelpquestions"] ."</li>";
+ }
+ if ( $use_tokens ) {
+ echo "<li>" . $messages["changehelptoken"] ."</li>";
+ }
+ echo "</ul>";
}
- echo "</p></div>\n";
+ echo "</div>\n";
}
?>
_______________________________________________
ltb-changes mailing list
[email protected]
http://lists.ltb-project.org/listinfo/ltb-changes
