New "team" block

root/includes/acp/acp_portal.php

@@ -47,6 +47,7 @@ class acp_portal
 						'portal_advanced_stat'				=> array('lang' => 'PORTAL_ADVANCED_STAT'	, 'validate' => 'bool'	, 'type' => 'radio:yes_no'	, 'explain' => true),
 						'portal_search'						=> array('lang' => 'PORTAL_SEARCH'		, 'validate' => 'bool'	, 'type' => 'radio:yes_no'	, 'explain' => true),
 						'portal_leaders'					=> array('lang' => 'PORTAL_LEADERS'		, 'validate' => 'bool'	, 'type' => 'radio:yes_no'	, 'explain' => true),
+						'portal_leaders_ext'				=> array('lang' => 'PORTAL_LEADERS_EXT'		, 'validate' => 'bool'	, 'type' => 'radio:yes_no'	, 'explain' => true),
 						'portal_clock'						=> array('lang' => 'PORTAL_CLOCK'		, 'validate' => 'bool'	, 'type' => 'radio:yes_no'	, 'explain' => true),
 						'portal_link_us'					=> array('lang' => 'PORTAL_LINK_US'		, 'validate' => 'bool'	, 'type' => 'radio:yes_no'	, 'explain' => true),
 						'portal_birthdays'					=> array('lang' => 'PORTAL_BIRTHDAYS'		, 'validate' => 'bool'	, 'type' => 'radio:yes_no'	, 'explain' => true),

root/install_portal/schemas/_schema_data.sql

