From 787c89961fa5722c72f45ef82d21ffd83d5d6335 Mon Sep 17 00:00:00 2001 From: Aevann1 Date: Mon, 21 Nov 2022 16:36:17 +0200 Subject: [PATCH] remove User.newtab and see if anyone complains --- files/classes/user.py | 1 - files/routes/settings.py | 1 - files/templates/admin/apps.html | 2 +- files/templates/comments.html | 6 +++--- files/templates/popover.html | 2 +- files/templates/settings/advanced.html | 1 - files/templates/submission.html | 6 +++--- files/templates/submission_listing.html | 10 +++++----- files/templates/submit.html | 2 +- files/templates/util/macros.html | 2 +- schema.sql | 2 -- 11 files changed, 15 insertions(+), 20 deletions(-) diff --git a/files/classes/user.py b/files/classes/user.py index 7aae028c7..ec4979bd5 100644 --- a/files/classes/user.py +++ b/files/classes/user.py @@ -86,7 +86,6 @@ class User(Base): slurreplacer = Column(Integer, default=1) profanityreplacer = Column(Integer, default=1) flairchanged = Column(Integer) - newtab = Column(Boolean, default=False) newtabexternal = Column(Boolean, default=True) reddit = Column(String, default='old.reddit.com') nitter = Column(Boolean) diff --git a/files/routes/settings.py b/files/routes/settings.py index e7a92dbe8..dc5b2bb57 100644 --- a/files/routes/settings.py +++ b/files/routes/settings.py @@ -120,7 +120,6 @@ def settings_personal_post(v): updated = updated or update_flag("hidevotedon", "hidevotedon") updated = updated or update_flag("cardview", "cardview") updated = updated or update_flag("highlightcomments", "highlightcomments") - updated = updated or update_flag("newtab", "newtab") updated = updated or update_flag("newtabexternal", "newtabexternal") updated = updated or update_flag("nitter", "nitter") updated = updated or update_flag("imginn", "imginn") diff --git a/files/templates/admin/apps.html b/files/templates/admin/apps.html index 6c0255931..5467c88fc 100644 --- a/files/templates/admin/apps.html +++ b/files/templates/admin/apps.html @@ -8,7 +8,7 @@
- +
diff --git a/files/templates/comments.html b/files/templates/comments.html index 0a967f8f2..47986edef 100644 --- a/files/templates/comments.html +++ b/files/templates/comments.html @@ -88,7 +88,7 @@ {% endif %} {% if c.post.sub %} - in /h/{{c.post.sub}} + in /h/{{c.post.sub}} {% endif %} {% elif c.author_id==AUTOJANNY_ID %} Notification @@ -291,7 +291,7 @@
-
Formatting help
+
Formatting help
{% endif %}
@@ -540,7 +540,7 @@
-
Formatting help
+
Formatting help
diff --git a/files/templates/popover.html b/files/templates/popover.html index aea1c14e8..ff81213d8 100644 --- a/files/templates/popover.html +++ b/files/templates/popover.html @@ -38,7 +38,7 @@ coins - + View diff --git a/files/templates/settings/advanced.html b/files/templates/settings/advanced.html index 1ce94f837..3bd653ca2 100644 --- a/files/templates/settings/advanced.html +++ b/files/templates/settings/advanced.html @@ -96,7 +96,6 @@
Tab Behavior
- {{common.toggle_section("Open Internal Links In New Tabs", "newtab", "newtab", v.newtab, "Enable if you would like to automatically open links to other pages on the site in new tabs.", false)}} {{common.toggle_section("Open External Links In New Tabs", "newtabexternal", "newtabexternal", v.newtabexternal, "Enable if you would like to automatically open links to other sites in new tabs.", false)}}
diff --git a/files/templates/submission.html b/files/templates/submission.html index 4e54c5811..a4aca3828 100644 --- a/files/templates/submission.html +++ b/files/templates/submission.html @@ -206,7 +206,7 @@
-
Formatting help
+
Formatting help
{% endif %} @@ -225,7 +225,7 @@
{% else %}
diff --git a/files/templates/submission_listing.html b/files/templates/submission_listing.html index 40440e4e5..1b8ff76ff 100644 --- a/files/templates/submission_listing.html +++ b/files/templates/submission_listing.html @@ -82,7 +82,7 @@ {% if p.club and not (v and (v.paid_dues or v.id == p.author_id)) %} post thumnail {% elif not p.url %} - + post thumnail {% elif p.is_image %} @@ -117,7 +117,7 @@
- + {% if p.club %}{{CC}}{% endif %} {% if p.flair %}{{p.flair | safe}}{% endif %} {{p.realtitle(v) | safe}} @@ -131,7 +131,7 @@ {% if p.realbody(v, listing=True) %} {% endif %} - + {{p.comment_count}} @@ -143,7 +143,7 @@
  • - + {{p.comment_count}} @@ -246,7 +246,7 @@ {% if p.is_image and not p.over_18 and ((v and v.cardview) or (not v and CARD_VIEW)) %}
    - + Unable to load image
    diff --git a/files/templates/submit.html b/files/templates/submit.html index 9a24cc20e..5ab9b0ce9 100644 --- a/files/templates/submit.html +++ b/files/templates/submit.html @@ -64,7 +64,7 @@
    -
    Formatting help
    +
    Formatting help
    diff --git a/files/templates/util/macros.html b/files/templates/util/macros.html index 20990b206..c5106dd04 100644 --- a/files/templates/util/macros.html +++ b/files/templates/util/macros.html @@ -103,7 +103,7 @@ {% endif %}  {{p.age_string}}   - ({% if p.is_image %}image post{% elif p.is_video %}video post{% elif p.is_audio %}audio post{% elif p.domain %}{{p.domain|truncate(50, True)}}{% else %}text post{% endif %}) + ({% if p.is_image %}image post{% elif p.is_video %}video post{% elif p.is_audio %}audio post{% elif p.domain %}{{p.domain|truncate(50, True)}}{% else %}text post{% endif %}) {% if p.edited_utc %} Edited {{p.edited_string}} {% endif %} diff --git a/schema.sql b/schema.sql index 9b6c3ed8d..2da44c72b 100644 --- a/schema.sql +++ b/schema.sql @@ -951,7 +951,6 @@ CREATE TABLE public.users ( profileurl character varying(65), bannerurl character varying(65), hidevotedon boolean DEFAULT false NOT NULL, - newtab boolean DEFAULT false NOT NULL, flairchanged integer, defaultsortingcomments character varying(15) NOT NULL, theme character varying(15) NOT NULL, @@ -2685,4 +2684,3 @@ ALTER TABLE ONLY public.comment_option_votes -- -- PostgreSQL database dump complete -- -