From eb973d54dd9ecbe7f2ab3a1b686d525025221a87 Mon Sep 17 00:00:00 2001
From: Luc Didry <luc@didry.org>
Date: Aug 17 2020 08:36:29 +0000
Subject: 🔀 Merge branch 'development'


---

diff --git a/CHANGELOG b/CHANGELOG
index 79438a8..0e5509a 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,7 @@
 Revision history for Lufi
 
 ?.??.? ????-??-??
+	- 🐛 Fix incorrect HTML in delays.html.ep (#207)
 
 0.05.3 2020-08-17
 	- 🐛 Check if provisioning lockfile mod time exists before using it (#208)
diff --git a/themes/default/templates/delays.html.ep b/themes/default/templates/delays.html.ep
index 39f59ca..94c73e6 100644
--- a/themes/default/templates/delays.html.ep
+++ b/themes/default/templates/delays.html.ep
@@ -4,35 +4,39 @@
     <div class="modal-content">
         <h1><%= l('Information about delays') %></h1>
         <div class="text-left">
-            <p><%= l('If you choose a delay, the file will be deleted after that delay.') %><br>
-               <%= l('Don\'t worry: if a user begins to download the file before the expiration and the download ends after the expiration, he will be able to get the file.') %>
-        % if (defined(config('delay_for_size'))) {
-            <p><%= l('This server sets limitations according to the file size. The expiration delay of your file will be the minimum between what you choose and the following limitations:') %></p>
-            <ul>
-            % my $delays   = config('delay_for_size');
-            % $delays->{0} = max_delay;
-            % my @keys     = sort {$a <=> $b} keys %{$delays};
-            % my $i        = 0;
-            % for my $key (@keys) {
-                % my $delay = $delays->{$keys[$i]};
-                % if ($i + 1 < scalar(@keys)) {
-                    % if ($delay) {
-                    <li><%= l('between %1 and %2, the file will be kept %3 day(s).', format_bytes($keys[$i]), format_bytes($keys[$i + 1]), $delay) %></li>
+            <p>
+                <%= l('If you choose a delay, the file will be deleted after that delay.') %><br>
+                <%= l('Don\'t worry: if a user begins to download the file before the expiration and the download ends after the expiration, he will be able to get the file.') %>
+            </p>
+            % if (defined(config('delay_for_size'))) {
+                <p>
+                    <%= l('This server sets limitations according to the file size. The expiration delay of your file will be the minimum between what you choose and the following limitations:') %>
+                </p>
+                <ul>
+                % my $delays   = config('delay_for_size');
+                % $delays->{0} = max_delay;
+                % my @keys     = sort {$a <=> $b} keys %{$delays};
+                % my $i        = 0;
+                % for my $key (@keys) {
+                    % my $delay = $delays->{$keys[$i]};
+                    % if ($i + 1 < scalar(@keys)) {
+                        % if ($delay) {
+                            <li><%= l('between %1 and %2, the file will be kept %3 day(s).', format_bytes($keys[$i]), format_bytes($keys[$i + 1]), $delay) %></li>
+                        % } else {
+                            <li><%= l('between %1 and %2, the file will be kept forever.', format_bytes($keys[$i]), format_bytes($keys[$i + 1]), $delay) %></li>
+                        % }
                     % } else {
-                    <li><%= l('between %1 and %2, the file will be kept forever.', format_bytes($keys[$i]), format_bytes($keys[$i + 1]), $delay) %></li>
-                    % }
-                % } else {
-                    % if ($delay) {
-                    <li><%= l('for %1 and more, the file will be kept %2 day(s)', format_bytes($keys[$i]), $delay) %></li>
-                    % } else {
-                    <li><%= l('for %1 and more, the file will be kept forever.', format_bytes($keys[$i]), $delay) %></li>
+                        % if ($delay) {
+                            <li><%= l('for %1 and more, the file will be kept %2 day(s)', format_bytes($keys[$i]), $delay) %></li>
+                        % } else {
+                            <li><%= l('for %1 and more, the file will be kept forever.', format_bytes($keys[$i]), $delay) %></li>
+                        % }
                     % }
+                    % $i++;
                 % }
-                % $i++;
+                </ul>
             % }
-            </ul>
         </div>
-        % }
     </div>
     <div class="modal-footer">
         <a href="#!" class="modal-action modal-close waves-effect waves-green btn-flat"><%= l('Close') %></a>