aboutsummaryrefslogtreecommitdiffstats
path: root/view/tpl
diff options
context:
space:
mode:
authorAndrew Manning <tamanning@zoho.com>2016-05-01 22:31:02 -0400
committerAndrew Manning <tamanning@zoho.com>2016-05-01 22:31:02 -0400
commit4ed5d6573c69157721d484ba0ce506788fcc8024 (patch)
treee9307ef5b75b0336f79de193d4f3f922513e9a93 /view/tpl
parentc2d15e6c3bd8a29bae89d184a999ddac15fcb807 (diff)
parentb4bf71dd0642e58fab6151e1df3c071d05650492 (diff)
downloadvolse-hubzilla-4ed5d6573c69157721d484ba0ce506788fcc8024.tar.gz
volse-hubzilla-4ed5d6573c69157721d484ba0ce506788fcc8024.tar.bz2
volse-hubzilla-4ed5d6573c69157721d484ba0ce506788fcc8024.zip
Merge remote-tracking branch 'upstream/dev' into plugin-repo
Diffstat (limited to 'view/tpl')
-rw-r--r--view/tpl/cloud_directory.tpl2
-rwxr-xr-xview/tpl/jot.tpl8
2 files changed, 8 insertions, 2 deletions
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>
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>