Avoid escaping relevant template variables

[friendica.git] / view / theme / frio / templates / wall_thread.tpl

diff --git a/view/theme/frio/templates/wall_thread.tpl b/view/theme/frio/templates/wall_thread.tpl
index b2e10a10a16ba01e514b326adedaffcd01cf9493..0ecceab0f16a98c7d07ff0a4b2a620c4d81bdce2 100644 (file)
--- a/view/theme/frio/templates/wall_thread.tpl
+++ b/view/theme/frio/templates/wall_thread.tpl
@@ -3,7 +3,7 @@
 It would be better if it would be done in friendica core but since core lacks this functionality
 it is done in the theme
 
 It would be better if it would be done in friendica core but since core lacks this functionality
 it is done in the theme
 

-In short: the piece of code counts the total number of children of the toplevelpost 
+In short: the piece of code counts the total number of children of the toplevelpost

 - this are usaly all posts with thread_level = 2 - and stores it in variable $top_children_total.
 The first time a children which hits thread_level = 2 and $top_child = 1 opens the div.
 
 - this are usaly all posts with thread_level = 2 - and stores it in variable $top_children_total.
 The first time a children which hits thread_level = 2 and $top_child = 1 opens the div.
 


@@ -40,11 +40,11 @@ as the value of $top_child_total (this is done at the end of this file)
 
        {{if $item.thread_level<3}}
                <div class="hide-comments-outer-wrapper">
 
        {{if $item.thread_level<3}}
                <div class="hide-comments-outer-wrapper">

-                       <div class="hide-comments-outer btn-link" onclick="showHideComments({{$item.id}});">
-                               <span id="hide-comments-total-{{$item.id}}" 
+                       <div class="hide-comments-outer fakelink" onclick="showHideComments({{$item.id}});">
+                               <span id="hide-comments-total-{{$item.id}}"

                                        class="hide-comments-total">{{$item.num_comments}}</span>
                                        class="hide-comments-total">{{$item.num_comments}}</span>

-                               <span id="hide-comments-{{$item.id}}" 
-                                       class="hide-comments fakelink">{{$item.hide_text}}</span>
+                               <span id="hide-comments-{{$item.id}}"
+                                       class="hide-comments">{{$item.hide_text}}</span>

                        </div>
                        <hr />
                </div>
                        </div>
                        <hr />
                </div>


@@ -57,9 +57,10 @@ as the value of $top_child_total (this is done at the end of this file)
 
 <!-- TODO => Unknow block -->
 <div class="wall-item-decor" style="display:none;">
 
 <!-- TODO => Unknow block -->
 <div class="wall-item-decor" style="display:none;">

+       {{if $item.star}}

        <span class="icon s22 star {{$item.isstarred}}" id="starred-{{$item.id}}" title="{{$item.star.starred}}">{{$item.star.starred}}</span>
        <span class="icon s22 star {{$item.isstarred}}" id="starred-{{$item.id}}" title="{{$item.star.starred}}">{{$item.star.starred}}</span>

+       {{/if}}

        {{if $item.lock}}<span class="navicon lock fakelink" onclick="lockview(event,{{$item.id}});" title="{{$item.lock}}"></span><span class="fa fa-lock"></span>{{/if}}
        {{if $item.lock}}<span class="navicon lock fakelink" onclick="lockview(event,{{$item.id}});" title="{{$item.lock}}"></span><span class="fa fa-lock"></span>{{/if}}

-       <img id="like-rotator-{{$item.id}}" class="like-rotator" src="images/rotator.gif" alt="{{$item.wait}}" title="{{$item.wait}}" style="display: none;" />

 </div>
 <!-- ./TODO => Unknow block -->
 
 </div>
 <!-- ./TODO => Unknow block -->
 


@@ -67,49 +68,61 @@ as the value of $top_child_total (this is done at the end of this file)
 
 {{* Use a different div container in dependence max thread-level = 7 *}}
 {{if $item.thread_level<7}}
 
 {{* Use a different div container in dependence max thread-level = 7 *}}
 {{if $item.thread_level<7}}

-<div class="wall-item-container {{$item.indent}} {{$item.shiny}} {{$item.network}} thread_level_{{$item.thread_level}} {{if $item.thread_level==1}}panel-body{{/if}}" id="item-{{$item.guid}}"><!-- wall-item-container -->
+<div class="item-{{$item.id}} wall-item-container {{$item.indent}} {{$item.shiny}} {{$item.network}} thread_level_{{$item.thread_level}} {{if $item.thread_level==1}}panel-body h-entry{{else}}u-comment h-cite{{/if}}" id="item-{{$item.guid}}"><!-- wall-item-container -->

 {{else}}
 {{else}}

