more work on bs5

5 files changed, 12 insertions, 73 deletions

diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index 49adde9eb..811df02e4 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -13,7 +13,7 @@ html {
 }
 
 body {
-	font-size: 1rem;
+	font-size: 0.9rem;
 	background-color: $bgcolour;
 	background-image: url('$background_image');
 	background-attachment: fixed;
diff --git a/view/theme/redbasic/php/style.php b/view/theme/redbasic/php/style.php
index d278aa309..4fb239cb6 100644
--- a/view/theme/redbasic/php/style.php
+++ b/view/theme/redbasic/php/style.php
@@ -69,7 +69,7 @@ if ((!$schema) || ($schema == '---')) {
 	}
 
 }
-		
+
 //Set some defaults - we have to do this after pulling owner settings, and we have to check for each setting
 //individually.  If we don't, we'll have problems if a user has set one, but not all options.
 if (! $nav_bg)
@@ -158,7 +158,7 @@ if(file_exists('view/theme/redbasic/css/style.css')) {
 
 }
 
-// Set the schema to the default schema in derived themes. See the documentation for creating derived themes how to override this. 
+// Set the schema to the default schema in derived themes. See the documentation for creating derived themes how to override this.
 
 if(local_channel() && App::$channel && App::$channel['channel_theme'] != 'redbasic')
 	set_pconfig(local_channel(), 'redbasic', 'schema', '---');
diff --git a/view/tpl/chatroomlist.tpl b/view/tpl/chatroomlist.tpl
index c7f2c2c6f..2825a3f9e 100644
--- a/view/tpl/chatroomlist.tpl
+++ b/view/tpl/chatroomlist.tpl
@@ -3,7 +3,7 @@
 	<ul class="nav nav-pills flex-column">
 		<li class="nav-item"><a class="nav-link" href="{{$baseurl}}/chat/{{$nickname}}">{{$overview}}</a></li>
 		{{foreach $items as $item}}
-		<li class="nav-item"><a class="nav-link" href="{{$baseurl}}/chat/{{$nickname}}/{{$item.cr_id}}"><span class="badge float-end">{{$item.cr_inroom}}</span>{{$item.cr_name}}</a></li>
+		<li class="nav-item"><a class="nav-link" href="{{$baseurl}}/chat/{{$nickname}}/{{$item.cr_id}}"><span class="badge bg-secondary float-end">{{$item.cr_inroom}}</span>{{$item.cr_name}}</a></li>
 		{{/foreach}}
 	</ul>
 </div>
diff --git a/view/tpl/notifications_widget.tpl b/view/tpl/notifications_widget.tpl
index 19452dad7..b75d9f796 100644
--- a/view/tpl/notifications_widget.tpl
+++ b/view/tpl/notifications_widget.tpl
@@ -493,9 +493,9 @@
 						if(fcount < 1)
 							$('.' + n[1] + '-button').fadeOut();
 
-						var count = Number($(this).find('.badge-secondary').html());
+						var count = Number($(this).find('.bg-secondary').html());
 						count--;
-						$(this).find('.badge-secondary').html(count);
+						$(this).find('.bg-secondary').html(count);
 						if(count < 1)
 							$(this).remove();
 					}
@@ -518,21 +518,21 @@
 	}
 </script>
 
-<!--div id="notifications_wrapper" class="mb-4">
+<div id="notifications_wrapper" class="mb-4">
 	<div id="no_notifications" class="d-xl-none">
 		{{$no_notifications}}<span class="jumping-dots"><span class="dot-1">.</span><span class="dot-2">.</span><span class="dot-3">.</span></span>
 	</div>
 	<div id="nav-notifications-template" rel="template">
 		<a class="list-group-item text-decoration-none text-dark clearfix notification {6}" href="{0}" title="{13}" data-b64mid="{7}" data-notify_id="{8}" data-thread_top="{9}" data-contact_name="{2}" data-contact_addr="{3}" data-when="{5}">
 			<img class="menu-img-3" data-src="{1}" loading="lazy">
