search

yblatti / issue-test

0 stars 0 forks source link

Supprimer l'espace dans le message de ré-initialisation de mot de passe [redmine:32478] #85

Open yblatti opened 3 years ago

yblatti commented 3 years ago

Original author : Yves Blatti

Sur Outlook, si on sélectionne le code de réinitialisation pour le copier un espace en fin de chaine vient toujours avec.

Il faudrait accoler la fin de paragraphe, donc remplacer : 

<code class="html">
<!DOCTYPE html SYSTEM "http://www.thymeleaf.org/dtd/xhtml1-strict-thymeleaf-spring4-4.dtd">
<!--
Copyright (C) 2017 arx iT

This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.

This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
GNU General Public License for more details.

You should have received a copy of the GNU General Public License
along with this program.  If not, see <http://www.gnu.org/licenses/>.
-->
<html xmlns="http://www.w3.org/1999/xhtml"
      xmlns:th="http://www.thymeleaf.org"
      xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout"
      layout:decorator="html/layout/master">

    <head>
        <title th:text="#{email.passwordReset.subject}">{Extract}</title>
    </head>

    <body>
        <div layout:fragment="content">
            <p th:text="#{email.passwordReset.requested}">{You requested a password reset token.}</p>
            <p>
                <span th:text="#{email.passwordReset.code.insert}">{Insert the code below in the reset form.}</span>
                <span th:text="#{email.passwordReset.code.expiration}">{The code will expire in 20 minutes.}</span>
            </p>
            <p>
                <span class="label" th:text="#{email.passwordReset.code.label}"></span>
                <span class="code" th:text="${token}">{Code}</span>
            </p>
            <p th:text="#{email.passwordReset.notRequested.ignore}">{If you didn't request it, nevermind.}</p>
        </div>
    </body>
</html>

Par :

<code class="html">
<!DOCTYPE html SYSTEM "http://www.thymeleaf.org/dtd/xhtml1-strict-thymeleaf-spring4-4.dtd">
<!--
Copyright (C) 2017 arx iT

This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.

This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
GNU General Public License for more details.

You should have received a copy of the GNU General Public License
along with this program.  If not, see <http://www.gnu.org/licenses/>.
-->
<html xmlns="http://www.w3.org/1999/xhtml"
      xmlns:th="http://www.thymeleaf.org"
      xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout"
      layout:decorator="html/layout/master">

    <head>
        <title th:text="#{email.passwordReset.subject}">{Extract}</title>
    </head>

    <body>
        <div layout:fragment="content">
            <p th:text="#{email.passwordReset.requested}">{You requested a password reset token.}</p>
            <p>
                <span th:text="#{email.passwordReset.code.insert}">{Insert the code below in the reset form.}</span>
                <span th:text="#{email.passwordReset.code.expiration}">{The code will expire in 20 minutes.}</span>
            </p>
            <p><span class="label" th:text="#{email.passwordReset.code.label}"></span> <span class="code" th:text="${token}">{Code}</span></p>
            <p th:text="#{email.passwordReset.notRequested.ignore}">{If you didn't request it, nevermind.}</p>
        </div>
    </body>
</html>

Version : Prochain lot