diff options
| author | friendica <info@friendica.com> | 2015-02-05 19:38:43 -0800 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2015-02-05 19:38:43 -0800 |
| commit | 4b348d248975ba07ba9cea62f51eb52d6afb5645 (patch) | |
| tree | fc60c2d05958c2a458ac72b03e1e7ddffce0c41b /view/tpl/attach_edit.tpl | |
| parent | aafed50a0ea8a8d7091572473dcb8e4fb8cd4602 (diff) | |
| parent | b948fbaeda84f4358722222b4a2d5555ef10b82e (diff) | |
| download | volse-hubzilla-4b348d248975ba07ba9cea62f51eb52d6afb5645.tar.gz volse-hubzilla-4b348d248975ba07ba9cea62f51eb52d6afb5645.tar.bz2 volse-hubzilla-4b348d248975ba07ba9cea62f51eb52d6afb5645.zip | |
Merge branch 'master' into tres
Conflicts:
view/css/mod_events.css
view/theme/redbasic/css/style.css
Diffstat (limited to 'view/tpl/attach_edit.tpl')
| -rw-r--r-- | view/tpl/attach_edit.tpl | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/view/tpl/attach_edit.tpl b/view/tpl/attach_edit.tpl index 5a8743919..4a438e8fd 100644 --- a/view/tpl/attach_edit.tpl +++ b/view/tpl/attach_edit.tpl @@ -22,11 +22,13 @@ </label> </div> {{/if}} + {{if !$isadir}} <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> + {{/if}} <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> |