[ticket/690] Add Kirk's changes from 3.3.x version

B3P-690
2021-08-27 21:20:47 +02:00
parent 12acc2191d
commit ea527c580c
27 changed files with 122 additions and 57 deletions
--- a/acp/portal_module.php
+++ b/acp/portal_module.php
@@ -125,7 +125,7 @@ class portal_module

 						if (!($this->c_class = $this->portal_helper->get_module($module_data['module_classname'])))
 						{
-							continue;
+							break;
 						}

 						// Load module language
@@ -445,7 +445,7 @@ class portal_module

 						if (!($this->c_class = $this->portal_helper->get_module($module_classname)))
 						{
-							continue;
+							break;
 						}

 						// Do not add modules that shouldn't be added
--- a/config/routing.yml
+++ b/config/routing.yml
@@ -1,6 +1,7 @@
 board3_portal_controller:
    path: /portal
-    defaults: { _controller: board3.portal.main:handle }
+    defaults:
+        _controller: 'board3.portal.main:handle'

 # This is currently not supported yet
 # board3_portal_pages_controller:
@@ -10,4 +11,5 @@ board3_portal_controller:
 # Redirect to portal by default
 board3_portal_redirect_controller:
    path: /
-    defaults: { _controller: board3.portal.main:handle }
+    defaults:
+        _controller: 'board3.portal.main:handle'
--- a/config/services.yml
+++ b/config/services.yml
@@ -2,9 +2,8 @@ imports:
    - { resource: modules.yml }

 parameters:
-    board3.portal.config.table: %core.table_prefix%portal_config
-    board3.portal.modules.table: %core.table_prefix%portal_modules
-
+    board3.portal.config.table: '%core.table_prefix%portal_config'
+    board3.portal.modules.table: '%core.table_prefix%portal_modules'
 services:
    board3.portal.main:
        class: board3\portal\controller\main
