diff --git a/mo/web/templates/parts/messages.html b/mo/web/templates/parts/messages.html index 936632238ed3cf96f239dcabfd0dedd2da852b5c..d90436f4af4b3bcb363f896936d3ba7ab1249099 100644 --- a/mo/web/templates/parts/messages.html +++ b/mo/web/templates/parts/messages.html @@ -12,6 +12,3 @@ {% endif %} </div> {% endfor %} -{% if not messages %} -<p><em>Žádné novinky zatím nebyly vydány.</em> -{% endif %} diff --git a/mo/web/templates/parts/user_news.html b/mo/web/templates/parts/user_news.html index b873d2058644274e61161ae5d7f1f661efd86019..3748a6ab5dc4d0d04a4f512b9f8133223ec27340 100644 --- a/mo/web/templates/parts/user_news.html +++ b/mo/web/templates/parts/user_news.html @@ -1,6 +1,11 @@ <div id="novinky"> {% include "parts/messages.html" %} </div> +<div id="novinky-status"> +{% if not messages %} +<p><em>Žádné novinky zatím nebyly vydány.</em> +{% endif %} +</div> <script type="text/javascript"> -r = new NewsReloader(document.getElementById("novinky"), "{{ url }}", 60000); +r = new NewsReloader(document.getElementById("novinky"), document.getElementById("novinky-status"), "{{ url }}", 60000); </script> diff --git a/mo/web/templates/user_contest.html b/mo/web/templates/user_contest.html index c676c07394e491d7d3be1be614f5f24cdf039fee..f4bf8c8cb2a0fe78a91e1467f55f9911b4067449 100644 --- a/mo/web/templates/user_contest.html +++ b/mo/web/templates/user_contest.html @@ -107,7 +107,7 @@ {% if contest.round.has_messages %} <h3>Novinky k soutěži</h3> -{% with title="Novinky k soutěži", url=url_for('user_contest_news', id=contest.contest_id) %} +{% with url=url_for('user_contest_news', id=contest.contest_id) %} {% include "parts/user_news.html" %} {% endwith %} {% endif %} diff --git a/mo/web/templates/user_contest_task.html b/mo/web/templates/user_contest_task.html index 01c3263b12f025e2e890a5b7520b3645d587a96d..32308295ab3757e3044308856810e9b2b888b6cc 100644 --- a/mo/web/templates/user_contest_task.html +++ b/mo/web/templates/user_contest_task.html @@ -93,7 +93,7 @@ {% if contest.round.has_messages %} <h3>Novinky k soutěži</h3> -{% with title="Novinky k soutěži", url=url_for('user_contest_news', id=contest.contest_id) %} +{% with url=url_for('user_contest_news', id=contest.contest_id) %} {% include "parts/user_news.html" %} {% endwith %} {% endif %} diff --git a/static/js/news-reloader.js b/static/js/news-reloader.js index 04fe721d2224264a2c76932ecdf0d413ee9bb73b..0d5c518da2ac9a82bef52070a35edde1ac997a64 100644 --- a/static/js/news-reloader.js +++ b/static/js/news-reloader.js @@ -3,8 +3,9 @@ class NewsReloader { notification_interval = null; original_title = ""; - constructor(element, url, check_interval=60000) { + constructor(element, status_element, url, check_interval=60000) { this.element = element; + this.status_element = status_element; this.url = url; this.check_interval = check_interval; @@ -44,6 +45,14 @@ class NewsReloader { var newsArr = JSON.parse(this.responseText); var count = newsArr.length + if (t.status_element != null) { + if (count == 0) { + t.status_element.innerHTML = "<p><em>Žádné novinky zatím nebyly vydány.</em>"; + } else { + t.status_element.innerHTML = ""; + } + } + var markN = 0; // how many elements to mark with class "new" if (count > t.news_count) { markN = count - t.news_count;