Merge pull request #649 from mexon/redirect_fix

[friendica.git] / view / theme / vier / wall_thread.tpl

diff --git a/view/theme/vier/wall_thread.tpl b/view/theme/vier/wall_thread.tpl
index cd0cf36e96c7e1bdbb21e2b02e72892e8b700fad..756015bc0f056ae6204f802e59ac225575c731c8 100644 (file)
--- a/view/theme/vier/wall_thread.tpl
+++ b/view/theme/vier/wall_thread.tpl
@@ -27,7 +27,7 @@
        <img id="like-rotator-$item.id" class="like-rotator" src="images/rotator.gif" alt="$item.wait" title="$item.wait" style="display: none;" />
 </div>
 
-<div class="wall-item-container $item.indent" id="item-$item.id">
+<div class="wall-item-container $item.indent $item.shiny " id="item-$item.id">
        <div class="wall-item-item">
                <div class="wall-item-info">
                        <div class="contact-photo-wrapper mframe{{ if $item.owner_url }} wwfrom{{ endif }}"
@@ -52,14 +52,14 @@
                </div>
                <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>
-                        {{ if $item.owner_url }}$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 }}
-                       <span class="wall-item-ago">-
-                               {{ if $item.plink }}<a class="link" title="$item.plink.title" href="$item.plink.href" style="color: #999">$item.ago</a>{{ else }} $item.ago {{ endif }}
-                               {{ if $item.lock }} - <span class="fakelink" style="color: #999" onclick="lockview(event,$item.id);">$item.lock</span> {{ endif }}
+                        {{ if $item.owner_url }}$item.via <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 }}
+                       <span class="wall-item-ago">
+                               {{ if $item.plink }}<a title="$item.plink.title" href="$item.plink.href" style="color: #999">$item.ago</a>{{ else }} $item.ago {{ endif }}
+                               {{ if $item.lock }}<span class="fakelink" style="color: #999" onclick="lockview(event,$item.id);">$item.lock</span> {{ endif }}
                        </span>
                </div>
 
-               <div class="wall-item-content">
+               <div itemprop="description" class="wall-item-content">
                        {{ if $item.title }}<h2><a href="$item.plink.href" class="$item.sparkle">$item.title</a></h2>{{ endif }}
                        $item.body
                </div>
@@ -84,57 +84,60 @@
        </div>  
        <div class="wall-item-bottom">
                <div class="wall-item-links">
-                       {{ if $item.plink }}<a class="icon s16 link$item.sparkle" title="$item.plink.title" href="$item.plink.href">$item.plink.title</a>{{ endif }}
+                       {{ if $item.plink }}<a title="$item.plink.title" href="$item.plink.href"><i class="icon-link icon-large"></i></a>{{ endif }}
                </div>
                <div class="wall-item-actions">
-                       <div class="wall-item-location">$item.location</div>                            
                        <div class="wall-item-actions-social">
                        {{ if $item.threaded }}{{ if $item.comment }}
-                               <span id="comment-$item.id" class="fakelink togglecomment" onclick="openClose('item-comments-$item.id');">$item.switchcomment</span>
+                               <span id="comment-$item.id" class="fakelink togglecomment" onclick="openClose('item-comments-$item.id');"><i class="icon-comment"></i></span>
                        {{ endif }}{{ endif }}
+                       {{ if $item.vote }}
+                               <a href="#" id="like-$item.id" title="$item.vote.like.0" onclick="dolike($item.id,'like'); return false"><i class="icon-thumbs-up icon-large"></i></a>
+                               {{ if $item.vote.dislike }}
+                               <a href="#" id="dislike-$item.id" title="$item.vote.dislike.0" onclick="dolike($item.id,'dislike'); return false"><i class="icon-thumbs-down icon-large"></i></a>
+                               {{ endif }}
+                       {{ endif }}
+                       {{ if $item.vote.share }}
+                               <a href="#" id="share-$item.id" title="$item.vote.share.0" onclick="jotShare($item.id); return false"><i class="icon-retweet icon-large"></i></a>
+                       {{ endif }}
                        {{ if $item.star }}
