mirror of
https://github.com/PrivateBin/PrivateBin.git
synced 2026-01-23 02:35:23 +00:00
Merge branch 'master' into fixes
This commit is contained in:
commit
34028229c8
10 changed files with 267 additions and 193 deletions
|
|
@ -261,11 +261,11 @@ if ($FILEUPLOAD) :
|
|||
<ul class="dropdown-menu px-2">
|
||||
<li id="filewrap">
|
||||
<div>
|
||||
<input type="file" id="file" name="file" class="form-control" />
|
||||
<input type="file" id="file" name="file" class="form-control" multiple />
|
||||
</div>
|
||||
<div id="dragAndDropFileName" class="dragAndDropFile"><?php echo I18n::_('alternatively drag & drop a file or paste an image from the clipboard'); ?></div>
|
||||
</li>
|
||||
<li id="customattachment" class="hidden"></li>
|
||||
<li id="customattachment" class="hidden d-flex flex-column px-3"></li>
|
||||
<li>
|
||||
<a id="fileremovebutton" href="#" class="dropdown-item">
|
||||
<?php echo I18n::_('Remove attachment'), PHP_EOL; ?>
|
||||
|
|
@ -370,10 +370,7 @@ endif;
|
|||
<?php
|
||||
if ($FILEUPLOAD) :
|
||||
?>
|
||||
<div id="attachment" 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'); ?></a>
|
||||
</div>
|
||||
<div id="attachment" class="hidden"></div>
|
||||
<?php
|
||||
endif;
|
||||
?>
|
||||
|
|
@ -514,9 +511,6 @@ endif;
|
|||
</p>
|
||||
</div>
|
||||
</footer>
|
||||
<?php
|
||||
if ($DISCUSSION) :
|
||||
?>
|
||||
<div id="serverdata" class="hidden" aria-hidden="true">
|
||||
<div id="templates">
|
||||
<article id="commenttemplate" class="comment px-2 pb-3">
|
||||
|
|
@ -538,12 +532,13 @@ if ($DISCUSSION) :
|
|||
</div>
|
||||
<button id="replybutton" class="btn btn-secondary btn-sm"><?php echo I18n::_('Post comment'); ?></button>
|
||||
</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'); ?></a>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<?php
|
||||
endif;
|
||||
?>
|
||||
<?php
|
||||
if ($FILEUPLOAD) :
|
||||
?>
|
||||
<div id="dropzone" class="hidden" tabindex="-1" aria-hidden="true"></div>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue