diff --git a/files/templates/admin/admin_home.html b/files/templates/admin/admin_home.html index fc4a8ed56..05f211f17 100644 --- a/files/templates/admin/admin_home.html +++ b/files/templates/admin/admin_home.html @@ -8,9 +8,7 @@ {% block customPadding %}px-3{% endblock %} {% block content %} -

-

-

Admin Tools

+

Admin Tools

{% if (v.admin_level >= PERMS['SITE_SETTINGS_SIDEBARS_BANNERS_BADGES'] or v.admin_level >= PERMS['SITE_SETTINGS_SNAPPY_QUOTES']) and (SITE_NAME == 'rDrama' or SIDEBAR_THREAD or BANNER_THREAD or BADGE_THREAD or SNAPPY_THREAD) %}

Add Stuff

@@ -110,8 +108,7 @@ {% if v.admin_level >= PERMS['SITE_SETTINGS'] %} -

-	
+
diff --git a/files/templates/admin/alt_votes.html b/files/templates/admin/alt_votes.html index 2b48172c8..6151df2cc 100644 --- a/files/templates/admin/alt_votes.html +++ b/files/templates/admin/alt_votes.html @@ -6,12 +6,8 @@ {% endblock %} {% block content %} -
 
-
-
-
-
Vote Info
+
Vote Info
diff --git a/files/templates/admin/badge_grant.html b/files/templates/admin/badge_grant.html index 16b5b88c2..bc50ed536 100644 --- a/files/templates/admin/badge_grant.html +++ b/files/templates/admin/badge_grant.html @@ -31,9 +31,7 @@
{% endif %} -

-

-
Badge Grant
+
Badge Grant
diff --git a/files/templates/admin/badge_remove.html b/files/templates/admin/badge_remove.html index 6694806b9..d1c3f27ba 100644 --- a/files/templates/admin/badge_remove.html +++ b/files/templates/admin/badge_remove.html @@ -31,9 +31,7 @@ {% endif %} -

-

-
Badge Remove
+
Badge Remove
diff --git a/files/templates/admin/banned_domains.html b/files/templates/admin/banned_domains.html index 15636ee3b..1b2d8bbc9 100644 --- a/files/templates/admin/banned_domains.html +++ b/files/templates/admin/banned_domains.html @@ -6,10 +6,6 @@ {% block content %} -
-
-
- -
+
diff --git a/files/templates/admin/lottery.html b/files/templates/admin/lottery.html index 70998ae3a..add67f366 100644 --- a/files/templates/admin/lottery.html +++ b/files/templates/admin/lottery.html @@ -1,9 +1,7 @@ {% extends "default.html" %} {% block content %} -

-
Admin — Lottery Info
-

+
Admin — Lottery Info
diff --git a/files/templates/admins.html b/files/templates/admins.html index 4e65e4de8..fda6fb1b2 100644 --- a/files/templates/admins.html +++ b/files/templates/admins.html @@ -6,8 +6,7 @@
Admins
-

-
+
diff --git a/files/templates/api.html b/files/templates/api.html index 1de23a226..1f97a6177 100644 --- a/files/templates/api.html +++ b/files/templates/api.html @@ -6,12 +6,7 @@ {% endblock %} {% block content %} -
-
-
-
-

API Guide for Bots

-

+

API Guide for Bots

This page explains how to obtain and use an access token.

Step 1: Create your Application

In the apps tab of {{SITE_NAME}} settings, fill in and submit the form to request an access token. You will need:

@@ -52,17 +47,8 @@ print(r.json())

The expected result of this would be a JSON representation of unread notifications for your account

-
 
-
-
-
-
-
-
-
-

API Guide for Applications

-

+

API Guide for Applications

The OAuth2 authorization flow is used to enable users to authorize third-party applications to access their {{SITE_NAME}} account without having to provide their login information to the application.

This page explains how to obtain API application keys, how to prompt a user for authorization, and how to obtain and use access tokens.

Step 1: Create your Application

@@ -109,4 +95,4 @@ print(r.json())

The expected result of this would be a JSON representation of unread notifications for your account

