diff --git a/files/templates/admin/alt_votes.html b/files/templates/admin/alt_votes.html index d84c3f4cc3..9374558ee5 100644 --- a/files/templates/admin/alt_votes.html +++ b/files/templates/admin/alt_votes.html @@ -72,7 +72,7 @@

Two accounts controlled by different people should have most uniqueness percentages at or above 70-80%

A sockpuppet account will have its uniqueness percentages significantly lower.

-Link Accounts +Link Accounts
diff --git a/files/templates/admin/app.html b/files/templates/admin/app.html index 08cca5eefa..6320a4fd4c 100644 --- a/files/templates/admin/app.html +++ b/files/templates/admin/app.html @@ -34,12 +34,12 @@
{% if not app.client_id%} - Approve - Reject + Approve + Reject {% else %} - Revoke + Revoke {% endif %}
diff --git a/files/templates/admin/apps.html b/files/templates/admin/apps.html index ab0d8aed2f..b6a38eaaa8 100644 --- a/files/templates/admin/apps.html +++ b/files/templates/admin/apps.html @@ -39,12 +39,12 @@
{% if not app.client_id %} - Approve - Reject + Approve + Reject {% else %} - Revoke + Revoke {% endif %}
diff --git a/files/templates/admin/awards.html b/files/templates/admin/awards.html index 2c82960f3a..d2de337048 100644 --- a/files/templates/admin/awards.html +++ b/files/templates/admin/awards.html @@ -64,6 +64,6 @@ 

 	{% if 'rdrama.net' not in request.host or v.admin_level > 2 %}
-		
Grant Monthly Marseybux

+		
Grant Monthly Marseybux

 	{% endif %}
 {% endblock %}
\ No newline at end of file
diff --git a/files/templates/authforms.html b/files/templates/authforms.html
index 1e432162ab..9ed5a0dca4 100644
--- a/files/templates/authforms.html
+++ b/files/templates/authforms.html
@@ -15,7 +15,7 @@
 
 		{% if v %}
 			
-			
+			
 			{% if v.agendaposter %}
 				
-			
+			
 		{% endif %}
 
 
diff --git a/files/templates/award_modal.html b/files/templates/award_modal.html
index 8c3dba8d85..09abcca428 100644
--- a/files/templates/award_modal.html
+++ b/files/templates/award_modal.html
@@ -14,9 +14,9 @@
 					

 						{% for award in v.user_awards %}
 							{% if award.owned %}
-								
+								
 							{% else %}
-								
+								
 							{% endif %}
 								
 								
{{award.title}}

diff --git a/files/templates/changelog.html b/files/templates/changelog.html
index 234c9f7682..122918654a 100644
--- a/files/templates/changelog.html
+++ b/files/templates/changelog.html
@@ -67,8 +67,8 @@
 {% block content %}
 
 {% if v %}
-	
-	
+	
+	
 {% endif %}
 
 

diff --git a/files/templates/comments.html b/files/templates/comments.html
index c52c0433cc..b5c3cec89e 100644
--- a/files/templates/comments.html
+++ b/files/templates/comments.html
@@ -188,7 +188,7 @@
 				{% if c.bannedfor and c.author.banned_by %}
 					
 				{% endif %}
-				{% if c.active_flags %}{{c.active_flags}} Reports{% endif %}
+				{% if c.active_flags %}{{c.active_flags}} Reports{% endif %}
 				{% if c.over_18 %}+18{% endif %}
 				{% if v and v.admin_level > 1 and c.author.shadowbanned %}{% endif %}
 				{% if c.is_pinned %}
@@ -203,7 +203,7 @@
 				{% if c.author.verified %}
 				{% endif %}
 
-				@{{c.author.username}}'s profile picture{{c.author.username}}
+				@{{c.author.username}}'s profile picture{{c.author.username}}
 				{% if c.author.customtitle %}  {% if c.author.quadrant %}{{c.author.quadrant}} quadrant{% endif %}{{c.author.customtitle | safe}}{% endif %}
 
 				{% if c.parent_comment_id and not standalone and level != 1 %}{{ c.parent_comment.author.username }}{% endif %}
@@ -222,7 +222,7 @@
 				

 				
    
 					{% for f in c.ordered_flags %}
