Frio: The separator dots are enabled again

diff --git a/view/theme/frio/css/style.css b/view/theme/frio/css/style.css
index 839bb9dcb208fd2707814142b3315add500b0d11..4c65552ec7e7e894522421d746e7a424bd3da8ec 100644 (file)
--- a/view/theme/frio/css/style.css
+++ b/view/theme/frio/css/style.css
@@ -1327,7 +1327,7 @@ blockquote.shared_content {
 .wall-item-actions .button-votes,
 .wall-item-actions .button-likes {
     padding-left: 0px;
-    padding-right: 10px;
+    padding-right: 0px;
 }
 
 /* wall item hover effects */

diff --git a/view/theme/frio/templates/nav.tpl b/view/theme/frio/templates/nav.tpl
index 8eb13c1a42a2376aa117bf4c66e0d486c3a03a6a..17da20b6f2cd266925f5bef241df8e51856295cc 100644 (file)
--- a/view/theme/frio/templates/nav.tpl
+++ b/view/theme/frio/templates/nav.tpl
@@ -134,21 +134,21 @@
                                                <ul id="nav-user-menu" class="dropdown-menu pull-right menu-popup" role="group" aria-labelledby="main-menu">
                                                        {{if $nav.remote}}{{if $nav.sitename}}
                                                        <li id="nav-sitename" role="menuitem">{{$nav.sitename}}</li>
-                                                       <li role="seperator" class="divider"></li>
+                                                       <li role="separator" class="divider"></li>
                                                        {{/if}}{{/if}}
                                                        {{foreach $nav.usermenu as $usermenu}}
                                                        <li role="menuitem"><a class="{{$usermenu.2}}" href="{{$usermenu.0}}" title="{{$usermenu.3}}">{{$usermenu.1}}</a></li>
                                                        {{/foreach}}
-                                                       <li role="seperator" class="divider"></li>
+                                                       <li role="separator" class="divider"></li>
                                                        <li role="menuitem"><a href="https://github.com/rabuzarus/frio" target="new" title="frio on GitHub"><i class="fa fa-github"></i> frio on GitHub</a></li>
-                                                       <li role="seperator" class="divider"></li>
+                                                       <li role="separator" class="divider"></li>
                                                        {{if $nav.notifications}}
                                                        <li role="menuitem"><a href="{{$nav.notifications.0}}" title="{{$nav.notifications.1}}"><i class="fa fa-exclamation-circle fa-fw"></i> {{$nav.notifications.1}}</a></li>
                                                        {{/if}}
                                                        {{if $nav.messages}}
                                                        <li role="menuitem"><a class="nav-commlink {{$nav.messages.2}} {{$sel.messages}}" href="{{$nav.messages.0}}" title="{{$nav.messages.3}}" ><i class="fa fa-envelope fa-fw"></i> {{$nav.messages.1}} <span id="mail-update-li" class="nav-mail-badge badge nav-notify"></span></a></li>
                                                        {{/if}}
-                                                       <li role="seperator" class="divider"></li>
+                                                       <li role="separator" class="divider"></li>
                                                        {{if $nav.contacts}}
                                                        <li role="menuitem"><a id="nav-contacts-link" class="nav-link {{$nav.contacts.2}}" href="{{$nav.contacts.0}}" title="{{$nav.contacts.3}}"><i class="fa fa-users fa-fw"></i> {{$nav.contacts.1}}</a><span id="intro-update-li" class="nav-intro-badge badge nav-notify"></span></li>
                                                        {{/if}}
@@ -156,10 +156,10 @@
                                                        <li role="menuitem"><a id="nav-manage-link" class="nav-commlink {{$nav.manage.2}} {{$sel.manage}}" href="{{$nav.manage.0}}" title="{{$nav.manage.3}}"><i class="fa fa-flag fa-fw"></i> {{$nav.manage.1}}</a></li>
                                                        {{/if}}
                                                        <li role="menuitem"><a id="nav-directory-link" class="nav-link {{$nav.directory.2}}" href="{{$nav.directory.0}}" title="{{$nav.directory.3}}"><i class="fa fa-sitemap fa-fw"></i>{{$nav.directory.1}}</a></li>
-                                                       <li role="seperator" class="divider"></li>
+                                                       <li role="separator" class="divider"></li>
                                                        {{if $nav.apps}}
                                                        <li role="menuitem"><a id="nav-apps-link" class="nav-link {{$nav.apps.2}} {{$sel.manage}}" href="{{$nav.apps.0}}" title="{{$nav.apps.3}}" ><i class="fa fa-puzzle-piece fa-fw"></i> {{$nav.apps.1}}</a>
-                                                       <li role="seperator" class="divider"></li>
+                                                       <li role="separator" class="divider"></li>
                                                        {{/if}}
                                                        {{if $nav.help}}
                                                        <li role="menuitem"><a id="nav-help-link" class="nav-link {{$nav.help.2}}" target="friendica-help" href="{{$nav.help.0}}" title="{{$nav.help.3}}" ><i class="fa fa-question-circle fa-fw"></i> {{$nav.help.3}}</a></li>
@@ -170,7 +170,7 @@
                                                        {{if $nav.admin}}
                                                        <li role="menuitem"><a id="nav-admin-link" class="nav-link {{$nav.admin.2}}" href="{{$nav.admin.0}}" title="{{$nav.admin.3}}" ><i class="fa fa-user-secret fa-fw"></i> {{$nav.admin.1}}</a></li>
                                                        {{/if}}
-                                                       <li role="seperator" class="divider"></li>
+                                                       <li role="separator" class="divider"></li>
                                                        {{if $nav.logout}}
                                                        <li role="menuitem"><a id="nav-logout-link" class="nav-link {{$nav.logout.2}}" href="{{$nav.logout.0}}" title="{{$nav.logout.3}}" ><i class="fa fa fa-sign-out fa-fw"></i> {{$nav.logout.1}}</a></li>
                                                        {{else}}

diff --git a/view/theme/frio/templates/search_item.tpl b/view/theme/frio/templates/search_item.tpl
index 122a86ae860ddff8223c7a465207e1c8258348b7..1f2b761703907977e6d112b0463cb6bdda802004 100644 (file)
--- a/view/theme/frio/templates/search_item.tpl
+++ b/view/theme/frio/templates/search_item.tpl
@@ -173,11 +173,11 @@
                                                <a role="button" href="#" class="button-likes" id="like-{{$item.id}}" title="{{$item.vote.like.0}}" onclick="dolike({{$item.id}},'like'); return false;">{{$item.vote.like.0}}</a>
 
                                                {{if $item.vote.dislike}}
-                                               <span role="presentation" class="seperator">&nbsp;•&nbsp;</span>
+                                               <span role="presentation" class="separator">&nbsp;•&nbsp;</span>
                                                <a role="button" href="#" class="button-likes" id="dislike-{{$item.id}}" title="{{$item.vote.dislike.0}}" onclick="dolike({{$item.id}},'dislike'); return false;">{{$item.vote.dislike.0}}</a>
                                                {{/if}}
 
-                                               {{if $item.comment}}<span role="presentation" class="seperator">&nbsp;•&nbsp;</span>{{/if}}
+                                               {{if $item.comment}}<span role="presentation" class="separator">&nbsp;•&nbsp;</span>{{/if}}
                                        </div>
                                        {{/if}}
 
@@ -191,7 +191,7 @@
                                        {{* Button for sharing the item *}}
                                        {{if $item.vote}}
                                                {{if $item.vote.share}}
-                                               <span role="presentation" class="seperator">&nbsp;•&nbsp;</span>
+                                               <span role="presentation" class="separator">&nbsp;•&nbsp;</span>
                                                <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>
                                                {{/if}}
                                        {{/if}}

diff --git a/view/theme/frio/templates/wall_thread.tpl b/view/theme/frio/templates/wall_thread.tpl
index 7ef178f838b375fe3466aac3e5ca851415c0c04e..ceef9230d185e3f7d9b5f928e2fd42156d45294b 100644 (file)
--- a/view/theme/frio/templates/wall_thread.tpl
+++ b/view/theme/frio/templates/wall_thread.tpl
@@ -289,12 +289,17 @@ as the value of $top_child_total (this is done at the end of this file)
                                        <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>
                                        {{/if}}
 
+                                       {{if $item.vote.like AND $item.vote.dislike}}
+                                       <span role="presentation" class="separator">&nbsp;•&nbsp;</span>
+                                       {{/if}}
+
                                        {{if $item.vote.dislike}}
-                                       <!-- <span role="presentation" class="seperator">&nbsp;•&nbsp;</span> -->
                                        <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>
                                        {{/if}}
 
-                                       <!-- {{if $item.comment}}<span role="presentation" class="seperator">&nbsp;•&nbsp;</span>{{/if}} -->
+                                       {{if ($item.vote.like OR $item.vote.dislike) AND $item.comment}}
+                                       <span role="presentation" class="separator">&nbsp;•&nbsp;</span>
+                                       {{/if}}
                                </div>
                                {{/if}}
 
@@ -307,8 +312,10 @@ as the value of $top_child_total (this is done at the end of this file)
 
                                {{* 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}}
-                                       <!-- <span role="presentation" class="seperator">&nbsp;•&nbsp;</span> -->
                                        <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}}
                                {{/if}}