From 2a4bd12465ec11b63079c5dff7b4f23439a593f1 Mon Sep 17 00:00:00 2001
From: hanakin <midaym@gmail.com>
Date: Tue, 6 Apr 2021 20:21:59 -1000
Subject: [PATCH 1/3] [ticket/16751] add rank-img class to template files

PHPBB3-16751
---
 phpBB/styles/prosilver/template/mcp_notes_user.html     | 2 +-
 phpBB/styles/prosilver/template/mcp_warn_post.html      | 2 +-
 phpBB/styles/prosilver/template/mcp_warn_user.html      | 2 +-
 phpBB/styles/prosilver/template/memberlist_body.html    | 2 +-
 phpBB/styles/prosilver/template/memberlist_view.html    | 4 ++--
 phpBB/styles/prosilver/template/ucp_pm_viewmessage.html | 2 +-
 phpBB/styles/prosilver/template/viewtopic_body.html     | 2 +-
 7 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/phpBB/styles/prosilver/template/mcp_notes_user.html b/phpBB/styles/prosilver/template/mcp_notes_user.html
index 448021eb8f..d576297736 100644
--- a/phpBB/styles/prosilver/template/mcp_notes_user.html
+++ b/phpBB/styles/prosilver/template/mcp_notes_user.html
@@ -17,7 +17,7 @@
 		<div class="column2">
 			<dl class="details">
 				<!-- IF RANK_TITLE --><dt>{L_RANK}{L_COLON}</dt><dd>{RANK_TITLE}</dd><!-- ENDIF -->
-				<!-- IF RANK_IMG --><dt><!-- IF RANK_TITLE -->&nbsp;<!-- ELSE -->{L_RANK}{L_COLON}<!-- ENDIF --></dt><dd>{RANK_IMG}</dd><!-- ENDIF -->
+				<!-- IF RANK_IMG --><dt><!-- IF RANK_TITLE -->&nbsp;<!-- ELSE -->{L_RANK}{L_COLON}<!-- ENDIF --></dt><dd class="rank-img">{RANK_IMG}</dd><!-- ENDIF -->
 				<dt>{L_JOINED}{L_COLON}</dt><dd>{JOINED}</dd>
 				<dt>{L_TOTAL_POSTS}{L_COLON}</dt><dd>{POSTS}</dd>
 				<dt>{L_WARNINGS}{L_COLON} </dt><dd>{WARNINGS}</dd>
diff --git a/phpBB/styles/prosilver/template/mcp_warn_post.html b/phpBB/styles/prosilver/template/mcp_warn_post.html
index 11395eea59..2442e72f99 100644
--- a/phpBB/styles/prosilver/template/mcp_warn_post.html
+++ b/phpBB/styles/prosilver/template/mcp_warn_post.html
@@ -17,7 +17,7 @@
 		<div class="column2">
 			<dl class="details">
 				<!-- IF RANK_TITLE --><dt>{L_RANK}{L_COLON}</dt><dd>{RANK_TITLE}</dd><!-- ENDIF -->
-				<!-- IF RANK_IMG --><dt><!-- IF RANK_TITLE -->&nbsp;<!-- ELSE -->{L_RANK}{L_COLON}<!-- ENDIF --></dt><dd>{RANK_IMG}</dd><!-- ENDIF -->
+				<!-- IF RANK_IMG --><dt><!-- IF RANK_TITLE -->&nbsp;<!-- ELSE -->{L_RANK}{L_COLON}<!-- ENDIF --></dt><dd class="rank-img">{RANK_IMG}</dd><!-- ENDIF -->
 				<dt>{L_JOINED}{L_COLON}</dt><dd>{JOINED}</dd>
 				<dt>{L_TOTAL_POSTS}{L_COLON}</dt><dd>{POSTS}</dd>
 				<dt>{L_WARNINGS}{L_COLON} </dt><dd>{WARNINGS}</dd>
