From 5bcd010055cc5e3e69b78f82092d2bd2d4128361 Mon Sep 17 00:00:00 2001
From: Luc Didry <luc@didry.org>
Date: Sat, 8 Aug 2015 00:15:26 +0200
Subject: [PATCH] Don't Repeat Yourself (and use partial templates)

---
 templates/index.html.ep                | 63 ++------------------------
 templates/partial/for_my_delay.html.ep | 20 ++++++++
 2 files changed, 23 insertions(+), 60 deletions(-)
 create mode 100644 templates/partial/for_my_delay.html.ep

diff --git a/templates/index.html.ep b/templates/index.html.ep
index 94248a1..45d0624 100644
--- a/templates/index.html.ep
+++ b/templates/index.html.ep
@@ -32,33 +32,12 @@
             <div class="form-group form-inline">
                 <input name="image_url" type="hidden" value="<%= $url %>">
                 <select name="delete-day" class="form-control">
-                    % for my $delay (qw/0 1 7 30 365/) {
-                    %   my $text = ($delay == 7 || $delay == 30) ? l('%1 days', $delay) : $d{'delay_'.$delay};
-                    %   if (config('max_delay')) {
-                    %       if ($delay) {
-                    %           if ($delay < config('max_delay')) {
-                                    <option value="<%= $delay %>" <%== is_selected($delay) %>><%= $text %></option>
-                    %           } elsif ($delay == config('max_delay')) {
-                                    <option value="<%= $delay %>" <%== is_selected($delay) %>><%= $text %></option>
-                    %               last;
-                    %           } else {
-                    %               my $text = ($delay == 1) ? l('24 hours') : l('%1 days', $delay);
-                                    <option value="<%= config('max_delay') %>" <%== is_selected(config('max_delay')) %>><%= l('%1 days', config('max_delay')) %></option>
-                    %               last;
-                    %           }
-                    %       }
-                    %   } else {
-                            <option value="<%= $delay %>" <%== is_selected($delay) %>><%= $text %></option>
-                    %   }
-                    % }
+                    %= include 'partial/for_my_delay', d => \%d
                 </select>
                 <div class="checkbox">
                     <label>
                         <input type="checkbox" name="first-view"> <%= l('Delete at first view?') %>
                     </label>
-                    <label <%== (config('always_encrypt')) ? 'class="always-encrypt"' : '' %>>
-                        <input type="checkbox" name="crypt"> <%= l('Encrypt the image (Lutim does not keep the key).') %>
-                    </label>
                 </div>
                 <%= submit_button l('Let\'s go!'), class => 'btn btn-sm btn-default btn-primary', id => 'submitbutton' %>
             </div>
@@ -84,25 +63,7 @@
     <form class="form" role="form" method="POST" action="<%= url_for('/') %>" enctype="multipart/form-data">
         <div class="form-group form-inline">
             <select name="delete-day" class="form-control">
-                % for my $delay (qw/0 1 7 30 365/) {
-                %   my $text = ($delay == 7 || $delay == 30) ? l('%1 days', $delay) : $d{'delay_'.$delay};
-                %   if (config('max_delay')) {
-                %       if ($delay) {
-                %           if ($delay < config('max_delay')) {
-                                <option value="<%= $delay %>" <%== is_selected($delay) %>><%= $text %></option>
-                %           } elsif ($delay == config('max_delay')) {
-                                <option value="<%= $delay %>" <%== is_selected($delay) %>><%= $text %></option>
-                %               last;
-                %           } else {
-                %               my $text = ($delay == 1) ? l('24 hours') : l('%1 days', $delay);
-                                <option value="<%= config('max_delay') %>" <%== is_selected(config('max_delay')) %>><%= l('%1 days', config('max_delay')) %></option>
-                %               last;
-                %           }
-                %       }
-                %   } else {
-                        <option value="<%= $delay %>" <%== is_selected($delay) %>><%= $text %></option>
-                %   }
-                % }
+                %= include 'partial/for_my_delay', d => \%d
             </select>
             <div class="checkbox">
                 <label>
@@ -133,25 +94,7 @@
 <div class="jsonly">
     <div class="form-group form-inline">
         <select id="delete-day" class="form-control">
-            % for my $delay (qw/0 1 7 30 365/) {
-            %   my $text = ($delay == 7 || $delay == 30) ? l('%1 days', $delay) : $d{'delay_'.$delay};
-            %   if (config('max_delay')) {
-            %       if ($delay) {
-            %           if ($delay < config('max_delay')) {
-                            <option value="<%= $delay %>" <%== is_selected($delay) %>><%= $text %></option>
-            %           } elsif ($delay == config('max_delay')) {
-                            <option value="<%= $delay %>" <%== is_selected($delay) %>><%= $text %></option>
-            %               last;
-            %           } else {
-            %               my $text = ($delay == 1) ? l('24 hours') : l('%1 days', $delay);
-                            <option value="<%= config('max_delay') %>" <%== is_selected(config('max_delay')) %>><%= l('%1 days', config('max_delay')) %></option>
-            %               last;
-            %           }
-            %       }
-            %   } else {
-                    <option value="<%= $delay %>" <%== is_selected($delay) %>><%= $text %></option>
-            %   }
-            % }
+            %= include 'partial/for_my_delay', d => \%d
         </select>
         <div class="checkbox">
             <label>
diff --git a/templates/partial/for_my_delay.html.ep b/templates/partial/for_my_delay.html.ep
new file mode 100644
index 0000000..dc166c4
--- /dev/null
+++ b/templates/partial/for_my_delay.html.ep
@@ -0,0 +1,20 @@
+% # vim:set sw=4 ts=4 sts=4 ft=html.epl expandtab:
+% for my $delay (qw/0 1 7 30 365/) {
+%   my $text = ($delay == 7 || $delay == 30) ? l('%1 days', $delay) : $d->{'delay_'.$delay};
+%   if (config('max_delay')) {
+%       if ($delay) {
+%           if ($delay < config('max_delay')) {
+                <option value="<%= $delay %>" <%== is_selected($delay) %>><%= $text %></option>
+%           } elsif ($delay == config('max_delay')) {
+                <option value="<%= $delay %>" <%== is_selected($delay) %>><%= $text %></option>
+%               last;
+%           } else {
+%               my $text = ($delay == 1) ? l('24 hours') : l('%1 days', $delay);
+                <option value="<%= config('max_delay') %>" <%== is_selected(config('max_delay')) %>><%= l('%1 days', config('max_delay')) %></option>
+%               last;
+%           }
+%       }
+%   } else {
+        <option value="<%= $delay %>" <%== is_selected($delay) %>><%= $text %></option>
+%   }
+% }