Merge branch '7.8RC'7.8

11 files changed, 61 insertions, 41 deletions

diff --git a/view/tpl/app_nav.tpl b/view/tpl/app_nav.tpl
index c3a7bc8b6..a8489382e 100644
--- a/view/tpl/app_nav.tpl
+++ b/view/tpl/app_nav.tpl
@@ -1 +1 @@
-<a class="dropdown-item{{if $app.active}} active{{/if}}" href="{{$app.url}}" data-papp="{{$app.papp}}" data-icon="{{$icon}}" data-url="{{$app.url}}" data-name="{{$app.name}}">{{if $icon}}<i class="generic-icons-nav fa fa-fw fa-{{$icon}}"></i>{{else}}<img src="{{$app.photo}}" width="16" height="16" style="margin-right:9px;"/>{{/if}}{{$app.name}}</a>
+<a class="nav-link{{if $app.active}} active{{/if}}" href="{{$app.url}}" data-papp="{{$app.papp}}" data-icon="{{$icon}}" data-url="{{$app.url}}" data-name="{{$app.name}}">{{if $icon}}<i class="generic-icons-nav fa fa-fw fa-{{$icon}}"></i>{{else}}<img src="{{$app.photo}}" width="16" height="16" style="margin-right:9px;"/>{{/if}}{{$app.name}}</a>
diff --git a/view/tpl/channel_activities.tpl b/view/tpl/channel_activities.tpl
index a675f71db..242fc519a 100644
--- a/view/tpl/channel_activities.tpl
+++ b/view/tpl/channel_activities.tpl
@@ -1,9 +1,9 @@
 <div class="mb-1 text-uppercase">
 	<a href="{{$url}}"><i class="fa fa-fw fa-{{$icon}} generic-icons-nav"></i>{{$label}}</a>
 </div>
-<div class="row mb-3">
+<div class="row row-cols-1 row-cols-sm-3 g-4 mb-4">
 	{{foreach $items as $i}}
-	<div class="col-sm-4 mb-3">
+	<div class="col">
 		<div class="card">
 			<a href="{{$i.url}}" class="text-dark">
 				<div class="card-body">
diff --git a/view/tpl/edpost_head.tpl b/view/tpl/edpost_head.tpl
index 94c882d53..b8b1cdbc5 100644
--- a/view/tpl/edpost_head.tpl
+++ b/view/tpl/edpost_head.tpl
@@ -11,7 +11,7 @@
 		<h2>{{$title}}</h2>
 		<div class="clear"></div>
 	</div>
-	<div id="webpage-editor" class="section-content-tools-wrapper">
+	<div id="webpage-editor" class="section-content-tools-wrapper rounded-bottom">
 		{{$editor}}
 	</div>
 </div>
diff --git a/view/tpl/jot.tpl b/view/tpl/jot.tpl
index a44b5b868..6c88e02b5 100644
--- a/view/tpl/jot.tpl
+++ b/view/tpl/jot.tpl
@@ -28,13 +28,9 @@
 		<input type="hidden" id="jot-consensus" name="consensus" value="{{if $consensus}}{{$consensus}}{{else}}0{{/if}}" />
 		<input type="hidden" id="jot-nocomment" name="nocomment" value="{{if $nocomment}}{{$nocomment}}{{else}}0{{/if}}" />
 
-		{{if $webpage}}
-		<div id="jot-pagetitle-wrap" class="jothidden">
-			<input class="w-100 border-0" name="pagetitle" id="jot-pagetitle" type="text" placeholder="{{$placeholdpagetitle}}" value="{{$pagetitle}}">
-		</div>
-		{{/if}}
+
 		<div id="jot-title-wrap" class="jothidden">
-			<input class="w-100 border-0" name="title" id="jot-title" type="text" placeholder="{{$placeholdertitle}}" tabindex="1" value="{{$title}}">
+			<input class="w-100 border-0 rounded-top" name="title" id="jot-title" type="text" placeholder="{{$placeholdertitle}}" tabindex="1" value="{{$title}}">
 		</div>
 		<div id="jot-summary-wrap" class="jothidden">
 			<input class="w-100 border-0" name="summary" id="jot-summary" type="text" placeholder="{{$placeholdersummary}}" tabindex="2" value="{{$summary}}">
