From 02d836301976fefc6b5ef5bd6ee9b061fa368992 Mon Sep 17 00:00:00 2001
From: Treer <treer.git@the-bordello.com>
Date: Sun, 1 May 2016 16:03:36 +1000
Subject: tweak dl bbcode in expanded autocomplete

---
 view/js/autocomplete.js | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

(limited to 'view')

diff --git a/view/js/autocomplete.js b/view/js/autocomplete.js
index 41077d427..01d77e22f 100644
--- a/view/js/autocomplete.js
+++ b/view/js/autocomplete.js
@@ -143,8 +143,10 @@ function listNewLineAutocomplete(id) {
 	if (word != null) {
 		var textBefore = text.value.substring(0, caretPos);
 		var textAfter  = text.value.substring(caretPos, text.length);
-		$('#' + id).val(textBefore + '\r\n[*] ' + textAfter);
-		setCaretPosition(text, caretPos + 5);
+		var textInsert = (word.indexOf('[/dl]') > 0) ? '\r\n[*= ' : '\r\n[*] ';
+
+		$('#' + id).val(textBefore + textInsert + textAfter);
+		setCaretPosition(text, caretPos + (textInsert.length - 1));
 		return true;
 	}
 	else {
@@ -296,10 +298,11 @@ function string2bb(element) {
 			replace: function (element) {
 				element = string2bb(element);
 				if(open_elements.indexOf(element) < 0) {
-					if(element === 'list' || element === 'ol' || element === 'ul' || element === 'dl') {
-						return ['\[' + element + '\]' + '\n\[*\] ', '\n\[/' + element + '\]'];
-					}
-					else if(element === 'table') {
+					if(element === 'list' || element === 'ol' || element === 'ul') {
+						return ['\[' + element + '\]' + '\n\[*\] ',            '\n\[/' + element + '\]'];
+					} else if (element === 'dl') {
+						return ['\[' + element + '\]' + '\n\[*= Item name\] ', '\n\[/' + element + '\]'];
+					} else if(element === 'table') {
 						return ['\[' + element + '\]' + '\n\[tr\]', '\[/tr\]\n\[/' + element + '\]'];
 					}
 					else {
-- 
cgit v1.2.3


From fa80a5c113582dc757de33199df610e0ef8503aa Mon Sep 17 00:00:00 2001
From: Mario Vavti <mario@mariovavti.com>
Date: Sun, 1 May 2016 15:45:42 +0200
Subject: make weblink and attach button hideable and some minor fixes

---
 view/tpl/jot.tpl | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'view')

diff --git a/view/tpl/jot.tpl b/view/tpl/jot.tpl
index 3de92cddb..a9f6766dc 100755
--- a/view/tpl/jot.tpl
+++ b/view/tpl/jot.tpl
@@ -138,6 +138,9 @@
 						{{if $feature_expire}}
 						<li><a href="#" onclick="jotGetExpiry(); return false;"><i class="fa fa-eraser"></i>&nbsp;{{$expires}}</a></li>
 						{{/if}}
+						{{if $feature_future}}
+						<li><a href="#" onclick="jotGetPubDate();return false;"><i class="fa fa-clock-o"></i>&nbsp;{{$future_txt}}</a></li>
+						{{/if}}
 						{{if $feature_encrypt}}
 						<li><a href="#" onclick="red_encrypt('{{$cipher}}','#profile-jot-text',$('#profile-jot-text').val());return false;"><i class="fa fa-key"></i>&nbsp;{{$encrypt}}</a></li>
 						{{/if}}
@@ -176,6 +179,7 @@
 
 <div id="jot-preview-content" style="display:none;"></div>
 
+{{if $feature_expire}}
 <!-- Modal for item expiry-->
 <div class="modal" id="expiryModal" tabindex="-1" role="dialog" aria-labelledby="expiryModalLabel" aria-hidden="true">
   <div class="modal-dialog">
@@ -196,7 +200,9 @@
     </div><!-- /.modal-content -->
   </div><!-- /.modal-dialog -->
 </div><!-- /.modal -->
+{{/if}}
 
+{{if $feature_future}}
 <!-- Modal for item created-->
 <div class="modal" id="createdModal" tabindex="-1" role="dialog" aria-labelledby="createdModalLabel" aria-hidden="true">
   <div class="modal-dialog">
@@ -217,7 +223,7 @@
     </div><!-- /.modal-content -->
   </div><!-- /.modal-dialog -->
 </div><!-- /.modal -->
-
+{{/if}}
 
 {{if $content || $attachment || $expanded}}
 <script>initEditor();</script>
-- 
cgit v1.2.3


From b35e69273d43af51a8a5dff1bc70a52b6bcfa714 Mon Sep 17 00:00:00 2001
From: Mario Vavti <mario@mariovavti.com>
Date: Sun, 1 May 2016 16:17:34 +0200
Subject: tweak dl bbcode in expanded autocomplete a bit more

---
 view/js/autocomplete.js | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'view')

diff --git a/view/js/autocomplete.js b/view/js/autocomplete.js
index 01d77e22f..33d825b55 100644
--- a/view/js/autocomplete.js
+++ b/view/js/autocomplete.js
@@ -143,10 +143,11 @@ function listNewLineAutocomplete(id) {
 	if (word != null) {
 		var textBefore = text.value.substring(0, caretPos);
 		var textAfter  = text.value.substring(caretPos, text.length);
-		var textInsert = (word.indexOf('[/dl]') > 0) ? '\r\n[*= ' : '\r\n[*] ';
+		var textInsert = (word.indexOf('[/dl]') > 0) ? '\r\n[*=] ' : '\r\n[*] ';
+		var caretPositionDiff = (word.indexOf('[/dl]') > 0) ? 3 : 1;
 
 		$('#' + id).val(textBefore + textInsert + textAfter);
-		setCaretPosition(text, caretPos + (textInsert.length - 1));
+		setCaretPosition(text, caretPos + (textInsert.length - caretPositionDiff));
 		return true;
 	}
 	else {
@@ -301,7 +302,7 @@ function string2bb(element) {
 					if(element === 'list' || element === 'ol' || element === 'ul') {
 						return ['\[' + element + '\]' + '\n\[*\] ',            '\n\[/' + element + '\]'];
 					} else if (element === 'dl') {
-						return ['\[' + element + '\]' + '\n\[*= Item name\] ', '\n\[/' + element + '\]'];
+						return ['\[' + element + '\]' + '\n\[*=Item name\] ', '\n\[/' + element + '\]'];
 					} else if(element === 'table') {
 						return ['\[' + element + '\]' + '\n\[tr\]', '\[/tr\]\n\[/' + element + '\]'];
 					}
-- 
cgit v1.2.3


From b4bf71dd0642e58fab6151e1df3c071d05650492 Mon Sep 17 00:00:00 2001
From: Mario Vavti <mario@mariovavti.com>
Date: Sun, 1 May 2016 16:34:55 +0200
Subject: fix mime-type icons in /cloud

---
 view/tpl/cloud_directory.tpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'view')

diff --git a/view/tpl/cloud_directory.tpl b/view/tpl/cloud_directory.tpl
index c0207c623..870f7e9e1 100644
--- a/view/tpl/cloud_directory.tpl
+++ b/view/tpl/cloud_directory.tpl
@@ -20,7 +20,7 @@
 	{{/if}}
 	{{foreach $entries as $item}}
 		<tr id="cloud-index-{{$item.attachId}}">
-			<td><i class="{{$item.iconFromType}}" title="{{$item.type}}"></i></td>
+			<td><i class="fa {{$item.iconFromType}}" title="{{$item.type}}"></i></td>
 			<td><a href="{{$item.fullPath}}">{{$item.displayName}}</a></td>
 	{{if $item.is_owner}}
 			<td class="cloud-index-tool">{{$item.attachIcon}}</td>
-- 
cgit v1.2.3