-<div class="wall-item-container {{$item.indent}} {{$item.shiny}} {{$item.network}} thread_level_7" id="item-{{$item.guid}}">
- {{/if}}
+<div class="item-{{$item.id}} wall-item-container {{$item.indent}} {{$item.shiny}} {{$item.network}} thread_level_7 u-comment h-cite" id="item-{{$item.guid}}">
+{{/if}}
+{{if $item.thread_level==1}}
+<span class="commented" style="display: none;">{{$item.commented}}</span>
+<span class="received" style="display: none;">{{$item.received}}</span>
+<span class="created" style="display: none;">{{$item.created_date}}</span>
+<span class="id" style="display: none;">{{$item.id}}</span>
+{{/if}}

        <div class="media">
                {{* Put addional actions in a top-right dropdown menu *}}
        <div class="media">
                {{* Put addional actions in a top-right dropdown menu *}}

-               
+

                <ul class="nav nav-pills preferences">
                        <li><span class="wall-item-network" title="{{$item.app}}">{{$item.network_name}}</span></li>
 
                <ul class="nav nav-pills preferences">
                        <li><span class="wall-item-network" title="{{$item.app}}">{{$item.network_name}}</span></li>
 

-                       {{if $item.plink || $item.drop.dropping || $item.edpost || $item.ignore || $item.tagger || $item.star || $item.filer}}
+                       {{if $item.plink || $item.drop.dropping || $item.edpost || $item.ignore || $item.tagger || $item.star || $item.filer || $item.subthread}}

                        <li class="dropdown">
                        <li class="dropdown">

-                               <a class="dropdown-toggle" data-toggle="dropdown" id="dropdownMenuTools-{{$item.id}}" role="button" aria-haspopup="true" aria-expanded="false"><i class="fa fa-angle-down"></i></a>
+                               <button type="button" class="btn-link dropdown-toggle" data-toggle="dropdown" id="dropdownMenuTools-{{$item.id}}" aria-haspopup="true" aria-expanded="false"><i class="fa fa-angle-down" aria-hidden="true"></i></button>

 
                                <ul class="dropdown-menu pull-right" role="menu" aria-labelledby="dropdownMenuTools-{{$item.id}}">
                                        {{if $item.plink}}      {{*link to the original source of the item *}}
                                        <li role="menuitem">
 
                                <ul class="dropdown-menu pull-right" role="menu" aria-labelledby="dropdownMenuTools-{{$item.id}}">
                                        {{if $item.plink}}      {{*link to the original source of the item *}}
                                        <li role="menuitem">

-                                               <a title="{{$item.plink.title}}" href="{{$item.plink.href}}" class="navicon plink"><i class="fa fa-external-link"></i> {{$item.plink.title}}</a>
+                                               <a title="{{$item.plink.title}}" href="{{$item.plink.href}}" class="navicon plink u-url"><i class="fa fa-external-link" aria-hidden="true"></i> {{$item.plink.title}}</a>

                                        </li>
                                        {{/if}}
 
                                        {{if $item.edpost}} {{* edit the posting *}}
                                        <li role="menuitem">
                                        </li>
                                        {{/if}}
 
                                        {{if $item.edpost}} {{* edit the posting *}}
                                        <li role="menuitem">

-                                               <a onclick="editpost('{{$item.edpost.0}}?mode=none'); return false;" title="{{$item.edpost.1}}" class="navicon pencil"><i class="fa fa-pencil"></i> {{$item.edpost.1}}</a>
+                                               <button type="button" onclick="editpost('{{$item.edpost.0}}?mode=none');" title="{{$item.edpost.1}}" class="btn-link navicon pencil"><i class="fa fa-pencil" aria-hidden="true"></i> {{$item.edpost.1}}</button>

                                        </li>
                                        {{/if}}
 
                                        {{if $item.tagger}} {{* tag the post *}}
                                        <li role="menuitem">
                                        </li>
                                        {{/if}}
 
                                        {{if $item.tagger}} {{* tag the post *}}
                                        <li role="menuitem">

-                                               <a id="tagger-{{$item.id}}" onclick="itemTag({{$item.id}}); return false;" class="{{$item.tagger.class}}" title="{{$item.tagger.add}}"><i class="fa fa-tag"></i> {{$item.tagger.add}}</a>
+                                               <button type="button" id="tagger-{{$item.id}}" onclick="itemTag({{$item.id}});" class="btn-link {{$item.tagger.class}}" title="{{$item.tagger.add}}"><i class="fa fa-tag" aria-hidden="true"></i> {{$item.tagger.add}}</button>

                                        </li>
                                        {{/if}}
 
                                        {{if $item.filer}}
                                        <li role="menuitem">
                                        </li>
                                        {{/if}}
 
                                        {{if $item.filer}}
                                        <li role="menuitem">

-                                               <a id="filer-{{$item.id}}" onclick="itemFiler({{$item.id}}); return false;" class="filer-item filer-icon" title="{{$item.filer}}"><i class="fa fa-folder"></i>&nbsp;{{$item.filer}}</a>
+                                               <button type="button" id="filer-{{$item.id}}" onclick="itemFiler({{$item.id}});" class="btn-link filer-item filer-icon" title="{{$item.filer}}"><i class="fa fa-folder" aria-hidden="true"></i>&nbsp;{{$item.filer}}</button>

                                        </li>
                                        {{/if}}
 
                                        {{if $item.star}}
                                        <li role="menuitem">
                                        </li>
                                        {{/if}}
 
                                        {{if $item.star}}
                                        <li role="menuitem">