diff --git a/phpBB/styles/prosilver/template/mcp_warn_user.html b/phpBB/styles/prosilver/template/mcp_warn_user.html
index 022763ba82..5490f752a7 100644
--- a/phpBB/styles/prosilver/template/mcp_warn_user.html
+++ b/phpBB/styles/prosilver/template/mcp_warn_user.html
@@ -17,7 +17,7 @@
 		<div class="column2">
 			<dl class="details">
 				<!-- IF RANK_TITLE --><dt>{L_RANK}{L_COLON}</dt><dd>{RANK_TITLE}</dd><!-- ENDIF -->
-				<!-- IF RANK_IMG --><dt><!-- IF RANK_TITLE -->&nbsp;<!-- ELSE -->{L_RANK}{L_COLON}<!-- ENDIF --></dt><dd>{RANK_IMG}</dd><!-- ENDIF -->
+				<!-- IF RANK_IMG --><dt><!-- IF RANK_TITLE -->&nbsp;<!-- ELSE -->{L_RANK}{L_COLON}<!-- ENDIF --></dt><dd class="rank-img">{RANK_IMG}</dd><!-- ENDIF -->
 				<dt>{L_JOINED}{L_COLON}</dt><dd>{JOINED}</dd>
 				<dt>{L_TOTAL_POSTS}{L_COLON}</dt><dd>{POSTS}</dd>
 				<dt>{L_WARNINGS}{L_COLON} </dt><dd>{WARNINGS}</dd>
diff --git a/phpBB/styles/prosilver/template/memberlist_body.html b/phpBB/styles/prosilver/template/memberlist_body.html
index 551c168d1e..34d2ec7ceb 100644
--- a/phpBB/styles/prosilver/template/memberlist_body.html
+++ b/phpBB/styles/prosilver/template/memberlist_body.html
@@ -28,7 +28,7 @@
 		<p>
 			<!-- IF AVATAR_IMG -->{AVATAR_IMG}<!-- ENDIF -->
 			{% EVENT memberlist_body_group_rank_before %}
-			{% if RANK_IMG %}{{ RANK_IMG }}{% endif %}
+			{% if RANK_IMG %}<span class="rank-img">{{ RANK_IMG }}</span>{% endif %}
 			{% if GROUP_RANK %}
 				{% if not RANK_IMG %}
 					{{ lang('GROUP_RANK') ~ lang('COLON') }}
diff --git a/phpBB/styles/prosilver/template/memberlist_view.html b/phpBB/styles/prosilver/template/memberlist_view.html
index 69988e57f2..bddf223bd6 100644
--- a/phpBB/styles/prosilver/template/memberlist_view.html
+++ b/phpBB/styles/prosilver/template/memberlist_view.html
@@ -13,7 +13,7 @@
 			<dt class="profile-avatar">{AVATAR_IMG}</dt>
 			<!-- EVENT memberlist_view_rank_avatar_before -->
 			<!-- IF RANK_TITLE --><dd style="text-align: center;">{RANK_TITLE}</dd><!-- ENDIF -->
-			<!-- IF RANK_IMG --><dd style="text-align: center;">{RANK_IMG}</dd><!-- ENDIF -->
+			<!-- IF RANK_IMG --><dd class="rank-img" style="text-align: center;">{RANK_IMG}</dd><!-- ENDIF -->
 			<!-- EVENT memberlist_view_rank_avatar_after -->
 		</dl>
 	<!-- ENDIF -->
@@ -32,7 +32,7 @@
 		<!-- IF not AVATAR_IMG -->
 			<!-- EVENT memberlist_view_rank_no_avatar_before -->
 			<!-- IF RANK_TITLE --><dt>{L_RANK}{L_COLON}</dt> <dd>{RANK_TITLE}</dd><!-- ENDIF -->
-			<!-- IF RANK_IMG --><dt><!-- IF RANK_TITLE -->&nbsp;<!-- ELSE -->{L_RANK}{L_COLON}<!-- ENDIF --></dt> <dd>{RANK_IMG}</dd><!-- ENDIF -->
+			<!-- IF RANK_IMG --><dt><!-- IF RANK_TITLE -->&nbsp;<!-- ELSE -->{L_RANK}{L_COLON}<!-- ENDIF --></dt> <dd class="rank-img">{RANK_IMG}</dd><!-- ENDIF -->
 			<!-- EVENT memberlist_view_rank_no_avatar_after -->
 		<!-- ENDIF -->
 		<!-- IF S_USER_INACTIVE --><dt>{L_USER_IS_INACTIVE}{L_COLON}</dt> <dd>{USER_INACTIVE_REASON}</dd><!-- ENDIF -->
