mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-05-05 23:25:30 +02:00
Code Issues Releases Wiki Activity

Let's try this. Split feed user interface into sections. This partly reverts r10366.

Browse Source 
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10374 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Andreas Fischer 2009-12-23 03:26:38 +00:00
parent 749fe6f9d0
commit 035fe74264
2 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
phpBB/includes/acp/acp_board.php
View File

@ -267,14 +267,20 @@ class acp_board
'legend1' => 'ACP_FEED_GENERAL',
'feed_enable' => array('lang' => 'ACP_FEED_ENABLE', 'validate' => 'bool', 'type' => 'radio:enabled_disabled', 'explain' => true ),
'feed_item_statistics' => array('lang' => 'ACP_FEED_ITEM_STATISTICS', 'validate' => 'bool', 'type' => 'radio:enabled_disabled', 'explain' => true),
'feed_limit_post' => array('lang' => 'ACP_FEED_LIMIT_POST', 'validate' => 'int:5', 'type' => 'text:3:4', 'explain' => true),
'legend2' => 'ACP_FEED_POST_BASED',
'feed_limit_post' => array('lang' => 'ACP_FEED_LIMIT', 'validate' => 'int:5', 'type' => 'text:3:4', 'explain' => true),
'feed_overall' => array('lang' => 'ACP_FEED_OVERALL', 'validate' => 'bool', 'type' => 'radio:enabled_disabled', 'explain' => true ),
'feed_forum' => array('lang' => 'ACP_FEED_FORUM', 'validate' => 'bool', 'type' => 'radio:enabled_disabled', 'explain' => true ),
'feed_topic' => array('lang' => 'ACP_FEED_TOPIC', 'validate' => 'bool', 'type' => 'radio:enabled_disabled', 'explain' => true ),
'feed_limit_topic' => array('lang' => 'ACP_FEED_LIMIT_TOPIC', 'validate' => 'int:5', 'type' => 'text:3:4', 'explain' => true),
'legend3' => 'ACP_FEED_TOPIC_BASED',
'feed_limit_topic' => array('lang' => 'ACP_FEED_LIMIT', 'validate' => 'int:5', 'type' => 'text:3:4', 'explain' => true),
'feed_overall_topics' => array('lang' => 'ACP_FEED_OVERALL_TOPIC', 'validate' => 'bool', 'type' => 'radio:enabled_disabled', 'explain' => true ),
'feed_overall_forums' => array('lang' => 'ACP_FEED_OVERALL_FORUMS', 'validate' => 'bool', 'type' => 'radio:enabled_disabled', 'explain' => true ),
'feed_news_id' => array('lang' => 'ACP_FEED_NEWS', 'validate' => 'string', 'type' => 'custom', 'method' => 'select_news_forums', 'explain' => true),
'legend4' => 'ACP_FEED_SETTINGS_OTHER',
'feed_overall_forums' => array('lang' => 'ACP_FEED_OVERALL_FORUMS', 'validate' => 'bool', 'type' => 'radio:enabled_disabled', 'explain' => true ),
'feed_exclude_id' => array('lang' => 'ACP_FEED_EXCLUDE_ID', 'validate' => 'string', 'type' => 'custom', 'method' => 'select_exclude_forums', 'explain' => true),
)
);

9
phpBB/language/en/acp/board.php
View File

@ -251,10 +251,8 @@ $lang = array_merge($lang, array(
'ACP_FEED_ENABLE' => 'Enable Feeds',
'ACP_FEED_ENABLE_EXPLAIN' => 'Turns on or off ATOM Feeds for the entire board.<br />Disabling this switches off all Feeds, no matter how the options below are set.',
'ACP_FEED_LIMIT_POST' => 'Number of items in post based feeds',
'ACP_FEED_LIMIT_POST_EXPLAIN' => 'The maximum number of feed items to display in post based feeds.',
'ACP_FEED_LIMIT_TOPIC' => 'Number of items in topic based feeds',
'ACP_FEED_LIMIT_TOPIC_EXPLAIN' => 'The maximum number of feed items to display in topic based feeds.',
'ACP_FEED_LIMIT' => 'Number of items',
'ACP_FEED_LIMIT_EXPLAIN' => 'The maximum number of feed items to display.',
'ACP_FEED_OVERALL' => 'Enable board-wide Feed',
'ACP_FEED_OVERALL_EXPLAIN' => 'Board-wide new posts.',
@ -272,6 +270,9 @@ $lang = array_merge($lang, array(
'ACP_FEED_NEWS_EXPLAIN' => 'Pull the first post from these forums. Select no forums to disable news feed.<br />Select multiple forums by holding <samp>CTRL</samp> and clicking.',
'ACP_FEED_GENERAL' => 'General Feed Settings',
'ACP_FEED_POST_BASED' => 'Post-based Feed Settings',
'ACP_FEED_TOPIC_BASED' => 'Topic-based Feed Settings',
'ACP_FEED_SETTINGS_OTHER' => 'Other Feeds and Seetings',
'ACP_FEED_ITEM_STATISTICS' => 'Item statistics',
'ACP_FEED_ITEM_STATISTICS_EXPLAIN' => 'Display individual statistics underneath feed items<br />(Posted by, date and time, Replies, Views)',