-                                               <a id="star-{{$item.id}}" onclick="dostar({{$item.id}}); return false;" class="{{$item.star.classdo}}" title="{{$item.star.do}}"><i class="fa fa-star-o"></i>&nbsp;{{$item.star.do}}</a>
-                                               <a id="unstar-{{$item.id}}" onclick="dostar({{$item.id}}); return false;" class="{{$item.star.classundo}}" title="{{$item.star.undo}}"><i class="fa fa-star"></i>&nbsp;{{$item.star.undo}}</a>
+                                               <button type="button" id="star-{{$item.id}}" onclick="dostar({{$item.id}});" class="btn-link {{$item.star.classdo}}" title="{{$item.star.do}}"><i class="fa fa-star-o" aria-hidden="true"></i>&nbsp;{{$item.star.do}}</button>
+                                               <button type="button" id="unstar-{{$item.id}}" onclick="dostar({{$item.id}});" class="btn-link {{$item.star.classundo}}" title="{{$item.star.undo}}"><i class="fa fa-star" aria-hidden="true"></i>&nbsp;{{$item.star.undo}}</button>
+                                       </li>
+                                       {{/if}}
+
+                                       {{if $item.subthread}}
+                                       <li role="menuitem">
+                                               <button type="button" id="subthread-{{$item.id}}" onclick="{{$item.subthread.action}}" class="btn-link" title="{{$item.subthread.title}}"><i class="fa fa-plus" aria-hidden="true"></i>&nbsp;{{$item.subthread.title}}</button>

                                        </li>
                                        {{/if}}
 
                                        </li>
                                        {{/if}}
 


@@ -119,16 +132,16 @@ as the value of $top_child_total (this is done at the end of this file)
 
                                        {{if $item.ignore}}
                                                <li role="menuitem">
 
                                        {{if $item.ignore}}
                                                <li role="menuitem">

-                                                       <a id="ignore-{{$item.id}}" onclick="doignore({{$item.id}}); return false;" class="{{$item.ignore.classdo}}" title="{{$item.ignore.do}}"><i class="fa fa-eye-slash"></i> {{$item.ignore.do}}</a>
+                                                       <button type="button" id="ignore-{{$item.id}}" onclick="doignore({{$item.id}});" class="btn-link {{$item.ignore.classdo}}" title="{{$item.ignore.do}}"><i class="fa fa-eye-slash" aria-hidden="true"></i> {{$item.ignore.do}}</button>

                                                </li>
                                                <li role="menuitem">
                                                </li>
                                                <li role="menuitem">

-                                                       <a id="unignore-{{$item.id}}" onclick="doignore({{$item.id}}); return false;"  class="{{$item.ignore.classundo}}"  title="{{$item.ignore.undo}}"><i class="fa fa-eye"></i> {{$item.ignore.undo}}</a>
+                                                       <button type="button" id="unignore-{{$item.id}}" onclick="doignore({{$item.id}});" class="btn-link {{$item.ignore.classundo}}"  title="{{$item.ignore.undo}}"><i class="fa fa-eye" aria-hidden="true"></i> {{$item.ignore.undo}}</button>

                                                </li>
                                        {{/if}}
 
                                        {{if $item.drop.dropping}}
                                        <li role="menuitem">
                                                </li>
                                        {{/if}}
 
                                        {{if $item.drop.dropping}}
                                        <li role="menuitem">

-                                               <a class="navicon delete" onclick="dropItem('item/drop/{{$item.id}}', '#item-{{$item.guid}}'); return false;" title="{{$item.drop.delete}}"><i class="fa fa-trash"></i> {{$item.drop.delete}}</a>
+                                               <button type="button" class="btn-link navicon delete" onclick="dropItem('item/drop/{{$item.id}}/{{$item.return}}', 'item-{{$item.guid}}');" title="{{$item.drop.delete}}"><i class="fa fa-trash" aria-hidden="true"></i> {{$item.drop.delete}}</button>

                                        </li>
                                        {{/if}}
                                </ul>
                                        </li>
                                        {{/if}}
                                </ul>


@@ -140,17 +153,17 @@ as the value of $top_child_total (this is done at the end of this file)
                {{* The avatar picture and the photo-menu *}}
                <div class="dropdown pull-left"><!-- Dropdown -->
                        {{if $item.thread_level==1}}
                {{* The avatar picture and the photo-menu *}}
                <div class="dropdown pull-left"><!-- Dropdown -->
                        {{if $item.thread_level==1}}

-                       <div class="hidden-sm hidden-xs contact-photo-wrapper mframe{{if $item.owner_url}} wwfrom{{/if}}">
-                               <a class="userinfo" id="wall-item-photo-menu-{{$item.id}}" href="{{$item.profile_url}}">
+                       <div class="hidden-sm hidden-xs contact-photo-wrapper mframe{{if $item.owner_url}} wwfrom{{/if}} p-author h-card">
+                               <a class="userinfo  u-url" id="wall-item-photo-menu-{{$item.id}}" href="{{$item.profile_url}}">

                                        <div class="contact-photo-image-wrapper">
                                        <div class="contact-photo-image-wrapper">

