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

Zotlabs/Module/Apporder.php

@@ -11,30 +11,35 @@ class Apporder extends \Zotlabs\Web\Controller {
 	}
 
 	function get() {
-       $syslist = array();
-        $list = Zlib\Apps::app_list(local_channel(), false, 'nav_featured_app');
-        if($list) {
-            foreach($list as $li) {
-                $syslist[] = Zlib\Apps::app_encode($li);
-            }
-        }
-        Zlib\Apps::translate_system_apps($syslist);
 
-	    usort($syslist,'Zotlabs\\Lib\\Apps::app_name_compare');
+		if(! local_channel())
+			return;
 
-    	$syslist = Zlib\Apps::app_order(local_channel(),$syslist);
+		nav_set_selected('Order Apps');
 
-	    foreach($syslist as $app) {
+		$syslist = array();
-    	    $nav_apps[] = Zlib\Apps::app_render($app,'nav-order');
+		$list = Zlib\Apps::app_list(local_channel(), false, 'nav_featured_app');
+		if($list) {
+			foreach($list as $li) {
+				$syslist[] = Zlib\Apps::app_encode($li);
+			}
+		}
+		Zlib\Apps::translate_system_apps($syslist);
 
+		usort($syslist,'Zotlabs\\Lib\\Apps::app_name_compare');
+
+		$syslist = Zlib\Apps::app_order(local_channel(),$syslist);
+
+		foreach($syslist as $app) {
+			$nav_apps[] = Zlib\Apps::app_render($app,'nav-order');
 		}
 
-	return replace_macros(get_markup_template('apporder.tpl'),
+		return replace_macros(get_markup_template('apporder.tpl'),
-		[
+			[
-			'$header' => t('Change Order of Navigation Apps'),
+				'$header' => t('Change Order of Navigation Apps'),
-			'$desc' => t('Use arrows to move the corresponding app up or down in the display list'),
+				'$desc' => t('Use arrows to move the corresponding app up or down in the display list'),
-			'$nav_apps' => $nav_apps
+				'$nav_apps' => $nav_apps
-		]
+			]
-	);
+		);
 	}
 }

Zotlabs/Module/Apps.php

