diff options
| author | Max Kostikov <max@kostikov.co> | 2018-09-28 15:46:14 +0200 |
|---|---|---|
| committer | Max Kostikov <max@kostikov.co> | 2018-09-28 15:46:14 +0200 |
| commit | 4a904fa3a8af1c101ede76657249fb7eb47faf60 (patch) | |
| tree | 544509813fb68579ef2b556ce879a971d183269a /view/tpl/conv_item.tpl | |
| parent | f5f6ec3d71acb3e0488386819d5060e59331ec23 (diff) | |
| parent | c13d7e29ef9676b0f0e4ae23aa52e203f4ad8895 (diff) | |
| download | volse-hubzilla-4a904fa3a8af1c101ede76657249fb7eb47faf60.tar.gz volse-hubzilla-4a904fa3a8af1c101ede76657249fb7eb47faf60.tar.bz2 volse-hubzilla-4a904fa3a8af1c101ede76657249fb7eb47faf60.zip | |
Merge branch 'patch-29' into 'dev'
Patch 29
See merge request Kostikov/core!3
Diffstat (limited to 'view/tpl/conv_item.tpl')
| -rwxr-xr-x | view/tpl/conv_item.tpl | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/view/tpl/conv_item.tpl b/view/tpl/conv_item.tpl index ac6af40e9..5720a2a5f 100755 --- a/view/tpl/conv_item.tpl +++ b/view/tpl/conv_item.tpl @@ -175,10 +175,18 @@ {{if $item.drop.dropping}} <a class="dropdown-item" href="#" onclick="dropItem('item/drop/{{$item.id}}', '#thread-wrapper-{{$item.id}}'); return false;" title="{{$item.drop.delete}}" ><i class="generic-icons-nav fa fa-fw fa-trash-o"></i>{{$item.drop.delete}}</a> {{/if}} + {{if $item.dropdown_extras}} + <div class="dropdown-divider"></div> + {{$item.dropdown_extras}} + {{/if}} {{if $item.edpost && $item.dreport}} <div class="dropdown-divider"></div> <a class="dropdown-item" href="dreport/{{$item.mid}}">{{$item.dreport}}</a> {{/if}} + {{if $item.settings}} + <div class="dropdown-divider"></div> + <a class="dropdown-item conversation-settings-link" href="" data-toggle="modal" data-target="#conversation_settings">{{$item.settings}}</a> + {{/if}} </div> </div> </div> @@ -206,7 +214,7 @@ <div class="modal-dialog"> <div class="modal-content"> <div class="modal-header"> - <h4 class="modal-title">{{$response.count}} {{$response.button}}</h4> + <h3 class="modal-title">{{$response.count}} {{$response.button}}</h3> <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button> </div> <div class="modal-body response-list"> |