]> git.mxchange.org Git - friendica.git/commitdiff
vier: threads
authorTobias Diekershoff <tobias.diekershoff@gmx.net>
Thu, 1 Nov 2012 14:05:31 +0000 (15:05 +0100)
committerTobias Diekershoff <tobias.diekershoff@gmx.net>
Thu, 1 Nov 2012 14:05:31 +0000 (15:05 +0100)
view/theme/vier/style.css
view/theme/vier/threaded_conversation.tpl
view/theme/vier/wall_thread.tpl

index 64b3ba9740ef0d49431e95d86203dbafab68692e..96903bba0027e0c3f3d20292ffe1d039906f8c9c 100644 (file)
@@ -1079,15 +1079,13 @@ section {
   padding-bottom: 2px;
 }
 .tag {
-  background: url("../../../images/tag_b.png") repeat-x center left;
-  color: #ffffff;
+  color: rgb(153,153,153);
   padding-left: 3px;
   font-size: 10px;
 }
 .tag a {
   padding-right: 8px;
-  background: url("../../../images/tag.png") no-repeat center right;
-  color: #ffffff;
+  color: rgb(153,153,153);
 }
 .wwto {
   position: absolute !important;
index ad510185ee9f1911cb8e27e17554c6fb36e7fabc..7eadf7e9f42c59ad59082b8f963f7304d462da7b 100644 (file)
@@ -2,7 +2,7 @@ $live_update
 
 {{ for $threads as $item }}
 
-<div id="tread-wrapper-$item.id" class="tread-wrapper {{ if $item.threaded }}threaded{{ endif }}">
+<div id="tread-wrapper-$item.id" class="tread-wrapper {{ if $item.threaded }}threaded{{ endif }}  $item.toplevel">
        
        
                {{ if $item.type == tag }}
index becf868e7907a68463f40954b7605c1eb5883440..f6f4679cbfed1af510788f9e9565f47597da3d87 100644 (file)
@@ -42,7 +42,7 @@
                                </ul>
                                
                        </div>
-                       {{ if $item.owner_url }}        
+                       {{ if $item.owner_url }}
                        <div class="contact-photo-wrapper mframe wwto" id="wall-item-ownerphoto-wrapper-$item.id" >
                                <a href="$item.owner_url" target="redir" title="$item.olinktitle" class="contact-photo-link" id="wall-item-ownerphoto-link-$item.id">
                                        <img src="$item.owner_photo" class="contact-photo $item.osparkle" id="wall-item-ownerphoto-$item.id" alt="$item.owner_name" />
                <div class="wall-item-links">
                </div>
                <div class="wall-item-tags">
-                       {{ for $item.tags as $tag }}
+                       {{ for $item.hashtags as $tag }}
                                <span class='tag'>$tag</span>
                        {{ endfor }}
+                       {{ for $item.mentions as $tag }}
+                               <span class='mention'>$tag</span>
+                       {{ endfor }}
+               {{ for $item.folders as $cat }}
+                    <span class='folder'>$cat.name</a>{{if $cat.removeurl}} (<a href="$cat.removeurl" title="$remove">x</a>) {{endif}} </span>
+               {{ endfor }}
+                {{ for $item.categories as $cat }}
+                    <span class='category'>$cat.name</a>{{if $cat.removeurl}} (<a href="$cat.removeurl" title="$remove">x</a>) {{endif}} </span>
+                {{ endfor }}
                </div>
        </div>  
        <div class="wall-item-bottom">
                </div>
                <div class="wall-item-actions">
                        <div class="wall-item-actions-author">
-                               <a href="$item.profile_url" target="redir" title="$item.linktitle" class="wall-item-name-link"><span class="wall-item-name$item.sparkle">$item.name</span></a> <span class="wall-item-ago">$item.ago</span>
+                               <a href="$item.profile_url" target="redir"
+                                title="$item.linktitle"
+                                class="wall-item-name-link"><span
+                                class="wall-item-name$item.sparkle">$item.name</span></a>
+                                <span class="wall-item-ago" title="$item.localtime">$item.ago</span>
                                 {{ if $item.owner_url }}<br/>$item.to <a href="$item.owner_url" target="redir" title="$item.olinktitle" class="wall-item-name-link"><span class="wall-item-name$item.osparkle" id="wall-item-ownername-$item.id">$item.owner_name</span></a> $item.vwall
                                 {{ endif }}
                        </div>
                <div class="wall-item-dislike" id="wall-item-dislike-$item.id">$item.dislike</div>      
        </div>
        
-       {{ if $item.threaded }}{{ if $item.comment }}{{ if $item.indent==comment }}
+       {{ if $item.threaded }}{{ if $item.comment }}
        <div class="wall-item-bottom">
                <div class="wall-item-links"></div>
                <div class="wall-item-comment-wrapper">
                                        $item.comment
                </div>
        </div>
-       {{ endif }}{{ endif }}{{ endif }}
+       {{ endif }}{{ endif }}
 </div>