-						
  • {{f.user.username}}{% if f.reason %}: {{f.realreason(v) | safe}}{% endif %} {% if v and v.admin_level > 1 %}[remove]{% endif %}
    • 
+						
  • {{f.user.username}}{% if f.reason %}: {{f.realreason(v) | safe}}{% endif %} {% if v and v.admin_level > 1 %}[remove]{% endif %}
    • 
 					{% endfor %}
 				

 			

@@ -245,7 +245,7 @@
 
 
 				{% if not c.parent_submission and c.author_id!=NOTIFICATIONS_ID and c.author_id!=AUTOJANNY_ID and c.author_id!=v.id %}
-					Reply
+					Reply
 					

 					

 						
-								Cancel 
+								Cancel 
 								Reply 
 							
 						

@@ -292,8 +292,8 @@
 								
 							
 						

-						Save Edit 
-						Cancel 
+						Save Edit 
+						Cancel 
 					
 					

 					
Formatting help

@@ -308,18 +308,18 @@
 							
@@ -632,27 +632,27 @@
 				

 					

 		

 			

-				Revoke
+				Revoke
 			

 		

 	
diff --git a/files/templates/settings_blocks.html b/files/templates/settings_blocks.html
index 51bc5e0466..bc2917a7bf 100644
--- a/files/templates/settings_blocks.html
+++ b/files/templates/settings_blocks.html
@@ -66,11 +66,11 @@
 
 						
 							

-								
 								

-									Unblock
+									Unblock
 								

 							

 						
diff --git a/files/templates/settings_profile.html b/files/templates/settings_profile.html
index 0b3ce397ca..8eeeaea862 100644
--- a/files/templates/settings_profile.html
+++ b/files/templates/settings_profile.html
@@ -171,7 +171,7 @@
 					
 					{% if v.background %}
 						

-							Remove Background
+							Remove Background
 							

 						

 					{% endif %}
diff --git a/files/templates/settings_security.html b/files/templates/settings_security.html
index f53e3d5058..9929cf0f46 100644
--- a/files/templates/settings_security.html
+++ b/files/templates/settings_security.html
@@ -27,7 +27,7 @@
 							
 							{% if v.email and not v.is_activated %}
-								
Email not verified. You will not be able to recover your account with this email until you verify it. Verify now.

+								
Email not verified. You will not be able to recover your account with this email until you verify it. Verify now.

 							{% elif not v.email %}
 								
Add an email to secure your account in case you forget your password.

 							{% endif %}
@@ -44,7 +44,7 @@
 			
 			

 				

-					Claim paypig rewards
+					Claim paypig rewards
 					{% if v.email %}
 					
diff --git a/files/templates/shop.html b/files/templates/shop.html
index ed8738612f..16792fda29 100644
--- a/files/templates/shop.html
+++ b/files/templates/shop.html
@@ -63,8 +63,8 @@
 				{{a['owned']}}
 				{% set kind = a['kind'] %}
 				
-					Buy
-					{% if a['kind'] != "grass" %}Buy with Marseybux{% endif %}
+					Buy
+					{% if a['kind'] != "grass" %}Buy with Marseybux{% endif %}
 				
 			
 		{% endfor %}
diff --git a/files/templates/sign_up.html b/files/templates/sign_up.html
index ea1b2f085c..05d3c5dacc 100644
--- a/files/templates/sign_up.html
+++ b/files/templates/sign_up.html
@@ -31,7 +31,7 @@
 		{% if ref_user %}{{ref_user.username}} invites you to {{'SITE_NAME' | app_config}}{% else %}Sign up - {{'SITE_NAME' | app_config}}{% endif %}
 
 		
-		
+		
 
 
 
diff --git a/files/templates/sign_up_failed_ref.html b/files/templates/sign_up_failed_ref.html
index c9669ac3ae..023ab3121e 100644
--- a/files/templates/sign_up_failed_ref.html
+++ b/files/templates/sign_up_failed_ref.html
@@ -32,7 +32,7 @@
 		{% if ref_user %}{{ref_user.username}} invites you to {{'SITE_NAME' | app_config}}{% else %}{{'SITE_NAME' | app_config}}{% endif %}
 
 		
-		
+		
 
 
 
