]> git.mxchange.org Git - friendica.git/commitdiff
Merge branch 'develop' into improvement/frio-action-links-to-buttons
authorHypolite Petovan <ben.lort@gmail.com>
Tue, 14 Mar 2017 14:45:17 +0000 (10:45 -0400)
committerHypolite Petovan <ben.lort@gmail.com>
Tue, 14 Mar 2017 14:45:17 +0000 (10:45 -0400)
# Conflicts:
# view/theme/frio/templates/search_item.tpl
# view/theme/frio/templates/wall_thread.tpl

1  2 
view/theme/frio/css/style.css
view/theme/frio/templates/search_item.tpl
view/theme/frio/templates/wall_thread.tpl

index 4e189b11fe5a046c0ec9121b910a4f8238057f68,34bcb833dbf21e50af43b8d735047d6201f6cebd..4e3dc9749cf1008590222a9477ef9d92d772a5b1
@@@ -185,12 -185,6 +185,12 @@@ a#item-delete-selected 
      outline: 0;
      background: $btn_primary_hover_color !important;
  }
 +.btn-default:active, .btn-default.active {
 +    color: $link_color;
 +}
 +.btn-default:active:hover, .btn-default.active:hover {
 +    color: $link_hover_color;
 +}
  .btn-primary.active.focus, .btn-primary.active:focus, .btn-primary.active:hover,
  .btn-primary:active.focus, .btn-primary:active:focus, .btn-primary:active:hover,
  .open>.dropdown-toggle.btn-primary.focus, .open>.dropdown-toggle.btn-primary:focus,
