aboutsummaryrefslogtreecommitdiffstats
path: root/view/tpl
diff options
context:
space:
mode:
authorMario Vavti <mario@mariovavti.com>2015-04-12 14:30:33 +0200
committerMario Vavti <mario@mariovavti.com>2015-04-12 14:30:33 +0200
commit70b109702ef20d0ebad027a98964ceae1fb216c3 (patch)
tree48e7edb413af553d32051faffc5fd901d997f98f /view/tpl
parent962fdf08c0f3c83927ed23a1b6f384b2c3d74aae (diff)
downloadvolse-hubzilla-70b109702ef20d0ebad027a98964ceae1fb216c3.tar.gz
volse-hubzilla-70b109702ef20d0ebad027a98964ceae1fb216c3.tar.bz2
volse-hubzilla-70b109702ef20d0ebad027a98964ceae1fb216c3.zip
make dropItem more universal and move delete up in the dropdown menu
Diffstat (limited to 'view/tpl')
-rwxr-xr-xview/tpl/conv_item.tpl7
-rwxr-xr-xview/tpl/conv_list.tpl8
2 files changed, 7 insertions, 8 deletions
diff --git a/view/tpl/conv_item.tpl b/view/tpl/conv_item.tpl
index 7de0e05f9..facda251b 100755
--- a/view/tpl/conv_item.tpl
+++ b/view/tpl/conv_item.tpl
@@ -117,14 +117,13 @@
{{if $item.star}}
<li role="presentation"><a role="menuitem" href="#" onclick="dostar({{$item.id}}); return false;"><i id="starred-{{$item.id}}" class="icon-star {{$item.star.isstarred}}" title="{{$item.star.toggle}}"></i> {{$item.star.toggle}}</a></li>
{{/if}}
+ {{if $item.drop.dropping}}
+ <li role="presentation"><a role="menuitem" href="#" onclick="dropItem('item/drop/{{$item.id}}', '#thread-wrapper-{{$item.id}}'); return false;" title="{{$item.drop.delete}}" ><i class="icon-trash"></i> {{$item.drop.delete}}</a></li>
+ {{/if}}
{{if $item.item_photo_menu}}
<li role="presentation" class="divider"></li>
{{$item.item_photo_menu}}
{{/if}}
- {{if $item.drop.dropping}}
- <li role="presentation" class="divider"></li>
- <li role="presentation"><a role="menuitem" href="#" onclick="dropItem({{$item.id}}); return false;" title="{{$item.drop.delete}}" ><i class="icon-trash"></i> {{$item.drop.delete}}</a></li>
- {{/if}}
</ul>
</div>
<div id="like-rotator-{{$item.id}}" class="like-rotator"></div>
diff --git a/view/tpl/conv_list.tpl b/view/tpl/conv_list.tpl
index 0d35fa685..c737c29ef 100755
--- a/view/tpl/conv_list.tpl
+++ b/view/tpl/conv_list.tpl
@@ -118,14 +118,14 @@
{{if $item.star}}
<li role="presentation"><a role="menuitem" href="#" onclick="dostar({{$item.id}}); return false;"><i id="starred-{{$item.id}}" class="icon-star {{$item.star.isstarred}}" title="{{$item.star.toggle}}"></i> {{$item.star.toggle}}</a></li>
{{/if}}
+ {{if $item.drop.dropping}}
+ <li role="presentation"><a role="menuitem" href="#" onclick="dropItem('item/drop/{{$item.id}}', '#thread-wrapper-{{$item.id}}'); return false;" title="{{$item.drop.delete}}" ><i class="icon-trash"></i> {{$item.drop.delete}}</a></li>
+ {{/if}}
{{if $item.item_photo_menu}}
<li role="presentation" class="divider"></li>
{{$item.item_photo_menu}}
{{/if}}
- {{if $item.drop.dropping}}
- <li role="presentation" class="divider"></li>
- <li role="presentation"><a role="menuitem" href="#" onclick="dropItem({{$item.id}}); return false;" title="{{$item.drop.delete}}" ><i class="icon-trash"></i> {{$item.drop.delete}}</a></li>
- {{/if}}
+
</ul>
</div>
<div id="like-rotator-{{$item.id}}" class="like-rotator"></div>