diff --git a/files/templates/submission.html b/files/templates/submission.html
index 49424185bb..f1b643ef06 100644
--- a/files/templates/submission.html
+++ b/files/templates/submission.html
@@ -189,35 +189,35 @@
 
 						
 
-						
-						
+						
+						
 
-						
-						
+						
+						
 
 
 						{% if v.id==p.author_id %}
 							
 
 							{% if p.private %}
-								
+								
 							{% endif %}
 
 							{% if request.path.startswith('/@') %}
-								
-								
+								
+								
 							{% endif %}
 
 							{% if p.deleted_utc > 0 %}
-								
+								
 							{% else %}
 								
 							{% endif %}
 
 
 							{% if v.club_allowed != False %}
-								
-								
+								
+								
 							{% endif %}
 
 							
@@ -250,23 +250,23 @@
 							
 						{% endif %}
 
-						
-						
+						
+						
 
-						
-						
+						
+						
 
 						{% if v==p.author %}
-							
-							
+							
+							
 						{% endif %}
 
 						{% if "/reported/" in request.path %}
-							
-							
+							
+							
 						{% else %}
-							
-							
+							
+							
 						{% endif %}
 
 						{% if p.oauth_app %}
@@ -278,7 +278,7 @@
 
 						{% if v.id!=p.author_id %}
 							
-							
+							
 						{% endif %}
 
 					
@@ -334,10 +334,10 @@
 						{% if p.is_bot %} {% endif %}
 						{% if p.over_18 %}+18{% endif %}
 						{% if p.private %}Draft{% endif %}
-						{% if p.active_flags %}{{p.active_flags}} Reports{% endif %}
+						{% if p.active_flags %}{{p.active_flags}} Reports{% endif %}
 						{% if p.author.verified %}
 						{% endif %}
-						@{{p.author.username}}'s profile picture{{p.author.username}}{% if p.author.customtitle %}  {% if p.author.quadrant %}{{p.author.quadrant}} quadrant{% endif %}{{p.author.customtitle | safe}}{% endif %}
+						@{{p.author.username}}'s profile picture{{p.author.username}}{% if p.author.customtitle %}  {% if p.author.quadrant %}{{p.author.quadrant}} quadrant{% endif %}{{p.author.customtitle | safe}}{% endif %}
 						 {{p.age_string}}
 						({% if p.is_image %}image post{% elif p.is_video %}video post{% elif p.realurl(v) %}{{p.domain}}{% else %}text post{% endif %})
 
@@ -352,7 +352,7 @@
 						

 						
 					

@@ -478,7 +478,7 @@
 									

 								
 								
-								Cancel 
+								Cancel 
 							
 							

 							
Formatting help

@@ -508,93 +508,105 @@
 						
 
 						{% if v and (v.id==p.author_id or v.admin_level > 1 and v.admin_level > 2) %}
-							Edit
+							Edit
 						{% endif %}
 
 						{% if v and v.id==p.author_id %}
 							{% if p.private %}
-								Publish
+								Publish
 							{% endif %}
 						{% endif %}
 
 						Votes
 						
 						{% if v %}
-							Give Award
+							Give Award
 						{% endif %}
 
-						Copy link
+						Copy link
 
 						{% if v %}
-							Subscribe
-							Unsubscribe
+							Subscribe
+							Unsubscribe
 
-							Save
-							Unsave
+							Save
+							Unsave
 
-							Report
+							Report
 						{% endif %}
 
 						{% if v and v.id==p.author_id %}
 							{% if request.path.startswith('/@') %}
-								Pin to profile
-								Unpin from profile
+								Pin to profile
+								Unpin from profile
 							{% endif %}
 							
 							{% if p.deleted_utc > 0 %}
-								Undelete
+								Undelete
 							{% else %}
-								Delete
-							{% endif %}
-						{% endif %}
-						{% if v and v.admin_level > 0 %}
-							Pin
-							Unpin
-							{% if v==p.author %}
-								Distinguish
-								Undistinguish
+								Delete
 							{% endif %}
 						{% endif %}
+						
+						
+						
+							
 							
 
 						
@@ -604,19 +616,19 @@
 					{% if v %}
 
 					

-						

+						

 
 						{{score}}
-						

+						

 					

 
 					{% else %}
 
 					

-						

