Merge pull request #8269 from MrPetovan/bug/frio-more-actions

[frio] Prevent more action menu to be clipped by the post box

diff --git a/view/theme/frio/css/style.css b/view/theme/frio/css/style.css
index 1595403..f3dfe38 100644 (file)
--- a/view/theme/frio/css/style.css
+++ b/view/theme/frio/css/style.css
@@ -524,17 +524,6 @@ nav.navbar .nav > li > button:focus
     top: 4px;
     right: -2px;
     background-color: #ff8989;
-
-/*    text-transform: uppercase;
-    display: inline-block;
-    padding: 3px 5px 4px;
-    font-weight: 600;
-    font-size: 10px!important;
-    color: #fff!important;
-    vertical-align: baseline;
-    white-space: nowrap;
-    text-shadow: none;
-    display: none;*/
 }
 #topbar-first #intro-update{
     cursor: pointer;
@@ -961,19 +950,6 @@ nav.navbar .nav > li > button:focus
     color: #555;
     margin-bottom: 15px;
 }
-.nav-pills.preferences .dropdown .dropdown-toggle,
-.nav-pills.preferences > li > .btn {
-    color: #bebebe;
-}
-.nav-pills.preferences .dropdown.open .dropdown-toggle,
-.nav-pills.preferences .dropdown.open .dropdown-toggle:hover {
-    background-color: $nav_bg;
-}
-
-.nav-pills.preferences .dropdown .dropdown-toggle,
-.nav-pills.preferences > li > .btn {
-    padding: 2px 10px;
-}
 
 #newmember-tab > a {
   font-size: 1.2em;
@@ -1681,13 +1657,13 @@ aside .panel-body {
 }
 
 /* wall items action dropdown menu */
