blitzwing/bintzwing
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

moving remaining time / for your eyes only message from nav bar into

Browse source 
status alert in bootstrap theme, to ensure it is seen even with a
collapsed nav bar as in the mobile view
This commit is contained in:
El RIDO 2015-09-12 10:38:04 +02:00
parent 428a9d9c41
commit 9dde7f034a
2 changed files with 15 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
js/zerobin.js
View file

@ -553,7 +553,8 @@ $(function() {
} }
} }
// Display paste expiration. // Display paste expiration / for your eyes only.
var content = this.remainingTime.contents();
if (comments[0].meta.expire_date) if (comments[0].meta.expire_date)
{ {
var expiration = helper.secondsToHuman(comments[0].meta.remaining_time), var expiration = helper.secondsToHuman(comments[0].meta.remaining_time),
@ -561,9 +562,9 @@ $(function() {
'This document will expire in %d ' + expiration[1] + '.', 'This document will expire in %d ' + expiration[1] + '.',
'This document will expire in %d ' + expiration[1] + 's.' 'This document will expire in %d ' + expiration[1] + 's.'
]; ];
content[content.length - 1].nodeValue = ' ' + i18n._(expirationLabel, expiration[0]);
this.remainingTime.removeClass('foryoureyesonly') this.remainingTime.removeClass('foryoureyesonly')
.text(i18n._(expirationLabel, expiration[0])) .removeClass('hidden');
.removeClass('hidden');
} }
if (comments[0].meta.burnafterreading) if (comments[0].meta.burnafterreading)
{ {
@ -571,9 +572,11 @@ $(function() {
.fail(function() { .fail(function() {
zerobin.showError(i18n._('Could not delete the paste, it was not stored in burn after reading mode.')); zerobin.showError(i18n._('Could not delete the paste, it was not stored in burn after reading mode.'));
}); });
content[content.length - 1].nodeValue = ' ' + i18n._(
'FOR YOUR EYES ONLY. Don\'t close this window, this message can\'t be displayed again.'
);
this.remainingTime.addClass('foryoureyesonly') this.remainingTime.addClass('foryoureyesonly')
.text(i18n._('FOR YOUR EYES ONLY. Don\'t close this window, this message can\'t be displayed again.')) .removeClass('hidden');
.removeClass('hidden');
// Discourage cloning (as it can't really be prevented). // Discourage cloning (as it can't really be prevented).
this.cloneButton.addClass('hidden'); this.cloneButton.addClass('hidden');
} }

12
tpl/bootstrap.html
View file

@ -80,9 +80,6 @@
<input type="password" id="passwordinput" placeholder="{function="t('Password (recommended)')"}" class="form-control" size="19"/> <input type="password" id="passwordinput" placeholder="{function="t('Password (recommended)')"}" class="form-control" size="19"/>
</div> </div>
</li>{/if} </li>{/if}
<li>
<p id="remainingtime" class="hidden navbar-text"></p>
</li>
</ul> </ul>
<ul class="nav navbar-nav pull-right"> <ul class="nav navbar-nav pull-right">
<li> <li>
@ -97,8 +94,13 @@
<header class="container">{if="strlen($NOTICE)"} <header class="container">{if="strlen($NOTICE)"}
<div role="alert" class="alert alert-info"> <div role="alert" class="alert alert-info">
<span class="glyphicon glyphicon-info-sign" aria-hidden="true"></span> {$NOTICE|htmlspecialchars} <span class="glyphicon glyphicon-info-sign" aria-hidden="true"></span> {$NOTICE|htmlspecialchars}
</div>{/if}{if="strlen($STATUS)"} </div>{/if}
<div id="status" role="alert" class="alert alert-success"><span class="glyphicon glyphicon-ok" aria-hidden="true"></span> {$STATUS|htmlspecialchars}</div>{/if} <div id="remainingtime" role="alert" class="hidden alert alert-info">
<span class="glyphicon glyphicon-info-sign" aria-hidden="true"></span>
</div>{if="strlen($STATUS)"}
<div id="status" role="alert" class="alert alert-success">
<span class="glyphicon glyphicon-ok" aria-hidden="true"></span> {$STATUS|htmlspecialchars}
</div>{/if}
<div id="errormessage" role="alert" class="{if="!strlen($ERROR)"}hidden {/if}alert alert-danger"><span class="glyphicon glyphicon-alert" aria-hidden="true"></span> {$ERROR|htmlspecialchars}</div> <div id="errormessage" role="alert" class="{if="!strlen($ERROR)"}hidden {/if}alert alert-danger"><span class="glyphicon glyphicon-alert" aria-hidden="true"></span> {$ERROR|htmlspecialchars}</div>
<div id="noscript" role="alert" class="nonworking alert alert-warning"><span class="glyphicon glyphicon-exclamation-sign" aria-hidden="true"></span> {function="t('Javascript is required for ZeroBin to work.<br />Sorry for the inconvenience.')"}</div> <div id="noscript" role="alert" class="nonworking alert alert-warning"><span class="glyphicon glyphicon-exclamation-sign" aria-hidden="true"></span> {function="t('Javascript is required for ZeroBin to work.<br />Sorry for the inconvenience.')"}</div>
<div id="oldienotice" role="alert" class="hidden nonworking alert alert-danger"><span class="glyphicon glyphicon-alert" aria-hidden="true"></span> {function="t('ZeroBin requires a modern browser to work.')"}</div> <div id="oldienotice" role="alert" class="hidden nonworking alert alert-danger"><span class="glyphicon glyphicon-alert" aria-hidden="true"></span> {function="t('ZeroBin requires a modern browser to work.')"}</div>