diff --git a/files/templates/award_modal.html b/files/templates/award_modal.html index ce9a348ced..b5be26570d 100644 --- a/files/templates/award_modal.html +++ b/files/templates/award_modal.html @@ -1,5 +1,3 @@ - - + + + +{% if v and v.agendaposter %} + + +{% endif %} + +{% if v %} + + +{% endif %} + + + diff --git a/files/templates/emoji_modal.html b/files/templates/emoji_modal.html index e899496565..6e469665c7 100644 --- a/files/templates/emoji_modal.html +++ b/files/templates/emoji_modal.html @@ -1,23 +1,3 @@ - - - -
- \ No newline at end of file + + + + + diff --git a/files/templates/gif_modal.html b/files/templates/gif_modal.html index bbf6287431..321b725bab 100644 --- a/files/templates/gif_modal.html +++ b/files/templates/gif_modal.html @@ -1,5 +1,3 @@ - - + + diff --git a/files/templates/header.html b/files/templates/header.html index 35b4b60e18..11bf14fa2a 100644 --- a/files/templates/header.html +++ b/files/templates/header.html @@ -1,16 +1,3 @@ -{% if v %}{% endif %} - - - - \ No newline at end of file + + +{% if v %}{% endif %} + + + \ No newline at end of file diff --git a/files/templates/home.html b/files/templates/home.html index 4ed19d33ef..5c63c13d51 100644 --- a/files/templates/home.html +++ b/files/templates/home.html @@ -165,20 +165,6 @@ {% endif %} -{% if v %} - - -{% endif %} - {% if request.path == '/' and g.system and g.timestamp > session.get('tooltip_last_dismissed',0)+60*60*24 and (not g.system.endswith('/chrome') and not g.system.endswith('/other')) and not g.system.endswith('/webview') %}
@@ -200,4 +186,18 @@ {% endif %} +{% if v %} + + +{% endif %} + {% endblock %} \ No newline at end of file diff --git a/files/templates/log.html b/files/templates/log.html index 1ea83020bc..d699a5d063 100644 --- a/files/templates/log.html +++ b/files/templates/log.html @@ -129,7 +129,6 @@ clipboard.on('success', function(e) { var myToast = new bootstrap.Toast(document.getElementById('toast-success')); myToast.show(); - console.log(e); }); diff --git a/files/templates/login.html b/files/templates/login.html index f08340a4f1..9cec011dfc 100644 --- a/files/templates/login.html +++ b/files/templates/login.html @@ -3,7 +3,6 @@ - @@ -115,6 +114,8 @@
+ + diff --git a/files/templates/mobile_navigation_bar.html b/files/templates/mobile_navigation_bar.html index 8d67377eeb..c1aa5434bc 100644 --- a/files/templates/mobile_navigation_bar.html +++ b/files/templates/mobile_navigation_bar.html @@ -1,11 +1,3 @@ - - - -
{% endif %}
-
\ No newline at end of file + + + + + \ No newline at end of file diff --git a/files/templates/report_post_modal.html b/files/templates/report_post_modal.html index 85480b8e12..33ed1350c3 100644 --- a/files/templates/report_post_modal.html +++ b/files/templates/report_post_modal.html @@ -1,5 +1,3 @@ - - - \ No newline at end of file + + + \ No newline at end of file diff --git a/files/templates/settings.html b/files/templates/settings.html index d1e11604d2..f60fa58885 100644 --- a/files/templates/settings.html +++ b/files/templates/settings.html @@ -2,31 +2,6 @@ - - - - - - - @@ -261,6 +236,31 @@ {% block onload %}{% endblock %} + + + + + + + + \ No newline at end of file diff --git a/files/templates/settings2.html b/files/templates/settings2.html index d2a7c9cc0e..03827022be 100644 --- a/files/templates/settings2.html +++ b/files/templates/settings2.html @@ -3,10 +3,6 @@ - - - - @@ -172,6 +168,11 @@ {% block scripts %} {% endblock %} + + + + + \ No newline at end of file diff --git a/files/templates/settings_profile.html b/files/templates/settings_profile.html index 1b345a76a3..a0e9816fb2 100644 --- a/files/templates/settings_profile.html +++ b/files/templates/settings_profile.html @@ -3,26 +3,6 @@ {% block pagetitle %}Profile Settings - {{'SITE_NAME' | app_config}}{% endblock %} {% block content %} -{% include "emoji_modal.html" %} -{% include "gif_modal.html" %} - - - -
@@ -701,4 +681,26 @@
+ + + + + +{% include "emoji_modal.html" %} +{% include "gif_modal.html" %} + {% endblock %} diff --git a/files/templates/sign_up.html b/files/templates/sign_up.html index 3055eb28db..5f3cd3e52e 100644 --- a/files/templates/sign_up.html +++ b/files/templates/sign_up.html @@ -2,14 +2,6 @@ - - - - - {% if hcaptcha %} - - {% endif %} - @@ -153,6 +145,15 @@ + + + + + +{% if hcaptcha %} + +{% endif %} + diff --git a/files/templates/sign_up_failed_ref.html b/files/templates/sign_up_failed_ref.html index 0c585ddffb..1677183385 100644 --- a/files/templates/sign_up_failed_ref.html +++ b/files/templates/sign_up_failed_ref.html @@ -3,8 +3,6 @@ - - @@ -97,6 +95,9 @@ Link copied to clipboard + + + diff --git a/files/templates/submission.html b/files/templates/submission.html index 366355adea..ac97d05c8a 100644 --- a/files/templates/submission.html +++ b/files/templates/submission.html @@ -13,6 +13,8 @@ {% block title %} + + {% if p.award_count("train") %} \ No newline at end of file + + + + + + + + + +{% if v %} + {% include "award_modal.html" %} +{% endif %} \ No newline at end of file diff --git a/files/templates/submit.html b/files/templates/submit.html index c7b086cc53..1756798e56 100644 --- a/files/templates/submit.html +++ b/files/templates/submit.html @@ -1,11 +1,6 @@ - - - - - @@ -18,9 +13,6 @@ {% set cc='Country Club' %} {% endif %} - {% include "emoji_modal.html" %} - {% include "gif_modal.html" %} - {% block title %} Create a post - {{'SITE_NAME' | app_config}} {% endblock %} @@ -175,6 +167,16 @@ {% endblock %} + + + + + + + + {% include "emoji_modal.html" %} + {% include "gif_modal.html" %} + - + \ No newline at end of file diff --git a/files/templates/userpage.html b/files/templates/userpage.html index 3aeeeca052..d6940b0c2e 100644 --- a/files/templates/userpage.html +++ b/files/templates/userpage.html @@ -8,14 +8,6 @@ {% if u and u.profilecss and (u.admin_level or not (v and v.admin_level)) %} {% endif %} - - - - {{u.username}}'s profile - {{'SITE_NAME' | app_config}} {% if u.is_private %} @@ -673,10 +665,6 @@ {% block content %} -{% if v %} - {% include "emoji_modal.html" %} -{% endif %} -
@@ -782,7 +770,21 @@ {% endif %} + + + + + + +{% if v %} + {% include "emoji_modal.html" %} +{% endif %} + {% endblock %} {% block GIFpicker %} -{% endblock %} +{% endblock %} \ No newline at end of file