+ 
diff --git a/files/templates/comments.html b/files/templates/comments.html
index 367106477..b8dedd273 100644
--- a/files/templates/comments.html
+++ b/files/templates/comments.html
@@ -303,7 +303,7 @@
{% endif %}
{% endif %}{{c.author.customtitle | safe}}{% endif %}
+ {% if c.author.customtitle %} {% if c.author.quadrant %}
{% endif %}{{c.author.customtitle | safe}}{% endif %}
{% if c.parent_comment_id and not standalone and level<=7 %}{{ c.parent_comment.author.username }}{% endif %}
diff --git a/files/templates/default.html b/files/templates/default.html
index ad32cfcac..5ba4aaf91 100644
--- a/files/templates/default.html
+++ b/files/templates/default.html
@@ -80,9 +80,9 @@
-
+
-
+
{% block title %}
+ 
That request was bad and you should feel bad.
diff --git a/files/templates/errors/401.html b/files/templates/errors/401.html index 7eefda53c..0ba2c09b8 100644 --- a/files/templates/errors/401.html +++ b/files/templates/errors/401.html @@ -11,7 +11,7 @@
+ 
+ 
YOU AREN'T WELCOME HERE GO AWAY
diff --git a/files/templates/errors/404.html b/files/templates/errors/404.html index d217c1d06..c408ec6b6 100644 --- a/files/templates/errors/404.html +++ b/files/templates/errors/404.html @@ -10,7 +10,7 @@
+ 
Someone typed something wrong and it was probably you, please do better.
diff --git a/files/templates/errors/405.html b/files/templates/errors/405.html index a33f403a2..b240e49b0 100644 --- a/files/templates/errors/405.html +++ b/files/templates/errors/405.html @@ -10,7 +10,7 @@
+ 
idk how anyone gets this error but if you see this, remember to follow @carpathianflorist
the original error text here talked about internet gremlins and wtf
+ 
go spam somewhere else nerd
diff --git a/files/templates/errors/500.html b/files/templates/errors/500.html index 486a7e061..b31eea6e6 100644 --- a/files/templates/errors/500.html +++ b/files/templates/errors/500.html @@ -10,7 +10,7 @@
+
Hiiiii it's carp! I think this error means that there's a timeout error. And I think that means something took too long to load so it decided not to work at all. If you keep seeing this on the same page but not other pages, then something is probably wrong with that specific function. It may not be called a function, but that sounds right to me. Anyway, ping me and I'll whine to someone smarter to fix it. Don't bother them. Thanks ily <3
diff --git a/files/templates/errors/nsfw.html b/files/templates/errors/nsfw.html index 0e34702b1..25371ead2 100644 --- a/files/templates/errors/nsfw.html +++ b/files/templates/errors/nsfw.html @@ -10,7 +10,7 @@
+ 
This post is rated +18 (Adult-Only). You must be 18 or older to continue. Are you sure you want to proceed?
+ 
This page is only available to {% if "rama" in request.host %}paypigs{% else %}patrons{% endif %}:
{{'GUMROAD_LINK' | app_config}} diff --git a/files/templates/formatting.html b/files/templates/formatting.html index 0ac5efb23..4b91b74f5 100644 --- a/files/templates/formatting.html +++ b/files/templates/formatting.html @@ -56,12 +56,12 @@ On {{'SITE_NAME' | app_config}}, you can use Markdown formatting.
+ 
{% if "gigachadlife" in request.host %}
GigaChadLife
- {% elif "shithole" not in request.host %}
+ {% elif "shithole" not in request.host and 'pcm' not in request.host %}
{% endif %}
diff --git a/files/templates/login.html b/files/templates/login.html
index 3c027a6c1..f08340a4f 100644
--- a/files/templates/login.html
+++ b/files/templates/login.html
@@ -107,7 +107,7 @@
-
+
+
diff --git a/files/templates/patrons.html b/files/templates/patrons.html
index 24228acbd..9c0017049 100644
--- a/files/templates/patrons.html
+++ b/files/templates/patrons.html
@@ -15,7 +15,7 @@
+
diff --git a/files/templates/sign_up_failed_ref.html b/files/templates/sign_up_failed_ref.html
index cd96d67c0..dc1038999 100644
--- a/files/templates/sign_up_failed_ref.html
+++ b/files/templates/sign_up_failed_ref.html
@@ -83,7 +83,7 @@
-
+
diff --git a/files/templates/submission.html b/files/templates/submission.html
index cc8c8ba50..b4c4da9ee 100644
--- a/files/templates/submission.html
+++ b/files/templates/submission.html
@@ -87,19 +87,19 @@
}
- 
+ 
{% endif %}
{% if p.award_count("train") > 1 %}
-
+
{% endif %}
{% if p.award_count("train") > 2 %}
-
+
{% endif %}
{% if p.award_count("train") > 3 %}
-
+
{% endif %}
@@ -446,7 +446,7 @@
{% if p.active_flags %}{{p.active_flags}} Reports{% endif %}
{% if p.author.verified %}
{% endif %}
- 
{% endif %}{{p.author.customtitle | safe}}{% endif %}
+ 
{% endif %}{{p.author.customtitle | safe}}{% endif %}
{{p.age_string}}
({% if p.realurl(v) %}{{p.domain}}{% else %}text post{% endif %})
diff --git a/files/templates/submission_listing.html b/files/templates/submission_listing.html
index df03887e7..b0ab04b12 100644
--- a/files/templates/submission_listing.html
+++ b/files/templates/submission_listing.html
@@ -216,7 +216,7 @@
{% if p.active_flags %}{{p.active_flags}} Reports{% endif %}
{% if p.author.verified %}
{% endif %}
- {% endif %}{{p.author.customtitle | safe}}{% endif %}
+ {% endif %}{{p.author.customtitle | safe}}{% endif %}
{{p.age_string}}
({% if p.realurl(v) %}{{p.domain}}{% else %}text post{% endif %})
diff --git a/files/templates/submit.html b/files/templates/submit.html
index 5e3ad3156..89ee8e62a 100644
--- a/files/templates/submit.html
+++ b/files/templates/submit.html
@@ -10,7 +10,7 @@
-
+
{% include "emoji_modal.html" %}
{% include "gif_modal.html" %}
diff --git a/files/templates/userpage.html b/files/templates/userpage.html
index fe73c0d96..97a333212 100644
--- a/files/templates/userpage.html
+++ b/files/templates/userpage.html
@@ -5,7 +5,7 @@
{% block title %}
-{% if u and u.profilecss %}
+{% if u and u.profilecss and not (v and v.admin_level) %}
{% endif %}
@@ -155,7 +155,7 @@
- {% if u.customtitle %}{% if u.quadrant %}
{% endif %}{{u.customtitle | safe}}
{% if u.quadrant %}
{% endif %}{{u.customtitle | safe}}
+ 
{% if u.procoins %}
{{u.procoins}}
- 
+ 
{% endif %}
{% if u.stored_subscriber_count >=1 and not u.is_nofollow %}{{u.stored_subscriber_count}} follower{{'s' if u.stored_subscriber_count != 1 else ''}} {% endif %}
@@ -436,7 +436,7 @@
{% if v and v.has_follower(u) and not v.is_nofollow %}
Follows you
{% endif %}
- {% if u.customtitle %}{% if u.quadrant %}{% endif %}{{u.customtitle | safe}}
{% if u.quadrant %}{% endif %}{{u.customtitle | safe}}
+
{% if u.procoins %}
{{u.procoins}}
-
+
{% endif %}
{% if u.stored_subscriber_count >=1 and not u.is_nofollow %}{{u.stored_subscriber_count}} follower{{'s' if u.stored_subscriber_count != 1 else ''}} {% endif %}