Merge remote-tracking branch 'upstream/master'

[friendica.git] / view / theme / diabook / search_item.tpl

diff --git a/view/theme/diabook/search_item.tpl b/view/theme/diabook/search_item.tpl
old mode 100755 (executable)
new mode 100644 (file)
index 1238340..d0c83c3
--- a/view/theme/diabook/search_item.tpl
+++ b/view/theme/diabook/search_item.tpl
@@ -29,6 +29,15 @@
                <div class="wall-item-content">
                        {{ if $item.title }}<h2><a href="$item.plink.href">$item.title</a></h2>{{ endif }}
                        $item.body
+                       {{ if $item.has_cats }}
+                       <div class="categorytags"><span>$item.txt_cats {{ for $item.categories as $cat }}$cat.name <a href="$cat.removeurl" title="$remove">[$remove]</a> {{ if $cat.last }}{{ else }}, {{ endif }}{{ endfor }}
+                       </div>
+                       {{ endif }}
+
+                       {{ if $item.has_folders }}
+                       <div class="filesavetags"><span>$item.txt_folders {{ for $item.folders as $cat }}$cat.name <a href="$cat.removeurl" title="$remove">[$remove]</a> {{ if $cat.last }}{{ else }}, {{ endif }}{{ endfor }}
+                       </div>
+                       {{ endif }}
                </div>
        </div>
        <div class="wall-item-bottom">
@@ -77,8 +86,10 @@
                        
                        <div class="wall-item-actions-tools">
 
-                               {{ if $item.drop.dropping }}
+                               {{ if $item.drop.pagedrop }}
                                        <input type="checkbox" title="$item.drop.select" name="itemselected[]" class="item-select" value="$item.id" />
+                               {{ endif }}
+                               {{ if $item.drop.dropping }}
                                        <a href="item/drop/$item.id" onclick="return confirmDelete();" class="icon drop" title="$item.drop.delete">$item.drop.delete</a>
                                {{ endif }}
                                {{ if $item.edpost }}