Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

FEATURE: added suppress_uncategorized_badge 

site setting to remove the suppression of the uncategorized badge from topic lists
This commit is contained in:
Sam 2014-01-07 10:59:28 +11:00
parent 3bb2948437
commit 164418b3f6
3 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/assets/javascripts/discourse/lib/html.js
View File

@ -39,7 +39,11 @@ Discourse.HTML = {
opts = opts || {}; opts = opts || {};
if ((!category) || if ((!category) ||
(!opts.allowUncategorized && Em.get(category, 'id') === Discourse.Site.currentProp("uncategorized_category_id"))) return ""; (!opts.allowUncategorized &&
Em.get(category, 'id') === Discourse.Site.currentProp("uncategorized_category_id") &&
Discourse.SiteSettings.suppress_uncategorized_badge
)
) return "";
var name = Em.get(category, 'name'), var name = Em.get(category, 'name'),
description = Em.get(category, 'description'), description = Em.get(category, 'description'),

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

@ -771,6 +771,7 @@ en:
enable_mobile_theme: "Mobile devices use a mobile-friendly theme, with the ability to switch to the full site. Disable this if you want to use a custom stylesheet that is fully responsive." enable_mobile_theme: "Mobile devices use a mobile-friendly theme, with the ability to switch to the full site. Disable this if you want to use a custom stylesheet that is fully responsive."
dominating_topic_minimum_percent: "What percentage of posts a user has to make in a topic before we consider it dominating." dominating_topic_minimum_percent: "What percentage of posts a user has to make in a topic before we consider it dominating."
suppress_uncategorized_badge: "Don't show the badge for uncategorized topics in topic lists"
enable_names: "Allow users to show their full names" enable_names: "Allow users to show their full names"
display_name_on_posts: "Also show a user's full name on their posts" display_name_on_posts: "Also show a user's full name on their posts"

3
config/site_settings.yml
View File

@ -420,5 +420,8 @@ uncategorized:
minimum_topics_similar: 50 minimum_topics_similar: 50
sequential_replies_threshold: 2 sequential_replies_threshold: 2
dominating_topic_minimum_percent: 20 dominating_topic_minimum_percent: 20
suppress_uncategorized_badge:
client: true
default: true