From e9445efc2224bfb5e8aea8a2c31dbd4e27c80148 Mon Sep 17 00:00:00 2001 From: Aevann1 Date: Thu, 8 Sep 2022 19:12:46 +0200 Subject: [PATCH] make bootstrap work on localhost --- files/assets/js/bootstrap.js | 20 +- files/assets/js/comments_v.js | 2 +- files/assets/js/emoji_modal.js | 321 ++++++++++----------- files/templates/admins.html | 2 +- files/templates/award_modal.html | 2 +- files/templates/badges.html | 2 +- files/templates/ban_modal.html | 2 +- files/templates/casino.html | 2 +- files/templates/category_modal.html | 2 +- files/templates/chat.html | 8 +- files/templates/comments.html | 12 +- files/templates/default.html | 8 +- files/templates/delete_post_modal.html | 2 +- files/templates/emoji_modal.html | 2 +- files/templates/followers.html | 2 +- files/templates/following.html | 2 +- files/templates/gif_modal.html | 2 +- files/templates/hats.html | 2 +- files/templates/home.html | 22 +- files/templates/log.html | 2 +- files/templates/login.html | 2 +- files/templates/lottery.html | 2 +- files/templates/mobile_navigation_bar.html | 2 +- files/templates/notifications.html | 2 +- files/templates/poll_votes.html | 2 +- files/templates/report_post_modal.html | 2 +- files/templates/search.html | 2 +- files/templates/settings.html | 4 +- files/templates/settings2.html | 2 +- files/templates/settings_blocks.html | 2 +- files/templates/settings_profile.html | 2 +- files/templates/settings_security.html | 2 +- files/templates/shop.html | 2 +- files/templates/sign_up.html | 6 +- files/templates/sign_up_failed_ref.html | 2 +- files/templates/sub/subs.html | 2 +- files/templates/submission.html | 26 +- files/templates/submission_listing.html | 12 +- files/templates/submit.html | 8 +- files/templates/transfers.html | 2 +- files/templates/userpage.html | 6 +- files/templates/userpage_comments.html | 4 +- files/templates/userpage_private.html | 4 +- files/templates/util/assetcache.html | 2 +- files/templates/votes.html | 2 +- 45 files changed, 264 insertions(+), 259 deletions(-) diff --git a/files/assets/js/bootstrap.js b/files/assets/js/bootstrap.js index dfe35569d..075fb575c 100644 --- a/files/assets/js/bootstrap.js +++ b/files/assets/js/bootstrap.js @@ -164,15 +164,17 @@ function bs_trigger(e) { } }) - let forms = document.querySelectorAll("textarea, .allow-emojis"); - forms.forEach(i => { - let pseudo_div = document.createElement("div"); - pseudo_div.className = "ghostdiv"; - pseudo_div.style.display = "none"; - i.after(pseudo_div); - i.addEventListener('input', update_speed_emoji_modal, false); - i.addEventListener('keydown', speed_carot_navigate, false); - }); + if (typeof update_speed_emoji_modal != 'undefined') { + let forms = e.querySelectorAll("textarea, .allow-emojis"); + forms.forEach(i => { + let pseudo_div = document.createElement("div"); + pseudo_div.className = "ghostdiv"; + pseudo_div.style.display = "none"; + i.after(pseudo_div); + i.addEventListener('input', update_speed_emoji_modal, false); + i.addEventListener('keydown', speed_carot_navigate, false); + }); + } } var bsTriggerOnReady = function() { diff --git a/files/assets/js/comments_v.js b/files/assets/js/comments_v.js index aadff07bc..2c4872414 100644 --- a/files/assets/js/comments_v.js +++ b/files/assets/js/comments_v.js @@ -253,7 +253,7 @@ function post_comment(fullname, hide){ comments.innerHTML = comment + comments.innerHTML; if (!hide) comments.scrollIntoView() - bs_trigger(commentForm); + bs_trigger(comments); btn.disabled = false; btn.classList.remove('disabled'); diff --git a/files/assets/js/emoji_modal.js b/files/assets/js/emoji_modal.js index d5475ba38..938718cfa 100644 --- a/files/assets/js/emoji_modal.js +++ b/files/assets/js/emoji_modal.js @@ -373,193 +373,190 @@ function emojiAddToInput(event) localStorage.setItem("favorite_emojis", JSON.stringify(favorite_emojis)); } -(function() { - const insertAt = (str, sub, pos) => `${str.slice(0, pos)}${sub}${str.slice(pos)}`; +const insertAt = (str, sub, pos) => `${str.slice(0, pos)}${sub}${str.slice(pos)}`; - let emoji_typing_state = false; +let emoji_typing_state = false; - function update_ghost_div_textarea(text) +function update_ghost_div_textarea(text) +{ + let ghostdiv = text.parentNode.querySelector(".ghostdiv"); + if (!ghostdiv) return; + + ghostdiv.innerText = text.value.substring(0, text.selectionStart); + ghostdiv.innerHTML += ""; + + // Now lets get coordinates + + ghostdiv.style.display = "initial"; + let end = ghostdiv.querySelector("span"); + const carot_coords = end.getBoundingClientRect(); + const ghostdiv_coords = ghostdiv.getBoundingClientRect(); + ghostdiv.style.display = "none"; + return { pos: text.selectionStart, x: carot_coords.x, y: carot_coords.y - ghostdiv_coords.y }; +} + +// Used for anything where a user is typing, specifically for the emoji modal +// Just leave it global, I don't care +let speed_carot_modal = document.createElement("div"); +speed_carot_modal.id = "speed-carot-modal"; +speed_carot_modal.style.position = "absolute"; +speed_carot_modal.style.left = "0px"; +speed_carot_modal.style.top = "0px"; +speed_carot_modal.style.display = "none"; +document.body.appendChild(speed_carot_modal); + +let e + +let current_word = ""; +let selecting; +let emoji_index = 0; + +function curr_word_is_emoji() +{ + return current_word && current_word.charAt(0) == ":" && + current_word.charAt(current_word.length-1) != ":"; +} + +function populate_speed_emoji_modal(results, textbox) +{ + selecting = true; + + if (!results || results.size === 0) { - let ghostdiv = text.parentNode.querySelector(".ghostdiv"); - if (!ghostdiv) return; - - ghostdiv.innerText = text.value.substring(0, text.selectionStart); - ghostdiv.innerHTML += ""; - - // Now lets get coordinates - - ghostdiv.style.display = "initial"; - let end = ghostdiv.querySelector("span"); - const carot_coords = end.getBoundingClientRect(); - const ghostdiv_coords = ghostdiv.getBoundingClientRect(); - ghostdiv.style.display = "none"; - return { pos: text.selectionStart, x: carot_coords.x, y: carot_coords.y - ghostdiv_coords.y }; + speed_carot_modal.style.display = "none"; + return -1; } - // Used for anything where a user is typing, specifically for the emoji modal - // Just leave it global, I don't care - let speed_carot_modal = document.createElement("div"); - speed_carot_modal.id = "speed-carot-modal"; - speed_carot_modal.style.position = "absolute"; - speed_carot_modal.style.left = "0px"; - speed_carot_modal.style.top = "0px"; - speed_carot_modal.style.display = "none"; - document.body.appendChild(speed_carot_modal); - - let e - - let current_word = ""; - let selecting; - let emoji_index = 0; - - function curr_word_is_emoji() + emoji_index = 0; + speed_carot_modal.innerHTML = ""; + const MAXXX = 25; + // Not sure why the results is a Set... but oh well + let i = 0; + for (let result of results) { - return current_word && current_word.charAt(0) == ":" && - current_word.charAt(current_word.length-1) != ":"; - } + if (i++ > MAXXX) return i; + let emoji_option = document.createElement("div"); + emoji_option.className = "speed-modal-option emoji-option " + (i === 1 ? "selected" : ""); + emoji_option.tabIndex = 0; + let emoji_option_img = document.createElement("img"); + emoji_option_img.className = "speed-modal-image emoji-option-image"; + // This is a bit + emoji_option_img.src = `/e/${result}.webp`; + let emoji_option_text = document.createElement("span"); + emoji_option_text.title = result; + emoji_option_text.innerText = result; - function populate_speed_emoji_modal(results, textbox) - { - selecting = true; + if (current_word.includes("#")) result = `#${result}` + if (current_word.includes("!")) result = `!${result}` - if (!results || results.size === 0) - { + emoji_option.onclick = (e) => { + selecting = false; speed_carot_modal.style.display = "none"; - return -1; - } + textbox.value = textbox.value.replace(new RegExp(current_word+"(?=\\s|$)", "g"), `:${result}:`) + markdown(textbox) + }; + // Pack + emoji_option.appendChild(emoji_option_img); + emoji_option.appendChild(emoji_option_text); + speed_carot_modal.appendChild(emoji_option); + } + if (i === 0) speed_carot_modal.style.display = "none"; + else speed_carot_modal.style.display = "initial"; + return i; +} - emoji_index = 0; - speed_carot_modal.innerHTML = ""; - const MAXXX = 25; - // Not sure why the results is a Set... but oh well - let i = 0; - for (let result of results) - { - if (i++ > MAXXX) return i; - let emoji_option = document.createElement("div"); - emoji_option.className = "speed-modal-option emoji-option " + (i === 1 ? "selected" : ""); - emoji_option.tabIndex = 0; - let emoji_option_img = document.createElement("img"); - emoji_option_img.className = "speed-modal-image emoji-option-image"; - // This is a bit - emoji_option_img.src = `/e/${result}.webp`; - let emoji_option_text = document.createElement("span"); - emoji_option_text.title = result; - emoji_option_text.innerText = result; +function update_speed_emoji_modal(event) +{ + const box_coords = update_ghost_div_textarea(event.target); - if (current_word.includes("#")) result = `#${result}` - if (current_word.includes("!")) result = `!${result}` + let text = event.target.value; - emoji_option.onclick = (e) => { - selecting = false; - speed_carot_modal.style.display = "none"; - textbox.value = textbox.value.replace(new RegExp(current_word+"(?=\\s|$)", "g"), `:${result}:`) - markdown(textbox) - }; - // Pack - emoji_option.appendChild(emoji_option_img); - emoji_option.appendChild(emoji_option_text); - speed_carot_modal.appendChild(emoji_option); - } - if (i === 0) speed_carot_modal.style.display = "none"; - else speed_carot_modal.style.display = "initial"; - return i; + // Unused, but left incase anyone wants to use this more efficient method for emojos + switch (event.data) + { + case ':': + emoji_typing_state = true; + break; + case ' ': + emoji_typing_state = false; + break; + default: + break; } - function update_speed_emoji_modal(event) + // Get current word at string, such as ":marse" or "word" + let coords = text.indexOf(' ',box_coords.pos); + current_word = /\S+$/.exec(text.slice(0, coords === -1 ? text.length : coords)); + if (current_word) current_word = current_word.toString(); + + /* We could also check emoji_typing_state here, which is less accurate but more efficient. I've + * kept it unless someone wants to provide an option to toggle it for performance */ + if (curr_word_is_emoji() && current_word != ":") { - const box_coords = update_ghost_div_textarea(event.target); + loadEmojis(null); + let modal_pos = event.target.getBoundingClientRect(); + modal_pos.x += window.scrollX; + modal_pos.y += window.scrollY; - let text = event.target.value; + speed_carot_modal.style.display = "initial"; + speed_carot_modal.style.left = box_coords.x - 35 + "px"; + speed_carot_modal.style.top = modal_pos.y + box_coords.y + 14 + "px"; - // Unused, but left incase anyone wants to use this more efficient method for emojos - switch (event.data) + // Do the search (and do something with it) + populate_speed_emoji_modal(emojisSearchDictionary.searchFor(current_word.substr(1).replace(/#/g, "").replace(/!/g, "")), event.target); + + } + else { + speed_carot_modal.style.display = "none"; + } +} + +function speed_carot_navigate(e) +{ + if (!selecting) return; + + let select_items = speed_carot_modal.querySelectorAll(".speed-modal-option"); + if (!select_items || !curr_word_is_emoji()) return false; + // Up or down arrow or enter + if (e.keyCode == 38 || e.keyCode == 40 || e.keyCode == 13) + { + if (emoji_index > select_items.length) + emoji_index = select_items; + + select_items[emoji_index].classList.remove("selected"); + switch (e.keyCode) { - case ':': - emoji_typing_state = true; + case 38: // Up arrow + if (emoji_index) + emoji_index--; break; - case ' ': - emoji_typing_state = false; + + case 40: // Down arrow + if (emoji_index < select_items.length-1) emoji_index++; break; + + case 13: + select_items[emoji_index].click(); + default: break; } - // Get current word at string, such as ":marse" or "word" - let coords = text.indexOf(' ',box_coords.pos); - current_word = /\S+$/.exec(text.slice(0, coords === -1 ? text.length : coords)); - if (current_word) current_word = current_word.toString(); - - /* We could also check emoji_typing_state here, which is less accurate but more efficient. I've - * kept it unless someone wants to provide an option to toggle it for performance */ - if (curr_word_is_emoji() && current_word != ":") - { - loadEmojis(null); - let modal_pos = event.target.getBoundingClientRect(); - modal_pos.x += window.scrollX; - modal_pos.y += window.scrollY; - - speed_carot_modal.style.display = "initial"; - speed_carot_modal.style.left = box_coords.x - 35 + "px"; - speed_carot_modal.style.top = modal_pos.y + box_coords.y + 14 + "px"; - - // Do the search (and do something with it) - populate_speed_emoji_modal(emojisSearchDictionary.searchFor(current_word.substr(1).replace(/#/g, "").replace(/!/g, "")), event.target); - - } - else { - speed_carot_modal.style.display = "none"; - } + select_items[emoji_index].classList.add("selected"); + e.preventDefault(); } +} - function speed_carot_navigate(e) - { - if (!selecting) return; - - let select_items = speed_carot_modal.querySelectorAll(".speed-modal-option"); - if (!select_items || !curr_word_is_emoji()) return false; - // Up or down arrow or enter - if (e.keyCode == 38 || e.keyCode == 40 || e.keyCode == 13) - { - if (emoji_index > select_items.length) - emoji_index = select_items; - - select_items[emoji_index].classList.remove("selected"); - switch (e.keyCode) - { - case 38: // Up arrow - if (emoji_index) - emoji_index--; - break; - - case 40: // Down arrow - if (emoji_index < select_items.length-1) emoji_index++; - break; - - case 13: - select_items[emoji_index].click(); - - default: - break; - } - - select_items[emoji_index].classList.add("selected"); - e.preventDefault(); - } - } - - // Let's get it running now - let forms = document.querySelectorAll("textarea, .allow-emojis"); - forms.forEach(i => { - let pseudo_div = document.createElement("div"); - pseudo_div.className = "ghostdiv"; - pseudo_div.style.display = "none"; - i.after(pseudo_div); - i.addEventListener('input', update_speed_emoji_modal, false); - i.addEventListener('keydown', speed_carot_navigate, false); - }); -})(); - +// Let's get it running now +let forms = document.querySelectorAll("textarea, .allow-emojis"); +forms.forEach(i => { + let pseudo_div = document.createElement("div"); + pseudo_div.className = "ghostdiv"; + pseudo_div.style.display = "none"; + i.after(pseudo_div); + i.addEventListener('input', update_speed_emoji_modal, false); + i.addEventListener('keydown', speed_carot_navigate, false); +}); function loadEmojis(inputTargetIDName) { @@ -575,4 +572,4 @@ function loadEmojis(inputTargetIDName) document.getElementById('emojiModal').addEventListener('shown.bs.modal', function () { emojiSearchBarDOM.focus(); -}); +}); \ No newline at end of file diff --git a/files/templates/admins.html b/files/templates/admins.html index 7353a3e32..a0bd04237 100644 --- a/files/templates/admins.html +++ b/files/templates/admins.html @@ -29,6 +29,6 @@ - + {% endblock %} diff --git a/files/templates/award_modal.html b/files/templates/award_modal.html index 017dfd61f..8054f5e08 100644 --- a/files/templates/award_modal.html +++ b/files/templates/award_modal.html @@ -55,4 +55,4 @@ - + diff --git a/files/templates/badges.html b/files/templates/badges.html index e1a883966..a3ab1e346 100644 --- a/files/templates/badges.html +++ b/files/templates/badges.html @@ -39,6 +39,6 @@ - + {% endblock %} \ No newline at end of file diff --git a/files/templates/ban_modal.html b/files/templates/ban_modal.html index f9bdfc406..ce75ef148 100644 --- a/files/templates/ban_modal.html +++ b/files/templates/ban_modal.html @@ -35,4 +35,4 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/files/templates/casino.html b/files/templates/casino.html index 9f4d96424..7778e963c 100644 --- a/files/templates/casino.html +++ b/files/templates/casino.html @@ -1,6 +1,6 @@ {% extends "default.html" %} {% block content %} - +
diff --git a/files/templates/category_modal.html b/files/templates/category_modal.html index d678ae1fc..37415c83d 100644 --- a/files/templates/category_modal.html +++ b/files/templates/category_modal.html @@ -13,4 +13,4 @@
- + diff --git a/files/templates/chat.html b/files/templates/chat.html index 935a9ed14..d8ba08b7f 100644 --- a/files/templates/chat.html +++ b/files/templates/chat.html @@ -3,7 +3,7 @@ - + @@ -220,8 +220,8 @@ {% include "emoji_modal.html" %} {% include "expanded_image_modal.html" %} - - - + + + \ No newline at end of file diff --git a/files/templates/comments.html b/files/templates/comments.html index 8c7f9ab9a..3c727cd86 100644 --- a/files/templates/comments.html +++ b/files/templates/comments.html @@ -817,20 +817,20 @@ {% endif %} {% if v %} - - + + {% endif %} - + {% if v and v.admin_level >= 2 %} - + {% endif %} {% include "expanded_image_modal.html" %} - - + + + @@ -377,13 +377,13 @@ - + {% if v %} - + {% endif %} - + diff --git a/files/templates/delete_post_modal.html b/files/templates/delete_post_modal.html index dd7fd4863..ef897be57 100644 --- a/files/templates/delete_post_modal.html +++ b/files/templates/delete_post_modal.html @@ -27,4 +27,4 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/files/templates/emoji_modal.html b/files/templates/emoji_modal.html index 4d0589a68..b5519638a 100644 --- a/files/templates/emoji_modal.html +++ b/files/templates/emoji_modal.html @@ -92,4 +92,4 @@ - + diff --git a/files/templates/followers.html b/files/templates/followers.html index a53a58b0c..ece41b98c 100644 --- a/files/templates/followers.html +++ b/files/templates/followers.html @@ -31,6 +31,6 @@ - + {% endblock %} \ No newline at end of file diff --git a/files/templates/following.html b/files/templates/following.html index 374568037..10cfb914e 100644 --- a/files/templates/following.html +++ b/files/templates/following.html @@ -29,6 +29,6 @@ - + {% endblock %} \ No newline at end of file diff --git a/files/templates/gif_modal.html b/files/templates/gif_modal.html index f279f393f..89d89b21f 100644 --- a/files/templates/gif_modal.html +++ b/files/templates/gif_modal.html @@ -26,4 +26,4 @@ - + diff --git a/files/templates/hats.html b/files/templates/hats.html index 04989d74f..d89870bfe 100644 --- a/files/templates/hats.html +++ b/files/templates/hats.html @@ -112,5 +112,5 @@ - + {% endblock %} diff --git a/files/templates/home.html b/files/templates/home.html index 9a299bb01..98d7c32cc 100644 --- a/files/templates/home.html +++ b/files/templates/home.html @@ -184,7 +184,7 @@ {% if PUSHER_ID != 'blahblahblah' and v %}
{{SITE}}{{v.id}}
{{PUSHER_ID}}
- + diff --git a/files/templates/log.html b/files/templates/log.html index 414eab65f..da6b343df 100644 --- a/files/templates/log.html +++ b/files/templates/log.html @@ -160,6 +160,6 @@ - + {% endblock %} \ No newline at end of file diff --git a/files/templates/login.html b/files/templates/login.html index e2391326e..4cb033c7b 100644 --- a/files/templates/login.html +++ b/files/templates/login.html @@ -4,7 +4,7 @@ - + diff --git a/files/templates/lottery.html b/files/templates/lottery.html index 2d734dcd1..fc6133e7c 100644 --- a/files/templates/lottery.html +++ b/files/templates/lottery.html @@ -185,5 +185,5 @@ - + diff --git a/files/templates/mobile_navigation_bar.html b/files/templates/mobile_navigation_bar.html index b9f9b14f9..1cb1c8ee2 100644 --- a/files/templates/mobile_navigation_bar.html +++ b/files/templates/mobile_navigation_bar.html @@ -80,4 +80,4 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/files/templates/notifications.html b/files/templates/notifications.html index 6dc66f6a9..fae00ae51 100644 --- a/files/templates/notifications.html +++ b/files/templates/notifications.html @@ -111,7 +111,7 @@ - + {% else %} {% with comments=notifications %} {% include "comments.html" %} diff --git a/files/templates/poll_votes.html b/files/templates/poll_votes.html index 75a6f9ee8..f3262ad93 100644 --- a/files/templates/poll_votes.html +++ b/files/templates/poll_votes.html @@ -38,7 +38,7 @@ - + {% endif %} diff --git a/files/templates/report_post_modal.html b/files/templates/report_post_modal.html index cf88fd8a1..1e7bf0be0 100644 --- a/files/templates/report_post_modal.html +++ b/files/templates/report_post_modal.html @@ -23,4 +23,4 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/files/templates/search.html b/files/templates/search.html index 1608c2af5..e05ae4a3c 100644 --- a/files/templates/search.html +++ b/files/templates/search.html @@ -83,7 +83,7 @@
- + {% endif %}
Showing {% block listinglength %}{{listing | length}}{% endblock %} of {{total}} result{{'s' if total != 1 else ''}} for

{{query}}

diff --git a/files/templates/settings.html b/files/templates/settings.html index bf563998a..a1925f4ec 100644 --- a/files/templates/settings.html +++ b/files/templates/settings.html @@ -3,7 +3,7 @@ - + @@ -260,7 +260,7 @@ {% block onload %}{% endblock %} - + diff --git a/files/templates/settings2.html b/files/templates/settings2.html index 67745ed0b..c33705966 100644 --- a/files/templates/settings2.html +++ b/files/templates/settings2.html @@ -4,7 +4,7 @@ - + diff --git a/files/templates/settings_blocks.html b/files/templates/settings_blocks.html index f1dd541e5..f60a418a1 100644 --- a/files/templates/settings_blocks.html +++ b/files/templates/settings_blocks.html @@ -111,6 +111,6 @@ - + {% endblock %} \ No newline at end of file diff --git a/files/templates/settings_profile.html b/files/templates/settings_profile.html index fa64a6144..5e72d02da 100644 --- a/files/templates/settings_profile.html +++ b/files/templates/settings_profile.html @@ -786,6 +786,6 @@ {% endif %} - + {% endblock %} \ No newline at end of file diff --git a/files/templates/settings_security.html b/files/templates/settings_security.html index 2aeacf943..5eb3a9a2d 100644 --- a/files/templates/settings_security.html +++ b/files/templates/settings_security.html @@ -4,7 +4,7 @@ {% block content %} - +
diff --git a/files/templates/shop.html b/files/templates/shop.html index 249691d52..0f57882ce 100644 --- a/files/templates/shop.html +++ b/files/templates/shop.html @@ -88,5 +88,5 @@ - + {% endblock %} diff --git a/files/templates/sign_up.html b/files/templates/sign_up.html index 422974205..d0cc3ab6b 100644 --- a/files/templates/sign_up.html +++ b/files/templates/sign_up.html @@ -3,7 +3,7 @@ - + @@ -140,10 +140,10 @@
- + {% if hcaptcha %} - + {% endif %} diff --git a/files/templates/sign_up_failed_ref.html b/files/templates/sign_up_failed_ref.html index 1f778f452..819ad2414 100644 --- a/files/templates/sign_up_failed_ref.html +++ b/files/templates/sign_up_failed_ref.html @@ -4,7 +4,7 @@ - + diff --git a/files/templates/sub/subs.html b/files/templates/sub/subs.html index 88a0f3430..e671a274a 100644 --- a/files/templates/sub/subs.html +++ b/files/templates/sub/subs.html @@ -26,6 +26,6 @@ - + {% endblock %} \ No newline at end of file diff --git a/files/templates/submission.html b/files/templates/submission.html index fbe7119c2..812c50a93 100644 --- a/files/templates/submission.html +++ b/files/templates/submission.html @@ -744,9 +744,9 @@ {% if p.domain == "twitter.com" %} {{p.embed_url | safe}} {% if v and v.theme.split("_")[0] in ["light", "coffee", "4chan"] %} - + {% else %} - + {% endif %} {% elif p.domain in ['youtu.be','youtube.com'] and p.embed_url and p.embed_url.startswith(' 1 and v.admin_level > 2) %} - + {% endif %} {% if not v or v.highlightcomments %} - + {% endif %} - + {% if not p.replies %} {% include "comments.html" %} {% endif %} {% if p.award_count("shit", v) %} - - + + {% endif %} {% if p.award_count("fireflies", v) %} - - + + {% endif %} +
@@ -1213,7 +1215,7 @@ {% endif %} {% if p.award_count("ricardo", v) %} - +
diff --git a/files/templates/submission_listing.html b/files/templates/submission_listing.html index c8cb6209b..63818b2c0 100644 --- a/files/templates/submission_listing.html +++ b/files/templates/submission_listing.html @@ -12,7 +12,7 @@ {% endif %} {% if not v or v.highlightcomments %} - + {% endif %} {% include "popover.html" %} @@ -306,7 +306,9 @@ @@ -427,6 +429,6 @@ {% endif %} {% include "expanded_image_modal.html" %} - - - + + + diff --git a/files/templates/submit.html b/files/templates/submit.html index 0169876d7..761dda630 100644 --- a/files/templates/submit.html +++ b/files/templates/submit.html @@ -3,7 +3,7 @@ - + @@ -228,9 +228,9 @@ {% endif %} - - - + + + {% include "emoji_modal.html" %} {% include "gif_modal.html" %} diff --git a/files/templates/transfers.html b/files/templates/transfers.html index 9aefd74ca..e7b4d5932 100644 --- a/files/templates/transfers.html +++ b/files/templates/transfers.html @@ -44,5 +44,5 @@ - + {% endblock %} \ No newline at end of file diff --git a/files/templates/userpage.html b/files/templates/userpage.html index e3d709e11..549b7da88 100644 --- a/files/templates/userpage.html +++ b/files/templates/userpage.html @@ -818,11 +818,11 @@ {% if v %}
{% if v.patron or u.patron or v.alts_patron or u.alts_patron %}0{% else %}0.03{% endif %}
- +
{{u.username}}
{% endif %} - + {% endblock %} @@ -849,7 +849,7 @@ {% endif %} {% if not request.path.endswith('/comments') %} - + {% endif %} {% if v and v.id != u.id and '/comments' not in request.path %} diff --git a/files/templates/userpage_comments.html b/files/templates/userpage_comments.html index 823aee102..d52b371e1 100644 --- a/files/templates/userpage_comments.html +++ b/files/templates/userpage_comments.html @@ -118,8 +118,8 @@ {% if v %}
{% if v.patron or u.patron %}0{% else %}0.03{% endif %}
{{u.username}}
- + {% endif %} - + {% endblock %} \ No newline at end of file diff --git a/files/templates/userpage_private.html b/files/templates/userpage_private.html index b04bfe6d9..91dfa9a00 100644 --- a/files/templates/userpage_private.html +++ b/files/templates/userpage_private.html @@ -34,9 +34,9 @@
{% if v.patron or u.patron %}0{% else %}0.03{% endif %}
{{u.username}}
{%- include "emoji_modal.html" -%} - + {% endif %} - + {% endblock %} \ No newline at end of file diff --git a/files/templates/util/assetcache.html b/files/templates/util/assetcache.html index b56b5537b..1efc33c18 100644 --- a/files/templates/util/assetcache.html +++ b/files/templates/util/assetcache.html @@ -16,7 +16,7 @@ set CACHE_VER = { 'css/win98.css': 4003, 'js/award_modal.js': 4000, - 'js/bootstrap.js': 4001, + 'js/bootstrap.js': 4002, 'js/category_modal.js': 4000, 'js/comments_admin.js': 4000, 'js/comments_v.js': 4001, diff --git a/files/templates/votes.html b/files/templates/votes.html index de147e25d..c36078ec5 100644 --- a/files/templates/votes.html +++ b/files/templates/votes.html @@ -75,7 +75,7 @@ - + {% endif %}