-			<div class="contactname"><span class="text-dark font-weight-bold">{2}</span> <span class="text-muted">{3}</span></div>
+			<div class="contactname"><span class="text-dark fw-bold">{2}</span> <span class="text-muted">{3}</span></div>
 			<span class="text-muted">{4}</span><br>
 			<span class="text-muted notifications-autotime" title="{5}">{5}</span>
 		</a>
 	</div>
 	<div id="nav-notifications-forums-template" rel="template">
 		<a class="list-group-item text-decoration-none clearfix notification notification-forum" href="{0}" title="{4} - {3}" data-b64mid="{7}" data-notify_id="{8}" data-thread_top="{9}" data-contact_name="{2}" data-contact_addr="{3}" data-b64mids='{12}'>
-			<span class="float-end badge badge-secondary">{10}</span>
+			<span class="float-end badge bg-secondary">{10}</span>
 			<img class="menu-img-1" data-src="{1}" loading="lazy">
 			<span class="">{2}</span>
 			<i class="fa fa-{11} text-muted"></i>
@@ -543,9 +543,9 @@
 		<div class="rounded list-group list-group-flush collapse {{$notification.type}}-button">
 			<a id="notification-link-{{$notification.type}}" class="collapsed list-group-item text-decoration-none notification-link" href="#" title="{{$notification.title}}" data-bs-target="#nav-{{$notification.type}}-sub" data-bs-toggle="collapse" data-sse_type="{{$notification.type}}">
 				<i class="fa fa-fw fa-{{$notification.icon}}"></i> {{$notification.label}}
-				<span class="float-end badge badge-{{$notification.severity}} {{$notification.type}}-update"></span>
+				<span class="float-end badge bg-{{$notification.severity}} {{$notification.type}}-update"></span>
 			</a>
-			<div id="nav-{{$notification.type}}-sub" class="list-group list-group-flush border border-left-0 border-top-0 border-right-0 collapse notification-content" data-parent="#notifications" data-sse_type="{{$notification.type}}">
+			<div id="nav-{{$notification.type}}-sub" class="list-group list-group-flush border border-left-0 border-top-0 border-right-0 collapse notification-content" data-bs-parent="#notifications" data-sse_type="{{$notification.type}}">
 				{{if $notification.viewall}}
 				<a class="list-group-item text-decoration-none text-dark" id="nav-{{$notification.type}}-see-all" href="{{$notification.viewall.url}}">
 					<i class="fa fa-fw fa-external-link"></i> {{$notification.viewall.label}}
@@ -579,65 +579,4 @@
 		</div>
 		{{/foreach}}
 	</div>