+						

 						

 						{{score}}
-						

+						

 					

 
 					{% endif %}
@@ -652,23 +664,23 @@
 					
 
 					{% if v and v.admin_level > 1 %}
-						
+						
 							
 						
 					{% endif %}
 				
 
-				Copy link
+				Copy link
 				{% if v %}
 				
  • 
-					
+					
 						
 					
 				
    • 
 				{% endif %}
 				
  • 
 					{% if v %}
-						
+						
 						
 					{% else %}
 						
@@ -679,7 +691,7 @@
 					{{score}}
 
 					{% if v %}
-						
+						
 					{% else %}
 						
 							
@@ -749,7 +761,7 @@
 					
 				
 			
    • 
-			Comment
+			Comment
 		
 		
    
 		
    Formatting help
    
diff --git a/files/templates/submission_listing.html b/files/templates/submission_listing.html
index 4f13f27719..4b284079ee 100644
--- a/files/templates/submission_listing.html
+++ b/files/templates/submission_listing.html
@@ -86,7 +86,7 @@
 		
    
 		
 	
@@ -112,19 +112,19 @@
 
 				{% elif v %}
 
-				
    
+				
    
 
 				{{score}}
 
-				
    
+				
    
 
 				{% else %}
 
-				
    
+				
    
 
 				{{score}}
 
-				
    
+				
    
 
 				{% endif %}
 
@@ -141,15 +141,15 @@
 						post thumnail
 					
 				{% elif p.is_image %}
-					
+					
 						post thumnail
 					
 				{% elif p.is_video %}
-					
+					
 						post thumnail
 					
 				{% elif p.is_youtube %}
-					
+					
 						post thumnail
 					
 				{% else %}
@@ -190,10 +190,10 @@
 				{% if p.is_blocking %}{% endif %}
 				{% if p.is_blocked %}{% endif %}
 				{% if p.private %}Draft{% endif %}
-				{% if p.active_flags %}{{p.active_flags}} Reports{% endif %}
+				{% if p.active_flags %}{{p.active_flags}} Reports{% endif %}
 				{% if p.author.verified %}
 				{% endif %}
-				@{{p.author.profile_url}}'s profile picture{{p.author.username}}{% if p.author.customtitle %}  {% if p.author.quadrant %}{{p.author.quadrant}} quadrant{% endif %}{{p.author.customtitle | safe}}{% endif %}
+				@{{p.author.profile_url}}'s profile picture{{p.author.username}}{% if p.author.customtitle %}  {% if p.author.quadrant %}{{p.author.quadrant}} quadrant{% endif %}{{p.author.customtitle | safe}}{% endif %}
 				 {{p.age_string}}
 				 
 				({% if p.is_image %}image post{% elif p.is_video %}video post{% elif p.realurl(v) %}{{p.domain}}{% else %}text post{% endif %})
@@ -212,7 +212,7 @@
 			
    
 				
 		
    
 	
@@ -330,22 +327,22 @@
 				
 
 				{% if v and v.admin_level > 1 %}
-					
+					
 						
 					
 				{% endif %}
 
 			
 			
-			
+			
 
 			{% if p.realbody(v) and request.path != "/changelog"%}
-				
+				
 			{% endif %}
 
 			{% if v %}
 				
  • 
-					
+					
 						
 					
 				
    • 
@@ -370,12 +367,12 @@
 				{% elif v %}
 				
  • 
 
-					
+					
 					
 
 					{{score}}
 
-					
+					
 					
 
 				
    • 
@@ -415,35 +412,35 @@
 
 						
 
-						
-						
+						
+						
 
-						
-						
+						
+						
 
 
 						{% if v.id==p.author_id %}
 							
 
 							{% if p.private %}
-								
+								
 							{% endif %}
 
 							{% if request.path.startswith('/@') %}
-								
-								
+								
+								
 							{% endif %}
 							
 							{% if p.deleted_utc > 0 %}
-								
+								
 							{% else %}
 								
 							{% endif %}
 
 
 							{% if v.club_allowed != False %}
-								
-								
+								
+								
 							{% endif %}
 
 							
