finalize filters and forum notifications

5 files changed, 9 insertions, 4 deletions

diff --git a/view/js/main.js b/view/js/main.js
index 7a8ddfe28..45c412296 100644
--- a/view/js/main.js
+++ b/view/js/main.js
@@ -509,7 +509,7 @@ function handleNotificationsItems(notifyType, data) {
 	notify_menu.html('');
 
 	$(data).each(function() {
-		html = notifications_tpl.format(this.notify_link,this.photo,this.name,this.message,this.when,this.hclass,this.b64mid,this.notify_id,this.thread_top,this.unseen);
+		html = notifications_tpl.format(this.notify_link,this.photo,this.name,this.message,this.when,this.hclass,this.b64mid,this.notify_id,this.thread_top,this.unseen,this.private_forum);
 		notify_menu.append(html);
 	});
 
@@ -828,6 +828,7 @@ function updateInit() {
 			});
 			handleNotificationsItems('forums', fnotifs);
 		}
+
 	}
 
 	if(! src) {
diff --git a/view/pdl/mod_network.pdl b/view/pdl/mod_network.pdl
index d26422093..a4bdf0a9f 100644
--- a/view/pdl/mod_network.pdl
+++ b/view/pdl/mod_network.pdl
@@ -1,9 +1,8 @@
 [region=aside]
 [widget=activity_order][/widget]
 [widget=activity_filter][/widget]
-[widget=forums][/widget]
-[widget=suggestions][/widget]
 [widget=savedsearch][/widget]
+[widget=suggestions][/widget]
 [widget=notes][/widget]
 [/region]
 
diff --git a/view/tpl/common_pills.tpl b/view/tpl/common_pills.tpl
index 8f4381f3d..e2b018d26 100755
--- a/view/tpl/common_pills.tpl
+++ b/view/tpl/common_pills.tpl
@@ -3,6 +3,7 @@
 	<li class="nav-item hover-fx-show"{{if $p.id}} id="{{$p.id}}"{{/if}}>
 		<a class="nav-link{{if $p.sel}} {{$p.sel}}{{/if}}" href="{{$p.url}}"{{if $p.title}} title="{{$p.title}}"{{/if}}{{if $p.sub}} onclick="{{if $p.sel}}closeOpen('{{$p.id}}_sub');{{else}}openClose('{{$p.id}}_sub');{{/if}} return false;"{{/if}}>
 			{{if $p.icon}}<i class="fa fa-fw fa-{{$p.icon}}"></i>{{/if}}
+			{{if $p.img}}<img class="menu-img-1" src="{{$p.img}}">{{/if}}
 			{{$p.label}}
 			{{if $p.sub}}<i class="fa fa-fw fa-caret-down hover-fx-hide"></i>{{/if}}
 		</a>
@@ -12,7 +13,9 @@
 			<li class="nav-item"{{if $ps.id}} id="{{$ps.id}}"{{/if}}>
 				<a class="nav-link{{if $ps.sel}} {{$ps.sel}}{{/if}}" href="{{$ps.url}}"{{if $ps.title}} title="{{$ps.title}}"{{/if}}>
 				{{if $ps.icon}}<i class="fa fa-fw fa-{{$ps.icon}}"></i>{{/if}}
+				{{if $ps.img}}<img class="menu-img-1" src="{{$ps.img}}">{{/if}}
 				{{$ps.label}}
+				{{if $ps.lock}}<i class="fa fa-{{$ps.lock}} text-muted"></i>{{/if}}
 				</a>
 			</li>
 			{{/foreach}}
diff --git a/view/tpl/notifications_widget.tpl b/view/tpl/notifications_widget.tpl
index c71f65b52..068441997 100644
--- a/view/tpl/notifications_widget.tpl
+++ b/view/tpl/notifications_widget.tpl
@@ -134,10 +134,11 @@
 		</a>
 	</div>
 	<div id="nav-notifications-forums-template" rel="template">
-		<a class="list-group-item clearfix notification notification-forum" href="{0}" title="{2} {3}" data-b64mid="{6}" data-notify_id="{7}" data-thread_top="{8}" data-contact_name="{2}">
+		<a class="list-group-item clearfix notification notification-forum" href="{0}" title="{3}" data-b64mid="{6}" data-notify_id="{7}" data-thread_top="{8}" data-contact_name="{2}">
 			<span class="float-right badge badge-{{$notification.severity}}">{9}</span>
 			<img class="menu-img-1" src="{1}">
 			<span class="">{2}</span>
+			<i class="fa fa-{10} text-muted"></i> 
 		</a>
 	</div>
 	<div id="notifications" class="navbar-nav">
diff --git a/view/tpl/settings.tpl b/view/tpl/settings.tpl
index b5e871c36..3a05ea828 100755
--- a/view/tpl/settings.tpl
+++ b/view/tpl/settings.tpl
@@ -147,6 +147,7 @@
 									{{include file="field_intcheckbox.tpl" field=$vnotify13}}
 								{{/if}}
 								{{include file="field_intcheckbox.tpl" field=$vnotify14}}
+								{{include file="field_intcheckbox.tpl" field=$vnotify15}}
 								{{include file="field_intcheckbox.tpl" field=$always_show_in_notices}}
 								{{include file="field_input.tpl" field=$evdays}}
 							</div>