Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge

3 files changed, 25 insertions, 0 deletions

diff --git a/Zotlabs/Widget/Activity_filter.php b/Zotlabs/Widget/Activity_filter.php
index b9c68da30..a123b739a 100644
--- a/Zotlabs/Widget/Activity_filter.php
+++ b/Zotlabs/Widget/Activity_filter.php
@@ -111,6 +111,13 @@ class Activity_filter {
 
 		if(x($_GET,'search')) {
 			$filter_active = 'search';
+			$tabs[] = [
+				'label' => t('Search'),
+				'icon' => 'search',
+				'url' => z_root() . '/' . $cmd . '/?f=&search=' . $_GET['search'],
+				'sel' => 'active disabled',
+				'title' => t('Panel search'),
+			];
 		}
 
 		$reset = [];
diff --git a/Zotlabs/Widget/Activity_order.php b/Zotlabs/Widget/Activity_order.php
index 93bfc5a26..534d6caee 100644
--- a/Zotlabs/Widget/Activity_order.php
+++ b/Zotlabs/Widget/Activity_order.php
@@ -84,18 +84,21 @@ class Activity_order {
 
 		$tabs[] = [
 			'label' => t('Commented Date'),
+			'icon' => '',
 			'url'=>z_root() . '/' . $cmd . '?f=&order=comment' . $filter,
 			'sel'=> $commentord_active,
 			'title' => t('Order by last commented date'),
 		];
 		$tabs[] = [
 			'label' => t('Posted Date'),
+			'icon' => '',
 			'url'=>z_root() . '/' . $cmd . '?f=&order=post' . $filter,
 			'sel'=> $postord_active,
 			'title' => t('Order by last posted date'),
 		];
 		$tabs[] = array(
 			'label' => t('Date Unthreaded'),
+			'icon' => '',
 			'url' => z_root() . '/' . $cmd . '?f=&order=unthreaded' . $filter,
 			'sel' => $unthreaded_active,
 			'title' => t('Order unthreaded by date'),
diff --git a/Zotlabs/Widget/Notifications.php b/Zotlabs/Widget/Notifications.php
index fc78a2a39..1be467ba6 100644
--- a/Zotlabs/Widget/Notifications.php
+++ b/Zotlabs/Widget/Notifications.php
@@ -111,6 +111,21 @@ class Notifications {
 					'label' => t('Mark all notices seen')
 				]
 			];
+
+			$notifications[] = [
+				'type' => 'forums',
+				'icon' => 'comments-o',
+				'severity' => 'secondary',
+				'label' => t('Forums'),
+				'title' => t('Forums'),
+				'viewall' => [
+					//'url' => 'notifications/system',
+					//'label' => t('View all notices')
+				],
+				'markall' => [
+					//'label' => t('Mark all notices seen')
+				]
+			];
 		}
 
 		if(local_channel() && is_site_admin()) {