Skip to content

Commit c57232b

Browse files
committed
Move some site settings around
1 parent ca0a8a5 commit c57232b

2 files changed

Lines changed: 61 additions & 55 deletions

File tree

config/locales/client.en.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1419,11 +1419,14 @@ en:
14191419
none: 'none'
14201420
categories:
14211421
required: 'Required'
1422+
basic: 'Basic Setup'
14221423
users: 'Users'
14231424
posting: 'Posting'
14241425
email: 'Email'
14251426
files: 'Files'
14261427
trust: 'Trust Levels'
1428+
security: 'Security'
1429+
seo: 'SEO'
14271430
spam: 'Spam'
14281431
rate_limits: 'Rate Limits'
14291432
developer: 'Developer'

config/site_settings.yml

Lines changed: 58 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,46 @@ required:
2020
company_short_name: 'Unconfigured Forum'
2121
company_domain: 'www.example.com'
2222

23+
basic:
24+
default_locale:
25+
default: 'en'
26+
enum: 'LocaleSiteSetting'
27+
ga_tracking_code:
28+
client: true
29+
default: ''
30+
ga_domain_name:
31+
client: true
32+
default: ''
33+
enable_wide_category_list:
34+
client: true
35+
default: false
36+
category_featured_topics:
37+
client: true
38+
default: 6
39+
topics_per_page: 30
40+
posts_per_page:
41+
client: true
42+
default: 20
43+
suggested_topics: 5
44+
enable_mobile_theme:
45+
client: true
46+
default: true
47+
top_menu:
48+
client: true
49+
default: 'latest|new|unread|favorited|categories'
50+
post_menu:
51+
client: true
52+
default: 'like|edit|flag|delete|share|bookmark|reply'
53+
share_links:
54+
client: true
55+
default: 'twitter|facebook|google+|email'
56+
category_colors:
57+
client: true
58+
default: 'BF1E2E|F1592A|F7941D|9EB83B|3AB54A|12A89D|25AAE2|0E76BD|652D90|92278F|ED207B|8C6238|231F20|808281|B3B5B4|283890'
59+
relative_date_duration:
60+
client: true
61+
default: 30
62+
2363
users:
2464
enable_local_logins:
2565
client: true
@@ -227,6 +267,21 @@ trust:
227267
default: 0
228268
enum: 'MinTrustToCreateTopicSetting'
229269

270+
security:
271+
enable_flash_video_onebox: false
272+
use_ssl: false
273+
enable_escaped_fragments:
274+
client: true
275+
default: false
276+
277+
seo:
278+
add_rel_nofollow_to_user_content: true
279+
exclude_rel_nofollow_domains: ''
280+
allow_index_in_robots_txt: true
281+
enable_noscript_support:
282+
client: true
283+
default: true
284+
230285
spam:
231286
email_domains_blacklist:
232287
client: true
@@ -280,30 +335,11 @@ uncategorized:
280335
privacy_policy_url:
281336
client: true
282337
default: ''
283-
top_menu:
284-
client: true
285-
default: 'latest|new|unread|favorited|categories'
286-
post_menu:
287-
client: true
288-
default: 'like|edit|flag|delete|share|bookmark|reply'
289-
share_links:
290-
client: true
291-
default: 'twitter|facebook|google+|email'
338+
292339
track_external_right_clicks:
293340
client: true
294341
default: false
295-
ga_tracking_code:
296-
client: true
297-
default: ''
298-
ga_domain_name:
299-
client: true
300-
default: ''
301-
enable_escaped_fragments:
302-
client: true
303-
default: false
304-
enable_noscript_support:
305-
client: true
306-
default: true
342+
307343
enable_long_polling:
308344
client: true
309345
default: true
@@ -323,45 +359,18 @@ uncategorized:
323359
client: true
324360
default: true
325361
new_version_emails: true
326-
category_colors:
327-
client: true
328-
default: 'BF1E2E|F1592A|F7941D|9EB83B|3AB54A|12A89D|25AAE2|0E76BD|652D90|92278F|ED207B|8C6238|231F20|808281|B3B5B4|283890'
329-
enable_wide_category_list:
330-
client: true
331-
default: false
332-
333362
auto_track_topics_after: 240000
334363
new_topic_duration_minutes: 2880
335364
long_polling_interval: 15000
336-
337-
use_ssl: false
338-
339-
340-
category_featured_topics:
341-
client: true
342-
default: 6
343-
topics_per_page: 30
344-
posts_per_page:
345-
client: true
346-
default: 20
347365
active_user_rate_limit_secs: 60
348366
previous_visit_timeout_hours: 1
349-
350-
suggested_topics: 5
351367
staff_like_weight: 3
352-
add_rel_nofollow_to_user_content: true
353-
exclude_rel_nofollow_domains: ''
354368
best_of_score_threshold: 15
355369
best_of_posts_required: 50
356370
best_of_likes_required: 1
357371
best_of_percent_filter: 20
358-
allow_index_in_robots_txt: true
359372
send_welcome_message: true
360-
enable_flash_video_onebox: false
361373
allow_import: false
362-
default_locale:
363-
default: 'en'
364-
enum: 'LocaleSiteSetting'
365374
educate_until_posts:
366375
client: true
367376
default: 2
@@ -376,13 +385,7 @@ uncategorized:
376385
client: true
377386
default: 5000
378387
minimum_topics_similar: 50
379-
relative_date_duration:
380-
client: true
381-
default: 30
382388
sequential_replies_threshold: 2
383-
enable_mobile_theme:
384-
client: true
385-
default: true
386389
dominating_topic_minimum_percent: 20
387-
390+
388391

0 commit comments

Comments
 (0)