mirror of
https://github.com/PrivateBin/PrivateBin.git
synced 2026-03-05 13:30:32 -05:00
Merge remote-tracking branch 'upstream/master' into copy_to_clipboard_btn
# Conflicts: # i18n/ar.json # i18n/bg.json # i18n/ca.json # i18n/co.json # i18n/cs.json # i18n/de.json # i18n/el.json # i18n/en.json # i18n/es.json # i18n/et.json # i18n/fi.json # i18n/fr.json # i18n/he.json # i18n/hi.json # i18n/hu.json # i18n/id.json # i18n/it.json # i18n/ja.json # i18n/jbo.json # i18n/ko.json # i18n/ku.json # i18n/la.json # i18n/lt.json # i18n/nl.json # i18n/no.json # i18n/oc.json # i18n/pl.json # i18n/pt.json # i18n/ro.json # i18n/ru.json # i18n/sk.json # i18n/sl.json # i18n/sv.json # i18n/th.json # i18n/tr.json # i18n/uk.json # i18n/zh.json # lib/Configuration.php
This commit is contained in:
ribas160
@@ -1,4 +1,4 @@
|
||||
<?php
|
||||
<?php declare(strict_types=1);
|
||||
use PrivateBin\I18n;
|
||||
$isCpct = substr($template, 9, 8) === '-compact';
|
||||
$isDark = substr($template, 9, 5) === '-dark';
|
||||
@@ -42,7 +42,7 @@ if ($SYNTAXHIGHLIGHTING) :
|
||||
endif;
|
||||
?>
|
||||
<noscript><link type="text/css" rel="stylesheet" href="css/noscript.css" /></noscript>
|
||||
<?php $this->_scriptTag('js/jquery-3.7.1.js', 'async'); ?>
|
||||
<?php $this->_scriptTag('js/jquery-3.7.1.js', 'defer'); ?>
|
||||
<?php
|
||||
if ($QRCODE) :
|
||||
?>
|
||||
@@ -56,8 +56,8 @@ if ($ZEROBINCOMPATIBILITY) :
|
||||
endif;
|
||||
?>
|
||||
<?php $this->_scriptTag('js/zlib-1.3.1.js', 'async'); ?>
|
||||
<?php $this->_scriptTag('js/base-x-4.0.0.js', 'async'); ?>
|
||||
<?php $this->_scriptTag('js/rawinflate-0.3.js', 'async'); ?>
|
||||
<?php $this->_scriptTag('js/base-x-4.0.0.js', 'defer'); ?>
|
||||
<?php $this->_scriptTag('js/rawinflate-0.3.js', 'defer'); ?>
|
||||
<?php $this->_scriptTag('js/bootstrap-3.4.1.js', 'defer'); ?>
|
||||
<?php
|
||||
if ($SYNTAXHIGHLIGHTING) :
|
||||
@@ -71,7 +71,7 @@ if ($MARKDOWN) :
|
||||
<?php
|
||||
endif;
|
||||
?>
|
||||
<?php $this->_scriptTag('js/purify-3.1.6.js', 'async'); ?>
|
||||
<?php $this->_scriptTag('js/purify-3.1.7.js', 'async'); ?>
|
||||
<?php $this->_scriptTag('js/legacy.js', 'async'); ?>
|
||||
<?php $this->_scriptTag('js/privatebin.js', 'defer'); ?>
|
||||
<!-- icon -->
|
||||
@@ -490,9 +490,16 @@ if ($FILEUPLOAD) :
|
||||
<?php
|
||||
endif;
|
||||
?>
|
||||
<div id="status" role="alert" class="alert alert-info<?php echo empty($STATUS) ? ' hidden' : '' ?>">
|
||||
<div id="status" role="alert" class="clearfix alert alert-<?php echo (bool)$ISDELETED ? 'success' : 'info'; echo empty($STATUS) ? ' hidden' : '' ?>">
|
||||
<span class="glyphicon glyphicon-info-sign" aria-hidden="true"></span>
|
||||
<?php echo I18n::encode($STATUS), PHP_EOL; ?>
|
||||
<?php
|
||||
if ((bool)$ISDELETED):
|
||||
?>
|
||||
<button type="button" class="btn btn-default pull-right" id="new-from-alert">
|
||||
<span class="glyphicon glyphicon-repeat"></span> <?php echo I18n::_('Start over'), PHP_EOL; ?>
|
||||
</button>
|
||||
<?php endif; ?>
|
||||
</div>
|
||||
<div id="errormessage" role="alert" class="<?php echo empty($ERROR) ? 'hidden' : '' ?> alert alert-danger">
|
||||
<span class="glyphicon glyphicon-alert" aria-hidden="true"></span>
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
<?php
|
||||
<?php declare(strict_types=1);
|
||||
use PrivateBin\I18n;
|
||||
?><!DOCTYPE html>
|
||||
<html lang="<?php echo I18n::getLanguage(); ?>"<?php echo I18n::isRtl() ? ' dir="rtl"' : ''; ?>>
|
||||
<html lang="<?php echo I18n::getLanguage(); ?>"<?php echo I18n::isRtl() ? ' dir="rtl"' : ''; ?> class="h-100">
|
||||
<head>
|
||||
<meta charset="utf-8" />
|
||||
<meta http-equiv="Content-Security-Policy" content="<?php echo I18n::encode($CSPHEADER); ?>">
|
||||
@@ -34,15 +34,15 @@ if ($QRCODE) :
|
||||
endif;
|
||||
if ($ZEROBINCOMPATIBILITY) :
|
||||
?>
|
||||
<?php $this->_scriptTag('js/base64-1.7.js', 'async'); ?>
|
||||
<?php $this->_scriptTag('js/base64-1.7.js', 'defer'); ?>
|
||||
<?php
|
||||
endif;
|
||||
?>
|
||||
<?php $this->_scriptTag('js/zlib-1.3.1.js', 'async'); ?>
|
||||
<?php $this->_scriptTag('js/base-x-4.0.0.js', 'async'); ?>
|
||||
<?php $this->_scriptTag('js/rawinflate-0.3.js', 'async'); ?>
|
||||
<?php $this->_scriptTag('js/zlib-1.3.1.js', 'defer'); ?>
|
||||
<?php $this->_scriptTag('js/base-x-4.0.0.js', 'defer'); ?>
|
||||
<?php $this->_scriptTag('js/rawinflate-0.3.js', 'defer'); ?>
|
||||
<?php $this->_scriptTag('js/bootstrap-5.3.3.js', 'async'); ?>
|
||||
<?php $this->_scriptTag('js/dark-mode-switch.js', 'async'); ?>
|
||||
<?php $this->_scriptTag('js/dark-mode-switch.js', 'defer'); ?>
|
||||
<?php
|
||||
if ($SYNTAXHIGHLIGHTING) :
|
||||
?>
|
||||
@@ -55,7 +55,7 @@ if ($MARKDOWN) :
|
||||
<?php
|
||||
endif;
|
||||
?>
|
||||
<?php $this->_scriptTag('js/purify-3.1.6.js', 'async'); ?>
|
||||
<?php $this->_scriptTag('js/purify-3.1.7.js', 'defer'); ?>
|
||||
<?php $this->_scriptTag('js/legacy.js', 'async'); ?>
|
||||
<?php $this->_scriptTag('js/privatebin.js', 'defer'); ?>
|
||||
<!-- icon -->
|
||||
@@ -80,7 +80,7 @@ endif;
|
||||
<meta property="og:image:width" content="180" />
|
||||
<meta property="og:image:height" content="180" />
|
||||
</head>
|
||||
<body role="document" data-compression="<?php echo rawurlencode($COMPRESSION); ?>">
|
||||
<body role="document" data-compression="<?php echo rawurlencode($COMPRESSION); ?>" class="d-flex flex-column h-100">
|
||||
<div id="passwordmodal" tabindex="-1" class="modal fade" role="dialog" aria-hidden="true">
|
||||
<div class="modal-dialog" role="document">
|
||||
<div class="modal-content">
|
||||
@@ -353,9 +353,18 @@ if ($FILEUPLOAD) :
|
||||
<?php
|
||||
endif;
|
||||
?>
|
||||
<div id="status" role="alert" class="alert alert-info<?php echo empty($STATUS) ? ' hidden' : '' ?>">
|
||||
<svg width="16" height="16" fill="currentColor" aria-hidden="true"><use href="img/bootstrap-icons.svg#info-circle" /></svg>
|
||||
<?php echo I18n::encode($STATUS), PHP_EOL; ?>
|
||||
<div id="status" role="alert" class="d-flex justify-content-between align-items-center alert alert-<?php echo (bool)$ISDELETED ? 'success' : 'info'; echo empty($STATUS) ? ' hidden' : '' ?>">
|
||||
<div>
|
||||
<svg width="16" height="16" fill="currentColor" aria-hidden="true"><use href="img/bootstrap-icons.svg#info-circle" /></svg>
|
||||
<?php echo I18n::encode($STATUS), PHP_EOL; ?>
|
||||
</div>
|
||||
<?php
|
||||
if ((bool)$ISDELETED):
|
||||
?>
|
||||
<button type="button" class="btn btn-secondary" id="new-from-alert">
|
||||
<svg width="16" height="16" fill="currentColor" aria-hidden="true"><use href="img/bootstrap-icons.svg#repeat" /></svg> <?php echo I18n::_('Start over'), PHP_EOL; ?>
|
||||
</button>
|
||||
<?php endif; ?>
|
||||
</div>
|
||||
<div id="errormessage" role="alert" class="<?php echo empty($ERROR) ? 'hidden' : '' ?> alert alert-danger">
|
||||
<svg width="16" height="16" fill="currentColor" aria-hidden="true"><use href="img/bootstrap-icons.svg#exclamation-triangle" /></svg>
|
||||
@@ -451,28 +460,28 @@ endif;
|
||||
<span class="small"><?php echo I18n::_('In case this message never disappears please have a look at <a href="%s">this FAQ for information to troubleshoot</a>.', 'https://github.com/PrivateBin/PrivateBin/wiki/FAQ#why-does-the-loading-message-not-go-away'); ?></span>
|
||||
</div>
|
||||
</section>
|
||||
<footer class="container-fluid">
|
||||
<div class="row">
|
||||
<h5 class="col-md-5 col-xs-8"><?php echo I18n::_($NAME); ?> <small>- <?php echo I18n::_('Because ignorance is bliss'); ?></small></h5>
|
||||
<p class="col-md-1 col-xs-4 text-center"><?php echo $VERSION; ?></p>
|
||||
<p id="aboutbox" class="col-md-6 col-xs-12">
|
||||
<?php echo sprintf(
|
||||
I18n::_('%s is a minimalist, open source online pastebin where the server has zero knowledge of pasted data. Data is encrypted/decrypted %sin the browser%s using 256 bits AES.',
|
||||
I18n::_($NAME),
|
||||
'%s', '%s'
|
||||
),
|
||||
'<i>', '</i>'), ' ', $INFO, PHP_EOL;
|
||||
?>
|
||||
</p>
|
||||
</div>
|
||||
</footer>
|
||||
</main>
|
||||
<footer class="container-fluid mt-auto">
|
||||
<div class="row">
|
||||
<h5 class="col-md-5 col-xs-8"><?php echo I18n::_($NAME); ?> <small>- <?php echo I18n::_('Because ignorance is bliss'); ?></small></h5>
|
||||
<p class="col-md-1 col-xs-4 text-center"><?php echo $VERSION; ?></p>
|
||||
<p id="aboutbox" class="col-md-6 col-xs-12">
|
||||
<?php echo sprintf(
|
||||
I18n::_('%s is a minimalist, open source online pastebin where the server has zero knowledge of pasted data. Data is encrypted/decrypted %sin the browser%s using 256 bits AES.',
|
||||
I18n::_($NAME),
|
||||
'%s', '%s'
|
||||
),
|
||||
'<i>', '</i>'), ' ', $INFO, PHP_EOL;
|
||||
?>
|
||||
</p>
|
||||
</div>
|
||||
</footer>
|
||||
<?php
|
||||
if ($DISCUSSION) :
|
||||
?>
|
||||
<div id="serverdata" class="hidden" aria-hidden="true">
|
||||
<div id="templates">
|
||||
<article id="commenttemplate" class="comment">
|
||||
<article id="commenttemplate" class="comment px-2 pb-3">
|
||||
<div class="commentmeta">
|
||||
<span class="nickname">name</span>
|
||||
<span class="commentdate">0000-00-00</span>
|
||||
@@ -480,11 +489,11 @@ if ($DISCUSSION) :
|
||||
<div class="commentdata">c</div>
|
||||
<button class="btn btn-secondary btn-sm"><?php echo I18n::_('Reply'); ?></button>
|
||||
</article>
|
||||
<p id="commenttailtemplate" class="comment">
|
||||
<p id="commenttailtemplate" class="comment px-2 pb-3">
|
||||
<button class="btn btn-secondary btn-sm"><?php echo I18n::_('Add comment'); ?></button>
|
||||
</p>
|
||||
<div id="replytemplate" class="reply hidden">
|
||||
<input type="text" id="nickname" class="form-control" title="<?php echo I18n::_('Optional nickname…'); ?>" placeholder="<?php echo I18n::_('Optional nickname…'); ?>" />
|
||||
<input type="text" id="nickname" class="form-control my-2" title="<?php echo I18n::_('Optional nickname…'); ?>" placeholder="<?php echo I18n::_('Optional nickname…'); ?>" />
|
||||
<textarea id="replymessage" class="replymessage form-control" cols="80" rows="7"></textarea><br />
|
||||
<div id="replystatus" role="alert" class="statusmessage hidden alert">
|
||||
<svg width="16" height="16" fill="currentColor" aria-hidden="true"><use href="img/bootstrap-icons.svg#info-circle" /></svg>
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
<?php
|
||||
<?php declare(strict_types=1);
|
||||
use PrivateBin\I18n;
|
||||
?><!DOCTYPE html>
|
||||
<html lang="<?php echo I18n::getLanguage(); ?>"<?php echo I18n::isRtl() ? ' dir="rtl"' : ''; ?>>
|
||||
@@ -49,7 +49,7 @@ if ($MARKDOWN):
|
||||
<?php
|
||||
endif;
|
||||
?>
|
||||
<?php $this->_scriptTag('js/purify-3.1.6.js', 'async'); ?>
|
||||
<?php $this->_scriptTag('js/purify-3.1.7.js', 'async'); ?>
|
||||
<?php $this->_scriptTag('js/legacy.js', 'async'); ?>
|
||||
<?php $this->_scriptTag('js/privatebin.js', 'defer'); ?>
|
||||
<!-- icon -->
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
<?php
|
||||
<?php declare(strict_types=1);
|
||||
use PrivateBin\I18n;
|
||||
?><!DOCTYPE html>
|
||||
<html lang="<?php echo I18n::getLanguage(); ?>"<?php echo I18n::isRtl() ? ' dir="rtl"' : ''; ?>>
|
||||
|
||||
Reference in New Issue
Block a user