mirror of
https://github.com/discourse/discourse.git
synced 2025-02-25 18:55:32 -06:00
FIX: ensure not found category badge consistent with style
This commit is contained in:
@@ -1,5 +1,10 @@
|
||||
module CategoryBadge
|
||||
|
||||
def self.category_stripe(color, classes)
|
||||
style = color ? "style='background-color: ##{color};'" : ''
|
||||
"<span class='#{classes}' #{style}></span>"
|
||||
end
|
||||
|
||||
def self.html_for(category, opts=nil)
|
||||
opts = opts || {}
|
||||
|
||||
@@ -9,20 +14,24 @@ module CategoryBadge
|
||||
# By default hide uncategorized
|
||||
return "" if category.uncategorized? && !opts[:show_uncategorized]
|
||||
|
||||
category_url = "#{Discourse.base_url}#{category.url}"
|
||||
extra_classes = "#{opts[:extra_classes]} #{SiteSetting.category_style}"
|
||||
|
||||
result = ""
|
||||
result = ''
|
||||
|
||||
result << "<a href='#{category_url}' style='background-color: ##{category.color}; font-size: 12px; padding: 2px 1px; font-weight: bold; margin: 0; width: 2px; white-space:nowrap;'> </a>"
|
||||
|
||||
unless category.parent_category_id.nil?
|
||||
unless category.parent_category_id.nil? || opts[:hide_parent]
|
||||
parent_category = Category.find_by(id: category.parent_category_id)
|
||||
result << "<a href='#{category_url}' style='background-color: ##{parent_category.color}; font-size: 12px; padding: 2px 1px; font-weight: bold; margin: 0; width: 2px; white-space:nowrap;'> </a>"
|
||||
result << category_stripe(parent_category.color, 'badge-category-parent-bg')
|
||||
end
|
||||
result << category_stripe(category.color, 'badge-category-bg')
|
||||
|
||||
result << "<a href='#{category_url}' style='font-size: 12px; font-weight: bold; margin-left: 3px; color: #222;'>#{category.name}</a>"
|
||||
class_names = 'badge-category clear-badge'
|
||||
text_color = "##{category.text_color}"
|
||||
description = category.description_text ? "title='#{category.description_text.html_safe}'" : ''
|
||||
|
||||
"<span class='badge-wrapper'>#{result}</span>"
|
||||
result << "<span style='color: #{text_color};' data-drop-close='true' class='#{class_names}'
|
||||
#{description}'>"
|
||||
|
||||
result << category.name.html_safe << '</span>'
|
||||
"<a class='badge-wrapper #{extra_classes}' href='#{Discourse.base_url}#{category.url}'>#{result}</a>"
|
||||
end
|
||||
|
||||
end
|
||||
|
||||
Reference in New Issue
Block a user