@@ -7,6 +7,8 @@ use \Zotlabs\Lib as Zlib;
 class Apps extends \Zotlabs\Web\Controller {
 
 	function get() {
+
+		nav_set_selected('Apps');
 	
 		if(argc() == 2 && argv(1) == 'edit')
 			$mode = 'edit';

Zotlabs/Widget/Notifications.php

@@ -120,21 +120,23 @@ class Notifications {
 			];
 		}
 
-		$notifications[] = [
+		if(get_config('system', 'disable_discover_tab') != 1) {
-			'type' => 'pubs',
+			$notifications[] = [
-			'icon' => 'globe',
+				'type' => 'pubs',
-			'severity' => 'secondary',
+				'icon' => 'globe',
-			'label' => t('Public Stream'),
+				'severity' => 'secondary',
-			'title' => t('Public Stream Notifications'),
+				'label' => t('Public Stream'),
-			'viewall' => [
+				'title' => t('Public Stream Notifications'),
-				'url' => 'pubstream',
+				'viewall' => [
-				'label' => t('View the public stream')
+					'url' => 'pubstream',
-			],
+					'label' => t('View the public stream')
-			'markall' => [
+				],
-				'url' => '#',
+				'markall' => [
-				'label' => t('Mark all notifications seen')
+					'url' => '#',
-			]
+					'label' => t('Mark all notifications seen')
-		];
+				]
+			];
+		}
 
 		$o = replace_macros(get_markup_template('notifications_widget.tpl'), array(
 			'$notifications' => $notifications,

view/css/widgets.css

@@ -57,7 +57,13 @@ li:hover .widget-nav-pills-icons {
 
 /*  affinity slider */
 #main-slider {
-	margin: 10px 7px 45px 7px;
+	margin: 10px 7px 4rem 7px;
+}
+
+@media screen and (max-width: 767px) {
+	#main-slider {
+		margin: 4rem 7px 4rem 7px;
+	}
 }
 
 /* posted date */

view/pdl/mod_network.pdl

@@ -1,5 +1,3 @@
-[region=nav]$nav[/region]
-
 [region=aside]
 [widget=collections][/widget]
 [widget=forums][/widget]

view/theme/redbasic/css/style.css

@@ -50,7 +50,7 @@ main {
 	height: 100%;
 	background: rgba(0, 0, 0, .5);
 	cursor: pointer;
-	z-index: 1029;
+	z-index: 1028;
 }
 
 h1, .h1 {

view/theme/redbasic/js/redbasic.js

@@ -83,7 +83,7 @@ $(document).ready(function() {
 	});
 
 	var notifications_parent = $('#notifications_wrapper')[0].parentElement.id;
-	$('#notifications-btn-1').click(function() {
+	$('#notifications-btn').click(function() {
 		if($('#notifications_wrapper').hasClass('fs'))
 			$('#notifications_wrapper').prependTo('#' + notifications_parent);
 		else

view/tpl/app_nav.tpl

@@ -1 +1 @@
-<a class="navbar-app nav-link{{if $app.active}} active{{/if}}" href="{{$app.url}}" title="{{$app.name}}" >{{if $icon}}<i class="generic-icons-nav fa fa-fw fa-{{$icon}}"></i>{{else}}<img src="{{$app.photo}}" width="16" height="16" />{{/if}}</a>
+<a class="navbar-app nav-link{{if $app.active}} active{{/if}}" href="{{$app.url}}" title="{{$app.name}}" >{{if $icon}}<i class="fa fa-fw fa-{{$icon}}"></i>{{else}}<img src="{{$app.photo}}" width="16" height="16" />{{/if}}</a>

view/tpl/main_slider.tpl

@@ -1,5 +1,9 @@
-<div id="main-slider" class="slider" ><input id="main-range" type="text" name="cminmax" value="{{$val}}" /></div>
+<div id="main-slider" class="slider" >
-<div id="profile-jot-text-loading" class="spinner-wrapper"><div class="spinner m"></div></div>
+	<input id="main-range" type="text" name="cminmax" value="{{$val}}" />
+	<div id="profile-jot-text-loading" class="spinner-wrapper">
+		<div class="spinner m"></div>
+	</div>
+</div>
 <script>
 $(document).ready(function() {
 	var old_cmin = 0;

view/tpl/navbar_default.tpl

@@ -67,7 +67,7 @@
 		<i class="fa fa-arrow-circle-right" id="expand-aside-icon"></i>
 	</button>
 	{{if $localuser || $nav.pubs}}
-	<button id="notifications-btn-1" type="button" class="navbar-toggler border-0 text-white">
+	<button id="notifications-btn" type="button" class="navbar-toggler border-0 text-white">
 		<i class="fa fa-exclamation-circle"></i>
 	</button>
 	{{/if}}
@@ -107,6 +107,13 @@
 			</div>
 		</li>
 		{{/if}}
+		{{if $navbar_apps}}
+		{{foreach $navbar_apps as $navbar_app}}
+		<li>
+		{{$navbar_app}}
+		</li>
+		{{/foreach}}
+		{{/if}}
 		<li class="nav-item dropdown" id="app-menu">
 			<a class="nav-link" href="#" data-toggle="dropdown"><i class="fa fa-fw fa-bars"></i></a>
 			<div id="dropdown-menu" class="dropdown-menu dropdown-menu-right">

view/tpl/notifications_widget.tpl

@@ -17,7 +17,7 @@
 		width: 100%;
 		max-width: 100%;
 		height: 100%;
-		z-index: 1025;
+		z-index: 1029;
 		overflow: auto;
 	}
 
@@ -26,6 +26,7 @@
 	}
 </style>
 
+{{if $notifications}}
 <div id="notifications_wrapper">
 	<div id="notifications" class="navbar-nav" data-children=".nav-item">
 		<div id="nav-notifications-template" rel="template">
@@ -43,10 +44,14 @@
 			</a>
 			<div id="nav-{{$notification.type}}-menu" class="collapse notification-content" rel="{{$notification.type}}">
 				{{if $notification.viewall}}
-				<a class="list-group-item" id="nav-{{$notification.type}}-see-all" href="{{$notification.viewall.url}}">{{$notification.viewall.label}}</a>
+				<a class="list-group-item 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}}
-				<a class="list-group-item" id="nav-{{$notification.type}}-mark-all" href="{{$notification.markall.url}}" onclick="markRead('{{$notification.type}}'); return false;">{{$notification.markall.label}}</a>
+				<a class="list-group-item text-dark" id="nav-{{$notification.type}}-mark-all" href="{{$notification.markall.url}}" onclick="markRead('{{$notification.type}}'); return false;">
+					<i class="fa fa-fw fa-check"></i> {{$notification.markall.label}}
+				</a>
 				{{/if}}
 				{{$loading}}
 			</div>
@@ -54,3 +59,4 @@
 		{{/foreach}}
 	</div>
 </div>
+{{/if}}