-                                               <img src="{{$item.thumb}}" class="contact-photo media-object {{$item.sparkle}}" id="wall-item-photo-{{$item.id}}" alt="{{$item.name}}" />
+                                               <img src="{{$item.thumb}}" class="contact-photo media-object {{$item.sparkle}} p-name u-photo" id="wall-item-photo-{{$item.id}}" alt="{{$item.name}}" />

                                        </div>
                                </a>
                        </div>
                        <div class="hidden-lg hidden-md contact-photo-wrapper mframe{{if $item.owner_url}} wwfrom{{/if}}">
                                        </div>
                                </a>
                        </div>
                        <div class="hidden-lg hidden-md contact-photo-wrapper mframe{{if $item.owner_url}} wwfrom{{/if}}">

-                               <a class="userinfo" id="wall-item-photo-menu-{{$item.id}}" href="{{$item.profile_url}}">
+                               <a class="userinfo u-url" id="wall-item-photo-menu-xs-{{$item.id}}" href="{{$item.profile_url}}">

                                        <div class="contact-photo-image-wrapper">
                                        <div class="contact-photo-image-wrapper">

-                                               <img src="{{$item.thumb}}" class="contact-photo-xs media-object {{$item.sparkle}}" id="wall-item-photo-{{$item.id}}" alt="{{$item.name}}" />
+                                               <img src="{{$item.thumb}}" class="contact-photo-xs media-object {{$item.sparkle}}" id="wall-item-photo-xs-{{$item.id}}" alt="{{$item.name}}" />

                                        </div>
                                </a>
                        </div>
                                        </div>
                                </a>
                        </div>


@@ -168,10 +181,10 @@ as the value of $top_child_total (this is done at the end of this file)
 
                        {{* The avatar picture for comments *}}
                        {{if $item.thread_level!=1}}
 
                        {{* The avatar picture for comments *}}
                        {{if $item.thread_level!=1}}

-                       <div class="contact-photo-wrapper mframe{{if $item.owner_url}} wwfrom{{/if}}">
-                               <a class="userinfo" id="wall-item-photo-menu-{{$item.id}}" href="{{$item.profile_url}}">
+                       <div class="contact-photo-wrapper mframe{{if $item.owner_url}} wwfrom{{/if}} p-author h-card">
+                               <a class="userinfo u-url" id="wall-item-photo-menu-{{$item.id}}" href="{{$item.profile_url}}">

                                        <div class="contact-photo-image-wrapper">
                                        <div class="contact-photo-image-wrapper">

-                                               <img src="{{$item.thumb}}" class="contact-photo-xs media-object {{$item.sparkle}}" id="wall-item-photo-{{$item.id}}" alt="{{$item.name}}" />
+                                               <img src="{{$item.thumb}}" class="contact-photo-xs media-object {{$item.sparkle}} p-name u-photo" id="wall-item-photo-comment-{{$item.id}}" alt="{{$item.name}}" />

                                        </div>
                                </a>
                        </div>
                                        </div>
                                </a>
                        </div>


@@ -183,14 +196,14 @@ as the value of $top_child_total (this is done at the end of this file)
                {{* contact info header*}}
                {{if $item.thread_level==1}}
                <div role="heading " aria-level="{{$item.thread_level}}" class="contact-info hidden-sm hidden-xs media-body"><!-- <= For computer -->
                {{* contact info header*}}
                {{if $item.thread_level==1}}
                <div role="heading " aria-level="{{$item.thread_level}}" class="contact-info hidden-sm hidden-xs media-body"><!-- <= For computer -->

-                       <h4 class="media-heading"><a href="{{$item.profile_url}}" title="{{$item.linktitle}}" class="wall-item-name-link userinfo"><span class="wall-item-name btn-link {{$item.sparkle}}">{{$item.name}}</span></a>
-                       {{if $item.owner_url}}{{$item.via}} <a href="{{$item.owner_url}}" target="redir" title="{{$item.olinktitle}}" class="wall-item-name-link userinfo"><span class="wall-item-name{{$item.osparkle}} btn-link" id="wall-item-ownername-{{$item.id}}">{{$item.owner_name}}</span></a>{{/if}}
-                       {{if $item.lock}}<span class="navicon lock fakelink" onClick="lockview(event,{{$item.id}});" title="{{$item.lock}}" data-toggle="tooltip">&nbsp;<small><i class="fa fa-lock"></i></small></span>{{/if}}
+                       <h4 class="media-heading"><a href="{{$item.profile_url}}" title="{{$item.linktitle}}" class="wall-item-name-link userinfo"><span class="wall-item-name {{$item.sparkle}}">{{$item.name}}</span></a>
+                       {{if $item.owner_url}}{{$item.via}} <a href="{{$item.owner_url}}" target="redir" title="{{$item.olinktitle}}" class="wall-item-name-link userinfo"><span class="wall-item-name {{$item.osparkle}}" id="wall-item-ownername-{{$item.id}}">{{$item.owner_name}}</span></a>{{/if}}
+                       {{if $item.lock}}<span class="navicon lock fakelink" onClick="lockview(event,{{$item.id}});" title="{{$item.lock}}" data-toggle="tooltip">&nbsp;<small><i class="fa fa-lock" aria-hidden="true"></i></small></span>{{/if}}

                        </h4>
 
                        <div class="additional-info text-muted">
                                <div id="wall-item-ago-{{$item.id}}" class="wall-item-ago">
                        </h4>
 
                        <div class="additional-info text-muted">
                                <div id="wall-item-ago-{{$item.id}}" class="wall-item-ago">