@@ -86,5 +86,8 @@ INSERT INTO phpbb_portal_config (config_name, config_value) VALUES ('portal_news
 INSERT INTO phpbb_portal_config (config_name, config_value) VALUES ('portal_announcements_archive', '1');
 INSERT INTO phpbb_portal_config (config_name, config_value) VALUES ('portal_links_array', 'a:2:{i:1;a:2:{s:4:"text";s:9:"Board3.de";s:3:"url";s:21:"http://www.board3.de/";}i:2;a:2:{s:4:"text";s:9:"phpBB.com";s:3:"url";s:21:"http://www.phpbb.com/";}}');
 
+# Version 1.0.0RC2 #
+INSERT INTO phpbb_portal_config (config_name, config_value) VALUES ('portal_leaders_ext', '0');
+
 # POSTGRES COMMIT #
 

root/install_portal/schemas/update_schema.php

@@ -55,6 +55,7 @@ $mod_update['0.3.0'] = array(
 $sql_update['1.0.0RC2'] = array(
 	"UPDATE phpbb_portal_config SET config_name = 'portal_right_column_width' WHERE config_name = 'portal_right_collumn_width'",
 	"UPDATE phpbb_portal_config SET config_name = 'portal_left_column_width' WHERE config_name = 'portal_left_collumn_width'",
+	"INSERT INTO phpbb_portal_config (config_name, config_value) VALUES ('portal_leaders_ext', '0');",
 );
 
 ?>

root/language/de/mods/lang_portal.php

@@ -160,6 +160,7 @@ $lang = array_merge($lang, array(
 	// team
 	'NO_ADMINISTRATORS_P'	=> 'Keine Administratoren',
 	'NO_MODERATORS_P'		=> 'Keine Moderatoren',
+	'NO_GROUPS_P'			=> 'Keine Groupen',
 
 	// average Statistics
 	'TOPICS_PER_DAY_OTHER'		=> 'Themen pro Tag: <strong>%d</strong>',

root/language/de/mods/lang_portal_acp.php

@@ -48,6 +48,8 @@ $lang = array_merge($lang, array(
 	'PORTAL_ADVANCED_STAT_EXPLAIN'				=> 'Diesen Block auf dem Portal anzeigen.',
 	'PORTAL_LEADERS'									=> 'Team',
 	'PORTAL_LEADERS_EXPLAIN'							=> 'Diesen Block auf dem Portal anzeigen.',
+	'PORTAL_LEADERS_EXT'					=> 'Extended Leaders / Team',
+	'PORTAL_LEADERS_EXT_EXPLAIN'			=> 'The standard block lists all admins/mods, while the extended block lists all non-hidden groups with a legend.',
 	'PORTAL_CLOCK'										=> 'Uhr',
 	'PORTAL_CLOCK_EXPLAIN'							=> 'Die Uhr auf dem Portal anzeigen.',
 	'PORTAL_LINK_US'									=> 'Verlink uns',

root/language/en/mods/lang_portal.php

@@ -166,8 +166,9 @@ $lang = array_merge($lang, array(
 	'STYLE_CHOOSE'			=> 'Select a style',
 		
 	// team
-	'NO_ADMINISTRATORS_P'	=> 'No administrators',
+	'NO_ADMINISTRATORS_P'	=> 'No Administrators',
-	'NO_MODERATORS_P'		=> 'No moderators',
+	'NO_MODERATORS_P'		=> 'No Moderators',
+	'NO_GROUPS_P'			=> 'No Groups',
 
 	// average Statistics
 	'TOPICS_PER_DAY_OTHER'	=> 'Topics per day: <strong>%d</strong>',

root/language/en/mods/lang_portal_acp.php

@@ -47,8 +47,10 @@ $lang = array_merge($lang, array(
 	'ACP_PORTAL_GENERAL_SETTINGS_EXPLAIN'	=> 'Here you can change your general and certain specific options.',
 	'PORTAL_ADVANCED_STAT'					=> 'Advanced statistics block',
 	'PORTAL_ADVANCED_STAT_EXPLAIN'			=> 'Display this block on the portal.',
-	'PORTAL_LEADERS'						=> 'Leaders / team block',
+	'PORTAL_LEADERS'						=> 'Leaders / Team block',
 	'PORTAL_LEADERS_EXPLAIN'				=> 'Display this block on the portal.',
+	'PORTAL_LEADERS_EXT'					=> 'Extended Leaders / Team',
+	'PORTAL_LEADERS_EXT_EXPLAIN'			=> 'The standard block lists all admins/mods, while the extended block lists all non-hidden groups with a legend.',
 	'PORTAL_CLOCK'							=> 'Clock block',
 	'PORTAL_CLOCK_EXPLAIN'					=> 'Display this block on the portal.',
 	'PORTAL_LINK_US'						=> 'Link us block',

root/portal.php

@@ -183,7 +183,11 @@ if ($portal_config['portal_link_us'])
 	include($phpbb_root_path . 'portal/block/link_us.'.$phpEx);
 }
 
-if ($portal_config['portal_leaders'])
+if ($portal_config['portal_leaders'] && $portal_config['portal_leaders_ext'])
+{
+	include($phpbb_root_path . 'portal/block/leaders_ext.'.$phpEx);
+}
+elseif ($portal_config['portal_leaders'])
 {
 	include($phpbb_root_path . 'portal/block/leaders.'.$phpEx);
 }

root/styles/prosilver/template/portal/portal_body.html

@@ -165,7 +165,9 @@
 			<!-- INCLUDE portal/block/mini_calendar.html -->
 		<!-- ENDIF -->
 		
-		<!-- IF S_DISPLAY_LEADERS -->
+		<!-- IF S_DISPLAY_LEADERS_EXT -->
+			<!-- INCLUDE portal/block/leaders_ext.html -->
+		<!-- ELSEIF S_DISPLAY_LEADERS -->
 			<!-- INCLUDE portal/block/leaders.html -->
 		<!-- ENDIF -->
 		

root/styles/subsilver2/template/portal/portal_body.html

@@ -178,8 +178,6 @@ small, .small {
 
 <!-- [+] right block area -->
 	<td width="{PORTAL_RIGHT_COLUMN}px" valign="top" style="padding-left:6px;">
-
-
 		<!-- IF S_DISPLAY_USERMENU -->
 			<!-- IF not S_USER_LOGGED_IN -->
 				<!-- INCLUDE portal/block/login_box.html -->
@@ -202,7 +200,9 @@ small, .small {
 			<!-- INCLUDE portal/block/mini_calendar.html -->
 		<!-- ENDIF -->
 
-		<!-- IF S_DISPLAY_LEADERS -->
+		<!-- IF S_DISPLAY_LEADERS_EXT -->
+			<!-- INCLUDE portal/block/leaders_ext.html -->
+		<!-- ELSEIF S_DISPLAY_LEADERS -->
 			<!-- INCLUDE portal/block/leaders.html -->
 		<!-- ENDIF -->