Add support for module icons in center column

2023-02-13 20:49:53 +01:00
parent 286bd55424
commit 68cf9864c6
43 changed files with 137 additions and 50 deletions
--- a/acp/portal_module.php
+++ b/acp/portal_module.php
@@ -101,7 +101,7 @@ class portal_module
 						'board3_display_jumpbox'	=> array('lang' => 'PORTAL_DISPLAY_JUMPBOX',	'validate' => 'bool',	'type' => 'radio:yes_no',	'explain' => true),

 						'legend2'					=> 'ACP_PORTAL_COLUMN_WIDTH_SETTINGS',
-						'board3_left_column_width'	=> array('lang' => 'PORTAL_LEFT_COLUMN_WIDTH',	'validate' => 'int',	'type' => 'text:3:3',		'explain' => true),
+						'board3_left_column_width'	=> ['lang' => 'PORTAL_LEFT_COLUMN_WIDTH',	'validate' => 'int',	'type' => 'number:150:400',		'explain' => true, 'append' => ' ' . $this->user->lang('PIXEL')],
 						'board3_right_column_width'	=> ['lang' => 'PORTAL_RIGHT_COLUMN_WIDTH',	'validate' => 'int',	'type' => 'number:150:400',		'explain' => true, 'append' => ' ' . $this->user->lang('PIXEL')],

 						'legend3'					=> 'ACP_PORTAL_SHOW_ALL',
@@ -145,7 +145,7 @@ class portal_module
 							'MODULE_FA'				=> $module_data['module_fa_icon'],
 							'MODULE_FA_SIZE'		=> $module_data['module_fa_size'],
 							'MODULE_ENABLED'		=> ($module_data['module_status']) ? true : false,
-							'MODULE_SHOW_IMAGE'		=> (in_array($this->portal_columns->number_to_string($module_data['module_column']), array('center', 'top', 'bottom'))) ? false : true,
+							'MODULE_SHOW_IMAGE'		=> (in_array($this->portal_columns->number_to_string($module_data['module_column']), array(''))) ? false : true,
 						));

 						if ($module_data['module_classname'] != '\board3\portal\modules\custom')
--- a/modules/announcements.php
+++ b/modules/announcements.php
@@ -33,7 +33,7 @@ class announcements extends module_base
 	* Default module-image:
 	* file must be in "{T_THEME_PATH}/images/portal/"
 	*/
-	public $image_src = '';
+	public $image_src = 'portal_custom.png';

 	/**
 	* module-language file
--- a/modules/calendar.php
+++ b/modules/calendar.php
@@ -188,8 +188,8 @@ class calendar extends module_base
 		// output our general calendar bits
 		$down = $this->mini_cal_month - 1;
 		$up = $this->mini_cal_month + 1;
-		$prev_month = '<a href="' . $this->modules_helper->route('board3_portal_controller') . "?m$module_id=$down#minical$module_id" . '" rel="nofollow"><i class="fa fa-backward" aria-hidden="true" title="' . $this->user->lang('VIEW_PREVIOUS_MONTH') . '"></i></a>';
-		$next_month = '<a href="' . $this->modules_helper->route('board3_portal_controller') . "?m$module_id=$up#minical$module_id" . '" rel="nofollow"><i class="fa fa-forward" aria-hidden="true" title="' . $this->user->lang('VIEW_NEXT_MONTH') . '"></i></a>';
+		$prev_month = '<a href="' . $this->modules_helper->route('board3_portal_controller') . "?m$module_id=$down#minical$module_id" . '" rel="nofollow"><i class="fa fa-backward" aria-hidden="true" title="' . $this->user->lang['VIEW_PREVIOUS_MONTH'] . '"></i></a>';
+		$next_month = '<a href="' . $this->modules_helper->route('board3_portal_controller') . "?m$module_id=$up#minical$module_id" . '" rel="nofollow"><i class="fa fa-forward" aria-hidden="true" title="' . $this->user->lang['VIEW_NEXT_MONTH'] . '"></i></a>';

 		$this->template->assign_block_vars('minical', array(
 			'S_SUNDAY_FIRST'	=> ($this->config['board3_sunday_first_' . $module_id]) ? true : false,
--- a/modules/custom.php
+++ b/modules/custom.php
@@ -405,8 +405,7 @@ class custom extends module_base
 				'template'	=> 'custom_' . $type . '.html',
 				'title'		=> $title,
 				'code'		=> $assign_code,
-				// no image for center blocks
-				'image_src'	=> ($type === 'center') ? '' : ((!empty($this->config['board3_custom_' . $module_id . '_image_src'])) ? $this->config['board3_custom_' . $module_id . '_image_src'] : $this->image_src),
+				'image_src'	=> ((!empty($this->config['board3_custom_' . $module_id . '_image_src'])) ? $this->config['board3_custom_' . $module_id . '_image_src'] : $this->image_src),
 			);
 		}
 	}
--- a/modules/forumlist.php
+++ b/modules/forumlist.php
@@ -33,7 +33,7 @@ class forumlist extends module_base
 	* Default module-image:
 	* file must be in "{T_THEME_PATH}/images/portal/"
 	*/
-	public $image_src = '';
+	public $image_src = 'portal_custom.png';

 	/**
 	* module-language file
--- a/modules/news.php
+++ b/modules/news.php
@@ -33,7 +33,7 @@ class news extends module_base
 	* Default module-image:
 	* file must be in "{T_THEME_PATH}/images/portal/"
 	*/
