From 113a1b49592fde0d6a0b886e3e35cb5fa919711f Mon Sep 17 00:00:00 2001 From: mummified-corroding-granny Date: Mon, 6 Feb 2023 02:07:39 +0000 Subject: [PATCH] small lil tisms: table column sort disabling, remove ugly https:// string from rules (#112) * about the rdrama_rules, when I changed from http:// to https:// the other day, in some browsers it now displays the protocol tag which is ugly and inconsistent. Not sure why on some browsers it did not display "http://" before * about the sorting: I will disable sorting on more table columns later on. This is all I can do right now Reviewed-on: https://fsdfsd.net/rDrama/rDrama/pulls/112 Co-authored-by: mummified-corroding-granny Co-committed-by: mummified-corroding-granny --- files/assets/js/bottom.js | 3 +++ files/templates/admin/alt_votes.html | 6 +++--- files/templates/admin/alts.html | 6 +++--- files/templates/formatting.html | 8 ++++---- files/templates/hats.html | 4 ++-- files/templates/rules_rDrama.html | 2 +- files/templates/shop.html | 4 ++-- files/templates/stats.html | 4 ++-- files/templates/userpage/blockers.html | 2 +- files/templates/userpage/followers.html | 4 ++-- files/templates/userpage/following.html | 2 +- files/templates/userpage/views.html | 2 +- 12 files changed, 25 insertions(+), 22 deletions(-) diff --git a/files/assets/js/bottom.js b/files/assets/js/bottom.js index 59c887c0b..5366b6e81 100644 --- a/files/assets/js/bottom.js +++ b/files/assets/js/bottom.js @@ -96,6 +96,9 @@ if (reload_page) { const TH = document.getElementsByTagName('th') for (const element of TH) { + if (element.classList.contains("disable-sort-click")) + continue; + element.addEventListener('click', () => {sort_table(element)}); } diff --git a/files/templates/admin/alt_votes.html b/files/templates/admin/alt_votes.html index 8709f4a35..124db9be4 100644 --- a/files/templates/admin/alt_votes.html +++ b/files/templates/admin/alt_votes.html @@ -16,9 +16,9 @@ - @{{u1.username}} only (% unique) - Both - @{{u2.username}} only (% unique) + @{{u1.username}} only (% unique) + Both + @{{u2.username}} only (% unique) diff --git a/files/templates/admin/alts.html b/files/templates/admin/alts.html index b1e264e80..a6c277005 100644 --- a/files/templates/admin/alts.html +++ b/files/templates/admin/alts.html @@ -25,11 +25,11 @@ # Name - Account Created + Account Created Alt Link Created Manual - Delinked - Actions + Delinked + Actions {% for user in alts %} diff --git a/files/templates/formatting.html b/files/templates/formatting.html index 759fb5f46..70aedc200 100644 --- a/files/templates/formatting.html +++ b/files/templates/formatting.html @@ -9,8 +9,8 @@ Name - What you type - What gets displayed + What you type + What gets displayed @@ -241,8 +241,8 @@ And we allow custom HTML in most places: Name - What you type - What gets displayed + What you type + What gets displayed diff --git a/files/templates/hats.html b/files/templates/hats.html index c2619cb82..4d440e61e 100644 --- a/files/templates/hats.html +++ b/files/templates/hats.html @@ -37,7 +37,7 @@ - + {% if SITE == 'rdrama.net' %} @@ -45,7 +45,7 @@ {% endif %} - + diff --git a/files/templates/rules_rDrama.html b/files/templates/rules_rDrama.html index c0b650259..b04dea173 100644 --- a/files/templates/rules_rDrama.html +++ b/files/templates/rules_rDrama.html @@ -1,6 +1,6 @@

Drama: any incident, scene, gaffe, rumor, opinion, or disagreement that is blown entirely out of proportion.

Do your part to keep our community healthy by blowing everything out of proportion and making literally everything as dramatic as possible.

-

https://rdrama.net caters to drama in all forms such as: Real life, videos, photos, gossip, rumors, news sites, Reddit, and Beyond™. There isn't drama we won't touch, and we want it all.

+

rdrama.net caters to drama in all forms such as: Real life, videos, photos, gossip, rumors, news sites, Reddit, and Beyond™. There isn't drama we won't touch, and we want it all.

What we want:

  • Arguments.

    • diff --git a/files/templates/shop.html b/files/templates/shop.html index 8ba1c0bfb..862ed4337 100644 --- a/files/templates/shop.html +++ b/files/templates/shop.html @@ -41,11 +41,11 @@
HatHat Name DescriptionOwners PriceActionsActions Added on
- + - + diff --git a/files/templates/stats.html b/files/templates/stats.html index c5494152b..1deb8d07c 100644 --- a/files/templates/stats.html +++ b/files/templates/stats.html @@ -4,8 +4,8 @@
IconIcon Title Price OwnedBuyBuy Description
- - + + {% for key, value in data.items() %} diff --git a/files/templates/userpage/blockers.html b/files/templates/userpage/blockers.html index 5532b4f2b..cfbde0ca0 100644 --- a/files/templates/userpage/blockers.html +++ b/files/templates/userpage/blockers.html @@ -6,7 +6,7 @@ - + diff --git a/files/templates/userpage/followers.html b/files/templates/userpage/followers.html index 2abc7ffff..320eb3723 100644 --- a/files/templates/userpage/followers.html +++ b/files/templates/userpage/followers.html @@ -6,9 +6,9 @@ - + + {% endif %} diff --git a/files/templates/userpage/following.html b/files/templates/userpage/following.html index 12f160e8d..3838a0678 100644 --- a/files/templates/userpage/following.html +++ b/files/templates/userpage/following.html @@ -7,7 +7,7 @@ {% if v.id == u.id %} - + {% endif %} diff --git a/files/templates/userpage/views.html b/files/templates/userpage/views.html index 40ef7c4cc..4377bdfe8 100644 --- a/files/templates/userpage/views.html +++ b/files/templates/userpage/views.html @@ -6,7 +6,7 @@ - + {% for view in views %}
StatisticValueStatisticValue
NameBlocking sinceBlocking since
NameFollowing sinceFollowing since {% if v.id == u.id %} -
Name
NameLast visitLast visit