remove option which shows download page

[jirafeau_mojo42.git] / index.php

diff --git a/index.php b/index.php
index 36ef29ee537c2b9b9776b8016956878090d02dbe..dade552fd4940c8844c5b90950ba3bc7b34b4d78 100644 (file)
--- a/index.php
+++ b/index.php
@@ -97,13 +97,11 @@ if (jirafeau_has_upload_password ($cfg))
     <p><?php echo t('File uploaded !') ?></p>
     <br />
 
     <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><a id="upload_link" href=""></a></p>
     <br />
     </div>
     <div id="upload_finished_download_page">
     <?php echo t('Download page') ?>
     <p><a id="upload_link" href=""></a></p>
     <br />
     </div>

-    <?php } ?>

 
     <div id="upload_password_page">
     <p><?php echo t('Download page') ?>:</p>
 
     <div id="upload_password_page">
     <p><?php echo t('Download page') ?>:</p>


@@ -137,7 +135,10 @@ if (jirafeau_has_upload_password ($cfg))
 
 <div id="uploading">
     <p>
 
 <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>
 
     </p>
 </div>
 


@@ -167,26 +168,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">
         <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 } ?>

-        <?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 } ?>

-        <?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 } ?>
         <?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 } ?>

-        <?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 } ?>

-        <?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>
         <?php } ?>
         </select></td>
         </tr>