diff options
| author | RedMatrix <info@friendica.com> | 2015-01-19 10:18:40 +1100 |
|---|---|---|
| committer | RedMatrix <info@friendica.com> | 2015-01-19 10:18:40 +1100 |
| commit | af75120fd0284878a4ecf292ca8cb865f7516e52 (patch) | |
| tree | ea2322baf1bcb035d466edde6009741f5dd1192d /view | |
| parent | 6657712714cb17afcd5fc3c81625a395279d8436 (diff) | |
| parent | b4faf4d90bca867ace578e7664f51c9921071945 (diff) | |
| download | volse-hubzilla-af75120fd0284878a4ecf292ca8cb865f7516e52.tar.gz volse-hubzilla-af75120fd0284878a4ecf292ca8cb865f7516e52.tar.bz2 volse-hubzilla-af75120fd0284878a4ecf292ca8cb865f7516e52.zip | |
Merge pull request #864 from git-marijus/master
basic proof of concept file activity support - will send activity via th...
Diffstat (limited to 'view')
| -rw-r--r-- | view/tpl/attach_edit.tpl | 7 | ||||
| -rw-r--r-- | view/tpl/cloud_header.tpl | 5 |
2 files changed, 9 insertions, 3 deletions
diff --git a/view/tpl/attach_edit.tpl b/view/tpl/attach_edit.tpl index 0147d35ba..5a8743919 100644 --- a/view/tpl/attach_edit.tpl +++ b/view/tpl/attach_edit.tpl @@ -14,7 +14,7 @@ <i class="icon-share jot-icons"></i> </button> </div> - <div id="attach-edit-tools-perms" class="form-group pull-right{{if $isadir}} btn-group{{/if}}"> + <div id="attach-edit-tools-perms" class="form-group pull-right btn-group"> {{if $isadir}} <div id="attach-edit-perms-recurse" class="btn-group" data-toggle="buttons"> <label class="btn btn-default btn-xs" title="{{$recurse}}"> @@ -22,6 +22,11 @@ </label> </div> {{/if}} + <div id="attach-edit-activity" class="btn-group" data-toggle="buttons"> + <label class="btn btn-default btn-xs" title="{{$activity_btn_title}}"> + <input type="checkbox" autocomplete="off" name="no_activity" value="1"><i class="icon-ban-circle jot-icons"></i> + </label> + </div> <div id="attach-edit-perms" class="btn-group"> <button id="dbtn-acl" class="btn btn-default btn-xs" data-toggle="modal" data-target="#aclModal" title="{{$permset}}" onclick="return false;"> <i id="jot-perms-icon" class="icon-{{$lockstate}} jot-icons"></i> diff --git a/view/tpl/cloud_header.tpl b/view/tpl/cloud_header.tpl index f5f123edb..403323085 100644 --- a/view/tpl/cloud_header.tpl +++ b/view/tpl/cloud_header.tpl @@ -1,8 +1,9 @@ <div class="section-title-wrapper"> {{if $actionspanel}} <div class="pull-right"> - <button id="files-create-btn"class="btn btn-xs btn-primary" title="{{if $quota.limit || $quota.used}}{{$quota.desc}}{{/if}}" onclick="openClose('files-mkdir-tools'); closeMenu('files-upload-tools');"><i class="icon-folder-close-alt"></i> Create</button> - <button id="files-upload-btn" class="btn btn-xs btn-success" title="{{if $quota.limit || $quota.used}}{{$quota.desc}}{{/if}}" onclick="openClose('files-upload-tools'); closeMenu('files-mkdir-tools');"><i class="icon-upload"></i> Upload</button> + <a href="/sharedwithme" class="btn btn-xs btn-default"><i class="icon-cloud-download"></i> {{$shared}}</a> + <button id="files-create-btn" class="btn btn-xs btn-primary" title="{{if $quota.limit || $quota.used}}{{$quota.desc}}{{/if}}" onclick="openClose('files-mkdir-tools'); closeMenu('files-upload-tools');"><i class="icon-folder-close-alt"></i> {{$create}}</button> + <button id="files-upload-btn" class="btn btn-xs btn-success" title="{{if $quota.limit || $quota.used}}{{$quota.desc}}{{/if}}" onclick="openClose('files-upload-tools'); closeMenu('files-mkdir-tools');"><i class="icon-upload"></i> {{$upload}}</button> </div> {{/if}} <h2>{{$header}}</h2> |