X-Git-Url: https://git.p6c8.net/jirafeau.git/blobdiff_plain/c5571d92378b2dc0529d05b8f6ad3349b2d128cc..8999b491d17e53015efb2de22d89e3928af7f7e9:/index.php

diff --git a/index.php b/index.php
index 36ef29e..86220f7 100644
--- a/index.php
+++ b/index.php
@@ -95,49 +95,41 @@ if (jirafeau_has_upload_password ($cfg))
 ?>
 <div id="upload_finished">
     <p><?php echo t('File uploaded !') ?></p>
-    <br />
 
-    <?php if ($cfg['download_page'] == true) { ?>
     <div id="upload_finished_download_page">
-    <?php echo t('Download page') ?>
+    <p><?php echo t('Download page') ?></p>
     <p><a id="upload_link" href=""></a></p>
-    <br />
-    </div>
-    <?php } ?>
-
-    <div id="upload_password_page">
-    <p><?php echo t('Download page') ?>:</p>
-    <p><a id="password_link" href=""></a></p>
-    <br />
     </div>
 
     <?php if ($cfg['preview'] == true) { ?>
     <div id="upload_finished_preview">
     <p><?php echo t('View link') ?>:</p>
     <p><a id="preview_link" href=""></a></p>
-    <br />
     </div>
     <?php } ?>
 
     <div id="upload_direct_download">
     <p><?php echo t('Direct download link') ?>:</p>
     <p><a id="direct_link" href=""></a></p>
-    <br />
     </div>
 
+    <div>
     <p><?php echo t('Delete link') ?>:</p>
     <p><a id="delete_link" href=""></a></p>
-    <br />
-    
-    <p id="validity">
-    <?php echo t('This file is valid until the following date'); ?>:
-    <br /><strong><div id="date"></div></strong>
-    </p>
+    </div>
+
+    <div id="validity">
+    <p><?php echo t('This file is valid until the following date'); ?>:</p>
+    <p id="date"></p>
+    </div>
 </div>
 
 <div id="uploading">
     <p>
-    <?php echo t ('Uploading ...'); ?><div id="uploaded_percentage"></div>
+    <?php echo t ('Uploading ...'); ?>
+    <div id="uploaded_percentage"></div>
+    <div id="uploaded_speed"></div>
+    <div id="uploaded_time"></div>
     </p>
 </div>
 
@@ -167,26 +159,26 @@ if (jirafeau_has_upload_password ($cfg))
         <tr>
         <td><label for="select_time"><?php echo t('Time limit') . ':'; ?></label></td>
         <td><select name="time" id="select_time">
-        <?php if ($cfg['availabilities']['minute']) { ?>
-        <option value = "minute"><?php echo t('One minute'); ?></option>
+        <?php if ($cfg['availabilities']['none']) { ?>
+        <option value="none"><?php echo t('None'); ?></option>
         <?php } ?>
-        <?php if ($cfg['availabilities']['hour']) { ?>
-        <option value = "hour"><?php echo t('One hour'); ?></option>
+        <?php if ($cfg['availabilities']['year']) { ?>
+        <option value = "year"><?php echo t('One year');?></option>
         <?php } ?>
-        <?php if ($cfg['availabilities']['day']) { ?>
-        <option value = "day"><?php echo t('One day'); ?></option>
+        <?php if ($cfg['availabilities']['month']) { ?>
+        <option value = "month"><?php echo t('One month');?></option>
         <?php } ?>
         <?php if ($cfg['availabilities']['week']) { ?>
         <option value = "week"><?php echo t('One week'); ?></option>
         <?php } ?>
-        <?php if ($cfg['availabilities']['month']) { ?>
-        <option value = "month"><?php echo t('One month');?></option>
+        <?php if ($cfg['availabilities']['day']) { ?>
+        <option value = "day"><?php echo t('One day'); ?></option>
         <?php } ?>
-        <?php if ($cfg['availabilities']['year']) { ?>
-        <option value = "year"><?php echo t('One year');?></option>
+        <?php if ($cfg['availabilities']['hour']) { ?>
+        <option value = "hour"><?php echo t('One hour'); ?></option>
         <?php } ?>
-        <?php if ($cfg['availabilities']['none']) { ?>
-        <option value="none"><?php echo t('None'); ?></option>
+        <?php if ($cfg['availabilities']['minute']) { ?>
+        <option value = "minute"><?php echo t('One minute'); ?></option>
         <?php } ?>
         </select></td>
         </tr>