-{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/files/templates/award_modal.html b/files/templates/award_modal.html index f37bdafd2..907526211 100644 --- a/files/templates/award_modal.html +++ b/files/templates/award_modal.html @@ -35,8 +35,6 @@ -
-				
diff --git a/files/templates/badges.html b/files/templates/badges.html index 4921a274f..14245323e 100644 --- a/files/templates/badges.html +++ b/files/templates/badges.html @@ -1,16 +1,8 @@ {% extends "default.html" %} {% block content %} -
-
-
-
-

User Badges

+

User Badges

This page describes the requirements for obtaining all profile badges.
-
-
-
-
-
+
diff --git a/files/templates/blockers.html b/files/templates/blockers.html index 9c68b5226..ab17c83b4 100644 --- a/files/templates/blockers.html +++ b/files/templates/blockers.html @@ -1,12 +1,7 @@ {% extends "default.html" %} {% block content %} -
-
-	
-
-
@{{u.username}}'s blockers
-

-
+
@{{u.username}}'s blockers
+
diff --git a/files/templates/blocks.html b/files/templates/blocks.html index c50738965..0820b51cf 100644 --- a/files/templates/blocks.html +++ b/files/templates/blocks.html @@ -4,8 +4,7 @@ {% block content %}

Blocks

-

-
#
+
diff --git a/files/templates/comments.html b/files/templates/comments.html index 60eae28e4..7a146fedd 100644 --- a/files/templates/comments.html +++ b/files/templates/comments.html @@ -209,8 +209,7 @@ {% if c.active_flags(v) %}
Reported by: -

-				
    +
      {% for f in c.filtered_flags(v) %}
    • {% if c.ghost %}👻{% else %}{{f.user.username}}{% endif %}{% if f.reason %}: {{f.realreason(v) | safe}}{% endif %} {% if v and v.admin_level >= PERMS['FLAGS_REMOVE'] %}{% endif %}
    • {% endfor %} @@ -780,8 +779,7 @@
#
+
@{{u.username}}'s followers
+
diff --git a/files/templates/following.html b/files/templates/following.html index d4ac9b3db..792b230c9 100644 --- a/files/templates/following.html +++ b/files/templates/following.html @@ -1,11 +1,6 @@ {% extends "default.html" %} {% block content %} -
-
-	
-
-
Users followed by @{{u.username}}
-

+
Users followed by @{{u.username}}
#
diff --git a/files/templates/formatting.html b/files/templates/formatting.html index 1a9970fd0..0903d547f 100644 --- a/files/templates/formatting.html +++ b/files/templates/formatting.html @@ -5,19 +5,11 @@ {% endblock %} {% block content %} -
-
-
-
-

Markdown Formatting

+

Markdown Formatting

You can use Markdown formatting: -
-
-
- -
+
@@ -240,11 +232,7 @@ Text 2 And we allow custom HTML in most places: -
-
-
- -

Allowed Tags

+

Allowed Tags

Name
diff --git a/files/templates/hats.html b/files/templates/hats.html index 81a449508..bc726b3cb 100644 --- a/files/templates/hats.html +++ b/files/templates/hats.html @@ -77,10 +77,8 @@ } -
-	
- -
+
+
@@ -144,12 +142,5 @@ {% endfor %}
Hat
-
-
-
-
-
-
-	
{% endblock %} diff --git a/files/templates/header.html b/files/templates/header.html index 28d1a283e..df9783bb2 100644 --- a/files/templates/header.html +++ b/files/templates/header.html @@ -342,16 +342,7 @@
  • {% if request.path == "/chat" %}

    Users in chat right now

    -
    -
    -
    -
    -
    -
    -
    -
    -
    -					
    +
    {% elif has_sidebar %} {% include "sidebar_" + SITE_NAME + ".html" %} {% endif %} diff --git a/files/templates/home_comments.html b/files/templates/home_comments.html index b218c2126..159243de7 100644 --- a/files/templates/home_comments.html +++ b/files/templates/home_comments.html @@ -4,8 +4,7 @@ {% block sortnav %}{% endblock %} {% block content %} -
    
    -	
    +
    diff --git a/files/templates/live.html b/files/templates/live.html index 8dd81a722..76451edee 100644 --- a/files/templates/live.html +++ b/files/templates/live.html @@ -46,7 +46,7 @@
    {% endif %} -
    +

    Live

    @@ -105,8 +105,4 @@ {% endif %} -
    -
    -
    -
    {% endblock %} diff --git a/files/templates/marseys.html b/files/templates/marseys.html index 9c1b86222..690d159ac 100644 --- a/files/templates/marseys.html +++ b/files/templates/marseys.html @@ -1,10 +1,6 @@ {% extends "default.html" %} {% block content %} -
    -
    -	
    -
    -
    +
    diff --git a/files/templates/message.html b/files/templates/message.html index c306e6e1d..16f28a281 100644 --- a/files/templates/message.html +++ b/files/templates/message.html @@ -18,7 +18,7 @@ -

    {{title}}

    +
    {{title}}
    {{message if message else error}}
    Go to homepage diff --git a/files/templates/poll_votes.html b/files/templates/poll_votes.html index 8e2f39158..c75046c94 100644 --- a/files/templates/poll_votes.html +++ b/files/templates/poll_votes.html @@ -9,11 +9,7 @@ {% if thing %} -
    -	
    -
    - -

    {{thing.body_html | safe}} - {{ups | length}} {% if thing.exclusive == 2 %}bets{% else %}votes{% endif %}

    +

    {{thing.body_html | safe}} - {{ups | length}} {% if thing.exclusive == 2 %}bets{% else %}votes{% endif %}

    #
    @@ -45,4 +41,4 @@ {% endif %} -{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/files/templates/report_post_modal.html b/files/templates/report_post_modal.html index 6c8ff4779..0d3d535f9 100644 --- a/files/templates/report_post_modal.html +++ b/files/templates/report_post_modal.html @@ -10,8 +10,7 @@ {% if v.background %}
    - -
    
    +							
     						
    {% endif %}
    @@ -585,8 +584,7 @@ -
    
    -										
    +
    Limit of 1500 characters
    @@ -604,8 +602,7 @@
    -
    
    -										
    +
    Limit of 500 characters
    @@ -623,8 +620,7 @@ -
    
    -										
    +
    Limit of 500 characters
    @@ -648,8 +644,7 @@  
    -
    
    -										
    +
    Limit of 200 characters
    diff --git a/files/templates/shop.html b/files/templates/shop.html index e86934348..7c92196c4 100644 --- a/files/templates/shop.html +++ b/files/templates/shop.html @@ -72,10 +72,7 @@ {% endblock %} {% block content %} -
    -	
    - -
    +
    @@ -114,12 +111,6 @@ {% endfor %}
    Icon
    -
    -
    -
    -
    -
    -
    -	
    +
    {% endblock %} diff --git a/files/templates/sidebar.html b/files/templates/sidebar.html index d18b17c5c..44d0b64b8 100644 --- a/files/templates/sidebar.html +++ b/files/templates/sidebar.html @@ -6,11 +6,7 @@ {% endblock %} {% block content %} -
    -
    -
    -
    -
    +

    Sidebar

    -{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/files/templates/sidebar_WPD.html b/files/templates/sidebar_WPD.html index d209383bd..00bef6273 100644 --- a/files/templates/sidebar_WPD.html +++ b/files/templates/sidebar_WPD.html @@ -1,4 +1,4 @@ -
  • -
    -
    -
    -
    -
    -
    -
    -	
    diff --git a/files/templates/sidebar_rDrama.html b/files/templates/sidebar_rDrama.html index 534da3e36..5cab15b86 100644 --- a/files/templates/sidebar_rDrama.html +++ b/files/templates/sidebar_rDrama.html @@ -1,4 +1,4 @@ - diff --git a/files/templates/stats.html b/files/templates/stats.html index 1277cb5d8..0953041ca 100644 --- a/files/templates/stats.html +++ b/files/templates/stats.html @@ -6,8 +6,7 @@ {% endblock %} {% block content %} -
    
    -
    +
    @@ -22,4 +21,4 @@ {% endfor %}
    Statistic
    -{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/files/templates/sub/blockers.html b/files/templates/sub/blockers.html index 60ef903d4..6baca4e17 100644 --- a/files/templates/sub/blockers.html +++ b/files/templates/sub/blockers.html @@ -1,12 +1,7 @@ {% extends "default.html" %} {% block content %} -
    -
    -	
    -
    -
    Users {{verb}} /h/{{sub}}
    -
    
    -
    +
    Users {{verb}} /h/{{sub}}
    +
    diff --git a/files/templates/sub/create_hole.html b/files/templates/sub/create_hole.html index 56348c1de..8f832249c 100644 --- a/files/templates/sub/create_hole.html +++ b/files/templates/sub/create_hole.html @@ -6,12 +6,7 @@ {% block form %} -
    -
    -
    -	
    -
    - +
    diff --git a/files/templates/sub/exilees.html b/files/templates/sub/exilees.html index 351a88b1f..6ab00d8f9 100644 --- a/files/templates/sub/exilees.html +++ b/files/templates/sub/exilees.html @@ -1,11 +1,6 @@ {% extends "default.html" %} {% block content %} -
    -
    -	
    -
    -
    Users exiled from /h/{{sub}}
    -
    
    +
    Users exiled from /h/{{sub}}
    #
    diff --git a/files/templates/sub/mods.html b/files/templates/sub/mods.html index 4925f8475..054d050ca 100644 --- a/files/templates/sub/mods.html +++ b/files/templates/sub/mods.html @@ -1,12 +1,7 @@ {% extends "default.html" %} {% block content %} -
    -
    -	
    -
    -
    /h/{{sub}} Mods
    -
    
    -
    +
    /h/{{sub}} Mods
    +
    @@ -42,4 +37,4 @@ {% endif %} -{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/files/templates/sub/subs.html b/files/templates/sub/subs.html index 7160c2368..abab4d5ed 100644 --- a/files/templates/sub/subs.html +++ b/files/templates/sub/subs.html @@ -1,11 +1,6 @@ {% extends "default.html" %} {% block content %} -
    -
    -	
    -
    -
    {{HOLE_NAME|capitalize}} List
    -
    
    +
    {{HOLE_NAME|capitalize}} List
    #
    diff --git a/files/templates/submission.html b/files/templates/submission.html index 690f2ba77..4037867b7 100644 --- a/files/templates/submission.html +++ b/files/templates/submission.html @@ -697,8 +697,7 @@ {% if p.active_flags(v) %}
    Reported by: -
    
    -						
      +
        {% for f in p.filtered_flags(v) %}
      • {{f.user.username}}{% if f.reason %}: {{f.realreason(v) | safe}}{% endif %} {% if v and v.admin_level >= PERMS['FLAGS_REMOVE'] %}{% endif %}
      • {% endfor %} @@ -751,28 +750,24 @@
        {% if p.is_image %} -
        + -
        
         							{% elif p.is_video %}
        -								
        +
        -
        
        -							{% elif p.is_audio %}
        -								
        +\ {% elif p.is_audio %} +
        -
        -
        
         							{% endif %}
         							{{p.realbody(v) | safe}}
         
        @@ -964,8 +959,7 @@
         					{% if sort != "controversial" %}Controversial{% endif %}
         				
        {% if comment_info and p.comment_count >= 2%} -
        
        -					
        +					
         				{% endif %}
         			
        diff --git a/files/templates/submission_listing.html b/files/templates/submission_listing.html index 912dd2e19..40a9e07ec 100644 --- a/files/templates/submission_listing.html +++ b/files/templates/submission_listing.html @@ -37,8 +37,7 @@ {% if p.active_flags(v) %}
        Reported by: -
        
        -		
          +
            {% for f in p.filtered_flags(v) %}
          • {{f.user.username}}{% if f.reason %}: {{f.realreason(v) | safe}}{% endif %} {% if v and v.admin_level >= PERMS['FLAGS_REMOVE'] %}{% endif %}
          • {% endfor %} @@ -384,9 +383,7 @@

            @{{u.username}} hasn't made a post yet

            -

            Their posting history will show here.

            -
            -			
            +

            Their posting history will show here.

    diff --git a/files/templates/submit.html b/files/templates/submit.html index 8beb6e52b..3e9999e7f 100644 --- a/files/templates/submit.html +++ b/files/templates/submit.html @@ -87,9 +87,7 @@
    -
    
    -												
    -												
    
    +												
    @@ -117,19 +115,10 @@
    {%- endif %} -
    +
    - -
    -
    -
    -
    -
    -
    -
    -												
    diff --git a/files/templates/transfers.html b/files/templates/transfers.html index 4c883b685..6ab6832a0 100644 --- a/files/templates/transfers.html +++ b/files/templates/transfers.html @@ -4,8 +4,7 @@ {% block sortnav %}{% endblock %} {% block content %} -
    
    -	
    +
    @@ -45,4 +44,4 @@
    -{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/files/templates/userpage.html b/files/templates/userpage.html index 098f98c48..c3692c9e0 100644 --- a/files/templates/userpage.html +++ b/files/templates/userpage.html @@ -89,8 +89,6 @@ {% if u.customtitle %}

    {{u.customtitle | safe}}

    - {% else %} -
    
     				{% endif %}
     				
     				{% if v and (v.id == u.id or v.admin_level >= PERMS['USER_VOTERS_VISIBLE']) -%}
    @@ -122,8 +120,7 @@
     
     				{% if FEATURES['USERS_PROFILE_BODYTEXT'] -%}
     					{% if u.bio_html %}
    -						
    
    -						
    {{u.bio_html | safe}}
    +
    {{u.bio_html | safe}}
    {% else %}

    No bio...

    {% endif %} @@ -185,9 +182,7 @@
    -
    
    -							
    -							
    
    +							
     							
     							 
     							
    @@ -220,8 +215,7 @@
     					
     					{{userpage_admintools.userAdminToolsLower('desktop')}}
     
    -					
    
    -					
    +

    User ID: {{u.id}}

    Coins spent: {{u.coins_spent}}

    True score: {{u.truecoins}}

    @@ -320,8 +314,6 @@ {% if u.customtitle %}

    {{u.customtitle | safe}}

    - {% else %} -
    
     				{% endif %}
     
     				{% if v and (v.id == u.id or v.admin_level >= PERMS['USER_VOTERS_VISIBLE']) -%}
    @@ -430,11 +422,9 @@
     
     					{{userpage_admintools.userAdminToolsUpper('mobile')}}
     					
    -						
    
    -						 
    +						 
     						
    -						
    
    -						
    +						
     						 
     						
     					
    @@ -458,8 +448,7 @@
     					{{userpage_admintools.userAdminToolsLower('mobile')}}
     					
     				{% endif %}
    -				
    
    -				
    +

    User ID: {{u.id}}

    Coins spent: {{u.coins_spent}}

    True score: {{u.truecoins}}

    diff --git a/files/templates/userpage_admintools.html b/files/templates/userpage_admintools.html index b699fbdca..324970a9c 100644 --- a/files/templates/userpage_admintools.html +++ b/files/templates/userpage_admintools.html @@ -39,7 +39,7 @@


    {% if v.admin_level >= PERMS['USER_TITLE_CHANGE'] %} -
    +
    @@ -57,18 +57,16 @@
    -
    
    -				
    
     			{% endif %}
     			{% if v.admin_level >= PERMS['USER_BAN'] %}
     				{% if u.is_suspended %}
    -					
    + {% else %} -
    + @@ -80,17 +78,15 @@ {% endif %} -
    
    -				
    
     			{% endif %}
     			{% if v.admin_level >= PERMS['USER_SHADOWBAN'] %}
     				{% if u.shadowbanned %}
    -					
    + {% else %} -
    +
    @@ -100,8 +96,6 @@ {% endif %} -
    
    -				
    
     			{% endif %}
     			{% if v.admin_level >= PERMS['USER_AGENDAPOSTER'] %}
     				
    @@ -109,13 +103,11 @@ -
    
    -				
    +				
     			{% endif %}
     			{% if v.admin_level >= PERMS['USER_BAN'] %}
     				
    -				
    -				
    
    +				
     			{% endif %}
     			{% if v and v.admin_level >= PERMS['POST_COMMENT_MODERATION'] %}
     				
    @@ -123,16 +115,14 @@ -
    
    -				
    + {% endif %} {% if FEATURES['COUNTRY_CLUB'] and v and v.admin_level >= PERMS['USER_CLUB_ALLOW_BAN'] %} -
    
    -				
    +				
     				
     			{% endif %}
     		
    diff --git a/files/templates/viewers.html b/files/templates/viewers.html index a7de67aef..e9383c44b 100644 --- a/files/templates/viewers.html +++ b/files/templates/viewers.html @@ -1,8 +1,6 @@ {% extends "default.html" %} {% block content %} -
    
    -
    Users who viewed your profile
    -
    
    +
    Users who viewed your profile
    @@ -22,4 +20,4 @@ {% endfor %}
    -{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/files/templates/voters.html b/files/templates/voters.html index 639ba5dbf..c2e712c65 100644 --- a/files/templates/voters.html +++ b/files/templates/voters.html @@ -1,13 +1,8 @@ {% extends "default.html" %} {% block content %} -
    -
    -	
    -
    -

    {{name2}}

    +

    {{name2}}

    Total: {{total}}
    -
    
    -
    +
    @@ -37,4 +32,4 @@
    #
    -{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/files/templates/votes.html b/files/templates/votes.html index dad1036d9..0e58c559b 100644 --- a/files/templates/votes.html +++ b/files/templates/votes.html @@ -9,10 +9,7 @@ {% if thing %} -
    -
    -
    -

    Info

    +

    Info

    {{thing.permalink}}

    Author: @{{thing.author.username}}

    Author Created At: