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

13 files changed, 99 insertions, 52 deletions

diff --git a/view/css/widgets.css b/view/css/widgets.css
index 402c3f473..abaf03038 100644
--- a/view/css/widgets.css
+++ b/view/css/widgets.css
@@ -65,7 +65,7 @@ li:hover .widget-nav-pills-icons {
 	padding: 5px;
 	width: 100%;
 	resize: vertical;
-	height: 250px;
+	min-height: 250px;
 }
 
 /* saved searches */
diff --git a/view/js/acl.js b/view/js/acl.js
index c11997c43..4dd60d303 100644
--- a/view/js/acl.js
+++ b/view/js/acl.js
@@ -276,6 +276,7 @@ ACL.prototype.update_view = function(value) {
 
 		/* jot acl */
 		$('#jot-perms-icon, #dialog-perms-icon, #' + that.form_id[0].id + ' .jot-perms-icon').removeClass('fa-lock').addClass('fa-unlock');
+		$('#jot-perms-icon').removeClass('jot-lock-warn');
 		$('#dbtn-jotnets').show();
 		$('.profile-jot-net input').attr('disabled', false);
 
diff --git a/view/js/main.js b/view/js/main.js
index 1d6eca91d..bfe9d25a3 100644
--- a/view/js/main.js
+++ b/view/js/main.js
@@ -1164,7 +1164,6 @@ function preview_mail() {
 	return true;
 }
 
-
 function unpause() {
 	// unpause auto reloads if they are currently stopped
 	totStopped = false;
diff --git a/view/php/default.php b/view/php/default.php
index f5be4fa35..839a36b5b 100644
--- a/view/php/default.php
+++ b/view/php/default.php
@@ -10,7 +10,7 @@
 	<header><?php if(x($page,'header')) echo $page['header']; ?></header>
 	<nav class="navbar navbar-inverse navbar-fixed-top" role="navigation"><?php if(x($page,'nav')) echo $page['nav']; ?></nav>
 	<main>
-		<aside id="region_1"><?php if(x($page,'aside')) echo $page['aside']; ?></aside>
+		<aside id="region_1"><div id="left_aside_wrapper"><?php if(x($page,'aside')) echo $page['aside']; ?></div></aside>
 		<section id="region_2"><?php if(x($page,'content')) echo $page['content']; ?>
 					<div id="page-footer"></div>
 			<div id="pause"></div>
diff --git a/view/php/theme_init.php b/view/php/theme_init.php
index 46aadaa7d..1fb07ae4f 100644
--- a/view/php/theme_init.php
+++ b/view/php/theme_init.php
@@ -26,6 +26,7 @@ head_add_js('library/jquery-textcomplete/jquery.textcomplete.js');
 //head_add_js('library/colorbox/jquery.colorbox.js');
 head_add_js('library/jquery.timeago.js');
 head_add_js('library/readmore.js/readmore.js');
+head_add_js('library/sticky-kit/sticky-kit.min.js');
 //head_add_js('library/jquery_ac/friendica.complete.js');
 //head_add_js('library/tiptip/jquery.tipTip.minified.js');
 head_add_js('library/jgrowl/jquery.jgrowl_minimized.js');
diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index 3ae52d5cc..c66b040a4 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -22,6 +22,8 @@ body {
 	color: $font_colour;
 	margin: 0px;
 	height: 100%;
+	overflow-x: hidden;
+	
 }
 
 aside {
@@ -30,6 +32,10 @@ aside {
 	max-width: $aside_widthpx;
 }
 
+aside#region_1 {
+	border-right: 1px solid transparent;
+}
+
 main {
 	margin-left: auto;
 	margin-right: auto;
@@ -473,7 +479,6 @@ footer {
 
 #contact-block {
 	width: 100%;
-	float: left;
 }
 
 #contact-block-numcontacts {
@@ -482,12 +487,10 @@ footer {
 }
 
 .contact-block-div {
-	float: left;
-	width: 50px;
-	height: 50px;
+	display: inline;
 }
+
 .contact-block-textdiv {
-	float: left;
 	width: 150px;
 	height: 34px;
 }
@@ -495,12 +498,11 @@ footer {
 #contact-block-end {
 	clear: both;
 }
-.contact-block-link {
-	float: left;
-}
+
 .contact-block-img {
-	width:48px;
-	height:48px;
+	width:47px;
+	height:47px;
+	margin-bottom: 3px;
 }
 
 #tag-remove {
@@ -1267,6 +1269,11 @@ img.mail-conv-sender-photo {
 	color: $toolicon_colour;
 }
 
+.jot-icons.jot-lock-warn {
+	color: darkorange;
+}
+
+
 /* conversation */
 .nsfw-wrap {
 	text-align: center;
@@ -1838,10 +1845,6 @@ nav .badge.mail-update:hover {
 	}
 
 	main {
-		transition: all 0.25s ease-in-out;
-	}
-
-	main {
 		left: -$aside_widthpx;
 		width: calc( 100% + $aside_widthpx );
 	}
diff --git a/view/theme/redbasic/js/redbasic.js b/view/theme/redbasic/js/redbasic.js
index c5f74db3f..4a18db8ff 100644
--- a/view/theme/redbasic/js/redbasic.js
+++ b/view/theme/redbasic/js/redbasic.js
@@ -8,17 +8,32 @@ $(document).ready(function() {
 	if( $('#css3-calc').width() == 10) {
 		$(window).resize(function() {
 			if($(window).width() < 767) {
-				$('main').css('width', $(window).width() + 287 );
+				$('main').css('width', $(window).width() + $('aside').outerWidth() );
 			} else {
 				$('main').css('width', '100%' );
 			}
 		});
 	}
+
 	$('#css3-calc').remove(); // Remove the test element
 
-	$('#expand-aside').click(function() {
-		$('#expand-aside-icon').toggleClass('fa-arrow-circle-right').toggleClass('fa-arrow-circle-left');
-		$('main').toggleClass('region_1-on');
+	$('#left_aside_wrapper').stick_in_parent({
+		offset_top: $('nav').outerHeight(true)
+	});
+
+	$('#expand-aside').on('click', toggleAside);
+
+	$('section').on('click', function() {
+		if($('main').hasClass('region_1-on')){
+			toggleAside();
+		}
+	});
+
+	$(window).on('scroll', function() {
+		if($('main').hasClass('region_1-on') && $(window).scrollLeft() > 5){
+			$(window).scrollLeft(0);
+			toggleAside();
+		}
 	});
 
 	if($('aside').length && $('aside').html().length === 0) {
@@ -72,5 +87,12 @@ function makeFullScreen(full) {
 		$('#tabs-collapse-1').css({'visibility': ''});
 		$('#inline-btn').hide();
 		$('main').css({'transition': ''});
+		$(document.body).trigger("sticky_kit:recalc");
 	}
 }
+
+function toggleAside() {
+	$(window).scroll();
+	$('#expand-aside-icon').toggleClass('fa-arrow-circle-right').toggleClass('fa-arrow-circle-left');
+	$('main').toggleClass('region_1-on');
+}
diff --git a/view/theme/redbasic/php/style.php b/view/theme/redbasic/php/style.php
index 2db0d4c44..9b994ebdf 100644
--- a/view/theme/redbasic/php/style.php
+++ b/view/theme/redbasic/php/style.php
@@ -165,7 +165,7 @@ if(file_exists('view/theme/redbasic/css/style.css')) {
 		$x .= $schemecss;
 	}
 
-	$aside_width = 287;
+	$aside_width = 288;
 
 	// left aside and right aside are 285px + converse width
 	if($align_left) {
diff --git a/view/tpl/conv_item.tpl b/view/tpl/conv_item.tpl
index 35c3d18e7..b5ff475b2 100755
--- a/view/tpl/conv_item.tpl
+++ b/view/tpl/conv_item.tpl
@@ -166,18 +166,27 @@
 								{{if $item.star}}
 								<li role="presentation"><a role="menuitem" href="#" onclick="dostar({{$item.id}}); return false;"><i id="starred-{{$item.id}}" class="fa fa-star {{$item.star.isstarred}}" title="{{$item.star.toggle}}"></i> {{$item.star.toggle}}</a></li>
 								{{/if}}
+
+								{{if $item.thread_action_menu}}
+								{{foreach $item.thread_action_menu as $mitem}}
+								<li role="presentation"><a role="menuitem" {{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}}
 								<li role="presentation"><a role="menuitem" href="#" onclick="dropItem('item/drop/{{$item.id}}', '#thread-wrapper-{{$item.id}}'); return false;" title="{{$item.drop.delete}}" ><i class="fa fa-trash-o"></i> {{$item.drop.delete}}</a></li>
 								{{/if}}
-								{{if $item.item_photo_menu}}
+
+								{{if $item.thread_author_menu}}
 								<li role="presentation" class="divider"></li>
-								{{$item.item_photo_menu}}
+								{{foreach $item.thread_author_menu as $mitem}}
+								<li role="presentation"><a role="menuitem" {{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}}
 
 								{{if $item.edpost && $item.dreport}}
 								<li role="presentation"><a role="menuitem" href="dreport/{{$item.mid}}">{{$item.dreport}}</a></li>
 								{{/if}}
-
-								{{/if}}
 							</ul>
 						</div>
 					</div>
diff --git a/view/tpl/jot.tpl b/view/tpl/jot.tpl
index a3bfad842..377eef453 100755
--- a/view/tpl/jot.tpl
+++ b/view/tpl/jot.tpl
@@ -180,7 +180,7 @@
 				{{/if}}
 				{{if $showacl}}
 				<button id="dbtn-acl" class="btn btn-default btn-sm" data-toggle="modal" data-target="#aclModal" title="{{$permset}}" type="button" data-form_id="profile-jot-form">
-					<i id="jot-perms-icon" class="fa fa-{{$lockstate}} jot-icons"></i>{{if $bang}}&nbsp;<i class="fa fa-exclamation jot-icons"></i>{{/if}}
+					<i id="jot-perms-icon" class="fa fa-{{$lockstate}} jot-icons{{if $bang}} jot-lock-warn{{/if}}"></i>
 				</button>
 				{{/if}}
 				<button id="dbtn-submit" class="btn btn-primary btn-sm" type="submit" tabindex="3" name="button-submit">{{$share}}</button>
diff --git a/view/tpl/micropro_img.tpl b/view/tpl/micropro_img.tpl
index 23b7bd281..a7c5973f3 100755
--- a/view/tpl/micropro_img.tpl
+++ b/view/tpl/micropro_img.tpl
@@ -1 +1 @@
-<div class="contact-block-div{{if $class}} {{$class}}{{/if}}"><a class="contact-block-link{{if $class}} {{$class}}{{/if}}{{if $click}} fakelink{{/if}}" href="{{if $click}}#{{else}}{{$url}}{{/if}}" {{if $click}}onclick="{{$click}}"{{/if}}><img class="contact-block-img{{if $class}} {{$class}}{{/if}}" src="{{$photo}}" title="{{$title}}" alt="{{$name}}" /></a></div>
+<div class="contact-block-div{{if $class}} {{$class}}{{/if}}"><a class="contact-block-link{{if $class}} {{$class}}{{/if}}{{if $click}} fakelink{{/if}}" href="{{if $click}}#{{else}}{{$url}}{{/if}}" {{if $click}}onclick="{{$click}}"{{/if}}><img class="contact-block-img{{if $class}} {{$class}}{{/if}}" src="{{$photo}}" title="{{$title}}" alt="" /></a></div>
diff --git a/view/tpl/notes.tpl b/view/tpl/notes.tpl
index 0e8c8017c..f9fed1feb 100644
--- a/view/tpl/notes.tpl
+++ b/view/tpl/notes.tpl
@@ -1,27 +1,32 @@
 <div class="widget">
-<script>
-var noteSaveTimer = null;
-$(document).on('focusout',"#note-text",function(e){
-	if(noteSaveTimer)
-		clearTimeout(noteSaveTimer);
-	notePostFinal();
-	noteSaveTimer = null;
-});
+	<h3>{{$banner}}</h3>
+	<textarea name="note_text" id="note-text">{{$text}}</textarea>
+	<script>
+		var noteSaveTimer = null;
+		var noteText = $('#note-text');
 
-$(document).on('focusin',"#note-text",function(e){
-	noteSaveTimer = setTimeout(noteSaveChanges,10000);
-});
+		$(document).ready(function(){
+			noteText.height(noteText[0].scrollHeight);
+		});
 
-function notePostFinal() {
-	$.post('notes/sync', { 'note_text' : $('#note-text').val() });
-}
+		$(document).on('focusout',"#note-text",function(e){
+			if(noteSaveTimer)
+				clearTimeout(noteSaveTimer);
+			notePostFinal();
+			noteSaveTimer = null;
+		});
 
-function noteSaveChanges() {
-	$.post('notes', { 'note_text' : $('#note-text').val() });
-	noteSaveTimer = setTimeout(noteSaveChanges,10000);
-}
-</script>
+		$(document).on('focusin',"#note-text",function(e){
+			noteSaveTimer = setTimeout(noteSaveChanges,10000);
+		});
 
-<h3>{{$banner}}</h3>
-<textarea name="note_text" id="note-text">{{$text}}</textarea>
+		function notePostFinal() {
+			$.post('notes/sync', { 'note_text' : $('#note-text').val() });
+		}
+
+		function noteSaveChanges() {
+			$.post('notes', { 'note_text' : $('#note-text').val() });
+			noteSaveTimer = setTimeout(noteSaveChanges,10000);
+		}
+	</script>
 </div>
diff --git a/view/tpl/search_item.tpl b/view/tpl/search_item.tpl
index 51fa8b8dc..a490cb473 100755
--- a/view/tpl/search_item.tpl
+++ b/view/tpl/search_item.tpl
@@ -74,13 +74,20 @@
 						<i class="fa fa-caret-down"></i>
 					</button>
 					<ul class="dropdown-menu">
-						{{if $item.item_photo_menu}}
-						{{$item.item_photo_menu}}
+						{{if $item.thread_action_menu}}
+						{{foreach $item.thread_action_menu as $mitem}}
+						<li role="presentation"><a role="menuitem" {{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}}
-						<li role="presentation" class="divider"></li>
 						<li><a 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}}
+						<li role="presentation" class="divider"></li>
+						{{foreach $item.thread_author_menu as $mitem}}
+						<li role="presentation"><a role="menuitem" {{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}}
 					</ul>
 				</div>
 				{{if $item.attachments}}