diff --git a/phpBB/styles/prosilver/template/ucp_pm_viewmessage.html b/phpBB/styles/prosilver/template/ucp_pm_viewmessage.html
index f0e5aabcf1..d159299061 100644
--- a/phpBB/styles/prosilver/template/ucp_pm_viewmessage.html
+++ b/phpBB/styles/prosilver/template/ucp_pm_viewmessage.html
@@ -41,7 +41,7 @@
 			</dt>
 
 			<!-- EVENT ucp_pm_viewmessage_rank_before -->
-			<!-- IF RANK_TITLE or RANK_IMG --><dd class="profile-rank">{RANK_TITLE}<!-- IF RANK_TITLE and RANK_IMG --><br /><!-- ENDIF -->{RANK_IMG}</dd><!-- ENDIF -->
+			<!-- IF RANK_TITLE or RANK_IMG --><dd class="profile-rank rank-img">{RANK_TITLE}<!-- IF RANK_TITLE and RANK_IMG --><br /><!-- ENDIF -->{RANK_IMG}</dd><!-- ENDIF -->
 			<!-- EVENT ucp_pm_viewmessage_rank_after -->
 
 			<dd class="profile-posts"><strong>{L_POSTS}{L_COLON}</strong> <!-- IF U_AUTHOR_POSTS != '' --><a href="{U_AUTHOR_POSTS}">{AUTHOR_POSTS}</a><!-- ELSE -->{AUTHOR_POSTS}<!-- ENDIF --></dd>
diff --git a/phpBB/styles/prosilver/template/viewtopic_body.html b/phpBB/styles/prosilver/template/viewtopic_body.html
index 713c1eeef3..7163a3c4c9 100644
--- a/phpBB/styles/prosilver/template/viewtopic_body.html
+++ b/phpBB/styles/prosilver/template/viewtopic_body.html
@@ -154,7 +154,7 @@
 			</dt>
 
 			<!-- EVENT viewtopic_body_postrow_rank_before -->
-			<!-- IF postrow.RANK_TITLE or postrow.RANK_IMG --><dd class="profile-rank">{postrow.RANK_TITLE}<!-- IF postrow.RANK_TITLE and postrow.RANK_IMG --><br /><!-- ENDIF -->{postrow.RANK_IMG}</dd><!-- ENDIF -->
+			<!-- IF postrow.RANK_TITLE or postrow.RANK_IMG --><dd class="profile-rank rank-img">{postrow.RANK_TITLE}<!-- IF postrow.RANK_TITLE and postrow.RANK_IMG --><br /><!-- ENDIF -->{postrow.RANK_IMG}</dd><!-- ENDIF -->
 			<!-- EVENT viewtopic_body_postrow_rank_after -->
 
 		<!-- IF postrow.POSTER_POSTS != '' --><dd class="profile-posts"><strong>{L_POSTS}{L_COLON}</strong> <!-- IF postrow.U_SEARCH !== '' --><a href="{postrow.U_SEARCH}"><!-- ENDIF -->{postrow.POSTER_POSTS}<!-- IF postrow.U_SEARCH !== '' --></a><!-- ENDIF --></dd><!-- ENDIF -->

From ee998588a213f9541090513c6628e7134fa5b8ec Mon Sep 17 00:00:00 2001
From: hanakin <midaym@gmail.com>
Date: Wed, 7 Apr 2021 17:37:52 -1000
Subject: [PATCH 2/3] [ticket/16751] Twig it up!!!!