-                                       <small><a href="{{$item.plink.orig}}"><span class="time" title="{{$item.localtime}}" data-toggle="tooltip">{{$item.ago}}</span></a></small>
+                                       <small><a href="{{$item.plink.orig}}"><span class="time" title="{{$item.localtime}}" data-toggle="tooltip"><time class="dt-published" datetime="{{$item.localtime}}">{{$item.ago}}</time></span></a></small>

                                </div>
 
                                {{if $item.location}}
                                </div>
 
                                {{if $item.location}}


@@ -218,9 +231,9 @@ as the value of $top_child_total (this is done at the end of this file)
                <div class="media-body">{{*this is the media body for comments - this div must be closed at the end of the file *}}
                <div role="heading " aria-level="{{$item.thread_level}}" class="contact-info-comment">
                        <h5 class="media-heading">
                <div class="media-body">{{*this is the media body for comments - this div must be closed at the end of the file *}}
                <div role="heading " aria-level="{{$item.thread_level}}" class="contact-info-comment">
                        <h5 class="media-heading">

-                               <a href="{{$item.profile_url}}" title="{{$item.linktitle}}" class="wall-item-name-link userinfo"><span class="btn-link">{{$item.name}}</span></a>
+                               <a href="{{$item.profile_url}}" title="{{$item.linktitle}}" class="wall-item-name-link userinfo"><span class="fakelink">{{$item.name}}</span></a>

                                <span class="text-muted">
                                <span class="text-muted">

-                                       <small><span title="{{$item.localtime}}" data-toggle="tooltip">{{$item.ago}}</span> {{if $item.location}}&nbsp;&mdash;&nbsp;({{$item.location}}){{/if}}</small>
+                                       <small><a class="time" href="{{$item.plink.orig}}" title="{{$item.localtime}}" data-toggle="tooltip">{{$item.ago}}</a> {{if $item.location}}&nbsp;&mdash;&nbsp;({{$item.location}}){{/if}}</small>

                                </span>
                        </h5>
                </div>
                                </span>
                        </h5>
                </div>


@@ -232,41 +245,42 @@ as the value of $top_child_total (this is done at the end of this file)
                {{if $item.thread_level==1}}<hr />{{/if}}
 
                {{* item content *}}
                {{if $item.thread_level==1}}<hr />{{/if}}
 
                {{* item content *}}