@@ -44,6 +40,11 @@
 			<input class="w-100 border-0" name="category" id="jot-category" type="text" placeholder="{{$placeholdercategory}}" value="{{$category}}" data-role="cat-tagsinput">
 		</div>
 		{{/if}}
+		{{if $webpage}}
+		<div id="jot-pagetitle-wrap" class="jothidden">
+			<input class="w-100 border-0 rounded-top" name="pagetitle" id="jot-pagetitle" type="text" placeholder="{{$placeholdpagetitle}}" value="{{$pagetitle}}">
+		</div>
+		{{/if}}
 		{{if $customjotheaders}}
 		<div id="jot-customjotheaders-wrap" class="jothidden">
 			{{$customjotheaders}}
@@ -60,7 +61,7 @@
 				</button>
 				{{/if}}
 			</div>
-			<textarea class="profile-jot-text" id="profile-jot-text" name="body" tabindex="2" placeholder="{{$placeholdtext}}" tabindex="3">{{$content}}</textarea>
+			<textarea class="profile-jot-text rounded" id="profile-jot-text" name="body" tabindex="2" placeholder="{{$placeholdtext}}" tabindex="3">{{$content}}</textarea>
 		</div>
 		{{if $attachment}}
 		<div id="jot-attachment-wrap">
diff --git a/view/tpl/js_strings.tpl b/view/tpl/js_strings.tpl
index 8f05165f1..46536a89a 100644
--- a/view/tpl/js_strings.tpl
+++ b/view/tpl/js_strings.tpl
@@ -3,6 +3,7 @@
 	var aStr = {
 
 		'delitem'     : "{{$delitem}}",
+		'itemdel'     : "{{$itemdel}}",
 		'comment'     : "{{$comment}}",
 		'showmore'    : "{{$showmore}}",
 		'showfewer'   : "{{$showfewer}}",
diff --git a/view/tpl/navbar_default.tpl b/view/tpl/navbar_default.tpl
index 0dccd4404..06e764a54 100644
--- a/view/tpl/navbar_default.tpl
+++ b/view/tpl/navbar_default.tpl
@@ -179,7 +179,7 @@
 			</a>
 			{{/if}}
 		</div>
-		<div class="d-lg-flex"></div>
+		<div class="nav d-lg-flex"></div>
 		{{else}}
 		<div class="lh-1" id="app-bin-label">
 			{{if $name}}
@@ -196,43 +196,49 @@
 		<button type="button" class="btn-close text-reset" data-bs-dismiss="offcanvas" aria-label="Close"></button>
 
 	</div>
-	<div class="offcanvas-body pt-0">
+	<div class="offcanvas-body">
 		{{if $channel_apps.0}}
-		<div class="dropdown-header text-uppercase text-muted">
+		<div class="text-uppercase text-muted">
 			{{$channelapps}}
 		</div>
-		{{foreach $channel_apps as $channel_app}}
-		{{$channel_app}}
-		{{/foreach}}
+		<div class="nav nav-pills flex-column">
+			{{foreach $channel_apps as $channel_app}}
+			{{$channel_app}}
+			{{/foreach}}
+		</div>
 		{{/if}}
 		{{if $navbar_apps.0}}
 		<div class="d-lg-none dropdown-header text-uppercase text-muted">
 			{{$pinned_apps}}
 		</div>
-		<div id="nav-app-bin-container" class="d-lg-none">
+		<div id="nav-app-bin-container" class="d-lg-none nav nav-pills flex-column">
 			{{foreach $navbar_apps as $navbar_app}}
-				{{$navbar_app|replace:'navbar-app nav-link':'dropdown-item nav-app-sortable'|replace:'fa':'generic-icons-nav fa'}}
+				{{$navbar_app|replace:'fa':'generic-icons-nav fa'}}
 			{{/foreach}}
 		</div>
 		{{/if}}
 		{{if $is_owner}}
-		<div class="dropdown-header text-uppercase text-muted">
+		<div class="text-uppercase text-muted nav-link">
 			{{$featured_apps}}
 		</div>
-		<div id="app-bin-container" data-token="{{$form_security_token}}">
+		<div id="app-bin-container" data-token="{{$form_security_token}}" class="nav nav-pills flex-column">
 			{{foreach $nav_apps as $nav_app}}
 				{{$nav_app}}
 			{{/foreach}}
 		</div>
-		<div class="dropdown-divider"></div>
-		<a class="dropdown-item" href="/apps"><i class="generic-icons-nav fa fa-fw fa-plus"></i>{{$addapps}}</a>
+		<hr>
+		<div class="nav nav-pills flex-column">
+			<a class="nav-link" href="/apps"><i class="generic-icons-nav fa fa-fw fa-plus"></i>{{$addapps}}</a>
+		</div>
 		{{else}}
-		<div class="dropdown-header text-uppercase text-muted">
+		<div class="text-uppercase text-muted nav-link">
 			{{$sysapps}}
 		</div>
-		{{foreach $nav_apps as $nav_app}}
-			{{$nav_app}}
-		{{/foreach}}
+		<div class="nav nav-pills flex-column">
+			{{foreach $nav_apps as $nav_app}}
+				{{$nav_app}}
+			{{/foreach}}
+		</div>
 		{{/if}}
 	</div>
 </div>
diff --git a/view/tpl/notifications_widget.tpl b/view/tpl/notifications_widget.tpl
index fcadf71e5..82b3665c3 100644
--- a/view/tpl/notifications_widget.tpl
+++ b/view/tpl/notifications_widget.tpl
@@ -542,13 +542,13 @@
 	</div>
 	<div id="notifications" class="border border-top-0 rounded navbar-nav collapse">
 		{{foreach $notifications as $notification}}
-		<div class="border border-start-0 border-end-0 border-bottom-0 list-group list-group-flush collapse {{$notification.type}}-button">
+		<div class="rounded-top rounded-bottom border border-start-0 border-end-0 border-bottom-0 list-group list-group-flush collapse {{$notification.type}}-button">
 			<a id="notification-link-{{$notification.type}}" class="collapsed list-group-item fakelink 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 bg-{{$notification.severity}} {{$notification.type}}-update"></span>
 			</a>
 		</div>
-		<div id="nav-{{$notification.type}}-sub" class="border border-start-0 border-end-0 border-bottom-0 list-group list-group-flush collapse notification-content" data-bs-parent="#notifications" data-sse_type="{{$notification.type}}">
+		<div id="nav-{{$notification.type}}-sub" class="rounded-bottom border border-start-0 border-end-0 border-bottom-0 list-group list-group-flush 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}}
diff --git a/view/tpl/pdledit_gui.tpl b/view/tpl/pdledit_gui.tpl
index 8c4ca3e50..0bfb4d0f8 100644
--- a/view/tpl/pdledit_gui.tpl
+++ b/view/tpl/pdledit_gui.tpl
@@ -1,4 +1,4 @@
-<div id="pdledit_gui_offcanvas" class="offcanvas offcanvas-lg offcanvas-bottom shadow border rounded-top start-50 translate-middle-x" tabindex="-1" data-bs-backdrop="false" data-bs-scroll="true" style="min-width: 300px">
+<div id="pdledit_gui_offcanvas" class="offcanvas offcanvas-bottom shadow border rounded-top start-50 translate-middle-x" tabindex="-1" data-bs-backdrop="false" data-bs-scroll="true" style="min-width: 300px">
 	<div id="pdledit_gui_offcanvas_body" class="offcanvas-body"></div>
 	<div class="offcanvas-header">
 		<div class="offcanvas-title h3"></div>
@@ -6,7 +6,7 @@
 	</div>
 </div>
 
-<div id="pdledit_gui_offcanvas_edit" class="offcanvas offcanvas-lg offcanvas-bottom shadow border rounded-top start-50 translate-middle-x" tabindex="-1" data-bs-backdrop="false" data-bs-scroll="true" style="min-width: 300px">
+<div id="pdledit_gui_offcanvas_edit" class="offcanvas offcanvas-bottom shadow border rounded-top start-50 translate-middle-x" tabindex="-1" data-bs-backdrop="false" data-bs-scroll="true" style="min-width: 300px">
 	<div id="pdledit_gui_offcanvas_edit_body" class="offcanvas-body">
 		<textarea id="pdledit_gui_offcanvas_edit_textarea" class="form-control font-monospace h-100"></textarea>
 	</div>
@@ -16,7 +16,7 @@
 	</div>
 </div>
 
-<div id="pdledit_gui_offcanvas_submit" class="offcanvas offcanvas-lg offcanvas-bottom shadow border rounded-top start-50 translate-middle-x" tabindex="-1" data-bs-backdrop="false" data-bs-scroll="true" style="min-width: 300px">
+<div id="pdledit_gui_offcanvas_submit" class="offcanvas offcanvas-bottom shadow border rounded-top start-50 translate-middle-x" tabindex="-1" data-bs-backdrop="false" data-bs-scroll="true" style="min-width: 300px">
 	<div id="pdledit_gui_offcanvas_submit_body" class="offcanvas-body"></div>
 	<div class="offcanvas-header">
 		<button id="pdledit_gui_offcanvas_submit_submit" type="button" class="btn btn-primary">Submit</button>
diff --git a/view/tpl/profile_tabs.tpl b/view/tpl/profile_tabs.tpl
index 84ebf12bd..3cabad83d 100644
--- a/view/tpl/profile_tabs.tpl
+++ b/view/tpl/profile_tabs.tpl
@@ -1,3 +1,3 @@
 {{foreach $tabs as $tab}}
-<a class="dropdown-item{{if $tab.sel}} {{$tab.sel}}{{/if}}" href="{{$tab.url}}"{{if $tab.title}} title="{{$tab.title}}"{{/if}}><i class="fa fa-fw fa-{{$tab.icon}} generic-icons-nav"></i>{{$tab.label}}</a>
+<a class="nav-link{{if $tab.sel}} {{$tab.sel}}{{/if}}" href="{{$tab.url}}"{{if $tab.title}} title="{{$tab.title}}"{{/if}}><i class="fa fa-fw fa-{{$tab.icon}} generic-icons-nav"></i>{{$tab.label}}</a>
 {{/foreach}}
diff --git a/view/tpl/siteinfo.tpl b/view/tpl/siteinfo.tpl
index 4d9c53656..fef3b961e 100644
--- a/view/tpl/siteinfo.tpl
+++ b/view/tpl/siteinfo.tpl
@@ -1,18 +1,18 @@
 <div class="generic-content-wrapper-styled">
 <h2>{{$title}}</h2>
+<hr><br/>
+<h3>{{$sitenametxt}}</h3> <div>{{$sitename}}</div>
 
-<h3>{{$sitenametxt}}</h3>
-
-<div>{{$sitename}}</div>
-
+<br/>
 <h3>{{$headline}}</h3>
 
 <div>{{if $site_about}}{{$site_about}}{{else}}--{{/if}}</div>
-
+<br>
 <h3>{{$admin_headline}}</h3>
 
 <div>{{if $admin_about}}{{$admin_about}}{{else}}--{{/if}}</div>
 
+
 <br><br>
 <div><a href="help/TermsOfService">{{$terms}}</a></div>
 
@@ -25,12 +25,11 @@
 {{if $prj_version}}
 <div>{{$prj_version}}</div>
 {{/if}}
-
+<br>
 
 <h3>{{$prj_linktxt}}</h3>
-
 <div>{{$prj_link}}</div>
-
+<br>
 <h3>{{$prj_srctxt}}</h3>
 
 <div>{{$prj_src}}</div>
diff --git a/view/tpl/threaded_conversation.tpl b/view/tpl/threaded_conversation.tpl
index 6e773088e..12c27a342 100644
--- a/view/tpl/threaded_conversation.tpl
+++ b/view/tpl/threaded_conversation.tpl
@@ -10,4 +10,17 @@
 {{if !$preview }}
 <div id="threads-end"></div>
 <div id="conversation-end"></div>
+<div class="modal" id="conversation_settings" tabindex="-1" role="dialog" aria-labelledby="conversation_settings_label" aria-hidden="true">
+	<div class="modal-dialog">
+		<div class="modal-content">
+			<div class="modal-header">
+				<h3 class="modal-title" id="conversation_settings_label">{{$conversation_tools}}</h3>
+				<button type="button" class="btn-close" data-bs-dismiss="modal" aria-hidden="true"></button>
+			</div>
+			<div class="modal-body" id="conversation_settings_body">
+				{{$wait}}
+			</div>
+		</div><!-- /.modal-content -->
+	</div><!-- /.modal-dialog -->
+</div><!-- /.modal -->
 {{/if}}