diff --git a/files/templates/comments.html b/files/templates/comments.html index 456994a26..0e571633e 100644 --- a/files/templates/comments.html +++ b/files/templates/comments.html @@ -182,7 +182,7 @@ {% if c.ghost %} 👻 {% else %} - {% if FEATURES['PATRON_ICONS'] and c.author.patron > 1 %} + {% if FEATURES['PATRON_ICONS'] and c.author.patron > 1 and c.author.lifetimedonated_visible %} {{c.author.patron_tooltip}} {% endif %} diff --git a/files/templates/settings/personal.html b/files/templates/settings/personal.html index 408ecd4bb..1d16ed340 100644 --- a/files/templates/settings/personal.html +++ b/files/templates/settings/personal.html @@ -250,7 +250,13 @@ {{common.toggle_section('Private Mode', 'privateswitch', 'private', v.is_private, 'This will hide your profile page from other users.', false)}} - {{common.toggle_section('Donation Visiblity', 'lifetimedonated_visibleswitch', 'lifetimedonated_visible', v.lifetimedonated_visible, 'Make your donation badges, your lifetime-donated amount, and your total award discount visible to everyone instead of just you.', false)}} + {% if FEATURES['PATRON_ICONS'] %} + {% set desc = 'Make your donation badges, your lifetime-donated amount, your total award discount, and your patron icon visible to everyone instead of just you.' %} + {% else %} + {% set desc = 'Make your donation badges, your lifetime-donated amount, and your total award discount visible to everyone instead of just you.' %} + {% endif %} + + {{common.toggle_section('Donation Visiblity', 'lifetimedonated_visibleswitch', 'lifetimedonated_visible', v.lifetimedonated_visible, desc, false)}} {{common.toggle_section('Spider', 'spiderswitch', 'spider', v.spider, 'Have a spider friend accompany you during your journey on the site.', v.spider > 1)}} diff --git a/files/templates/userpage/banner.html b/files/templates/userpage/banner.html index 61238a719..9ebb932d2 100644 --- a/files/templates/userpage/banner.html +++ b/files/templates/userpage/banner.html @@ -52,7 +52,7 @@ {% endif %} {% endif %} - {% if FEATURES['PATRON_ICONS'] and u.patron > 1 %} + {% if FEATURES['PATRON_ICONS'] and u.patron > 1 and u.lifetimedonated_visible %} {{u.patron_tooltip}} {% endif %} @@ -357,7 +357,7 @@ {% endif %} - {% if FEATURES['PATRON_ICONS'] and u.patron > 1 %} + {% if FEATURES['PATRON_ICONS'] and u.patron > 1 and u.lifetimedonated_visible %} {{u.patron_tooltip}} {% endif %} diff --git a/files/templates/util/macros.html b/files/templates/util/macros.html index b8b3a37bd..ce8fba718 100644 --- a/files/templates/util/macros.html +++ b/files/templates/util/macros.html @@ -92,7 +92,7 @@ {% if p.ghost %} 👻 {% else %} - {% if FEATURES['PATRON_ICONS'] and p.author.patron > 1 %} + {% if FEATURES['PATRON_ICONS'] and p.author.patron > 1 and p.author.lifetimedonated_visible %} {{p.author.patron_tooltip}} {% endif %}