a3x/nyaa
1
0
Fork 0
mirror of https://gitlab.com/SIGBUS/nyaa.git synced 2024-12-21 17:09:59 +00:00
Code Issues Projects Releases Wiki Activity

Make blue info bubble dismissible, configurable (#508)

Browse source 
Infobubble text is now in a separate file, along with a timestamp,
so that changes to it don't result in merge conflicts too often.

We also add some JS to make the bubble dismissible, keeping track
of the last timestamp that was dismissed in localstorage.
This commit is contained in:
Nicolas F 2018-08-03 04:16:28 +02:00 committed by Arylide
parent bf090c0fab
commit 62ec8a5236
4 changed files with 28 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
nyaa/static/js/main.js
View file

@ -260,6 +260,16 @@ document.addEventListener("DOMContentLoaded", function() {
}
});
// Info bubble stuff
document.addEventListener("DOMContentLoaded", function() {
var bubble = document.getElementById('infobubble');
if (Number(localStorage.getItem('infobubble_dismiss_ts')) < Number(bubble.dataset.ts)) {
bubble.removeAttribute('hidden');
}
$('#infobubble').on('close.bs.alert', function () {
localStorage.setItem('infobubble_dismiss_ts', bubble.dataset.ts);
})
});
// Decode HTML entities (&gt; etc), used for decoding comment markdown from escaped text
function htmlDecode(input){

5
nyaa/templates/home.html
View file

@ -12,10 +12,7 @@
{% block body %}
{% if not search.term %}
<div class="alert alert-info">
<p>We welcome you to provide feedback on IRC at <a href="irc://irc.rizon.net/nyaa-dev">#nyaa-dev@irc.rizon.net</a></p>
<p>Our GitHub: <a href="https://github.com/nyaadevs" target="_blank">https://github.com/nyaadevs</a> - creating <a href="https://github.com/nyaadevs/nyaa/issues">issues</a> for features and faults is recommended!</p>
</div>
{% include "infobubble.html" %}
{% endif %}
{% include "search_results.html" %}

14
nyaa/templates/infobubble.html Normal file
View file

@ -0,0 +1,14 @@
{% import "infobubble_content.html" as info %}
{% if info.info_text %}
<div class="alert alert-info alert-dismissible" id="infobubble" data-ts='{{ info.info_ts }}' hidden>
{{ info.info_text|safe }}
<button type="button" class="close" data-dismiss="alert" aria-label="Close">
<span aria-hidden="true">&times;</span>
</button>
</div>
<noscript>
<div class="alert alert-info" id="infobubble-noscript">
{{ info.info_text|safe }}
</div>
</noscript>
{% endif %}

3
nyaa/templates/infobubble_content.html Normal file
View file

@ -0,0 +1,3 @@
{% set info_text = "<b>Put your announcements here!</b>" %}
{# Update this to a larger timestamp if you change your announcement #}
{% set info_ts = 1531215917 %}