+ 
diff --git a/files/templates/award_modal.html b/files/templates/award_modal.html
index b90ef5a02..afda87db9 100644
--- a/files/templates/award_modal.html
+++ b/files/templates/award_modal.html
@@ -23,11 +23,6 @@
{{award.owned}} owned
{% endfor %}
-
-
-
- More comments
+ More comments
{% elif replies %}
{% endif %}
{% endif %}
@@ -255,7 +255,7 @@
{% else %}
{{c.post.realtitle(v) | safe}}
{% endif %}
- {% elif c.author_id==NOTIFICATIONS_ACCOUNT or c.author_id==AUTOJANNY_ACCOUNT %}
+ {% elif c.author_id==NOTIFICATIONS_ID or c.author_id==AUTOJANNY_ID %}
{{'SITE_NAME' | app_config}} Notification
{% else %}
{% if c.sentto == 0 %}
@@ -291,7 +291,7 @@
{% endif %}
{% if c.active_flags %}{{c.active_flags}} Reports{% endif %}
{% if c.over_18 %}+18{% endif %}
- {% if v and v.admin_level==6 and c.author.shadowbanned %}{% endif %}
+ {% if v and v.admin_level > 1 and c.author.shadowbanned %}{% endif %}
{% if c.is_pinned %}{% endif %}
{% if c.distinguish_level %}{% endif %}
{% if c.is_op %}{% endif %}
@@ -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 %}
@@ -319,7 +319,7 @@
-
{% for f in c.ordered_flags %}
-
- {{f.user.username}}{% if f.reason %}: {{f.reason | safe}}{% endif %} {% if v.admin_level==6 %}[remove]{% endif %} +
- {{f.user.username}}{% if f.reason %}: {{f.reason | safe}}{% endif %} {% if v and v.admin_level > 1 %}[remove]{% endif %} {% endfor %}
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/login_2fa.html b/files/templates/login_2fa.html
index 928ba0cba..1da0240e5 100644
--- a/files/templates/login_2fa.html
+++ b/files/templates/login_2fa.html
@@ -12,7 +12,7 @@
+
+
diff --git a/files/templates/notifications.html b/files/templates/notifications.html
index 1999f56f6..e8581a7ef 100644
--- a/files/templates/notifications.html
+++ b/files/templates/notifications.html
@@ -30,7 +30,7 @@
Messages
- {% if v.admin_level==6 %}
+ {% if v.admin_level > 1 %}
diff --git a/files/templates/settings_profile.html b/files/templates/settings_profile.html
index f118e62e4..a59fc1caa 100644
--- a/files/templates/settings_profile.html
+++ b/files/templates/settings_profile.html
@@ -550,8 +550,8 @@
+ 
{% endif %}
{% if p.award_count("train") > 1 %}
-
+
{% endif %}
{% if p.award_count("train") > 2 %}
-
+
{% endif %}
{% if p.award_count("train") > 3 %}
-
+
{% endif %}
-{% if v and (v.id == p.author_id or v.admin_level == 6 and v.id in [1,28,30,995,2513,3333]) %}
+{% if v and (v.id == p.author_id or v.admin_level > 1 and v.admin_level > 2) %}
{% if v %}
-
+
{% include "award_modal.html" %}
{% include "emoji_modal.html" %}
{% include "gif_modal.html" %}
- {% if v.admin_level == 6 %}
+ {% if v.admin_level > 1 %}
{% include "ban_modal.html" %}
{% endif %}
{% endif %}
@@ -316,7 +316,7 @@
- {% if v and (v.id==p.author_id or v.admin_level==6 and v.id in [1,28,30,995,2513,3333]) and not v.is_suspended %}
+ {% if v and (v.id==p.author_id or v.admin_level > 1 and v.admin_level > 2) and not v.is_suspended %}
-
-
+
+
diff --git a/files/templates/submission.html b/files/templates/submission.html
index 81855311c..7f88da0b5 100644
--- a/files/templates/submission.html
+++ b/files/templates/submission.html
@@ -87,26 +87,26 @@
}
-
+
{% endif %}
{% if p.award_count("train") > 1 %}
-
+
{% endif %}
{% if p.award_count("train") > 2 %}
-
+
{% endif %}
{% if p.award_count("train") > 3 %}
-
+
{% endif %}
-{% if v and (v.id == p.author_id or v.admin_level == 6 and v.id in [1,28,30,995,2513,3333]) %}
+{% if v and (v.id == p.author_id or v.admin_level > 1 and v.admin_level > 2) %}
{% if v %}
-
+
{% include "award_modal.html" %}
{% include "emoji_modal.html" %}
{% include "gif_modal.html" %}
- {% if v.admin_level == 6 %}
+ {% if v.admin_level > 1 %}
{% include "ban_modal.html" %}
{% endif %}
{% endif %}
@@ -316,7 +316,7 @@
-
- {% if v and (v.id==p.author_id or v.admin_level==6 and v.id in [1,28,30,995,2513,3333]) %}
+ {% if v and (v.id==p.author_id or v.admin_level > 1 and v.admin_level > 2) %}
{% endif %}
@@ -351,12 +351,12 @@
- {% if v.admin_level >=3 or v.id == p.author.id and v.paid_dues %}
+ {% if v.admin_level > 1 or v.id == p.author.id and v.paid_dues %}
{% endif %}
- {% if v.admin_level >=3 %}
+ {% if v.admin_level > 1 %}
{% if v==p.author %}
@@ -373,7 +373,7 @@
{% endif %}
{% endif %}
- {% if v.admin_level >=4 and p.oauth_app %}
+ {% if v.admin_level > 1 and p.oauth_app %}
{% endif %}
@@ -387,7 +387,7 @@
{% endif %}
- {% if v and (v.id==p.author_id or v.admin_level>=3) %}
+ {% if v and (v.id==p.author_id or v.admin_level > 1) %}
{% endif %}
@@ -397,7 +397,7 @@
{% endif %}
- {% if v and v.admin_level == 6 and v.id!=p.author_id %}
+ {% if v and v.admin_level > 1 and v.id!=p.author_id %}
{% endif %}
@@ -410,6 +410,11 @@
{% block content %}
+{% if request.host == 'pcmemes.net' %}
+ {% set cc='SPLASH MOUNTAIN' %}
+{% else %}
+ {% set cc='COUNTRY CLUB' %}
+{% endif %}
- {{f.user.username}}{% if f.reason %}: {{f.reason | safe}}{% endif %} {% if v.admin_level==6 %}[remove]{% endif %} +
- {{f.user.username}}{% if f.reason %}: {{f.reason | safe}}{% endif %} {% if v and v.admin_level > 1 %}[remove]{% endif %} {% endfor %}
@@ -436,7 +441,7 @@
{% endfor %}
{% endif %}
- {% if v and v.admin_level==6 and p.author.shadowbanned %}{% endif %}
+ {% if v and v.admin_level > 1 and p.author.shadowbanned %}{% endif %}
{% if p.stickied %}{% endif %}
{% if p.is_pinned %}{% endif %}
{% if p.distinguish_level %} {% endif %}
@@ -446,7 +451,7 @@
{% if p.active_flags %}{{p.active_flags}} Reports{% endif %}
{% if p.author.verified %}
{% endif %}
- 
{{p.author.username}}{% if p.author.customtitle %} {% if p.author.quadrant %}
{% endif %}{{p.author.customtitle | safe}}{% endif %}
+ {{p.author.username}}{% if p.author.customtitle %} {% if p.author.quadrant %}
{% endif %}{{p.author.customtitle | safe}}{% endif %}
{{p.age_string}}
({% if p.realurl(v) %}{{p.domain}}{% else %}text post{% endif %})
@@ -459,19 +464,19 @@
{% endif %}
{% if p.realurl(v) %}
{% 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 %})
@@ -459,19 +464,19 @@
-
{% for f in p.ordered_flags %}
-
- {% if p.club %}COUNTRY CLUB{% endif %} + {% if p.club %}{{cc}}{% endif %} {{p.realtitle(v) | safe}}
{% else %}- {% if p.club %}COUNTRY CLUB{% endif %} + {% if p.club %}{{cc}}{% endif %} {{p.realtitle(v) | safe}}
{% endif %} @@ -555,7 +560,7 @@
{% endif %}
-{% if v.admin_level >=3 and v.id==p.author_id %}
+{% if v.admin_level > 1 and v.id==p.author_id %}
{% endif %}
-{% if v.admin_level >=1 and v.admin_level > p.author.admin_level %}
+{% if v.admin_level > 1 and v.admin_level > p.author.admin_level %}
{% if p.is_banned %}
{{p.body_html | safe}}
diff --git a/files/templates/submission_listing.html b/files/templates/submission_listing.html
index f975c3dc6..dcd4da6ae 100644
--- a/files/templates/submission_listing.html
+++ b/files/templates/submission_listing.html
@@ -32,6 +32,12 @@
})
+{% if request.host == 'pcmemes.net' %}
+ {% set cc='SPLASH MOUNTAIN' %}
+{% else %}
+ {% set cc='COUNTRY CLUB' %}
+{% endif %}
+
{% for p in listing %}
@@ -204,7 +210,7 @@
{% endfor %}
{% endif %}
- {% if v and v.admin_level==6 and p.author.shadowbanned %}{% endif %}
+ {% if v and v.admin_level > 1 and p.author.shadowbanned %}{% endif %}
{% if p.stickied %}{% endif %}
{% if p.distinguish_level %}{% endif %}
{% if p.is_pinned and request.path.startswith('/@') %}{% endif %}
@@ -216,7 +222,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 %})
@@ -225,7 +231,7 @@
- {% if p.club %}COUNTRY CLUB{% endif %} + {% if p.club %}{{cc}}{% endif %} {{p.realtitle(v) | safe}}
@@ -271,7 +277,7 @@ {% endif %} {% endif %} - {% if v and v.admin_level>=3 %} + {% if v and v.admin_level > 1 %} Pin Unpin {% if v==p.author %} @@ -281,12 +287,12 @@ {% endif %} {% if v %} - {% if v.admin_level >=3 or v.id == p.author.id and v.paid_dues %} + {% if v.admin_level > 1 or v.id == p.author.id and v.paid_dues %} Mark club Unmark club {% endif %} - {% if v.admin_level >=3 %} + {% if v.admin_level > 1 %} {% if "/reported/" in request.path %} {% if v.id != p.author.id %}Remove{% endif %} Approve @@ -297,7 +303,7 @@ {% endif %} - {% if v.admin_level >= 4 and p.oauth_app %} + {% if v.admin_level > 1 and p.oauth_app %} API App {% endif %} @@ -309,12 +315,12 @@ Block user {% endif %} - {% if v and (v.id==p.author_id or v.admin_level>=3) %} + {% if v and (v.id==p.author_id or v.admin_level > 1) %} Mark +18 Unmark +18 {% endif %} - {% if v.admin_level >=3 and v.id!=p.author_id %} + {% if v.admin_level > 1 and v.id!=p.author_id %} Ban user Unban user {% endif %} @@ -437,12 +443,12 @@ - {% if v.admin_level >=3 or v.id == p.author.id and v.paid_dues %} + {% if v.admin_level > 1 or v.id == p.author.id and v.paid_dues %} {% endif %} - {% if v.admin_level >=3 %} + {% if v.admin_level > 1 %} {% if v==p.author %} @@ -459,7 +465,7 @@ {% endif %} {% endif %} - {% if v.admin_level >=4 and p.oauth_app %} + {% if v.admin_level > 1 and p.oauth_app %} {% endif %} @@ -473,7 +479,7 @@ {% endif %} - {% if v and (v.id==p.author_id or v.admin_level>=3) %} + {% if v and (v.id==p.author_id or v.admin_level > 1) %} {% endif %} @@ -483,7 +489,7 @@ {% endif %} - {% if v and v.admin_level == 6 and v.id!=p.author_id %} + {% if v and v.admin_level > 1 and v.id!=p.author_id %} {% endif %} @@ -602,7 +608,7 @@ {% if v %} {% include "delete_post_modal.html" %} {% include "report_post_modal.html" %} - {% if v.admin_level == 6 %} + {% if v.admin_level > 1 %} {% include "ban_modal.html" %} {% endif %} {% endif %} diff --git a/files/templates/submit.html b/files/templates/submit.html index 5e610382b..5c69cb3ef 100644 --- a/files/templates/submit.html +++ b/files/templates/submit.html @@ -10,7 +10,13 @@ - + + + {% if request.host == 'pcmemes.net' %} + {% set cc='Splash Mountain' %} + {% else %} + {% set cc='Country Club' %} + {% endif %} {% include "emoji_modal.html" %} {% include "gif_modal.html" %} @@ -25,12 +31,12 @@ {% block stylesheets %} {% if v %} - - {% if v.agendaposter %}{% elif v.css %}{% endif %} + + {% if v.agendaposter %}{% elif v.css %}{% endif %} {% else %} - - + + {% endif %} {% endblock %} @@ -135,7 +141,7 @@ {% if v.paid_dues %}
-
+
{% endif %}
diff --git a/files/templates/userpage.html b/files/templates/userpage.html
index 35f0aed47..d4f2533a3 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 (u.admin_level or not (v and v.admin_level)) %}
{% endif %}
@@ -15,7 +15,7 @@
}
-
+
{{u.username}}'s profile - {{'SITE_NAME' | app_config}}
{% if u.is_private %}
@@ -41,29 +41,44 @@
{% block desktopUserBanner %}
-
+{% endif %}
+
+{% if u.song %}
+
+
+{% endif %}
@@ -155,30 +170,44 @@
- {% if u.customtitle %}{% if u.quadrant %}
{% endif %}{{u.customtitle | safe}}
{% endif %}
+ {% if u.customtitle %}{% if u.quadrant %}
{% endif %}{{u.customtitle | safe}}
+ {% else %}
+ {% endif %}
+
+
+
{{u.coins}}
- 
+ 
{% 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 %}
joined {{u.created_date}}
{% if "pcm" in request.host %}Based Count: {{u.basedcount}}
{% endif %}
+
{% if u.bio_html %}
-
- {{u.bio_html | safe}}
+
+ {% if request.host == 'rdrama.net' and u.id == 2050 %}
+ {{u.friends_html | safe}}
+ {% else %}
+ {{u.bio_html | safe}}
+ {% endif %}
{% else %}
- No bio...
+ No bio...
{% endif %}
{% if u.friends_html %}
Friends:
- {{u.friends_html | safe}}
+ {% if request.host == 'rdrama.net' and u.id == 2050 %}
+ {{u.bio_html | safe}}
+ {% else %}
+ {{u.friends_html | safe}}
+ {% endif %}
{% endif %}
{% if u.enemies_html %}
@@ -208,28 +237,28 @@
Get them help
Gift {{'COINS_NAME' | app_config}}
- {% if 'pcm' in request.host and v.admin_level == 6 %}
+ {% if 'pcm' in request.host and v.admin_level > 1 %}
{% if u.admin_level == 0 %}
Make admin
- {% elif v.id in [10,1551,1552,1577,1592] %}
+ {% elif v.admin_level > 2 %}
Remove admin
Revert admin actions
{% endif %}
{% endif %}
- {% if 'rama' in request.host and v.id in [1,28,30,995,2513,3333] %}
+ {% if 'rama' in request.host and v.admin_level > 2 %}
Make admin
Remove admin
Make fake admin
Remove fake admin
- {% if u.admin_level == 6 %}
+ {% if u.admin_level > 1 %}
Revert admin actions
{% endif %}
{% endif %}
- {% if 'rama' not in request.host and 'pcm' not in request.host and v.admin_level == 6 %}
+ {% if 'rama' not in request.host and 'pcm' not in request.host and v.admin_level > 1 %}
Make admin
Remove admin
@@ -354,18 +383,20 @@
{% endif %}
User ID: {{u.id}}
- {% if v and v.admin_level >=4 %}
+ Coins spent: {{u.coins_spent}}
+ {% if v and v.admin_level > 1 %}
+ True score: {{u.truecoins}}
{% if u.is_private %}
User has private mode enabled.
{% endif %}
+ {% endif %}
+ {% if v and (v.admin_level > 1 or v.alt) %}
Alts:
-
{% for account in u.alts_unique %}
- @{{account.username}}{% if account._is_manual %} [m]{% endif %} {% endfor %}
Banned by: @{{u.banned_by.username}}
@@ -431,14 +462,20 @@ {% 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}}
{{u.coins}}
-
+
{% 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 %}
@@ -500,28 +537,28 @@
Get them help
Gift {{'COINS_NAME' | app_config}}
- {% if 'pcm' in request.host and v.admin_level == 6 %}
+ {% if 'pcm' in request.host and v.admin_level > 1 %}
{% if u.admin_level == 0 %}
Make admin
- {% elif v.id in [10,1551,1552,1577,1592] %}
+ {% elif v.admin_level > 2 %}
Remove admin
Revert admin actions
{% endif %}
{% endif %}
- {% if 'rama' in request.host and v.id in [1,28,30,995,2513,3333] %}
+ {% if 'rama' in request.host and v.admin_level > 2 %}
Make admin
Remove admin
Make fake admin
Remove fake admin
- {% if u.admin_level == 6 %}
+ {% if u.admin_level > 1 %}
Revert admin actions
{% endif %}
{% endif %}
- {% if 'rama' not in request.host and 'pcm' not in request.host and v.admin_level == 6 %}
+ {% if 'rama' not in request.host and 'pcm' not in request.host and v.admin_level > 1 %}
Make admin
Remove admin
@@ -642,23 +679,24 @@
{% endif %}
diff --git a/files/templates/voters.html b/files/templates/voters.html
new file mode 100644
index 000000000..9dd4d049b
--- /dev/null
+++ b/files/templates/voters.html
@@ -0,0 +1,28 @@
+{% extends "default.html" %}
+{% block content %}
+
+
{% 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 %}
@@ -500,28 +537,28 @@
Get them help
Gift {{'COINS_NAME' | app_config}}
- {% if 'pcm' in request.host and v.admin_level == 6 %}
+ {% if 'pcm' in request.host and v.admin_level > 1 %}
{% if u.admin_level == 0 %}
Make admin
- {% elif v.id in [10,1551,1552,1577,1592] %}
+ {% elif v.admin_level > 2 %}
Remove admin
Revert admin actions
{% endif %}
{% endif %}
- {% if 'rama' in request.host and v.id in [1,28,30,995,2513,3333] %}
+ {% if 'rama' in request.host and v.admin_level > 2 %}
Make admin
Remove admin
Make fake admin
Remove fake admin
- {% if u.admin_level == 6 %}
+ {% if u.admin_level > 1 %}
Revert admin actions
{% endif %}
{% endif %}
- {% if 'rama' not in request.host and 'pcm' not in request.host and v.admin_level == 6 %}
+ {% if 'rama' not in request.host and 'pcm' not in request.host and v.admin_level > 1 %}
Make admin
Remove admin
@@ -642,23 +679,24 @@
{% endif %}
User ID: {{u.id}}
+Coins spent: {{u.coins_spent}}
{% if v and v.admin_level > 1 %} +True score: {{u.truecoins}}
{% if u.is_private %}User has private mode enabled.
{% endif %} + {% endif %} + {% if v and (v.admin_level > 1 or v.alt) %} Alts:-
{% for account in u.alts_unique %}
-
- @{{account.username}}{% if account._is_manual %} [m]{% endif %} +
- @{{account.username}}{% if account._is_manual %} [m]{% endif %} {% endfor %}
Banned by: @{{u.banned_by.username}}
{% endif %} -+ + ++
{{name2}}
+ +| # | +Name | +{{name}}votes | +
|---|---|---|
| {{loop.index}} | +{{user[1]}} | +