github-mirror/discourse
github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-04-11 11:40:50 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

UX: Show a warning on the category edit page when category style is none and colors are disabled. (#11742)

Browse Source
This commit is contained in:
Roman Rizzi 2021-01-18 13:13:38 -03:00 committed by GitHub
parent 650e3d18c4
commit 19b2011601
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/assets/javascripts/discourse/app/templates/components/edit-category-general.hbs
View File

@ -50,8 +50,13 @@
</section> </section>
{{/if}} {{/if}}
{{#unless noCategoryStyle}}
<section class="field"> <section class="field">
{{#if noCategoryStyle}}
<label>
{{d-icon "exclamation-triangle"}}
{{i18n "category.colors_disabled"}}
</label>
{{else}}
<label>{{i18n "category.badge_colors"}}</label> <label>{{i18n "category.badge_colors"}}</label>
<div class="category-color-editor"> <div class="category-color-editor">
{{html-safe categoryBadgePreview}} {{html-safe categoryBadgePreview}}
@ -72,6 +77,6 @@
</div> </div>
</div> </div>
</div> </div>
{{/if}}
</section> </section>
{{/unless}}
</form> </form>

1
config/locales/client.en.yml
View File

@ -3085,6 +3085,7 @@ en:
list_filters: list_filters:
all: "all topics" all: "all topics"
none: "no subcategories" none: "no subcategories"
colors_disabled: "You can’t select colors because you have a category style of none."
flagging: flagging:
title: "Thanks for helping to keep our community civil!" title: "Thanks for helping to keep our community civil!"