PHPBB3-16751
---
 phpBB/styles/prosilver/template/mcp_notes_user.html     | 2 +-
 phpBB/styles/prosilver/template/mcp_warn_post.html      | 2 +-
 phpBB/styles/prosilver/template/mcp_warn_user.html      | 2 +-
 phpBB/styles/prosilver/template/memberlist_view.html    | 4 ++--
 phpBB/styles/prosilver/template/ucp_pm_viewmessage.html | 2 +-
 phpBB/styles/prosilver/template/viewtopic_body.html     | 2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/phpBB/styles/prosilver/template/mcp_notes_user.html b/phpBB/styles/prosilver/template/mcp_notes_user.html
index d576297736..42e13cc97b 100644
--- a/phpBB/styles/prosilver/template/mcp_notes_user.html
+++ b/phpBB/styles/prosilver/template/mcp_notes_user.html
@@ -17,7 +17,7 @@
 		<div class="column2">
 			<dl class="details">
 				<!-- IF RANK_TITLE --><dt>{L_RANK}{L_COLON}</dt><dd>{RANK_TITLE}</dd><!-- ENDIF -->
-				<!-- IF RANK_IMG --><dt><!-- IF RANK_TITLE -->&nbsp;<!-- ELSE -->{L_RANK}{L_COLON}<!-- ENDIF --></dt><dd class="rank-img">{RANK_IMG}</dd><!-- ENDIF -->
+				{% if RANK_IMG %}<dt>{% if RANK_TITLE %}&nbsp;{% else %}{{ lang('RANK') ~ lang('COLON') }}{% endif %}</dt><dd class="rank-img">{{ RANK_IMG }}</dd>{% endif %}
 				<dt>{L_JOINED}{L_COLON}</dt><dd>{JOINED}</dd>
 				<dt>{L_TOTAL_POSTS}{L_COLON}</dt><dd>{POSTS}</dd>
 				<dt>{L_WARNINGS}{L_COLON} </dt><dd>{WARNINGS}</dd>
diff --git a/phpBB/styles/prosilver/template/mcp_warn_post.html b/phpBB/styles/prosilver/template/mcp_warn_post.html
index 2442e72f99..7aefc4836f 100644
--- a/phpBB/styles/prosilver/template/mcp_warn_post.html
+++ b/phpBB/styles/prosilver/template/mcp_warn_post.html
@@ -17,7 +17,7 @@
 		<div class="column2">
 			<dl class="details">
 				<!-- IF RANK_TITLE --><dt>{L_RANK}{L_COLON}</dt><dd>{RANK_TITLE}</dd><!-- ENDIF -->
-				<!-- IF RANK_IMG --><dt><!-- IF RANK_TITLE -->&nbsp;<!-- ELSE -->{L_RANK}{L_COLON}<!-- ENDIF --></dt><dd class="rank-img">{RANK_IMG}</dd><!-- ENDIF -->
+				{% if RANK_IMG %}<dt>{% if RANK_TITLE %}&nbsp;{% else %}{{ lang('RANK') ~ lang('COLON') }}{% endif %}</dt><dd class="rank-img">{{ RANK_IMG }}</dd>{% endif %}
 				<dt>{L_JOINED}{L_COLON}</dt><dd>{JOINED}</dd>
 				<dt>{L_TOTAL_POSTS}{L_COLON}</dt><dd>{POSTS}</dd>
 				<dt>{L_WARNINGS}{L_COLON} </dt><dd>{WARNINGS}</dd>
diff --git a/phpBB/styles/prosilver/template/mcp_warn_user.html b/phpBB/styles/prosilver/template/mcp_warn_user.html
index 5490f752a7..b9a75b8e94 100644
--- a/phpBB/styles/prosilver/template/mcp_warn_user.html
+++ b/phpBB/styles/prosilver/template/mcp_warn_user.html
@@ -17,7 +17,7 @@
 		<div class="column2">
 			<dl class="details">
 				<!-- IF RANK_TITLE --><dt>{L_RANK}{L_COLON}</dt><dd>{RANK_TITLE}</dd><!-- ENDIF -->
