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/tpl')

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 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/tpl')

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