diff options
| -rw-r--r-- | view/js/main.js | 2 | ||||
| -rw-r--r-- | view/tpl/abook_edit.tpl | 4 | ||||
| -rw-r--r-- | view/tpl/cdav_addressbook.tpl | 4 | ||||
| -rw-r--r-- | view/tpl/chat.tpl | 2 | ||||
| -rw-r--r-- | view/tpl/cloud_directory.tpl | 10 | ||||
| -rw-r--r-- | view/tpl/common_tabs.tpl | 2 | ||||
| -rw-r--r-- | view/tpl/connections.tpl | 2 | ||||
| -rw-r--r-- | view/tpl/conv_item.tpl | 8 | ||||
| -rw-r--r-- | view/tpl/conv_list.tpl | 4 | ||||
| -rw-r--r-- | view/tpl/directory_header.tpl | 2 | ||||
| -rw-r--r-- | view/tpl/help.tpl | 2 | ||||
| -rw-r--r-- | view/tpl/mail_conv.tpl | 2 | ||||
| -rw-r--r-- | view/tpl/navbar_tucson.tpl | 4 | ||||
| -rw-r--r-- | view/tpl/photo_view.tpl | 4 | ||||
| -rw-r--r-- | view/tpl/pinned_item.tpl | 6 | ||||
| -rw-r--r-- | view/tpl/profile_advanced.tpl | 4 | ||||
| -rw-r--r-- | view/tpl/profile_edit.tpl | 2 | ||||
| -rw-r--r-- | view/tpl/profile_vcard.tpl | 2 | ||||
| -rw-r--r-- | view/tpl/prv_message.tpl | 2 | ||||
| -rw-r--r-- | view/tpl/search_item.tpl | 2 | ||||
| -rw-r--r-- | view/tpl/wiki.tpl | 2 | ||||
| -rw-r--r-- | view/tpl/wikilist.tpl | 2 |
22 files changed, 37 insertions, 37 deletions
diff --git a/view/js/main.js b/view/js/main.js index bc8155c58..1a51652c9 100644 --- a/view/js/main.js +++ b/view/js/main.js @@ -99,7 +99,7 @@ $(document).ready(function() { tao.zin.htm += '</ul>'; $('.zinpax').remove(); $('.zinlcx').append(tao.zin.htm); - $('.zinlcxp > ul').addClass('dropdown dropdown-menu dropdown-menu-right').css('left','-16em'); + $('.zinlcxp > ul').addClass('dropdown dropdown-menu dropdown-menu-end').css('left','-16em'); }); return false; } else { diff --git a/view/tpl/abook_edit.tpl b/view/tpl/abook_edit.tpl index 5520a7a45..380d5886c 100644 --- a/view/tpl/abook_edit.tpl +++ b/view/tpl/abook_edit.tpl @@ -6,7 +6,7 @@ <button id="connection-dropdown" class="btn btn-outline-secondary btn-sm dropdown-toggle" type="button" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> <i class="fa fa-cog"></i> {{$tools_label}} </button> - <div class="dropdown-menu dropdown-menu-right" aria-labelledby="dLabel"> + <div class="dropdown-menu dropdown-menu-end" aria-labelledby="dLabel"> <a class="dropdown-item" href="{{$tools.view.url}}" title="{{$tools.view.title}}">{{$tools.view.label}}</a> <a class="dropdown-item" href="{{$tools.recent.url}}" title="{{$tools.recent.title}}">{{$tools.recent.label}}</a> {{if $tools.fetchvc}} @@ -26,7 +26,7 @@ <a href="connedit/{{$abook_prev}}{{if $section}}?f=§ion={{$section}}{{/if}}" class="btn btn-outline-secondary btn-sm{{if ! $abook_prev}} disabled{{/if}}" ><i class="fa fa-backward"></i></a> <div class="btn-group" > <button class="btn btn-outline-secondary btn-sm{{if $is_pending}} disabled{{/if}}" type="button" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false"><i class="fa fa-bars"></i></button> - <div class="dropdown-menu dropdown-menu-right" aria-labelledby="dLabel"> + <div class="dropdown-menu dropdown-menu-end" aria-labelledby="dLabel"> {{foreach $sections as $s}} <a class="dropdown-item" href="{{$s.url}}" title="{{$s.title}}">{{$s.label}}</a> {{/foreach}} diff --git a/view/tpl/cdav_addressbook.tpl b/view/tpl/cdav_addressbook.tpl index 081a34011..ab0b43ffc 100644 --- a/view/tpl/cdav_addressbook.tpl +++ b/view/tpl/cdav_addressbook.tpl @@ -173,7 +173,7 @@ $(document).ready(function() { <input type="hidden" name="target" value="{{$id}}"> <div class="dropdown float-end"> <button data-bs-toggle="dropdown" type="button" class="btn btn-outline-secondary btn-sm dropdown-toggle"><i class="fa fa-plus"></i> {{$add_field}}</button> - <div class="dropdown-menu dropdown-menu-right"> + <div class="dropdown-menu dropdown-menu-end"> <a class="dropdown-item add-vcard-org add-field" style="display: none" href="#" data-add="vcard-org" data-id="new">{{$org_label}}</a> <a class="dropdown-item add-vcard-title add-field" style="display: none" href="#" data-add="vcard-title" data-id="new">{{$title_label}}</a> <a class="dropdown-item add-vcard-tel add-field" href="#" data-add="vcard-tel" data-id="new">{{$tel_label}}</a> @@ -275,7 +275,7 @@ $(document).ready(function() { <div id="vcard-cancel-{{$card.id}}" class="vcard-cancel vcard-cancel-btn" data-id="{{$card.id}}" data-action="cancel"><i class="fa fa-close"></i></div> <div id="vcard-add-field-{{$card.id}}" class="dropdown float-end vcard-add-field"> <button data-bs-toggle="dropdown" type="button" class="btn btn-outline-secondary btn-sm dropdown-toggle"><i class="fa fa-plus"></i> {{$add_field}}</button> - <div class="dropdown-menu dropdown-menu-right"> + <div class="dropdown-menu dropdown-menu-end"> <a class="dropdown-item add-vcard-org add-field"{{if $card.org}} style="display: none"{{/if}} href="#" data-add="vcard-org" data-id="{{$card.id}}">{{$org_label}}</a> <a class="dropdown-item add-vcard-title add-field"{{if $card.title}} style="display: none"{{/if}} href="#" data-add="vcard-title" data-id="{{$card.id}}">{{$title_label}}</a> <a class="dropdown-item add-vcard-tel add-field" href="#" data-add="vcard-tel" data-id="{{$card.id}}">{{$tel_label}}</a> diff --git a/view/tpl/chat.tpl b/view/tpl/chat.tpl index 944fbebb5..da8da30f2 100644 --- a/view/tpl/chat.tpl +++ b/view/tpl/chat.tpl @@ -32,7 +32,7 @@ <div id="chat-submit" class="dropup float-end"> <button class="btn btn-outline-secondary btn-sm dropdown-toggle" type="button" data-bs-toggle="dropdown"><i class="fa fa-cog"></i></button> <button class="btn btn-primary btn-sm" type="submit" id="chat-submit" name="submit" value="{{$submit}}">{{$submit}}</button> - <div class="dropdown-menu dropdown-menu-right"> + <div class="dropdown-menu dropdown-menu-end"> <a class="dropdown-item" href="{{$baseurl}}/chatsvc?f=&room_id={{$room_id}}&status=online"><i class="fa fa-circle online"></i> {{$online}}</a> <a class="dropdown-item" href="{{$baseurl}}/chatsvc?f=&room_id={{$room_id}}&status=away"><i class="fa fa-circle away"></i> {{$away}}</a> <a class="dropdown-item" href="{{$baseurl}}/chat/{{$nickname}}/{{$room_id}}/leave"><i class="fa fa-circle leave"></i> {{$leave}}</a> diff --git a/view/tpl/cloud_directory.tpl b/view/tpl/cloud_directory.tpl index a587c6cf2..b5ac93204 100644 --- a/view/tpl/cloud_directory.tpl +++ b/view/tpl/cloud_directory.tpl @@ -77,7 +77,7 @@ <button class="btn btn-warning btn-sm" id="multi-dropdown-button" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> <i class="fa fa-fw fa-ellipsis-v d-table-cell"></i><span class="d-none d-md-table-cell">{{$bulk_actions_label}}</span> </button> - <div class="dropdown-menu dropdown-menu-right" aria-labelledby="dropdown-button"> + <div class="dropdown-menu dropdown-menu-end" aria-labelledby="dropdown-button"> {{if $is_owner}} <a id="cloud-multi-tool-perms-btn" class="dropdown-item" href="#"><i class="fa fa-fw fa-lock"></i> {{$adjust_permissions_label}}</a> {{/if}} @@ -92,7 +92,7 @@ <button class="btn btn-warning btn-sm" id="multi-dropdown-button" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> <i class="fa fa-fw fa-ellipsis-v d-table-cell"></i><span class="d-none d-md-table-cell">{{$bulk_actions_label}}</span> </button> - <div class="dropdown-menu dropdown-menu-right" aria-labelledby="dropdown-button"> + <div class="dropdown-menu dropdown-menu-end" aria-labelledby="dropdown-button"> <a id="cloud-multi-tool-delete-btn" class="dropdown-item" href="#"><i class="fa fa-fw fa-trash-o"></i> {{$admin_delete_label}}</a> </div> </div> @@ -152,7 +152,7 @@ <td class="cloud-index-tool p-2"> {{if $item.lockstate == 'lock'}} <i class="fa fa-lock lockview" data-bs-toggle="dropdown" onclick="lockview('attach',{{$item.attach_id}});"></i> - <ul id="panel-{{$item.attach_id}}" class="lockview-panel dropdown-menu dropdown-menu-right"></ul> + <ul id="panel-{{$item.attach_id}}" class="lockview-panel dropdown-menu dropdown-menu-end"></ul> {{/if}} </td> <td class="cloud-index-tool"> @@ -161,7 +161,7 @@ <button class="btn btn-link btn-sm" id="dropdown-button-{{$item.attach_id}}" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> <i class="fa fa-fw fa-ellipsis-v"></i> </button> - <div class="dropdown-menu dropdown-menu-right" aria-labelledby="dropdown-button-{{$item.attach_id}}"> + <div class="dropdown-menu dropdown-menu-end" aria-labelledby="dropdown-button-{{$item.attach_id}}"> <a id="cloud-tool-info-btn-{{$item.attach_id}}" class="dropdown-item cloud-tool-info-btn" href="#" data-id="{{$item.attach_id}}"><i class="fa fa-fw fa-info"></i> {{$info_label}}</a> {{if $is_owner}} <a id="cloud-tool-perms-btn-{{$item.attach_id}}" class="dropdown-item cloud-tool-perms-btn" href="#" data-id="{{$item.attach_id}}"><i class="fa fa-fw fa-{{$item.lockstate}}"></i> {{$adjust_permissions_label}}</a> @@ -186,7 +186,7 @@ <button class="btn btn-link btn-sm" id="dropdown-button-{{$item.attach_id}}" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> <i class="fa fa-fw fa-ellipsis-v"></i> </button> - <div class="dropdown-menu dropdown-menu-right" aria-labelledby="dropdown-button-{{$item.attach_id}}"> + <div class="dropdown-menu dropdown-menu-end" aria-labelledby="dropdown-button-{{$item.attach_id}}"> {{if $item.collection}} <a id="cloud-tool-dir-download-btn-{{$item.attach_id}}" class="dropdown-item cloud-tool-dir-download-btn" href="#" data-id="{{$item.attach_id}}"><i class="fa fa-fw fa-cloud-download"></i> {{$download_label}}</a> {{else}} diff --git a/view/tpl/common_tabs.tpl b/view/tpl/common_tabs.tpl index 100114c21..429cc561d 100644 --- a/view/tpl/common_tabs.tpl +++ b/view/tpl/common_tabs.tpl @@ -9,7 +9,7 @@ <button type="button" class="btn btn-outline-secondary btn-sm float-end" data-bs-toggle="dropdown"> <i class="fa fa-bars"></i> </button> - <div class="dropdown-menu dropdown-menu-right"> + <div class="dropdown-menu dropdown-menu-end"> {{foreach $tabs as $tab}} <a class="dropdown-item{{if $tab.sel}} {{$tab.sel}}{{/if}}" href="{{$tab.url}}"{{if $tab.title}} title="{{$tab.title}}"{{/if}}>{{$tab.label}}</a> {{/foreach}} diff --git a/view/tpl/connections.tpl b/view/tpl/connections.tpl index 0dc7f536b..86f353d82 100644 --- a/view/tpl/connections.tpl +++ b/view/tpl/connections.tpl @@ -7,7 +7,7 @@ <button type="button" class="btn btn-outline-secondary btn-sm dropdown-toggle" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false" title="{{$sort}}"> <i class="fa fa-filter"></i> </button> - <div class="dropdown-menu dropdown-menu-right"> + <div class="dropdown-menu dropdown-menu-end"> {{foreach $tabs as $menu}} <a class="dropdown-item {{$menu.sel}}" href="{{$menu.url}}">{{$menu.label}}</a> {{/foreach}} diff --git a/view/tpl/conv_item.tpl b/view/tpl/conv_item.tpl index fc4b2e4dc..7c3505410 100644 --- a/view/tpl/conv_item.tpl +++ b/view/tpl/conv_item.tpl @@ -89,7 +89,7 @@ <button type="button" class="btn btn-outline-secondary btn-sm dropdown-toggle" data-bs-toggle="dropdown" id="wall-item-react-{{$item.id}}"> <i class="fa fa-smile-o"></i> </button> - <div class="dropdown-menu dropdown-menu-right"> + <div class="dropdown-menu dropdown-menu-end"> {{foreach $item.reactions as $react}} <a class="dropdown-item clearfix" href="#" onclick="jotReact({{$item.id}},'{{$react}}'); return false;"><img class="menu-img-2" src="/images/emoji/{{$react}}.png" alt="{{$react}}" /></a> {{/foreach}} @@ -117,7 +117,7 @@ <button type="button" class="btn btn-outline-secondary btn-sm dropdown-toggle" data-bs-toggle="dropdown" id="wall-item-attend-menu-{{$item.id}}" title="{{$item.attend_title}}"> <i class="fa fa-calendar-check-o"></i> </button> - <div class="dropdown-menu dropdown-menu-right"> + <div class="dropdown-menu dropdown-menu-end"> <a class="dropdown-item" href="#" title="{{$item.attend.0}}" onclick="itemAddToCal({{$item.id}}); dolike({{$item.id}},'attendyes'); return false;"> <i class="item-act-list fa fa-check{{if $item.my_responses.attend}} ivoted{{/if}}" ></i> {{$item.attend.0}} </a> @@ -135,7 +135,7 @@ <button type="button" class="btn btn-outline-secondary btn-sm dropdown-toggle" data-bs-toggle="dropdown" id="wall-item-consensus-menu-{{$item.id}}" title="{{$item.vote_title}}"> <i class="fa fa-check-square-o"></i> </button> - <div class="dropdown-menu dropdown-menu-right" role="menu" aria-labelledby="wall-item-consensus-menu-{{$item.id}}"> + <div class="dropdown-menu dropdown-menu-end" role="menu" aria-labelledby="wall-item-consensus-menu-{{$item.id}}"> <a class="dropdown-item" href="#" title="{{$item.conlabels.0}}" onclick="dolike({{$item.id}},'agree'); return false;"> <i class="item-act-list fa fa-check{{if $item.my_responses.agree}} ivoted{{/if}}" ></i> {{$item.conlabels.0}} </a> @@ -152,7 +152,7 @@ <button type="button" class="btn btn-outline-secondary btn-sm dropdown-toggle" data-bs-toggle="dropdown" id="wall-item-menu-{{$item.id}}"> <i class="fa fa-cog"></i> </button> - <div class="dropdown-menu dropdown-menu-right" role="menu" aria-labelledby="wall-item-menu-{{$item.id}}"> + <div class="dropdown-menu dropdown-menu-end" role="menu" aria-labelledby="wall-item-menu-{{$item.id}}"> {{if $item.share}} <a class="dropdown-item" href="#" onclick="jotShare({{$item.id}},{{$item.item_type}}); return false"><i class="generic-icons-nav fa fa-fw fa-retweet" title="{{$item.share.0}}"></i>{{$item.share.0}}</a> {{/if}} diff --git a/view/tpl/conv_list.tpl b/view/tpl/conv_list.tpl index d163c5842..a20a6de8d 100644 --- a/view/tpl/conv_list.tpl +++ b/view/tpl/conv_list.tpl @@ -77,7 +77,7 @@ <button type="button" class="btn btn-outline-secondary btn-sm dropdown-toggle" data-bs-toggle="dropdown" id="wall-item-react-{{$item.id}}"> <i class="fa fa-smile-o"></i> </button> - <div class="dropdown-menu dropdown-menu-right"> + <div class="dropdown-menu dropdown-menu-end"> {{foreach $item.reactions as $react}} <a class="dropdown-item clearfix" href="#" onclick="jotReact({{$item.id}},'{{$react}}'); return false;"><img class="menu-img-2" src="/images/emoji/{{$react}}.png" alt="{{$react}}" /></a> {{/foreach}} @@ -135,7 +135,7 @@ <button type="button" class="btn btn-outline-secondary btn-sm dropdown-toggle" data-bs-toggle="dropdown" id="wall-item-menu-{{$item.id}}"> <i class="fa fa-cog"></i> </button> - <div class="dropdown-menu dropdown-menu-right" role="menu" aria-labelledby="wall-item-menu-{{$item.id}}"> + <div class="dropdown-menu dropdown-menu-end" role="menu" aria-labelledby="wall-item-menu-{{$item.id}}"> {{if $item.share}} <a class="dropdown-item" href="#" onclick="jotShare({{$item.id}},{{$item.item_type}}); return false"><i class="generic-icons-nav fa fa-fw fa-retweet" title="{{$item.share.0}}"></i>{{$item.share.0}}</a> {{/if}} diff --git a/view/tpl/directory_header.tpl b/view/tpl/directory_header.tpl index 95ddef96e..f5ce7ce0a 100644 --- a/view/tpl/directory_header.tpl +++ b/view/tpl/directory_header.tpl @@ -4,7 +4,7 @@ <button type="button" class="btn btn-outline-secondary btn-sm dropdown-toggle" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false" title="{{$sort}}"> <i class="fa fa-sort"></i> </button> - <div class="dropdown-menu dropdown-menu-right"> + <div class="dropdown-menu dropdown-menu-end"> <a class="dropdown-item" href="directory?f=&order=date{{$suggest}}">{{$date}}</a> <a class="dropdown-item" href="directory?f=&order=normal{{$suggest}}">{{$normal}}</a> <a class="dropdown-item" href="directory?f=&order=reversedate{{$suggest}}">{{$reversedate}}</a> diff --git a/view/tpl/help.tpl b/view/tpl/help.tpl index 59f4a48cd..5022e7b1b 100644 --- a/view/tpl/help.tpl +++ b/view/tpl/help.tpl @@ -5,7 +5,7 @@ <button type="button" class="btn btn-outline-secondary btn-sm dropdown-toggle" data-bs-toggle="dropdown"> <i class="fa fa-language" style="font-size: 1.4em;"></i> </button> - <div class="dropdown-menu dropdown-menu-right flex-column lang-selector"> + <div class="dropdown-menu dropdown-menu-end flex-column lang-selector"> <a class="dropdown-item lang-choice" href="/help">de</a> <a class="dropdown-item lang-choice" href="/help">en</a> <a class="dropdown-item lang-choice" href="/help">es</a> diff --git a/view/tpl/mail_conv.tpl b/view/tpl/mail_conv.tpl index f51b44884..948890312 100644 --- a/view/tpl/mail_conv.tpl +++ b/view/tpl/mail_conv.tpl @@ -23,7 +23,7 @@ <button type="button" class="btn btn-outline-secondary btn-sm dropdown-toggle" data-bs-toggle="dropdown" id="mail-item-menu-{{$mail.id}}"> <i class="fa fa-cog"></i> </button> - <div class="dropdown-menu dropdown-menu-right" role="menu" aria-labelledby="mail-item-menu-{{$mail.id}}"> + <div class="dropdown-menu dropdown-menu-end" role="menu" aria-labelledby="mail-item-menu-{{$mail.id}}"> {{** if $mail.can_recall}} <a class="dropdown-item" href="mail/{{$mail.mailbox}}/recall/{{$mail.id}}" title="{{$mail.recall}}" id="mail-conv-recall-icon-{{$mail.id}}"><i class="fa fa-fw fa-undo"></i> {{$mail.recall}}</a> {{/if **}} diff --git a/view/tpl/navbar_tucson.tpl b/view/tpl/navbar_tucson.tpl index c790e3fbf..6a8b5872d 100644 --- a/view/tpl/navbar_tucson.tpl +++ b/view/tpl/navbar_tucson.tpl @@ -142,7 +142,7 @@ {{if $channel_menu && $channel_apps.0}} <li class="nav-item dropdown" id="channel-menu"> <a class="nav-link" href="#" data-bs-toggle="dropdown"><img src="{{$channel_thumb}}" style="height:14px; width:14px;position:relative; top:-2px;" /></a> - <div id="dropdown-menu" class="dropdown-menu dropdown-menu-right"> + <div id="dropdown-menu" class="dropdown-menu dropdown-menu-end"> {{foreach $channel_apps as $channel_app}} {{$channel_app}} {{/foreach}} @@ -158,7 +158,7 @@ {{/if}} <li class="nav-item dropdown" id="app-menu"> <a class="nav-link" href="#" data-bs-toggle="dropdown"><i class="fa fa-fw fa-bars"></i></a> - <div id="dropdown-menu" class="dropdown-menu dropdown-menu-right"> + <div id="dropdown-menu" class="dropdown-menu dropdown-menu-end"> {{if $channel_apps.0 && ! $channel_menu}} {{foreach $channel_apps as $channel_app}} {{$channel_app}} diff --git a/view/tpl/photo_view.tpl b/view/tpl/photo_view.tpl index 85d794f11..473e34123 100644 --- a/view/tpl/photo_view.tpl +++ b/view/tpl/photo_view.tpl @@ -7,7 +7,7 @@ <button type="button" class="btn btn-outline-secondary btn-sm dropdown-toggle" data-bs-toggle="dropdown"> <i class="fa fa-cog"></i> {{$tools_label}} </button> - <div class="dropdown-menu dropdown-menu-right flex-column"> + <div class="dropdown-menu dropdown-menu-end flex-column"> {{if $tools}} <a class="dropdown-item" href="{{$tools.profile.0}}"><i class="fa fa-user"></i> {{$tools.profile.1}}</a> <a class="dropdown-item" href="{{$tools.cover.0}}"><i class="fa fa-picture-o"></i> {{$tools.cover.1}}</a> @@ -24,7 +24,7 @@ {{if $lock}} <div class="btn-group"> <button id="lockview" class="btn btn-outline-secondary btn-sm dropdown-toggle" data-bs-toggle="dropdown" title="{{$lock}}" onclick="lockview('photo',{{$id}});" ><i class="fa fa-lock"></i></button> - <ul id="panel-{{$id}}" class="lockview-panel dropdown-menu dropdown-menu-right"></ul> + <ul id="panel-{{$id}}" class="lockview-panel dropdown-menu dropdown-menu-end"></ul> </div> {{/if}} {{if $prevlink || $nextlink}} diff --git a/view/tpl/pinned_item.tpl b/view/tpl/pinned_item.tpl index bca49c3df..4d059e0a4 100644 --- a/view/tpl/pinned_item.tpl +++ b/view/tpl/pinned_item.tpl @@ -92,7 +92,7 @@ <button type="button" class="btn btn-outline-secondary btn-sm dropdown-toggle" data-bs-toggle="dropdown" id="pinned-item-attend-menu-{{$id}}" title="{{$attend_title}}"> <i class="fa fa-calendar-check-o"></i> </button> - <div class="dropdown-menu dropdown-menu-right"> + <div class="dropdown-menu dropdown-menu-end"> <a class="dropdown-item" href="#" title="{{$attend.0}}" onclick="itemAddToCal({{$id}}); dolike({{$id}},'attendyes'); return false;"> <i class="item-act-list fa fa-check{{if $my_responses.attend}} ivoted{{/if}}" ></i> {{$attend.0}} </a> @@ -110,7 +110,7 @@ <button type="button" class="btn btn-outline-secondary btn-sm dropdown-toggle" data-bs-toggle="dropdown" id="pinned-item-consensus-menu-{{$id}}" title="{{$vote_title}}"> <i class="fa fa-check-square-o"></i> </button> - <div class="dropdown-menu dropdown-menu-right" role="menu" aria-labelledby="wall-item-consensus-menu-{{$id}}"> + <div class="dropdown-menu dropdown-menu-end" role="menu" aria-labelledby="wall-item-consensus-menu-{{$id}}"> <a class="dropdown-item" href="#" title="{{$conlabels.0}}" onclick="dolike({{$id}},'agree'); return false;"> <i class="item-act-list fa fa-check{{if $my_responses.agree}} ivoted{{/if}}" ></i> {{$conlabels.0}} </a> @@ -127,7 +127,7 @@ <button type="button" class="btn btn-outline-secondary btn-sm dropdown-toggle" data-bs-toggle="dropdown" id="pinned-item-menu-{{$id}}"> <i class="fa fa-cog"></i> </button> - <div class="dropdown-menu dropdown-menu-right" role="menu" aria-labelledby="wall-item-menu-{{$id}}"> + <div class="dropdown-menu dropdown-menu-end" role="menu" aria-labelledby="wall-item-menu-{{$id}}"> {{if $share}} <a class="dropdown-item" href="#" onclick="jotShare({{$id}},{{$item_type}}); return false;"><i class="generic-icons-nav fa fa-fw fa-retweet" title="{{$share.0}}"></i>{{$share.0}}</a> {{/if}} diff --git a/view/tpl/profile_advanced.tpl b/view/tpl/profile_advanced.tpl index bb60269ae..a4f6c9525 100644 --- a/view/tpl/profile_advanced.tpl +++ b/view/tpl/profile_advanced.tpl @@ -5,7 +5,7 @@ <div class="btn-group"> <button type="button" class="btn btn-outline-secondary btn-sm dropdown-toggle" data-bs-toggle="dropdown" id="profile-like">{{$profile.like_count}} {{$profile.like_button_label}}</button> {{if $profile.likers}} - <ul class="dropdown-menu dropdown-menu-right" role="menu" aria-labelledby="profile-like">{{foreach $profile.likers as $liker}}<li role="presentation"><a href="{{$liker.url}}"><img class="menu-img-1" src="{{$liker.photo}}" alt="{{$liker.name}}" /> {{$liker.name}}</a></li>{{/foreach}}</ul> + <ul class="dropdown-menu dropdown-menu-end" role="menu" aria-labelledby="profile-like">{{foreach $profile.likers as $liker}}<li role="presentation"><a href="{{$liker.url}}"><img class="menu-img-1" src="{{$liker.photo}}" alt="{{$liker.name}}" /> {{$liker.name}}</a></li>{{/foreach}}</ul> {{/if}} </div> {{/if}} @@ -19,7 +19,7 @@ {{if $editmenu.multi}} <div class="btn-group"> <a class="btn btn-primary btn-sm dropdown-toggle" data-bs-toggle="dropdown" href="#" ><i class="fa fa-pencil"></i> {{$editmenu.edit.3}}</a> - <div class="dropdown-menu dropdown-menu-right"> + <div class="dropdown-menu dropdown-menu-end"> {{foreach $editmenu.menu.entries as $e}} <a class="dropdown-item" href="profiles/{{$e.id}}"><img class="dropdown-menu-img-xs" src='{{$e.photo}}'> {{$e.profile_name}}</a> {{/foreach}} diff --git a/view/tpl/profile_edit.tpl b/view/tpl/profile_edit.tpl index a2dd319f8..14430bf89 100644 --- a/view/tpl/profile_edit.tpl +++ b/view/tpl/profile_edit.tpl @@ -4,7 +4,7 @@ <button type="button" class="btn btn-outline-secondary btn-sm dropdown-toggle" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> <i class="fa fa-cog"></i> {{$tools_label}} </button> - <div class="dropdown-menu dropdown-menu-right"> + <div class="dropdown-menu dropdown-menu-end"> <a class="dropdown-item" href="profile_photo" id="profile-photo_upload-link" title="{{$profpic}}"><i class="fa fa-fw fa-user"></i> {{$profpic}}</a> {{if $is_default}} <a class="dropdown-item" href="cover_photo" id="cover-photo_upload-link" title="{{$coverpic}}"><i class="fa fa-fw fa-picture-o"></i> {{$coverpic}}</a> diff --git a/view/tpl/profile_vcard.tpl b/view/tpl/profile_vcard.tpl index 6d3a51d60..13caf5603 100644 --- a/view/tpl/profile_vcard.tpl +++ b/view/tpl/profile_vcard.tpl @@ -9,7 +9,7 @@ {{if $editmenu.multi}} <div class="dropdown float-end"> <a class="dropdown-toggle" data-bs-toggle="dropdown" href="#" ><i class="fa fa-pencil" title="{{$editmenu.edit.1}}"></i></a> - <div class="dropdown-menu dropdown-menu-right" role="menu"> + <div class="dropdown-menu dropdown-menu-end" role="menu"> {{foreach $editmenu.menu.entries as $e}} <a href="profiles/{{$e.id}}" class="dropdown-item"><img class="menu-img-1" src='{{$e.photo}}'> {{$e.profile_name}}</a> {{/foreach}} diff --git a/view/tpl/prv_message.tpl b/view/tpl/prv_message.tpl index e01574d9a..4646d9f88 100644 --- a/view/tpl/prv_message.tpl +++ b/view/tpl/prv_message.tpl @@ -83,7 +83,7 @@ <button type="button" id="more-tools" class="btn btn-outline-secondary btn-sm dropdown-toggle" data-bs-toggle="dropdown" aria-expanded="false"> <i id="more-tools-icon" class="fa fa-cog jot-icons"></i> </button> - <div class="dropdown-menu dropdown-menu-right" role="menu"> + <div class="dropdown-menu dropdown-menu-end" role="menu"> <a class="dropdown-item" href="#" id="prvmail-attach-sub"><i class="fa fa-paperclip"></i> {{$attach}}</a> <a class="dropdown-item" href="#" onclick="prvmailJotGetLink(); return false;" ><i class="fa fa-link"></i> {{$insert}}</a> {{if $feature_expire || $feature_encrypt}} diff --git a/view/tpl/search_item.tpl b/view/tpl/search_item.tpl index 9797b11d8..ee89973a8 100644 --- a/view/tpl/search_item.tpl +++ b/view/tpl/search_item.tpl @@ -76,7 +76,7 @@ <button type="button" class="btn btn-outline-secondary btn-sm dropdown-toggle" data-bs-toggle="dropdown"> <i class="fa fa-cog"></i> </button> - <div class="dropdown-menu dropdown-menu-right"> + <div class="dropdown-menu dropdown-menu-end"> {{if $item.star}} <a class="dropdown-item" href="#" onclick="dostar({{$item.id}}); return false;"><i id="starred-{{$item.id}}" class="fa fa-fw{{if $item.star.isstarred}} starred fa-star{{else}} unstarred fa-star-o{{/if}} generic-icons-nav" title="{{$item.star.toggle}}"></i>{{$item.star.toggle}}</a> {{/if}} diff --git a/view/tpl/wiki.tpl b/view/tpl/wiki.tpl index 7d5c418ce..c300bddba 100644 --- a/view/tpl/wiki.tpl +++ b/view/tpl/wiki.tpl @@ -7,7 +7,7 @@ <button type="button" class="btn btn-outline-secondary btn-sm dropdown-toggle" data-bs-toggle="dropdown"> <i class="fa fa-cog"></i> {{$tools_label}} </button> - <div class="dropdown-menu dropdown-menu-right"> + <div class="dropdown-menu dropdown-menu-end"> {{if $renamePage}} <a class="dropdown-item rename-page" href="#"><i class="fa fa-fw fa-edit"></i> {{$renamePage}}</a> {{/if}} diff --git a/view/tpl/wikilist.tpl b/view/tpl/wikilist.tpl index e954a39c1..bc8461dac 100644 --- a/view/tpl/wikilist.tpl +++ b/view/tpl/wikilist.tpl @@ -48,7 +48,7 @@ <td class="dropdown"> {{if $wiki.lockstate == 'lock'}} <i class="fa fa-lock lockview" data-bs-toggle="dropdown" onclick="lockview('item',{{$wiki.id}});"></i> - <ul id="panel-{{$wiki.id}}" class="lockview-panel dropdown-menu dropdown-menu-right"></ul> + <ul id="panel-{{$wiki.id}}" class="lockview-panel dropdown-menu dropdown-menu-end"></ul> {{/if}} </td> <td><i class="fa fa-download" onclick="wiki_download_wiki('{{$wiki.resource_id}}'); return false;"></i></td> |