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

6 files changed, 58 insertions, 59 deletions

diff --git a/view/php/default.php b/view/php/default.php
index 06cecc56f..60f3f6a6f 100644
--- a/view/php/default.php
+++ b/view/php/default.php
@@ -10,12 +10,12 @@
 	<header><?php if(x($page,'header')) echo $page['header']; ?></header>
 	<nav class="navbar fixed-top navbar-expand-lg navbar-dark bg-dark"><?php if(x($page,'nav')) echo $page['nav']; ?></nav>
 	<main>
-		<aside id="region_1"><div id="left_aside_spacer"><div id="left_aside_wrapper"><?php if(x($page,'aside')) echo $page['aside']; ?></div></div></aside>
+		<aside id="region_1"><div class="aside_spacer"><div id="left_aside_wrapper"><?php if(x($page,'aside')) echo $page['aside']; ?></div></div></aside>
 		<section id="region_2"><?php if(x($page,'content')) echo $page['content']; ?>
 					<div id="page-footer"></div>
 			<div id="pause"></div>
 		</section>
-		<aside id="region_3" class="d-none d-xl-table-cell"><div id="right_aside_spacer"><div id="right_aside_wrapper"><?php if(x($page,'right_aside')) echo $page['right_aside']; ?></div></div></aside>
+		<aside id="region_3" class="d-none d-xl-table-cell"><div class="aside_spacer"><div id="right_aside_wrapper"><?php if(x($page,'right_aside')) echo $page['right_aside']; ?></div></div></aside>
 	</main>
 	<footer><?php if(x($page,'footer')) echo $page['footer']; ?></footer>
 </body>
