From: Weblate <noreply@weblate.org>
Date: Fri, 13 Jan 2017 17:41:01 +0000 (+0100)
Subject: Merge remote-tracking branch 'origin/master'
X-Git-Tag: 3.2.0~37
X-Git-Url: https://git.p6c8.net/jirafeau_project.git/commitdiff_plain/a5788a3215ef8fdf21d306c4b10e4840dd82e156?hp=145ca7860e1b2c33b6a92efe606a1b75b20a9cb3

Merge remote-tracking branch 'origin/master'
---

diff --git a/lib/functions.php b/lib/functions.php
index 592e841..d454011 100644
--- a/lib/functions.php
+++ b/lib/functions.php
@@ -613,11 +613,8 @@ jirafeau_admin_list ($name, $file_hash, $link_hash)
                 /* Print link informations. */
                 echo '<tr>';
                 echo '<td>' .
-                '<form action = "admin.php" method = "post">' .
-                '<input type = "hidden" name = "action" value = "download"/>' .
-                '<input type = "hidden" name = "link" value = "' . $node . '"/>' .
-                '<input type = "submit" value = "' . htmlspecialchars($l['file_name']) . '" />' .
-                '</form>';
+                '<strong><a id="upload_link" href="/f.php?h='. htmlspecialchars($node) .'" title="' .
+                    t('Download page') . '">' . htmlspecialchars($l['file_name']) . '</a></strong>';
                 echo '</td>';
                 echo '<td>' . $l['mime_type'] . '</td>';
                 echo '<td>' . jirafeau_human_size ($l['file_size']) . '</td>';
@@ -633,6 +630,11 @@ jirafeau_admin_list ($name, $file_hash, $link_hash)
                 echo '<td>' . $l['ip'] . '</td>';
                 echo '<td>' .
                 '<form action = "admin.php" method = "post">' .
+                '<input type = "hidden" name = "action" value = "download"/>' .
+                '<input type = "hidden" name = "link" value = "' . $node . '"/>' .
+                '<input type = "submit" value = "' . t('Download') . '" />' .
+                '</form>' .
+                '<form action = "admin.php" method = "post">' .
                 '<input type = "hidden" name = "action" value = "delete_link"/>' .
                 '<input type = "hidden" name = "link" value = "' . $node . '"/>' .
                 '<input type = "submit" value = "' . t('Del link') . '" />' .