-               <div itemprop="description" class="wall-item-content {{$item.type}}" id="wall-item-content-{{$item.id}}">
+               <div class="wall-item-content {{$item.type}}" id="wall-item-content-{{$item.id}}">

                        {{* insert some space if it's an top-level post *}}
                        {{if $item.thread_level==1}}
                        {{* insert some space if it's an top-level post *}}
                        {{if $item.thread_level==1}}

-                       <div style="height:10px;">&nbsp;</div> <!-- use padding/margin instead-->
+                       <div class="wall-spacer">&nbsp;</div> <!-- use padding/margin instead-->

                        {{/if}}
 
                        {{if $item.title}}
                        {{/if}}
 
                        {{if $item.title}}

-                       <span class="wall-item-title" id="wall-item-title-{{$item.id}}"><h4 class="media-heading"><a href="{{$item.plink.href}}" class="{{$item.sparkle}}">{{$item.title}}</a></h4><br /></span>
+                       <span class="wall-item-title" id="wall-item-title-{{$item.id}}"><h4 class="media-heading"><a href="{{$item.plink.href}}" class="{{$item.sparkle}} p-name">{{$item.title}}</a></h4><br /></span>

                        {{/if}}
 
                        {{/if}}
 

-                       <div class="wall-item-body" id="wall-item-body-{{$item.id}}">{{$item.body}}</div>
+                       <div class="wall-item-body e-content {{if !$item.title}}p-name{{/if}}" id="wall-item-body-{{$item.id}}">{{$item.body nofilter}}</div>

                </div>
 
                <!-- TODO -->
                <div class="wall-item-bottom">
                </div>
 
                <!-- TODO -->
                <div class="wall-item-bottom">

-                       <div class="wall-item-links">
-                       </div>
+                       <div class="wall-item-links"></div>

                        <div class="wall-item-tags">
                        <div class="wall-item-tags">

-                               {{foreach $item.hashtags as $tag}}
-                                       <span class='tag label btn-info sm'>{{$tag}} <i class="fa fa-bolt"></i></span>
-                               {{/foreach}}
-
-                               {{foreach $item.mentions as $tag}}
-                                       <span class='mention label btn-warning sm'>{{$tag}} <i class="fa fa-user"></i></span>
-                               {{/foreach}}
+               {{if !$item.suppress_tags}}
+                       {{foreach $item.hashtags as $tag}}
+                               <span class="tag label btn-info sm">{{$tag}} <i class="fa fa-bolt" aria-hidden="true"></i></span>
+                       {{/foreach}}
+
+                       {{foreach $item.mentions as $tag}}
+                               <span class="mention label btn-warning sm">{{$tag}} <i class="fa fa-user" aria-hidden="true"></i></span>
+                       {{/foreach}}
+               {{/if}}

 
 

-                               {{foreach $item.folders as $cat}}
-                                       <span class='folder label btn-danger sm'>{{$cat.name}}</a>{{if $cat.removeurl}} (<a href="{{$cat.removeurl}}" title="{{$remove}}">x</a>) {{/if}} </span>
-                               {{/foreach}}
+                       {{foreach $item.folders as $cat}}
+                               <span class="folder label btn-danger sm"><span class="p-category">{{$cat.name}}</span></a>{{if $cat.removeurl}} (<a href="{{$cat.removeurl}}" title="{{$remove}}">x</a>) {{/if}} </span>
+                       {{/foreach}}

 
 

-                               {{foreach $item.categories as $cat}}
-                                       <span class='category label btn-success sm'>{{$cat.name}}</a>{{if $cat.removeurl}} (<a href="{{$cat.removeurl}}" title="{{$remove}}">x</a>) {{/if}} </span>
-                               {{/foreach}}
+                       {{foreach $item.categories as $cat}}
+                               <span class="category label btn-success sm"><span class="p-category">{{$cat.name}}</span></a>{{if $cat.removeurl}} (<a href="{{$cat.removeurl}}" title="{{$remove}}">x</a>) {{/if}} </span>
+                       {{/foreach}}

                        </div>
                        </div>

-                               {{if $item.edited}}<div class="itemedited text-muted">{{$item.edited['label']}} (<span title="{{$item.edited['date']}}">{{$item.edited['relative']}}</span>)</div>{{/if}}
+                       {{if $item.edited}}<div class="itemedited text-muted">{{$item.edited['label']}} (<span title="{{$item.edited['date']}}">{{$item.edited['relative']}}</span>)</div>{{/if}}

                </div>
                <!-- ./TODO -->
 
                </div>
                <!-- ./TODO -->
 


@@ -276,7 +290,7 @@ as the value of $top_child_total (this is done at the end of this file)
                        <div class="wall-item-actions-left pull-left">
                                <!--comment this out to try something different {{if $item.threaded}}{{if $item.comment}}
                                <div id="button-reply" class="pull-left">
                        <div class="wall-item-actions-left pull-left">
                                <!--comment this out to try something different {{if $item.threaded}}{{if $item.comment}}
                                <div id="button-reply" class="pull-left">

-                                       <span class="btn-link" id="comment-{{$item.id}}" onclick="openClose('item-comments-{{$item.id}}'); commentExpand({{$item.id}});"><i class="fa fa-reply" title="{{$item.switchcomment}}"></i> </span>
+                                       <button type="button" class="btn-link" id="comment-{{$item.id}}" onclick="openClose('item-comments-{{$item.id}}'); commentExpand({{$item.id}});"><i class="fa fa-reply" title="{{$item.switchcomment}}"></i> </span>

                                </div>
                                {{/if}}{{/if}}-->
 
                                </div>
                                {{/if}}{{/if}}-->
 


@@ -285,45 +299,44 @@ as the value of $top_child_total (this is done at the end of this file)
                                {{* Buttons for like and dislike *}}
                                {{if $item.vote}}
                                        {{if $item.vote.like}}
                                {{* Buttons for like and dislike *}}
                                {{if $item.vote}}
                                        {{if $item.vote.like}}

-                                       <a role="button" class="button-likes" id="like-{{$item.id}}" title="{{$item.vote.like.1}}" onclick="dolike({{$item.id}},'like'); return false;"><i class="fa fa-thumbs-up"></i>&nbsp;{{$item.vote.like.1}}</a>
+                                       <button type="button" class="btn-link button-likes{{if $item.responses.like.self}} active" aria-pressed="true{{/if}}" id="like-{{$item.id}}" title="{{$item.vote.like.0}}" onclick="doLikeAction({{$item.id}},'like');" data-toggle="button"><i class="fa fa-thumbs-up" aria-hidden="true"></i>&nbsp;{{$item.vote.like.1}}</button>

                                        {{/if}}
                                        {{/if}}

-

                                        {{if $item.vote.like AND $item.vote.dislike}}
                                        {{if $item.vote.like AND $item.vote.dislike}}

-                                       <span role="presentation" class="separator">&nbsp;•&nbsp;</span>
+                                       <span role="presentation" class="separator">•</span>

                                        {{/if}}
                                        {{/if}}

-

                                        {{if $item.vote.dislike}}
                                        {{if $item.vote.dislike}}

-                                       <a role="button" class="button-likes" id="dislike-{{$item.id}}" title="{{$item.vote.dislike.1}}" onclick="dolike({{$item.id}},'dislike'); return false;"><i class="fa fa-thumbs-down"></i>&nbsp;{{$item.vote.dislike.1}}</a>
+                                       <button type="button" class="btn-link button-likes{{if $item.responses.dislike.self}} active" aria-pressed="true{{/if}}" id="dislike-{{$item.id}}" title="{{$item.vote.dislike.0}}" onclick="doLikeAction({{$item.id}},'dislike');" data-toggle="button"><i class="fa fa-thumbs-down" aria-hidden="true"></i>&nbsp;{{$item.vote.dislike.1}}</button>

                                        {{/if}}
 
                                        {{if ($item.vote.like OR $item.vote.dislike) AND $item.comment}}
                                        {{/if}}
 
                                        {{if ($item.vote.like OR $item.vote.dislike) AND $item.comment}}

-                                       <span role="presentation" class="separator">&nbsp;•&nbsp;</span>
+                                       <span role="presentation" class="separator">•</span>

                                        {{/if}}
                                {{/if}}
 
                                        {{/if}}
                                {{/if}}
 

-                               {{* Butten to open the comment text field *}}
+                               {{* Button to open the comment text field *}}

                                {{if $item.comment}}
                                {{if $item.comment}}

-                               <a role="button" class="button-comments" id="comment-{{$item.id}}" title="{{$item.switchcomment}}" {{if $item.thread_level != 1}}onclick="openClose('item-comments-{{$item.id}}'); commentExpand({{$item.id}});" {{else}} onclick="showHide('item-comments-{{$item.id}}'); commentExpand({{$item.id}});"{{/if}}><i class="fa fa-commenting"></i>&nbsp;{{$item.switchcomment}}</a>
+                               <button type="button" class="btn-link button-comments" id="comment-{{$item.id}}" title="{{$item.switchcomment}}" {{if $item.thread_level != 1}}onclick="openClose('item-comments-{{$item.id}}'); commentExpand({{$item.id}});" {{else}} onclick="showHide('item-comments-{{$item.id}}'); commentExpand({{$item.id}});"{{/if}}><i class="fa fa-commenting" aria-hidden="true"></i>&nbsp;{{$item.switchcomment}}</button>

                                {{/if}}
 
                                {{* Button for sharing the item *}}
                                {{if $item.vote}}
                                {{/if}}
 
                                {{* Button for sharing the item *}}
                                {{if $item.vote}}

-                                       {{if ($item.vote.like OR $item.vote.dislike OR $item.comment) AND $item.vote.share}}
-                                       <span role="presentation" class="separator">&nbsp;•&nbsp;</span>
-                                       {{/if}}

                                        {{if $item.vote.share}}
                                        {{if $item.vote.share}}

-                                       <a role="button" class="button-votes" id="share-{{$item.id}}" title="{{$item.vote.share.0}}" onclick="jotShare({{$item.id}}); return false;"><i class="fa fa-retweet"></i>&nbsp;{{$item.vote.share.0}}</a>
+                                               {{if $item.vote.like OR $item.vote.dislike OR $item.comment}}
+                                       <span role="presentation" class="separator">•</span>
+                                               {{/if}}
+                                       <button type="button" class="btn-link button-votes" id="share-{{$item.id}}" title="{{$item.vote.share.0}}" onclick="jotShare({{$item.id}});"><i class="fa fa-retweet" aria-hidden="true"></i>&nbsp;{{$item.vote.share.1}}</button>

                                        {{/if}}
                                {{/if}}
                                        {{/if}}
                                {{/if}}

+                               <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-actions-right pull-right">
                                {{* Event attendance buttons *}}
                                {{if $item.isevent}}
                                <div class="vote-event">
                        </div>
 
                        <div class="wall-item-actions-right pull-right">
                                {{* Event attendance buttons *}}
                                {{if $item.isevent}}
                                <div class="vote-event">

-                                       <a role="button" class="button-event" id="attendyes-{{$item.id}}" title="{{$item.attend.0}}" onclick="dolike({{$item.id}},'attendyes'); return false;"><i class="fa fa-check"><span class="sr-only">{{$item.attend.0}}</span></i></a>
-                                       <a role="button" class="button-event" id="attendno-{{$item.id}}" title="{{$item.attend.1}}" onclick="dolike({{$item.id}},'attendno'); return false;"><i class="fa fa-times"><span class="sr-only">{{$item.attend.1}}</span></i></a>
-                                       <a role="button" class="button-event" id="attendmaybe-{{$item.id}}" title="{{$item.attend.2}}" onclick="dolike({{$item.id}},'attendmaybe'); return false;"><i class="fa fa-question"><span class="sr-only">{{$item.attend.2}}</span></i></a>
+                                       <button type="button" class="btn btn-xs btn-default button-event{{if $item.responses.attendyes.self}} active" aria-pressed="true{{/if}}" id="attendyes-{{$item.id}}" title="{{$item.attend.0}}" onclick="doLikeAction({{$item.id}},'attendyes');"><i class="fa fa-check" aria-hidden="true"><span class="sr-only">{{$item.attend.0}}</span></i></button>
+                                       <button type="button" class="btn btn-xs btn-default button-event{{if $item.responses.attendno.self}} active" aria-pressed="true{{/if}}" id="attendno-{{$item.id}}" title="{{$item.attend.1}}" onclick="doLikeAction({{$item.id}},'attendno');"><i class="fa fa-times" aria-hidden="true"><span class="sr-only">{{$item.attend.1}}</span></i></button>
+                                       <button type="button" class="btn btn-xs btn-default button-event{{if $item.responses.attendmaybe.self}} active" aria-pressed="true{{/if}}" id="attendmaybe-{{$item.id}}" title="{{$item.attend.2}}" onclick="doLikeAction({{$item.id}},'attendmaybe');"><i class="fa fa-question" aria-hidden="true"><span class="sr-only">{{$item.attend.2}}</span></i></button>

                                </div>
                                {{/if}}
 
                                </div>
                                {{/if}}
 


@@ -343,7 +356,7 @@ as the value of $top_child_total (this is done at the end of this file)
                {{if $item.responses}}
                        <div class="wall-item-responses">
                                {{foreach $item.responses as $verb=>$response}}
                {{if $item.responses}}
                        <div class="wall-item-responses">
                                {{foreach $item.responses as $verb=>$response}}

-                               <div class="wall-item-{{$verb}}" id="wall-item-{{$verb}}-{{$item.id}}">{{$response.output}}</div>
+                               <div class="wall-item-{{$verb}}" id="wall-item-{{$verb}}-{{$item.id}}">{{$response.output nofilter}}</div>

                                {{/foreach}}
                        </div>
                {{/if}}
                                {{/foreach}}
                        </div>
                {{/if}}


@@ -357,7 +370,7 @@ as the value of $top_child_total (this is done at the end of this file)
                {{* Insert comment box of threaded children *}}
                {{if $item.threaded}}{{if $item.comment}}{{if $item.indent==comment}}
                <div class="wall-item-comment-wrapper" id="item-comments-{{$item.id}}" style="display: none;">
                {{* Insert comment box of threaded children *}}
                {{if $item.threaded}}{{if $item.comment}}{{if $item.indent==comment}}
                <div class="wall-item-comment-wrapper" id="item-comments-{{$item.id}}" style="display: none;">

-                       {{$item.comment}}
+                       {{$item.comment nofilter}}

                </div>
                {{/if}}{{/if}}{{/if}}
 
                </div>
                {{/if}}{{/if}}{{/if}}
 


@@ -378,19 +391,19 @@ as the value of $top_child_total (this is done at the end of this file)
                        case it could be opend with the "comment" button *}}
                {{if $item.total_comments_num}}
                        {{if $item.threaded}}{{if $item.comment}}{{if $item.thread_level==1}}
                        case it could be opend with the "comment" button *}}
                {{if $item.total_comments_num}}
                        {{if $item.threaded}}{{if $item.comment}}{{if $item.thread_level==1}}

