Merge branch '2.8RC'

17 files changed, 136 insertions, 53 deletions

diff --git a/view/theme/redbasic/css/align_left.css b/view/theme/redbasic/css/align_left.css
deleted file mode 100644
index acb2893e3..000000000
--- a/view/theme/redbasic/css/align_left.css
+++ /dev/null
@@ -1,8 +0,0 @@
-main {
-	margin-left: 0px;
-}
-
-aside#region_3 {
-	width: auto;
-	padding: 0px 0px 0px 0px;
-}
diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index fd2ceb2c9..aea75df65 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -7,6 +7,7 @@
 
 
 /* generals */
+
 html {
 	font-size: $font_size;
 }
@@ -49,7 +50,7 @@ main {
 	height: 100%;
 	background: rgba(0, 0, 0, .5);
 	cursor: pointer;
-	z-index: 1029;
+	z-index: 1028;
 }
 
 h1, .h1 {
@@ -136,6 +137,7 @@ input, optgroup, select, textarea {
 
 pre code {
 	border: none;
+	padding: 1em 1.5em;
 }
 
 code {
@@ -147,6 +149,7 @@ pre {
 	background: #F5F5F5;
 	color: #333;
 	border:1px solid #ccc;
+	border-radius: $radius;
 }
 
 .heart {
@@ -158,6 +161,10 @@ nav {
 	filter:alpha(opacity=$nav_percent_min_opacity);
 }
 
+#nav-app-link {
+	white-space: nowrap;
+}
+
 #powered-by {
 	font-size: 0.5rem;
 	position: absolute;
@@ -226,6 +233,81 @@ nav {
 
 /* contextual help end */
 
+/* spinner */
+
+.spinner-wrapper {
+	display: none;
+}
+
+.spinner.s {
+	height: 1rem;
+	width: 1rem;
+}
+
+.spinner.m {
+	height: 2rem;
+	width: 2rem;
+}
+
+.spinner.l {
+	height: 3rem;
+	width: 3rem;
+}
+
+.spinner.s,
+.spinner.m,
+.spinner.l {
+	margin: 0 auto;
+	position: relative;
+	-webkit-animation: rotation 1s infinite linear;
+	-moz-animation: rotation 1s infinite linear;
+	-o-animation: rotation 1s infinite linear;
+	animation: rotation 1s infinite linear;
+	border-left: .2rem solid rgba(77, 77, 77, .15);
+	border-right: .2rem solid rgba(77, 77, 77, .15);
+	border-bottom: .2rem solid rgba(77, 77, 77, .15);
+	border-top: .2rem solid rgba(77, 77, 77, .5);
+	border-radius: 100%;
+}
+
+@-webkit-keyframes rotation {
+	from {
+		-webkit-transform: rotate(0deg);
+	}
+	to {
+		-webkit-transform: rotate(359deg);
+	}
+}
+
+@-moz-keyframes rotation {
+	from {
+		-moz-transform: rotate(0deg);
+	}
+	to {
+		-moz-transform: rotate(359deg);
+	}
+}
+
+@-o-keyframes rotation {
+	from {
+		-o-transform: rotate(0deg);
+	}
+	to {
+		-o-transform: rotate(359deg);
+	}
+}
+
+@keyframes rotation {
+	from {
+		transform: rotate(0deg);
+	}
+	to {
+		transform: rotate(359deg);
+	}
+}
+
+/* spinner end */
+
 /* footer */
 
 footer {
@@ -251,8 +333,7 @@ footer {
 	margin-top: 15px;
 }
 
-.preview {
-	background: url('../img/gray_and_white_diagonal_stripes_background_seamless.gif');
+.preview-indicator {
 }
 
 #theme-preview {
@@ -477,8 +558,8 @@ footer {
 
 #nav-search-spinner {
 	float: right;
-	margin-top: -0.85rem;
-	margin-right: 1.6rem;
+	margin-top: -1.4rem;
+	margin-right: 1rem;
 }
 
 
@@ -706,23 +787,21 @@ div.jGrowl div.jGrowl-notification {
 
 .contactname {
 	font-weight: bold;
+	color: $font_colour;
 	display: block;
 	overflow: hidden;
 	text-overflow: ellipsis;
 }
 
 .dropdown-notification,
+.notification,
 .member-item {
 	line-height: 1.1em;
 	font-size: 0.75rem;
 	overflow: hidden;
 	text-overflow: ellipsis;
 	display: block;
-}
-
-#page-spinner {
-	color: #777;
-	margin: 24px;
+	white-space: nowrap;
 }
 
 #acl-search::-webkit-input-placeholder {
@@ -972,10 +1051,6 @@ img.mail-conv-sender-photo {
 	display: none;
 }
 
-#profile-rotator {
-	color: #777;
-}
-
 .jot-icons.jot-lock-warn {
 	color: darkorange;
 }
@@ -1074,16 +1149,11 @@ img.mail-conv-sender-photo {
 }
 
 
-.comment-edit-text-empty,
-.comment-edit-text-full {
+.comment-edit-text {
 	border: 1px solid #ccc;
 	border-radius: $radius;
 }
 
-.comment-edit-text-empty {
-	color: gray;
-}
-
 .divgrow-showmore {
 	display: block;
 	border-top: 1px dashed #ccc;
@@ -1198,7 +1268,8 @@ img.mail-conv-sender-photo {
 .generic-content-wrapper {
 	border: 1px solid #ccc;
 	box-shadow: 0px 0px 5px 1px rgba(0,0,0,0.2);
-	border-radius:  $radius;
+	border-radius: $radius;
+	margin-bottom: 1.5rem;
 }
 
 .section-title-wrapper {
@@ -1390,6 +1461,10 @@ blockquote {
 	background-color: $nav_bg !important;
 }
 
+.navbar {
+	z-index:1030;
+}
+
 .navbar-dark .navbar-nav .nav-link,
 .usermenu i {
 	color: $nav_icon_colour;
diff --git a/view/theme/redbasic/img/bbedit.png b/view/theme/redbasic/img/bbedit.png
deleted file mode 100644
index b89f2f7a8..000000000
--- a/view/theme/redbasic/img/bbedit.png
+++ /dev/null
diff --git a/view/theme/redbasic/img/border.jpg b/view/theme/redbasic/img/border.jpg
deleted file mode 100644
index 034a1cb63..000000000
--- a/view/theme/redbasic/img/border.jpg
+++ /dev/null
diff --git a/view/theme/redbasic/img/editicons.png b/view/theme/redbasic/img/editicons.png
deleted file mode 100644
index 171a40876..000000000
--- a/view/theme/redbasic/img/editicons.png
+++ /dev/null
diff --git a/view/theme/redbasic/img/ff-16.jpg b/view/theme/redbasic/img/ff-16.jpg
deleted file mode 100644
index 3621f5914..000000000
--- a/view/theme/redbasic/img/ff-16.jpg
+++ /dev/null
diff --git a/view/theme/redbasic/img/file.gif b/view/theme/redbasic/img/file.gif
deleted file mode 100644
index c532335ed..000000000
--- a/view/theme/redbasic/img/file.gif
+++ /dev/null
diff --git a/view/theme/redbasic/img/friendika-16.png b/view/theme/redbasic/img/friendika-16.png
deleted file mode 100644
index 1a742ecdc..000000000
--- a/view/theme/redbasic/img/friendika-16.png
+++ /dev/null
diff --git a/view/theme/redbasic/img/jotperms.png b/view/theme/redbasic/img/jotperms.png
deleted file mode 100644
index d133a6e01..000000000
--- a/view/theme/redbasic/img/jotperms.png
+++ /dev/null
diff --git a/view/theme/redbasic/img/login-bg.gif b/view/theme/redbasic/img/login-bg.gif
deleted file mode 100644
index cde836c89..000000000
--- a/view/theme/redbasic/img/login-bg.gif
+++ /dev/null
diff --git a/view/theme/redbasic/img/notify_on.png b/view/theme/redbasic/img/notify_on.png
deleted file mode 100644
index 18002e15c..000000000
--- a/view/theme/redbasic/img/notify_on.png
+++ /dev/null
diff --git a/view/theme/redbasic/img/photo-menu.jpg b/view/theme/redbasic/img/photo-menu.jpg
deleted file mode 100644
index fde5eb535..000000000
--- a/view/theme/redbasic/img/photo-menu.jpg
+++ /dev/null
diff --git a/view/theme/redbasic/img/shiny.png b/view/theme/redbasic/img/shiny.png
deleted file mode 100644
index 994c0d05d..000000000
--- a/view/theme/redbasic/img/shiny.png
+++ /dev/null
diff --git a/view/theme/redbasic/js/redbasic.js b/view/theme/redbasic/js/redbasic.js
index 5a586b9f9..04199ea95 100644
--- a/view/theme/redbasic/js/redbasic.js
+++ b/view/theme/redbasic/js/redbasic.js
@@ -16,20 +16,26 @@ $(document).ready(function() {
 	}
 	$('#css3-calc').remove(); // Remove the test element
 
-
-
-	if($(window).width() > 767) {
+	if($(window).width() >= 767) {
 		$('#left_aside_wrapper').stick_in_parent({
-			offset_top: $('nav').outerHeight(true) + 10,
-			parent: '#region_1',
+			offset_top: parseInt($('aside').css('padding-top')),
+			parent: 'main',
 			spacer: '#left_aside_spacer'
 		});
 	}
 
-	if(($(window).width() < 767) && ($('#left_aside_wrapper .widget, #left_aside_wrapper .vcard').length > 0))
-		$('#expand-aside').show();
-	else
-		$('#expand-aside').hide();
+	if($(window).width() >= 1200) {
+		$('#right_aside_wrapper').stick_in_parent({
+			offset_top: parseInt($('aside').css('padding-top')),
+			parent: 'main',
+			spacer: '#right_aside_spacer'
+		});
+	}
+
+
+	$('#notifications_wrapper.fs #notifications').stick_in_parent({
+		parent: '#notifications_wrapper'
+	});
 
 	$('#expand-aside').on('click', toggleAside);
 
@@ -48,6 +54,16 @@ $(document).ready(function() {
 		}
 	});
 
+
+	var right_aside_height = $('#rightt_aside_wrapper').height();
+
+	$('#right_aside_wrapper').on('click', function() {
+		if(right_aside_height != $('#right_aside_wrapper').height()) {
+			$(document.body).trigger("sticky_kit:recalc");
+			right_aside_height = $('#right_aside_wrapper').height();
+		}
+	});
+
 	$('.usermenu').click(function() {
 		if($('#navbar-collapse-1, #navbar-collapse-2').hasClass('show')){
 			$('#navbar-collapse-1, #navbar-collapse-2').removeClass('show');
@@ -66,6 +82,19 @@ $(document).ready(function() {
 		}
 	});
 
+	var notifications_parent = $('#notifications_wrapper')[0].parentElement.id;
+	$('#notifications-btn').click(function() {
+		if($('#notifications_wrapper').hasClass('fs'))
+			$('#notifications_wrapper').prependTo('#' + notifications_parent);
+		else
+			$('#notifications_wrapper').prependTo('section');
+
+		$('#notifications_wrapper').toggleClass('fs');
+		if($('#navbar-collapse-2').hasClass('show')){
+			$('#navbar-collapse-2').removeClass('show');
+		}
+	});
+
 	$("input[data-role=cat-tagsinput]").tagsinput({
 		tagClass: 'badge badge-pill badge-warning text-dark'
 	});
diff --git a/view/theme/redbasic/php/config.php b/view/theme/redbasic/php/config.php
index 8dbe1be9c..f98182739 100644
--- a/view/theme/redbasic/php/config.php
+++ b/view/theme/redbasic/php/config.php
@@ -52,7 +52,6 @@ class RedbasicConfig {
 		$arr['radius'] = get_pconfig(local_channel(),'redbasic', 'radius' );
 		$arr['shadow'] = get_pconfig(local_channel(),'redbasic', 'photo_shadow' );
 		$arr['converse_width']=get_pconfig(local_channel(),"redbasic","converse_width");
-		$arr['align_left']=get_pconfig(local_channel(),"redbasic","align_left");
 		$arr['top_photo']=get_pconfig(local_channel(),"redbasic","top_photo");
 		$arr['reply_photo']=get_pconfig(local_channel(),"redbasic","reply_photo");
 		return $this->form($arr);
@@ -79,7 +78,6 @@ class RedbasicConfig {
 			set_pconfig(local_channel(), 'redbasic', 'radius', $_POST['redbasic_radius']);
 			set_pconfig(local_channel(), 'redbasic', 'photo_shadow', $_POST['redbasic_shadow']);
 			set_pconfig(local_channel(), 'redbasic', 'converse_width', $_POST['redbasic_converse_width']);
-			set_pconfig(local_channel(), 'redbasic', 'align_left', $_POST['redbasic_align_left']);
 			set_pconfig(local_channel(), 'redbasic', 'top_photo', $_POST['redbasic_top_photo']);
 			set_pconfig(local_channel(), 'redbasic', 'reply_photo', $_POST['redbasic_reply_photo']);
 		}
@@ -112,7 +110,6 @@ class RedbasicConfig {
 			'$radius' => array('redbasic_radius', t('Set radius of corners'), $arr['radius'], t('Example: 4px')),
 			'$shadow' => array('redbasic_shadow', t('Set shadow depth of photos'), $arr['shadow']),
 			'$converse_width' => array('redbasic_converse_width',t('Set maximum width of content region in pixel'),$arr['converse_width'], t('Leave empty for default width')),
-			'$align_left' => array('redbasic_align_left',t('Left align page content'),$arr['align_left'], '', array(t('No'),t('Yes'))),
 			'$top_photo' => array('redbasic_top_photo', t('Set size of conversation author photo'), $arr['top_photo']),
 			'$reply_photo' => array('redbasic_reply_photo', t('Set size of followup author photos'), $arr['reply_photo']),
 			));
diff --git a/view/theme/redbasic/php/style.php b/view/theme/redbasic/php/style.php
index e5a6eb0cd..91cc0b85b 100644
--- a/view/theme/redbasic/php/style.php
+++ b/view/theme/redbasic/php/style.php
@@ -26,7 +26,6 @@ if(! App::$install) {
 	$radius = get_pconfig($uid, 'redbasic', 'radius');
 	$shadow = get_pconfig($uid,'redbasic','photo_shadow');
 	$converse_width=get_pconfig($uid,'redbasic','converse_width');
-	$align_left=get_pconfig($uid,'redbasic','align_left');
 	$top_photo=get_pconfig($uid,'redbasic','top_photo');
 	$reply_photo=get_pconfig($uid,'redbasic','reply_photo');
 }
@@ -117,10 +116,6 @@ if(file_exists('view/theme/redbasic/css/style.css')) {
 		$x .= file_get_contents('view/theme/redbasic/css/narrow_navbar.css');
 	}
 
-	if($align_left && file_exists('view/theme/redbasic/css/align_left.css')) {
-		$x .= file_get_contents('view/theme/redbasic/css/align_left.css');
-	}
-
 	if($schemecss) {
 		$x .= $schemecss;
 	}
@@ -128,12 +123,8 @@ if(file_exists('view/theme/redbasic/css/style.css')) {
 	$aside_width = 288;
 
 	// left aside and right aside are 285px + converse width
-	if($align_left) {
-		$main_width = (($aside_width) + intval($converse_width));
-	}
-	else {
-		$main_width = (($aside_width * 2) + intval($converse_width));
-	}
+	$main_width = (($aside_width * 2) + intval($converse_width));
+
 	// prevent main_width smaller than 768px
 	$main_width = (($main_width < 768) ? 768 : $main_width);
 
diff --git a/view/theme/redbasic/tpl/theme_settings.tpl b/view/theme/redbasic/tpl/theme_settings.tpl
index f90e37ac3..7c552b49e 100644
--- a/view/theme/redbasic/tpl/theme_settings.tpl
+++ b/view/theme/redbasic/tpl/theme_settings.tpl
@@ -1,4 +1,3 @@
-{{include file="field_checkbox.tpl" field=$align_left}}
 {{include file="field_checkbox.tpl" field=$narrow_navbar}}
 {{include file="field_input.tpl" field=$converse_width}}
 {{include file="field_input.tpl" field=$font_size}}