diff --git a/files/helpers/sanitize.py b/files/helpers/sanitize.py index 63e0068fe..7f67f7c5f 100644 --- a/files/helpers/sanitize.py +++ b/files/helpers/sanitize.py @@ -179,7 +179,7 @@ def sanitize(sanitized, noimages=False): classes = 'class="emoji-lg" ' remoji = emoji[1:] else: - classes = 'height=60 class="emoji-lg" ' + classes = 'height=60 class="emoji" ' remoji = emoji if path.isfile(f'./files/assets/images/emojis/{remoji}.webp'): diff --git a/files/templates/admin/admin_home.html b/files/templates/admin/admin_home.html index b31b39e4d..ad4c46824 100644 --- a/files/templates/admin/admin_home.html +++ b/files/templates/admin/admin_home.html @@ -52,9 +52,9 @@
  • Site Rules
  • -
    - - +
    + +
    {% endblock %} \ No newline at end of file diff --git a/files/templates/admin/alt_votes.html b/files/templates/admin/alt_votes.html index 9e9ad185d..418ad532e 100644 --- a/files/templates/admin/alt_votes.html +++ b/files/templates/admin/alt_votes.html @@ -6,6 +6,7 @@ {% endblock %} {% block content %} +
     
     
    @@ -27,7 +28,7 @@
     
     
     
    -
    +
    @@ -84,5 +85,5 @@ {% endif %} - + {% endblock %} \ No newline at end of file diff --git a/files/templates/admin/app.html b/files/templates/admin/app.html index 59da65439..17a8a6924 100644 --- a/files/templates/admin/app.html +++ b/files/templates/admin/app.html @@ -6,10 +6,7 @@ {% endblock %} {% block content %} - -
    -
    -
    +
    @@ -45,15 +42,12 @@
    -
    - {% if listing %} {% include "submission_listing.html" %} {% elif comments %} {% include "comments.html" %} {% endif %} -
    +
    @@ -53,17 +55,19 @@ - + {% endfor %}
    Icon
    {{a['title']}}
    - +
    
     	{% 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/admin/badge_grant.html b/files/templates/admin/badge_grant.html index fef488c0a..e1eab7f6b 100644 --- a/files/templates/admin/badge_grant.html +++ b/files/templates/admin/badge_grant.html @@ -7,6 +7,7 @@ {% block pagetype %}message{% endblock %} {% block content %} +
    {% if error %} + + + {% if v.agendaposter %} @@ -203,14 +204,14 @@ {% endif %} {% else %} - + + {% endif %} {% endblock %} - - + - + {% if v.agendaposter %}{% elif v.css %}{% endif %} {% else %} - + {% endif %}
    diff --git a/files/templates/modals/ModalGiftCoins.html b/files/templates/modals/ModalGiftCoins.html index 837168d2d..b6398a514 100644 --- a/files/templates/modals/ModalGiftCoins.html +++ b/files/templates/modals/ModalGiftCoins.html @@ -9,7 +9,7 @@
    - - {% block mobilenavbar %} {% include "mobile_navigation_bar.html" %} {% endblock %} diff --git a/files/templates/settings_filters.html b/files/templates/settings_filters.html index 1bd6cb67b..1754b7d15 100644 --- a/files/templates/settings_filters.html +++ b/files/templates/settings_filters.html @@ -142,9 +142,9 @@
    -
    - - +
    + +
    Enable if you would like to automatically open threads in new tabs. @@ -162,9 +162,9 @@
    -
    - - +
    + +
    Enable if you would like to automatically open external links in new tabs. @@ -190,9 +190,9 @@
    -
    - - +
    + +
    Enable if you would like to automatically convert twitter.com links to nitter.net links. @@ -216,9 +216,9 @@
    -
    - - +
    + +
    Enable if you would like to automatically convert reddit.com links to teddit.net links. @@ -235,9 +235,9 @@
    -
    - - +
    + +
    Enable if you would like to automatically convert reddit.com links to old.reddit.com links. @@ -254,9 +254,9 @@
    -
    - - +
    + +
    Enable if you would like to automatically sort reddit.com links by controversial. @@ -279,9 +279,9 @@
    -
    - - +
    + +
    Hide user signatures. @@ -300,9 +300,9 @@
    -
    - - +
    + +
    Enable if you would like to not get a warning before viewing +18 content. @@ -321,9 +321,9 @@
    -
    - - +
    + +
    Enable if you would like to automatically replace slurs. @@ -341,9 +341,9 @@
    -
    - - +
    + +
    Enable if you would like to automatically hide posts you have voted on from your frontpage. diff --git a/files/templates/shop.html b/files/templates/shop.html index 1a8329c48..e44fe52ee 100644 --- a/files/templates/shop.html +++ b/files/templates/shop.html @@ -108,7 +108,7 @@
    - +
    {{a['description']}}
    diff --git a/files/templates/sidebars/HomeSidebar.html b/files/templates/sidebars/HomeSidebar.html index bd8051709..e9fdce648 100644 --- a/files/templates/sidebars/HomeSidebar.html +++ b/files/templates/sidebars/HomeSidebar.html @@ -45,6 +45,19 @@
    +
  • +
    + ribbon icon +
    + +

  • diff --git a/files/templates/submission/SubmissionActions.html b/files/templates/submission/SubmissionActions.html index 771c956b0..c7ddc9114 100644 --- a/files/templates/submission/SubmissionActions.html +++ b/files/templates/submission/SubmissionActions.html @@ -66,6 +66,11 @@ Votes +