diff --git a/view/theme/redbasic/js/redbasic.js b/view/theme/redbasic/js/redbasic.js
index c905c92cb..70d196a02 100644
--- a/view/theme/redbasic/js/redbasic.js
+++ b/view/theme/redbasic/js/redbasic.js
@@ -18,26 +18,12 @@ $(document).ready(function() {
 	$('#css3-calc').remove(); // Remove the test element
 
 	if($(window).width() >= 992) {
-		$('#left_aside_wrapper').stick_in_parent({
-			offset_top: parseInt($('aside').css('padding-top')),
-			parent: 'main',
-			spacer: '#left_aside_spacer'
-		});
-	}
-
-	if($(window).width() >= 992) {
-		$('#right_aside_wrapper').stick_in_parent({
+		$('#left_aside_wrapper, #right_aside_wrapper').stick_in_parent({
 			offset_top: parseInt($('aside').css('padding-top')),
-			parent: 'main',
-			spacer: '#right_aside_spacer'
+			parent: 'main'
 		});
 	}
 
-
-	$('#notifications_wrapper.fs #notifications').stick_in_parent({
-		parent: '#notifications_wrapper'
-	});
-
 	$('#expand-aside').on('click', toggleAside);
 
 	$('section').on('click', function() {
diff --git a/view/theme/redbasic/php/theme_init.php b/view/theme/redbasic/php/theme_init.php
index d9750de42..5f73f6736 100644
--- a/view/theme/redbasic/php/theme_init.php
+++ b/view/theme/redbasic/php/theme_init.php
@@ -1,14 +1,14 @@
 <?php
 
 head_add_css('/library/fork-awesome/css/fork-awesome.min.css');
-head_add_css('/library/bootstrap/css/bootstrap.min.css');
+head_add_css('/vendor/twbs/bootstrap/dist/css/bootstrap.min.css');
 head_add_css('/library/bootstrap-tagsinput/bootstrap-tagsinput.css');
 head_add_css('/view/css/bootstrap-red.css');
 head_add_css('/library/datetimepicker/jquery.datetimepicker.css');
 head_add_css('/library/bootstrap-colorpicker/dist/css/bootstrap-colorpicker.min.css');
 require_once('view/php/theme_init.php');
 
-head_add_js('/library/bootstrap/js/bootstrap.bundle.min.js');
+head_add_js('/vendor/twbs/bootstrap/dist/js/bootstrap.bundle.min.js');
 head_add_js('/library/bootbox/bootbox.min.js');
 head_add_js('/library/bootstrap-tagsinput/bootstrap-tagsinput.js');
 head_add_js('/library/datetimepicker/jquery.datetimepicker.js');
diff --git a/view/tpl/app.tpl b/view/tpl/app.tpl
index 7d2e46c59..3245a86e0 100644
--- a/view/tpl/app.tpl
+++ b/view/tpl/app.tpl
@@ -11,11 +11,11 @@
 		<a href="{{$app.page}}" class="btn btn-outline-secondary" title="{{$purchase}}" ><i class="fa fa-external"></i></a>
 	</div>
 	{{/if}}
-	{{if $install || $update || $delete || $feature}}
+	{{if $action_label || $update || $delete || $feature}}
 	<div class="text-center app-tools">
 		<form action="{{$hosturl}}appman" method="post">
 		<input type="hidden" name="papp" value="{{$app.papp}}" />
-		{{if $install}}<button type="submit" name="install" value="{{$install}}" class="btn btn-outline-secondary btn-sm" title="{{$install}}" ><i class="fa fa-fw fa-arrow-circle-o-down" ></i></button>{{/if}}
+		{{if $action_label}}<button type="submit" name="install" value="{{$action_label}}" class="btn btn-outline-{{if $installed}}secondary{{else}}success{{/if}} btn-sm" title="{{$action_label}}" ><i class="fa fa-fw {{if $installed}}fa-refresh{{else}}fa-arrow-circle-o-down{{/if}}" ></i> {{$action_label}}</button>{{/if}}
 		{{if $edit}}<input type="hidden" name="appid" value="{{$app.guid}}" /><button type="submit" name="edit" value="{{$edit}}" class="btn btn-outline-secondary btn-sm" title="{{$edit}}" ><i class="fa fa-fw fa-pencil" ></i></button>{{/if}}
 		{{if $delete}}<button type="submit" name="delete" value="{{if $deleted}}{{$undelete}}{{else}}{{$delete}}{{/if}}" class="btn btn-outline-secondary btn-sm" title="{{if $deleted}}{{$undelete}}{{else}}{{$delete}}{{/if}}" ><i class="fa fa-fw fa-trash-o drop-icons"></i></button>{{/if}}
 		{{if $feature}}<button type="submit" name="feature" value="nav_featured_app" class="btn btn-outline-secondary btn-sm" title="{{if $featured}}{{$remove}}{{else}}{{$add}}{{/if}}"><i class="fa fa-fw fa-star{{if $featured}} text-warning{{/if}}"></i></button>{{/if}}
diff --git a/view/tpl/cover_photo_widget.tpl b/view/tpl/cover_photo_widget.tpl
index 2de3c74be..7739d24b8 100755
--- a/view/tpl/cover_photo_widget.tpl
+++ b/view/tpl/cover_photo_widget.tpl
@@ -3,66 +3,57 @@
 	var section_padding_top;
 	var coverSlid = false;
 	var hide_cover = Boolean({{$hide_cover}});
+	var cover_height;
 
 	$(document).ready(function() {
 		if(! $('#cover-photo').length)
 			return;
 
-		aside_padding_top = parseInt($('aside').css('padding-top'));
-		section_padding_top = parseInt($('section').css('padding-top'));
-
-		$(document).on('click mouseup keyup', slideUpCover);
+		if($(window).width() < 755) {
+			$('#cover-photo').remove();
+			coverSlid = true;
+			return;
+		}
 
-		if($(window).width() > 755) {
-			$('#cover-photo').removeClass('d-none');
-			datasrc2src('#cover-photo > img');
+		$('#cover-photo').removeClass('d-none');
+		cover_height = Math.ceil($(window).width()/2.75862069);
+		$('#cover-photo').css('height', cover_height + 'px');
+		datasrc2src('#cover-photo > img');
 
-			if(hide_cover) {
-				hideCover();
-				coverSlid = true;
-			}
+		$(document).on('click mouseup keyup', slideUpCover);
 
-			if($(window).scrollTop() < $('#cover-photo').height()) {
-				$('body').css('cursor', 'n-resize');
-				$('.navbar').removeClass('fixed-top');
-				$('main').css('margin-top', - $('nav').outerHeight(true) + 'px');
-				$('main').css('opacity', 0);
-			}
+		if(hide_cover) {
+			hideCover();
 		}
-		else {
-			$('#cover-photo').remove();
-			coverSlid = true;
+		else if(!hide_cover && !coverSlid)  {
+			coverVisibleActions();
 		}
 	});
 
 	$(window).scroll(function () {
-		if($(window).width() > 755 && $(window).scrollTop() >= $('#cover-photo').height()) {
-			$('body').css('cursor', '');
-			$('.navbar').addClass('fixed-top');
-			$('main').css('margin-top', '');
-			$('main').css('opacity', 1);
+		if($(window).scrollTop() >= cover_height) {
+			coverHiddenActions();
 			coverSlid = true;
 		}
-		else if ($(window).width() > 755 && $(window).scrollTop() < $('#cover-photo').height()){
+		else if ($(window).scrollTop() < cover_height){
 			if(coverSlid) {
-				$(window).scrollTop(Math.ceil($('#cover-photo').height()));
+				$(window).scrollTop(cover_height);
 				setTimeout(function(){ coverSlid = false; }, 1000);
 			}
 			else {
-				if($(window).scrollTop() < $('#cover-photo').height()) {
-					$('body').css('cursor', 'n-resize');
-					$('.navbar').removeClass('fixed-top');
-					$('main').css('margin-top', - $('nav').outerHeight(true) + 'px');
-					$('main').css('opacity', 0);
+				if($(window).scrollTop() < cover_height) {
+					coverVisibleActions();
 				}
 			}
 		}
 		if($('main').css('opacity') < 1) {
-			$('main').css('opacity', ($(window).scrollTop()/$('#cover-photo').height()).toFixed(1));
+			$('main').css('opacity', ($(window).scrollTop()/cover_height).toFixed(1));
 		}
 	});
 
 	$(window).resize(function () {
+		cover_height = Math.ceil($(window).width()/2.75862069);
+		$('#cover-photo').css('height', cover_height + 'px');
 		if($(window).width() < 755) {
 			$('#cover-photo').remove();
 			$('.navbar').addClass('fixed-top');
@@ -76,7 +67,7 @@
 		if(coverSlid) {
 			return;
 		}
-		$('html, body').animate({scrollTop: Math.ceil($('#cover-photo').height()) + 'px' }, 'fast');
+		$('html, body').animate({scrollTop: cover_height + 'px'}, 'fast');
 		return;
 	}
 
@@ -84,7 +75,22 @@
 		if(coverSlid) {
 			return;
 		}
-		window.scrollTo(0, Math.ceil($('#cover-photo').height()));
+		window.scrollTo(0, cover_height);
+		return;
+	}
+
+	function coverVisibleActions() {
+		$('body').css('cursor', 'n-resize');
+		$('.navbar').removeClass('fixed-top');
+		$('main').css('margin-top', - $('nav').outerHeight(true) + 'px');
+		$('main').css('opacity', 0);
+	}
+
+	function coverHiddenActions() {
+		$('body').css('cursor', '');
+		$('.navbar').addClass('fixed-top');
+		$('main').css('margin-top', '');
+		$('main').css('opacity', 1);
 	}
 </script>
 
diff --git a/view/tpl/notifications_widget.tpl b/view/tpl/notifications_widget.tpl
index 068441997..9b3d7487e 100644
--- a/view/tpl/notifications_widget.tpl
+++ b/view/tpl/notifications_widget.tpl
@@ -5,10 +5,17 @@
 	$(document).ready(function() {
 		notifications_parent = $('#notifications_wrapper')[0].parentElement.id;
 		$('.notifications-btn').click(function() {
-			if($('#notifications_wrapper').hasClass('fs'))
+			if($('#notifications_wrapper').hasClass('fs')) {
 				$('#notifications_wrapper').prependTo('#' + notifications_parent);
-			else
+				//undo scrollbar remove
+				$('section').css('height', '');
+			}
+			else {
 				$('#notifications_wrapper').prependTo('section');
+				//remove superfluous scrollbar
+				//setting overflow to hidden here has issues with some browsers
+				$('section').css('height', '100vh');
+			}
 
 			$('#notifications_wrapper').toggleClass('fs');
 			if($('#navbar-collapse-2').hasClass('show')){