diff options
Diffstat (limited to 'view')
| -rw-r--r-- | view/js/main.js | 16 | ||||
| -rw-r--r-- | view/theme/redbasic/css/style.css | 6 | ||||
| -rw-r--r-- | view/theme/redbasic/js/redbasic.js | 8 | ||||
| -rw-r--r-- | view/tpl/app.tpl | 16 | ||||
| -rw-r--r-- | view/tpl/app_inline.tpl | 6 | ||||
| -rw-r--r-- | view/tpl/app_install.tpl | 2 | ||||
| -rw-r--r-- | view/tpl/app_nav.tpl | 2 | ||||
| -rw-r--r-- | view/tpl/app_nav_pinned.tpl | 2 | ||||
| -rw-r--r-- | view/tpl/app_order.tpl | 6 | ||||
| -rw-r--r-- | view/tpl/conv_item.tpl | 4 | ||||
| -rw-r--r-- | view/tpl/hq_controls.tpl | 2 | ||||
| -rw-r--r-- | view/tpl/messages_widget.tpl | 12 | ||||
| -rw-r--r-- | view/tpl/myapps.tpl | 2 | ||||
| -rw-r--r-- | view/tpl/navbar_default.tpl | 36 | ||||
| -rw-r--r-- | view/tpl/notifications_widget.tpl | 12 |
15 files changed, 66 insertions, 66 deletions
diff --git a/view/js/main.js b/view/js/main.js index 782ce4b62..aa6b72dda 100644 --- a/view/js/main.js +++ b/view/js/main.js @@ -1256,7 +1256,7 @@ function doscroll(parent, hidden) { }); $('html, body').animate({scrollTop:(id.offset().top) - 50}, 'slow'); - $('<a href="javascript:doscrollback(' + pos + ');" id="back-to-reply" title="' + aStr['to_reply'] + '"><i class="fa fa-angle-double-down"></i></a>').insertAfter('#wall-item-ago-' + id.attr('id').replace(/\D/g,'')); + $('<a href="javascript:doscrollback(' + pos + ');" id="back-to-reply" title="' + aStr['to_reply'] + '"><i class="bi bi-chevron-double-down"></i></a>').insertAfter('#wall-item-ago-' + id.attr('id').replace(/\D/g,'')); } function doscrollback(pos) { @@ -1281,7 +1281,7 @@ function dopin(id) { $('.dropdown-item-pinnable').html($('.dropdown-item-pinnable').html().replace(aStr['unpin_item'],aStr['pin_item'])); $('.wall-item-pinned').remove() if(i.length == 0) { - $('<span class="wall-item-pinned" title="' + aStr['pinned'] + '" id="wall-item-pinned-' + id + '"><i class="fa fa-thumb-tack"> </i></span>').insertAfter('#wall-item-ago-' + id); + $('<span class="wall-item-pinned" title="' + aStr['pinned'] + '" id="wall-item-pinned-' + id + '"><i class="bi bi-pin"> </i></span>').insertAfter('#wall-item-ago-' + id); me.html(me.html().replace(aStr['pin_item'],aStr['unpin_item'])); }; }) @@ -1356,8 +1356,8 @@ function dostar(ident) { if(data.result == 1) { $('#starred-' + ident).addClass('starred'); $('#starred-' + ident).removeClass('unstarred'); - $('#starred-' + ident).addClass('fa-star'); - $('#starred-' + ident).removeClass('fa-star-o'); + $('#starred-' + ident).addClass('bi-star-fill'); + $('#starred-' + ident).removeClass('bi-star'); $('#star-' + ident).addClass('hidden'); $('#unstar-' + ident).removeClass('hidden'); var btn_tpl = '<div class="" id="star-button-' + ident + '"><button type="button" class="btn btn-outline-secondary border-0 wall-item-star" onclick="dostar(' + ident + ');"><i class="fa fa-star"></i></button></div>' @@ -1366,8 +1366,8 @@ function dostar(ident) { else { $('#starred-' + ident).addClass('unstarred'); $('#starred-' + ident).removeClass('starred'); - $('#starred-' + ident).addClass('fa-star-o'); - $('#starred-' + ident).removeClass('fa-star'); + $('#starred-' + ident).addClass('bi-star'); + $('#starred-' + ident).removeClass('bi-star-fill'); $('#star-' + ident).removeClass('hidden'); $('#unstar-' + ident).addClass('hidden'); $('#star-button-' + ident).remove(); @@ -1678,7 +1678,7 @@ function push_notification(title, body, b64mid) { function toggleAside() { if ($('main.region_1-on').length) { - $('#expand-aside-icon').addClass('fa-arrow-circle-right').removeClass('fa-arrow-circle-left'); + $('#expand-aside-icon').addClass('bi-arrow-right-circle').removeClass('bi-arrow-left-circle'); $('html, body').css({ 'position': '', 'left': '' }); $('main').removeClass('region_1-on'); $('#region_1').addClass('d-none'); @@ -1686,7 +1686,7 @@ function toggleAside() { $('#overlay').remove(); } else { - $('#expand-aside-icon').removeClass('fa-arrow-circle-right').addClass('fa-arrow-circle-left'); + $('#expand-aside-icon').removeClass('bi-arrow-right-circle').addClass('bi-arrow-left-circle'); $('html, body').css({ 'position': 'sticky', 'left': '0px'}); $('main').addClass('region_1-on'); $('#region_1').removeClass('d-none'); diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 2de40d671..49b3fe25e 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -855,12 +855,12 @@ a .generic-icons { .generic-icons-nav { font-size: 1rem; - margin-right: 7px; + margin-right: 0.5rem; } .admin-icons { - font-size: 1.2em; - margin-right: 7px; + font-size: 1rem; + margin-right: 0.5rem; } .drop-icons, diff --git a/view/theme/redbasic/js/redbasic.js b/view/theme/redbasic/js/redbasic.js index 0f2617cc0..76d6c0854 100644 --- a/view/theme/redbasic/js/redbasic.js +++ b/view/theme/redbasic/js/redbasic.js @@ -29,11 +29,11 @@ $(document).ready(function() { } if (redbasic_dark_mode == 1) { - $('#theme-switch-icon').removeClass('fa-moon-o').addClass('fa-sun-o'); + $('#theme-switch-icon').removeClass('bi-moon').addClass('bi-sun'); $('[data-bs-theme="light"]').attr('data-bs-theme', 'dark'); } if (redbasic_dark_mode == 0) { - $('#theme-switch-icon').removeClass('fa-sun-o').addClass('fa-moon-o'); + $('#theme-switch-icon').removeClass('bi-sun').addClass('bi-moon'); $('[data-bs-theme="dark"]:not(nav)').attr('data-bs-theme', 'light'); } @@ -84,12 +84,12 @@ $(document).ready(function() { $('[data-bs-theme="dark"]').attr('data-bs-theme', 'light'); } localStorage.setItem('redbasic_dark_mode', 0); - $('#theme-switch-icon').removeClass('fa-sun-o').addClass('fa-moon-o'); + $('#theme-switch-icon').removeClass('bi-sun').addClass('bi-moon'); } else { $('[data-bs-theme="light"]').attr('data-bs-theme', 'dark'); localStorage.setItem('redbasic_dark_mode', 1); - $('#theme-switch-icon').removeClass('fa-moon-o').addClass('fa-sun-o'); + $('#theme-switch-icon').removeClass('bi-moon').addClass('bi-sun'); } $('meta[name=theme-color]').attr('content', $('nav').css('background-color')); localStorage.setItem('redbasic_theme_color', $('nav').css('background-color')); diff --git a/view/tpl/app.tpl b/view/tpl/app.tpl index f3f6ae58b..b078aa66d 100644 --- a/view/tpl/app.tpl +++ b/view/tpl/app.tpl @@ -3,19 +3,19 @@ {{if $app.type !== 'system'}} {{if $purchase}} <div class="app-purchase"> - <a href="{{$app.page}}" class="btn btn-outline-secondary" title="{{$purchase}}" ><i class="fa fa-external"></i></a> + <a href="{{$app.page}}" class="btn btn-outline-secondary" title="{{$purchase}}" ><i class="bi bi-box-arrow-up-right"></i></a> </div> {{/if}} {{if $action_label || $update || $delete || $feature}} <div class="app-tools"> <form action="{{$hosturl}}appman" method="post"> <input type="hidden" name="papp" value="{{$app.papp}}" /> - {{if $action_label}}<button type="submit" name="install" value="{{$action_label}}" class="btn btn-{{if $installed}}outline-secondary{{else}}success{{/if}} btn-sm" title="{{$action_label}}" ><i class="fa fa-fw {{if $installed}}fa-refresh{{else}}fa-arrow-circle-o-down{{/if}}" ></i> {{$action_label}}</button>{{/if}} - {{if $edit}}<input type="hidden" name="appid" value="{{$app.guid}}" /><button type="submit" name="edit" value="{{$edit}}" class="btn btn-outline-secondary btn-sm" title="{{$edit}}" ><i class="fa fa-fw fa-pencil" ></i></button>{{/if}} - {{if $delete}}<button type="submit" name="delete" value="{{if $deleted}}{{$undelete}}{{else}}{{$delete}}{{/if}}" class="btn btn-outline-secondary btn-sm" title="{{if $deleted}}{{$undelete}}{{else}}{{$delete}}{{/if}}" ><i class="fa fa-fw fa-trash-o drop-icons"></i></button>{{/if}} - {{if $settings_url}}<a href="{{$settings_url}}/?f=&rpath={{$rpath}}" class="btn btn-outline-secondary btn-sm"><i class="fa fa-fw fa-cog"></i></a>{{/if}} - {{if $feature}}<button type="submit" name="feature" value="nav_featured_app" class="btn btn-outline-secondary btn-sm" title="{{if $featured}}{{$remove}}{{else}}{{$add}}{{/if}}"><i class="fa fa-fw fa-star{{if $featured}} text-warning{{/if}}"></i></button>{{/if}} - {{if $pin}}<button type="submit" name="pin" value="nav_pinned_app" class="btn btn-outline-secondary btn-sm" title="{{if $pinned}}{{$remove_nav}}{{else}}{{$add_nav}}{{/if}}"><i class="fa fa-fw fa-thumb-tack{{if $pinned}} text-success{{/if}}"></i></button>{{/if}} + {{if $action_label}}<button type="submit" name="install" value="{{$action_label}}" class="btn btn-{{if $installed}}outline-secondary{{else}}success{{/if}} btn-sm" title="{{$action_label}}" ><i class="bi{{if $installed}} bi-arrow-repeat{{else}} bi-arrow-down-circle{{/if}}" ></i> {{$action_label}}</button>{{/if}} + {{if $edit}}<input type="hidden" name="appid" value="{{$app.guid}}" /><button type="submit" name="edit" value="{{$edit}}" class="btn btn-outline-secondary btn-sm" title="{{$edit}}" ><i class="bi bi-pencil" ></i></button>{{/if}} + {{if $delete}}<button type="submit" name="delete" value="{{if $deleted}}{{$undelete}}{{else}}{{$delete}}{{/if}}" class="btn btn-outline-secondary btn-sm" title="{{if $deleted}}{{$undelete}}{{else}}{{$delete}}{{/if}}" ><i class="bi bi-trash drop-icons"></i></button>{{/if}} + {{if $settings_url}}<a href="{{$settings_url}}/?f=&rpath={{$rpath}}" class="btn btn-outline-secondary btn-sm"><i class="bi bi-gear"></i></a>{{/if}} + {{if $feature}}<button type="submit" name="feature" value="nav_featured_app" class="btn btn-outline-secondary btn-sm" title="{{if $featured}}{{$remove}}{{else}}{{$add}}{{/if}}"><i class="bi bi-star{{if $featured}} text-warning{{/if}}"></i></button>{{/if}} + {{if $pin}}<button type="submit" name="pin" value="nav_pinned_app" class="btn btn-outline-secondary btn-sm" title="{{if $pinned}}{{$remove_nav}}{{else}}{{$add_nav}}{{/if}}"><i class="bi bi-pin{{if $pinned}} text-success{{/if}}"></i></button>{{/if}} </form> </div> {{/if}} @@ -27,7 +27,7 @@ <div class="{{if $deleted}} app-deleted{{/if}} mb-3"> <a class="app-icon app-link" href="{{$app.url}}"{{if $app.target}} target="{{$app.target}}"{{/if}}{{if $installed}} data-papp="{{$app.papp}}" data-icon="{{$icon}}" data-url="{{$app.url}}" data-name="{{$app.name}}"{{/if}}> {{if $icon}} - <i class="app-icon fa fa-fw fa-{{$icon}}"></i> + <i class="app-icon bi bi-{{$icon}}"></i> {{else}} <img src="{{$app.photo}}" width="80" height="80" /> {{/if}} diff --git a/view/tpl/app_inline.tpl b/view/tpl/app_inline.tpl index fc3675380..678720f5f 100644 --- a/view/tpl/app_inline.tpl +++ b/view/tpl/app_inline.tpl @@ -1,7 +1,7 @@ <h3 class="mb-3">{{$app.name}}{{if $app.price}} ({{$app.price}}){{/if}}</h3> <a class="app-icon" href="{{$app.url}}" > {{if $icon}} - <i class="app-icon fa fa-fw fa-{{$icon}} mb-3"></i> + <i class="app-icon bi bi-{{$icon}} mb-3"></i> {{else}} <img src="{{$app.photo}}" width="80" height="80" class="mb-3" /> {{/if}} @@ -14,10 +14,10 @@ <form action="{{$hosturl}}appman" method="post"> <input type="hidden" name="papp" value="{{$app.papp}}" /> {{if $action_label}} - <button type="submit" name="install" value="{{$action_label}}" class="btn btn-{{if $installed}}outline-secondary{{else}}success{{/if}} btn-sm" title="{{$action_label}}" ><i class="fa fa-fw {{if $installed}}fa-refresh{{else}}fa-arrow-circle-o-down{{/if}}" ></i> {{$action_label}}</button> + <button type="submit" name="install" value="{{$action_label}}" class="btn btn-{{if $installed}}outline-secondary{{else}}success{{/if}} btn-sm" title="{{$action_label}}" ><i class="bi{{if $installed}} bi-repeat{{else}}bi-arrow-down-circle{{/if}}" ></i> {{$action_label}}</button> {{/if}} {{if $purchase && $app.type !== 'system'}} - <a href="{{$app.page}}" class="btn btn-sm btn-link" title="{{$purchase}}" ><i class="fa fa-external-link"></i></a> + <a href="{{$app.page}}" class="btn btn-sm btn-link" title="{{$purchase}}" ><i class="bi bi-box-arrow-up-right"></i></a> {{/if}} </form> </div> diff --git a/view/tpl/app_install.tpl b/view/tpl/app_install.tpl index 16b89d350..4783ba977 100644 --- a/view/tpl/app_install.tpl +++ b/view/tpl/app_install.tpl @@ -8,6 +8,6 @@ <input type="hidden" name="papp" value="{{$papp.papp}}" /> <input type="hidden" name="return_path" value="{{$return_path}}" /> <button type="submit" name="install" value="install" class="btn btn-success"> - <i class="fa fa-fw fa-arrow-circle-o-down"></i> {{$install}} + <i class="bi bi-arrow-down-circle"></i> {{$install}} </button> </form> diff --git a/view/tpl/app_nav.tpl b/view/tpl/app_nav.tpl index a8489382e..c91a0c9af 100644 --- a/view/tpl/app_nav.tpl +++ b/view/tpl/app_nav.tpl @@ -1 +1 @@ -<a class="nav-link{{if $app.active}} active{{/if}}" href="{{$app.url}}" data-papp="{{$app.papp}}" data-icon="{{$icon}}" data-url="{{$app.url}}" data-name="{{$app.name}}">{{if $icon}}<i class="generic-icons-nav fa fa-fw fa-{{$icon}}"></i>{{else}}<img src="{{$app.photo}}" width="16" height="16" style="margin-right:9px;"/>{{/if}}{{$app.name}}</a> +<a class="nav-link{{if $app.active}} active{{/if}}" href="{{$app.url}}" data-papp="{{$app.papp}}" data-icon="{{$icon}}" data-url="{{$app.url}}" data-name="{{$app.name}}">{{if $icon}}<i class="generic-icons-nav bi bi-{{$icon}}"></i>{{else}}<img src="{{$app.photo}}" width="16" height="16" style="margin-right:9px;"/>{{/if}}{{$app.name}}</a> diff --git a/view/tpl/app_nav_pinned.tpl b/view/tpl/app_nav_pinned.tpl index bf942dd48..5156372c3 100644 --- a/view/tpl/app_nav_pinned.tpl +++ b/view/tpl/app_nav_pinned.tpl @@ -1,6 +1,6 @@ <a class="navbar-app nav-link{{if $app.active}} active{{/if}}" href="{{$app.url}}" title="{{$app.name}}"> {{if $icon}} - <i class="fa fa-fw fa-{{$icon}}"></i> + <i class="bi bi-{{$icon}}"></i> <span class="d-lg-none">{{$app.name}}</span> {{else}} <img src="{{$app.photo}}" width="16" height="16" /> diff --git a/view/tpl/app_order.tpl b/view/tpl/app_order.tpl index 53c770cb7..4552e8e37 100644 --- a/view/tpl/app_order.tpl +++ b/view/tpl/app_order.tpl @@ -1,3 +1,3 @@ -<a href="{{$hosturl}}appman/{{$app.guid}}/moveup{{if $mode == 'nav-order-pinned'}}/nav_pinned_app{{else}}/nav_featured_app{{/if}}" class="btn btn-outline-secondary btn-sm" style="margin-bottom: 5px;"><i class="generic-icons-nav fa fa-fw fa-arrow-up"></i></a> -<a href="{{$hosturl}}appman/{{$app.guid}}/movedown{{if $mode == 'nav-order-pinned'}}/nav_pinned_app{{else}}/nav_featured_app{{/if}}" class="btn btn-outline-secondary btn-sm" style="margin-bottom: 5px;"><i class="generic-icons-nav fa fa-fw fa-arrow-down"></i></a> -{{if $icon}}<i class="generic-icons-nav fa fa-fw fa-{{$icon}}"></i>{{else}}<img src="{{$app.photo}}" width="16" height="16" style="margin-right:9px;"/>{{/if}}{{$app.name}}<br> +<a href="{{$hosturl}}appman/{{$app.guid}}/moveup{{if $mode == 'nav-order-pinned'}}/nav_pinned_app{{else}}/nav_featured_app{{/if}}" class="btn btn-outline-secondary btn-sm" style="margin-bottom: 5px;"><i class="generic-icons-nav bi bi-arrow-up"></i></a> +<a href="{{$hosturl}}appman/{{$app.guid}}/movedown{{if $mode == 'nav-order-pinned'}}/nav_pinned_app{{else}}/nav_featured_app{{/if}}" class="btn btn-outline-secondary btn-sm" style="margin-bottom: 5px;"><i class="generic-icons-nav bi bi-arrow-down"></i></a> +{{if $icon}}<i class="generic-icons-nav bi bi-{{$icon}}"></i>{{else}}<img src="{{$app.photo}}" width="16" height="16" style="margin-right:9px;"/>{{/if}}{{$app.name}}<br> diff --git a/view/tpl/conv_item.tpl b/view/tpl/conv_item.tpl index 54ac8cae4..ed8241545 100644 --- a/view/tpl/conv_item.tpl +++ b/view/tpl/conv_item.tpl @@ -187,7 +187,7 @@ {{/if}} {{if $item.reply_to}} <button type="button" title="{{$item.reply_to.0}}" class="btn btn-outline-secondary border-0" onclick="doreply({{$item.parent}}, {{$item.id}}, '{{$item.author_id}}', '{{$item.reply_to.2}} {{$item.name|escape:javascript}}');"> - <i class="bi bi-reply" ></i> + <i class="bi bi-arrow-90deg-left" ></i> </button> {{/if}} <div class=""> @@ -199,7 +199,7 @@ <!--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}} {{if $item.embed}} - <a class="dropdown-item" href="#" onclick="jotEmbed({{$item.id}},{{$item.item_type}}); return false"><i class="generic-icons-nav bi bi-arrow-up-right" title="{{$item.embed.0}}"></i>{{$item.embed.0}}</a> + <a class="dropdown-item" href="#" onclick="jotEmbed({{$item.id}},{{$item.item_type}}); return false"><i class="generic-icons-nav bi bi-arrow-90deg-right" title="{{$item.embed.0}}"></i>{{$item.embed.0}}</a> {{/if}} {{if $item.plink}} <a class="dropdown-item" href="{{$item.plink.href}}" title="{{$item.plink.title}}" class="u-url"><i class="generic-icons-nav bi bi-box-arrow-up-right"></i>{{$item.plink.title}}</a> diff --git a/view/tpl/hq_controls.tpl b/view/tpl/hq_controls.tpl index 0d433c2c2..83c62cb1d 100644 --- a/view/tpl/hq_controls.tpl +++ b/view/tpl/hq_controls.tpl @@ -1,7 +1,7 @@ <div class="mb-3 hq_controls{{if $wrapper_class}} {{$wrapper_class}}{{/if}}"> {{foreach $entries as $e}} <button class="{{$e.class}} rounded-circle{{if $entry_class}} {{$entry_class}}{{/if}}" type="{{$e.type}}" title="{{$e.label}}"{{if $e.extra}} {{$e.extra}}{{/if}}> - {{if $e.icon}}<i class="fa fa-{{$e.icon}}"></i>{{/if}} + {{if $e.icon}}<i class="bi bi-{{$e.icon}}"></i>{{/if}} </button> {{/foreach}} </div> diff --git a/view/tpl/messages_widget.tpl b/view/tpl/messages_widget.tpl index 9b6c6d03b..8bcecd9d4 100644 --- a/view/tpl/messages_widget.tpl +++ b/view/tpl/messages_widget.tpl @@ -1,24 +1,24 @@ <ul class="nav nav-tabs nav-fill clearfix"> <li class="nav-item"> <a class="nav-link active messages-type" href="#" title="{{$strings.messages_title}}" data-messages_type=""> - <i class="fa fa-fw fa-comment-o"></i> + <i class="bi bi-chat"></i> </a> </li> <li class="nav-item"> <a class="nav-link messages-type" href="#" title="{{$strings.direct_messages_title}}" data-messages_type="direct"> - <i class="fa fa-fw fa-envelope-o"></i> + <i class="bi bi-envelope"></i> </a> </li> {{if $feature_star}} <li class="nav-item"> <a class="nav-link messages-type" href="#" title="{{$strings.starred_messages_title}}" data-messages_type="starred"> - <i class="fa fa-fw fa-star"></i> + <i class="bi bi-star"></i> </a> </li> {{/if}} <li class="nav-item"> <a class="nav-link messages-type" href="#" title="{{$strings.notice_messages_title}}" data-messages_type="notification"> - <i class="fa fa-fw fa-exclamation"></i> + <i class="bi bi-exclamation-circle"></i> </a> </li> </ul> @@ -49,9 +49,9 @@ </div> <div id="messages-container" class="list-group list-group-flush" data-offset="10"> <div id="messages-author-container" class="list-group-item notifications-textinput"> - <div class="text-muted notifications-textinput-filter"><i class="fa fa-fw fa-filter"></i></div> + <div class="text-muted notifications-textinput-filter"><i class="bi bi-funnel"></i></div> <input id="messages-author" type="text" class="form-control form-control-sm" placeholder="{{$strings.filter}}"> - <div id="messages-author-input-clear" class="text-muted notifications-textinput-clear d-none"><i class="fa fa-times"></i></div> + <div id="messages-author-input-clear" class="text-muted notifications-textinput-clear d-none"><i class="bi bi-x-lg"></i></div> </div> {{foreach $entries as $e}} <a href="{{$e.href}}" class="list-group-item list-group-item-action message" data-b64mid="{{$e.b64mid}}"> diff --git a/view/tpl/myapps.tpl b/view/tpl/myapps.tpl index 404ab73d3..d11dad59f 100644 --- a/view/tpl/myapps.tpl +++ b/view/tpl/myapps.tpl @@ -2,7 +2,7 @@ <div class="section-title-wrapper clearfix"> {{if $authed}} {{if $create}} - <a href="appman" class="float-end btn btn-success btn-sm"><i class="fa fa-pencil-square-o"></i> {{$create}}</a> + <a href="appman" class="float-end btn btn-success btn-sm"><i class="bi bi-pencil-square"></i> {{$create}}</a> {{elseif $manage}} <a href="apps/edit{{if $cat.0}}/?f=&cat={{$cat.0}}{{/if}}" class="float-end btn btn-primary btn-sm">{{$manage}}</a> {{/if}} diff --git a/view/tpl/navbar_default.tpl b/view/tpl/navbar_default.tpl index d8b8e2f74..3e9c96053 100644 --- a/view/tpl/navbar_default.tpl +++ b/view/tpl/navbar_default.tpl @@ -5,7 +5,7 @@ <div class="dropdown"> <div class="cursor-pointer usermenu" data-bs-toggle="dropdown"> <img id="avatar" src="{{$userinfo.icon}}" alt="{{$userinfo.name}}" class="rounded"> - <i class="navbar-text fa fa-caret-down"></i> + <i class="navbar-text bi bi-caret-down-fill"></i> </div> {{if $is_owner}} <div class="dropdown-menu" {{$color_mode}}> @@ -20,7 +20,7 @@ {{/if}} {{if $nav.channels}} {{foreach $nav.channels as $chan}} - <a class="dropdown-item" href="manage/{{$chan.channel_id}}" title="{{$chan.channel_name}}" role="menuitem"><i class="fa fa-circle{{if $localuser == $chan.channel_id}} text-success{{else}} invisible{{/if}}"></i> {{$chan.channel_name}}</a> + <a class="dropdown-item" href="manage/{{$chan.channel_id}}" title="{{$chan.channel_name}}" role="menuitem"><i class="bi bi-circle-fill{{if $localuser == $chan.channel_id}} text-success{{else}} invisible{{/if}}"></i> {{$chan.channel_name}}</a> {{/foreach}} {{/if}} {{if $nav.profiles}} @@ -59,7 +59,7 @@ {{if $settings_url}} <div id="nav-app-settings-link-wrapper" class="navbar-nav"> <a id="nav-app-settings-link" href="{{$settings_url}}/?f=&rpath={{$url}}" class="nav-link"> - <i class="fa fa-fw fa-cog"></i> + <i class="bi bi-gear"></i> </a> </div> {{/if}} @@ -71,19 +71,19 @@ <div class="navbar-toggler-right"> {{if $nav.help.6}} <button id="context-help-btn" class="navbar-toggler border-0" type="button" onclick="contextualHelp(); return false;"> - <i class="fa fa-question-circle"></i> + <i class="bi bi-question-circle-fill"></i> </button> {{/if}} <button id="expand-aside" type="button" class="d-lg-none navbar-toggler border-0"> - <i class="fa fa-arrow-circle-right" id="expand-aside-icon"></i> + <i class="bi bi-arrow-right-circle" id="expand-aside-icon"></i> </button> {{if $localuser || $nav.pubs}} <button id="notifications-btn-1" type="button" class="navbar-toggler border-0 notifications-btn"> - <i id="notifications-btn-icon-1" class="fa fa-exclamation-circle notifications-btn-icon"></i> + <i id="notifications-btn-icon-1" class="bi bi-exclamation-circle notifications-btn-icon"></i> </button> {{/if}} <button id="menu-btn" class="navbar-toggler border-0" type="button" data-bs-toggle="offcanvas" data-bs-target="#app-bin"> - <i class="fa fa-bars"></i> + <i class="bi bi-three-dots-vertical"></i> </button> </div> <div class="collapse navbar-collapse justify-content-between" id="navbar-collapse-1"> @@ -125,16 +125,16 @@ </div> </li> <li class="nav-item" id="nav-search-btn"> - <a class="nav-link" href="#nav-search" title="{{$nav.search.3}}" onclick="openMenu('nav-search'); closeMenu('nav-search-btn'); $('#nav-search-text').focus(); return false;"><i class="fa fa-fw fa-search"></i></a> + <a class="nav-link" href="#nav-search" title="{{$nav.search.3}}" onclick="openMenu('nav-search'); closeMenu('nav-search-btn'); $('#nav-search-text').focus(); return false;"><i class="bi bi-search"></i></a> </li> {{if $nav.help.6}} <li class="nav-item dropdown {{$sel.help}}"> - <a class="nav-link {{$nav.help.2}}" target="hubzilla-help" href="{{$nav.help.0}}" title="{{$nav.help.3}}" id="{{$nav.help.4}}" onclick="contextualHelp(); return false;"><i class="fa fa-fw fa-question-circle"></i></a> + <a class="nav-link {{$nav.help.2}}" target="hubzilla-help" href="{{$nav.help.0}}" title="{{$nav.help.3}}" id="{{$nav.help.4}}" onclick="contextualHelp(); return false;"><i class="bi bi-question-circle-fill"></i></a> </li> {{/if}} {{if $localuser || $nav.pubs}} <li id="notifications-btn" class="nav-item d-xl-none"> - <a class="nav-link notifications-btn" href="#"><i id="notifications-btn-icon" class="fa fa-exclamation-circle notifications-btn-icon"></i></a> + <a class="nav-link notifications-btn" href="#"><i id="notifications-btn-icon" class="bi bi-exclamation-circle notifications-btn-icon"></i></a> </li> {{/if}} {{if $navbar_apps}} @@ -145,7 +145,7 @@ {{/foreach}} {{/if}} <li class="nav-item dropdown" id="app-menu"> - <a class="nav-link" href="#" data-bs-toggle="offcanvas" data-bs-target="#app-bin" aria-controls="app-bin"><i class="fa fa-fw fa-bars"></i></a> + <a class="nav-link" href="#" data-bs-toggle="offcanvas" data-bs-target="#app-bin" aria-controls="app-bin"><i class="bi bi-three-dots-vertical"></i></a> </li> </ul> </div> @@ -153,8 +153,8 @@ <div id="contextual-help-content" class="contextual-help-content"> {{$nav.help.5}} <div class="float-end"> - <a class="btn btn-primary btn-sm" target="hubzilla-help" href="{{$nav.help.0}}" title="{{$nav.help.3}}"><i class="fa fa-question"></i> {{$fulldocs}}</a> - <a class="contextual-help-tool" href="#" onclick="contextualHelp(); return false;"><i class="fa fa-times"></i></a> + <a class="btn btn-primary btn-sm" target="hubzilla-help" href="{{$nav.help.0}}" title="{{$nav.help.3}}"><i class="bi bi-question"></i> {{$fulldocs}}</a> + <a class="contextual-help-tool" href="#" onclick="contextualHelp(); return false;"><i class="bi bi-x-lg"></i></a> </div> </div> {{/if}} @@ -192,11 +192,11 @@ </div> {{/if}} </div> - <i id="app-bin-trash" class="fa fa-2x fa-fw fa-trash-o d-none"></i> + <i id="app-bin-trash" class="bi bi-trash d-none"></i> {{/if}} <div class="hstack gap-1"> {{if $theme_switch_icon}} - <button id="theme-switch" type="button" class="btn btn-outline-secondary border-0"><i id="theme-switch-icon" class="fa fa-{{$theme_switch_icon}}-o"></i></button> + <button id="theme-switch" type="button" class="btn btn-outline-secondary border-0"><i id="theme-switch-icon" class="bi bi-{{$theme_switch_icon}}"></i></button> {{/if}} <button type="button" class="btn-close text-reset" data-bs-dismiss="offcanvas" aria-label="Close"></button> </div> @@ -234,7 +234,7 @@ </div> <hr> <div class="nav nav-pills flex-column"> - <a class="nav-link" href="/apps"><i class="generic-icons-nav fa fa-fw fa-plus"></i>{{$addapps}}</a> + <a class="nav-link" href="/apps"><i class="generic-icons-nav bi bi-plus-lg"></i>{{$addapps}}</a> </div> {{else}} <div class="text-uppercase text-muted nav-link"> @@ -372,7 +372,7 @@ } }) .done( function() { - $('<li><a class="navbar-app nav-link" href="' + app_url + '"><i class="fa fa-fw fa-' + app_icon + '"></i></li>').insertBefore('#app-menu'); + $('<li><a class="navbar-app nav-link" href="' + app_url + '"><i class="bi bi-' + app_icon + '"></i></li>').insertBefore('#app-menu'); }); }); @@ -406,7 +406,7 @@ } }) .done( function() { - $('<a class="dropdown-item" href="' + app_url + '"><i class="generic-icons-nav fa fa-fw fa-' + app_icon + '"></i>' + app_name + '</a>').appendTo('#app-bin-container'); + $('<a class="dropdown-item" href="' + app_url + '"><i class="generic-icons-nav bi bi-' + app_icon + '"></i>' + app_name + '</a>').appendTo('#app-bin-container'); }); }); diff --git a/view/tpl/notifications_widget.tpl b/view/tpl/notifications_widget.tpl index 0b3b463bc..caa9a4f91 100644 --- a/view/tpl/notifications_widget.tpl +++ b/view/tpl/notifications_widget.tpl @@ -572,7 +572,7 @@ <div class="rounded-top rounded-bottom border border-start-0 border-end-0 border-bottom-0 list-group list-group-flush collapse {{$notification.type}}-button"> <a id="notification-link-{{$notification.type}}" class="collapsed list-group-item justify-content-between align-items-center d-flex fakelink stretched-link notification-link" href="#" title="{{$notification.title}}" data-bs-target="#nav-{{$notification.type}}-sub" data-bs-toggle="collapse" data-sse_type="{{$notification.type}}"> <div> - <i class="fa fa-fw fa-{{$notification.icon}}"></i> + <i class="bi bi-{{$notification.icon}} generic-icons-nav"></i> {{$notification.label}} </div> <span class="badge bg-{{$notification.severity}} {{$notification.type}}-update"></span> @@ -581,25 +581,25 @@ <div id="nav-{{$notification.type}}-sub" class="rounded-bottom border border-start-0 border-end-0 border-bottom-0 list-group list-group-flush collapse notification-content" data-bs-parent="#notifications" data-sse_type="{{$notification.type}}"> {{if $notification.viewall}} <a class="list-group-item list-group-item-action text-decoration-none" id="nav-{{$notification.type}}-see-all" href="{{$notification.viewall.url}}"> - <i class="fa fa-fw fa-external-link"></i> {{$notification.viewall.label}} + <i class="bi bi-box-arrow-up-right generic-icons-nav"></i> {{$notification.viewall.label}} </a> {{/if}} {{if $notification.markall}} <div class="list-group-item list-group-item-action cursor-pointer" id="nav-{{$notification.type}}-mark-all" onclick="markRead('{{$notification.type}}'); return false;"> - <i class="fa fa-fw fa-check"></i> {{$notification.markall.label}} + <i class="bi bi-check-circle generic-icons-nav"></i> {{$notification.markall.label}} </div> {{/if}} {{if $notification.filter}} {{if $notification.filter.posts_label}} <div class="list-group-item list-group-item-action cursor-pointer" id="tt-{{$notification.type}}-only"> - <i class="fa fa-fw fa-filter"></i> {{$notification.filter.posts_label}} + <i class="bi bi-funnel generic-icons-nav"></i> {{$notification.filter.posts_label}} </div> {{/if}} {{if $notification.filter.name_label}} <div class="list-group-item clearfix notifications-textinput" id="cn-{{$notification.type}}-only"> - <div class="text-muted notifications-textinput-filter"><i class="fa fa-fw fa-filter"></i></div> + <div class="text-muted notifications-textinput-filter"><i class="bi bi-funnel"></i></div> <input id="cn-{{$notification.type}}-input" type="text" class="notification-filter form-control form-control-sm" placeholder="{{$notification.filter.name_label}}"> - <div id="cn-{{$notification.type}}-input-clear" class="text-muted notifications-textinput-clear d-none"><i class="fa fa-times"></i></div> + <div id="cn-{{$notification.type}}-input-clear" class="text-muted notifications-textinput-clear d-none"><i class="bi bi-x-lg"></i></div> </div> {{/if}} {{/if}} |