Fix the collapse icons for Bootstrap 5 DNNCommunity#788

Dnn.CommunityForums/themes/community-bootstrap/templates/ForumView.ascx

@@ -5,7 +5,7 @@
 <div class="dcf-forums">
 		<div class="dcf-group-title-wrap d-flex align-items-center py-2">
 			<h3 class="dcf-group-title h5 flex-grow-1">[RESX:Group]: [GROUPNAME]</h3>
-			<a class="bs-collapse" data-toggle="collapse" href="#forum-group-1">
+			<a class="bs-collapse" data-toggle="collapse" href="#forum-group-1" role="button" data-bs-toggle="collapse">
 				<i class="fa fa-chevron-circle-down fa-lg"></i>
 			</a>
 		</div>
@@ -36,13 +36,11 @@
 					<tbody>
 					<tr class="dcf-table-body-row">
 
-						<td class="dcf-col dcf-col-text border-0">
-						<div class="d-flex">
+						<td class="dcf-col dcf-col-text d-flex border-0">
 							[FORUMICONCSS]
-							<div class="dcf-forum-title-text">
-								<h4 class="dcf-forum-title h5 mt-0 mb-2">[FORUMNAME]</h4>
-								<div class="dcf-forum-description">[FORUMDESCRIPTION]</div>
-							</div>
+						<div class="dcf-forum-title-text">
+							<h4 class="dcf-forum-title h5 mt-0 mb-2">[FORUMNAME]</h4>
+							<div class="dcf-forum-description">[FORUMDESCRIPTION]</div>
 						</div>
 
 						</td>

Dnn.CommunityForums/themes/community-bootstrap/templates/QuickReply.ascx

@@ -1,13 +1,15 @@
 <div class="dcf-quick-reply">
-	<header class="dcf-quick-reply-header dcf-cols">
-		<div class="dcf-col-50">
-			<h3 class="dcf-title h4 mb-3">[RESX:QuickReply]</h3>
+	<header class="dcf-quick-reply-header d-flex mt-4">
+		<div class="w-50">
+			<h3 class="dcf-title h4 m-0">[RESX:QuickReply]</h3>
 		</div>
-		<div class="dcf-col-50">
-			<div class="dcf-collapse">[AF:CONTROLS:GROUPTOGGLE]</div>
+		<div class="w-50 text-right text-end">
+			<a class="dcf-collapse bs-collapse" data-toggle="collapse" href="#groupQR" role="button" data-bs-toggle="collapse">
+				<i class="fa fa-chevron-circle-down fa-lg"></i>
+			</a>
 		</div>
 	</header>
-	<section class="dcf-section" id="groupQR">
+	<section class="dcf-section collapse show" id="groupQR">
 			<div class="dcf-group">
 				<asp:PlaceHolder ID="plhMessage" runat="server" />
 				<div>
@@ -55,7 +57,7 @@
 							<div>[AF:INPUT:CAPTCHA]</div> 
 						</div>
 					[/AF:UI:ANON]
-					<div class="dcf-subscribe-topic">
+					<div class="dcf-subscribe">
 						<div id="divSubscribe" runat="server" />
 					</div>