-				<!-- IF RANK_IMG --><dt><!-- IF RANK_TITLE -->&nbsp;<!-- ELSE -->{L_RANK}{L_COLON}<!-- ENDIF --></dt><dd class="rank-img">{RANK_IMG}</dd><!-- ENDIF -->
+				{% if RANK_IMG %}<dt>{% if RANK_TITLE %}&nbsp;{% else %}{{ lang('RANK') ~ lang('COLON') }}{% endif %}</dt><dd class="rank-img">{{ RANK_IMG }}</dd>{% endif %}
 				<dt>{L_JOINED}{L_COLON}</dt><dd>{JOINED}</dd>
 				<dt>{L_TOTAL_POSTS}{L_COLON}</dt><dd>{POSTS}</dd>
 				<dt>{L_WARNINGS}{L_COLON} </dt><dd>{WARNINGS}</dd>
diff --git a/phpBB/styles/prosilver/template/memberlist_view.html b/phpBB/styles/prosilver/template/memberlist_view.html
index bddf223bd6..d53e907206 100644
--- a/phpBB/styles/prosilver/template/memberlist_view.html
+++ b/phpBB/styles/prosilver/template/memberlist_view.html
@@ -13,7 +13,7 @@
 			<dt class="profile-avatar">{AVATAR_IMG}</dt>
 			<!-- EVENT memberlist_view_rank_avatar_before -->
 			<!-- IF RANK_TITLE --><dd style="text-align: center;">{RANK_TITLE}</dd><!-- ENDIF -->
-			<!-- IF RANK_IMG --><dd class="rank-img" style="text-align: center;">{RANK_IMG}</dd><!-- ENDIF -->
+			{% if RANK_IMG %}<dd class="rank-img" style="text-align: center;">{{ RANK_IMG }}</dd>{% endif %}
 			<!-- EVENT memberlist_view_rank_avatar_after -->
 		</dl>
 	<!-- ENDIF -->
@@ -32,7 +32,7 @@
 		<!-- IF not AVATAR_IMG -->
 			<!-- EVENT memberlist_view_rank_no_avatar_before -->
 			<!-- IF RANK_TITLE --><dt>{L_RANK}{L_COLON}</dt> <dd>{RANK_TITLE}</dd><!-- ENDIF -->
-			<!-- IF RANK_IMG --><dt><!-- IF RANK_TITLE -->&nbsp;<!-- ELSE -->{L_RANK}{L_COLON}<!-- ENDIF --></dt> <dd class="rank-img">{RANK_IMG}</dd><!-- ENDIF -->
+			{% if RANK_IMG %}<dt>{% if RANK_TITLE %}&nbsp;{% else %}{{ lang('RANK') ~ lang('COLON') }}{% endif %}</dt><dd class="rank-img">{{ RANK_IMG }}</dd>{% endif %}
 			<!-- EVENT memberlist_view_rank_no_avatar_after -->
 		<!-- ENDIF -->
 		<!-- IF S_USER_INACTIVE --><dt>{L_USER_IS_INACTIVE}{L_COLON}</dt> <dd>{USER_INACTIVE_REASON}</dd><!-- ENDIF -->
diff --git a/phpBB/styles/prosilver/template/ucp_pm_viewmessage.html b/phpBB/styles/prosilver/template/ucp_pm_viewmessage.html
index d159299061..97487e639d 100644
--- a/phpBB/styles/prosilver/template/ucp_pm_viewmessage.html
+++ b/phpBB/styles/prosilver/template/ucp_pm_viewmessage.html
@@ -41,7 +41,7 @@
 			</dt>
 
 			<!-- EVENT ucp_pm_viewmessage_rank_before -->
-			<!-- IF RANK_TITLE or RANK_IMG --><dd class="profile-rank rank-img">{RANK_TITLE}<!-- IF RANK_TITLE and RANK_IMG --><br /><!-- ENDIF -->{RANK_IMG}</dd><!-- ENDIF -->
+			{% if RANK_IMG or RANK_TITLE %}<dd class="profile-rank rank-img">{{ RANK_TITLE }}{% if RANK_IMG and RANK_TITLE %}<br />{% endif %}{{ RANK_IMG }}</dd>{% endif %}
 			<!-- EVENT ucp_pm_viewmessage_rank_after -->
 
 			<dd class="profile-posts"><strong>{L_POSTS}{L_COLON}</strong> <!-- IF U_AUTHOR_POSTS != '' --><a href="{U_AUTHOR_POSTS}">{AUTHOR_POSTS}</a><!-- ELSE -->{AUTHOR_POSTS}<!-- ENDIF --></dd>