-                               <div class="wall-item-comment-wrapper well well-small" id="item-comments-{{$item.id}}">{{$item.comment}}</div>
+                               <div class="wall-item-comment-wrapper well well-small" id="item-comments-{{$item.id}}">{{$item.comment nofilter}}</div>

                        {{/if}}{{/if}}{{/if}}
 
                        {{if $item.flatten}}
                        {{/if}}{{/if}}{{/if}}
 
                        {{if $item.flatten}}

-                               <div class="wall-item-comment-wrapper well well-small" id="item-comments-{{$item.id}}">{{$item.comment}}</div>
+                               <div class="wall-item-comment-wrapper well well-small" id="item-comments-{{$item.id}}">{{$item.comment nofilter}}</div>

                        {{/if}}
                {{else}}
                        {{if $item.threaded}}{{if $item.comment}}{{if $item.thread_level==1}}
                        {{/if}}
                {{else}}
                        {{if $item.threaded}}{{if $item.comment}}{{if $item.thread_level==1}}

-                               <div class="wall-item-comment-wrapper well well-small" id="item-comments-{{$item.id}}" style="display: none;">{{$item.comment}}</div>
+                               <div class="wall-item-comment-wrapper well well-small" id="item-comments-{{$item.id}}" style="display: none;">{{$item.comment nofilter}}</div>

                        {{/if}}{{/if}}{{/if}}
 
                        {{if $item.flatten}}
                        {{/if}}{{/if}}{{/if}}
 
                        {{if $item.flatten}}

-                               <div class="wall-item-comment-wrapper well well-small" id="item-comments-{{$item.id}}" style="display: none;">{{$item.comment}}</div>
+                               <div class="wall-item-comment-wrapper well well-small" id="item-comments-{{$item.id}}" style="display: none;">{{$item.comment nofilter}}</div>

                        {{/if}}
                {{/if}}
        </div><!-- /media -->
                        {{/if}}
                {{/if}}
        </div><!-- /media -->