From dc6514a11fd01997f21498b74eed0027304d13b4 Mon Sep 17 00:00:00 2001
From: ksamuel <kevin.samuel@yandex.com>
Date: Wed, 12 Aug 2020 16:10:37 +0200
Subject: [PATCH] Remove expiration

---
 zerobin/views/404.tpl   | 14 ++++++--------
 zerobin/views/home.tpl  | 14 ++++++--------
 zerobin/views/paste.tpl | 16 +++++++---------
 3 files changed, 19 insertions(+), 25 deletions(-)

diff --git a/zerobin/views/404.tpl b/zerobin/views/404.tpl
index 0eba0bd..196e31a 100644
--- a/zerobin/views/404.tpl
+++ b/zerobin/views/404.tpl
@@ -19,13 +19,12 @@
     </div>
 
     <div class="form-group select-date paste-option">
-      <label class="col-form-label">Expiration:</label>
       <div class="input-group">
         <select id="expiration" name="expiration" class="custom-select" v-model="newPaste.expiration">
           <option value="burn_after_reading">Burn after reading</option>
-          <option selected value="1_day">1 day</option>
-          <option value="1_month">1 month</option>
-          <option value="never">Never</option>
+          <option selected value="1_day">Expire in 1 day</option>
+          <option value="1_month">Expire in 1 month</option>
+          <option value="never">Never expire</option>
         </select>
         <div class="input-group-append">
           <button type="submit" class="btn btn-primary">Submit</button>
@@ -44,13 +43,12 @@
   </div>
 
   <div class="form-group select-date paste-option down" v-if="displayBottomToolBar">
-    <label class="col-form-label">Expiration:</label>
     <div class="input-group">
       <select id="expiration" name="expiration" class="custom-select" v-model="newPaste.expiration">
         <option value="burn_after_reading">Burn after reading</option>
-        <option selected value="1_day">1 day</option>
-        <option value="1_month">1 month</option>
-        <option value="never">Never</option>
+        <option selected value="1_day">Expire in 1 day</option>
+        <option value="1_month">Expire in 1 month</option>
+        <option value="never">Never expire</option>
       </select>
       <div class="input-group-append">
         <button type="submit" class="btn btn-primary">Submit</button>
diff --git a/zerobin/views/home.tpl b/zerobin/views/home.tpl
index 350b3de..9e650e1 100644
--- a/zerobin/views/home.tpl
+++ b/zerobin/views/home.tpl
@@ -11,13 +11,12 @@
     </div>
 
     <div class="form-group select-date paste-option">
-      <label class="col-form-label">Expiration:</label>
       <div class="input-group">
         <select id="expiration" name="expiration" class="custom-select" v-model="newPaste.expiration">
           <option value="burn_after_reading">Burn after reading</option>
-          <option selected value="1_day">1 day</option>
-          <option value="1_month">1 month</option>
-          <option value="never">Never</option>
+          <option selected value="1_day">Expire in 1 day</option>
+          <option value="1_month">Expire in 1 month</option>
+          <option value="never">Never expire</option>
         </select>
         <div class="input-group-append">
           <button type="submit" class="btn btn-primary">Submit</button>
@@ -36,13 +35,12 @@
   </div>
 
   <div class="form-group select-date paste-option down" v-if="displayBottomToolBar">
-    <label class="col-form-label">Expiration:</label>
     <div class="input-group">
       <select id="expiration" name="expiration" class="custom-select" v-model="newPaste.expiration">
         <option value="burn_after_reading">Burn after reading</option>
-        <option selected value="1_day">1 day</option>
-        <option value="1_month">1 month</option>
-        <option value="never">Never</option>
+        <option selected value="1_day">Expire in 1 day</option>
+        <option value="1_month">Expire in 1 month</option>
+        <option value="never">Never expire</option>
       </select>
       <div class="input-group-append">
         <button type="submit" class="btn btn-primary">Submit</button>
diff --git a/zerobin/views/paste.tpl b/zerobin/views/paste.tpl
index f2b0e24..c31d3fd 100644
--- a/zerobin/views/paste.tpl
+++ b/zerobin/views/paste.tpl
@@ -54,7 +54,7 @@
     %if expiration:
     <span id="expiration-tag">Expire {{ expiration }}</span>
     %end
-    
+
     <pre id="paste-content" class="prettyprint">
       <code>
         {{ paste.content }}
@@ -95,13 +95,12 @@
       </div>
 
       <div class="form-group select-date-clone paste-option">
-        <label class="col-form-label">Expiration:</label>
         <div class="input-group">
           <select id="expiration" name="expiration" class="custom-select" v-model="newPaste.expiration">
             <option value="burn_after_reading">Burn after reading</option>
-            <option selected value="1_day">1 day</option>
-            <option value="1_month">1 month</option>
-            <option value="never">Never</option>
+            <option selected value="1_day">Expire in 1 day</option>
+            <option value="1_month">Expire in 1 month</option>
+            <option value="never">Never expire</option>
           </select>
           <div class="input-group-append">
             <button type="submit" class="btn btn-primary">Submit</button>
@@ -132,13 +131,12 @@
       </div>
 
       <div class="form-group select-date-clone paste-option">
-        <label class="col-form-label">Expiration:</label>
         <div class="input-group">
           <select id="expiration" name="expiration" class="custom-select" v-model="newPaste.expiration">
             <option value="burn_after_reading">Burn after reading</option>
-            <option selected value="1_day">1 day</option>
-            <option value="1_month">1 month</option>
-            <option value="never">Never</option>
+            <option selected value="1_day">Expire in 1 day</option>
+            <option value="1_month">Expire in 1 month</option>
+            <option value="never">Never expire</option>
           </select>
           <div class="input-group-append">
             <button type="submit" class="btn btn-primary">Submit</button>