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

5 files changed, 51 insertions, 30 deletions

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}}