--- a/includes/functions.php
+++ b/includes/functions.php
@@ -173,7 +173,7 @@ function generate_portal_pagination($base_url, $num_items, $per_page, $start_ite
 	$on_page = floor($start_item / $per_page) + 1;
 	$url_delim = (strpos($base_url, '?') === false) ? '?' : '&amp;';

-	$page_string = ($on_page == 1) ? '<ul><li class="active"><span>1</span></li>' : '<ul><li><a href="' . $base_url . $anker .'" role="button">1</a></li>';
+	$page_string = ($on_page == 1) ? '<ul><li class="active"><span>1</span></li>' : '<ul><li><a class="button" href="' . $base_url . $anker .'" role="button">1</a></li>';

 	if ($total_pages > 5)
 	{
@@ -185,7 +185,7 @@ function generate_portal_pagination($base_url, $num_items, $per_page, $start_ite

 		for ($i = $start_cnt + 1; $i < $end_cnt; ++$i)
 		{
-			$page_string .= ($i == $on_page) ? '<li class="active"><span>' . $i . '</span></li>' : '<li><a href="' . $base_url . "{$url_delim}" . $pagination_type . '=' . (($i - 1) * $per_page) . $anker . '" role="button">' . $i . '</a></li>';
+			$page_string .= ($i == $on_page) ? '<li class="active"><span>' . $i . '</span></li>' : '<li><a class="button" href="' . $base_url . "{$url_delim}" . $pagination_type . '=' . (($i - 1) * $per_page) . $anker . '" role="button">' . $i . '</a></li>';
 			if ($i < $end_cnt - 1)
 			{
 				$page_string .= $seperator;
@@ -201,25 +201,25 @@ function generate_portal_pagination($base_url, $num_items, $per_page, $start_ite

 		for ($i = 2; $i < $total_pages; ++$i)
 		{
-			$page_string .= ($i == $on_page) ? '<li class="active"><span>' . $i . '</span></li>' : '<li><a href="' . $base_url . "{$url_delim}" . $pagination_type . '=' . (($i - 1) * $per_page) . $anker . '" role="button">' . $i . '</a></li>';
+			$page_string .= ($i == $on_page) ? '<li class="active"><span>' . $i . '</span></li>' : '<li><a class="button" href="' . $base_url . "{$url_delim}" . $pagination_type . '=' . (($i - 1) * $per_page) . $anker . '" role="button">' . $i . '</a></li>';
 			if ($i < $total_pages)
 			{
 				$page_string .= $seperator;
 			}
 		}
 	}
-	$page_string .= ($on_page == $total_pages) ? '<li class="active"><span>' . $total_pages . '</span></li></ul>' : '<li><a href="' . $base_url . "{$url_delim}" . $pagination_type . '=' . (($total_pages - 1) * $per_page) . $anker . '" role="button">' . $total_pages . '</a></li></ul>';
+	$page_string .= ($on_page == $total_pages) ? '<li class="active"><span>' . $total_pages . '</span></li></ul>' : '<li><a class="button" href="' . $base_url . "{$url_delim}" . $pagination_type . '=' . (($total_pages - 1) * $per_page) . $anker . '" role="button">' . $total_pages . '</a></li></ul>';

 	if ($add_prevnext_text)
 	{
 		if ($on_page != 1)
 		{
-			$page_string = '<a href="' . $base_url . "{$url_delim}" . $pagination_type . '=' . (($on_page - 2) * $per_page) . $anker . '" role="button">' . $user->lang['PREVIOUS'] . '</a>&nbsp;&nbsp;' . $page_string;
+			$page_string = '<a class="button" href="' . $base_url . "{$url_delim}" . $pagination_type . '=' . (($on_page - 2) * $per_page) . $anker . '" role="button">' . $user->lang['PREVIOUS'] . '</a>&nbsp;&nbsp;' . $page_string;
 		}

 		if ($on_page != $total_pages)
 		{
-			$page_string .= '&nbsp;&nbsp;<a href="' . $base_url . "{$url_delim}" . $pagination_type . '=' . ($on_page * $per_page) . $anker . '" role="button">' . $user->lang['NEXT'] . '</a>';
+			$page_string .= '&nbsp;&nbsp;<a class="button" href="' . $base_url . "{$url_delim}" . $pagination_type . '=' . ($on_page * $per_page) . $anker . '" role="button">' . $user->lang['NEXT'] . '</a>';
 		}
 	}

--- a/language/de/modules/portal_search_module.php
+++ b/language/de/modules/portal_search_module.php
@@ -38,5 +38,5 @@ $lang = array_merge($lang, array(
 	'PORTAL_SEARCH_POSTS'	=> 'Beiträge',
 	'PORTAL_SEARCH_AUTHOR'	=> 'Autor',
 	'PORTAL_SEARCH_ENGINE'	=> 'Suchmaschinen',
-	'PORTAL_SEARCH_ADV'		=> 'erweiterte Suche',
+	'PORTAL_SEARCH_ADV'		=> 'Erweiterte Suche',
 ));
--- 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"><span class="portal-arrow-left-icon" title="' . $this->user->lang['VIEW_PREVIOUS_MONTH'] . '"></span></a>';
-		$next_month = '<a href="' . $this->modules_helper->route('board3_portal_controller') . "?m$module_id=$up#minical$module_id" . '" rel="nofollow"><span class="portal-arrow-right-icon" title="' . $this->user->lang['VIEW_NEXT_MONTH'] . '"></span></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
@@ -307,7 +307,7 @@ class custom extends module_base
 			default:
 				if (!isset($custom_code))
 				{
-					$custom_code = generate_text_for_edit($portal_config['board3_custom_' . $module_id . '_code'], $this->config['board3_custom_' . $module_id . '_uid'], '');
+					$custom_code = generate_text_for_edit($portal_config['board3_custom_' . $module_id . '_code'], $this->config['board3_custom_' . $module_id . '_uid'], 0);
 				}

 				$this->template->assign_vars(array(
--- a/styles/prosilver/template/event/overall_footer_breadcrumb_prepend.html
+++ b/styles/prosilver/template/event/overall_footer_breadcrumb_prepend.html
@@ -1 +1 @@
-<!-- IF U_PORTAL --><span class="crumb"><a href="{U_PORTAL}" data-navbar-reference="portal">{L_PORTAL}</a></span><!-- ENDIF -->
+<!-- IF U_PORTAL --><span class="crumb"><a href="{U_PORTAL}" data-navbar-reference="portal"><i class="icon fa-university fa-fw" aria-hidden="true"></i><span>{L_PORTAL}</span></a></span><!-- ENDIF -->
--- a/styles/prosilver/template/event/overall_header_breadcrumb_prepend.html
+++ b/styles/prosilver/template/event/overall_header_breadcrumb_prepend.html
@@ -1 +1 @@
-<!-- IF U_PORTAL --><span class="crumb"><a href="{U_PORTAL}" data-navbar-reference="portal">{L_PORTAL}</a></span><!-- ENDIF -->
+<!-- IF U_PORTAL --><span class="crumb"><a href="{U_PORTAL}" data-navbar-reference="portal"><i class="icon fa-university fa-fw" aria-hidden="true"></i><span>{L_PORTAL}</span></a></span><!-- ENDIF -->
--- a/styles/prosilver/template/portal/modules/announcements_center.html
+++ b/styles/prosilver/template/portal/modules/announcements_center.html
@@ -18,7 +18,7 @@
             </h4>
             <!-- IF announcements.center_row.PAGINATION --><strong class="pagination"><span>{announcements.center_row.PAGINATION}</span></strong><!-- ENDIF -->
             <ul class="linklist">
-                <li>{L_POSTED} {L_POST_BY_AUTHOR}{L_COLON} {announcements.center_row.POSTER_FULL} &raquo; {announcements.center_row.TIME}</li>
+				<li>{L_POSTED} {L_POST_BY_AUTHOR}{L_COLON} {announcements.center_row.POSTER_FULL} &raquo; <a href="{announcements.center_row.U_LAST_COMMENTS}" title="{L_GOTO_LAST_POST}"> {announcements.center_row.TIME}</a></li>
                <li class="rightside"><!-- IF announcements.center_row.FORUM_NAME -->{L_FORUM}{L_COLON} <strong><a href="{announcements.center_row.U_VIEWFORUM}">{announcements.center_row.FORUM_NAME}</a></strong><!-- ELSE -->{L_GLOBAL_ANNOUNCEMENT}<!-- ENDIF --></li>
             </ul>
             <!-- IF not $S_POSTBODY_TOP --><div class="postbody portal-module-postbody"><!-- ENDIF -->
--- a/styles/prosilver/template/portal/modules/announcements_center_compact.html
+++ b/styles/prosilver/template/portal/modules/announcements_center_compact.html
@@ -42,9 +42,13 @@
 						</ul>
 					</div>
 					<!-- ENDIF -->
+					<!-- IF not S_IS_BOT -->
 						<div class="responsive-show" style="display: none;">
-							{L_LAST_POST} {L_POST_BY_AUTHOR} {announcements.center_row.USERNAME_FULL_LAST} &raquo; <a href="{announcements.center_row.U_LAST_COMMENTS}" title="{L_GOTO_LAST_POST}" title="{L_VIEW_LATEST_POST}"> {announcements.center_row.LAST_POST_TIME}</a>
+							{L_LAST_POST} {L_POST_BY_AUTHOR} {announcements.center_row.USERNAME_FULL_LAST} &raquo; <a href="{announcements.center_row.U_LAST_COMMENTS}" title="{L_GOTO_LAST_POST}"> {announcements.center_row.LAST_POST_TIME}</a>
 						</div>
+					<!-- ELSE -->
+					<br />
+					<!-- ENDIF -->

 						<div class="responsive-hide">
 							<!-- IF announcements.center_row.ATTACH_ICON_IMG --><i class="icon fa-paperclip fa-fw" aria-hidden="true"></i><!-- ENDIF -->
@@ -64,8 +68,8 @@
 				<dd class="posts">{announcements.center_row.REPLIES} <dfn>{L_REPLIES}</dfn></dd>
 				<dd class="views">{announcements.center_row.TOPIC_VIEWS} <dfn>{L_VIEWS}</dfn></dd>
 			<!-- ENDIF -->
-			<dd class="lastpost"><span><dfn>{L_LAST_POST}</dfn>{L_POST_BY_AUTHOR} {announcements.center_row.USERNAME_FULL_LAST} <!-- IF announcements.center_row.S_UNREAD_INFO --><a href="{announcements.center_row.U_VIEW_UNREAD}" title="{L_VIEW_NEWEST_POST}"><i class="icon fa-external-link-square fa-fw icon-red icon-md" aria-hidden="true"></i><span class="sr-only">{L_VIEW_LATEST_POST}</span></a><!-- ELSE --><a href="{announcements.center_row.U_LAST_COMMENTS}" title="{L_VIEW_LATEST_POST}"><i class="icon fa-external-link-square fa-fw icon-lightgray icon-md" aria-hidden="true"></i><span class="sr-only">{L_VIEW_LATEST_POST}</span></a><!-- ENDIF --><br />
-				{announcements.center_row.LAST_POST_TIME}</span>
+			<dd class="lastpost"><span><dfn>{L_LAST_POST}</dfn>{L_POST_BY_AUTHOR} {announcements.center_row.USERNAME_FULL_LAST} <!-- IF not S_IS_BOT --><!-- IF announcements.center_row.S_UNREAD_INFO --><a href="{announcements.center_row.U_VIEW_UNREAD}" title="{L_VIEW_NEWEST_POST}"><i class="icon fa-external-link-square fa-fw icon-red icon-md" aria-hidden="true"></i><span class="sr-only">{L_VIEW_LATEST_POST}</span></a><!-- ELSE --><a href="{announcements.center_row.U_LAST_COMMENTS}" title="{L_VIEW_LATEST_POST}"><i class="icon fa-external-link-square fa-fw icon-lightgray icon-md" aria-hidden="true"></i><span class="sr-only">{L_VIEW_LATEST_POST}</span></a><!-- ENDIF --><br />
+				{announcements.center_row.LAST_POST_TIME}</span><!-- ENDIF -->
 			</dd>
 		</dl>
 	</li>
@@ -74,6 +78,7 @@
 	<li class="row<!-- IF announcements.center_row.S_ROW_COUNT is even --> bg2<!-- ELSE --> bg1<!-- ENDIF --> portal-news-pagination">
 		<div class="topic-actions">
 			<div class="pagination">
+				<span><i class="icon fa-clone fa-fw" aria-hidden="true"></i></span>
 				{announcements.TOTAL_ANNOUNCEMENTS}
 				<!-- IF announcements.AP_PAGE_NUMBER --><!-- IF announcements.AP_PAGINATION --> &bull; {announcements.AP_PAGE_NUMBER} &bull; {announcements.AP_PAGINATION}<!-- ELSE --> &bull; {announcements.AP_PAGE_NUMBER}<!-- ENDIF --><!-- ENDIF --> &nbsp;
 			</div>
--- a/styles/prosilver/template/portal/modules/friends_side.html
+++ b/styles/prosilver/template/portal/modules/friends_side.html
@@ -1,7 +1,7 @@
 {$LR_BLOCK_H_L}<!-- IF $S_BLOCK_ICON --><img src="{$IMAGE_SRC}" width="{$IMAGE_WIDTH}" height="{$IMAGE_HEIGHT}" alt="" />&nbsp;<!-- ENDIF -->{$TITLE}{$LR_BLOCK_H_R}
 	<strong style="color:green<!-- IF S_CONTENT_DIRECTION eq 'rtl' -->; float: right;<!-- ENDIF -->">{L_FRIENDS_ONLINE}</strong><br />
 	<!-- BEGIN b3p_friends_online -->
-        <span class="portal-user-icon"></span><span class="portal-user-span">{b3p_friends_online.USERNAME_FULL}</span><br class="portal-clear" />
+		<span class="portal-user-icon"></span><span class="portal-user-span"><i class="icon fa-user fa-fw" aria-hidden="true"></i><span>{b3p_friends_online.USERNAME_FULL}</span</span><br class="portal-clear" />
    <!-- BEGINELSE -->
        <span class="portal-user-span">{L_NO_FRIENDS_ONLINE}</span>
        <br class="portal-clear" />
@@ -9,7 +9,7 @@
 		<br class="portal-clear" />
 		<strong style="color:red<!-- IF S_CONTENT_DIRECTION eq 'rtl' -->; float: right;<!-- ENDIF -->">{L_FRIENDS_OFFLINE}</strong><br />
 	<!-- BEGIN b3p_friends_offline -->
-        <span class="portal-user-icon"></span><span class="portal-user-span"><i class="icon fa-user fa-fw" aria-hidden="true"></i>{b3p_friends_offline.USERNAME_FULL}</span><br class="portal-clear" />
+		<span class="portal-user-icon"></span><span class="portal-user-span"><i class="icon fa-user fa-fw" aria-hidden="true"></i><span>{b3p_friends_offline.USERNAME_FULL}</span></span><br class="portal-clear" />
    <!-- BEGINELSE -->
        <span class="portal-user-span">{L_NO_FRIENDS_OFFLINE}</span>
    <!-- END b3p_friends_offline -->
--- a/styles/prosilver/template/portal/modules/login_box_side.html
+++ b/styles/prosilver/template/portal/modules/login_box_side.html
@@ -17,6 +17,8 @@
 	<br />
 	<input type="hidden" name="redirect" value="{U_PORTAL_REDIRECT}" />
 	<input type="submit" name="login" tabindex="5" value="{L_LOGIN}" class="button1" />
+	{S_LOGIN_REDIRECT}
+	{S_FORM_TOKEN_LOGIN}
 {$LR_BLOCK_F_L}{$LR_BLOCK_F_R}
 </div>
-</form>
+</form>
--- a/styles/prosilver/template/portal/modules/news_center.html
+++ b/styles/prosilver/template/portal/modules/news_center.html
@@ -3,7 +3,6 @@
 	<!-- BEGIN news -->
 	<!-- IF news.MODULE_ID eq $MODULE_ID -->
 	<!-- BEGIN news_row -->
-		<!-- IF news.news_row.S_FIRST_ROW --><a id="n_{$MODULE_ID}"></a><!-- ENDIF -->
 		<!-- IF news.news_row.S_NO_TOPICS  -->
 			<div class="post bg2">
 				<div class="inner">
@@ -13,10 +12,15 @@
 		<!-- ELSE -->
 			<div class="post <!-- IF news.news_row.S_ROW_COUNT is odd -->bg1<!-- ELSE -->bg2<!-- ENDIF -->">
 				<div class="inner">
-					<h4 class="first"><a id="n_{$MODULE_ID}_{news.news_row.N_ID}"></a><!-- IF news.news_row.S_UNREAD_INFO --><a href="{news.news_row.U_VIEW_UNREAD}">{NEWEST_POST_IMG}</a><!-- ELSE --><a href="{news.news_row.U_LAST_COMMENTS}">{READ_POST_IMG}</a><!-- ENDIF --> {news.news_row.ATTACH_ICON_IMG} <!-- IF news.news_row.S_POLL --><strong>{L_VIEW_TOPIC_POLL}</strong><!-- ENDIF --><!-- IF news.news_row.TOPIC_ICON_IMG --><img src="{T_ICONS_PATH}{news.news_row.TOPIC_ICON_IMG}" width="{news.news_row.TOPIC_ICON_IMG_WIDTH}" height="{news.news_row.TOPIC_ICON_IMG_HEIGHT}" alt="" /> <!-- ENDIF --><a href="{news.news_row.U_VIEW_COMMENTS}"><strong>{news.news_row.TITLE}</strong></a></h4>
+					<h4 class="first">
+						<a id="n_{$MODULE_ID}_{news.news_row.N_ID}"></a><!-- IF news.news_row.S_UNREAD_INFO --><a href="{news.news_row.U_VIEW_UNREAD}" title="{postrow.MINI_POST}"><!-- ELSE --><a href="{news.news_row.U_LAST_COMMENTS}"><!-- ENDIF -->
+							<i class="icon fa-file fa-fw <!-- IF news.news_row.S_UNREAD_INFO -->icon-red<!-- ELSE -->icon-lightgray<!-- ENDIF --> icon-md" aria-hidden="true"></i><span class="sr-only">{postrow.MINI_POST}</span>
+						</a>
+					<!-- IF news.news_row.S_UNREAD_INFO --><a class="unread" href="{news.news_row.U_VIEW_UNREAD}" title="{postrow.MINI_POST}"></a><!-- ELSE --><a href="{news.news_row.U_LAST_COMMENTS}"></a><!-- ENDIF --><!-- IF news.news_row.TOPIC_ICON_IMG --><img src="{T_ICONS_PATH}{news.news_row.POST_ICON_IMG}" width="{news.news_row.POST_ICON_IMG_WIDTH}" height="{news.news_row.POST_ICON_IMG_HEIGHT}" alt="" /> <!-- ENDIF --><a href="{news.news_row.U_VIEW_COMMENTS}"><strong>{news.news_row.TITLE}</strong></a>
+					</h4>
 					<!-- IF news.news_row.PAGINATION --><strong class="pagination"><span>{news.news_row.PAGINATION}</span></strong><!-- ENDIF -->
 						<ul class="linklist">
-							<li>{news.POSTED_BY_TEXT} {L_POST_BY_AUTHOR}{L_COLON} {news.news_row.POSTER_FULL} &raquo; {news.news_row.TIME}</li>
+							<li>{news.POSTED_BY_TEXT} {L_POST_BY_AUTHOR}{L_COLON} {news.news_row.POSTER_FULL} &raquo; <a href="{news.news_row.U_LAST_COMMENTS}" title="{L_GOTO_LAST_POST}"> {news.news_row.TIME}</a></li>
 							<li class="rightside">{L_FORUM}{L_COLON} <strong><a href="{news.news_row.U_VIEWFORUM}">{news.news_row.FORUM_NAME}</a></strong></li>
 						</ul>
 						<!-- IF not $S_POSTBODY_TOP --><div class="postbody portal-module-postbody"><!-- ENDIF -->
@@ -34,7 +38,12 @@
 					<br class="portal-clear" />
 					<span class="portal-title-span">{L_TOPIC_VIEWS}{L_COLON} {news.news_row.TOPIC_VIEWS} &nbsp;&bull;&nbsp; <a href="{news.news_row.U_VIEW_COMMENTS}" title="{L_VIEW_COMMENTS}">{L_COMMENTS}{L_COLON} {news.news_row.REPLIES}</a> &nbsp;&bull;&nbsp; <a href="{news.news_row.U_POST_COMMENT}">{L_PORTAL_POST_REPLY}</a></span>
 					<span class="portal-read-all-link">{news.news_row.OPEN}<a href="{news.news_row.U_READ_FULL}">{news.news_row.L_READ_FULL}</a>{news.news_row.CLOSE}</span>
-					<div class="back2top"><a href="#wrap" class="top" title="{L_BACK_TO_TOP}">{L_BACK_TO_TOP}</a></div>
+					<div class="back2top">
+						<a href="#top" class="top" title="{L_BACK_TO_TOP}">
+							<i class="icon fa-chevron-circle-up fa-fw icon-gray" aria-hidden="true"></i>
+							<span class="sr-only">{L_BACK_TO_TOP}</span>
+						</a>
+					</div>
 					<!-- IF news.news_row.S_NOT_LAST --><br class="portal-clear" /><!-- ENDIF -->
 					<!-- IF news.news_row.S_LAST_ROW -->
 					<!-- IF not news.news_row.S_NO_TOPICS  -->
--- a/styles/prosilver/template/portal/modules/news_compact_center.html
+++ b/styles/prosilver/template/portal/modules/news_compact_center.html
@@ -42,14 +42,18 @@
 						</ul>
 					</div>
 					<!-- ENDIF -->
+					<!-- IF not S_IS_BOT -->
 						<div class="responsive-show" style="display: none;">
-							{L_LAST_POST} {L_POST_BY_AUTHOR} {news.news_row.USERNAME_FULL_LAST} &raquo; <a href="{news.news_row.U_LAST_COMMENTS}" title="{L_GOTO_LAST_POST}" title="{L_VIEW_LATEST_POST}"> {news.news_row.LAST_POST_TIME}</a>
+							{L_LAST_POST} {L_POST_BY_AUTHOR} {news.news_row.USERNAME_FULL_LAST} &raquo; <a href="{news.news_row.U_LAST_COMMENTS}" title="{L_GOTO_LAST_POST}"> {news.news_row.LAST_POST_TIME}</a>
 						</div>
+					<!-- ELSE -->
+					<br />
+					<!-- ENDIF -->

 						<div class="responsive-hide">
 							<!-- IF news.news_row.ATTACH_ICON_IMG --><i class="icon fa-paperclip fa-fw" aria-hidden="true"></i><!-- ENDIF -->
-							<!-- IF news.news_row.S_POLL --> <i class="icon fa-bar-chart fa-fw" aria-hidden="true"></i> <!-- ENDIF -->
-							{L_POST_BY_AUTHOR} {news.news_row.POSTER_FULL} &raquo; {news.news_row.TIME}
+							<!-- IF news.news_row.S_POLL --><i class="icon fa-bar-chart fa-fw" aria-hidden="true"></i> <!-- ENDIF -->
+							{L_POSTED} {L_POST_BY_AUTHOR} {news.news_row.POSTER_FULL} &raquo; {news.news_row.TIME}
 						</div>
 					<!-- IF news.news_row.FORUM_NAME -->
 						{L_FORUM}{L_COLON} <a href="{news.news_row.U_VIEWFORUM}" class="portal-forumtitle">{news.news_row.FORUM_NAME}</a>
@@ -61,8 +65,8 @@
 				<dd class="posts" data-skip-responsive="true">{news.news_row.REPLIES} <dfn>{L_REPLIES}</dfn></dd>
 				<dd class="views" data-skip-responsive="true">{news.news_row.TOPIC_VIEWS} <dfn>{L_VIEWS}</dfn></dd>
 			<!-- ENDIF -->
-			<dd class="lastpost"><span><dfn>{L_LAST_POST}</dfn>{L_POST_BY_AUTHOR} {news.news_row.USERNAME_FULL_LAST} <!-- IF news.news_row.S_UNREAD_INFO --><a href="{news.news_row.U_VIEW_UNREAD}" title="{L_VIEW_NEWEST_POST}"><i class="icon fa-external-link-square fa-fw icon-red icon-md" aria-hidden="true"></i><span class="sr-only">{L_VIEW_LATEST_POST}</span></a><!-- ELSE --><a href="{news.news_row.U_LAST_COMMENTS}" title="{L_VIEW_LATEST_POST}"><i class="icon fa-external-link-square fa-fw icon-lightgray icon-md" aria-hidden="true"></i><span class="sr-only">{L_VIEW_LATEST_POST}</span></a><!-- ENDIF --><br />
-				{news.news_row.LAST_POST_TIME}</span>
+			<dd class="lastpost"><span><dfn>{L_LAST_POST}</dfn>{L_POST_BY_AUTHOR} {news.news_row.USERNAME_FULL_LAST} <!-- IF not S_IS_BOT --><!-- IF news.news_row.S_UNREAD_INFO --><a href="{news.news_row.U_VIEW_UNREAD}" title="{L_VIEW_NEWEST_POST}"><i class="icon fa-external-link-square fa-fw icon-red icon-md" aria-hidden="true"></i><span class="sr-only">{L_VIEW_LATEST_POST}</span></a><!-- ELSE --><a href="{news.news_row.U_LAST_COMMENTS}" title="{L_VIEW_LATEST_POST}"><i class="icon fa-external-link-square fa-fw icon-lightgray icon-md" aria-hidden="true"></i><span class="sr-only">{L_VIEW_LATEST_POST}</span></a><!-- ENDIF --><br />
+				{news.news_row.LAST_POST_TIME}</span><!-- ENDIF -->
 			</dd>
 		</dl>
 	</li>
--- a/styles/prosilver/template/portal/modules/random_member_side.html
+++ b/styles/prosilver/template/portal/modules/random_member_side.html
@@ -1,7 +1,7 @@
 {$LR_BLOCK_H_L}<!-- IF $S_BLOCK_ICON --><img src="{$IMAGE_SRC}" width="{$IMAGE_WIDTH}" height="{$IMAGE_HEIGHT}" alt="" />&nbsp;<!-- ENDIF -->{$TITLE}{$LR_BLOCK_H_R}
 <!-- BEGIN random_member -->
 	<div class="portal-centered-content"><span class="portal-random-member-name">{random_member.USERNAME_FULL}</span><br class="portal-clear" />
-		<!-- IF random_member.AVATAR_IMG --><a href="{random_member.U_VIEW_PROFILE}">{random_member.AVATAR_IMG}</a><br class="portal-clear" /><!-- ENDIF -->
+		<!-- IF random_member.AVATAR_IMG --><a href="{random_member.U_VIEW_PROFILE}">{random_member.AVATAR_IMG}</a><!-- ELSEIF $NO_AVATAR_IMG --><a href="{random_member.U_VIEW_PROFILE}"><img src="{T_THEME_PATH}{$NO_AVATAR_IMG}" alt="" /></a><br class="portal-clear" /><!-- ENDIF -->
 		<!-- IF random_member.RANK_TITLE --><span class="gensmall">{random_member.RANK_TITLE}</span><br class="portal-clear" /><!-- ENDIF -->
 		<!-- IF random_member.RANK_IMG -->{random_member.RANK_IMG}<br class="portal-clear" /><!-- ENDIF -->
 	</div>
--- a/styles/prosilver/template/portal/modules/search_side.html
+++ b/styles/prosilver/template/portal/modules/search_side.html
@@ -49,7 +49,7 @@ function qsearch_onSubmit()
 {$LR_BLOCK_H_L}<!-- IF $S_BLOCK_ICON --><img src="{$IMAGE_SRC}" width="{$IMAGE_WIDTH}" height="{$IMAGE_HEIGHT}" alt="" />&nbsp;<!-- ENDIF -->{$TITLE}{$LR_BLOCK_H_R}
 	<form id="qsearch_form" method="post" action="{U_SEARCH}" onsubmit="return qsearch_onSubmit();">
 	<p>
-		<input type="text" tabindex="6" name="keywords" id="searchfield" maxlength="40" title="{L_SEARCH_KEYWORDS}" class="inputbox search autowidth" value="<!-- IF SEARCH_WORDS-->{SEARCH_WORDS}<!-- ELSE -->{L_SEARCH_MINI}<!-- ENDIF -->" onclick="if(this.value=='{LA_SEARCH_MINI}')this.value='';" onblur="if(this.value=='')this.value='{LA_SEARCH_MINI}';" />
+		<input type="text" tabindex="6" name="keywords" id="searchfield" maxlength="40" title="{L_SEARCH_KEYWORDS}" class="inputbox search icon_portal_search" value="<!-- IF SEARCH_WORDS-->{SEARCH_WORDS}<!-- ELSE -->{L_SEARCH_MINI}<!-- ENDIF -->" onclick="if(this.value=='{LA_SEARCH_MINI}')this.value='';" onblur="if(this.value=='')this.value='{LA_SEARCH_MINI}';" />
 	</p>
 	<p>
 	<select id="qsearch_select" tabindex="7">
@@ -73,4 +73,4 @@ function qsearch_onSubmit()
 	</p>
 	</form>
 	<p><a href="{U_SEARCH}">{L_PORTAL_SEARCH_ADV}</a></p>
-{$LR_BLOCK_F_L}{$LR_BLOCK_F_R}
+{$LR_BLOCK_F_L}{$LR_BLOCK_F_R}
--- a/styles/prosilver/template/portal/modules/whois_online_center.html
+++ b/styles/prosilver/template/portal/modules/whois_online_center.html
@@ -1,10 +1,17 @@
 {$C_BLOCK_H_L}<!-- IF U_VIEWONLINE --><a href="{U_VIEWONLINE}">{$TITLE}</a><!-- ELSE -->{$TITLE}<!-- ENDIF -->{$C_BLOCK_H_R}
 	<ul class="topiclist bg1">
-		<li><dl><dt></dt>
+		<li>
+			<dl>
+				<dt></dt>
 			<dd class="portal-whois-online-content portal-responsive-show">
-				<p>{TOTAL_USERS_ONLINE} ({L_ONLINE_EXPLAIN})<br />{RECORD_USERS}<br /> <br />{LOGGED_IN_USER_LIST}
-				<!-- IF PORTAL_LEGEND --><br /><em>{L_LEGEND}{L_COLON} {PORTAL_LEGEND}</em><!-- ENDIF --></p>
+						<p>{TOTAL_USERS_ONLINE} ({L_ONLINE_EXPLAIN})<br />{RECORD_USERS}<br />
+							<!-- IF U_VIEWONLINE -->
+								<br />{LOGGED_IN_USER_LIST}
+								<!-- IF PORTAL_LEGEND --><br /><em>{L_LEGEND}{L_COLON} {PORTAL_LEGEND}</em><!-- ENDIF -->
+							<!-- ENDIF -->
+						</p>
 			</dd>
-		</dl></li>
+			</dl>
+		</li>
 	</ul>
-{$C_BLOCK_F_L}{$C_BLOCK_F_R}
+{$C_BLOCK_F_L}{$C_BLOCK_F_R}
--- a/styles/prosilver/template/portal/modules/whois_online_side.html
+++ b/styles/prosilver/template/portal/modules/whois_online_side.html
@@ -1,5 +1,9 @@
 {$LR_BLOCK_H_L}<!-- IF $S_BLOCK_ICON --><img src="{$IMAGE_SRC}" width="{$IMAGE_WIDTH}" height="{$IMAGE_HEIGHT}" alt="" />&nbsp;<!-- ENDIF --><!-- IF U_VIEWONLINE --><a href="{U_VIEWONLINE}">{$TITLE}</a><!-- ELSE -->{$TITLE}<!-- ENDIF -->{$LR_BLOCK_H_R}
 <div class="portal-whois-online-content">
-	<p>{TOTAL_USERS_ONLINE}<br /> <br />{LOGGED_IN_USER_LIST}</p>
+	<p>{TOTAL_USERS_ONLINE}<br />
+		<!-- IF U_VIEWONLINE -->
+			<br />{LOGGED_IN_USER_LIST}
+		<!-- ENDIF -->
+	</p>
 </div>
 {$LR_BLOCK_F_L}{$LR_BLOCK_F_R}
--- a/styles/prosilver/template/portal/portal_body.html
+++ b/styles/prosilver/template/portal/portal_body.html
@@ -101,7 +101,7 @@
 </div>

 <!--// board3 Portal by www.board3.de //-->
-<div class="copyright">Powered by <a href="http://www.board3.de/">Board3 Portal</a> &copy; 2009 - 2015 Board3 Group</div>
+<div class="copyright b3p-copyright">Powered by <a href="http://www.board3.de/">Board3 Portal</a> &copy; 2009 - 2021 Board3 Group</div>

 <!-- INCLUDEJS portal/assets/jquery.getscrollbarwidth.js -->
 <!-- INCLUDEJS portal/assets/portal.js -->
--- a/styles/prosilver/theme/images/portal/arrowbullet.gif
+++ b/styles/prosilver/theme/images/portal/arrowbullet.gif
--- a/styles/prosilver/theme/images/portal/arrowbullet_rtl.gif
+++ b/styles/prosilver/theme/images/portal/arrowbullet_rtl.gif
--- a/styles/prosilver/theme/images/portal/icon_portal_search.png
+++ b/styles/prosilver/theme/images/portal/icon_portal_search.png
--- a/styles/prosilver/theme/images/portal/icon_topic_attach.gif
+++ b/styles/prosilver/theme/images/portal/icon_topic_attach.gif
--- a/styles/prosilver/theme/images/portal/portal_weather.png
+++ b/styles/prosilver/theme/images/portal/portal_weather.png
--- a/styles/prosilver/theme/portal.css
+++ b/styles/prosilver/theme/portal.css
@@ -1,5 +1,17 @@
 /* main menu, user menu and the links */

+.content li {
+	list-style-type: inherit !important;
+}
+
+a {
+	display: inline-block;
+}
+
+ul {
+	list-style-type: disc !important;
+}
+
 .portal-navigation{
 	width: auto;
 }
@@ -122,10 +134,6 @@
 	min-height: 1em;
 }

-.content li {
-    list-style-type: inherit !important;
-}
-
 .portal-stylechanger-select {
 	width: 150px;
 }
@@ -205,7 +213,8 @@ a.portal-forumtitle {
 }

 .portal-poll-side-option-info {
-	width: 30% !important;
+	width: 58% !important;
+	float: right !important;
 }

 .portal-poll-side-checkbox {
@@ -214,6 +223,7 @@ a.portal-forumtitle {

 .portal-poll-side-checkbox input {
 	vertical-align: top;
+	margin-left: 39px;
 	margin-top: 0;
 }

@@ -234,6 +244,7 @@ a.portal-forumtitle {

 .portal-calendar-days-title td, .portal-calendar-days td {
 	width: 14%;
+	text-align: center;
 }

 .portal-calendar-days-title span {
@@ -617,4 +628,11 @@ dd.responsive-portal-news:last-of-type, dd.responsive-portal-announcements:last-
 .fa-backward, .fa-forward {
 	font-size: 1.4em;
 	margin-bottom: 4px;
-}
+}
+
+.icon_portal_search {
+	background-image: url("../../prosilver/theme/images/portal/icon_portal_search.png") !important;
+	background-position: left 1px;
+	background-repeat: no-repeat;
+	padding-left: 17px;
+}
--- a/styles/prosilver/theme/portal_responsive.css
+++ b/styles/prosilver/theme/portal_responsive.css
@@ -1,5 +1,4 @@
-@media only screen and (max-width: 1040px), only screen and (max-device-width: 1040px)
-{
+@media (max-width: 1040px) {
 	.responsive-portal-announcements dd.views { display: none !important; }
 	dd.responsive-portal-announcements { display: none !important; }

@@ -21,8 +20,7 @@
 	#portal-forumlist dl.icon dt { width: 125% !important; }
 }

-@media only screen and (max-width: 895px), only screen and (max-device-width: 895px)
-{
+@media (max-width: 895px) {
 	div#portal-right {
 		width: 49% !important;
 		margin-left: 1% !important;
@@ -53,8 +51,7 @@
 	.responsive-portal-announcements dt { width: 100% !important; }
 }

-@media only screen and (max-width: 700px), only screen and (max-device-width: 700px)
-{
+@media (max-width: 700px) {
 	.responsive-portal-news dd.lastpost, .responsive-portal-announcements dd.lastpost { display: none !important; }
 	.responsive-portal-news dt .list-inner, .responsive-portal-announcements dt .list-inner { margin-right: 0 !important; }
 	.responsive-portal-news dt, .responsive-portal-announcements dt { width: 100% !important; }
@@ -70,6 +67,11 @@
 		float: right !important;
 	}

+	.row .pagination .ellipsis + li {
+		display: inline !important;
+		vertical-align: bottom !important;
+	}
+
 	#portal-forumlist dl.icon dt { width: 100% !important; }
 	#portal-left ul.topiclist dd, #portal-right ul.topiclist dd { display: block !important; }
 	.portal-responsive-show { display: block !important; }
@@ -84,4 +86,17 @@
 		margin-right: 0 !important;
 		padding-left: 0 !important;
 	}
+
+	.b3p-jumpbox {
+		margin: 15px auto;
+	}
+	.b3p-copyright {
+		clear: both;
+	}
+}
+
+@media (max-width: 500px) {
+	.portal-news-pagination .pagination {
+		display: none;
+	}
 }