Merge branch 'dev' of framagit.org:hubzilla/core into dev

24 files changed, 168 insertions, 88 deletions

diff --git a/view/css/default.css b/view/css/default.css
index fc6da54f9..765a197d9 100644
--- a/view/css/default.css
+++ b/view/css/default.css
@@ -1,11 +1,3 @@
-header #banner {
-	position: fixed;
-	top: 0px;
-	width: 33%;
-	margin-left: 33%;
-	margin-right: 33%;
-}
-
 main {
 	display: table;
 	table-layout: fixed;
diff --git a/view/fr/hmessages.po b/view/fr/hmessages.po
index a830d06ef..c5263c2df 100644
--- a/view/fr/hmessages.po
+++ b/view/fr/hmessages.po
@@ -15,7 +15,7 @@ msgstr ""
 "Project-Id-Version: Redmatrix\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-04-23 11:34+0200\n"
-"PO-Revision-Date: 2018-05-06 07:46+0000\n"
+"PO-Revision-Date: 2018-05-26 07:06+0000\n"
 "Last-Translator: Philip Wittamore <philip@wittamore.com>\n"
 "Language-Team: French (http://www.transifex.com/Friendica/red-matrix/language/fr/)\n"
 "MIME-Version: 1.0\n"
@@ -6943,7 +6943,7 @@ msgstr "À propos&nbsp;:"
 #: ../../include/conversation.php:1052 ../../include/channel.php:1376
 #: ../../include/connections.php:110
 msgid "Connect"
-msgstr "Ajouter/Suivre"
+msgstr "Lier"
 
 #: ../../Zotlabs/Module/Directory.php:339
 msgid "Public Forum:"
@@ -12750,7 +12750,7 @@ msgstr "Saisir nom ou centre d'intérêt"
 
 #: ../../include/contact_widgets.php:21
 msgid "Connect/Follow"
-msgstr "Ajouter/Suivre"
+msgstr "Lier et suivre"
 
 #: ../../include/contact_widgets.php:22
 msgid "Examples: Robert Morgenstein, Fishing"
diff --git a/view/fr/hstrings.php b/view/fr/hstrings.php
index f7fd25224..cdf233584 100644
--- a/view/fr/hstrings.php
+++ b/view/fr/hstrings.php
@@ -1485,7 +1485,7 @@ App::$strings["Location:"] = "Emplacement&nbsp;:";
 App::$strings["Description:"] = "Description&nbsp;:";
 App::$strings["Hometown:"] = "Ville natale&nbsp;:";
 App::$strings["About:"] = "À propos&nbsp;:";
-App::$strings["Connect"] = "Ajouter/Suivre";
+App::$strings["Connect"] = "Lier";
 App::$strings["Public Forum:"] = "Forum public&nbsp;:";
 App::$strings["Keywords: "] = "Mots-clefs&nbsp;:";
 App::$strings["Don't suggest"] = "Ne pas suggérer";
@@ -2868,7 +2868,7 @@ App::$strings["%d invitation available"] = array(
 );
 App::$strings["Find Channels"] = "Trouver des canaux";
 App::$strings["Enter name or interest"] = "Saisir nom ou centre d'intérêt";
-App::$strings["Connect/Follow"] = "Ajouter/Suivre";
+App::$strings["Connect/Follow"] = "Lier et suivre";
 App::$strings["Examples: Robert Morgenstein, Fishing"] = "Exemples: Guillaume Martin, Course à pieds";
 App::$strings["Random Profile"] = "Un profil au hasard";
 App::$strings["Invite Friends"] = "Inviter des amis";
diff --git a/view/js/main.js b/view/js/main.js
index 3e24e8177..45c412296 100644
--- a/view/js/main.js
+++ b/view/js/main.js
@@ -420,6 +420,14 @@ function notificationsUpdate(cached_data) {
 			// Put the object into storage
 			sessionStorage.setItem('notifications_cache', JSON.stringify(data));
 
+			var fnotifs = [];
+			if(data.forums) {
+				$.each(data.forums_sub, function() {
+					fnotifs.push(this);
+				});
+				handleNotificationsItems('forums', fnotifs);
+			}
+
 			if(data.invalid == 1) {
 				window.location.href=window.location.href;
 			}
@@ -451,7 +459,7 @@ function notificationsUpdate(cached_data) {
 }
 
 function handleNotifications(data) {
-	if(data.network || data.home || data.intros || data.register || data.mail || data.all_events || data.notify || data.files || data.pubs) {
+	if(data.network || data.home || data.intros || data.register || data.mail || data.all_events || data.notify || data.files || data.pubs || data.forums) {
 		$('.notifications-btn').css('opacity', 1);
 		$('#no_notifications').hide();
 	}
@@ -495,13 +503,13 @@ function handleNotifications(data) {
 }
 
 function handleNotificationsItems(notifyType, data) {
-	var notifications_tpl= unescape($("#nav-notifications-template[rel=template]").html());
+	var notifications_tpl = ((notifyType == 'forums') ? unescape($("#nav-notifications-forums-template[rel=template]").html()) : unescape($("#nav-notifications-template[rel=template]").html()));
 	var notify_menu = $("#nav-" + notifyType + "-menu");
 
 	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);
+		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);
 	});
 
@@ -812,6 +820,15 @@ function updateInit() {
 	if (initialLoad && (sessionStorage.getItem('notifications_cache') !== null)) {
 		var cached_data = JSON.parse(sessionStorage.getItem('notifications_cache'));
 		notificationsUpdate(cached_data);
+
+		var fnotifs = [];
+		if(cached_data.forums) {
+			$.each(cached_data.forums_sub, function() {
+				fnotifs.push(this);
+			});
+			handleNotificationsItems('forums', fnotifs);
+		}
+
 	}
 
 	if(! src) {
@@ -1022,6 +1039,7 @@ function loadNotificationItems(notifyType) {
 	}
 
 	console.log('updating ' + notifyType + ' notifications...');
+
 	$.get(pingExCmd, function(data) {
 		if(data.invalid == 1) {
 			window.location.href=window.location.href;
diff --git a/view/pdl/mod_network.pdl b/view/pdl/mod_network.pdl
index 09fdba573..a4bdf0a9f 100644
--- a/view/pdl/mod_network.pdl
+++ b/view/pdl/mod_network.pdl
@@ -1,9 +1,8 @@
 [region=aside]
-[widget=collections][/widget]
-[widget=forums][/widget]
-[widget=suggestions][/widget]
+[widget=activity_order][/widget]
+[widget=activity_filter][/widget]
 [widget=savedsearch][/widget]
-[widget=filer][/widget]
+[widget=suggestions][/widget]
 [widget=notes][/widget]
 [/region]
 
diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index 4488dcddd..87c97f1f5 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -593,7 +593,8 @@ footer {
 	background-color: $comment_item_colour;
 }
 
-#nav-notifications-template {
+#nav-notifications-template,
+#nav-notifications-forums-template {
 	display: none;
 }
 
@@ -837,6 +838,11 @@ div.jGrowl div.jGrowl-notification {
 	white-space: nowrap;
 }
 
+.notification.notification-forum {
+	font-size: 0.9rem;
+	color: $font_colour;
+}
+
 #acl-search::-webkit-input-placeholder {
 	/* non-fontawesome fonts set a fallback for text parts of the placeholder*/
 	font-family: ForkAwesome, sans-serif, arial, freesans;
@@ -1271,9 +1277,8 @@ img.mail-conv-sender-photo {
 }
 
 .menu-img-1 {
-	height: 1.5em;
-	width: 1.5em;
-	margin-right: 5px;
+	height: 1.28571429em;
+	width: 1.28571429em;
 	border-radius: $radius;
 }
 
@@ -1799,3 +1804,11 @@ dl.bb-dl > dd > li {
 .cover-photo-review {
 	margin-bottom: 10px;
 }
+
+.hover-fx-hide  {
+	opacity: 0;
+}
+
+.hover-fx-show:hover .hover-fx-hide {
+	opacity: 1;
+}
diff --git a/view/theme/redbasic/js/redbasic.js b/view/theme/redbasic/js/redbasic.js
index 41f5eb7ce..c905c92cb 100644
--- a/view/theme/redbasic/js/redbasic.js
+++ b/view/theme/redbasic/js/redbasic.js
@@ -89,6 +89,11 @@ $(document).ready(function() {
 		tagClass: 'badge badge-pill badge-warning text-dark'
 	});
 
+	$('a.disabled').click(function(e) {
+		e.preventDefault();
+		e.stopPropagation();
+	});
+
 	var doctitle = document.title;
 	function checkNotify() {
 		var notifyUpdateElem = document.getElementById('notify-update');
diff --git a/view/tpl/activity_filter_widget.tpl b/view/tpl/activity_filter_widget.tpl
new file mode 100644
index 000000000..7ff5a4f7e
--- /dev/null
+++ b/view/tpl/activity_filter_widget.tpl
@@ -0,0 +1,11 @@
+<div class="widget">
+	<h3 class="d-flex justify-content-between align-items-center">
+		{{$title}}
+		{{if $reset}}
+		<a href="{{$reset.url}}" class="text-muted" title="{{$reset.title}}">
+			<i class="fa fa-fw fa-{{$reset.icon}}"></i>
+		</a>
+		{{/if}}
+	</h3>
+	{{$content}}
+</div>
diff --git a/view/tpl/build_query.tpl b/view/tpl/build_query.tpl
index 1d938d395..754d5997c 100755
--- a/view/tpl/build_query.tpl
+++ b/view/tpl/build_query.tpl
@@ -30,6 +30,7 @@
 	var bParam_mid = "{{$mid}}";
 	var bParam_verb = "{{$verb}}";
 	var bParam_net = "{{$net}}";
+	var bParam_pf = "{{$pf}}";
 
 	function buildCmd() {
 		var udargs = ((page_load) ? "/load" : "");
@@ -60,6 +61,7 @@
 		if(bParam_verb != "") bCmd = bCmd + "&verb=" + bParam_verb;
 		if(bParam_net != "") bCmd = bCmd + "&net=" + bParam_net;
 		if(bParam_page != 1) bCmd = bCmd + "&page=" + bParam_page;
+		if(bParam_pf != 0) bCmd = bCmd + "&pf=" + bParam_pf;
 		return(bCmd);
 	}
 
diff --git a/view/tpl/common_pills.tpl b/view/tpl/common_pills.tpl
new file mode 100755
index 000000000..e2b018d26
--- /dev/null
+++ b/view/tpl/common_pills.tpl
@@ -0,0 +1,26 @@
+<ul class="nav nav-pills flex-column">
+	{{foreach $pills as $p}}
+	<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>
+		{{if $p.sub}}
+		<ul class="nav nav-pills flex-column ml-4" id="{{$p.id}}_sub"{{if !$p.sel}} style="display: none;"{{/if}}>
+			{{foreach $p.sub as $ps}}
+			<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}}
+		</ul>
+		{{/if}}
+	</li>
+	{{/foreach}}
+</ul>
diff --git a/view/tpl/common_widget.tpl b/view/tpl/common_widget.tpl
new file mode 100644
index 000000000..e542031dc
--- /dev/null
+++ b/view/tpl/common_widget.tpl
@@ -0,0 +1,6 @@
+<div class="widget">
+	<h3>
+		{{$title}}
+	</h3>
+	{{$content}}
+</div>
diff --git a/view/tpl/conv_item.tpl b/view/tpl/conv_item.tpl
index 6baf06dda..ac6af40e9 100755
--- a/view/tpl/conv_item.tpl
+++ b/view/tpl/conv_item.tpl
@@ -29,7 +29,7 @@
 				<div class="p-2 clearfix wall-item-head{{if $item.is_new && !$item.title && !$item.event && !$item.is_comment}} wall-item-head-new rounded-top{{/if}}">
 					<div class="wall-item-info " id="wall-item-info-{{$item.id}}" >
 						<div class="wall-item-photo-wrapper{{if $item.owner_url}} wwfrom{{/if}} h-card p-author" id="wall-item-photo-wrapper-{{$item.id}}">
-							<img src="{{$item.thumb}}" class="fakelink wall-item-photo{{$item.sparkle}} u-photo p-name" id="wall-item-photo-{{$item.id}}" alt="{{$item.name}}"  data-toggle="dropdown" />
+							<img src="{{$item.thumb}}" class="fakelink wall-item-photo{{$item.sparkle}} u-photo p-name" id="wall-item-photo-{{$item.id}}" alt="{{$item.name}}" data-toggle="dropdown" />
 							{{if $item.thread_author_menu}}
 							<i class="fa fa-caret-down wall-item-photo-caret cursor-pointer" data-toggle="dropdown"></i>
 							<div class="dropdown-menu">
diff --git a/view/tpl/design_tools.tpl b/view/tpl/design_tools.tpl
index bc7d46dc1..b4657cb7f 100644
--- a/view/tpl/design_tools.tpl
+++ b/view/tpl/design_tools.tpl
@@ -2,7 +2,7 @@
 	<h3>{{$title}}</h3>
 	<div class="nav nav-pills flex-column">
 		<a class="nav-link" href="blocks/{{$who}}">{{$blocks}}</a>
-		<a class="nav-link" href="menu{{if $sys}}?f=&sys=1{{/if}}">{{$menus}}</a>
+		<a class="nav-link" href="menu/{{$who}}">{{$menus}}</a>
 		<a class="nav-link" href="layouts/{{$who}}">{{$layout}}</a>
 		<a class="nav-link" href="webpages/{{$who}}">{{$pages}}</a>
 	</div>
diff --git a/view/tpl/jot-header.tpl b/view/tpl/jot-header.tpl
index 22413f350..365a922f9 100755
--- a/view/tpl/jot-header.tpl
+++ b/view/tpl/jot-header.tpl
@@ -365,12 +365,12 @@ var activeCommentText = '';
 		if($('#jot-nocomment').val() > 0) {
 			$('#jot-nocomment').val(0);
 			$('#profile-nocomment, #profile-nocomment-sub').removeClass('fa-comments-o').addClass('fa-comments');
-			$('#profile-nocomment-wrapper').attr('title', '{{$nocomment_enabled}}');
+			$('#profile-nocomment-wrapper').attr('title', '{{$nocomment_enabled|escape:'javascript'}}');
 		}
 		else {
 			$('#jot-nocomment').val(1);
 			$('#profile-nocomment, #profile-nocomment-sub').removeClass('fa-comments').addClass('fa-comments-o');
-			$('#profile-nocomment-wrapper').attr('title', '{{$nocomment_disabled}}');
+			$('#profile-nocomment-wrapper').attr('title', '{{$nocomment_disabled|escape:'javascript'}}');
 		}
 	}
 
diff --git a/view/tpl/menuedit.tpl b/view/tpl/menuedit.tpl
index 84b16dc0b..3558bdbaa 100644
--- a/view/tpl/menuedit.tpl
+++ b/view/tpl/menuedit.tpl
@@ -11,7 +11,7 @@
 </div>
 {{/if}}
 <div id="menu-creator" class="section-content-tools-wrapper" style="display: {{$display}};">
-	<form id="menuedit" action="menu{{if $menu_id}}/{{$menu_id}}{{/if}}{{if $sys}}?f=&sys=1{{/if}}" method="post" >
+	<form id="menuedit" action="menu/{{$nick}}{{if $menu_id}}/{{$menu_id}}{{/if}}{{if $sys}}?f=&sys=1{{/if}}" method="post" >
 		{{if $menu_id}}
 		<input type="hidden" name="menu_id" value="{{$menu_id}}" />
 		{{/if}}
diff --git a/view/tpl/menulist.tpl b/view/tpl/menulist.tpl
index e23035062..f9c925472 100644
--- a/view/tpl/menulist.tpl
+++ b/view/tpl/menulist.tpl
@@ -25,11 +25,11 @@
 			{{foreach $menus as $m }}
 			<tr id="menu-list-item-{{$m.menu_id}}">
 				<td>{{if $m.bookmark}}<i class="fa fa-bookmark menu-list-tool" title="{{$bmark}}" ></i>{{/if}}</td>
-				<td><a href="mitem/{{$m.menu_id}}{{if $sys}}?f=&sys=1{{/if}}" title="{{$hintcontent}}">{{$m.menu_name}}</a></td>
+				<td><a href="mitem/{{$nick}}/{{$m.menu_id}}{{if $sys}}?f=&sys=1{{/if}}" title="{{$hintcontent}}">{{$m.menu_name}}</a></td>
 				<td>{{$m.menu_desc}}</td>
-				<td class="menu-list-tool"><a href="menu/{{$m.menu_id}}{{if $sys}}?f=&sys=1{{/if}}" title="{{$hintedit}}"><i class="fa fa-pencil"></i></a></td>
+				<td class="menu-list-tool"><a href="menu/{{$nick}}/{{$m.menu_id}}{{if $sys}}?f=&sys=1{{/if}}" title="{{$hintedit}}"><i class="fa fa-pencil"></i></a></td>
 				<td class="menu-list-tool"><a href="rpost?attachment={{$m.element}}" title="{{$share}}"><i class="fa fa-share-square-o"></i></a></td>
-				<td class="menu-list-tool"><a href="#" title="{{$hintdrop}}"  onclick="dropItem('menu/{{$m.menu_id}}/drop{{if $sys}}?f=&sys=1{{/if}}', '#menu-list-item-{{$m.menu_id}}'); return false;"><i class="fa fa-trash-o drop-icons"></i></a></td>
+				<td class="menu-list-tool"><a href="#" title="{{$hintdrop}}"  onclick="dropItem('menu/{{$nick}}/{{$m.menu_id}}/drop{{if $sys}}?f=&sys=1{{/if}}', '#menu-list-item-{{$m.menu_id}}'); return false;"><i class="fa fa-trash-o drop-icons"></i></a></td>
 				<td class="d-none d-md-table-cell">{{$m.menu_created}}</td>
 				<td class="d-none d-md-table-cell">{{$m.menu_edited}}</td>
 			</tr>
diff --git a/view/tpl/mitemedit.tpl b/view/tpl/mitemedit.tpl
index 9f696fc23..36be0b207 100644
--- a/view/tpl/mitemedit.tpl
+++ b/view/tpl/mitemedit.tpl
@@ -5,7 +5,7 @@
 	</div>
 {{/if}}
 	<div id="menu-element-creator" class="section-content-tools-wrapper" style="display: {{$display}};">
-		<form id="mitemedit" action="mitem/{{$menu_id}}{{if $mitem_id}}/{{$mitem_id}}{{/if}}{{if $sys}}?f=&sys=1{{/if}}" method="post" class="acl-form" data-form_id="mitemedit" data-allow_cid='{{$allow_cid}}' data-allow_gid='{{$allow_gid}}' data-deny_cid='{{$deny_cid}}' data-deny_gid='{{$deny_gid}}'>
+		<form id="mitemedit" action="mitem/{{$nick}}/{{$menu_id}}{{if $mitem_id}}/{{$mitem_id}}{{/if}}{{if $sys}}?f=&sys=1{{/if}}" method="post" class="acl-form" data-form_id="mitemedit" data-allow_cid='{{$allow_cid}}' data-allow_gid='{{$allow_gid}}' data-deny_cid='{{$deny_cid}}' data-deny_gid='{{$deny_gid}}'>
 			<input type="hidden" name="menu_id" value="{{$menu_id}}" />
 			{{if $mitem_id}}
 			<input type="hidden" name="mitem_id" value="{{$mitem_id}}" />
diff --git a/view/tpl/mitemlist.tpl b/view/tpl/mitemlist.tpl
index b28cdfc7e..1e6302868 100644
--- a/view/tpl/mitemlist.tpl
+++ b/view/tpl/mitemlist.tpl
@@ -24,8 +24,8 @@
 				<td width="1%">{{$m.mitem_desc}}</td>
 				<td width="96%"><a href="{{$m.mitem_link}}">{{$m.mitem_link}}</a></td>
 				<td width="1%" class="mitem-list-tool dropdown">{{if $m.allow_cid || $m.allow_gid || $m.deny_cid || $m.deny_gid}}<i class="fa fa-lock lockview" data-toggle="dropdown" onclick="lockview('menu_item',{{$m.mitem_id}});" ></i><ul id="panel-{{$m.mitem_id}}" class="lockview-panel dropdown-menu"></ul>{{/if}}</td>
-				<td width="1%" class="mitem-list-tool"><a href="mitem/{{$menu_id}}/{{$m.mitem_id}}" title="{{$hintedit}}"><i class="fa fa-pencil"></i></a></td>
-				<td width="1%" class="mitem-list-tool"><a href="#" title="{{$hintdrop}}"  onclick="dropItem('mitem/{{$menu_id}}/{{$m.mitem_id}}/drop', '#mitem-list-item-{{$m.mitem_id}}, #pmenu-item-{{$m.mitem_id}}'); return false;"><i class="fa fa-trash-o drop-icons"></i></a></td>
+				<td width="1%" class="mitem-list-tool"><a href="mitem/{{$nick}}/{{$menu_id}}/{{$m.mitem_id}}" title="{{$hintedit}}"><i class="fa fa-pencil"></i></a></td>
+				<td width="1%" class="mitem-list-tool"><a href="#" title="{{$hintdrop}}"  onclick="dropItem('mitem/{{$nick}}/{{$menu_id}}/{{$m.mitem_id}}/drop', '#mitem-list-item-{{$m.mitem_id}}, #pmenu-item-{{$m.mitem_id}}'); return false;"><i class="fa fa-trash-o drop-icons"></i></a></td>
 			</tr>
 			{{/foreach}}
 		</table>
diff --git a/view/tpl/navbar_default.tpl b/view/tpl/navbar_default.tpl
index 7bc8df8d5..0eb0a964c 100755
--- a/view/tpl/navbar_default.tpl
+++ b/view/tpl/navbar_default.tpl
@@ -27,6 +27,9 @@
 		{{foreach $nav.usermenu as $usermenu}}
 		<a class="dropdown-item{{if $usermenu.2}} active{{/if}}"  href="{{$usermenu.0}}" title="{{$usermenu.3}}" role="menuitem" id="{{$usermenu.4}}">{{$usermenu.1}}</a>
 		{{/foreach}}
+		{{if $nav.group}}
+		<a class="dropdown-item" href="{{$nav.group.0}}" title="{{$nav.group.3}}" role="menuitem" id="{{$nav.group.4}}">{{$nav.group.1}}</a>
+		{{/if}}
 		{{if $nav.manage}}
 		<a class="dropdown-item{{if $sel.name == Manage}} active{{/if}}" href="{{$nav.manage.0}}" title="{{$nav.manage.3}}" role="menuitem" id="{{$nav.manage.4}}">{{$nav.manage.1}}</a>
 		{{/if}}	
@@ -119,7 +122,7 @@
 
 	<ul id="nav-right" class="navbar-nav ml-auto">
 		<li class="nav-item collapse clearfix" id="nav-search">
-			<form class="form-inline" method="get" action="search" role="search">
+			<form class="form-inline" method="get" action="{{$nav.search.4}}" role="search">
 				<input class="form-control form-control-sm mt-1 mr-2" id="nav-search-text" type="text" value="" placeholder="{{$help}}" name="search" title="{{$nav.search.3}}" onclick="this.submit();" onblur="closeMenu('nav-search'); openMenu('nav-search-btn');"/>
 			</form>
 			<div id="nav-search-spinner" class="spinner-wrapper">
diff --git a/view/tpl/notifications_widget.tpl b/view/tpl/notifications_widget.tpl
index 215fddd08..068441997 100644
--- a/view/tpl/notifications_widget.tpl
+++ b/view/tpl/notifications_widget.tpl
@@ -127,12 +127,20 @@
 		{{$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 clearfix notification {5}" 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 {5}" href="{0}" title="{2}" data-b64mid="{6}" data-notify_id="{7}" data-thread_top="{8}" data-contact_name="{2}">
 			<img class="menu-img-3" data-src="{1}">
 			<span class="contactname">{2}</span>
 			<span class="dropdown-sub-text">{3}<br>{4}</span>
 		</a>
 	</div>
+	<div id="nav-notifications-forums-template" rel="template">
+		<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">
 		{{foreach $notifications as $notification}}
 		<div class="collapse {{$notification.type}}-button">
@@ -152,15 +160,19 @@
 				</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="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="">
 					{{$loading}}<span class="jumping-dots"><span class="dot-1">.</span><span class="dot-2">.</span><span class="dot-3">.</span></span>
 				</div>
diff --git a/view/tpl/profile_tabs.tpl b/view/tpl/profile_tabs.tpl
index e77da23f3..dd9fbc52b 100644
--- a/view/tpl/profile_tabs.tpl
+++ b/view/tpl/profile_tabs.tpl
@@ -1,5 +1,5 @@
-<div class="dropdown-header text-white-50 d-lg-none" ><img src="{{$thumb}}" class="menu-img-1">{{$name}}</div>
-<div class="dropdown-header text-black-50 d-none d-lg-block"><img src="{{$thumb}}" class="menu-img-1">{{$name}}</div>
+<div class="dropdown-header text-white-50 d-lg-none" ><img src="{{$thumb}}" class="menu-img-1"> {{$name}}</div>
+<div class="dropdown-header text-black-50 d-none d-lg-block"><img src="{{$thumb}}" class="menu-img-1"> {{$name}}</div>
 {{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>
 {{/foreach}}
diff --git a/view/tpl/profile_vcard.tpl b/view/tpl/profile_vcard.tpl
index 07e6dcc0a..262bf257f 100755
--- a/view/tpl/profile_vcard.tpl
+++ b/view/tpl/profile_vcard.tpl
@@ -11,7 +11,7 @@
 		<a class="dropdown-toggle" data-toggle="dropdown" href="#" ><i class="fa fa-pencil" title="{{$editmenu.edit.1}}"></i></a>
 		<div class="dropdown-menu dropdown-menu-right" role="menu">
 			{{foreach $editmenu.menu.entries as $e}}
-			<a href="profiles/{{$e.id}}" class="dropdown-item"><img class="menu-img-1" src='{{$e.photo}}'>{{$e.profile_name}}</a>
+			<a href="profiles/{{$e.id}}" class="dropdown-item"><img class="menu-img-1" src='{{$e.photo}}'> {{$e.profile_name}}</a>
 			{{/foreach}}
 			<a href="profile_photo" class="dropdown-item">{{$editmenu.menu.chg_photo}}</a>
 			{{if $editmenu.menu.cr_new}}<a href="profiles/new" id="profile-listing-new-link" class="dropdown-item">{{$editmenu.menu.cr_new}}</a>{{/if}}
diff --git a/view/tpl/search_item.tpl b/view/tpl/search_item.tpl
index ebfb6a256..018e98989 100755
--- a/view/tpl/search_item.tpl
+++ b/view/tpl/search_item.tpl
@@ -23,7 +23,15 @@
 			<div class="p-2 clearfix wall-item-head{{if $item.is_new && !$item.title && !$item.event && !$item.is_comment}} wall-item-head-new rounded-top{{/if}}">
 				<div class="wall-item-info" id="wall-item-info-{{$item.id}}" >
 					<div class="wall-item-photo-wrapper{{if $item.owner_url}} wwfrom{{/if}}" id="wall-item-photo-wrapper-{{$item.id}}">
-						<a href="{{$item.profile_url}}" title="{{$item.linktitle}}" class="wall-item-photo-link" id="wall-item-photo-link-{{$item.id}}"><img src="{{$item.thumb}}" class="wall-item-photo{{$item.sparkle}}" id="wall-item-photo-{{$item.id}}" alt="{{$item.name}}" /></a>
+						<img src="{{$item.thumb}}" class="fakelink wall-item-photo{{$item.sparkle}} u-photo p-name" id="wall-item-photo-{{$item.id}}" alt="{{$item.name}}" data-toggle="dropdown" />
+						{{if $item.thread_author_menu}}
+						<i class="fa fa-caret-down wall-item-photo-caret cursor-pointer" data-toggle="dropdown"></i>
+						<div class="dropdown-menu">
+							{{foreach $item.thread_author_menu as $mitem}}
+							<a class="dropdown-item" {{if $mitem.href}}href="{{$mitem.href}}"{{/if}} {{if $mitem.action}}onclick="{{$mitem.action}}"{{/if}} {{if $mitem.title}}title="{{$mitem.title}}"{{/if}} >{{$mitem.title}}</a>
+							{{/foreach}}
+						</div>
+						{{/if}}
 					</div>
 				</div>
 				{{if $item.lock}}
@@ -54,69 +62,53 @@
 				<div class="body-tags">
 					<span class="tag">{{$item.mentions}} {{$item.tags}} {{$item.categories}} {{$item.folders}}</span>
 				</div>
-			{{**
-				{{if $item.mentions}}
-				<div class="body-tags" id="item-mentions">
-					<span class="tag">{{$item.mentions}}</span>
-				</div>
-				{{/if}}
-				{{if $item.tags}}
-				<div class="body-tags" id="item-tags">
-					<span class="tag">{{$item.tags}}</span>
-				</div>
-				{{/if}}
-				{{if $item.categories}}
-				<div class="body-tags" id="item-categories">
-					<span class="tag">{{$item.categories}}</span>
-				</div>
-				{{/if}}
-				{{if $item.folders}}
-				<div class="body-tags" id="item-folders">
-					<span class="tag">{{$item.folders}}</span>
-				</div>
-				{{/if}}
-			**}}
 			</div>
 			{{/if}}
 			<div class="p-2 clearfix wall-item-tools">
-				<div class="wall-item-tools-right btn-group pull-right">
-					<button type="button" class="btn btn-outline-secondary btn-sm dropdown-toggle" data-toggle="dropdown">
-						<i class="fa fa-cog"></i>
-					</button>
-					<div class="dropdown-menu dropdown-menu-right">
-						{{if $item.thread_action_menu}}
-						{{foreach $item.thread_action_menu as $mitem}}
-						<a class="dropdown-item" {{if $mitem.href}}href="{{$mitem.href}}"{{/if}} {{if $mitem.action}}onclick="{{$mitem.action}}"{{/if}} {{if $mitem.title}}title="{{$mitem.title}}"{{/if}} ><i class="fa fa-{{$mitem.icon}}"></i> {{$mitem.title}}</a></li>
-						{{/foreach}}
-						{{/if}}
-						{{if $item.drop.dropping}}
-						<a class="dropdown-item" href="item/drop/{{$item.id}}" onclick="return confirmDelete();" title="{{$item.drop.delete}}" ><i class="fa fa-trash-o"></i> {{$item.drop.delete}}</a></li>
-						{{/if}}
-						{{if $item.thread_author_menu}}
-						<div class="dropdown-divider"></div>
-						{{foreach $item.thread_author_menu as $mitem}}
-						<a class="dropdown-item" {{if $mitem.href}}href="{{$mitem.href}}"{{/if}} {{if $mitem.action}}onclick="{{$mitem.action}}"{{/if}} {{if $mitem.title}}title="{{$mitem.title}}"{{/if}} >{{$mitem.title}}</a></li>
-						{{/foreach}}
-						{{/if}}
+				<div class="float-right wall-item-tools-right">
+					<div class="btn-group">
+						<div id="like-rotator-{{$item.id}}" class="spinner-wrapper">
+							<div class="spinner s"></div>
+						</div>
 					</div>
+					<div class="btn-group">
+						<button type="button" class="btn btn-outline-secondary btn-sm dropdown-toggle" data-toggle="dropdown">
+							<i class="fa fa-cog"></i>
+						</button>
+						<div class="dropdown-menu dropdown-menu-right">
+							{{if $item.star}}
+							<a class="dropdown-item" href="#" onclick="dostar({{$item.id}}); return false;"><i id="starred-{{$item.id}}" class="fa fa-fw{{if $item.star.isstarred}} starred fa-star{{else}} unstarred fa-star-o{{/if}} generic-icons-nav" title="{{$item.star.toggle}}"></i>{{$item.star.toggle}}</a>
+							{{/if}}
+							{{if $item.thread_action_menu}}
+							{{foreach $item.thread_action_menu as $mitem}}
+							<a class="dropdown-item" {{if $mitem.href}}href="{{$mitem.href}}"{{/if}} {{if $mitem.action}}onclick="{{$mitem.action}}"{{/if}} {{if $mitem.title}}title="{{$mitem.title}}"{{/if}} ><i class="fa fa-fw fa-{{$mitem.icon}} generic-icons-nav"></i>{{$mitem.title}}</a></li>
+							{{/foreach}}
+							{{/if}}
+							{{if $item.drop.dropping}}
+							<a class="dropdown-item" href="item/drop/{{$item.id}}" onclick="return confirmDelete();" title="{{$item.drop.delete}}" ><i class="fa fa-fw fa-trash-o generic-icons-nav"></i>{{$item.drop.delete}}</a></li>
+							{{/if}}
+						</div>
+					</div>
+				</div>
+				{{if $item.star && $item.star.isstarred}}
+				<div class="btn-group" id="star-button-{{$item.id}}">
+					<button type="button" class="btn btn-outline-secondary btn-sm wall-item-like" onclick="dostar({{$item.id}});"><i class="fa fa-star"></i></button>
 				</div>
+				{{/if}}
 				{{if $item.attachments}}
 				<div class="wall-item-tools-left btn-group">
 					<button type="button" class="btn btn-outline-secondary btn-sm wall-item-like dropdown-toggle" data-toggle="dropdown" id="attachment-menu-{{$item.id}}"><i class="fa fa-paperclip"></i></button>
 					<div class="dropdown-menu">{{$item.attachments}}</div>
 				</div>
 				{{/if}}
-				{{if $item.mode === 'moderate'}}
 
-				<div class="wall-item-tools-left btn-group">
+				<div class="wall-item-tools-left btn-group" id="wall-item-tools-left-{{$item.id}}">
+					{{if $item.mode === 'moderate'}}
 					<a href="moderate/{{$item.id}}/approve" class="btn btn-success btn-sm">{{$item.approve}}</a>
 					<a href="moderate/{{$item.id}}/drop" class="btn btn-danger btn-sm">{{$item.delete}}</a>
-
+					{{/if}}
 				</div>
 
-
-
-				{{/if}}
 			</div>
 		</div>
 		{{if $item.conv}}
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>