lib: simplify link deisplay function

[jirafeau_mojo42.git] / index.php

diff --git a/index.php b/index.php
index ac2fb4723cd8f442257ece4194cba21fd38021c0..e06086fec7c5534ec602f5d27edcfbf466554e3d 100644 (file)
--- a/index.php
+++ b/index.php
@@ -97,19 +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>
-    <p><a id="password_link" href=""></a></p>
-    <br />
-    </div>

 
     <?php if ($cfg['preview'] == true) { ?>
     <div id="upload_finished_preview">
 
     <?php if ($cfg['preview'] == true) { ?>
     <div id="upload_finished_preview">


@@ -137,7 +129,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>