@@@ -553,8 -547,9 +553,8 @@@ nav.navbar .nav>li>a:focus
  #topbar-first .dropdown-footer {
      margin: 10px 10px 5px
  }
 -#topbar-first a,
 -nav.navbar a {
 -    /*color: #fff*/
 +#topbar-first a, #topbar-first .btn-link,
 +nav.navbar a, nav.navbar .btn-link {
      color: $nav_icon_color;
  }
  #topbar-first .caret {
  .contact-photo-wrapper .dropdown-menu li {
      border-left: 3px solid $nav_bg;
  }
 -.nav-pills .dropdown-menu li a,
 -.nav-tabs .dropdown-menu li a,
 -.account .dropdown-menu li a,
 -.contact-photo-wrapper .dropdown-menu li a {
 +.nav-pills .dropdown-menu li a, .nav-pills .dropdown-menu li .btn-link,
 +.nav-tabs .dropdown-menu li a, .nav-tabs .dropdown-menu li .btn-link,
 +.account .dropdown-menu li a, .account .dropdown-menu li .btn-link,
 +.contact-photo-wrapper .dropdown-menu li a, .contact-photo-wrapper .dropdown-menu li .btn-link {
      color: $nav_icon_color;
      font-weight: 400;
      font-size: 13px;
      padding: 4px 15px;
      text-transform: capitalize;
  }
 -.nav-pills .dropdown-menu li a i,
 -.nav-tabs .dropdown-menu li a i,
 -.account .dropdown-menu li a i,
 -.contact-photo-wrapper .dropdown-menu li a i {
 +.nav-pills .dropdown-menu li a i, .nav-pills .dropdown-menu li .btn-link i,
 +.nav-tabs .dropdown-menu li a i, .nav-tabs .dropdown-menu li .btn-link i,
 +.account .dropdown-menu li a i, .account .dropdown-menu li .btn-link i,
 +.contact-photo-wrapper .dropdown-menu li a i, .contact-photo-wrapper .dropdown-menu li .btn-link i {
      margin-right: 5px;
      font-size: 14px;
      display: inline-block;
      width: 14px
  }
 -.nav-pills .dropdown-menu li a:hover,
 -.nav-tabs .dropdown-menu li a:hover,
 -.account .dropdown-menu li a:hover,
 -.contact-photo-wrapper .dropdown-menu li a:hover,
 -.nav-pills .dropdown-menu li a:visited,
 -.nav-tabs .dropdown-menu li a:visited,
 -.account .dropdown-menu li a:visited,
 -.contact-photo-wrapper .dropdown-menu li a:visited,
 -.nav-pills .dropdown-menu li a:hover,
 -.nav-tabs .dropdown-menu li a:hover,
 -.account .dropdown-menu li a:hover,
 -.contact-photo-wrapper .dropdown-menu li a:hover,
 -.nav-pills .dropdown-menu li a:focus,
 -.nav-tabs .dropdown-menu li a:focus,
 -.account .dropdown-menu li a:focus,
 -.contact-photo-wrapper .dropdown-menu li a:focus {
 +.nav-pills .dropdown-menu li a:hover, .nav-pills .dropdown-menu li .btn-link:hover,
 +.nav-tabs .dropdown-menu li a:hover, .nav-tabs .dropdown-menu li .btn-link:hover,
 +.account .dropdown-menu li a:hover, .account .dropdown-menu li .btn-link:hover,
 +.contact-photo-wrapper .dropdown-menu li a:hover, .contact-photo-wrapper .dropdown-menu li .btn-link:hover,
 +.nav-pills .dropdown-menu li a:visited, .nav-pills .dropdown-menu li .btn-link:visited,
 +.nav-tabs .dropdown-menu li a:visited, .nav-tabs .dropdown-menu li .btn-link:visited,
 +.account .dropdown-menu li a:visited, .account .dropdown-menu li .btn-link:visited,
 +.contact-photo-wrapper .dropdown-menu li a:visited, .contact-photo-wrapper .dropdown-menu li .btn-link:visited,
 +.nav-pills .dropdown-menu li a:hover, .nav-pills .dropdown-menu li .btn-link:hover,
 +.nav-tabs .dropdown-menu li a:hover, .nav-tabs .dropdown-menu li .btn-link:hover,
 +.account .dropdown-menu li a:hover, .account .dropdown-menu li .btn-link:hover,
 +.contact-photo-wrapper .dropdown-menu li a:hover, .contact-photo-wrapper .dropdown-menu li .btn-link:hover,
 +.nav-pills .dropdown-menu li a:focus, .nav-pills .dropdown-menu li .btn-link:focus,
 +.nav-tabs .dropdown-menu li a:focus, .nav-tabs .dropdown-menu li .btn-link:focus,
 +.account .dropdown-menu li a:focus, .account .dropdown-menu li .btn-link:focus,
 +.contact-photo-wrapper .dropdown-menu li a:focus, .contact-photo-wrapper .dropdown-menu li .btn-link:focus {
      background: 0 0
  }
  .nav-pills .dropdown-menu li:hover,
@@@ -1319,7 -1314,7 +1319,7 @@@ section #jotOpen 
  }
  
  .toplevel_item:hover .fakelink, .wall-item-container:hover .fakelink,
 -.toplevel_item:hover .wall-item-container:hover .btn-link,
 +.toplevel_item:hover .wall-item-container:hover :not(.dropdown):not([role=menuitem]) > .btn-link,
  .toplevel_item:hover .wall-item-container:hover .wall-item-responses a,
  .toplevel_item:hover .wall-item-content a,
  .toplevel_item:hover .wall-item-name,
@@@ -1568,6 -1563,8 +1568,6 @@@ code > .hl-main 
  .wall-item-actions .button-comments,
  .wall-item-actions .button-votes,
  .wall-item-actions .button-likes {
 -    padding-left: 0px;
 -    padding-right: 0px;
      text-transform: capitalize;
  }
  
  /*
  * Comment Box
  */
 +.wall-item-comment-wrapper {
 +      margin-top: 10px;
 +}
  .thread_level_2 .wall-item-comment-wrapper {
      padding-right: 5px;
  }
@@@ -2514,6 -2508,24 +2514,24 @@@ body .tread-wrapper .hovercard:hover .h
      color: $link_color !important;
  }
  
+ /* Pagination improvements */
+ .pagination > li > a,
+ .pagination > li > span {
+       color: $link_color;
+ }
+ .pagination>.active>a,
+ .pagination>.active>a:focus,
+ .pagination>.active>a:hover,
+ .pagination>.active>span,
+ .pagination>.active>span:focus,
+ .pagination>.active>span:hover {
+       background-color: $link_color;
+     border-color: $link_color;
+ }
+ .disabled > a {
+       pointer-events: none;
+ }
  /*
   * some temporary workarounds until this will solved
   * elsewhere (e.g. new templates)
index bf90f8606bffd53cc3eb0e43889b5cf9b35b3612,0a6eca0c2700fc182b0db5a9f3a8fa7fc20f46bc..2faa31475c2ba1ce1703afdd9b5b36c60a530be5
@@@ -1,13 -1,13 +1,13 @@@
  <!-- TODO => Unknow block -->
  <div class="wall-item-decor" style="display:none;">
        <span class="icon s22 star {{$item.isstarred}}" id="starred-{{$item.id}}" title="{{$item.star.starred}}">{{$item.star.starred}}</span>
 -      {{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 class="panel">
+ <div class="panel" id="item-{{$item.guid}}">
        <div class="wall-item-container panel-body{{$item.indent}} {{$item.shiny}} {{$item.previewing}}" >
                <div class="media">
                        {{* Put additional actions in a top-right dropdown menu *}}
  
                                {{if $item.plink || $item.star || $item.drop.dropping || $item.edpost}}
                                <li class="dropdown">
 -                                      <a class="dropdown-toggle" data-toggle="dropdown"  href="#" id="dropdownMenuTools-{{$item.id}}" role="button" aria-haspopup="true" aria-expanded="false"><i class="fa fa-angle-down"></i></a>
 +                                      <button class="btn-link dropdown-toggle" data-toggle="dropdown" id="dropdownMenuTools-{{$item.id}}" type="button" aria-haspopup="true" aria-expanded="false"><i class="fa fa-angle-down"></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">
 -                                                      <a title="{{$item.plink.title}}" href="{{$item.plink.href}}" class="navicon plink"><i class="fa fa-external-link"></i> {{$item.plink.title}}</a>
 -                                              </li>
 -                                              {{/if}}
 +                                              <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>
 +                                              </li>
 +                                              {{/if}}
  
                                                {{if $item.edpost}} {{* edit the posting *}}
                                                <li role="menuitem">
 -                                                      <a href="#" href="{{$item.edpost.0}}" title="{{$item.edpost.1}}" class="navicon pencil"><i class="fa fa-pencil"></i> {{$item.edpost.1}}</a>
 +                                                      <button type="button" href="{{$item.edpost.0}}" title="{{$item.edpost.1}}" class="btn-link navicon pencil"><i class="fa fa-pencil"></i> {{$item.edpost.1}}</button>
                                                </li>
                                                {{/if}}
  
                                                {{if $item.tagger}} {{* tag the post *}}
                                                <li role="menuitem">
 -                                                      <a href="#" 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}}); return false;" class="btn-link {{$item.tagger.class}}" title="{{$item.tagger.add}}"><i class="fa fa-tag"></i> {{$item.tagger.add}}</button>
                                                </li>
                                                {{/if}}
  
                                                {{if $item.filer}}
                                                <li role="menuitem">
 -                                                      <a href="#" 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}}); return false;" class="btn-link filer-item filer-icon" title="{{$item.filer}}"><i class="fa fa-folder"></i>&nbsp;{{$item.filer}}</button>
                                                </li>
                                                {{/if}}
  
                                                {{if $item.star}}
                                                <li role="menuitem">
 -                                                      <a href="#" 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 href="#" 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}}); return false;" class="btn-link {{$item.star.classdo}}" title="{{$item.star.do}}"><i class="fa fa-star-o"></i>&nbsp;{{$item.star.do}}</button>
 +                                                      <button type="button" id="unstar-{{$item.id}}" onclick="dostar({{$item.id}}); return false;" class="btn-link {{$item.star.classundo}}" title="{{$item.star.undo}}"><i class="fa fa-star"></i>&nbsp;{{$item.star.undo}}</button>
                                                </li>
                                                {{/if}}
  
                                                {{if $item.drop.dropping}}
                                                <li role="separator" class="divider"></li>
                                                <li role="menuitem">
-                                                       <button type="button" class="btn-link 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}}</button>
 -                                                      <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-{{$item.guid}}'); return false;" title="{{$item.drop.delete}}"><i class="fa fa-trash"></i> {{$item.drop.delete}}</button>
                                                </li>
                                                {{/if}}
                                        </ul>
@@@ -85,7 -85,7 +85,7 @@@
                        <div role="heading " 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}}">&nbsp;<small><i class="fa fa-lock"></i></small></span>{{/if}}
 +                                      {{if $item.lock}}<span class="navicon lock fakelink" onClick="lockview(event, {{$item.id}});" title="{{$item.lock}}">&nbsp;<small><i class="fa fa-lock"></i></small></span>{{/if}}
  
                                        <div class="additional-info text-muted">
                                                <div id="wall-item-ago-{{$item.id}}" class="wall-item-ago">
                                </div>
                                <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>
 +                                              <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>
 +                                              <span class="mention label btn-warning sm">{{$tag}} <i class="fa fa-user"></i></span>
                                        {{/foreach}}
  
                                        {{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>
 +                                              <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.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>
 +                                              <span class="category label btn-success sm">{{$cat.name}}</a>{{if $cat.removeurl}} (<a href="{{$cat.removeurl}}" title="{{$remove}}">x</a>) {{/if}} </span>
                                        {{/foreach}}
                                </div>
                                        {{if $item.edited}}<div class="itemedited text-muted">{{$item.edited['label']}} (<span title="{{$item.edited['date']}}">{{$item.edited['relative']}}</span>)</div>{{/if}}
                                        {{* Buttons for like and dislike *}}
                                        {{if $item.vote}}
                                                {{if $item.vote.like}}
 -                                              <a role="button" href="#" class="button-likes{{if $item.responses.like.self}} active{{/if}}" id="like-{{$item.id}}" title="{{$item.vote.like.0}}" onclick="dolike({{$item.id}},'like'); return false;">{{$item.vote.like.0}}</a>
 -                                              {{/if}}
 -
 -                                              {{if $item.vote.like AND $item.vote.dislike}}
 -                                              <span role="presentation" class="separator">&nbsp;•&nbsp;</span>
 +                                              <button type="button" class="btn btn-defaultbutton-likes{{if $item.responses.like.self}} active" aria-pressed="true{{/if}}" id="like-{{$item.id}}" title="{{$item.vote.like.0}}" onclick="dolike({{$item.id}}, 'like'); return false;">{{$item.vote.like.0}}</button>
                                                {{/if}}
  
                                                {{if $item.vote.dislike}}
 -                                              <a role="button" href="#" class="button-likes{{if $item.responses.like.self}} active{{/if}}" id="dislike-{{$item.id}}" title="{{$item.vote.dislike.0}}" onclick="dolike({{$item.id}},'dislike'); return false;">{{$item.vote.dislike.0}}</a>
 -                                              {{/if}}
 -
 -                                              {{if ($item.vote.like OR $item.vote.dislike) AND $item.comment}}
 -                                              <span role="presentation" class="separator">&nbsp;•&nbsp;</span>
 +                                              <button type="button" class="btn btn-defaultbutton-likes{{if $item.responses.like.self}} active" aria-pressed="true{{/if}}" id="dislike-{{$item.id}}" title="{{$item.vote.dislike.0}}" onclick="dolike({{$item.id}}, 'dislike'); return false;">{{$item.vote.dislike.0}}</button>
                                                {{/if}}
                                        {{/if}}
  
 -                                      {{* Butten to open the comment text field *}}
 +                                      {{* Button to open the comment text field *}}
                                        {{if $item.comment}}
 -                                      <a role="button" class="" id="comment-{{$item.id}}" title="{{$item.switchcomment}}" onclick="openClose('item-comments-{{$item.id}}'); commentExpand({{$item.id}});">{{$item.switchcomment}} </a>
 +                                      <button type="button" class="btn btn-default" id="comment-{{$item.id}}" title="{{$item.switchcomment}}" onclick="openClose('item-comments-{{$item.id}}'); commentExpand({{$item.id}});">{{$item.switchcomment}}</button>
                                        {{/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}}
 -                                              <a role="button" href="#" class="" 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>
 +                                              <button type="button" class="btn btn-default" 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}}</button>
                                                {{/if}}
                                        {{/if}}
                                </div>
                                        {{* Event attendance buttons *}}
                                        {{if $item.isevent}}
                                        <div class="vote-event">
 -                                              <a role="button" href="#" class="button-event{{if $item.responses.attendyes.self}} active{{/if}}" 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" href="#" class="button-event{{if $item.responses.attendno.self}} active{{/if}}" 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" href="#" class="button-event{{if $item.responses.attendmaybe.self}} active{{/if}}" 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-defaultbutton-event{{if $item.responses.attendyes.self}} active" aria-pressed="true{{/if}}" 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></button>
 +                                              <button type="button" class="btn btn-defaultbutton-event{{if $item.responses.attendno.self}} active" aria-pressed="true{{/if}}" 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></button>
 +                                              <button type="button" class="btn btn-defaultbutton-event{{if $item.responses.attendmaybe.self}} active" aria-pressed="true{{/if}}" 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></button>
                                        </div>
                                        {{/if}}
  
  
                                        {{* Display likes, dislike and attendance stats *}}
                        {{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>
 -                                      {{/foreach}}
 -                              </div>
 +                      <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>
 +                              {{/foreach}}
 +                      </div>
                        {{/if}}
  
                        <div class="wall-item-conv" id="wall-item-conv-{{$item.id}}" >
                        {{if $item.conv}}
 -                                      <a href='{{$item.conv.href}}' id='context-{{$item.id}}' title='{{$item.conv.title}}'>{{$item.conv.title}}</a>
 +                              <a href="{{$item.conv.href}}" id="context-{{$item.id}}" title="{{$item.conv.title}}">{{$item.conv.title}}</a>
                        {{/if}}
                        </div>
                </div><!--./media>-->
index 6f7de795fc21a2a6a585f0b29fb24d9376e3d427,85091cf1c69aa3858130e66c2802ae636c41b2fd..4024ce7810d61e408f4b9be824c342e04438bf9b
@@@ -80,7 -80,7 +80,7 @@@ as the value of $top_child_total (this 
  
                        {{if $item.plink || $item.drop.dropping || $item.edpost || $item.ignore || $item.tagger || $item.star || $item.filer}}
                        <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"></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 *}}
  
                                        {{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'); return false;" title="{{$item.edpost.1}}" class="btn-link navicon pencil"><i class="fa fa-pencil"></i> {{$item.edpost.1}}</button>
                                        </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}}); return false;" class="btn-link {{$item.tagger.class}}" title="{{$item.tagger.add}}"><i class="fa fa-tag"></i> {{$item.tagger.add}}</button>
                                        </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}}); return false;" class="btn-link filer-item filer-icon" title="{{$item.filer}}"><i class="fa fa-folder"></i>&nbsp;{{$item.filer}}</button>
                                        </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}}); return false;" class="btn-link {{$item.star.classdo}}" title="{{$item.star.do}}"><i class="fa fa-star-o"></i>&nbsp;{{$item.star.do}}</button>
 +                                              <button type="button" id="unstar-{{$item.id}}" onclick="dostar({{$item.id}}); return false;" class="btn-link {{$item.star.classundo}}" title="{{$item.star.undo}}"><i class="fa fa-star"></i>&nbsp;{{$item.star.undo}}</button>
                                        </li>
                                        {{/if}}
  
  
                                        {{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}}); return false;" class="btn-link {{$item.ignore.classdo}}" title="{{$item.ignore.do}}"><i class="fa fa-eye-slash"></i> {{$item.ignore.do}}</button>
                                                </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}}); return false;" class="btn-link {{$item.ignore.classundo}}"  title="{{$item.ignore.undo}}"><i class="fa fa-eye"></i> {{$item.ignore.undo}}</button>
                                                </li>
                                        {{/if}}
  
                                        {{if $item.drop.dropping}}
                                        <li role="menuitem">
-                                               <button type="button" class="btn-link 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}}</button>
 -                                              <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-{{$item.guid}}'); return false;" title="{{$item.drop.delete}}"><i class="fa fa-trash"></i> {{$item.drop.delete}}</button>
                                        </li>
                                        {{/if}}
                                </ul>
                                {{* Buttons for like and dislike *}}
                                {{if $item.vote}}
                                        {{if $item.vote.like}}
 -                                      <a role="button" class="button-likes{{if $item.responses.like.self}} active{{/if}}" id="like-{{$item.id}}" title="{{$item.vote.like.0}}" 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 btn-xs btn-default button-likes{{if $item.responses.like.self}} active" aria-pressed="true{{/if}}" id="like-{{$item.id}}" title="{{$item.vote.like.0}}" onclick="dolike({{$item.id}},'like'); return false;" data-toggle="button"><i class="fa fa-thumbs-up"></i>&nbsp;{{$item.vote.like.1}}</button>
                                        {{/if}}
 -
 -                                      {{if $item.vote.like AND $item.vote.dislike}}
 -                                      <span role="presentation" class="separator">&nbsp;•&nbsp;</span>
 -                                      {{/if}}
 -
                                        {{if $item.vote.dislike}}
 -                                      <a role="button" class="button-likes{{if $item.responses.dislike.self}} active{{/if}}" id="dislike-{{$item.id}}" title="{{$item.vote.dislike.0}}" 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 btn-xs btn-default button-likes{{if $item.responses.dislike.self}} active" aria-pressed="true{{/if}}" id="dislike-{{$item.id}}" title="{{$item.vote.dislike.0}}" onclick="dolike({{$item.id}},'dislike'); return false;" data-toggle="button"><i class="fa fa-thumbs-down"></i>&nbsp;{{$item.vote.dislike.1}}</button>
                                        {{/if}}
  
 -                                      {{if ($item.vote.like OR $item.vote.dislike) AND $item.comment}}
 -                                      <span role="presentation" class="separator">&nbsp;•&nbsp;</span>
 -                                      {{/if}}
                                {{/if}}
  
 -                              {{* Butten to open the comment text field *}}
 +                              {{* Button to open the comment text field *}}
                                {{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 btn-xs btn-default 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}}</button>
                                {{/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}}
 -                                      <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.1}}</a>
 +                                      <button type="button" class="btn btn-xs btn-default 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.1}}</a>
                                        {{/if}}
                                {{/if}}
                        </div>
                                {{* Event attendance buttons *}}
                                {{if $item.isevent}}
                                <div class="vote-event">
 -                                      <a role="button" class="button-event{{if $item.responses.attendyes.self}} active{{/if}}" 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{{if $item.responses.attendno.self}} active{{/if}}" 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{{if $item.responses.attendmaybe.self}} active{{/if}}" 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="dolike({{$item.id}},'attendyes'); return false;"><i class="fa fa-check"><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="dolike({{$item.id}},'attendno'); return false;"><i class="fa fa-times"><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="dolike({{$item.id}},'attendmaybe'); return false;"><i class="fa fa-question"><span class="sr-only">{{$item.attend.2}}</span></i></button>
                                </div>
                                {{/if}}