From 70b109702ef20d0ebad027a98964ceae1fb216c3 Mon Sep 17 00:00:00 2001
From: Mario Vavti <mario@mariovavti.com>
Date: Sun, 12 Apr 2015 14:30:33 +0200
Subject: make dropItem more universal and move delete up in the dropdown menu

---
 view/tpl/conv_item.tpl | 7 +++----
 view/tpl/conv_list.tpl | 8 ++++----
 2 files changed, 7 insertions(+), 8 deletions(-)

(limited to 'view/tpl')

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>
-- 
cgit v1.2.3