-	public $image_src = '';
+	public $image_src = 'portal_custom.png';

 	/**
 	* module-language file
--- a/modules/recent.php
+++ b/modules/recent.php
@@ -33,7 +33,7 @@ class recent extends module_base
 	* Default module-image:
 	* file must be in "{T_THEME_PATH}/images/portal/"
 	*/
-	public $image_src = '';
+	public $image_src = 'portal_custom.png';

 	/**
 	* module-language file
--- a/modules/welcome.php
+++ b/modules/welcome.php
@@ -33,7 +33,7 @@ class welcome extends module_base
 	* Default module-image:
 	* file must be in "{T_THEME_PATH}/images/portal/"
 	*/
-	public $image_src = '';
+	public $image_src = 'portal_custom.png';

 	/**
 	* module-language file
--- a/styles/prosilver/template/portal/_block_config.html
+++ b/styles/prosilver/template/portal/_block_config.html
@@ -5,13 +5,13 @@
 {% DEFINE LR_BLOCK_F_R = '</div></div><br class="portal-clear" />' %}

 <!-- Config for the center blocks //-->
-{% DEFINE C_BLOCK_H_L = '<div class="forabg" role="row"><div class="inner"><ul class="topiclist"><li class="header"><dl class="row-item"><dt>' %}
+{% DEFINE C_BLOCK_H_L = '<div class="forabg" role="row"><div class="inner"><ul class="topiclist"><li class="header"><dl class="row-item"><dt style="padding: 0px 0px 2px; white-space: nowrap; margin-bottom: 0px; margin-top: 0px;">' %}
 {% DEFINE C_BLOCK_H_R = '</dt><dd></dd></dl></li></ul>' %}
 {% DEFINE C_BLOCK_F_L = ' ' %}
 {% DEFINE C_BLOCK_F_R = '</div></div><br class="portal-clear" />' %}

 <!-- Config for compact blocks //-->
-{% DEFINE CC_BLOCK_H_L = '<div class="forabg" role="row"><div class="inner"><ul class="topiclist"><li class="header"><dl class="row-item">' %}
+{% DEFINE CC_BLOCK_H_L = '<div class="forabg" role="row"><div class="inner"><ul class="topiclist"><li class="header"><dl class="row-item" style="padding: 0px 0px 2px; white-space: nowrap; margin-bottom: -4px; margin-top: 0px;">' %}
 {% DEFINE CC_BLOCK_H_R = '</dl></li></ul>' %}

 <!-- Images-URL //-->
--- a/styles/prosilver/template/portal/modules/announcements_center.html
+++ b/styles/prosilver/template/portal/modules/announcements_center.html
@@ -1,4 +1,10 @@
-{{ definition.C_BLOCK_H_L }}{{ definition.TITLE }}{{ definition.C_BLOCK_H_R }}
+{{ definition.C_BLOCK_H_L }}{% if definition.S_BLOCK_ICON %}
+{% if definition.FA_ENABLED %}
+<i class="icon fa {{ definition.FA_ICON }}" style="font-size: {{ definition.FA_SIZE }}px;" aria-hidden="true"></i>
+{% else %}
+<img src="{{ definition.IMAGE_SRC }}" width="{{ definition.IMAGE_WIDTH }}" height="{{ definition.IMAGE_HEIGHT }}" alt="" />
+{% endif %}
+{% endif %}{{ definition.TITLE }}{{ definition.C_BLOCK_H_R }}
 {% if definition.S_POSTBODY_TOP %}<div class="postbody portal-module-postbody">{% endif %}
 {% for announcements in loops.announcements %}
 {% if announcements.MODULE_ID eq definition.MODULE_ID %}
--- a/styles/prosilver/template/portal/modules/announcements_center_compact.html
+++ b/styles/prosilver/template/portal/modules/announcements_center_compact.html
@@ -2,7 +2,13 @@
 {% if announcements.MODULE_ID eq definition.MODULE_ID %}
 {% for center_row in announcements.center_row %}
 {% if center_row.S_NO_TOPICS %}
-{{ definition.C_BLOCK_H_L }}{{ definition.TITLE }}{{ definition.C_BLOCK_H_R }}
+{{ definition.C_BLOCK_H_L }}{% if definition.S_BLOCK_ICON %}
+{% if definition.FA_ENABLED %}
+<i class="icon b3p-icon fa {{ definition.FA_ICON }}" style="font-size: {{ definition.FA_SIZE }}px;" aria-hidden="true"></i>
+{% else %}
+<img src="{{ definition.IMAGE_SRC }}" width="{{ definition.IMAGE_WIDTH }}" height="{{ definition.IMAGE_HEIGHT }}" alt="" />
+{% endif %}
+{% endif %}{{ definition.TITLE }}{{ definition.C_BLOCK_H_R }}
 	<div class="post bg2 portal-no-margin">
 		<div class="inner">
 			<span><strong>{{ lang('NO_ANNOUNCEMENTS') }}</strong></span>
@@ -11,12 +17,21 @@
 {{ definition.C_BLOCK_F_L }}{{ definition.C_BLOCK_F_R }}
 {% else %}
 {% if center_row.S_FIRST_ROW %}
-{{ definition.CC_BLOCK_H_L }}
-	<dt id="a_{{ definition.MODULE_ID }}">{{ definition.TITLE }}</dt>
+{{ definition.CC_BLOCK_H_L }}{% if definition.S_BLOCK_ICON %}
+{% if definition.FA_ENABLED %}
+	<dt style="margin-top: 1px;" id="a_{{ definition.MODULE_ID }}"><i class="icon b3p-icon fa {{ definition.FA_ICON }}" style="font-size: {{ definition.FA_SIZE }}px;" aria-hidden="true"></i>&nbsp;{{ definition.TITLE }}</dt>
 	{% if announcements.S_DISPLAY_ANNOUNCEMENTS_RVS %}
 		<dd class="posts responsive-portal-announcements">{{ lang('REPLIES') }}</dd>
 		<dd class="views responsive-portal-announcements">{{ lang('VIEWS') }}</dd>
 	{% endif %}
+{% else %}
+	<dt style="margin-top: 0px;" id="a_{{ definition.MODULE_ID }}"><img src="{{ definition.IMAGE_SRC }}" width="{{ definition.IMAGE_WIDTH }}" height="{{ definition.IMAGE_HEIGHT }}" alt="" />&nbsp;{{ definition.TITLE }}</dt>
+	{% if announcements.S_DISPLAY_ANNOUNCEMENTS_RVS %}
+		<dd class="posts responsive-portal-announcements">{{ lang('REPLIES') }}</dd>
+		<dd class="views responsive-portal-announcements">{{ lang('VIEWS') }}</dd>
+	{% endif %}
+{% endif %}
+{% endif %}
 	<dd class="lastpost responsive-portal-announcements"><span>{{ lang('LAST_POST') }}</span></dd>
 {{ definition.CC_BLOCK_H_R }}
 <ul class="topiclist topics responsive-portal-announcements">
--- a/styles/prosilver/template/portal/modules/attachments_center.html
+++ b/styles/prosilver/template/portal/modules/attachments_center.html
@@ -1,4 +1,10 @@
-{{ definition.C_BLOCK_H_L }}{{ definition.TITLE }}{{ definition.C_BLOCK_H_R }}
+{{ definition.C_BLOCK_H_L }}{% if definition.S_BLOCK_ICON %}
+{% if definition.FA_ENABLED %}
+	<i class="icon b3p-icon fa {{ definition.FA_ICON }}" style="font-size: {{ definition.FA_SIZE }}px;" aria-hidden="true"></i>
+{% else %}
+	<img src="{{ definition.IMAGE_SRC }}" width="{{ definition.IMAGE_WIDTH }}" height="{{ definition.IMAGE_HEIGHT }}" alt="" />
+{% endif %}
+{% endif %}{{ definition.TITLE }}{{ definition.C_BLOCK_H_R }}
 <div class="panel bg1 portal-no-margin">
 	<div class="inner">
 	{% if loops.attach_center|length %}
--- a/styles/prosilver/template/portal/modules/attachments_side.html
+++ b/styles/prosilver/template/portal/modules/attachments_side.html
@@ -1,7 +1,7 @@
 {{ definition.LR_BLOCK_H_L }}
 	{% if definition.S_BLOCK_ICON %}
 		{% if definition.FA_ENABLED %}
-			<i class="icon fa {{ definition.FA_ICON }}" style="font-size: {{ definition.FA_SIZE }}px;" aria-hidden="true"></i>
+			<i class="icon b3p-icon fa {{ definition.FA_ICON }}" style="font-size: {{ definition.FA_SIZE }}px;" aria-hidden="true"></i>
 		{% else %}
 			<img src="{{ definition.IMAGE_SRC }}" width="{{ definition.IMAGE_WIDTH }}" height="{{ definition.IMAGE_HEIGHT }}" alt="" />
 		{% endif %}
--- a/styles/prosilver/template/portal/modules/birthdays_side.html
+++ b/styles/prosilver/template/portal/modules/birthdays_side.html
@@ -1,7 +1,7 @@
 {{ definition.LR_BLOCK_H_L }}
 			{% if definition.S_BLOCK_ICON %}
 				{% if definition.FA_ENABLED %}
-					<i class="icon fa {{ definition.FA_ICON }}" style="font-size: {{ definition.FA_SIZE }}px;" aria-hidden="true"></i>
+					<i class="icon b3p-icon fa {{ definition.FA_ICON }}" style="font-size: {{ definition.FA_SIZE }}px;" aria-hidden="true"></i>
 				{% else %}
 					<img src="{{ definition.IMAGE_SRC }}" width="{{ definition.IMAGE_WIDTH }}" height="{{ definition.IMAGE_HEIGHT }}" alt="" />
 				{% endif %}
--- a/styles/prosilver/template/portal/modules/calendar_side.html
+++ b/styles/prosilver/template/portal/modules/calendar_side.html
@@ -3,7 +3,7 @@
 <a id="minical{{ minical.MODULE_ID }}"></a>
 {{ definition.LR_BLOCK_H_L }}{% if definition.S_BLOCK_ICON %}
 {% if definition.FA_ENABLED %}
-	<i class="icon fa {{ definition.FA_ICON }}" style="font-size: {{ definition.FA_SIZE }}px;" aria-hidden="true"></i>
+	<i class="icon b3p-icon fa {{ definition.FA_ICON }}" style="font-size: {{ definition.FA_SIZE }}px;" aria-hidden="true"></i>
 {% else %}
 	<img src="{{ definition.IMAGE_SRC }}" width="{{ definition.IMAGE_WIDTH }}" height="{{ definition.IMAGE_HEIGHT }}" alt="" />
 {% endif %}
--- a/styles/prosilver/template/portal/modules/clock_side.html
+++ b/styles/prosilver/template/portal/modules/clock_side.html
@@ -1,6 +1,6 @@
 {{ definition.LR_BLOCK_H_L }}{% if definition.S_BLOCK_ICON %}
 {% if definition.FA_ENABLED %}
-<i class="icon fa {{ definition.FA_ICON }}" style="font-size: {{ definition.FA_SIZE }}px;" aria-hidden="true"></i>
+<i class="icon b3p-icon fa {{ definition.FA_ICON }}" style="font-size: {{ definition.FA_SIZE }}px;" aria-hidden="true"></i>
 {% else %}
 <img src="{{ definition.IMAGE_SRC }}" width="{{ definition.IMAGE_WIDTH }}" height="{{ definition.IMAGE_HEIGHT }}" alt="" />
 {% endif %}
--- a/styles/prosilver/template/portal/modules/custom_center.html
+++ b/styles/prosilver/template/portal/modules/custom_center.html
@@ -1,4 +1,10 @@
-{{ definition.C_BLOCK_H_L }}{{ definition.TITLE }}{{ definition.C_BLOCK_H_R }}
+{{ definition.C_BLOCK_H_L }}{% if definition.S_BLOCK_ICON %}
+{% if definition.FA_ENABLED %}
+	<i class="icon b3p-icon fa {{ definition.FA_ICON }}" style="font-size: {{ definition.FA_SIZE }}px;" aria-hidden="true"></i>
+{% else %}
+	<img src="{{ definition.IMAGE_SRC }}" width="{{ definition.IMAGE_WIDTH }}" height="{{ definition.IMAGE_HEIGHT }}" alt="" />
+{% endif %}
+{% endif %}{{ definition.TITLE }}{{ definition.C_BLOCK_H_R }}
 <div class="panel bg1 portal-no-margin">
 	<div class="inner">
 		<div class="postbody portal-module-postbody">
--- a/styles/prosilver/template/portal/modules/custom_side.html
+++ b/styles/prosilver/template/portal/modules/custom_side.html
@@ -1,6 +1,6 @@
 {{ definition.LR_BLOCK_H_L }}{% if definition.S_BLOCK_ICON %}
 {% if definition.FA_ENABLED %}
-<i class="icon fa {{ definition.FA_ICON }}" style="font-size: {{ definition.FA_SIZE }}px;" aria-hidden="true"></i>
+<i class="icon b3p-icon fa {{ definition.FA_ICON }}" style="font-size: {{ definition.FA_SIZE }}px;" aria-hidden="true"></i>
 {% else %}
 <img src="{{ definition.IMAGE_SRC }}" width="{{ definition.IMAGE_WIDTH }}" height="{{ definition.IMAGE_HEIGHT }}" alt="" />
 {% endif %}
--- a/styles/prosilver/template/portal/modules/donation_center.html
+++ b/styles/prosilver/template/portal/modules/donation_center.html
@@ -1,4 +1,10 @@
-{{ definition.C_BLOCK_H_L }}{{ definition.TITLE }}{{ definition.C_BLOCK_H_R }}
+{{ definition.C_BLOCK_H_L }}{% if definition.S_BLOCK_ICON %}
+{% if definition.FA_ENABLED %}
+	<i class="icon b3p-icon fa {{ definition.FA_ICON }}" style="font-size: {{ definition.FA_SIZE }}px;" aria-hidden="true"></i>
+{% else %}
+	<img src="{{ definition.IMAGE_SRC }}" width="{{ definition.IMAGE_WIDTH }}" height="{{ definition.IMAGE_HEIGHT }}" alt="" />
+{% endif %}
+{% endif %}{{ definition.TITLE }}{{ definition.C_BLOCK_H_R }}
 	<ul class="topiclist bg1">
 		<li><dl><dt></dt>
 			<dd class="portal-donation-center-content portal-responsive-show">
--- a/styles/prosilver/template/portal/modules/donation_side.html
+++ b/styles/prosilver/template/portal/modules/donation_side.html
@@ -1,6 +1,6 @@
 {{ definition.LR_BLOCK_H_L }}{% if definition.S_BLOCK_ICON %}
 {% if definition.FA_ENABLED %}
-<i class="icon fa {{ definition.FA_ICON }}" style="font-size: {{ definition.FA_SIZE }}px;" aria-hidden="true"></i>
+<i class="icon b3p-icon fa {{ definition.FA_ICON }}" style="font-size: {{ definition.FA_SIZE }}px;" aria-hidden="true"></i>
 {% else %}
 <img src="{{ definition.IMAGE_SRC }}" width="{{ definition.IMAGE_WIDTH }}" height="{{ definition.IMAGE_HEIGHT }}" alt="" />
 {% endif %}
--- a/styles/prosilver/template/portal/modules/friends_side.html
+++ b/styles/prosilver/template/portal/modules/friends_side.html
@@ -1,6 +1,6 @@
 {{ definition.LR_BLOCK_H_L }}{% if definition.S_BLOCK_ICON %}
 {% if definition.FA_ENABLED %}
-<i class="icon fa {{ definition.FA_ICON }}" style="font-size: {{ definition.FA_SIZE }}px;" aria-hidden="true"></i>
+<i class="icon b3p-icon fa {{ definition.FA_ICON }}" style="font-size: {{ definition.FA_SIZE }}px;" aria-hidden="true"></i>
 {% else %}
 <img src="{{ definition.IMAGE_SRC }}" width="{{ definition.IMAGE_WIDTH }}" height="{{ definition.IMAGE_HEIGHT }}" alt="" />
 {% endif %}
--- a/styles/prosilver/template/portal/modules/latest_bots_side.html
+++ b/styles/prosilver/template/portal/modules/latest_bots_side.html
@@ -1,6 +1,6 @@
 {{ definition.LR_BLOCK_H_L }}{% if definition.S_BLOCK_ICON %}
 {% if definition.FA_ENABLED %}
-<i class="icon fa {{ definition.FA_ICON }}" style="font-size: {{ definition.FA_SIZE }}px;" aria-hidden="true"></i>
+<i class="icon b3p-icon fa {{ definition.FA_ICON }}" style="font-size: {{ definition.FA_SIZE }}px;" aria-hidden="true"></i>
 {% else %}
 <img src="{{ definition.IMAGE_SRC }}" width="{{ definition.IMAGE_WIDTH }}" height="{{ definition.IMAGE_HEIGHT }}" alt="" />
 {% endif %}
--- a/styles/prosilver/template/portal/modules/latest_members_side.html
+++ b/styles/prosilver/template/portal/modules/latest_members_side.html
@@ -1,6 +1,6 @@
 {{ definition.LR_BLOCK_H_L }}{% if definition.S_BLOCK_ICON %}
 {% if definition.FA_ENABLED %}
-<i class="icon fa {{ definition.FA_ICON }}" style="font-size: {{ definition.FA_SIZE }}px;" aria-hidden="true"></i>
+<i class="icon b3p-icon fa {{ definition.FA_ICON }}" style="font-size: {{ definition.FA_SIZE }}px;" aria-hidden="true"></i>
 {% else %}
 <img src="{{ definition.IMAGE_SRC }}" width="{{ definition.IMAGE_WIDTH }}" height="{{ definition.IMAGE_HEIGHT }}" alt="" />
 {% endif %}
--- a/styles/prosilver/template/portal/modules/leaders_ext_side.html
+++ b/styles/prosilver/template/portal/modules/leaders_ext_side.html
@@ -1,6 +1,6 @@
 {{ definition.LR_BLOCK_H_L }}{% if definition.S_BLOCK_ICON %}
 {% if definition.FA_ENABLED %}
-<i class="icon fa {{ definition.FA_ICON }}" style="font-size: {{ definition.FA_SIZE }}px;" aria-hidden="true"></i>
+<i class="icon b3p-icon fa {{ definition.FA_ICON }}" style="font-size: {{ definition.FA_SIZE }}px;" aria-hidden="true"></i>
 {% else %}
 <img src="{{ definition.IMAGE_SRC }}" width="{{ definition.IMAGE_WIDTH }}" height="{{ definition.IMAGE_HEIGHT }}" alt="" />
 {% endif %}
--- a/styles/prosilver/template/portal/modules/leaders_side.html
+++ b/styles/prosilver/template/portal/modules/leaders_side.html
@@ -1,6 +1,6 @@
 {{ definition.LR_BLOCK_H_L }}{% if definition.S_BLOCK_ICON %}
 {% if definition.FA_ENABLED %}
-<i class="icon fa {{ definition.FA_ICON }}" style="font-size: {{ definition.FA_SIZE }}px;" aria-hidden="true"></i>
+<i class="icon b3p-icon fa {{ definition.FA_ICON }}" style="font-size: {{ definition.FA_SIZE }}px;" aria-hidden="true"></i>
 {% else %}
 <img src="{{ definition.IMAGE_SRC }}" width="{{ definition.IMAGE_WIDTH }}" height="{{ definition.IMAGE_HEIGHT }}" alt="" />
 {% endif %}
--- a/styles/prosilver/template/portal/modules/link_us_side.html
+++ b/styles/prosilver/template/portal/modules/link_us_side.html
@@ -1,6 +1,6 @@
 {{ definition.LR_BLOCK_H_L }}{% if definition.S_BLOCK_ICON %}
 {% if definition.FA_ENABLED %}
-<i class="icon fa {{ definition.FA_ICON }}" style="font-size: {{ definition.FA_SIZE }}px;" aria-hidden="true"></i>
+<i class="icon b3p-icon fa {{ definition.FA_ICON }}" style="font-size: {{ definition.FA_SIZE }}px;" aria-hidden="true"></i>
 {% else %}
 <img src="{{ definition.IMAGE_SRC }}" width="{{ definition.IMAGE_WIDTH }}" height="{{ definition.IMAGE_HEIGHT }}" alt="" />
 {% endif %}
--- a/styles/prosilver/template/portal/modules/links_side.html
+++ b/styles/prosilver/template/portal/modules/links_side.html
@@ -2,7 +2,7 @@
 {% if portal_links.MODULE_ID eq definition.MODULE_ID %}
 {{ definition.LR_BLOCK_H_L }}{% if definition.S_BLOCK_ICON %}
 {% if definition.FA_ENABLED %}
-<i class="icon fa {{ definition.FA_ICON }}" style="font-size: {{ definition.FA_SIZE }}px;" aria-hidden="true"></i>
+<i class="icon b3p-icon fa {{ definition.FA_ICON }}" style="font-size: {{ definition.FA_SIZE }}px;" aria-hidden="true"></i>
 {% else %}
 <img src="{{ definition.IMAGE_SRC }}" width="{{ definition.IMAGE_WIDTH }}" height="{{ definition.IMAGE_HEIGHT }}" alt="" />
 {% endif %}
--- a/styles/prosilver/template/portal/modules/login_box_side.html
+++ b/styles/prosilver/template/portal/modules/login_box_side.html
@@ -2,7 +2,7 @@
 	<div>
 		{{ definition.LR_BLOCK_H_L }}<a href="{{ U_LOGIN_LOGOUT }}">{% if definition.S_BLOCK_ICON %}
 			{% if definition.FA_ENABLED %}
-			<i class="icon fa {{ definition.FA_ICON }}" style="font-size: {{ definition.FA_SIZE }}px;" aria-hidden="true"></i>
+			<i class="icon b3p-icon fa {{ definition.FA_ICON }}" style="font-size: {{ definition.FA_SIZE }}px;" aria-hidden="true"></i>
 			{% else %}
 			<img src="{{ definition.IMAGE_SRC }}" width="{{ definition.IMAGE_WIDTH }}" height="{{ definition.IMAGE_HEIGHT }}" alt="" />
 			{% endif %}
--- a/styles/prosilver/template/portal/modules/main_menu_side.html
+++ b/styles/prosilver/template/portal/modules/main_menu_side.html
@@ -2,7 +2,7 @@
 {% if portal_menu.MODULE_ID eq definition.MODULE_ID %}
 {{ definition.LR_BLOCK_H_L }}{% if definition.S_BLOCK_ICON %}
 {% if definition.FA_ENABLED %}
-<i class="icon fa {{ definition.FA_ICON }}" style="font-size: {{ definition.FA_SIZE }}px;" aria-hidden="true"></i>
+<i class="icon b3p-icon fa {{ definition.FA_ICON }}" style="font-size: {{ definition.FA_SIZE }}px;" aria-hidden="true"></i>
 {% else %}
 <img src="{{ definition.IMAGE_SRC }}" width="{{ definition.IMAGE_WIDTH }}" height="{{ definition.IMAGE_HEIGHT }}" alt="" />
 {% endif %}
--- a/styles/prosilver/template/portal/modules/news_center.html
+++ b/styles/prosilver/template/portal/modules/news_center.html
@@ -1,4 +1,10 @@
-{{ definition.C_BLOCK_H_L }}{{ definition.TITLE }}{{ definition.C_BLOCK_H_R }}
+{{ definition.C_BLOCK_H_L }}{% if definition.S_BLOCK_ICON %}
+{% if definition.FA_ENABLED %}
+	<i class="icon b3p-icon fa {{ definition.FA_ICON }}" style="font-size: {{ definition.FA_SIZE }}px;" aria-hidden="true"></i>
+{% else %}
+	<img src="{{ definition.IMAGE_SRC }}" width="{{ definition.IMAGE_WIDTH }}" height="{{ definition.IMAGE_HEIGHT }}" alt="" />
+{% endif %}
+{% endif %}{{ definition.TITLE }}{{ definition.C_BLOCK_H_R }}
 {% if definition.S_POSTBODY_TOP %}<div class="postbody portal-module-postbody">{% endif %}
 	{% for news in loops.news %}
 	{% if news.MODULE_ID eq definition.MODULE_ID %}
--- a/styles/prosilver/template/portal/modules/news_compact_center.html
+++ b/styles/prosilver/template/portal/modules/news_compact_center.html
@@ -2,7 +2,13 @@
 {% if news.MODULE_ID eq definition.MODULE_ID %}
 {% for news_row in news.news_row %}
 {% if news_row.S_NO_TOPICS %}
-{{ definition.C_BLOCK_H_L }}{{ definition.TITLE }}{{ definition.C_BLOCK_H_R }}
+{{ definition.C_BLOCK_H_L }}{% if definition.S_BLOCK_ICON %}
+{% if definition.FA_ENABLED %}
+	<i class="icon b3p-icon fa {{ definition.FA_ICON }}" style="font-size: {{ definition.FA_SIZE }}px;" aria-hidden="true"></i>
+{% else %}
+	<img src="{{ definition.IMAGE_SRC }}" width="{{ definition.IMAGE_WIDTH }}" height="{{ definition.IMAGE_HEIGHT }}" alt="" />
+{% endif %}
+{% endif %}{{ definition.TITLE }}{{ definition.C_BLOCK_H_R }}
 	<div class="post bg2 portal-no-margin">
 		<div class="inner">
 			<span><strong>{{ lang('NO_NEWS') }}</strong></span>
@@ -11,12 +17,21 @@
 {{ definition.C_BLOCK_F_L }}{{ definition.C_BLOCK_F_R }}
 {% else  %}
 {% if news_row.S_FIRST_ROW  %}
-{{ definition.CC_BLOCK_H_L }}
-	<dt id="n_{{ definition.MODULE_ID }}">{{ definition.TITLE }}</dt>
+{{ definition.CC_BLOCK_H_L }}{% if definition.S_BLOCK_ICON %}
+{% if definition.FA_ENABLED %}
+	<dt style="margin-top: 1px;" id="a_{{ definition.MODULE_ID }}"><i class="icon b3p-icon fa {{ definition.FA_ICON }}" style="font-size: {{ definition.FA_SIZE }}px;" aria-hidden="true"></i>&nbsp;{{ definition.TITLE }}</dt>
 	{% if news.S_DISPLAY_NEWS_RVS %}
 		<dd class="posts responsive-portal-news">{{ lang('REPLIES') }}</dd>
 		<dd class="views responsive-portal-news">{{ lang('VIEWS') }}</dd>
 	{% endif %}
+{% else %}
+	<dt style="margin-top: 0px;" id="a_{{ definition.MODULE_ID }}"><img src="{{ definition.IMAGE_SRC }}" width="{{ definition.IMAGE_WIDTH }}" height="{{ definition.IMAGE_HEIGHT }}" alt="" />&nbsp;{{ definition.TITLE }}</dt>
+	{% if news.S_DISPLAY_NEWS_RVS %}
+		<dd class="posts responsive-portal-news">{{ lang('REPLIES') }}</dd>
+		<dd class="views responsive-portal-news">{{ lang('VIEWS') }}</dd>
+	{% endif %}
+{% endif %}
+{% endif %}
 	<dd class="lastpost responsive-portal-news"><span>{{ lang('LAST_POST') }}</span></dd>
 {{ definition.CC_BLOCK_H_R }}
 <ul class="topiclist topics responsive-portal-news">
--- a/styles/prosilver/template/portal/modules/poll_center.html
+++ b/styles/prosilver/template/portal/modules/poll_center.html
@@ -1,4 +1,10 @@
-{{ definition.C_BLOCK_H_L }}{{ definition.TITLE }}{{ definition.C_BLOCK_H_R }}
+{{ definition.C_BLOCK_H_L }}{% if definition.S_BLOCK_ICON %}
+{% if definition.FA_ENABLED %}
+	<i class="icon b3p-icon fa {{ definition.FA_ICON }}" style="font-size: {{ definition.FA_SIZE }}px;" aria-hidden="true"></i>
+{% else %}
+	<img src="{{ definition.IMAGE_SRC }}" width="{{ definition.IMAGE_WIDTH }}" height="{{ definition.IMAGE_HEIGHT }}" alt="" />
+{% endif %}
+{% endif %}{{ definition.TITLE }}{{ definition.C_BLOCK_H_R }}
 	{% if S_HAS_B3P_POLL %}
 		<div id="viewpoll" class="panel bg1 portal-no-margin">
 			<div class="inner">
--- a/styles/prosilver/template/portal/modules/poll_side.html
+++ b/styles/prosilver/template/portal/modules/poll_side.html
@@ -1,6 +1,6 @@
 {{ definition.LR_BLOCK_H_L }}{% if definition.S_BLOCK_ICON %}
 {% if definition.FA_ENABLED %}
-<i class="icon fa {{ definition.FA_ICON }}" style="font-size: {{ definition.FA_SIZE }}px;" aria-hidden="true"></i>
+<i class="icon b3p-icon fa {{ definition.FA_ICON }}" style="font-size: {{ definition.FA_SIZE }}px;" aria-hidden="true"></i>
 {% else %}
 <img src="{{ definition.IMAGE_SRC }}" width="{{ definition.IMAGE_WIDTH }}" height="{{ definition.IMAGE_HEIGHT }}" alt="" />
 {% endif %}
--- a/styles/prosilver/template/portal/modules/random_member_side.html
+++ b/styles/prosilver/template/portal/modules/random_member_side.html
@@ -1,6 +1,6 @@
 {{ definition.LR_BLOCK_H_L }}{% if definition.S_BLOCK_ICON %}
 {% if definition.FA_ENABLED %}
-<i class="icon fa {{ definition.FA_ICON }}" style="font-size: {{ definition.FA_SIZE }}px;" aria-hidden="true"></i>
+<i class="icon b3p-icon fa {{ definition.FA_ICON }}" style="font-size: {{ definition.FA_SIZE }}px;" aria-hidden="true"></i>
 {% else %}
 <img src="{{ definition.IMAGE_SRC }}" width="{{ definition.IMAGE_WIDTH }}" height="{{ definition.IMAGE_HEIGHT }}" alt="" />
 {% endif %}
--- a/styles/prosilver/template/portal/modules/recent_center.html
+++ b/styles/prosilver/template/portal/modules/recent_center.html
@@ -1,5 +1,11 @@
 {% if loops.latest_announcements|length or loops.latest_hot_topics|length or loops.latest_topics|length %}
-{{ definition.C_BLOCK_H_L }}{{ definition.TITLE }}{{ definition.C_BLOCK_H_R }}
+{{ definition.C_BLOCK_H_L }}{% if definition.S_BLOCK_ICON %}
+{% if definition.FA_ENABLED %}
+	<i class="icon b3p-icon fa {{ definition.FA_ICON }}" style="font-size: {{ definition.FA_SIZE }}px;" aria-hidden="true"></i>
+{% else %}
+	<img src="{{ definition.IMAGE_SRC }}" width="{{ definition.IMAGE_WIDTH }}" height="{{ definition.IMAGE_HEIGHT }}" alt="" />
+{% endif %}
+{% endif %}{{ definition.TITLE }}{{ definition.C_BLOCK_H_R }}
 <div class="panel bg1 portal-no-margin">
 	<div class="inner">
 		<div class="portal-navigation">
--- a/styles/prosilver/template/portal/modules/search_side.html
+++ b/styles/prosilver/template/portal/modules/search_side.html
@@ -48,7 +48,7 @@ function qsearch_onSubmit()

 {{ definition.LR_BLOCK_H_L }}{% if definition.S_BLOCK_ICON %}
 {% if definition.FA_ENABLED %}
-<i class="icon fa {{ definition.FA_ICON }}" style="font-size: {{ definition.FA_SIZE }}px;" aria-hidden="true"></i>
+<i class="icon b3p-icon fa {{ definition.FA_ICON }}" style="font-size: {{ definition.FA_SIZE }}px;" aria-hidden="true"></i>
 {% else %}
 <img src="{{ definition.IMAGE_SRC }}" width="{{ definition.IMAGE_WIDTH }}" height="{{ definition.IMAGE_HEIGHT }}" alt="" />
 {% endif %}
--- a/styles/prosilver/template/portal/modules/statistics_side.html
+++ b/styles/prosilver/template/portal/modules/statistics_side.html
@@ -1,6 +1,6 @@
 {{ definition.LR_BLOCK_H_L }}{% if definition.S_BLOCK_ICON %}
 {% if definition.FA_ENABLED %}
-<i class="icon fa {{ definition.FA_ICON }}" style="font-size: {{ definition.FA_SIZE }}px;" aria-hidden="true"></i>
+<i class="icon b3p-icon fa {{ definition.FA_ICON }}" style="font-size: {{ definition.FA_SIZE }}px;" aria-hidden="true"></i>
 {% else %}
 <img src="{{ definition.IMAGE_SRC }}" width="{{ definition.IMAGE_WIDTH }}" height="{{ definition.IMAGE_HEIGHT }}" alt="" />
 {% endif %}
--- a/styles/prosilver/template/portal/modules/stylechanger_side.html
+++ b/styles/prosilver/template/portal/modules/stylechanger_side.html
@@ -1,7 +1,7 @@
 {% if S_STYLE_OPTIONS %}
 {{ definition.LR_BLOCK_H_L }}{% if definition.S_BLOCK_ICON %}
 {% if definition.FA_ENABLED %}
-	<i class="icon fa {{ definition.FA_ICON }}" style="font-size: {{ definition.FA_SIZE }}px;" aria-hidden="true"></i>
+	<i class="icon b3p-icon fa {{ definition.FA_ICON }}" style="font-size: {{ definition.FA_SIZE }}px;" aria-hidden="true"></i>
 {% else %}
 <img src="{{ definition.IMAGE_SRC }}" width="{{ definition.IMAGE_WIDTH }}" height="{{ definition.IMAGE_HEIGHT }}" alt="" />
 {% endif %}
--- a/styles/prosilver/template/portal/modules/topposters_side.html
+++ b/styles/prosilver/template/portal/modules/topposters_side.html
@@ -1,6 +1,6 @@
 {{ definition.LR_BLOCK_H_L }}{% if definition.S_BLOCK_ICON %}
 {% if definition.FA_ENABLED %}
-<i class="icon fa {{ definition.FA_ICON }}" style="font-size: {{ definition.FA_SIZE }}px;" aria-hidden="true"></i>
+<i class="icon b3p-icon fa {{ definition.FA_ICON }}" style="font-size: {{ definition.FA_SIZE }}px;" aria-hidden="true"></i>
 {% else %}
 <img src="{{ definition.IMAGE_SRC }}" width="{{ definition.IMAGE_WIDTH }}" height="{{ definition.IMAGE_HEIGHT }}" alt="" />
 {% endif %}
--- a/styles/prosilver/template/portal/modules/user_menu_side.html
+++ b/styles/prosilver/template/portal/modules/user_menu_side.html
@@ -1,6 +1,6 @@
 {{ definition.LR_BLOCK_H_L }}{% if definition.S_BLOCK_ICON %}
 {% if definition.FA_ENABLED %}
-<i class="icon fa {{ definition.FA_ICON }}" style="font-size: {{ definition.FA_SIZE }}px;" aria-hidden="true"></i>
+<i class="icon b3p-icon fa {{ definition.FA_ICON }}" style="font-size: {{ definition.FA_SIZE }}px;" aria-hidden="true"></i>
 {% else %}
 <img src="{{ definition.IMAGE_SRC }}" width="{{ definition.IMAGE_WIDTH }}" height="{{ definition.IMAGE_HEIGHT }}" alt="" />
 {% endif %}
--- a/styles/prosilver/template/portal/modules/welcome_center.html
+++ b/styles/prosilver/template/portal/modules/welcome_center.html
@@ -1,4 +1,10 @@
-{{ definition.C_BLOCK_H_L }}{{ definition.TITLE }}{{ definition.C_BLOCK_H_R }}
+{{ definition.C_BLOCK_H_L }}{% if definition.S_BLOCK_ICON %}
+{% if definition.FA_ENABLED %}
+	<i class="icon b3p-icon fa {{ definition.FA_ICON }}" style="font-size: {{ definition.FA_SIZE }}px;" aria-hidden="true"></i>
+{% else %}
+	<img src="{{ definition.IMAGE_SRC }}" width="{{ definition.IMAGE_WIDTH }}" height="{{ definition.IMAGE_HEIGHT }}" alt="" />
+{% endif %}
+{% endif %}{{ definition.TITLE }}{{ definition.C_BLOCK_H_R }}
 	<div class="panel bg1 portal-no-margin">
 		<div class="inner">
 			<div class="postbody portal-module-postbody">
--- a/styles/prosilver/template/portal/modules/whois_online_center.html
+++ b/styles/prosilver/template/portal/modules/whois_online_center.html
@@ -1,4 +1,10 @@
-{{ definition.C_BLOCK_H_L }}{% if U_VIEWONLINE %}<a href="{{ U_VIEWONLINE }}">{{ definition.TITLE }}</a>{% else %}{{ definition.TITLE }}{% endif %}{{ definition.C_BLOCK_H_R }}
+{{ definition.C_BLOCK_H_L }}{% if definition.S_BLOCK_ICON %}
+{% if definition.FA_ENABLED %}
+	<i class="icon b3p-icon fa {{ definition.FA_ICON }}" style="font-size: {{ definition.FA_SIZE }}px;" aria-hidden="true"></i>
+{% else %}
+	<img src="{{ definition.IMAGE_SRC }}" width="{{ definition.IMAGE_WIDTH }}" height="{{ definition.IMAGE_HEIGHT }}" alt="" />
+{% endif %}
+{% endif %}{% if U_VIEWONLINE %}<a href="{{ U_VIEWONLINE }}">{{ definition.TITLE }}</a>{% else %}{{ definition.TITLE }}{% endif %}{{ definition.C_BLOCK_H_R }}
 	<ul class="topiclist bg1">
 		<li>
 			<dl>
--- a/styles/prosilver/theme/portal.css
+++ b/styles/prosilver/theme/portal.css
@@ -12,6 +12,10 @@ ul {
 	list-style-type: disc;
 }

+.b3p-icon {
+	vertical-align: sub;
+}
+
 .portal-navigation{
 	width: auto;
 }