diff --git a/phpBB/styles/prosilver/template/viewtopic_body.html b/phpBB/styles/prosilver/template/viewtopic_body.html
index 7163a3c4c9..fa507b1852 100644
--- a/phpBB/styles/prosilver/template/viewtopic_body.html
+++ b/phpBB/styles/prosilver/template/viewtopic_body.html
@@ -154,7 +154,7 @@
 			</dt>
 
 			<!-- EVENT viewtopic_body_postrow_rank_before -->
-			<!-- IF postrow.RANK_TITLE or postrow.RANK_IMG --><dd class="profile-rank rank-img">{postrow.RANK_TITLE}<!-- IF postrow.RANK_TITLE and postrow.RANK_IMG --><br /><!-- ENDIF -->{postrow.RANK_IMG}</dd><!-- ENDIF -->
+			{% if postrow.RANK_IMG or postrow.RANK_TITLE %}<dd class="profile-rank rank-img">{{ postrow.RANK_TITLE }}{% if postrow.RANK_IMG and postrow.RANK_TITLE %}<br />{% endif %}{{ postrow.RANK_IMG }}</dd>{% endif %}
 			<!-- EVENT viewtopic_body_postrow_rank_after -->
 
 		<!-- IF postrow.POSTER_POSTS != '' --><dd class="profile-posts"><strong>{L_POSTS}{L_COLON}</strong> <!-- IF postrow.U_SEARCH !== '' --><a href="{postrow.U_SEARCH}"><!-- ENDIF -->{postrow.POSTER_POSTS}<!-- IF postrow.U_SEARCH !== '' --></a><!-- ENDIF --></dd><!-- ENDIF -->

From 6fa78f696c0af41ff77d9eb1add2b48d9fa1c0c5 Mon Sep 17 00:00:00 2001
From: hanakin <midaym@gmail.com>
Date: Wed, 7 Apr 2021 18:22:24 -1000
Subject: [PATCH 3/3] [ticket/16751] cleanup inline while at it

PHPBB3-16751
---
 phpBB/styles/prosilver/template/memberlist_view.html | 3 +--
 phpBB/styles/prosilver/theme/content.css             | 4 ++++
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/phpBB/styles/prosilver/template/memberlist_view.html b/phpBB/styles/prosilver/template/memberlist_view.html
index d53e907206..38b2f58d7b 100644
--- a/phpBB/styles/prosilver/template/memberlist_view.html
+++ b/phpBB/styles/prosilver/template/memberlist_view.html
@@ -12,8 +12,7 @@
 		<dl class="left-box">
 			<dt class="profile-avatar">{AVATAR_IMG}</dt>
 			<!-- EVENT memberlist_view_rank_avatar_before -->
-			<!-- IF RANK_TITLE --><dd style="text-align: center;">{RANK_TITLE}</dd><!-- ENDIF -->
-			{% if RANK_IMG %}<dd class="rank-img" style="text-align: center;">{{ RANK_IMG }}</dd>{% endif %}
+			<!-- IF RANK_TITLE --><dd class="profile-avatar">{RANK_TITLE}</dd><!-- ENDIF -->
 			<!-- EVENT memberlist_view_rank_avatar_after -->
 		</dl>
 	<!-- ENDIF -->
diff --git a/phpBB/styles/prosilver/theme/content.css b/phpBB/styles/prosilver/theme/content.css
index 7d732d288e..338016ac2c 100644
--- a/phpBB/styles/prosilver/theme/content.css
+++ b/phpBB/styles/prosilver/theme/content.css
@@ -833,6 +833,10 @@ dd.profile-contact {
 }
 
 /* Profile used on view-profile */
+.profile-avatar {
+	text-align: center;
+}
+
 .profile-avatar img {
 	max-width: 100%;
 }