@@ -472,23 +469,23 @@
 				
 				
    
 					
diff --git a/files/templates/submit.html b/files/templates/submit.html
index e5f6058a86..211cce95ad 100644
--- a/files/templates/submit.html
+++ b/files/templates/submit.html
@@ -26,7 +26,7 @@
 		{% block stylesheets %}
 		{% if v %}
 			
-			
+			
 			{% if v.agendaposter %}
 				
-			
+			
 			
 		{% endif %}
 		{% endblock %}
diff --git a/files/templates/user_listing.html b/files/templates/user_listing.html
index 25b0b00fee..64fc86ca8f 100644
--- a/files/templates/user_listing.html
+++ b/files/templates/user_listing.html
@@ -13,9 +13,9 @@
 
 					{% if v %}
 						{% if v.id!=u.id and not u.is_private and not u.is_nofollow %}
-						
    Follow
    
+						
    Follow
    
 
-						{% if not u.fish %}
    Unfollow
    {% endif %}
+						{% if not u.fish %}
    Unfollow
    {% endif %}
 						{% endif %}
 					{% else %}
 					
    Follow
    
diff --git a/files/templates/userpage.html b/files/templates/userpage.html
index 0079d29f39..1d3c6c0324 100644
--- a/files/templates/userpage.html
+++ b/files/templates/userpage.html
@@ -75,7 +75,7 @@
 								
    
 								{% if v and v.id != u.id %}
 								
    
-									
@@ -83,7 +83,7 @@
 							{% endif %}
 							{% if v and v.id == u.id %}
 							
    
-								
@@ -147,20 +147,20 @@
 				
    
 					
    
 					{% if v and v.id != u.id %}
-						{% if not u.fish %}Unfollow{% endif %}
-						Follow						
-						Message
+						{% if not u.fish %}Unfollow{% endif %}
+						Follow						
+						Message
 
-						Get them help
-						Gift {{'COINS_NAME' | app_config}}
-						Gift Marseybux
+						Get them help
+						Gift {{'COINS_NAME' | app_config}}
+						Gift Marseybux
 
 						{% if v.admin_level > 2 %} 
-							Make meme admin
-							Remove meme admin
+							Make meme admin
+							Remove meme admin
 
 							{% if u.admin_level > 1 %}
-								Revert admin actions
+								Revert admin actions
 							{% endif %}
 						{% endif %}
 
@@ -198,8 +198,8 @@
 					{% endif %}
 
 					{% if u.song and v and v.mute and (not u.unmutable or v.id == u.id) %}
-						Pause anthem
-						Play anthem
+						Pause anthem
+						Play anthem
 					{% endif %}
 
 					{% if v and v.id != u.id and v.admin_level > 1 %}
@@ -251,19 +251,19 @@
 							
 							
 						
-						Disable Agendaposter Theme
+						Disable Agendaposter Theme
 
 						
    
 
-						Shadowban
+						Shadowban
 
-						Unshadowban
+						Unshadowban
 
 
 						
    
 
-						Verify
-						Unverify
+						Verify
+						Unverify
 
 						
    
 						
    
@@ -422,24 +422,24 @@
 				{% endif %}
 
 				{% if u.song and v and v.mute and not u.unmutable %}
-					Pause anthem
-					Play anthem
+					Pause anthem
+					Play anthem
 				{% endif %}
 
 				{% if v and v.id != u.id %}
-					{% if not u.fish %}Unfollow{% endif %}
-					Follow						
-					Message
-					Get them help
-					Gift {{'COINS_NAME' | app_config}}
-					Gift Marseybux
+					{% if not u.fish %}Unfollow{% endif %}
+					Follow						
+					Message
+					Get them help
+					Gift {{'COINS_NAME' | app_config}}
+					Gift Marseybux
 
 					{% if v.admin_level > 2 %} 
-						Make meme admin
-						Remove meme admin
+						Make meme admin
+						Remove meme admin
 
 						{% if u.admin_level > 1 %}
-							Revert admin actions
+							Revert admin actions
 						{% endif %}
 					{% endif %}
 
@@ -527,19 +527,19 @@
 							
 							
 						
    
-						Disable Agendaposter Theme
+						Disable Agendaposter Theme
 
 						
    
 
-						Shadowban
+						Shadowban
 
-						Unshadowban
+						Unshadowban
 
 
 						
    
 
-						Verify
-						Unverify
+						Verify
+						Unverify