[BUGFIX] fix user password prompt html

[jirafeau_mojo42.git] / lib / functions.js.php

diff --git a/lib/functions.js.php b/lib/functions.js.php
index 542000b6574a96e04a1e92a8da3daa572492caa5..7d248b5c7b5c4e616eb7a8369616ad9644f06643 100644 (file)
--- a/lib/functions.js.php
+++ b/lib/functions.js.php
@@ -119,7 +119,7 @@ function show_link (reference, delete_code, crypt_key, date)
     document.getElementById('uploading').style.display = 'none';
     document.getElementById('upload').style.display = 'none';
     document.getElementById('upload_finished').style.display = '';
     document.getElementById('uploading').style.display = 'none';
     document.getElementById('upload').style.display = 'none';
     document.getElementById('upload_finished').style.display = '';

-    document.title = 'Jirafeau - 100%';
+    document.title = "100% - <?php echo empty($cfg['title']) ? 'Jirafeau' : $cfg['title']; ?>";

 
     // Download page
     var download_link_href = 'f.php?h=' + reference;
 
     // Download page
     var download_link_href = 'f.php?h=' + reference;


@@ -203,7 +203,7 @@ function show_upload_progression (percentage, speed, time_left)
     document.getElementById('uploaded_percentage').innerHTML = percentage;
     document.getElementById('uploaded_speed').innerHTML = speed;
     document.getElementById('uploaded_time').innerHTML = time_left;
     document.getElementById('uploaded_percentage').innerHTML = percentage;
     document.getElementById('uploaded_speed').innerHTML = speed;
     document.getElementById('uploaded_time').innerHTML = time_left;

-    document.title = 'Jirafeau - ' + percentage;
+    document.title = percentage + " - <?php echo empty($cfg['title']) ? 'Jirafeau' : $cfg['title']; ?>";

 }
 
 function hide_upload_progression ()
 }
 
 function hide_upload_progression ()


@@ -211,7 +211,7 @@ function hide_upload_progression ()
     document.getElementById('uploaded_percentage').style.display = 'none';
     document.getElementById('uploaded_speed').style.display = 'none';
     document.getElementById('uploaded_time').style.display = 'none';
     document.getElementById('uploaded_percentage').style.display = 'none';
     document.getElementById('uploaded_speed').style.display = 'none';
     document.getElementById('uploaded_time').style.display = 'none';

-    document.title = 'Jirafeau';
+    document.title = "<?php echo empty($cfg['title']) ? 'Jirafeau' : $cfg['title']; ?>";

 }
 
 function upload_progress (e)
 }
 
 function upload_progress (e)


@@ -607,17 +607,17 @@ function upload_time_estimation_speed_string()
     if (s <= 1000)
     {
         res = s.toString();
     if (s <= 1000)
     {
         res = s.toString();

-        scale = "o/s";
+        scale = "Bit/s";

     }
     else if (s < 1000000)
     {
         res = Math.floor(s/100) / 10;
     }
     else if (s < 1000000)
     {
         res = Math.floor(s/100) / 10;

-        scale = "Ko/s";
+        scale = "KBit/s";

     }
     else
     {
         res = Math.floor(s/100000) / 10;
     }
     else
     {
         res = Math.floor(s/100000) / 10;

-        scale = "Mo/s";
+        scale = "Mbit/s";

     }
     if (res == 0)
         return '';
     }
     if (res == 0)
         return '';


@@ -627,7 +627,14 @@ function upload_time_estimation_speed_string()
 function milliseconds_to_time_string (milliseconds)
 {
     function numberEnding (number) {
 function milliseconds_to_time_string (milliseconds)
 {
     function numberEnding (number) {

+      var currentLanguage = '<?php echo $cfg['lang']; ?>';
+
+      if(currentLanguage == 'de') {
+        return (number > 1) ? 'n' : '';
+      }
+      else {

         return (number > 1) ? 's' : '';
         return (number > 1) ? 's' : '';

+      }

     }
 
     var temp = Math.floor(milliseconds / 1000);
     }
 
     var temp = Math.floor(milliseconds / 1000);


@@ -710,3 +717,25 @@ document.addEventListener('DOMContentLoaded', function(event) {
     // Search for all datetime fields and convert the time to local timezone
     convertAllDatetimeFields();
 });
     // Search for all datetime fields and convert the time to local timezone
     convertAllDatetimeFields();
 });

+
+// Add copy event listeners
+function copyLinkToClipboard(link_id) {
+    var focus = document.activeElement;
+    var e = document.getElementById(link_id);
+
+    var tmp = document.createElement("textarea");
+    document.body.appendChild(tmp);
+    tmp.textContent = e.href;
+    tmp.focus();
+    tmp.setSelectionRange(0, tmp.value.length);
+    document.execCommand("copy");
+    document.body.removeChild(tmp);
+
+    focus.focus();
+}
+
+function addCopyListener(button_id, link_id) {
+    document.getElementById(button_id)
+            .addEventListener("click", function() {
+                copyLinkToClipboard(link_id);});
+}