-</div-->
-
-<div id="notifications_wrapper" class="mb-4">
-	<div id="nav-notifications-template" rel="template">
-		<a class="list-group-item text-decoration-none text-darkclearfix notification {6}" href="{0}" title="{13}" data-b64mid="{7}" data-notify_id="{8}" data-thread_top="{9}" data-contact_name="{2}" data-contact_addr="{3}" data-when="{5}">
-			<img class="menu-img-3" data-src="{1}" loading="lazy">
-			<div class="contactname"><span class="text-dark fw-bold">{2}</span> <span class="text-muted">{3}</span></div>
-			<span class="text-muted">{4}</span><br>
-			<span class="text-muted notifications-autotime" title="{5}">{5}</span>
-		</a>
-	</div>
-	<div id="nav-notifications-forums-template" rel="template">
-		<a class="list-group-item text-decoration-none clearfix notification notification-forum" href="{0}" title="{4} - {3}" data-b64mid="{7}" data-notify_id="{8}" data-thread_top="{9}" data-contact_name="{2}" data-contact_addr="{3}" data-b64mids='{12}'>
-			<span class="float-end badge badge-secondary">{10}</span>
-			<img class="menu-img-1" data-src="{1}" loading="lazy">
-			<span class="">{2}</span>
-			<i class="fa fa-{11} text-muted"></i>
-		</a>
-	</div>
-	<div class="accordion accordion-flush border collapse" id="notifications">
-		{{foreach $notifications as $notification}}
-		<div class="accordion-item {{$notification.type}}-button collapse">
-			<div class="accordion-header notification-link" id="notification-link-{{$notification.type}}">
-				<button class="accordion-button collapsed p-3" type="button" data-bs-toggle="collapse" data-bs-target="#nav-{{$notification.type}}-sub" data-sse_type="{{$notification.type}}" aria-expanded="false" aria-controls="nav-{{$notification.type}}-sub">
-					<i class="fa fa-fw fa-{{$notification.icon}}"></i>&nbsp;{{$notification.label}}
-					<span class="float-end badge badge-{{$notification.severity}} {{$notification.type}}-update"></span>
-				</button>
-			</div>
-			<div id="nav-{{$notification.type}}-sub" class="list-group list-group-flush accordion-collapse collapse notification-content" aria-labelledby="notification-link-{{$notification.type}}" data-bs-parent="#notifications">
-				{{if $notification.viewall}}
-				<a class="list-group-item text-decoration-none text-dark" id="nav-{{$notification.type}}-see-all" href="{{$notification.viewall.url}}">
-					<i class="fa fa-fw fa-external-link"></i> {{$notification.viewall.label}}
-				</a>
-				{{/if}}
-				{{if $notification.markall}}
-				<div class="list-group-item cursor-pointer" id="nav-{{$notification.type}}-mark-all" onclick="markRead('{{$notification.type}}'); return false;">
-					<i class="fa fa-fw fa-check"></i> {{$notification.markall.label}}
-				</div>
-				{{/if}}
-				{{if $notification.filter}}
-				{{if $notification.filter.posts_label}}
-				<div class="list-group-item cursor-pointer" id="tt-{{$notification.type}}-only">
-					<i class="fa fa-fw fa-filter"></i> {{$notification.filter.posts_label}}
-				</div>
-				{{/if}}
-				{{if $notification.filter.name_label}}
-				<div class="list-group-item clearfix notifications-textinput" id="cn-{{$notification.type}}-only">
-					<div class="text-muted notifications-textinput-filter"><i class="fa fa-fw fa-filter"></i></div>
-					<input id="cn-{{$notification.type}}-input" type="text" class="notification-filter form-control form-control-sm" placeholder="{{$notification.filter.name_label}}">
-					<div id="cn-{{$notification.type}}-input-clear" class="text-muted notifications-textinput-clear d-none"><i class="fa fa-times"></i></div>
-				</div>
-				{{/if}}
-				{{/if}}
-				<div id="nav-{{$notification.type}}-menu" class="list-group list-group-flush"></div>
-				<div id="nav-{{$notification.type}}-loading" class="list-group-item" style="display: none;">
-					{{$loading}}<span class="jumping-dots"><span class="dot-1">.</span><span class="dot-2">.</span><span class="dot-3">.</span></span>
-				</div>
-			</div>
-		</div>
-		{{/foreach}}
-	</div>
 </div>
diff --git a/view/tpl/photo_albums.tpl b/view/tpl/photo_albums.tpl
index 9e77ba71e..e2edec687 100644
--- a/view/tpl/photo_albums.tpl
+++ b/view/tpl/photo_albums.tpl
@@ -5,7 +5,7 @@
 		{{if $albums}}
 		{{foreach $albums as $al}}
 		{{if $al.shorttext}}
-		<li class="nav-item"><a class="nav-link" href="{{$baseurl}}/photos/{{$nick}}/album/{{$al.bin2hex}}"><span class="badge badge-secondary float-end">{{$al.total}}</span>{{$al.shorttext}}</a></li>
+		<li class="nav-item"><a class="nav-link" href="{{$baseurl}}/photos/{{$nick}}/album/{{$al.bin2hex}}"><span class="badge bg-secondary float-end">{{$al.total}}</span>{{$al.shorttext}}</a></li>
 		{{/if}}
 		{{/foreach}}
 		{{/if}}