-.nav-pills.preferences {
+.preferences {
     position: absolute;
     right: 15px;
     top: 10px;
 }
-.comment .nav-pills.preferences {
-    right: 5px;
+.comment .preferences {
+    right: 10px;
     top: 5px;
 }
 .wall-item-network {
@@ -1931,6 +1907,9 @@ code > .hl-main {
 .wall-item-actions .separator {
     margin: 0 .3em;
 }
+.wall-item-actions .more-links {
+    position: absolute;
+}
 
 .wall-item-responses > div > p {
     margin: 0;
@@ -1938,7 +1917,7 @@ code > .hl-main {
 
 /* wall item hover effects */
 .wall-item-container .wall-item-links,
-.wall-item-container .wall-item-actions,
+.wall-item-container .wall-item-actions button,
 .wall-item-container .body-attach > a {
     opacity: 0.3;
     -webkit-transition: all 0.25s ease-in-out;
@@ -1948,7 +1927,7 @@ code > .hl-main {
     transition: all 0.25s ease-in-out;
 }
 .wall-item-container:hover .wall-item-links,
-.wall-item-container:hover .wall-item-actions,
+.wall-item-container:hover .wall-item-actions button,
 .wall-item-container:hover .body-attach > a {
     opacity: 1;
     -webkit-transition: all 0.25s ease-in-out;
@@ -1962,7 +1941,7 @@ code > .hl-main {
 }
 
 /*
-/* Comments
+* Comments
 */
 .well {
     border: none;
@@ -3523,7 +3502,7 @@ section .profile-match-wrapper {
                margin-top: 0;
        }
 
-       .nav-pills.preferences {
+       .preferences {
                right: 10px;
        }
 

diff --git a/view/theme/frio/templates/wall_thread.tpl b/view/theme/frio/templates/wall_thread.tpl
index d6c7f43..8e058c3 100644 (file)
--- a/view/theme/frio/templates/wall_thread.tpl
+++ b/view/theme/frio/templates/wall_thread.tpl
@@ -208,13 +208,19 @@ as the value of $top_child_total (this is done at the end of this file)
                </div>
                {{/if}}
 
-               <ul class="nav nav-pills preferences">
-                       {{if $item.network_icon != ""}}
-                       <li><span class="wall-item-network"><i class="fa fa-{{$item.network_icon}}" title="{{$item.network_name}}" aria-hidden="true"></i></span></li>
-                       {{else}}
-                       <li><span class="wall-item-network" title="{{$item.app}}">{{$item.network_name}}</span></li>
-                       {{/if}}
-               </ul>
+               <div class="preferences">
+               {{if $item.network_icon != ""}}
+                       <span class="wall-item-network"><i class="fa fa-{{$item.network_icon}}" title="{{$item.network_name}}" aria-hidden="true"></i></span>
+               {{else}}
+                       <span class="wall-item-network" title="{{$item.app}}">{{$item.network_name}}</span>
+               {{/if}}
+               {{if $item.plink}}      {{*link to the original source of the item *}}
+                       &nbsp;
+                       <a href="{{$item.plink.href}}" class="plink u-url" aria-label="{{$item.plink.title}}" title="{{$item.plink.title}}">
+                               <i class="fa fa-external-link"></i>
+                       </a>
+               {{/if}}
+               </div>
 
                <div class="clearfix"></div>
 
@@ -263,118 +269,108 @@ as the value of $top_child_total (this is done at the end of this file)
                <div class="wall-item-actions">
                        {{* Action buttons to interact with the item (like: like, dislike, share and so on *}}
                        <span class="wall-item-actions-left">
-                               <!--comment this out to try something different {{if $item.threaded}}{{if $item.comment}}
-                               <div id="button-reply" class="pull-left">
-                                       <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}}-->
 
-                               {{if $item.threaded}}{{/if}}
-
-                               {{* Buttons for like and dislike *}}
-                               {{if $item.vote}}
-                                       {{if $item.vote.like}}
-                                       <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 $item.vote.like AND $item.vote.dislike}}
-                                       <span role="presentation" class="separator"></span>
-                                       {{/if}}
-                                       {{if $item.vote.dislike}}
-                                       <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}}
+                       {{* Buttons for like and dislike *}}
+                       {{if $item.vote}}
+                               {{if $item.vote.like}}
+                               <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 $item.vote.like AND $item.vote.dislike}}
+                               <span role="presentation" class="separator"></span>
+                               {{/if}}
+                               {{if $item.vote.dislike}}
+                               <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}}
-                                       <span role="presentation" class="separator"></span>
-                                       {{/if}}
+                               {{if ($item.vote.like OR $item.vote.dislike) AND $item.comment}}
+                               <span role="presentation" class="separator"></span>
                                {{/if}}
+                       {{/if}}
 
-                               {{* Button to open the comment text field *}}
-                               {{if $item.comment}}
+                       {{* Button to open the comment text field *}}
+                       {{if $item.comment}}
                                <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="openClose('item-comments-{{$item.id}}'); commentExpand({{$item.id}});"{{/if}}><i class="fa fa-commenting" aria-hidden="true"></i>&nbsp;{{$item.switchcomment}}</button>
-                               {{/if}}
+                       {{/if}}
 
-                               {{* Button for sharing the item *}}
-                               {{if $item.vote}}
-                                       {{if $item.vote.share}}
-                                               {{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>
+                       {{* Button for sharing the item *}}
+                       {{if $item.vote}}
+                               {{if $item.vote.share}}
+                                       {{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}}
 
-                               {{* Put additional actions in a dropdown menu *}}
-                               {{if $item.plink || $item.drop.dropping || $item.edpost || $item.ignore || $item.tagger || $item.star || $item.filer || $item.subthread}}
+                       {{* Put additional actions in a dropdown menu *}}
+                       {{if $item.edpost || $item.tagger || $item.filer || $item.pin || $item.star || $item.subthread || $item.ignore || $item.drop.dropping}}
                                <span role="presentation" class="separator"></span>
-                               <span class="btn-group dropup">
-                               <button type="button" class="btn-link dropdown-toggle" data-toggle="dropdown" id="dropdownMenuOptions-{{$item.id}}" aria-haspopup="true" aria-expanded="false" title="{{$item.menu}}"><i class="fa fa-ellipsis-h" aria-hidden="true"></i>&nbsp;{{$item.menu}}</button>
-                               <ul class="dropdown-menu pull-right" role="menu" aria-labelledby="dropdownMenuOptions-{{$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 u-url"><i class="fa fa-external-link" aria-hidden="true"></i> {{$item.plink.title}}</a>
-                                       </li>
-                                       {{/if}}
+                               <span class="more-links btn-group{{if $item.thread_level > 1}} dropup{{/if}}">
+                                       <button type="button" class="btn-link dropdown-toggle" data-toggle="dropdown" id="dropdownMenuOptions-{{$item.id}}" aria-haspopup="true" aria-expanded="false" title="{{$item.menu}}"><i class="fa fa-ellipsis-h" aria-hidden="true"></i>&nbsp;{{$item.menu}}</button>
+                                       <ul class="dropdown-menu dropdown-menu-right" role="menu" aria-labelledby="dropdownMenuOptions-{{$item.id}}">
+                                               {{if $item.edpost}} {{* edit the posting *}}
+                                               <li role="menuitem">
+                                                       <a href="javascript: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}}</a>
+                                               </li>
+                                               {{/if}}
 
-                                       {{if $item.edpost}} {{* edit the posting *}}
-                                       <li role="menuitem">
-                                               <a href="javascript: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}}</a>
-                                       </li>
-                                       {{/if}}
+                                               {{if $item.tagger}} {{* tag the post *}}
+                                               <li role="menuitem">
+                                                       <a id="tagger-{{$item.id}}" href="javascript: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}}</a>
+                                               </li>
+                                               {{/if}}
 
-                                       {{if $item.tagger}} {{* tag the post *}}
-                                       <li role="menuitem">
-                                               <a id="tagger-{{$item.id}}" href="javascript: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}}</a>
-                                       </li>
-                                       {{/if}}
+                                               {{if $item.filer}}
+                                               <li role="menuitem">
+                                                       <a id="filer-{{$item.id}}" href="javascript: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}}</a>
+                                               </li>
+                                               {{/if}}
 
-                                       {{if $item.filer}}
-                                       <li role="menuitem">
-                                               <a id="filer-{{$item.id}}" href="javascript: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}}</a>
-                                       </li>
-                                       {{/if}}
+                                               {{if $item.pin}}
+                                               <li role="menuitem">
+                                                       <a id="pin-{{$item.id}}" href="javascript:dopin({{$item.id}});" class="btn-link {{$item.pin.classdo}}" title="{{$item.pin.do}}"><i class="fa fa-circle-o" aria-hidden="true"></i>&nbsp;{{$item.pin.do}}</a>
+                                                       <a id="unpin-{{$item.id}}" href="javascript:dopin({{$item.id}});" class="btn-link {{$item.pin.classundo}}" title="{{$item.pin.undo}}"><i class="fa fa-dot-circle-o" aria-hidden="true"></i>&nbsp;{{$item.pin.undo}}</a>
+                                               </li>
+                                               {{/if}}
 
-                                       {{if $item.pin}}
-                                       <li role="menuitem">
-                                               <a id="pin-{{$item.id}}" href="javascript:dopin({{$item.id}});" class="btn-link {{$item.pin.classdo}}" title="{{$item.pin.do}}"><i class="fa fa-circle-o" aria-hidden="true"></i>&nbsp;{{$item.pin.do}}</a>
-                                               <a id="unpin-{{$item.id}}" href="javascript:dopin({{$item.id}});" class="btn-link {{$item.pin.classundo}}" title="{{$item.pin.undo}}"><i class="fa fa-dot-circle-o" aria-hidden="true"></i>&nbsp;{{$item.pin.undo}}</a>
-                                       </li>
-                                       {{/if}}
+                                               {{if $item.star}}
+                                               <li role="menuitem">
+                                                       <a id="star-{{$item.id}}" href="javascript: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}}</a>
+                                                       <a id="unstar-{{$item.id}}" href="javascript: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}}</a>
+                                               </li>
+                                               {{/if}}
 
-                                       {{if $item.star}}
-                                       <li role="menuitem">
-                                               <a id="star-{{$item.id}}" href="javascript: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}}</a>
-                                               <a id="unstar-{{$item.id}}" href="javascript: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}}</a>
-                                       </li>
-                                       {{/if}}
+                                               {{if $item.subthread}}
+                                               <li role="menuitem">
+                                                       <a id="subthread-{{$item.id}}" href="javascript:{{$item.subthread.action}}" class="btn-link" title="{{$item.subthread.title}}"><i class="fa fa-plus" aria-hidden="true"></i>&nbsp;{{$item.subthread.title}}</a>
+                                               </li>
+                                               {{/if}}
 
-                                       {{if $item.subthread}}
-                                       <li role="menuitem">
-                                               <a id="subthread-{{$item.id}}" href="javascript:{{$item.subthread.action}}" class="btn-link" title="{{$item.subthread.title}}"><i class="fa fa-plus" aria-hidden="true"></i>&nbsp;{{$item.subthread.title}}</a>
-                                       </li>
-                                       {{/if}}
+                                               {{if $item.ignore || $item.drop.dropping}}
+                                               <li role="separator" class="divider"></li>
+                                               {{/if}}
 
-                                       {{if $item.ignore || $item.drop.dropping}}
-                                       <li role="separator" class="divider"></li>
-                                       {{/if}}
+                                               {{if $item.ignore}}
+                                                       <li role="menuitem">
+                                                               <a id="ignore-{{$item.id}}" href="javascript: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}}</a>
+                                                       </li>
+                                                       <li role="menuitem">
+                                                               <a id="unignore-{{$item.id}}" href="javascript: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}}</a>
+                                                       </li>
+                                               {{/if}}
 
-                                       {{if $item.ignore}}
-                                               <li role="menuitem">
-                                                       <a id="ignore-{{$item.id}}" href="javascript: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}}</a>
-                                               </li>
+                                               {{if $item.drop.dropping}}
                                                <li role="menuitem">
-                                                       <a id="unignore-{{$item.id}}" href="javascript: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}}</a>
+                                                       <a class="btn-link navicon delete" href="javascript: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}}</a>
                                                </li>
-                                       {{/if}}
-
-                                       {{if $item.drop.dropping}}
-                                       <li role="menuitem">
-                                               <a class="btn-link navicon delete" href="javascript: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}}</a>
-                                       </li>
-                                       {{/if}}
-                               </ul>
+                                               {{/if}}
+                                       </ul>
+                                       <img id="like-rotator-{{$item.id}}" class="like-rotator" src="images/rotator.gif" alt="{{$item.wait}}" title="{{$item.wait}}" style="display: none;" />
                                </span>
-                               {{/if}}
+                       {{else}}
                                <img id="like-rotator-{{$item.id}}" class="like-rotator" src="images/rotator.gif" alt="{{$item.wait}}" title="{{$item.wait}}" style="display: none;" />
+                       {{/if}}
+
                        </span>
 
                        <span class="wall-item-actions-right">