diff options
| author | Haakon Meland Eriksen <haakon.eriksen@far.no> | 2015-12-18 16:04:07 +0100 |
|---|---|---|
| committer | Haakon Meland Eriksen <haakon.eriksen@far.no> | 2015-12-18 16:04:07 +0100 |
| commit | 628e565a6c5ee52341ba6de0b5ecf6495cbb78f8 (patch) | |
| tree | 737c1027334a211b62b4a278f87be80bb7e17a4c /view/tpl | |
| parent | a721f39945bf3213c4305a389946c464b831a5f9 (diff) | |
| parent | 84bf7058119bb2ed48358678be9c212a66c8cb83 (diff) | |
| download | volse-hubzilla-628e565a6c5ee52341ba6de0b5ecf6495cbb78f8.tar.gz volse-hubzilla-628e565a6c5ee52341ba6de0b5ecf6495cbb78f8.tar.bz2 volse-hubzilla-628e565a6c5ee52341ba6de0b5ecf6495cbb78f8.zip | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'view/tpl')
| -rwxr-xr-x | view/tpl/admin_site.tpl | 1 | ||||
| -rwxr-xr-x | view/tpl/search_item.tpl | 11 |
2 files changed, 7 insertions, 5 deletions
diff --git a/view/tpl/admin_site.tpl b/view/tpl/admin_site.tpl index 4add59a0d..0e65dfa69 100755 --- a/view/tpl/admin_site.tpl +++ b/view/tpl/admin_site.tpl @@ -58,6 +58,7 @@ <h3>{{$registration}}</h3> {{include file="field_input.tpl" field=$register_text}} {{include file="field_select.tpl" field=$register_policy}} + {{include file="field_checkbox.tpl" field=$invite_only}} {{include file="field_select.tpl" field=$access_policy}} {{include file="field_textarea.tpl" field=$allowed_email}} {{include file="field_textarea.tpl" field=$not_allowed_email}} diff --git a/view/tpl/search_item.tpl b/view/tpl/search_item.tpl index b2689c7ba..24e1b97d5 100755 --- a/view/tpl/search_item.tpl +++ b/view/tpl/search_item.tpl @@ -65,11 +65,6 @@ <span class="tag">{{$item.folders}}</span> </div> {{/if}} - {{if $item.attachments}} - <div class="body-tags" id="item-attachments"> - <span class='tag'>{{$item.attachments}}</span> - </div> - {{/if}} <div class="clear"></div> </div> {{/if}} @@ -88,6 +83,12 @@ {{/if}} </ul> </div> + {{if $item.attachments}} + <div class="wall-item-tools-left btn-group"> + <button type="button" class="btn btn-default btn-sm wall-item-like dropdown-toggle" data-toggle="dropdown" id="attachment-menu-{{$item.id}}"><i class="icon-paperclip"></i></button> + <ul class="dropdown-menu" role="menu" aria-labelledby="attachment-menu-{{$item.id}}">{{$item.attachments}}</ul> + </div> + {{/if}} <div class="clear"></div> </div> <div class="clear"></div> |