diff options
| author | redmatrix <git@macgirvin.com> | 2016-05-01 19:20:09 -0700 |
|---|---|---|
| committer | redmatrix <git@macgirvin.com> | 2016-05-01 19:20:09 -0700 |
| commit | 23bb4e8e1546a8f8b3319e39172cf2fd17cb4139 (patch) | |
| tree | 15b7ba8f607da56f7f84ab4d1039c4768069095d /view/tpl | |
| parent | cd518625bf561f1ed42db0b78030b74c32435136 (diff) | |
| parent | b4bf71dd0642e58fab6151e1df3c071d05650492 (diff) | |
| download | volse-hubzilla-23bb4e8e1546a8f8b3319e39172cf2fd17cb4139.tar.gz volse-hubzilla-23bb4e8e1546a8f8b3319e39172cf2fd17cb4139.tar.bz2 volse-hubzilla-23bb4e8e1546a8f8b3319e39172cf2fd17cb4139.zip | |
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
Diffstat (limited to 'view/tpl')
| -rw-r--r-- | view/tpl/cloud_directory.tpl | 2 | ||||
| -rwxr-xr-x | view/tpl/jot.tpl | 8 |
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> {{$expires}}</a></li> {{/if}} + {{if $feature_future}} + <li><a href="#" onclick="jotGetPubDate();return false;"><i class="fa fa-clock-o"></i> {{$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> {{$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> |