restore category/file display on dispy/diabook

diff --git a/view/theme/diabook/search_item.tpl b/view/theme/diabook/search_item.tpl
index 12383406479ccaa51d5ffcbcbc5232406f8b9061..c953228104d4ca5ef8904bebbfa15fce83bfa660 100644 (file)
--- 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">

diff --git a/view/theme/diabook/wall_item.tpl b/view/theme/diabook/wall_item.tpl
index 5b9de296894d84537fe536e30d55abba51986852..8acc91193d2b1bc4e39bc783e2cd03b9a5c91c6a 100644 (file)
--- a/view/theme/diabook/wall_item.tpl
+++ b/view/theme/diabook/wall_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">

diff --git a/view/theme/diabook/wall_thread.tpl b/view/theme/diabook/wall_thread.tpl
index c53f8b017ceb96a4ba64c4feb2830d2335b1e0a9..cea2705976f3649ac783b3af74fed9d81ffcbb36 100644 (file)
--- a/view/theme/diabook/wall_thread.tpl
+++ b/view/theme/diabook/wall_thread.tpl
@@ -36,6 +36,16 @@
                <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">

diff --git a/view/theme/diabook/wallwall_item.tpl b/view/theme/diabook/wallwall_item.tpl
index b2c980c78de460e10596881328dea3ad0d7d812e..0a183f07667de146bef7a0e1bdb617f4ffdf6f31 100644 (file)
--- a/view/theme/diabook/wallwall_item.tpl
+++ b/view/theme/diabook/wallwall_item.tpl
@@ -35,6 +35,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">

diff --git a/view/theme/diabook/wallwall_thread.tpl b/view/theme/diabook/wallwall_thread.tpl
index c53f8b017ceb96a4ba64c4feb2830d2335b1e0a9..48468417610efba9605e5b940ce3618843ba6e01 100644 (file)
--- a/view/theme/diabook/wallwall_thread.tpl
+++ b/view/theme/diabook/wallwall_thread.tpl
@@ -36,6 +36,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">

diff --git a/view/theme/dispy/search_item.tpl b/view/theme/dispy/search_item.tpl
index 35572caa0455e0ca344046d5d01d56f50e89b573..3e997ad7a3f5ba3ed32ef5bfcdd6ca44c1d12bbf 100644 (file)
--- a/view/theme/dispy/search_item.tpl
+++ b/view/theme/dispy/search_item.tpl
@@ -29,6 +29,16 @@
                        <div class="wall-item-title" id="wall-item-title-$item.id">$item.title</div>
                        <div class="wall-item-title-end"></div>
                        <div class="wall-item-body" id="wall-item-body-$item.id" >$item.body</div>
+                       {{ 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 class="wall-item-tools" id="wall-item-tools-$item.id">
                        <div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-$item.id" >

diff --git a/view/theme/dispy/wall_item.tpl b/view/theme/dispy/wall_item.tpl
index d5cc7f16c8332f123b26466117f5a12cbc45c383..0b869e144fb04f2f30c4a981d72de279b148ee4f 100644 (file)
--- a/view/theme/dispy/wall_item.tpl
+++ b/view/theme/dispy/wall_item.tpl
@@ -73,6 +73,16 @@
                                        {{ for $item.tags as $tag }}
                                                <span class='tag'>$tag</span>
                                        {{ endfor }}
+                       {{ 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>

diff --git a/view/theme/dispy/wall_thread.tpl b/view/theme/dispy/wall_thread.tpl
index 5f434d4cb670e8d5e6f1471b3424e71c61c46a23..19b32bfaa17d14ef67886d132ee4453e5bb91426 100644 (file)
--- a/view/theme/dispy/wall_thread.tpl
+++ b/view/theme/dispy/wall_thread.tpl
@@ -83,6 +83,17 @@
                                                <span class='tag'>$tag</span>
                                        {{ endfor }}
                                </div>
+                       {{ 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>

diff --git a/view/theme/dispy/wallwall_item.tpl b/view/theme/dispy/wallwall_item.tpl
index 63c8a2e96bee53763c16dfbd4a80dd64b4b63039..edfbdf27e076b85bc6c6df7e0cebb033733f14d5 100644 (file)
--- a/view/theme/dispy/wallwall_item.tpl
+++ b/view/theme/dispy/wallwall_item.tpl
@@ -82,6 +82,16 @@ class="icon recycle wall-item-share-buttons"  title="$item.vote.share.0" onclick
                                                <span class="tag">$tag</span>
                                        {{ endfor }}
                                </div>                  
+                       {{ 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>  

diff --git a/view/theme/dispy/wallwall_thread.tpl b/view/theme/dispy/wallwall_thread.tpl
index cab97cafade4d4496c57242d6004ce025aacf315..b150e1fd0234eabdeace94a958b0fc406ed729f4 100644 (file)
--- a/view/theme/dispy/wallwall_thread.tpl
+++ b/view/theme/dispy/wallwall_thread.tpl
@@ -89,6 +89,16 @@ class="icon recycle wall-item-share-buttons"  title="$item.vote.share.0" onclick
                                                <span class="tag">$tag</span>
                                        {{ endfor }}
                                </div>                  
+                       {{ 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>