-                               <a href="#" id="star-$item.id" onclick="dostar($item.id); return false;"  class="$item.star.classdo"  title="$item.star.do">$item.star.do</a>
-                               <a href="#" id="unstar-$item.id" onclick="dostar($item.id); return false;"  class="$item.star.classundo"  title="$item.star.undo">$item.star.undo</a>
-                               <a href="#" id="tagger-$item.id" onclick="itemTag($item.id); return false;" class="$item.star.classtagger" title="$item.star.tagger">$item.star.tagger</a>
+                               <a href="#" id="star-$item.id" onclick="dostar($item.id); return false;"  class="$item.star.classdo"  title="$item.star.do"><i class="icon-star icon-large"></i></a>
+                               <a href="#" id="unstar-$item.id" onclick="dostar($item.id); return false;"  class="$item.star.classundo"  title="$item.star.undo"><i class="icon-star-empty icon-large"></i></a>
+                       {{ endif }}
+                       {{ if $item.tagger }}
+                               <a href="#" id="tagger-$item.id" onclick="itemTag($item.id); return false;" class="$item.tagger.class" title="$item.tagger.add"><i class="icon-tags icon-large"></i></a>
                        {{ endif }}
                        {{ if $item.filer }}
-                                <a href="#" id="filer-$item.id" onclick="itemFiler($item.id); return false;" class="filer-item filer-icon" title="$item.filer">$item.filer</a>
-                       {{ endif }}                     
-                       
-                       {{ if $item.vote }}
-                               <a href="#" id="like-$item.id" title="$item.vote.like.0" onclick="dolike($item.id,'like'); return false">$item.vote.like.1</a>
-                               <a href="#" id="dislike-$item.id" title="$item.vote.dislike.0" onclick="dolike($item.id,'dislike'); return false">$item.vote.dislike.1</a>
+                                <a href="#" id="filer-$item.id" onclick="itemFiler($item.id); return false;" class="filer-item filer-icon" title="$item.filer"><i class="icon-folder-close icon-large"></i></a>
                        {{ endif }}
-                                               
-                       {{ if $item.vote.share }}
-                               <a href="#" id="share-$item.id" title="$item.vote.share.0" onclick="jotShare($item.id); return false">$item.vote.share.1</a>
-                       {{ endif }}                     
                        </div>
-                       
+                       <div class="wall-item-location">$item.location $item.postopts</div>                             
                        <div class="wall-item-actions-tools">
 
                                {{ 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 delete s16" title="$item.drop.delete">$item.drop.delete</a>
+                                       <a href="item/drop/$item.id" onclick="return confirmDelete();" title="$item.drop.delete"><i class="icon-trash icon-large"></i></a>
                                {{ endif }}
                                {{ if $item.edpost }}
-                                       <a class="icon edit s16" href="$item.edpost.0" title="$item.edpost.1"></a>
+                                       <a href="$item.edpost.0" title="$item.edpost.1"><i class="icon-edit icon-large"></i></a>
                                {{ endif }}
                        </div>
                        
                </div>
        </div>
        <div class="wall-item-bottom">
-               <div class="wall-item-links"></div>
+               <div class="wall-item-links">
+               </div>
                <div class="wall-item-like" id="wall-item-like-$item.id">$item.like</div>
                <div class="wall-item-dislike" id="wall-item-dislike-$item.id">$item.dislike</div>      
        </div>
        
        {{ if $item.threaded }}{{ if $item.comment }}
        <div class="wall-item-bottom">
-               <div class="wall-item-links"></div>
+               <div class="wall-item-links">
+               </div>
                <div class="wall-item-comment-wrapper" id="item-comments-$item.id" style="display: none;">
                                        $item.comment
                </div>