Browse Source

Now leaving styling to customer if he wants the filename and filesize as a hyperlink or outside the hyperlink

Stephan Kristyn 5 months ago
parent
commit
cfea0fb20e
4 changed files with 5 additions and 10 deletions
  1. 2 1
      js/privatebin.js
  2. 1 1
      lib/Configuration.php
  3. 1 4
      tpl/bootstrap.php
  4. 1 4
      tpl/bootstrap5.php

+ 2 - 1
js/privatebin.js

@@ -2995,7 +2995,8 @@ jQuery.PrivateBin = (function($) {
                 attachmentLink.attr('download', fileName);
 
                 const fileSize = Helper.formatBytes(decodedData.length);
-                const span = template[0].querySelector('a > span');
+                const spans = template[0].querySelectorAll('span');
+                const span = spans[spans.length - 1];
                 span.textContent = ` (${fileName}, ${fileSize})`;
             }
 

+ 1 - 1
lib/Configuration.php

@@ -122,7 +122,7 @@ class Configuration
             'js/kjua-0.10.0.js'      => 'sha512-BYj4xggowR7QD150VLSTRlzH62YPfhpIM+b/1EUEr7RQpdWAGKulxWnOvjFx1FUlba4m6ihpNYuQab51H6XlYg==',
             'js/legacy.js'           => 'sha512-RQEo1hxpNc37i+jz/D9/JiAZhG8GFx3+SNxjYnI7jUgirDIqrCSj6QPAAZeaidditcWzsJ3jxfEj5lVm7ZwTRQ==',
             'js/prettify.js'         => 'sha512-puO0Ogy++IoA2Pb9IjSxV1n4+kQkKXYAEUtVzfZpQepyDPyXk8hokiYDS7ybMogYlyyEIwMLpZqVhCkARQWLMg==',
-            'js/privatebin.js'       => 'sha512-YOVC+ZjeGfgp/PBIZDJOKvbGRpFnQkXAXLKXLSgP/aXysO34DRxpNLFOmJeZlP9NfraS2tl9paeIcM0nV1uxcQ==',
+            'js/privatebin.js'       => 'sha512-KnVJOIXg/dcO/A1cEEWD/AlKfmGK2UNmNrqr0kD+ecj4nuwDiscimKy9Olt/iWcDAOQ8WG7JcJ/teQ3kfZWz9A==',
             'js/purify-3.3.0.js'     => 'sha512-lsHD5zxs4lu/NDzaaibe27Vd2t7Cy9JQ3qDHUvDfb4oZvKoWDNEhwUY+4bT3R68cGgpgCYp8U1x2ifeVxqurdQ==',
             'js/showdown-2.1.0.js'   => 'sha512-WYXZgkTR0u/Y9SVIA4nTTOih0kXMEd8RRV6MLFdL6YU8ymhR528NLlYQt1nlJQbYz4EW+ZsS0fx1awhiQJme1Q==',
             'js/zlib-1.3.1-2.js'     => 'sha512-4gT+v+BkBqdVBbKOO4qKGOAzuay+v1FmOLksS+bMgQ08Oo4xEb3X48Xq1Kv2b4HtiCQA7xq9dFRzxal7jmQI7w==',

+ 1 - 4
tpl/bootstrap.php

@@ -691,10 +691,7 @@ endif;
 				</div>
 				<div id="attachmenttemplate" role="alert" class="attachment hidden alert alert-info">
 					<span class="glyphicon glyphicon-download-alt" aria-hidden="true"></span>
-					<a class="alert-link">
-						<?php echo I18n::_('Download attachment'); ?>
-						<span></span>
-					</a>
+					<a class="alert-link"><?php echo I18n::_('Download attachment'); ?><span></span></a>
 				</div>
 			</div>
 		</div>

+ 1 - 4
tpl/bootstrap5.php

@@ -549,10 +549,7 @@ endif;
 				</div>
 				<div id="attachmenttemplate" role="alert" class="hidden alert alert-info">
 					<svg width="16" height="16" fill="currentColor" aria-hidden="true"><use href="img/bootstrap-icons.svg#download" /></svg>
-					<a class="alert-link">
-						<?php echo I18n::_('Download attachment'); ?>
-						<span></span>
-					</a>
+					<a class="alert-link"><?php echo I18n::_('Download attachment'); ?><span></span></a>
 				</div>
 			</div>
 		</div>