Merge branch 'dev' into 'dev'

Dev sync

See merge request kostikov/core!1

5 files changed, 12 insertions, 3 deletions

diff --git a/view/css/conversation.css b/view/css/conversation.css
index 06da8528c..43bc96e57 100644
--- a/view/css/conversation.css
+++ b/view/css/conversation.css
@@ -17,6 +17,7 @@
 }
 
 #jot-title-wrap,
+#jot-summary-wrap,
 #jot-pagetitle-wrap,
 #jot-category-wrap,
 #jot-customjotheaders-wrap {
@@ -29,6 +30,7 @@
 }
 
 #jot-title-wrap input,
+#jot-summary-wrap input,
 #jot-pagetitle-wrap input,
 #jot-customjotheaders-wrap {
 	padding: 0.5rem;
diff --git a/view/js/autocomplete.js b/view/js/autocomplete.js
index 92db42f6d..c45c47518 100644
--- a/view/js/autocomplete.js
+++ b/view/js/autocomplete.js
@@ -350,7 +350,7 @@ function string2bb(element) {
 			return;
 
 		if(type=='bbcode') {
-			var open_close_elements = ['bold', 'italic', 'underline', 'overline', 'strike', 'superscript', 'subscript', 'quote', 'code', 'open', 'spoiler', 'summary', 'map', 'nobb', 'list', 'checklist', 'question', 'answer', 'ul', 'ol', 'dl', 'li', 'table', 'tr', 'th', 'td', 'center', 'color', 'font', 'size', 'zrl', 'zmg', 'rpost', 'qr', 'observer', 'observer.language','embed', 'highlight', 'url', 'h1', 'h2', 'h3', 'h4', 'h5', 'h6'];
+			var open_close_elements = ['bold', 'italic', 'underline', 'overline', 'strike', 'superscript', 'subscript', 'quote', 'code', 'open', 'spoiler', 'map', 'nobb', 'list', 'checklist', 'question', 'answer', 'ul', 'ol', 'dl', 'li', 'table', 'tr', 'th', 'td', 'center', 'color', 'font', 'size', 'zrl', 'zmg', 'rpost', 'qr', 'observer', 'observer.language','embed', 'highlight', 'url', 'h1', 'h2', 'h3', 'h4', 'h5', 'h6'];
 			var open_elements = ['observer.baseurl', 'observer.address', 'observer.photo', 'observer.name', 'observer.webname', 'observer.url', '*', 'hr' ];
 
 			var elements = open_close_elements.concat(open_elements);
diff --git a/view/tpl/conv_item.tpl b/view/tpl/conv_item.tpl
index b021509d3..361392796 100644
--- a/view/tpl/conv_item.tpl
+++ b/view/tpl/conv_item.tpl
@@ -141,7 +141,7 @@
 									</a>
 									<a class="dropdown-item" href="#" title="{{$item.conlabels.1}}" onclick="dolike({{$item.id}},'disagree'); return false;">
 										 <i class="item-act-list fa fa-times{{if $item.my_responses.disagree}} ivoted{{/if}}" ></i> {{$item.conlabels.1}}
-									</a> 
+									</a>
 									<a class="dropdown-item" href="#" title="{{$item.conlabels.2}}" onclick="dolike({{$item.id}},'abstain'); return false;">
 										<i class="item-act-list fa fa-question{{if $item.my_responses.abstain}} ivoted{{/if}}" ></i> {{$item.conlabels.2}}
 									</a>
diff --git a/view/tpl/jot.tpl b/view/tpl/jot.tpl
index 36e71223c..1454f038b 100644
--- a/view/tpl/jot.tpl
+++ b/view/tpl/jot.tpl
@@ -36,12 +36,15 @@
 		<div id="jot-title-wrap" class="jothidden">
 			<input class="w-100 border-0" name="title" id="jot-title" type="text" placeholder="{{$placeholdertitle}}" tabindex="1" value="{{$title}}">
 		</div>
+		<div id="jot-summary-wrap" class="jothidden">
+			<input class="w-100 border-0" name="summary" id="jot-summary" type="text" placeholder="{{$placeholdersummary}}" tabindex="2" value="{{$summary}}">
+		</div>
 		{{if $catsenabled}}
 		<div id="jot-category-wrap" class="jothidden">
 			<input class="w-100 border-0" name="category" id="jot-category" type="text" placeholder="{{$placeholdercategory}}" value="{{$category}}" data-role="cat-tagsinput">
 		</div>
 		{{/if}}
-                {{if $customjotheaders}}
+		{{if $customjotheaders}}
 		<div id="jot-customjotheaders-wrap" class="jothidden">
 			{{$customjotheaders}}
 		</div>
diff --git a/view/tpl/threaded_conversation.tpl b/view/tpl/threaded_conversation.tpl
index 5bc7d8386..6e773088e 100644
--- a/view/tpl/threaded_conversation.tpl
+++ b/view/tpl/threaded_conversation.tpl
@@ -1,9 +1,13 @@
+{{if !$preview }}
 <div id="threads-begin"></div>
+{{/if}}
 {{if $photo_item}}
 {{$photo_item}}
 {{/if}}
 {{foreach $threads as $thread_item}}
 {{include file="{{$thread_item.template}}" item=$thread_item}}
 {{/foreach}}
+{{if !$preview }}
 <div id="threads-end"></div>
 <div id="conversation-end"></div>
+{{/if}}