diff options
| author | nobody <nobody@zotlabs.com> | 2021-08-25 19:13:31 -0700 |
|---|---|---|
| committer | nobody <nobody@zotlabs.com> | 2021-08-25 19:13:31 -0700 |
| commit | aa2106f9495bee4dcf0701fbd9fec8de6fa44984 (patch) | |
| tree | f2e7178f78311069bd54471f6c063c5901d16fb7 /view | |
| parent | 73b53675b1a339cfd950845279438e35b4e2dc7c (diff) | |
| parent | 6261d0826c49ca24df9f694931592fbb9bf60f7e (diff) | |
| download | volse-hubzilla-aa2106f9495bee4dcf0701fbd9fec8de6fa44984.tar.gz volse-hubzilla-aa2106f9495bee4dcf0701fbd9fec8de6fa44984.tar.bz2 volse-hubzilla-aa2106f9495bee4dcf0701fbd9fec8de6fa44984.zip | |
Merge branch 'dev' of https://framagit.org/hubzilla/core into dev
Diffstat (limited to 'view')
159 files changed, 2616 insertions, 2395 deletions
diff --git a/view/css/bootstrap-red.css b/view/css/bootstrap-red.css index 122bb5904..0e4b0e8e6 100644 --- a/view/css/bootstrap-red.css +++ b/view/css/bootstrap-red.css @@ -1,5 +1,12 @@ /* override some bootstrap settings */ +/* scroll-behavior smooth is behaving weird on mobile devices. */ +@media (prefers-reduced-motion: no-preference) { + :root { + scroll-behavior: unset; + } +} + /* nav overrides */ nav .badge { @@ -52,8 +59,24 @@ nav .dropdown-menu { .navbar-dark .navbar-toggler { color: rgba(255,255,255,1); } + +/* offcanvas */ +.offcanvas, +.modal-backdrop.fade { + transition: none; +} + +.offcanvas-end { + width: unset; + min-width: 250px; +} + /* nav overrides end */ label { font-weight: bold; } + +a { + text-decoration: none !important; +} diff --git a/view/css/mod_apps.css b/view/css/mod_apps.css index 62777bb39..ddf6d5c6b 100644 --- a/view/css/mod_apps.css +++ b/view/css/mod_apps.css @@ -10,3 +10,16 @@ text-overflow: ellipsis; margin: 10px 0px; } + +.app-icon { + display: table-cell; + table-layout: fixed; + vertical-align: top; +} + +.app-info { + display: table-cell; + table-layout: fixed; + vertical-align: top; + padding-left: 10px; +} diff --git a/view/js/main.js b/view/js/main.js index f427df8ad..68f3415ee 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 { @@ -159,13 +159,13 @@ $(document).ready(function() { let notify_id = $(this).data('notify_id'); let path = $(this)[0].pathname.split('/')[1]; let stateObj = { b64mid: b64mid }; - let singlethread_modules = ['display', 'hq', 'dm']; + let singlethread_modules = ['display', 'hq']; let redirect_modules = ['display', 'notify']; if(! b64mid && ! notify_id) return; - if(redirect_modules.indexOf(path) !== -1) { + if(localUser && redirect_modules.indexOf(path) !== -1) { path = 'hq'; } @@ -548,8 +548,10 @@ function markRead(notifType) { $('#nav-' + notifType + '-menu').html(''); $('#nav-' + notifType + '-sub').removeClass('show'); sessionStorage.removeItem('notification_open'); - sse_setNotificationsStatus(); + $(document).trigger('hz:sse_setNotificationsStatus'); }); + + } function markItemRead(itemId) { @@ -717,52 +719,18 @@ function updateConvItems(mode,data) { } } - // take care of the notifications count updates - var nmids = $(this).data('b64mids'); - - nmids.forEach(function(nmid, index) { - - sse_rmids.push(nmid); - - if($('.notification[data-b64mid=\'' + nmid + '\']').length) { - $('.notification[data-b64mid=\'' + nmid + '\']').each(function() { - var n = this.parentElement.id.split('-'); - return sse_updateNotifications(n[1], nmid); - }); - } - - // special handling for forum notifications - $('.notification-forum').filter(function() { - var fmids = decodeURIComponent($(this).data('b64mids')); - var n = this.parentElement.id.split('-'); - if(fmids.indexOf(nmid) > -1) { - var fcount = Number($('.' + n[1] + '-update').html()); - fcount--; - $('.' + n[1] + '-update').html(fcount); - if(fcount < 1) - $('.' + n[1] + '-button').fadeOut(); - - var count = Number($(this).find('.badge-secondary').html()); - count--; - $(this).find('.badge-secondary').html(count); - if(count < 1) - $(this).remove(); - } - }); - - - }); - - sse_setNotificationsStatus(); + $(document).trigger('hz:sse_setNotificationsStatus', [$(this).data('b64mids')]); }); $(window).scrollTop(scroll_position); - if(followUpPageLoad) - sse_bs_counts(); - else - sse_bs_init(); + if(followUpPageLoad) { + $(document).trigger('hz:sse_bs_counts'); + } + else { + $(document).trigger('hz:sse_bs_init'); + } if(commentBusy) { commentBusy = false; @@ -902,7 +870,7 @@ function updateInit() { liveUpdate(); } else { - sse_bs_init(); + $(document).trigger('hz:sse_bs_init'); } if($('#live-photos').length || $('#live-cards').length || $('#live-articles').length ) { @@ -1046,7 +1014,7 @@ function liveUpdate(notify_id) { //console.log('all images loaded, at least one is broken'); }) .progress( function( instance, image ) { - $('#image_counter').html(instance.progressedCount + '/' + instance.images.length); + $('#image_counter').html(Math.floor((instance.progressedCount*100)/instance.images.length) + '%'); //var result = image.isLoaded ? 'loaded' : 'broken'; //console.log( 'image is ' + result + ' for ' + image.img.src ); }); @@ -1237,7 +1205,7 @@ function doscroll(parent, hidden) { }); $('html, body').animate({scrollTop:(id.offset().top) - 50}, 'slow'); - $('<a href="javascript:doscrollback(' + pos + ');" id="back-to-reply" class="float-right" title="' + aStr['to_reply'] + '"><i class="fa fa-angle-double-down"> </i></a>').insertBefore('#wall-item-info-' + id.attr('id').replace(/\D/g,'')); + $('<a href="javascript:doscrollback(' + pos + ');" id="back-to-reply" class="float-end" title="' + aStr['to_reply'] + '"><i class="fa fa-angle-double-down"> </i></a>').insertBefore('#wall-item-info-' + id.attr('id').replace(/\D/g,'')); } function doscrollback(pos) { @@ -1262,7 +1230,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="float-right wall-item-pinned" title="' + aStr['pinned'] + '" id="wall-item-pinned-' + id + '"><i class="fa fa-thumb-tack"> </i></span>').insertBefore('#wall-item-info-' + id); + $('<span class="float-end wall-item-pinned" title="' + aStr['pinned'] + '" id="wall-item-pinned-' + id + '"><i class="fa fa-thumb-tack"> </i></span>').insertBefore('#wall-item-info-' + id); me.html(me.html().replace(aStr['pin_item'],aStr['unpin_item'])); }; }) diff --git a/view/js/mod_cloud.js b/view/js/mod_cloud.js index 5ca1f52a9..928ce8689 100644 --- a/view/js/mod_cloud.js +++ b/view/js/mod_cloud.js @@ -47,7 +47,7 @@ $(document).ready(function () { let id = $(this).data('id'); activate_id(id); $('#id_categories_' + id).tagsinput({ - tagClass: 'badge badge-pill badge-warning text-dark' + tagClass: 'badge rounded-pill bg-warning text-dark' }); $('#cloud-tool-categories-' + id).show(); }); @@ -278,7 +278,7 @@ $(document).ready(function () { disable_multi_acl(); $('#id_categories').tagsinput({ - tagClass: 'badge badge-pill badge-warning text-dark' + tagClass: 'badge rounded-pill bg-warning text-dark' }); $('#cloud-multi-tool-submit, #cloud-multi-tool-categories').show(); diff --git a/view/js/mod_photos.js b/view/js/mod_photos.js index 41b8ed560..1ce410a1b 100644 --- a/view/js/mod_photos.js +++ b/view/js/mod_photos.js @@ -8,24 +8,11 @@ $(document).ready(function() { UploadInit(); } - //$("#photo-edit-newtag").contact_autocomplete(baseurl + '/acl', 'a', false, function(data) { - //$("#photo-edit-newtag").val('@' + data.name); - //}); - $(".comment-edit-form textarea").editor_autocomplete(baseurl+"/acl?f=&n=1"); $('textarea').editor_autocomplete(baseurl+"/acl"); $('textarea').bbco_autocomplete('bbcode'); - showHideBodyTextarea(); - }); -function showHideBodyTextarea() { - if( $('#id_visible').is(':checked')) - $('#body-textarea').slideDown(); - else - $('#body-textarea').slideUp(); -} - // initialize function UploadInit() { diff --git a/view/pdl/mod_appman.pdl b/view/pdl/mod_appman.pdl index 8bd407372..ad8843890 100644 --- a/view/pdl/mod_appman.pdl +++ b/view/pdl/mod_appman.pdl @@ -1,5 +1,5 @@ [region=aside] -[widget=appcategories][/widget] +[widget=appstore][/widget] [/region] [region=right_aside] [widget=notifications][/widget] diff --git a/view/php/theme_init.php b/view/php/theme_init.php index bf34f210a..4aa695aeb 100644 --- a/view/php/theme_init.php +++ b/view/php/theme_init.php @@ -33,6 +33,7 @@ head_add_js('/library/colorbox/jquery.colorbox-min.js'); head_add_js('/library/jquery.AreYouSure/jquery.are-you-sure.js'); head_add_js('/library/tableofcontents/jquery.toc.js'); +head_add_js('/library/Sortable/Sortable.min.js'); head_add_js('/vendor/desandro/imagesloaded/imagesloaded.pkgd.min.js'); /** diff --git a/view/pl/cron_bad_eml.tpl b/view/pl/cron_bad_eml.tpl index 809499971..de717a977 100644 --- a/view/pl/cron_bad_eml.tpl +++ b/view/pl/cron_bad_eml.tpl @@ -3,9 +3,9 @@ Komunikat serwera WWW pod adresem {{$sitename}}; Rutynowa kontrola wskazuje, że zaplanowane zadania konserwacyjne na tym serwisie internetowym nie działają. Przejrzyj swoje zadania "cron" lub plik równoważnego mechanizmu w systemie operacyjnym i upewnij się, że mechanizm -ten jest uruchomiony. Proszę zapoznać się z instrukcjami w pliku INSTALLm jeśli +ten jest uruchomiony. Proszę zapoznać się z instrukcjami w pliku INSTALL.md, jeśli widzisz tą wiadomość po raz pierwszy. Jeśli te zadania konserwacyjne działały -do tej pory normalnie, sprawdź, czy coś mogło się nie udać, ponieważ nie obecnie +do tej pory normalnie, sprawdź, czy coś mogło się nie udać, ponieważ obecnie nie działają. Kontrola ta przeprowadzana jest mniej więcej co trzy dni. Komunikat błędu brzmi: '{{$error}}'. diff --git a/view/pl/hmessages.mo b/view/pl/hmessages.mo Binary files differindex 4dc55fd42..859809b88 100644 --- a/view/pl/hmessages.mo +++ b/view/pl/hmessages.mo diff --git a/view/pl/hmessages.po b/view/pl/hmessages.po index f9100f023..137395d56 100644 --- a/view/pl/hmessages.po +++ b/view/pl/hmessages.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: 5.7\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-06-12 02:13+0200\n" -"PO-Revision-Date: 2021-06-13 02:21+0200\n" +"POT-Creation-Date: 2021-08-01 02:30+0200\n" +"PO-Revision-Date: 2021-08-01 02:54+0200\n" "Last-Translator: Andrzej Budziński <astabski@gmail.com>\n" "Language-Team: \n" "Language: pl\n" @@ -153,7 +153,7 @@ msgid "Special - Group Repository" msgstr "Specjalne - repozytorium grupowe" #: ../../Zotlabs/Access/PermissionRoles.php:310 -#: ../../Zotlabs/Module/Cdav.php:1385 ../../Zotlabs/Module/Profiles.php:796 +#: ../../Zotlabs/Module/Cdav.php:1386 ../../Zotlabs/Module/Profiles.php:796 #: ../../Zotlabs/Module/Connedit.php:920 ../../include/selectors.php:60 #: ../../include/selectors.php:77 ../../include/selectors.php:115 #: ../../include/selectors.php:151 ../../include/connections.php:741 @@ -192,8 +192,8 @@ msgstr "Tryb niestandardowy/ekspercki" #: ../../Zotlabs/Module/Sharedwithme.php:19 #: ../../Zotlabs/Module/Editlayout.php:67 #: ../../Zotlabs/Module/Editlayout.php:90 ../../Zotlabs/Module/Manage.php:10 -#: ../../Zotlabs/Module/Item.php:506 ../../Zotlabs/Module/Item.php:525 -#: ../../Zotlabs/Module/Item.php:535 ../../Zotlabs/Module/Item.php:1446 +#: ../../Zotlabs/Module/Item.php:507 ../../Zotlabs/Module/Item.php:526 +#: ../../Zotlabs/Module/Item.php:536 ../../Zotlabs/Module/Item.php:1447 #: ../../Zotlabs/Module/Page.php:34 ../../Zotlabs/Module/Page.php:133 #: ../../Zotlabs/Module/Achievements.php:34 ../../Zotlabs/Module/Regmod.php:20 #: ../../Zotlabs/Module/Editblock.php:67 ../../Zotlabs/Module/Chat.php:113 @@ -225,7 +225,7 @@ msgstr "Tryb niestandardowy/ekspercki" #: ../../Zotlabs/Module/Attach_edit.php:106 #: ../../Zotlabs/Module/Settings.php:58 ../../Zotlabs/Module/Viewsrc.php:19 #: ../../Zotlabs/Web/WebServer.php:116 ../../Zotlabs/Lib/Chatroom.php:135 -#: ../../include/photos.php:27 ../../include/attach.php:156 +#: ../../include/photos.php:30 ../../include/attach.php:156 #: ../../include/attach.php:205 ../../include/attach.php:278 #: ../../include/attach.php:329 ../../include/attach.php:424 #: ../../include/attach.php:438 ../../include/attach.php:445 @@ -234,7 +234,7 @@ msgstr "Tryb niestandardowy/ekspercki" #: ../../include/items.php:3744 #: ../../extend/addon/hubzilla-addons/openid/Mod_Id.php:53 #: ../../extend/addon/hubzilla-addons/keepout/keepout.php:36 -#: ../../extend/addon/hubzilla-addons/mail/Mod_Mail.php:26 +#: ../../extend/addon/hubzilla-addons/mail/Mod_Mail.php:22 #: ../../extend/addon/hubzilla-addons/pumpio/pumpio.php:44 msgid "Permission denied." msgstr "Dostęp zabroniony." @@ -261,7 +261,6 @@ msgstr "Aplikacja Edytor PDL" #: ../../Zotlabs/Module/Invite.php:310 ../../Zotlabs/Module/Lang.php:20 #: ../../Zotlabs/Module/Lang.php:63 ../../Zotlabs/Module/Sources.php:88 #: ../../Zotlabs/Module/Poke.php:165 -#: ../../extend/addon/hubzilla-addons/gnusoc/Mod_Gnusoc.php:22 #: ../../extend/addon/hubzilla-addons/skeleton/Mod_Skeleton.php:32 #: ../../extend/addon/hubzilla-addons/redred/Mod_Redred.php:50 #: ../../extend/addon/hubzilla-addons/diaspora/Mod_Diaspora.php:58 @@ -391,14 +390,14 @@ msgstr "Układ systemowy" #: ../../extend/addon/hubzilla-addons/cart/cart.php:1376 #: ../../extend/addon/hubzilla-addons/cart/submodules/orderoptions.php:312 #: ../../extend/addon/hubzilla-addons/cart/submodules/orderoptions.php:412 -#: ../../extend/addon/hubzilla-addons/cart/submodules/hzservices.php:643 +#: ../../extend/addon/hubzilla-addons/cart/submodules/hzservices.php:644 #: ../../extend/addon/hubzilla-addons/cart/submodules/subscriptions.php:410 #: ../../extend/addon/hubzilla-addons/cart/submodules/manualcat.php:248 #: ../../extend/addon/hubzilla-addons/cart/Settings/Cart.php:132 #: ../../extend/addon/hubzilla-addons/cart/Settings/Cart.php:142 #: ../../extend/addon/hubzilla-addons/hzfiles/hzfiles.php:86 #: ../../extend/addon/hubzilla-addons/diaspora/Mod_Diaspora.php:102 -#: ../../extend/addon/hubzilla-addons/diaspora/diaspora.php:79 +#: ../../extend/addon/hubzilla-addons/diaspora/diaspora.php:84 #: ../../extend/addon/hubzilla-addons/openstreetmap/openstreetmap.php:155 #: ../../extend/addon/hubzilla-addons/ljpost/Mod_Ljpost.php:82 #: ../../extend/addon/hubzilla-addons/workflow/workflow.php:1461 @@ -424,8 +423,8 @@ msgstr "Układ systemowy" #: ../../extend/addon/hubzilla-addons/nofed/Mod_Nofed.php:53 #: ../../extend/addon/hubzilla-addons/content_import/Mod_content_import.php:142 #: ../../extend/addon/hubzilla-addons/pageheader/Mod_Pageheader.php:54 -#: ../../extend/addon/hubzilla-addons/mail/Mod_Mail.php:311 -#: ../../extend/addon/hubzilla-addons/openclipatar/openclipatar.php:53 +#: ../../extend/addon/hubzilla-addons/mail/Mod_Mail.php:206 +#: ../../extend/addon/hubzilla-addons/openclipatar/openclipatar.php:54 #: ../../extend/addon/hubzilla-addons/smileybutton/Mod_Smileybutton.php:55 #: ../../extend/addon/hubzilla-addons/rtof/Mod_Rtof.php:72 #: ../../extend/addon/hubzilla-addons/logrot/logrot.php:35 @@ -541,7 +540,7 @@ msgstr "Nieprawidłowy identyfikator profilu." msgid "Profile Visibility Editor" msgstr "Edytor widoczności profilu" -#: ../../Zotlabs/Module/Profperm.php:113 ../../Zotlabs/Lib/Apps.php:362 +#: ../../Zotlabs/Module/Profperm.php:113 ../../Zotlabs/Lib/Apps.php:363 #: ../../include/channel.php:1834 msgid "Profile" msgstr "Profil" @@ -629,7 +628,7 @@ msgstr "Strefa czasowa:" #: ../../Zotlabs/Module/Cdav.php:1015 ../../Zotlabs/Module/Appman.php:145 #: ../../Zotlabs/Module/Rbmark.php:100 #: ../../extend/addon/hubzilla-addons/rendezvous/rendezvous.php:173 -#: ../../extend/addon/hubzilla-addons/cart/submodules/hzservices.php:655 +#: ../../extend/addon/hubzilla-addons/cart/submodules/hzservices.php:656 #: ../../extend/addon/hubzilla-addons/cart/submodules/manualcat.php:260 msgid "Description" msgstr "Opis" @@ -686,11 +685,11 @@ msgstr "Więcej" msgid "Less" msgstr "Mniej" -#: ../../Zotlabs/Module/Cdav.php:1054 ../../Zotlabs/Module/Cdav.php:1389 +#: ../../Zotlabs/Module/Cdav.php:1054 ../../Zotlabs/Module/Cdav.php:1390 #: ../../Zotlabs/Module/Profiles.php:800 ../../Zotlabs/Module/Oauth.php:53 #: ../../Zotlabs/Module/Oauth.php:137 ../../Zotlabs/Module/Oauth2.php:58 #: ../../Zotlabs/Module/Oauth2.php:144 ../../Zotlabs/Module/Connedit.php:924 -#: ../../Zotlabs/Module/Admin/Addons.php:457 ../../Zotlabs/Lib/Apps.php:536 +#: ../../Zotlabs/Module/Admin/Addons.php:457 ../../Zotlabs/Lib/Apps.php:537 msgid "Update" msgstr "Zaktualizuj" @@ -707,7 +706,7 @@ msgstr "Kalendarze kanału" msgid "CalDAV Calendars" msgstr "Kalendarze CalDAV" -#: ../../Zotlabs/Module/Cdav.php:1057 ../../Zotlabs/Module/Cdav.php:1390 +#: ../../Zotlabs/Module/Cdav.php:1057 ../../Zotlabs/Module/Cdav.php:1391 #: ../../Zotlabs/Module/Webpages.php:256 ../../Zotlabs/Module/Profiles.php:801 #: ../../Zotlabs/Module/Oauth.php:174 ../../Zotlabs/Module/Card_edit.php:130 #: ../../Zotlabs/Module/Oauth2.php:195 ../../Zotlabs/Module/Blocks.php:162 @@ -720,9 +719,9 @@ msgstr "Kalendarze CalDAV" #: ../../Zotlabs/Module/Admin/Accounts.php:320 #: ../../Zotlabs/Module/Admin/Channels.php:149 #: ../../Zotlabs/Module/Admin/Profs.php:176 ../../Zotlabs/Module/Thing.php:269 -#: ../../Zotlabs/Storage/Browser.php:384 ../../Zotlabs/Lib/Apps.php:558 +#: ../../Zotlabs/Storage/Browser.php:384 ../../Zotlabs/Lib/Apps.php:559 #: ../../Zotlabs/Lib/ThreadItem.php:171 ../../include/conversation.php:730 -#: ../../include/conversation.php:777 +#: ../../include/conversation.php:784 msgid "Delete" msgstr "Usuń" @@ -730,7 +729,7 @@ msgstr "Usuń" msgid "Delete all" msgstr "Usuń wszystko" -#: ../../Zotlabs/Module/Cdav.php:1059 ../../Zotlabs/Module/Cdav.php:1391 +#: ../../Zotlabs/Module/Cdav.php:1059 ../../Zotlabs/Module/Cdav.php:1392 #: ../../Zotlabs/Module/Filer.php:56 ../../Zotlabs/Module/Profiles.php:802 #: ../../Zotlabs/Module/Oauth.php:112 ../../Zotlabs/Module/Oauth.php:138 #: ../../Zotlabs/Module/Card_edit.php:132 ../../Zotlabs/Module/Oauth2.php:117 @@ -745,14 +744,14 @@ msgstr "Usuń wszystko" #: ../../Zotlabs/Module/Article_edit.php:130 #: ../../Zotlabs/Module/Admin/Addons.php:427 #: ../../Zotlabs/Module/Cover_photo.php:428 -#: ../../Zotlabs/Storage/Browser.php:383 ../../include/conversation.php:1455 -#: ../../include/conversation.php:1510 +#: ../../Zotlabs/Storage/Browser.php:383 ../../include/conversation.php:1464 +#: ../../include/conversation.php:1519 #: ../../extend/addon/hubzilla-addons/hsse/hsse.php:209 #: ../../extend/addon/hubzilla-addons/hsse/hsse.php:258 msgid "Cancel" msgstr "Anuluj" -#: ../../Zotlabs/Module/Cdav.php:1060 ../../Zotlabs/Module/Cdav.php:1388 +#: ../../Zotlabs/Module/Cdav.php:1060 ../../Zotlabs/Module/Cdav.php:1389 #: ../../Zotlabs/Module/Webpages.php:253 ../../Zotlabs/Module/Profiles.php:799 #: ../../Zotlabs/Module/Layouts.php:185 #: ../../Zotlabs/Module/New_channel.php:189 ../../Zotlabs/Module/Blocks.php:159 @@ -768,7 +767,13 @@ msgstr "" "Przepraszamy! Edycja powtarzających się wydarzeń nie została jeszcze " "zaimplementowana." -#: ../../Zotlabs/Module/Cdav.php:1071 ../../Zotlabs/Storage/Browser.php:293 +#: ../../Zotlabs/Module/Cdav.php:1062 +msgid "" +"Could not fetch calendar resource. The selected calendar might be disabled." +msgstr "" +"Nie udało się pobrać zasobu kalendarza. Wybrany kalendarz może być wyłączony." + +#: ../../Zotlabs/Module/Cdav.php:1072 ../../Zotlabs/Storage/Browser.php:293 #: ../../Zotlabs/Storage/Browser.php:388 ../../Zotlabs/Storage/Browser.php:403 #: ../../Zotlabs/Widget/Appcategories.php:43 #: ../../include/contact_widgets.php:112 ../../include/contact_widgets.php:156 @@ -778,7 +783,7 @@ msgstr "" msgid "Categories" msgstr "Kategorie" -#: ../../Zotlabs/Module/Cdav.php:1373 ../../Zotlabs/Module/Group.php:155 +#: ../../Zotlabs/Module/Cdav.php:1374 ../../Zotlabs/Module/Group.php:155 #: ../../Zotlabs/Module/Oauth.php:113 ../../Zotlabs/Module/Oauth.php:139 #: ../../Zotlabs/Module/Oauth2.php:118 ../../Zotlabs/Module/Oauth2.php:146 #: ../../Zotlabs/Module/Wiki.php:217 ../../Zotlabs/Module/Connedit.php:908 @@ -791,22 +796,22 @@ msgstr "Kategorie" msgid "Name" msgstr "Nazwa" -#: ../../Zotlabs/Module/Cdav.php:1374 ../../Zotlabs/Module/Connedit.php:909 +#: ../../Zotlabs/Module/Cdav.php:1375 ../../Zotlabs/Module/Connedit.php:909 msgid "Organisation" msgstr "Organizacja" -#: ../../Zotlabs/Module/Cdav.php:1375 ../../Zotlabs/Module/Connedit.php:910 +#: ../../Zotlabs/Module/Cdav.php:1376 ../../Zotlabs/Module/Connedit.php:910 #: ../../extend/addon/hubzilla-addons/workflow/workflow.php:2617 #: ../../extend/addon/hubzilla-addons/workflow/workflow.php:2678 msgid "Title" msgstr "Tytuł" -#: ../../Zotlabs/Module/Cdav.php:1376 ../../Zotlabs/Module/Profiles.php:787 +#: ../../Zotlabs/Module/Cdav.php:1377 ../../Zotlabs/Module/Profiles.php:787 #: ../../Zotlabs/Module/Connedit.php:911 msgid "Phone" msgstr "Numer telefonu" -#: ../../Zotlabs/Module/Cdav.php:1377 ../../Zotlabs/Module/Profiles.php:788 +#: ../../Zotlabs/Module/Cdav.php:1378 ../../Zotlabs/Module/Profiles.php:788 #: ../../Zotlabs/Module/Connedit.php:912 #: ../../Zotlabs/Module/Admin/Accounts.php:316 #: ../../Zotlabs/Module/Admin/Accounts.php:330 ../../include/network.php:1743 @@ -817,90 +822,91 @@ msgstr "Numer telefonu" msgid "Email" msgstr "Adres e-mail" -#: ../../Zotlabs/Module/Cdav.php:1378 ../../Zotlabs/Module/Profiles.php:789 +#: ../../Zotlabs/Module/Cdav.php:1379 ../../Zotlabs/Module/Profiles.php:789 #: ../../Zotlabs/Module/Connedit.php:913 msgid "Instant messenger" msgstr "Komunikator internetowy" -#: ../../Zotlabs/Module/Cdav.php:1379 ../../Zotlabs/Module/Profiles.php:790 +#: ../../Zotlabs/Module/Cdav.php:1380 ../../Zotlabs/Module/Profiles.php:790 #: ../../Zotlabs/Module/Connedit.php:914 msgid "Website" msgstr "Strona internetowa" -#: ../../Zotlabs/Module/Cdav.php:1380 ../../Zotlabs/Module/Profiles.php:504 +#: ../../Zotlabs/Module/Cdav.php:1381 ../../Zotlabs/Module/Profiles.php:504 #: ../../Zotlabs/Module/Profiles.php:791 ../../Zotlabs/Module/Locs.php:127 #: ../../Zotlabs/Module/Connedit.php:915 #: ../../Zotlabs/Module/Admin/Channels.php:160 msgid "Address" msgstr "Adres" -#: ../../Zotlabs/Module/Cdav.php:1381 ../../Zotlabs/Module/Profiles.php:792 +#: ../../Zotlabs/Module/Cdav.php:1382 ../../Zotlabs/Module/Profiles.php:792 #: ../../Zotlabs/Module/Connedit.php:916 msgid "Note" msgstr "Notatka" -#: ../../Zotlabs/Module/Cdav.php:1382 ../../Zotlabs/Module/Profiles.php:793 +#: ../../Zotlabs/Module/Cdav.php:1383 ../../Zotlabs/Module/Profiles.php:793 #: ../../Zotlabs/Module/Connedit.php:917 ../../include/connections.php:734 #: ../../include/event.php:1422 msgid "Mobile" msgstr "Komórka" -#: ../../Zotlabs/Module/Cdav.php:1383 ../../Zotlabs/Module/Profiles.php:794 -#: ../../Zotlabs/Module/Connedit.php:918 ../../include/connections.php:735 +#: ../../Zotlabs/Module/Cdav.php:1384 ../../Zotlabs/Module/Profiles.php:794 +#: ../../Zotlabs/Module/Connedit.php:918 +#: ../../Zotlabs/Widget/Notifications.php:36 ../../include/connections.php:735 #: ../../include/event.php:1423 msgid "Home" msgstr "Domowy" -#: ../../Zotlabs/Module/Cdav.php:1384 ../../Zotlabs/Module/Profiles.php:795 +#: ../../Zotlabs/Module/Cdav.php:1385 ../../Zotlabs/Module/Profiles.php:795 #: ../../Zotlabs/Module/Connedit.php:919 ../../include/connections.php:738 #: ../../include/event.php:1426 msgid "Work" msgstr "Praca" -#: ../../Zotlabs/Module/Cdav.php:1386 ../../Zotlabs/Module/Profiles.php:797 +#: ../../Zotlabs/Module/Cdav.php:1387 ../../Zotlabs/Module/Profiles.php:797 #: ../../Zotlabs/Module/Connedit.php:921 msgid "Add Contact" msgstr "Dodaj kontakt" -#: ../../Zotlabs/Module/Cdav.php:1387 ../../Zotlabs/Module/Profiles.php:798 +#: ../../Zotlabs/Module/Cdav.php:1388 ../../Zotlabs/Module/Profiles.php:798 #: ../../Zotlabs/Module/Connedit.php:922 msgid "Add Field" msgstr "Dodaj pole" -#: ../../Zotlabs/Module/Cdav.php:1392 ../../Zotlabs/Module/Connedit.php:927 +#: ../../Zotlabs/Module/Cdav.php:1393 ../../Zotlabs/Module/Connedit.php:927 msgid "P.O. Box" msgstr "Skrytka pocztowa" -#: ../../Zotlabs/Module/Cdav.php:1393 ../../Zotlabs/Module/Connedit.php:928 +#: ../../Zotlabs/Module/Cdav.php:1394 ../../Zotlabs/Module/Connedit.php:928 msgid "Additional" msgstr "Dodatkowe informacje" -#: ../../Zotlabs/Module/Cdav.php:1394 ../../Zotlabs/Module/Connedit.php:929 +#: ../../Zotlabs/Module/Cdav.php:1395 ../../Zotlabs/Module/Connedit.php:929 msgid "Street" msgstr "Ulica" -#: ../../Zotlabs/Module/Cdav.php:1395 ../../Zotlabs/Module/Connedit.php:930 +#: ../../Zotlabs/Module/Cdav.php:1396 ../../Zotlabs/Module/Connedit.php:930 msgid "Locality" msgstr "Miejscowość" -#: ../../Zotlabs/Module/Cdav.php:1396 ../../Zotlabs/Module/Connedit.php:931 +#: ../../Zotlabs/Module/Cdav.php:1397 ../../Zotlabs/Module/Connedit.php:931 msgid "Region" msgstr "Region" -#: ../../Zotlabs/Module/Cdav.php:1397 ../../Zotlabs/Module/Connedit.php:932 +#: ../../Zotlabs/Module/Cdav.php:1398 ../../Zotlabs/Module/Connedit.php:932 msgid "ZIP Code" msgstr "Kod pocztowy" -#: ../../Zotlabs/Module/Cdav.php:1398 ../../Zotlabs/Module/Profiles.php:758 +#: ../../Zotlabs/Module/Cdav.php:1399 ../../Zotlabs/Module/Profiles.php:758 #: ../../Zotlabs/Module/Connedit.php:933 msgid "Country" msgstr "Państwo" -#: ../../Zotlabs/Module/Cdav.php:1457 +#: ../../Zotlabs/Module/Cdav.php:1458 msgid "Default Calendar" msgstr "Domyślny kalendarz" -#: ../../Zotlabs/Module/Cdav.php:1468 +#: ../../Zotlabs/Module/Cdav.php:1469 msgid "Default Addressbook" msgstr "Domyślna książka adresowa" @@ -942,9 +948,7 @@ msgstr "" #: ../../Zotlabs/Storage/Browser.php:312 ../../Zotlabs/Storage/Browser.php:389 #: ../../Zotlabs/Storage/Browser.php:391 ../../Zotlabs/Storage/Browser.php:552 #: ../../Zotlabs/Lib/Libzotdir.php:165 ../../Zotlabs/Lib/Libzotdir.php:166 -#: ../../Zotlabs/Lib/Libzotdir.php:168 ../../include/conversation.php:1463 -#: ../../include/dir_fns.php:144 ../../include/dir_fns.php:145 -#: ../../include/dir_fns.php:146 +#: ../../Zotlabs/Lib/Libzotdir.php:168 ../../include/conversation.php:1472 #: ../../extend/addon/hubzilla-addons/channelreputation/channelreputation.php:111 #: ../../extend/addon/hubzilla-addons/redred/Mod_Redred.php:63 #: ../../extend/addon/hubzilla-addons/cart/cart.php:1370 @@ -953,9 +957,9 @@ msgstr "" #: ../../extend/addon/hubzilla-addons/cart/submodules/orderoptions.php:361 #: ../../extend/addon/hubzilla-addons/cart/submodules/orderoptions.php:437 #: ../../extend/addon/hubzilla-addons/cart/submodules/orderoptions.php:461 -#: ../../extend/addon/hubzilla-addons/cart/submodules/hzservices.php:65 -#: ../../extend/addon/hubzilla-addons/cart/submodules/hzservices.php:649 -#: ../../extend/addon/hubzilla-addons/cart/submodules/hzservices.php:653 +#: ../../extend/addon/hubzilla-addons/cart/submodules/hzservices.php:66 +#: ../../extend/addon/hubzilla-addons/cart/submodules/hzservices.php:650 +#: ../../extend/addon/hubzilla-addons/cart/submodules/hzservices.php:654 #: ../../extend/addon/hubzilla-addons/cart/submodules/subscriptions.php:153 #: ../../extend/addon/hubzilla-addons/cart/submodules/subscriptions.php:425 #: ../../extend/addon/hubzilla-addons/cart/submodules/paypalbuttonV2.php:88 @@ -994,7 +998,7 @@ msgstr "" #: ../../extend/addon/hubzilla-addons/pumpio/Mod_Pumpio.php:98 #: ../../extend/addon/hubzilla-addons/pumpio/Mod_Pumpio.php:102 #: ../../view/theme/redbasic/php/config.php:99 -#: ../../view/theme/redbasic/php/config.php:116 ../../boot.php:1725 +#: ../../view/theme/redbasic/php/config.php:116 ../../boot.php:1726 msgid "Yes" msgstr "Tak" @@ -1016,9 +1020,7 @@ msgstr "Tak" #: ../../Zotlabs/Storage/Browser.php:312 ../../Zotlabs/Storage/Browser.php:389 #: ../../Zotlabs/Storage/Browser.php:391 ../../Zotlabs/Storage/Browser.php:552 #: ../../Zotlabs/Lib/Libzotdir.php:165 ../../Zotlabs/Lib/Libzotdir.php:166 -#: ../../Zotlabs/Lib/Libzotdir.php:168 ../../include/conversation.php:1463 -#: ../../include/dir_fns.php:144 ../../include/dir_fns.php:145 -#: ../../include/dir_fns.php:146 +#: ../../Zotlabs/Lib/Libzotdir.php:168 ../../include/conversation.php:1472 #: ../../extend/addon/hubzilla-addons/channelreputation/channelreputation.php:111 #: ../../extend/addon/hubzilla-addons/redred/Mod_Redred.php:63 #: ../../extend/addon/hubzilla-addons/cart/cart.php:1370 @@ -1027,9 +1029,9 @@ msgstr "Tak" #: ../../extend/addon/hubzilla-addons/cart/submodules/orderoptions.php:362 #: ../../extend/addon/hubzilla-addons/cart/submodules/orderoptions.php:438 #: ../../extend/addon/hubzilla-addons/cart/submodules/orderoptions.php:462 -#: ../../extend/addon/hubzilla-addons/cart/submodules/hzservices.php:65 -#: ../../extend/addon/hubzilla-addons/cart/submodules/hzservices.php:649 -#: ../../extend/addon/hubzilla-addons/cart/submodules/hzservices.php:653 +#: ../../extend/addon/hubzilla-addons/cart/submodules/hzservices.php:66 +#: ../../extend/addon/hubzilla-addons/cart/submodules/hzservices.php:650 +#: ../../extend/addon/hubzilla-addons/cart/submodules/hzservices.php:654 #: ../../extend/addon/hubzilla-addons/cart/submodules/subscriptions.php:153 #: ../../extend/addon/hubzilla-addons/cart/submodules/subscriptions.php:425 #: ../../extend/addon/hubzilla-addons/cart/submodules/paypalbuttonV2.php:88 @@ -1068,7 +1070,7 @@ msgstr "Tak" #: ../../extend/addon/hubzilla-addons/pumpio/Mod_Pumpio.php:98 #: ../../extend/addon/hubzilla-addons/pumpio/Mod_Pumpio.php:102 #: ../../view/theme/redbasic/php/config.php:99 -#: ../../view/theme/redbasic/php/config.php:116 ../../boot.php:1725 +#: ../../view/theme/redbasic/php/config.php:116 ../../boot.php:1726 msgid "No" msgstr "Nie" @@ -1093,7 +1095,7 @@ msgstr "lub wybierz istniejący folder (kliknij dwukrotnie)" #: ../../Zotlabs/Module/Admin/Profs.php:114 #: ../../Zotlabs/Module/Articles.php:117 ../../Zotlabs/Module/Rbmark.php:31 #: ../../Zotlabs/Module/Rbmark.php:103 ../../Zotlabs/Widget/Notes.php:23 -#: ../../include/text.php:1145 ../../include/text.php:1157 +#: ../../include/text.php:1146 ../../include/text.php:1158 #: ../../extend/addon/hubzilla-addons/queueworker/Mod_Queueworker.php:116 msgid "Save" msgstr "Zapisz" @@ -1106,7 +1108,7 @@ msgstr "Zapisz do folderu" msgid "Documentation Search" msgstr "Przeszukaj dokumentację" -#: ../../Zotlabs/Module/Help.php:83 ../../include/nav.php:434 +#: ../../Zotlabs/Module/Help.php:83 ../../include/nav.php:438 msgid "About" msgstr "O platformie" @@ -1190,8 +1192,8 @@ msgstr "Eksportuj elementy strony internetowej" msgid "Export selected" msgstr "Eksportuj wybrane" -#: ../../Zotlabs/Module/Webpages.php:251 ../../Zotlabs/Lib/Apps.php:341 -#: ../../include/nav.php:524 +#: ../../Zotlabs/Module/Webpages.php:251 ../../Zotlabs/Lib/Apps.php:342 +#: ../../include/nav.php:528 msgid "Webpages" msgstr "Strony internetowe" @@ -1207,7 +1209,7 @@ msgstr "Strony internetowe" #: ../../Zotlabs/Module/Editwebpage.php:142 #: ../../Zotlabs/Module/Article_edit.php:97 #: ../../Zotlabs/Module/Admin/Profs.php:175 ../../Zotlabs/Module/Thing.php:268 -#: ../../Zotlabs/Module/Menu.php:176 ../../Zotlabs/Lib/Apps.php:557 +#: ../../Zotlabs/Module/Menu.php:176 ../../Zotlabs/Lib/Apps.php:558 #: ../../Zotlabs/Lib/ThreadItem.php:149 ../../Zotlabs/Widget/Cdav.php:138 #: ../../Zotlabs/Widget/Cdav.php:175 ../../include/channel.php:1486 #: ../../include/channel.php:1490 ../../include/menu.php:120 @@ -1217,7 +1219,7 @@ msgstr "Edytuj" #: ../../Zotlabs/Module/Webpages.php:255 ../../Zotlabs/Module/Layouts.php:194 #: ../../Zotlabs/Module/Wiki.php:300 ../../Zotlabs/Module/Blocks.php:161 #: ../../Zotlabs/Module/Photos.php:1078 ../../Zotlabs/Widget/Cdav.php:136 -#: ../../include/conversation.php:1432 +#: ../../include/conversation.php:1441 #: ../../extend/addon/hubzilla-addons/hsse/hsse.php:186 msgid "Share" msgstr "Udostępnij" @@ -1229,7 +1231,7 @@ msgid "View" msgstr "Widok" #: ../../Zotlabs/Module/Webpages.php:261 ../../Zotlabs/Module/Photos.php:1099 -#: ../../Zotlabs/Lib/ThreadItem.php:837 ../../include/conversation.php:1399 +#: ../../Zotlabs/Lib/ThreadItem.php:837 ../../include/conversation.php:1408 #: ../../extend/addon/hubzilla-addons/hsse/hsse.php:153 msgid "Preview" msgstr "Podgląd" @@ -1725,38 +1727,38 @@ msgid "Previous action reversed." msgstr "Poprzednia czynność została cofnięta." #: ../../Zotlabs/Module/Like.php:439 ../../Zotlabs/Module/Tagger.php:71 -#: ../../Zotlabs/Module/Subthread.php:115 ../../Zotlabs/Lib/Activity.php:3248 -#: ../../include/conversation.php:128 ../../include/text.php:2236 -#: ../../extend/addon/hubzilla-addons/diaspora/Receiver.php:1649 -#: ../../extend/addon/hubzilla-addons/pubcrawl/as.php:2111 +#: ../../Zotlabs/Module/Subthread.php:115 ../../Zotlabs/Lib/Activity.php:3252 +#: ../../include/conversation.php:128 ../../include/text.php:2251 +#: ../../extend/addon/hubzilla-addons/diaspora/Receiver.php:1621 +#: ../../extend/addon/hubzilla-addons/pubcrawl/as.php:1926 #: ../../extend/addon/hubzilla-addons/redphotos/redphotohelper.php:71 msgid "photo" msgstr "zdjecie" #: ../../Zotlabs/Module/Like.php:439 ../../Zotlabs/Module/Subthread.php:115 -#: ../../extend/addon/hubzilla-addons/diaspora/Receiver.php:1649 -#: ../../extend/addon/hubzilla-addons/pubcrawl/as.php:2111 +#: ../../extend/addon/hubzilla-addons/diaspora/Receiver.php:1621 +#: ../../extend/addon/hubzilla-addons/pubcrawl/as.php:1926 msgid "status" msgstr "stan" #: ../../Zotlabs/Module/Like.php:441 ../../Zotlabs/Module/Tagger.php:75 #: ../../Zotlabs/Module/Channel_calendar.php:221 -#: ../../include/conversation.php:132 ../../include/text.php:2239 +#: ../../include/conversation.php:132 ../../include/text.php:2254 #: ../../include/event.php:1259 msgid "event" msgstr "wydarzenie" -#: ../../Zotlabs/Module/Like.php:471 ../../Zotlabs/Lib/Activity.php:3281 +#: ../../Zotlabs/Module/Like.php:471 ../../Zotlabs/Lib/Activity.php:3285 #: ../../include/conversation.php:174 -#: ../../extend/addon/hubzilla-addons/diaspora/Receiver.php:1595 -#: ../../extend/addon/hubzilla-addons/pubcrawl/as.php:2148 +#: ../../extend/addon/hubzilla-addons/diaspora/Receiver.php:1567 +#: ../../extend/addon/hubzilla-addons/pubcrawl/as.php:1963 #, php-format msgid "%1$s likes %2$s's %3$s" msgstr "%1$s pochwalił %3$s %2$s" -#: ../../Zotlabs/Module/Like.php:473 ../../Zotlabs/Lib/Activity.php:3283 +#: ../../Zotlabs/Module/Like.php:473 ../../Zotlabs/Lib/Activity.php:3287 #: ../../include/conversation.php:177 -#: ../../extend/addon/hubzilla-addons/pubcrawl/as.php:2150 +#: ../../extend/addon/hubzilla-addons/pubcrawl/as.php:1965 #, php-format msgid "%1$s doesn't like %2$s's %3$s" msgstr "%1$s zganił %3$s %2$s" @@ -1777,19 +1779,19 @@ msgid "%1$s abstains from a decision on %2$s's %3$s" msgstr "%1$s wstrzymuje się od decyzji w sprawie %3$s dla %2$s" #: ../../Zotlabs/Module/Like.php:481 -#: ../../extend/addon/hubzilla-addons/diaspora/Receiver.php:2226 +#: ../../extend/addon/hubzilla-addons/diaspora/Receiver.php:2200 #, php-format msgid "%1$s is attending %2$s's %3$s" msgstr "%1$s jest uczestnikiem %3$s %2$s" #: ../../Zotlabs/Module/Like.php:483 -#: ../../extend/addon/hubzilla-addons/diaspora/Receiver.php:2228 +#: ../../extend/addon/hubzilla-addons/diaspora/Receiver.php:2202 #, php-format msgid "%1$s is not attending %2$s's %3$s" msgstr "%1$s nie jest uczestnikiem %3$s %2$s" #: ../../Zotlabs/Module/Like.php:485 -#: ../../extend/addon/hubzilla-addons/diaspora/Receiver.php:2230 +#: ../../extend/addon/hubzilla-addons/diaspora/Receiver.php:2204 #, php-format msgid "%1$s may attend %2$s's %3$s" msgstr "%1$s może być uczestnikiem %3$s %2$s" @@ -1811,7 +1813,7 @@ msgstr "Brak dostępu do rekordu kontaktu." #: ../../extend/addon/hubzilla-addons/msgfooter/msgfooter.php:54 #: ../../extend/addon/hubzilla-addons/piwik/piwik.php:116 #: ../../extend/addon/hubzilla-addons/rendezvous/rendezvous.php:82 -#: ../../extend/addon/hubzilla-addons/diaspora/diaspora.php:97 +#: ../../extend/addon/hubzilla-addons/diaspora/diaspora.php:102 #: ../../extend/addon/hubzilla-addons/openstreetmap/openstreetmap.php:171 #: ../../extend/addon/hubzilla-addons/xmpp/xmpp.php:54 #: ../../extend/addon/hubzilla-addons/twitter/twitter.php:487 @@ -1850,8 +1852,8 @@ msgstr "Rola uprawnień" #: ../../Zotlabs/Module/Defperms.php:257 #: ../../Zotlabs/Module/New_channel.php:157 #: ../../Zotlabs/Module/New_channel.php:164 -#: ../../Zotlabs/Module/Connedit.php:854 -#: ../../Zotlabs/Widget/Notifications.php:167 ../../include/nav.php:324 +#: ../../Zotlabs/Module/Connedit.php:854 ../../Zotlabs/Widget/Messages.php:27 +#: ../../Zotlabs/Widget/Notifications.php:166 ../../include/nav.php:324 msgid "Loading" msgstr "Ładowanie" @@ -1903,11 +1905,11 @@ msgstr "Nazwa układu" msgid "Layout Description (Optional)" msgstr "Opis układu (opcjonalnie)" -#: ../../Zotlabs/Module/Layouts.php:184 ../../include/text.php:2675 +#: ../../Zotlabs/Module/Layouts.php:184 ../../include/text.php:2690 msgid "Layouts" msgstr "Układy" -#: ../../Zotlabs/Module/Layouts.php:186 ../../Zotlabs/Lib/Apps.php:348 +#: ../../Zotlabs/Module/Layouts.php:186 ../../Zotlabs/Lib/Apps.php:349 #: ../../include/nav.php:180 ../../include/nav.php:320 #: ../../include/help.php:118 ../../include/help.php:126 msgid "Help" @@ -1934,21 +1936,21 @@ msgid "The unmoderated public stream of this hub" msgstr "Niemoderowany strumień publiczny tego portalu" #: ../../Zotlabs/Module/Pubstream.php:95 ../../Zotlabs/Module/Display.php:76 -#: ../../Zotlabs/Module/Channel.php:269 ../../Zotlabs/Module/Hq.php:125 +#: ../../Zotlabs/Module/Channel.php:269 ../../Zotlabs/Module/Hq.php:113 #: ../../Zotlabs/Module/Network.php:209 msgid "Reset form" msgstr "Resetuj formularz" -#: ../../Zotlabs/Module/Pubstream.php:105 ../../Zotlabs/Lib/Apps.php:375 +#: ../../Zotlabs/Module/Pubstream.php:105 ../../Zotlabs/Lib/Apps.php:376 #: ../../Zotlabs/Widget/Notifications.php:147 msgid "Public Stream" msgstr "Strumień publiczny" -#: ../../Zotlabs/Module/Sse_bs.php:569 +#: ../../Zotlabs/Module/Sse_bs.php:572 msgid "Private forum" msgstr "Prywatne forum" -#: ../../Zotlabs/Module/Sse_bs.php:569 +#: ../../Zotlabs/Module/Sse_bs.php:572 msgid "Public forum" msgstr "Publiczne forum" @@ -1978,7 +1980,7 @@ msgid "Management of privacy groups" msgstr "Zarządzanie grupami prywatności" #: ../../Zotlabs/Module/Group.php:142 ../../Zotlabs/Module/Group.php:154 -#: ../../Zotlabs/Lib/Group.php:324 ../../Zotlabs/Lib/Apps.php:364 +#: ../../Zotlabs/Lib/Group.php:324 ../../Zotlabs/Lib/Apps.php:365 #: ../../Zotlabs/Widget/Activity_filter.php:88 ../../include/group.php:327 #: ../../include/acl_selectors.php:87 ../../include/nav.php:104 msgid "Privacy Groups" @@ -2061,7 +2063,7 @@ msgid "Please enter your password for verification:" msgstr "Wprowadź hasło do weryfikacji:" #: ../../Zotlabs/Module/Removeme.php:64 -#: ../../Zotlabs/Module/Settings/Channel.php:596 +#: ../../Zotlabs/Module/Settings/Channel.php:597 msgid "Remove Channel" msgstr "Usuń kanał" @@ -2261,20 +2263,20 @@ msgstr "Nie można ponownie wysłać weryfikacyjną wiadomość e-mail." msgid "Public access denied." msgstr "Odmowa dostępu publicznego." -#: ../../Zotlabs/Module/Search.php:45 ../../Zotlabs/Module/Connections.php:379 -#: ../../Zotlabs/Lib/Apps.php:353 ../../Zotlabs/Widget/Sitesearch.php:31 -#: ../../Zotlabs/Widget/Activity_filter.php:203 ../../include/text.php:1144 -#: ../../include/text.php:1156 ../../include/acl_selectors.php:149 +#: ../../Zotlabs/Module/Search.php:44 ../../Zotlabs/Module/Connections.php:379 +#: ../../Zotlabs/Lib/Apps.php:354 ../../Zotlabs/Widget/Sitesearch.php:31 +#: ../../Zotlabs/Widget/Activity_filter.php:203 ../../include/text.php:1145 +#: ../../include/text.php:1157 ../../include/acl_selectors.php:149 #: ../../include/nav.php:194 msgid "Search" msgstr "Szukaj" -#: ../../Zotlabs/Module/Search.php:250 +#: ../../Zotlabs/Module/Search.php:249 #, php-format msgid "Items tagged with: %s" msgstr "Elementy oznaczone jako: %s" -#: ../../Zotlabs/Module/Search.php:252 +#: ../../Zotlabs/Module/Search.php:251 #, php-format msgid "Search results for: %s" msgstr "Wyniki wyszukiwania dla: %s" @@ -2315,14 +2317,14 @@ msgstr "przełącz na tryb pełnego ekranu" msgid "Post not found." msgstr "Nie znaleziono wpisu." -#: ../../Zotlabs/Module/Tagger.php:79 ../../Zotlabs/Lib/Activity.php:3248 -#: ../../include/conversation.php:158 ../../include/text.php:2242 +#: ../../Zotlabs/Module/Tagger.php:79 ../../Zotlabs/Lib/Activity.php:3252 +#: ../../include/conversation.php:158 ../../include/text.php:2257 #: ../../include/markdown.php:205 ../../include/bbcode.php:555 msgid "post" msgstr "wpis" #: ../../Zotlabs/Module/Tagger.php:81 ../../include/conversation.php:160 -#: ../../include/text.php:2244 +#: ../../include/text.php:2259 msgid "comment" msgstr "komentarz" @@ -2601,10 +2603,9 @@ msgstr "Nie znaleziono elementu" #: ../../Zotlabs/Module/Card_edit.php:101 #: ../../Zotlabs/Module/Editblock.php:116 ../../Zotlabs/Module/Chat.php:220 #: ../../Zotlabs/Module/Editwebpage.php:143 -#: ../../Zotlabs/Module/Article_edit.php:99 ../../include/conversation.php:1340 +#: ../../Zotlabs/Module/Article_edit.php:99 ../../include/conversation.php:1348 #: ../../extend/addon/hubzilla-addons/hsse/hsse.php:95 -#: ../../extend/addon/hubzilla-addons/mail/Mod_Mail.php:167 -#: ../../extend/addon/hubzilla-addons/mail/Mod_Mail.php:310 +#: ../../extend/addon/hubzilla-addons/mail/Mod_Mail.php:205 msgid "Insert web link" msgstr "Wstaw link internetowy" @@ -2612,7 +2613,7 @@ msgstr "Wstaw link internetowy" #: ../../Zotlabs/Module/Editblock.php:129 ../../Zotlabs/Module/Photos.php:674 #: ../../Zotlabs/Module/Photos.php:1044 #: ../../Zotlabs/Module/Article_edit.php:116 -#: ../../include/conversation.php:1472 +#: ../../include/conversation.php:1481 #: ../../extend/addon/hubzilla-addons/hsse/hsse.php:221 msgid "Title (optional)" msgstr "Tytuł (opcjonalnie)" @@ -2626,27 +2627,27 @@ msgid "No connections." msgstr "Brak połączeń." #: ../../Zotlabs/Module/Viewconnections.php:80 -#: ../../Zotlabs/Module/Connections.php:289 ../../include/text.php:1038 +#: ../../Zotlabs/Module/Connections.php:289 ../../include/text.php:1039 msgid "Accepts" msgstr "Akceptacje" #: ../../Zotlabs/Module/Viewconnections.php:83 -#: ../../Zotlabs/Module/Connections.php:292 ../../include/text.php:1041 +#: ../../Zotlabs/Module/Connections.php:292 ../../include/text.php:1042 msgid "Comments" msgstr "Komentarze" #: ../../Zotlabs/Module/Viewconnections.php:88 -#: ../../Zotlabs/Module/Connections.php:297 ../../include/text.php:1046 +#: ../../Zotlabs/Module/Connections.php:297 ../../include/text.php:1047 msgid "Stream items" msgstr "Elementy strumienia" #: ../../Zotlabs/Module/Viewconnections.php:93 -#: ../../Zotlabs/Module/Connections.php:302 ../../include/text.php:1051 +#: ../../Zotlabs/Module/Connections.php:302 ../../include/text.php:1052 msgid "Wall posts" msgstr "Wpisy ścienne" #: ../../Zotlabs/Module/Viewconnections.php:97 -#: ../../Zotlabs/Module/Connections.php:306 ../../include/text.php:1055 +#: ../../Zotlabs/Module/Connections.php:306 ../../include/text.php:1056 msgid "Nothing" msgstr "Nic" @@ -2735,11 +2736,12 @@ msgid "Error downloading wiki: " msgstr "Błąd podczas pobierania wiki: " #: ../../Zotlabs/Module/Wiki.php:205 ../../Zotlabs/Widget/Wiki_list.php:15 -#: ../../include/nav.php:536 +#: ../../include/nav.php:540 msgid "Wikis" msgstr "Wiki" #: ../../Zotlabs/Module/Wiki.php:211 ../../Zotlabs/Storage/Browser.php:404 +#: ../../extend/addon/hubzilla-addons/mail/Mod_Mail.php:166 msgid "Download" msgstr "Pobierz" @@ -2753,19 +2755,19 @@ msgstr "Rodzaj treści" #: ../../Zotlabs/Module/Wiki.php:216 ../../Zotlabs/Module/Wiki.php:370 #: ../../Zotlabs/Widget/Wiki_pages.php:38 -#: ../../Zotlabs/Widget/Wiki_pages.php:95 ../../include/text.php:2100 +#: ../../Zotlabs/Widget/Wiki_pages.php:95 ../../include/text.php:2115 #: ../../extend/addon/hubzilla-addons/mdpost/mdpost.php:41 msgid "Markdown" msgstr "Markdown" #: ../../Zotlabs/Module/Wiki.php:216 ../../Zotlabs/Module/Wiki.php:370 #: ../../Zotlabs/Widget/Wiki_pages.php:38 -#: ../../Zotlabs/Widget/Wiki_pages.php:95 ../../include/text.php:2098 +#: ../../Zotlabs/Widget/Wiki_pages.php:95 ../../include/text.php:2113 msgid "BBcode" msgstr "BBcode" #: ../../Zotlabs/Module/Wiki.php:216 ../../Zotlabs/Widget/Wiki_pages.php:38 -#: ../../Zotlabs/Widget/Wiki_pages.php:95 ../../include/text.php:2101 +#: ../../Zotlabs/Widget/Wiki_pages.php:95 ../../include/text.php:2116 msgid "Text" msgstr "Tekst" @@ -2822,7 +2824,7 @@ msgstr "Krótki opis zmian (opcjonalnie)" #: ../../extend/addon/hubzilla-addons/ljpost/ljpost.php:134 #: ../../extend/addon/hubzilla-addons/dwpost/Mod_Dwpost.php:69 #: ../../extend/addon/hubzilla-addons/dwpost/dwpost.php:134 -#: ../../extend/addon/hubzilla-addons/wppost/wppost.php:173 +#: ../../extend/addon/hubzilla-addons/wppost/wppost.php:174 #: ../../extend/addon/hubzilla-addons/wppost/Mod_Wppost.php:98 msgid "Source" msgstr "Źródło" @@ -2835,27 +2837,27 @@ msgstr "Nowa nazwa strony" msgid "Embed image from photo albums" msgstr "Osadź obraz z albumów fotograficznych" -#: ../../Zotlabs/Module/Wiki.php:399 ../../include/conversation.php:1454 +#: ../../Zotlabs/Module/Wiki.php:399 ../../include/conversation.php:1463 #: ../../extend/addon/hubzilla-addons/hsse/hsse.php:208 msgid "Embed an image from your albums" msgstr "Osadź obraz ze swoich albumów" #: ../../Zotlabs/Module/Wiki.php:401 ../../Zotlabs/Module/Profile_photo.php:508 -#: ../../Zotlabs/Module/Cover_photo.php:429 ../../include/conversation.php:1456 -#: ../../include/conversation.php:1509 +#: ../../Zotlabs/Module/Cover_photo.php:429 ../../include/conversation.php:1465 +#: ../../include/conversation.php:1518 #: ../../extend/addon/hubzilla-addons/hsse/hsse.php:210 #: ../../extend/addon/hubzilla-addons/hsse/hsse.php:257 msgid "OK" msgstr "Dobrze" #: ../../Zotlabs/Module/Wiki.php:402 ../../Zotlabs/Module/Profile_photo.php:509 -#: ../../Zotlabs/Module/Cover_photo.php:430 ../../include/conversation.php:1382 +#: ../../Zotlabs/Module/Cover_photo.php:430 ../../include/conversation.php:1390 #: ../../extend/addon/hubzilla-addons/hsse/hsse.php:139 msgid "Choose images to embed" msgstr "Wybierz zdjęcie do osadzenia" #: ../../Zotlabs/Module/Wiki.php:403 ../../Zotlabs/Module/Profile_photo.php:510 -#: ../../Zotlabs/Module/Cover_photo.php:431 ../../include/conversation.php:1383 +#: ../../Zotlabs/Module/Cover_photo.php:431 ../../include/conversation.php:1391 #: ../../extend/addon/hubzilla-addons/hsse/hsse.php:140 msgid "Choose an album" msgstr "Wybierz album" @@ -2866,19 +2868,19 @@ msgid "Choose a different album" msgstr "Wybierz inny album" #: ../../Zotlabs/Module/Wiki.php:405 ../../Zotlabs/Module/Profile_photo.php:512 -#: ../../Zotlabs/Module/Cover_photo.php:433 ../../include/conversation.php:1385 +#: ../../Zotlabs/Module/Cover_photo.php:433 ../../include/conversation.php:1393 #: ../../extend/addon/hubzilla-addons/hsse/hsse.php:142 msgid "Error getting album list" msgstr "Błąd podczas pobierania listy albumów" #: ../../Zotlabs/Module/Wiki.php:406 ../../Zotlabs/Module/Profile_photo.php:513 -#: ../../Zotlabs/Module/Cover_photo.php:434 ../../include/conversation.php:1386 +#: ../../Zotlabs/Module/Cover_photo.php:434 ../../include/conversation.php:1394 #: ../../extend/addon/hubzilla-addons/hsse/hsse.php:143 msgid "Error getting photo link" msgstr "Błąd podczas pobierania linku do zdjęcia" #: ../../Zotlabs/Module/Wiki.php:407 ../../Zotlabs/Module/Profile_photo.php:514 -#: ../../Zotlabs/Module/Cover_photo.php:435 ../../include/conversation.php:1387 +#: ../../Zotlabs/Module/Cover_photo.php:435 ../../include/conversation.php:1395 #: ../../extend/addon/hubzilla-addons/hsse/hsse.php:144 msgid "Error getting album" msgstr "Błąd podczas pobierania albumu" @@ -2944,7 +2946,7 @@ msgstr "Trzeba być uwierzytelnionym." msgid "Block Name" msgstr "Nazwa bloku" -#: ../../Zotlabs/Module/Blocks.php:154 ../../include/text.php:2673 +#: ../../Zotlabs/Module/Blocks.php:154 ../../include/text.php:2688 msgid "Blocks" msgstr "Bloki" @@ -3026,13 +3028,14 @@ msgstr "Z dala" msgid "Online" msgstr "On-line" -#: ../../Zotlabs/Module/Fbrowser.php:29 ../../Zotlabs/Lib/Apps.php:345 -#: ../../include/features.php:368 ../../include/nav.php:444 +#: ../../Zotlabs/Module/Fbrowser.php:29 ../../Zotlabs/Lib/Apps.php:346 +#: ../../include/features.php:368 ../../include/nav.php:448 msgid "Photos" msgstr "Zdjęcia" #: ../../Zotlabs/Module/Fbrowser.php:85 ../../Zotlabs/Storage/Browser.php:351 -#: ../../Zotlabs/Lib/Apps.php:340 ../../include/nav.php:452 +#: ../../Zotlabs/Lib/Apps.php:341 ../../Zotlabs/Widget/Notifications.php:101 +#: ../../include/nav.php:456 msgid "Files" msgstr "Pliki" @@ -3070,9 +3073,9 @@ msgstr "Nie można ustawić parametrów książki adresowej." msgid "Connection has been removed." msgstr "Połączenie zostało usunięte." -#: ../../Zotlabs/Module/Connedit.php:593 ../../Zotlabs/Lib/Apps.php:344 -#: ../../include/conversation.php:1078 ../../include/nav.php:115 -#: ../../extend/addon/hubzilla-addons/openclipatar/openclipatar.php:57 +#: ../../Zotlabs/Module/Connedit.php:593 ../../Zotlabs/Lib/Apps.php:345 +#: ../../include/conversation.php:1086 ../../include/nav.php:115 +#: ../../extend/addon/hubzilla-addons/openclipatar/openclipatar.php:58 msgid "View Profile" msgstr "Wyświetl profil" @@ -3097,7 +3100,7 @@ msgstr "Odśwież zdjęcie" msgid "Fetch updated photo" msgstr "Pobierz zaktualizowane zdjęcie" -#: ../../Zotlabs/Module/Connedit.php:614 ../../include/conversation.php:1088 +#: ../../Zotlabs/Module/Connedit.php:614 ../../include/conversation.php:1096 msgid "Recent Activity" msgstr "Ostatnia aktywność" @@ -3536,7 +3539,7 @@ msgid "Image resize failed." msgstr "Zmiana rozmiaru obrazu nie powiodła się." #: ../../Zotlabs/Module/Profile_photo.php:254 -#: ../../extend/addon/hubzilla-addons/openclipatar/openclipatar.php:298 +#: ../../extend/addon/hubzilla-addons/openclipatar/openclipatar.php:299 msgid "" "Shift-reload the page or clear browser cache if the new photo does not " "display immediately." @@ -3545,7 +3548,7 @@ msgstr "" "zdjęcie nie zostanie wyświetlone od razu." #: ../../Zotlabs/Module/Profile_photo.php:261 -#: ../../Zotlabs/Module/Cover_photo.php:241 ../../include/photos.php:196 +#: ../../Zotlabs/Module/Cover_photo.php:241 ../../include/photos.php:199 msgid "Unable to process image" msgstr "Nie można przetworzyć obrazu" @@ -3657,7 +3660,7 @@ msgid "NEW" msgstr "NOWY" #: ../../Zotlabs/Module/Sharedwithme.php:108 -#: ../../Zotlabs/Storage/Browser.php:379 ../../include/text.php:1540 +#: ../../Zotlabs/Storage/Browser.php:379 ../../include/text.php:1541 msgid "Size" msgstr "Rozmiar" @@ -3682,7 +3685,7 @@ msgstr "Edytuj układ" msgid "Create a new channel" msgstr "Utwórz nowy kanał" -#: ../../Zotlabs/Module/Manage.php:160 ../../Zotlabs/Lib/Apps.php:337 +#: ../../Zotlabs/Module/Manage.php:160 ../../Zotlabs/Lib/Apps.php:338 #: ../../include/nav.php:101 msgid "Channel Manager" msgstr "Menadżer kanałów" @@ -3716,36 +3719,36 @@ msgstr "Deleguj kanał" msgid "Connection added." msgstr "Dodano połączenie." -#: ../../Zotlabs/Module/Item.php:471 ../../Zotlabs/Module/Pin.php:36 +#: ../../Zotlabs/Module/Item.php:472 ../../Zotlabs/Module/Pin.php:36 msgid "Unable to locate original post." msgstr "Nie można znaleźć oryginalnego wpisu." -#: ../../Zotlabs/Module/Item.php:757 +#: ../../Zotlabs/Module/Item.php:758 msgid "Empty post discarded." msgstr "Pusty wpis został odrzucony." -#: ../../Zotlabs/Module/Item.php:1191 +#: ../../Zotlabs/Module/Item.php:1192 msgid "Duplicate post suppressed." msgstr "Powielony wpis został wyłączony." -#: ../../Zotlabs/Module/Item.php:1336 +#: ../../Zotlabs/Module/Item.php:1337 msgid "System error. Post not saved." msgstr "Błąd systemu. Wpis nie został zapisany." -#: ../../Zotlabs/Module/Item.php:1370 +#: ../../Zotlabs/Module/Item.php:1371 msgid "Your comment is awaiting approval." msgstr "Twój komentarz oczekuje na zatwierdzenie." -#: ../../Zotlabs/Module/Item.php:1500 +#: ../../Zotlabs/Module/Item.php:1501 msgid "Unable to obtain post information from database." msgstr "Nie można uzyskać z bazy danych informacji o tym wpisie." -#: ../../Zotlabs/Module/Item.php:1507 +#: ../../Zotlabs/Module/Item.php:1508 #, php-format msgid "You have reached your limit of %1$.0f top level posts." msgstr "Osiągnięty został limit %1$.0f wpisów najwyższego poziomu." -#: ../../Zotlabs/Module/Item.php:1514 +#: ../../Zotlabs/Module/Item.php:1515 #, php-format msgid "You have reached your limit of %1$.0f webpages." msgstr "Osiągnięty został limit %1$.0f stron internetowych." @@ -3877,7 +3880,7 @@ msgstr "Statystyki" msgid "Software" msgstr "Oprogramowanie" -#: ../../Zotlabs/Module/Pubsites.php:35 ../../include/conversation.php:1128 +#: ../../Zotlabs/Module/Pubsites.php:35 ../../include/conversation.php:1136 msgid "Ratings" msgstr "Oceny" @@ -3922,18 +3925,16 @@ msgstr "Jestem dostępny" msgid "Bookmark this room" msgstr "Zaznacz ten pokój" -#: ../../Zotlabs/Module/Chat.php:218 ../../include/conversation.php:1377 +#: ../../Zotlabs/Module/Chat.php:218 ../../include/conversation.php:1385 #: ../../extend/addon/hubzilla-addons/hsse/hsse.php:134 -#: ../../extend/addon/hubzilla-addons/mail/Mod_Mail.php:120 -#: ../../extend/addon/hubzilla-addons/mail/Mod_Mail.php:241 +#: ../../extend/addon/hubzilla-addons/mail/Mod_Mail.php:135 msgid "Please enter a link URL:" msgstr "Proszę wprowadzić adres URL linku:" #: ../../Zotlabs/Module/Chat.php:219 ../../Zotlabs/Lib/ThreadItem.php:841 -#: ../../include/conversation.php:1507 +#: ../../include/conversation.php:1516 #: ../../extend/addon/hubzilla-addons/hsse/hsse.php:255 -#: ../../extend/addon/hubzilla-addons/mail/Mod_Mail.php:173 -#: ../../extend/addon/hubzilla-addons/mail/Mod_Mail.php:316 +#: ../../extend/addon/hubzilla-addons/mail/Mod_Mail.php:211 msgid "Encrypt text" msgstr "Zaszyfruj tekst" @@ -4079,7 +4080,7 @@ msgstr "" "Nie można zweryfikować żądania. (Możliwe, że zostało już przesłane). " "Resetowanie hasła nie powiodło się." -#: ../../Zotlabs/Module/Lostpass.php:91 ../../boot.php:1729 +#: ../../Zotlabs/Module/Lostpass.php:91 ../../boot.php:1730 msgid "Password Reset" msgstr "Resetowanie hasła" @@ -4301,13 +4302,12 @@ msgid "View Photo" msgstr "Zobacz zdjęcie" #: ../../Zotlabs/Module/Photos.php:793 ../../Zotlabs/Module/Photos.php:1253 -#: ../../Zotlabs/Module/Embedphotos.php:177 ../../Zotlabs/Lib/Apps.php:1112 -#: ../../Zotlabs/Lib/Apps.php:1196 ../../Zotlabs/Lib/Activity.php:1553 +#: ../../Zotlabs/Module/Embedphotos.php:177 ../../Zotlabs/Lib/Apps.php:1113 +#: ../../Zotlabs/Lib/Apps.php:1197 ../../Zotlabs/Lib/Activity.php:1555 #: ../../Zotlabs/Widget/Portfolio.php:95 ../../Zotlabs/Widget/Pinned.php:268 -#: ../../Zotlabs/Widget/Album.php:84 ../../include/conversation.php:1209 +#: ../../Zotlabs/Widget/Album.php:84 ../../include/conversation.php:1217 #: ../../include/cdav.php:158 ../../include/cdav.php:159 #: ../../include/cdav.php:167 -#: ../../extend/addon/hubzilla-addons/pubcrawl/as.php:1196 msgid "Unknown" msgstr "Nieznane" @@ -4389,7 +4389,7 @@ msgid "I don't like this (toggle)" msgstr "Nie pochwalam tego (przełącz)" #: ../../Zotlabs/Module/Photos.php:1079 ../../Zotlabs/Lib/ThreadItem.php:503 -#: ../../include/conversation.php:830 +#: ../../include/conversation.php:838 msgid "Please wait" msgstr "Proszę czekać" @@ -4455,7 +4455,7 @@ msgid "View all" msgstr "Pokaż wszystkie" #: ../../Zotlabs/Module/Photos.php:1136 ../../Zotlabs/Lib/ThreadItem.php:243 -#: ../../include/conversation.php:1744 ../../include/channel.php:1729 +#: ../../include/conversation.php:1754 ../../include/channel.php:1729 #: ../../include/taxonomy.php:670 msgctxt "noun" msgid "Like" @@ -4465,7 +4465,7 @@ msgstr[1] "Pochwały" msgstr[2] "Pochwał" #: ../../Zotlabs/Module/Photos.php:1141 ../../Zotlabs/Lib/ThreadItem.php:248 -#: ../../include/conversation.php:1747 +#: ../../include/conversation.php:1757 msgctxt "noun" msgid "Dislike" msgid_plural "Dislikes" @@ -4503,7 +4503,7 @@ msgid "Close" msgstr "Zamknij" #: ../../Zotlabs/Module/Photos.php:1346 ../../Zotlabs/Module/Photos.php:1359 -#: ../../Zotlabs/Module/Photos.php:1360 ../../include/photos.php:667 +#: ../../Zotlabs/Module/Photos.php:1360 ../../include/photos.php:715 msgid "Recent Photos" msgstr "Najnowsze zdjęcia" @@ -4539,8 +4539,8 @@ msgstr "Twórz osobiste karty zadań" msgid "Add Card" msgstr "Dodaj kartę" -#: ../../Zotlabs/Module/Cards.php:207 ../../Zotlabs/Lib/Apps.php:326 -#: ../../include/nav.php:501 +#: ../../Zotlabs/Module/Cards.php:207 ../../Zotlabs/Lib/Apps.php:327 +#: ../../include/nav.php:505 msgid "Cards" msgstr "Karty" @@ -4711,7 +4711,8 @@ msgstr "Usuń połączenie" msgid "Channel address" msgstr "Adres kanału" -#: ../../Zotlabs/Module/Connections.php:333 ../../include/features.php:290 +#: ../../Zotlabs/Module/Connections.php:333 +#: ../../Zotlabs/Widget/Notifications.php:16 ../../include/features.php:290 msgid "Network" msgstr "Sieć" @@ -4733,7 +4734,7 @@ msgstr "Zatwierdź połączenie" #: ../../Zotlabs/Module/Connections.php:343 #: ../../Zotlabs/Module/Admin/Accounts.php:318 -#: ../../include/conversation.php:776 +#: ../../include/conversation.php:783 msgid "Approve" msgstr "Zatwierdź" @@ -4747,7 +4748,7 @@ msgstr "Ostatnia aktywność" #: ../../Zotlabs/Module/Connections.php:350 ../../Zotlabs/Module/Suggest.php:71 #: ../../Zotlabs/Module/Directory.php:369 ../../Zotlabs/Widget/Follow.php:32 -#: ../../Zotlabs/Widget/Suggestions.php:46 ../../include/conversation.php:1098 +#: ../../Zotlabs/Widget/Suggestions.php:46 ../../include/conversation.php:1106 #: ../../include/channel.php:1566 ../../include/connections.php:110 msgid "Connect" msgstr "Połączenie" @@ -4756,8 +4757,8 @@ msgstr "Połączenie" msgid "Connect at this location" msgstr "Połącz w tej lokalizacji" -#: ../../Zotlabs/Module/Connections.php:375 ../../Zotlabs/Lib/Apps.php:333 -#: ../../include/features.php:133 ../../include/text.php:1030 +#: ../../Zotlabs/Module/Connections.php:375 ../../Zotlabs/Lib/Apps.php:334 +#: ../../include/features.php:133 ../../include/text.php:1031 msgid "Connections" msgstr "Połączenia" @@ -4862,7 +4863,7 @@ msgstr "Brak popularnych połączeń." msgid "View Common Connections" msgstr "Wyświetl popularne połączenia" -#: ../../Zotlabs/Module/Share.php:104 ../../Zotlabs/Lib/Activity.php:2182 +#: ../../Zotlabs/Module/Share.php:104 ../../Zotlabs/Lib/Activity.php:2187 #, php-format msgid "🔁 Repeated %1$s's %2$s" msgstr "🔁 Powtórzony %2$s %1$s" @@ -4892,7 +4893,7 @@ msgid "Authentication failed." msgstr "Uwierzytelnienie nie powiodło się." #: ../../Zotlabs/Module/Rmagic.php:96 ../../include/channel.php:2545 -#: ../../boot.php:1721 +#: ../../boot.php:1722 msgid "Remote Authentication" msgstr "Zdalne uwierzytelnienie" @@ -4968,7 +4969,7 @@ msgid "Toggle" msgstr "Przełącz" #: ../../Zotlabs/Module/Admin/Themes.php:125 -#: ../../Zotlabs/Module/Admin/Addons.php:345 ../../Zotlabs/Lib/Apps.php:339 +#: ../../Zotlabs/Module/Admin/Addons.php:345 ../../Zotlabs/Lib/Apps.php:340 #: ../../Zotlabs/Widget/Settings_menu.php:61 #: ../../Zotlabs/Widget/Newmember.php:53 ../../include/nav.php:106 msgid "Settings" @@ -5291,7 +5292,7 @@ msgstr "" "tym portalu zostanie bezpowrotnie usunięte!\\n\\nCzy na pewno usunąć?" #: ../../Zotlabs/Module/Admin/Accounts.php:347 -#: ../../include/conversation.php:1118 +#: ../../include/conversation.php:1126 msgid "Message" msgstr "Wiadowmość" @@ -5489,7 +5490,7 @@ msgstr "Zezwalaj na kod" msgid "Disallow Code" msgstr "Nie zezwalaj na kod" -#: ../../Zotlabs/Module/Admin/Channels.php:154 ../../include/nav.php:421 +#: ../../Zotlabs/Module/Admin/Channels.php:154 ../../include/nav.php:425 msgid "Channel" msgstr "Kanał" @@ -5639,7 +5640,7 @@ msgstr "Pobierz repozytorium dodatków" msgid "Install new repo" msgstr "Zainstaluj nowe repozytorium" -#: ../../Zotlabs/Module/Admin/Addons.php:426 ../../Zotlabs/Lib/Apps.php:536 +#: ../../Zotlabs/Module/Admin/Addons.php:426 ../../Zotlabs/Lib/Apps.php:537 msgid "Install" msgstr "Zainstaluj" @@ -5671,7 +5672,7 @@ msgstr "Błędy" msgid "Site settings updated." msgstr "Zaktualizowano ustawienia portalu." -#: ../../Zotlabs/Module/Admin/Site.php:251 ../../include/text.php:3356 +#: ../../Zotlabs/Module/Admin/Site.php:251 ../../include/text.php:3366 #: ../../extend/addon/hubzilla-addons/cart/submodules/orderoptions.php:335 #: ../../extend/addon/hubzilla-addons/cart/submodules/orderoptions.php:359 #: ../../extend/addon/hubzilla-addons/cart/submodules/orderoptions.php:435 @@ -6371,12 +6372,12 @@ msgstr "Pola własne" msgid "Create Custom Field" msgstr "Utwórz własne pole" -#: ../../Zotlabs/Module/Notify.php:61 +#: ../../Zotlabs/Module/Notify.php:69 #: ../../Zotlabs/Module/Notifications.php:106 msgid "No more system notifications." msgstr "Nigdy więcej powiadomień systemowych." -#: ../../Zotlabs/Module/Notify.php:65 +#: ../../Zotlabs/Module/Notify.php:73 #: ../../Zotlabs/Module/Notifications.php:110 msgid "System Notifications" msgstr "Powiadomienia systemowe" @@ -6614,8 +6615,8 @@ msgstr "Twórz interaktywne artykuły" msgid "Add Article" msgstr "Dodaj artykuł" -#: ../../Zotlabs/Module/Articles.php:225 ../../Zotlabs/Lib/Apps.php:325 -#: ../../include/nav.php:512 +#: ../../Zotlabs/Module/Articles.php:225 ../../Zotlabs/Lib/Apps.php:326 +#: ../../include/nav.php:516 msgid "Articles" msgstr "Artykuły" @@ -7379,7 +7380,7 @@ msgstr "Aplikacja Nastrój" msgid "Set your current mood and tell your friends" msgstr "Ustaw swój aktualny nastrój i podziel się tym ze znajomymi" -#: ../../Zotlabs/Module/Mood.php:154 ../../Zotlabs/Lib/Apps.php:350 +#: ../../Zotlabs/Module/Mood.php:154 ../../Zotlabs/Lib/Apps.php:351 msgid "Mood" msgstr "Nastrój" @@ -7407,7 +7408,7 @@ msgstr "" "Użyj tego formularza, aby utworzyć reguły uprawnień dla różnych klas osób " "lub połączeń." -#: ../../Zotlabs/Module/Permcats.php:113 ../../Zotlabs/Lib/Apps.php:374 +#: ../../Zotlabs/Module/Permcats.php:113 ../../Zotlabs/Lib/Apps.php:375 msgid "Permission Categories" msgstr "Kategorie uprawnień" @@ -7550,7 +7551,7 @@ msgid "I have an invite code" msgstr "Mam kod zaproszenia" #: ../../Zotlabs/Module/Register.php:542 ../../include/nav.php:168 -#: ../../boot.php:1697 +#: ../../boot.php:1698 msgid "Register" msgstr "Zarejestruj się" @@ -8152,40 +8153,52 @@ msgstr "" "Pokaż w powiadomieniach nowe wpisy na ścianie oraz prywatne wiadomości i " "połączenia" +#: ../../Zotlabs/Module/Settings/Channel.php:584 +msgid "" +"Desktop notifications are unavailable because the required browser " +"permission has not been granted" +msgstr "" +"Powiadomienia na pulpicie są niedostępne, ponieważ nie udzielono wymaganych " +"uprawnień przeglądarce" + #: ../../Zotlabs/Module/Settings/Channel.php:585 +msgid "Grant permission" +msgstr "Udziel pozwolenia" + +#: ../../Zotlabs/Module/Settings/Channel.php:586 msgid "Notify me of events this many days in advance" msgstr "Informuj mnie o wydarzeniach z wyprzedzeniem (w dniach)" -#: ../../Zotlabs/Module/Settings/Channel.php:585 +#: ../../Zotlabs/Module/Settings/Channel.php:586 msgid "Must be greater than 0" msgstr "Musi być większa od 0" -#: ../../Zotlabs/Module/Settings/Channel.php:590 +#: ../../Zotlabs/Module/Settings/Channel.php:591 msgid "Advanced Account/Page Type Settings" msgstr "Zaawansowane ustawienia konta/typu strony" -#: ../../Zotlabs/Module/Settings/Channel.php:591 +#: ../../Zotlabs/Module/Settings/Channel.php:592 msgid "Change the behaviour of this account for special situations" msgstr "Zmień zachowanie tego konta w szczególnych sytuacjach" -#: ../../Zotlabs/Module/Settings/Channel.php:593 +#: ../../Zotlabs/Module/Settings/Channel.php:594 msgid "Miscellaneous Settings" msgstr "Różne ustawienia" -#: ../../Zotlabs/Module/Settings/Channel.php:594 +#: ../../Zotlabs/Module/Settings/Channel.php:595 msgid "Default photo upload folder" msgstr "Domyślny folder na przesyłane zdjęcia" -#: ../../Zotlabs/Module/Settings/Channel.php:594 #: ../../Zotlabs/Module/Settings/Channel.php:595 +#: ../../Zotlabs/Module/Settings/Channel.php:596 msgid "%Y - current year, %m - current month" msgstr "%Y - bieżący rok, %m - bieżący miesiąc" -#: ../../Zotlabs/Module/Settings/Channel.php:595 +#: ../../Zotlabs/Module/Settings/Channel.php:596 msgid "Default file upload folder" msgstr "Domyślny folder przesyłania plików" -#: ../../Zotlabs/Module/Settings/Channel.php:597 +#: ../../Zotlabs/Module/Settings/Channel.php:598 msgid "Remove this channel." msgstr "Usuń ten kanał." @@ -8351,7 +8364,6 @@ msgid "Enter email addresses, one per line:" msgstr "Wprowadź adresy e-mail, po jednym w każdym wierszu:" #: ../../Zotlabs/Module/Invite.php:539 -#: ../../extend/addon/hubzilla-addons/mail/Mod_Mail.php:164 msgid "Your message:" msgstr "Twoja wiadomość:" @@ -8360,8 +8372,7 @@ msgid "Invite template" msgstr "Szablon zaproszenia" #: ../../Zotlabs/Module/Invite.php:542 -#: ../../extend/addon/hubzilla-addons/mail/Mod_Mail.php:161 -#: ../../extend/addon/hubzilla-addons/mail/Mod_Mail.php:303 +#: ../../extend/addon/hubzilla-addons/mail/Mod_Mail.php:198 msgid "Subject:" msgstr "Temat:" @@ -8441,14 +8452,6 @@ msgstr "Aplikacja Język" msgid "Change UI language" msgstr "Zmień język interfejsu użytkownika" -#: ../../Zotlabs/Module/Hq.php:131 -msgid "Welcome to Hubzilla!" -msgstr "Witamy w Hubzilla!" - -#: ../../Zotlabs/Module/Hq.php:131 -msgid "You have got no unseen posts..." -msgstr "Nie masz żadnych nieoglądniętych wpisów..." - #: ../../Zotlabs/Module/Cover_photo.php:196 #: ../../Zotlabs/Module/Cover_photo.php:254 msgid "Cover Photos" @@ -8525,7 +8528,7 @@ msgstr "Menu może służyć do przechowywania zapisanych zakładek" msgid "Submit and proceed" msgstr "Prześlij i kontynuuj" -#: ../../Zotlabs/Module/Menu.php:171 ../../include/text.php:2674 +#: ../../Zotlabs/Module/Menu.php:171 ../../include/text.php:2689 msgid "Menus" msgstr "Kolekcja menu" @@ -8601,7 +8604,7 @@ msgstr "Automatycznie importuj zawartość kanału z innych kanałów lub źród msgid "*" msgstr "*" -#: ../../Zotlabs/Module/Sources.php:107 ../../Zotlabs/Lib/Apps.php:368 +#: ../../Zotlabs/Module/Sources.php:107 ../../Zotlabs/Lib/Apps.php:369 msgid "Channel Sources" msgstr "Źródła kanału" @@ -8677,8 +8680,8 @@ msgstr "Aplikacja Zaczepka" msgid "Poke somebody in your addressbook" msgstr "Zaczep kogoś w swojej książce adresowej" -#: ../../Zotlabs/Module/Poke.php:199 ../../Zotlabs/Lib/Apps.php:351 -#: ../../include/conversation.php:1138 +#: ../../Zotlabs/Module/Poke.php:199 ../../Zotlabs/Lib/Apps.php:352 +#: ../../include/conversation.php:1146 msgid "Poke" msgstr "Zaczepka" @@ -8816,7 +8819,7 @@ msgstr "Informacje" msgid "Rename" msgstr "Zień nazwę" -#: ../../Zotlabs/Storage/Browser.php:407 ../../Zotlabs/Lib/Apps.php:360 +#: ../../Zotlabs/Storage/Browser.php:407 ../../Zotlabs/Lib/Apps.php:361 msgid "Post" msgstr "Wpis" @@ -8930,181 +8933,181 @@ msgstr "Nie można połączyć się ze sobą." msgid "error saving data" msgstr "błąd podczas zapisywania danych" -#: ../../Zotlabs/Lib/Apps.php:323 +#: ../../Zotlabs/Lib/Apps.php:324 ../../include/nav.php:338 msgid "Apps" msgstr "Aplikacje" -#: ../../Zotlabs/Lib/Apps.php:324 +#: ../../Zotlabs/Lib/Apps.php:325 msgid "Affinity Tool" msgstr "Narzędzie więzi" -#: ../../Zotlabs/Lib/Apps.php:327 +#: ../../Zotlabs/Lib/Apps.php:328 msgid "Site Admin" msgstr "Administrator portalu" -#: ../../Zotlabs/Lib/Apps.php:328 +#: ../../Zotlabs/Lib/Apps.php:329 #: ../../extend/addon/hubzilla-addons/buglink/buglink.php:16 msgid "Report Bug" msgstr "Raport błędów" -#: ../../Zotlabs/Lib/Apps.php:329 ../../include/nav.php:490 +#: ../../Zotlabs/Lib/Apps.php:330 ../../include/nav.php:494 msgid "Bookmarks" msgstr "Zakładki" -#: ../../Zotlabs/Lib/Apps.php:330 ../../Zotlabs/Widget/Chatroom_list.php:16 -#: ../../include/nav.php:477 ../../include/nav.php:480 +#: ../../Zotlabs/Lib/Apps.php:331 ../../Zotlabs/Widget/Chatroom_list.php:16 +#: ../../include/nav.php:481 ../../include/nav.php:484 msgid "Chatrooms" msgstr "Czaty" -#: ../../Zotlabs/Lib/Apps.php:331 +#: ../../Zotlabs/Lib/Apps.php:332 msgid "Content Filter" msgstr "Filtr treści" -#: ../../Zotlabs/Lib/Apps.php:332 +#: ../../Zotlabs/Lib/Apps.php:333 #: ../../extend/addon/hubzilla-addons/content_import/Mod_content_import.php:135 msgid "Content Import" msgstr "Import treści" -#: ../../Zotlabs/Lib/Apps.php:334 +#: ../../Zotlabs/Lib/Apps.php:335 msgid "Remote Diagnostics" msgstr "Zdalna diagnostyka" -#: ../../Zotlabs/Lib/Apps.php:335 +#: ../../Zotlabs/Lib/Apps.php:336 msgid "Suggest Channels" msgstr "Proponowane kanały" -#: ../../Zotlabs/Lib/Apps.php:336 ../../include/nav.php:127 -#: ../../include/nav.php:131 ../../boot.php:1720 +#: ../../Zotlabs/Lib/Apps.php:337 ../../include/nav.php:127 +#: ../../include/nav.php:131 ../../boot.php:1721 msgid "Login" msgstr "Zaloguj się" -#: ../../Zotlabs/Lib/Apps.php:338 +#: ../../Zotlabs/Lib/Apps.php:339 msgid "Stream" msgstr "Strumień" -#: ../../Zotlabs/Lib/Apps.php:342 ../../include/nav.php:539 +#: ../../Zotlabs/Lib/Apps.php:343 ../../include/nav.php:543 msgid "Wiki" msgstr "Wiki" -#: ../../Zotlabs/Lib/Apps.php:343 ../../include/features.php:104 +#: ../../Zotlabs/Lib/Apps.php:344 ../../include/features.php:104 msgid "Channel Home" msgstr "Strona główna kanału" -#: ../../Zotlabs/Lib/Apps.php:346 ../../include/features.php:82 -#: ../../include/nav.php:463 ../../include/nav.php:466 +#: ../../Zotlabs/Lib/Apps.php:347 ../../include/features.php:82 +#: ../../include/nav.php:467 ../../include/nav.php:470 msgid "Calendar" msgstr "Kalendarz" -#: ../../Zotlabs/Lib/Apps.php:347 ../../include/features.php:192 +#: ../../Zotlabs/Lib/Apps.php:348 ../../include/features.php:192 msgid "Directory" msgstr "Katalog" -#: ../../Zotlabs/Lib/Apps.php:349 +#: ../../Zotlabs/Lib/Apps.php:350 msgid "Mail" msgstr "Poczta" -#: ../../Zotlabs/Lib/Apps.php:352 +#: ../../Zotlabs/Lib/Apps.php:353 msgid "Chat" msgstr "Czat" -#: ../../Zotlabs/Lib/Apps.php:354 +#: ../../Zotlabs/Lib/Apps.php:355 msgid "Probe" msgstr "Sonda" -#: ../../Zotlabs/Lib/Apps.php:355 +#: ../../Zotlabs/Lib/Apps.php:356 msgid "Suggest" msgstr "Propozycja" -#: ../../Zotlabs/Lib/Apps.php:356 +#: ../../Zotlabs/Lib/Apps.php:357 msgid "Random Channel" msgstr "Losowy kanał" -#: ../../Zotlabs/Lib/Apps.php:357 +#: ../../Zotlabs/Lib/Apps.php:358 msgid "Invite" msgstr "Zaproszenie" -#: ../../Zotlabs/Lib/Apps.php:358 ../../Zotlabs/Widget/Admin.php:26 +#: ../../Zotlabs/Lib/Apps.php:359 ../../Zotlabs/Widget/Admin.php:26 msgid "Features" msgstr "Możliwości" -#: ../../Zotlabs/Lib/Apps.php:359 +#: ../../Zotlabs/Lib/Apps.php:360 #: ../../extend/addon/hubzilla-addons/openid/MysqlProvider.php:69 msgid "Language" msgstr "Język" -#: ../../Zotlabs/Lib/Apps.php:361 +#: ../../Zotlabs/Lib/Apps.php:362 #: ../../extend/addon/hubzilla-addons/openid/MysqlProvider.php:58 #: ../../extend/addon/hubzilla-addons/openid/MysqlProvider.php:59 #: ../../extend/addon/hubzilla-addons/openid/MysqlProvider.php:60 msgid "Profile Photo" msgstr "Zdjęcie profilowe" -#: ../../Zotlabs/Lib/Apps.php:363 ../../include/features.php:382 +#: ../../Zotlabs/Lib/Apps.php:364 ../../include/features.php:382 msgid "Profiles" msgstr "Profile" -#: ../../Zotlabs/Lib/Apps.php:365 +#: ../../Zotlabs/Lib/Apps.php:366 msgid "Notifications" msgstr "Powiadomienia" -#: ../../Zotlabs/Lib/Apps.php:366 +#: ../../Zotlabs/Lib/Apps.php:367 msgid "Order Apps" msgstr "Kolejność aplikacji" -#: ../../Zotlabs/Lib/Apps.php:367 +#: ../../Zotlabs/Lib/Apps.php:368 msgid "CardDAV" msgstr "CardDAV" -#: ../../Zotlabs/Lib/Apps.php:369 +#: ../../Zotlabs/Lib/Apps.php:370 msgid "Guest Access" msgstr "Dostęp gościa" -#: ../../Zotlabs/Lib/Apps.php:370 ../../Zotlabs/Widget/Notes.php:21 +#: ../../Zotlabs/Lib/Apps.php:371 ../../Zotlabs/Widget/Notes.php:21 #: ../../extend/addon/hubzilla-addons/workflow/workflow.php:2625 msgid "Notes" msgstr "Notatki" -#: ../../Zotlabs/Lib/Apps.php:371 +#: ../../Zotlabs/Lib/Apps.php:372 msgid "OAuth Apps Manager" msgstr "Menadżer aplikacji OAuth" -#: ../../Zotlabs/Lib/Apps.php:372 +#: ../../Zotlabs/Lib/Apps.php:373 msgid "OAuth2 Apps Manager" msgstr "Menadżer aplikacji OAuth2" -#: ../../Zotlabs/Lib/Apps.php:373 +#: ../../Zotlabs/Lib/Apps.php:374 msgid "PDL Editor" msgstr "Edytor PDL" -#: ../../Zotlabs/Lib/Apps.php:376 +#: ../../Zotlabs/Lib/Apps.php:377 msgid "My Chatrooms" msgstr "Moje czaty" -#: ../../Zotlabs/Lib/Apps.php:377 +#: ../../Zotlabs/Lib/Apps.php:378 msgid "Channel Export" msgstr "Eksport kanału" -#: ../../Zotlabs/Lib/Apps.php:554 +#: ../../Zotlabs/Lib/Apps.php:555 msgid "Purchase" msgstr "Zakup" -#: ../../Zotlabs/Lib/Apps.php:559 +#: ../../Zotlabs/Lib/Apps.php:560 msgid "Undelete" msgstr "Cofnij usunięcie" -#: ../../Zotlabs/Lib/Apps.php:569 +#: ../../Zotlabs/Lib/Apps.php:570 msgid "Add to app-tray" msgstr "Dodaj do zasobnika aplikacji" -#: ../../Zotlabs/Lib/Apps.php:570 +#: ../../Zotlabs/Lib/Apps.php:571 msgid "Remove from app-tray" msgstr "Usuń z zasobnika aplikacji" -#: ../../Zotlabs/Lib/Apps.php:571 +#: ../../Zotlabs/Lib/Apps.php:572 msgid "Pin to navbar" msgstr "Przypnij do paska nawigacyjnego" -#: ../../Zotlabs/Lib/Apps.php:572 +#: ../../Zotlabs/Lib/Apps.php:573 msgid "Unpin from navbar" msgstr "Odepnij od paska nawigacyjnego" @@ -9239,85 +9242,86 @@ msgstr "Aby nie otrzymywać tych wiadomości, zmień %s." msgid "%s <!item_type!>" msgstr "%s <!item_type!>" -#: ../../Zotlabs/Lib/Enotify.php:127 +#: ../../Zotlabs/Lib/Enotify.php:128 #, php-format -msgid "[$Projectname:Notify] New mail received at %s" -msgstr "[$Projectname:Notify] Otrzymano nową pocztę na %s" +msgid "[$Projectname:Notify] New direct message received at %s" +msgstr "[$Projectname:Notify] Otrzymano nową wiadomość bezpośrednią o %s" -#: ../../Zotlabs/Lib/Enotify.php:129 +#: ../../Zotlabs/Lib/Enotify.php:130 #, php-format -msgid "%1$s sent you a new private message at %2$s." -msgstr "%1$s wysłał Ci nową prywatną wiadomość na %2$s." +msgid "%1$s sent you a new direct message at %2$s." +msgstr "%1$s wysłał Ci nową wiadomość bezpośrednią na %2$s." -#: ../../Zotlabs/Lib/Enotify.php:130 +#: ../../Zotlabs/Lib/Enotify.php:131 #, php-format msgid "%1$s sent you %2$s." msgstr "%1$s wysłał Ci %2$s." -#: ../../Zotlabs/Lib/Enotify.php:130 -msgid "a private message" -msgstr "prywatna wiadomość" - #: ../../Zotlabs/Lib/Enotify.php:131 +msgid "a direct message" +msgstr "wiadomość bezpośrednia" + +#: ../../Zotlabs/Lib/Enotify.php:132 #, php-format -msgid "Please visit %s to view and/or reply to your private messages." +msgid "Please visit %s to view and/or reply to your direct messages." msgstr "" -"Odwiedź %s, aby wyświetlić albo odpowiedzieć na swoje prywatne wiadomości." +"Proszę odwiedzić %s, aby wyświetlić albo odpowiedzieć na swoje bezpośrednie " +"wiadomości." -#: ../../Zotlabs/Lib/Enotify.php:144 +#: ../../Zotlabs/Lib/Enotify.php:145 msgid "commented on" msgstr "skomentował" -#: ../../Zotlabs/Lib/Enotify.php:157 +#: ../../Zotlabs/Lib/Enotify.php:158 msgid "liked" msgstr "pochwalone" -#: ../../Zotlabs/Lib/Enotify.php:160 +#: ../../Zotlabs/Lib/Enotify.php:161 msgid "disliked" msgstr "zganione" -#: ../../Zotlabs/Lib/Enotify.php:165 +#: ../../Zotlabs/Lib/Enotify.php:166 msgid "voted on" msgstr "głosował" -#: ../../Zotlabs/Lib/Enotify.php:208 +#: ../../Zotlabs/Lib/Enotify.php:209 #, php-format msgid "%1$s %2$s [zrl=%3$s]a %4$s[/zrl]" msgstr "%1$s %2$s [zrl=%3$s]%4$s[/zrl]" -#: ../../Zotlabs/Lib/Enotify.php:216 +#: ../../Zotlabs/Lib/Enotify.php:217 #, php-format msgid "%1$s %2$s [zrl=%3$s]%4$s's %5$s[/zrl]" msgstr "%1$s %2$s [zrl=%3$s]%5$s %4$s[/zrl]" -#: ../../Zotlabs/Lib/Enotify.php:225 +#: ../../Zotlabs/Lib/Enotify.php:226 #, php-format msgid "%1$s %2$s [zrl=%3$s]your %4$s[/zrl]" msgstr "%1$s %2$s [zrl=%3$s]Twój %4$s[/zrl]" -#: ../../Zotlabs/Lib/Enotify.php:237 +#: ../../Zotlabs/Lib/Enotify.php:238 #, php-format msgid "[$Projectname:Notify] Moderated Comment to conversation #%1$d by %2$s" msgstr "[$Projectname:Notify] Moderowany komentarz do rozmowy #%1$d przez %2$s" -#: ../../Zotlabs/Lib/Enotify.php:239 +#: ../../Zotlabs/Lib/Enotify.php:240 #, php-format msgid "[$Projectname:Notify] Comment to conversation #%1$d by %2$s" msgstr "[$Projectname:Notify] Komentarz do rozmowy #%1$d przez %2$s" -#: ../../Zotlabs/Lib/Enotify.php:240 +#: ../../Zotlabs/Lib/Enotify.php:241 #, php-format msgid "%1$s commented on an item/conversation you have been following." msgstr "%1$s skomentował obserwowany element/rozmowa." -#: ../../Zotlabs/Lib/Enotify.php:243 ../../Zotlabs/Lib/Enotify.php:324 -#: ../../Zotlabs/Lib/Enotify.php:340 ../../Zotlabs/Lib/Enotify.php:365 -#: ../../Zotlabs/Lib/Enotify.php:382 ../../Zotlabs/Lib/Enotify.php:395 +#: ../../Zotlabs/Lib/Enotify.php:244 ../../Zotlabs/Lib/Enotify.php:324 +#: ../../Zotlabs/Lib/Enotify.php:340 ../../Zotlabs/Lib/Enotify.php:364 +#: ../../Zotlabs/Lib/Enotify.php:381 ../../Zotlabs/Lib/Enotify.php:394 #, php-format msgid "Please visit %s to view and/or reply to the conversation." msgstr "Odwiedź %s, aby wyświetlić albo włączyć się do rozmowy." -#: ../../Zotlabs/Lib/Enotify.php:247 ../../Zotlabs/Lib/Enotify.php:248 +#: ../../Zotlabs/Lib/Enotify.php:248 ../../Zotlabs/Lib/Enotify.php:249 #, php-format msgid "Please visit %s to approve or reject this comment." msgstr "Odwiedź %s, aby zaakceptować lub odrzucić ten komentarz." @@ -9352,130 +9356,130 @@ msgstr "%1$s opublikowano na ścianie Twojego profilu pod adresem %2$s" msgid "%1$s posted to [zrl=%2$s]your wall[/zrl]" msgstr "%1$s opublikował na [zrl=%2$s]Twojej ścianie[/zrl]" -#: ../../Zotlabs/Lib/Enotify.php:359 +#: ../../Zotlabs/Lib/Enotify.php:358 #, php-format msgid "[$Projectname:Notify] %s tagged you" msgstr "[$Projectname:Notify]%s oznaczył Cię tagiem" -#: ../../Zotlabs/Lib/Enotify.php:360 +#: ../../Zotlabs/Lib/Enotify.php:359 #, php-format msgid "%1$s tagged you at %2$s" msgstr "%1$s oznaczył Cię tagiem %2$s" -#: ../../Zotlabs/Lib/Enotify.php:361 +#: ../../Zotlabs/Lib/Enotify.php:360 #, php-format msgid "%1$s [zrl=%2$s]tagged you[/zrl]." msgstr "%1$s [zrl=%2$s]oznaczył Cię tagiem[/zrl]." -#: ../../Zotlabs/Lib/Enotify.php:372 +#: ../../Zotlabs/Lib/Enotify.php:371 #, php-format msgid "[$Projectname:Notify] %1$s poked you" msgstr "[$Projectname:Notify] %1$s zaczepił Cię" -#: ../../Zotlabs/Lib/Enotify.php:373 +#: ../../Zotlabs/Lib/Enotify.php:372 #, php-format msgid "%1$s poked you at %2$s" msgstr "%1$s zaczepił Cię %2$s" -#: ../../Zotlabs/Lib/Enotify.php:374 +#: ../../Zotlabs/Lib/Enotify.php:373 #, php-format msgid "%1$s [zrl=%2$s]poked you[/zrl]." msgstr "%1$s [zrl=%2$s]zaczepił Cię[/zrl]." -#: ../../Zotlabs/Lib/Enotify.php:389 +#: ../../Zotlabs/Lib/Enotify.php:388 #, php-format msgid "[$Projectname:Notify] %s tagged your post" msgstr "[$Projectname:Notify] %s oznaczył tagiem Twój wpis" -#: ../../Zotlabs/Lib/Enotify.php:390 +#: ../../Zotlabs/Lib/Enotify.php:389 #, php-format msgid "%1$s tagged your post at %2$s" msgstr "%1$s oznaczył tagiem Twój wpis na %2$s" -#: ../../Zotlabs/Lib/Enotify.php:391 +#: ../../Zotlabs/Lib/Enotify.php:390 #, php-format msgid "%1$s tagged [zrl=%2$s]your post[/zrl]" msgstr "%1$s oznaczył tagiem [zrl=%2$s]Twój wpis[/zrl]" -#: ../../Zotlabs/Lib/Enotify.php:402 +#: ../../Zotlabs/Lib/Enotify.php:401 msgid "[$Projectname:Notify] Introduction received" msgstr "[$Projectname:Notify] Otrzymano prośbę o połączenie" -#: ../../Zotlabs/Lib/Enotify.php:403 +#: ../../Zotlabs/Lib/Enotify.php:402 #, php-format msgid "You've received an new connection request from '%1$s' at %2$s" msgstr "Masz nową prośbę połączenia od „%1$s” na %2$s" -#: ../../Zotlabs/Lib/Enotify.php:404 +#: ../../Zotlabs/Lib/Enotify.php:403 #, php-format msgid "You've received [zrl=%1$s]a new connection request[/zrl] from %2$s." msgstr "Masz [zrl=%1$s]nową prośbę połączenia [/zrl] od %2$s." -#: ../../Zotlabs/Lib/Enotify.php:407 ../../Zotlabs/Lib/Enotify.php:425 +#: ../../Zotlabs/Lib/Enotify.php:406 ../../Zotlabs/Lib/Enotify.php:424 #, php-format msgid "You may visit their profile at %s" msgstr "Możesz odwiedzić ich profil na %s" -#: ../../Zotlabs/Lib/Enotify.php:409 +#: ../../Zotlabs/Lib/Enotify.php:408 #, php-format msgid "Please visit %s to approve or reject the connection request." msgstr "Odwiedź %s, aby zatwierdzić lub odrzucić prośbę o połączenie." -#: ../../Zotlabs/Lib/Enotify.php:416 +#: ../../Zotlabs/Lib/Enotify.php:415 msgid "[$Projectname:Notify] Friend suggestion received" msgstr "[$Projectname:Notify] Otrzymano propozycję znajomości" -#: ../../Zotlabs/Lib/Enotify.php:417 +#: ../../Zotlabs/Lib/Enotify.php:416 #, php-format msgid "You've received a friend suggestion from '%1$s' at %2$s" msgstr "Masz propozycję znajomości od '%1$s' na %2$s" -#: ../../Zotlabs/Lib/Enotify.php:418 +#: ../../Zotlabs/Lib/Enotify.php:417 #, php-format msgid "You've received [zrl=%1$s]a friend suggestion[/zrl] for %2$s from %3$s." msgstr "Masz [zrl=%1$s] propozycję znajomości[/ zrl] dla %2$s od %3$s." -#: ../../Zotlabs/Lib/Enotify.php:423 +#: ../../Zotlabs/Lib/Enotify.php:422 msgid "Name:" msgstr "Nazwa:" -#: ../../Zotlabs/Lib/Enotify.php:424 +#: ../../Zotlabs/Lib/Enotify.php:423 msgid "Photo:" msgstr "Zdjęcie:" -#: ../../Zotlabs/Lib/Enotify.php:427 +#: ../../Zotlabs/Lib/Enotify.php:426 #, php-format msgid "Please visit %s to approve or reject the suggestion." msgstr "Odwiedź %s, aby zaakceptować lub odrzucić propozycję." -#: ../../Zotlabs/Lib/Enotify.php:652 +#: ../../Zotlabs/Lib/Enotify.php:651 msgid "[$Projectname:Notify]" msgstr "[$Projectname:Notify]" -#: ../../Zotlabs/Lib/Enotify.php:820 +#: ../../Zotlabs/Lib/Enotify.php:819 msgid "created a new poll" msgstr "utworzył nową ankietę" -#: ../../Zotlabs/Lib/Enotify.php:820 +#: ../../Zotlabs/Lib/Enotify.php:819 msgid "created a new post" msgstr "utworzył nowy wpis" -#: ../../Zotlabs/Lib/Enotify.php:821 +#: ../../Zotlabs/Lib/Enotify.php:820 #, php-format msgid "voted on %s's poll" msgstr "głosował w ankiecie %s" -#: ../../Zotlabs/Lib/Enotify.php:821 +#: ../../Zotlabs/Lib/Enotify.php:820 #, php-format msgid "commented on %s's post" msgstr "skomentował wpis %s" -#: ../../Zotlabs/Lib/Enotify.php:825 +#: ../../Zotlabs/Lib/Enotify.php:824 #, php-format msgid "repeated %s's post" msgstr "powtórzony wpis %s" -#: ../../Zotlabs/Lib/Enotify.php:829 ../../Zotlabs/Lib/Enotify.php:931 +#: ../../Zotlabs/Lib/Enotify.php:828 ../../Zotlabs/Lib/Enotify.php:927 msgid "shared a file with you" msgstr "udostępnił Ci plik" @@ -9484,32 +9488,32 @@ msgstr "udostępnił Ci plik" msgid "edited a post dated %s" msgstr "edytował wpis z dnia %s" -#: ../../Zotlabs/Lib/Enotify.php:841 +#: ../../Zotlabs/Lib/Enotify.php:840 #, php-format msgid "edited a comment dated %s" msgstr "edytował komentarz z dnia %s" -#: ../../Zotlabs/Lib/Enotify.php:914 +#: ../../Zotlabs/Lib/Enotify.php:912 msgid "added your channel" msgstr "dodał Twój kanał" -#: ../../Zotlabs/Lib/Enotify.php:948 -msgid "sent you a private message" -msgstr "wysłał Ci prywatną wiadomość" +#: ../../Zotlabs/Lib/Enotify.php:942 +msgid "sent you a direct message" +msgstr "wysłał Ci wiadomość bez[ośrednią" -#: ../../Zotlabs/Lib/Enotify.php:957 +#: ../../Zotlabs/Lib/Enotify.php:949 msgid "g A l F d" msgstr "g A l F d" -#: ../../Zotlabs/Lib/Enotify.php:960 +#: ../../Zotlabs/Lib/Enotify.php:952 msgid "[today]" msgstr "[dzisiaj]" -#: ../../Zotlabs/Lib/Enotify.php:970 +#: ../../Zotlabs/Lib/Enotify.php:962 msgid "created an event" msgstr "utworzono wydarzenie" -#: ../../Zotlabs/Lib/Enotify.php:986 +#: ../../Zotlabs/Lib/Enotify.php:977 msgid "status verified" msgstr "status został zweryfikowany" @@ -9592,11 +9596,11 @@ msgid "Compare" msgstr "Porównaj" #: ../../Zotlabs/Lib/NativeWikiPage.php:618 ../../include/bbcode.php:1050 -#: ../../include/bbcode.php:1217 +#: ../../include/bbcode.php:1238 msgid "Different viewers will see this text differently" msgstr "Różni widzowie będą inaczej widzieć ten tekst" -#: ../../Zotlabs/Lib/ThreadItem.php:103 ../../include/conversation.php:739 +#: ../../Zotlabs/Lib/ThreadItem.php:103 ../../include/conversation.php:742 msgid "Private Message" msgstr "Wiadomość prywatna" @@ -9633,23 +9637,23 @@ msgid "I abstain" msgstr "Wstrzymuję się" # Sprawdzić w kontekscie! -#: ../../Zotlabs/Lib/ThreadItem.php:274 ../../include/conversation.php:734 +#: ../../Zotlabs/Lib/ThreadItem.php:274 ../../include/conversation.php:736 msgid "Toggle Star Status" msgstr "Przełącz stan gwiazdki" #: ../../Zotlabs/Lib/ThreadItem.php:285 ../../Zotlabs/Widget/Pinned.php:88 -#: ../../include/conversation.php:748 +#: ../../include/conversation.php:751 msgid "Message signature validated" msgstr "Podpis wiadomości został zatwierdzony" #: ../../Zotlabs/Lib/ThreadItem.php:286 ../../Zotlabs/Widget/Pinned.php:89 -#: ../../include/conversation.php:749 +#: ../../include/conversation.php:752 msgid "Message signature incorrect" msgstr "Niepoprawny podpis wiadomości" -#: ../../Zotlabs/Lib/ThreadItem.php:302 ../../include/conversation.php:935 -msgid "Conversation Tools" -msgstr "Narzędzia do konwersacji" +#: ../../Zotlabs/Lib/ThreadItem.php:302 ../../include/conversation.php:943 +msgid "Conversation Features" +msgstr "Funkcje rozmów" #: ../../Zotlabs/Lib/ThreadItem.php:318 ../../include/taxonomy.php:584 msgid "like" @@ -9700,7 +9704,8 @@ msgstr "%d nie zobaczone" msgid "to" msgstr "do" -#: ../../Zotlabs/Lib/ThreadItem.php:414 ../../Zotlabs/Widget/Pinned.php:127 +#: ../../Zotlabs/Lib/ThreadItem.php:414 ../../Zotlabs/Widget/Messages.php:93 +#: ../../Zotlabs/Widget/Pinned.php:127 msgid "via" msgstr "poprzez" @@ -9713,19 +9718,19 @@ msgid "via Wall-To-Wall:" msgstr "poprzez rozwinięcie:" #: ../../Zotlabs/Lib/ThreadItem.php:430 ../../Zotlabs/Widget/Pinned.php:132 -#: ../../include/conversation.php:809 +#: ../../include/conversation.php:817 #, php-format msgid "from %s" msgstr "od %s" #: ../../Zotlabs/Lib/ThreadItem.php:433 ../../Zotlabs/Widget/Pinned.php:135 -#: ../../include/conversation.php:812 +#: ../../include/conversation.php:820 #, php-format msgid "last edited: %s" msgstr "ostatnio edytowane: %s" #: ../../Zotlabs/Lib/ThreadItem.php:434 ../../Zotlabs/Widget/Pinned.php:136 -#: ../../include/conversation.php:813 +#: ../../include/conversation.php:821 #, php-format msgid "Expires: %s" msgstr "Wygasa: %s" @@ -9738,7 +9743,7 @@ msgstr "Uczestnicz" msgid "Attendance Options" msgstr "Opcje uczestnictwa" -#: ../../Zotlabs/Lib/ThreadItem.php:446 ../../include/text.php:1906 +#: ../../Zotlabs/Lib/ThreadItem.php:446 ../../include/text.php:1921 msgid "Vote" msgstr "Głosuj" @@ -9781,27 +9786,27 @@ msgstr "Ten podgląd nie został zapisany" msgid "%s show all" msgstr "%s pokaż wszystko" -#: ../../Zotlabs/Lib/ThreadItem.php:828 ../../include/conversation.php:1446 +#: ../../Zotlabs/Lib/ThreadItem.php:828 ../../include/conversation.php:1455 #: ../../extend/addon/hubzilla-addons/hsse/hsse.php:200 msgid "Bold" msgstr "Grube" -#: ../../Zotlabs/Lib/ThreadItem.php:829 ../../include/conversation.php:1447 +#: ../../Zotlabs/Lib/ThreadItem.php:829 ../../include/conversation.php:1456 #: ../../extend/addon/hubzilla-addons/hsse/hsse.php:201 msgid "Italic" msgstr "Pochyłe" -#: ../../Zotlabs/Lib/ThreadItem.php:830 ../../include/conversation.php:1448 +#: ../../Zotlabs/Lib/ThreadItem.php:830 ../../include/conversation.php:1457 #: ../../extend/addon/hubzilla-addons/hsse/hsse.php:202 msgid "Underline" msgstr "Podkreślone" -#: ../../Zotlabs/Lib/ThreadItem.php:831 ../../include/conversation.php:1449 +#: ../../Zotlabs/Lib/ThreadItem.php:831 ../../include/conversation.php:1458 #: ../../extend/addon/hubzilla-addons/hsse/hsse.php:203 msgid "Quote" msgstr "Cytat" -#: ../../Zotlabs/Lib/ThreadItem.php:832 ../../include/conversation.php:1450 +#: ../../Zotlabs/Lib/ThreadItem.php:832 ../../include/conversation.php:1459 #: ../../extend/addon/hubzilla-addons/hsse/hsse.php:204 msgid "Code" msgstr "Kod" @@ -9810,7 +9815,7 @@ msgstr "Kod" msgid "Image" msgstr "Obraz" -#: ../../Zotlabs/Lib/ThreadItem.php:834 ../../include/conversation.php:1451 +#: ../../Zotlabs/Lib/ThreadItem.php:834 ../../include/conversation.php:1460 #: ../../extend/addon/hubzilla-addons/hsse/hsse.php:205 msgid "Attach/Upload file" msgstr "Załącz/Prześlij plik" @@ -9835,41 +9840,41 @@ msgstr "Twój adres e-mail (wymagane)" msgid "Your website URL (optional)" msgstr "Adres URL Twojego portalu (opcjonalnie)" -#: ../../Zotlabs/Lib/Activity.php:2159 +#: ../../Zotlabs/Lib/Activity.php:2164 #, php-format msgid "Likes %1$s's %2$s" msgstr "Pochwalił %2$s %1$s" -#: ../../Zotlabs/Lib/Activity.php:2162 +#: ../../Zotlabs/Lib/Activity.php:2167 #, php-format msgid "Doesn't like %1$s's %2$s" msgstr "Zganił %2$s %1$s" -#: ../../Zotlabs/Lib/Activity.php:2168 +#: ../../Zotlabs/Lib/Activity.php:2173 #, php-format msgid "Will attend %s's event" msgstr "Weźmie udział w wydarzeniu %s" -#: ../../Zotlabs/Lib/Activity.php:2171 +#: ../../Zotlabs/Lib/Activity.php:2176 #, php-format msgid "Will not attend %s's event" msgstr "Nie weźmie udziału w wydarzeniu %s" -#: ../../Zotlabs/Lib/Activity.php:2174 +#: ../../Zotlabs/Lib/Activity.php:2179 #, php-format msgid "May attend %s's event" msgstr "Może uczestniczyć w wydarzeniu %s" -#: ../../Zotlabs/Lib/Activity.php:2177 +#: ../../Zotlabs/Lib/Activity.php:2182 #, php-format msgid "May not attend %s's event" msgstr "Nie może uczestniczyć w wydarzeniu %s" -#: ../../Zotlabs/Lib/Activity.php:3098 ../../Zotlabs/Lib/Activity.php:3290 +#: ../../Zotlabs/Lib/Activity.php:3102 ../../Zotlabs/Lib/Activity.php:3294 #: ../../include/network.php:1742 -#: ../../extend/addon/hubzilla-addons/pubcrawl/as.php:1500 -#: ../../extend/addon/hubzilla-addons/pubcrawl/as.php:1949 -#: ../../extend/addon/hubzilla-addons/pubcrawl/as.php:2157 +#: ../../extend/addon/hubzilla-addons/pubcrawl/as.php:1292 +#: ../../extend/addon/hubzilla-addons/pubcrawl/as.php:1764 +#: ../../extend/addon/hubzilla-addons/pubcrawl/as.php:1972 msgid "ActivityPub" msgstr "ActivityPub" @@ -9881,19 +9886,19 @@ msgstr "Wiki zaktualizowane pomyślnie" msgid "Wiki files deleted successfully" msgstr "Pliki Wiki zostały pomyślnie usunięte" -#: ../../Zotlabs/Lib/Libzotdir.php:163 ../../include/dir_fns.php:142 +#: ../../Zotlabs/Lib/Libzotdir.php:163 msgid "Directory Options" msgstr "Opcje katalogu" -#: ../../Zotlabs/Lib/Libzotdir.php:165 ../../include/dir_fns.php:144 +#: ../../Zotlabs/Lib/Libzotdir.php:165 msgid "Safe Mode" msgstr "Tryb bezpieczny" -#: ../../Zotlabs/Lib/Libzotdir.php:166 ../../include/dir_fns.php:145 +#: ../../Zotlabs/Lib/Libzotdir.php:166 msgid "Public Forums Only" msgstr "Tylko fora publiczne" -#: ../../Zotlabs/Lib/Libzotdir.php:168 ../../include/dir_fns.php:146 +#: ../../Zotlabs/Lib/Libzotdir.php:168 msgid "This Website Only" msgstr "Tylko ten portal" @@ -10080,6 +10085,22 @@ msgstr "Wybierz książkę adresową do zaimportowania" msgid "Saved Folders" msgstr "Zapisywane foldery" +#: ../../Zotlabs/Widget/Messages.php:24 +msgid "Public and restricted messages" +msgstr "Wiadomości publiczne i zastrzeżone" + +#: ../../Zotlabs/Widget/Messages.php:25 +msgid "Direct messages" +msgstr "Wiadomości bezpośrednie" + +#: ../../Zotlabs/Widget/Messages.php:26 +msgid "Starred messages" +msgstr "Wyróżnione wiadomości" + +#: ../../Zotlabs/Widget/Messages.php:28 +msgid "No messages" +msgstr "Brak wiadomości" + #: ../../Zotlabs/Widget/Tagcloud.php:22 ../../include/taxonomy.php:323 #: ../../include/taxonomy.php:460 ../../include/taxonomy.php:481 msgid "Tags" @@ -10251,13 +10272,13 @@ msgstr "Skrzynka nadawcza" msgid "Refresh" msgstr "Odśwież" -#: ../../Zotlabs/Widget/Hq_controls.php:14 -msgid "HQ Control Panel" -msgstr "Panel kontrolny HQ" - #: ../../Zotlabs/Widget/Hq_controls.php:17 -msgid "Create a new post" -msgstr "Utwórz nowy wpis" +msgid "Toggle post editor" +msgstr "Przełącz edytor wpisów" + +#: ../../Zotlabs/Widget/Hq_controls.php:28 +msgid "Toggle personal notes" +msgstr "Przełącz notatki osobiste" #: ../../Zotlabs/Widget/Eventstools.php:13 msgid "Events Tools" @@ -10272,6 +10293,7 @@ msgid "Import Calendar" msgstr "Import kalendarza" #: ../../Zotlabs/Widget/Activity_filter.php:37 +#: ../../Zotlabs/Widget/Notifications.php:55 msgid "Direct Messages" msgstr "Bezpośrednie wiadomości" @@ -10280,6 +10302,7 @@ msgid "Show direct (private) messages" msgstr "Pokaż bezpośrednie (prywatne) wiadomości" #: ../../Zotlabs/Widget/Activity_filter.php:46 +#: ../../Zotlabs/Widget/Notifications.php:74 msgid "Events" msgstr "Wydarzenia" @@ -10358,17 +10381,13 @@ msgctxt "widget" msgid "Activity" msgstr "Aktywność" -#: ../../Zotlabs/Widget/Notifications.php:16 -msgid "New Network Activity" -msgstr "Nowa aktywność sieciowa" - #: ../../Zotlabs/Widget/Notifications.php:17 -msgid "New Network Activity Notifications" +msgid "New network activity notifications" msgstr "Powiadomienia o nowej aktywności sieciowej" #: ../../Zotlabs/Widget/Notifications.php:20 -msgid "View your network activity" -msgstr "Wyświetl swoją aktywność w sieci" +msgid "Network stream" +msgstr "Strumień sieciowy" #: ../../Zotlabs/Widget/Notifications.php:23 #: ../../Zotlabs/Widget/Notifications.php:62 @@ -10390,42 +10409,29 @@ msgstr "Pokaż tylko nowe wpisy" msgid "Filter by name or address" msgstr "Filtruj wg nazwy lub adresu" -# Sprawdzić w kontekście! -#: ../../Zotlabs/Widget/Notifications.php:36 -msgid "New Home Activity" -msgstr "Nowa aktywność domowa" - #: ../../Zotlabs/Widget/Notifications.php:37 -msgid "New Home Activity Notifications" +msgid "New home activity notifications" msgstr "Powiadomienia o nowej aktywności domowej" #: ../../Zotlabs/Widget/Notifications.php:40 -msgid "View your home activity" -msgstr "Wyświetl swoją aktywność domową" +msgid "Home stream" +msgstr "Strumień domowy" #: ../../Zotlabs/Widget/Notifications.php:43 #: ../../Zotlabs/Widget/Notifications.php:154 msgid "Mark all notifications seen" msgstr "Oznacz wszystkie powiadomienia jako oglądnięte" -#: ../../Zotlabs/Widget/Notifications.php:55 -msgid "New Direct Messages" -msgstr "Nowe bezpośrednie wiadomości" - #: ../../Zotlabs/Widget/Notifications.php:56 -msgid "New Direct Messages Notifications" +msgid "New direct messages notifications" msgstr "Powiadomienia o nowych wiadomościach bezpośrednich" #: ../../Zotlabs/Widget/Notifications.php:59 -msgid "View your direct messages" -msgstr "Wyświetl swoje bezpośrednie wiadomości" - -#: ../../Zotlabs/Widget/Notifications.php:74 -msgid "New Events" -msgstr "Nowe wydarzenia" +msgid "Direct messages stream" +msgstr "Strumień wiadomości bezpośrednich" #: ../../Zotlabs/Widget/Notifications.php:75 -msgid "New Events Notifications" +msgid "New events notifications" msgstr "Powiadomienia o nowych wydarzeniach" #: ../../Zotlabs/Widget/Notifications.php:78 @@ -10437,19 +10443,15 @@ msgid "Mark all events seen" msgstr "Oznacza wydarzenia jako oglądnięte" #: ../../Zotlabs/Widget/Notifications.php:90 -msgid "New Connections Notifications" +msgid "New connections notifications" msgstr "Powiadomienia o nowych połączeniach" #: ../../Zotlabs/Widget/Notifications.php:93 msgid "View all connections" msgstr "Pokaż wszystkie połączenia" -#: ../../Zotlabs/Widget/Notifications.php:101 -msgid "New Files" -msgstr "Nowe pliki" - #: ../../Zotlabs/Widget/Notifications.php:102 -msgid "New Files Notifications" +msgid "New files notifications" msgstr "Powiadomienia o nowych plikach" #: ../../Zotlabs/Widget/Notifications.php:109 @@ -10466,22 +10468,22 @@ msgid "Mark all notices seen" msgstr "Oznacz wszystkie powiadomienia jako oglądnięte" #: ../../Zotlabs/Widget/Notifications.php:137 -msgid "New Registrations" -msgstr "Nowe rejestracje" +msgid "Registrations" +msgstr "Rejestracje" #: ../../Zotlabs/Widget/Notifications.php:138 -msgid "New Registrations Notifications" +msgid "New registrations notifications" msgstr "Powiadomienia o nowych rejestracjach" #: ../../Zotlabs/Widget/Notifications.php:148 -msgid "Public Stream Notifications" -msgstr "Powiadomienia o strumieniu publicznym" +msgid "New public stream notifications" +msgstr "Powiadomienia o nowym strumieniu publicznym" #: ../../Zotlabs/Widget/Notifications.php:151 -msgid "View the public stream" -msgstr "Pokaż strumień publiczny" +msgid "Public stream" +msgstr "Strumień publiczny" -#: ../../Zotlabs/Widget/Notifications.php:166 +#: ../../Zotlabs/Widget/Notifications.php:165 msgid "Sorry, you have got no notifications at the moment" msgstr "W tej chwili nie masz żadnych powiadomień" @@ -10667,67 +10669,67 @@ msgstr "%1$s jest teraz połączony z %2$s" msgid "%1$s poked %2$s" msgstr "%1$s zaczepił %2$s" -#: ../../include/conversation.php:267 ../../include/text.php:1236 -#: ../../include/text.php:1240 +#: ../../include/conversation.php:267 ../../include/text.php:1237 +#: ../../include/text.php:1241 msgid "poked" msgstr "zaczepiony" -#: ../../include/conversation.php:781 +#: ../../include/conversation.php:789 #, php-format msgid "View %s's profile @ %s" msgstr "Pokaż profil @ %s %s" -#: ../../include/conversation.php:802 +#: ../../include/conversation.php:810 msgid "Categories:" msgstr "Kategorie:" -#: ../../include/conversation.php:803 +#: ../../include/conversation.php:811 msgid "Filed under:" msgstr "Skategoryzowane pod:" -#: ../../include/conversation.php:828 +#: ../../include/conversation.php:836 msgid "View in context" msgstr "Zobacz w kontekście" -#: ../../include/conversation.php:930 +#: ../../include/conversation.php:938 msgid "remove" msgstr "usuń" -#: ../../include/conversation.php:934 +#: ../../include/conversation.php:942 msgid "Loading..." msgstr "Ładowanie ..." -#: ../../include/conversation.php:936 +#: ../../include/conversation.php:944 msgid "Delete Selected Items" msgstr "Usuń wybrane elementy" -#: ../../include/conversation.php:980 +#: ../../include/conversation.php:988 msgid "View Source" msgstr "Pokaż źródło" -#: ../../include/conversation.php:990 +#: ../../include/conversation.php:998 msgid "Follow Thread" msgstr "Obserwuj wątek" -#: ../../include/conversation.php:999 +#: ../../include/conversation.php:1007 msgid "Unfollow Thread" msgstr "Przestań obserwować wątek" -#: ../../include/conversation.php:1108 +#: ../../include/conversation.php:1116 msgid "Edit Connection" msgstr "Edytuj połączenie" -#: ../../include/conversation.php:1260 +#: ../../include/conversation.php:1268 #, php-format msgid "%s likes this." msgstr "%s pochwalił to." -#: ../../include/conversation.php:1260 +#: ../../include/conversation.php:1268 #, php-format msgid "%s doesn't like this." msgstr "%s zganił to." -#: ../../include/conversation.php:1264 +#: ../../include/conversation.php:1272 #, php-format msgid "<span %1$s>%2$d people</span> like this." msgid_plural "<span %1$s>%2$d people</span> like this." @@ -10735,7 +10737,7 @@ msgstr[0] "<span %1$s>%2$d osoba</span> pochwaliła to." msgstr[1] "<span %1$s>%2$d osoby</span> pochwaliły to." msgstr[2] "<span %1$s>%2$d osób</span> pochwaliło to." -#: ../../include/conversation.php:1266 +#: ../../include/conversation.php:1274 #, php-format msgid "<span %1$s>%2$d people</span> don't like this." msgid_plural "<span %1$s>%2$d people</span> don't like this." @@ -10743,11 +10745,11 @@ msgstr[0] "<span %1$s>%2$d osoba</span> zganiła to." msgstr[1] "<span %1$s>%2$d osoby</span> zganiły to." msgstr[2] "<span %1$s>%2$d osób</span> zganiło to." -#: ../../include/conversation.php:1272 +#: ../../include/conversation.php:1280 msgid "and" msgstr "i" -#: ../../include/conversation.php:1275 +#: ../../include/conversation.php:1283 #, php-format msgid ", and %d other people" msgid_plural ", and %d other people" @@ -10755,141 +10757,140 @@ msgstr[0] ", oraz %d inna osoba" msgstr[1] ", oraz %d inne osoby" msgstr[2] ", oraz %d innych osób" -#: ../../include/conversation.php:1276 +#: ../../include/conversation.php:1284 #, php-format msgid "%s like this." msgstr "%s pochwala to." -#: ../../include/conversation.php:1276 +#: ../../include/conversation.php:1284 #, php-format msgid "%s don't like this." msgstr "%s gani to." -#: ../../include/conversation.php:1327 +#: ../../include/conversation.php:1335 #: ../../extend/addon/hubzilla-addons/hsse/hsse.php:82 msgid "Set your location" msgstr "Ustaw swoją lokalizację" -#: ../../include/conversation.php:1328 +#: ../../include/conversation.php:1336 #: ../../extend/addon/hubzilla-addons/hsse/hsse.php:83 msgid "Clear browser location" msgstr "Wyczyść lokalizację przeglądarki" -#: ../../include/conversation.php:1344 +#: ../../include/conversation.php:1352 #: ../../extend/addon/hubzilla-addons/hsse/hsse.php:99 msgid "Embed (existing) photo from your photo albums" msgstr "Osadź (istniejące) zdjęcie z albumów ze zdjęciami" -#: ../../include/conversation.php:1378 +#: ../../include/conversation.php:1386 #: ../../extend/addon/hubzilla-addons/hsse/hsse.php:135 msgid "Tag term:" msgstr "Nazwa tagu:" -#: ../../include/conversation.php:1379 +#: ../../include/conversation.php:1387 #: ../../extend/addon/hubzilla-addons/hsse/hsse.php:136 msgid "Where are you right now?" msgstr "Gdzie teraz jesteś?" -#: ../../include/conversation.php:1384 +#: ../../include/conversation.php:1392 #: ../../extend/addon/hubzilla-addons/hsse/hsse.php:141 msgid "Choose a different album..." msgstr "Wybierz inny album..." -#: ../../include/conversation.php:1388 +#: ../../include/conversation.php:1396 #: ../../extend/addon/hubzilla-addons/hsse/hsse.php:145 msgid "Comments enabled" msgstr "Włączone komentowanie" -#: ../../include/conversation.php:1389 +#: ../../include/conversation.php:1397 #: ../../extend/addon/hubzilla-addons/hsse/hsse.php:146 msgid "Comments disabled" msgstr "Wyłączone komentowanie" -#: ../../include/conversation.php:1441 +#: ../../include/conversation.php:1450 #: ../../extend/addon/hubzilla-addons/hsse/hsse.php:195 msgid "Page link name" msgstr "Nazwa linku do strony" -#: ../../include/conversation.php:1444 +#: ../../include/conversation.php:1453 #: ../../extend/addon/hubzilla-addons/hsse/hsse.php:198 msgid "Post as" msgstr "Opublikuj jako" -#: ../../include/conversation.php:1458 +#: ../../include/conversation.php:1467 #: ../../extend/addon/hubzilla-addons/hsse/hsse.php:212 msgid "Toggle voting" msgstr "Przełącz głosowanie" -#: ../../include/conversation.php:1459 +#: ../../include/conversation.php:1468 msgid "Toggle poll" msgstr "Przełącz ankietę" -#: ../../include/conversation.php:1460 +#: ../../include/conversation.php:1469 msgid "Option" msgstr "Opcja" -#: ../../include/conversation.php:1461 +#: ../../include/conversation.php:1470 msgid "Add option" msgstr "Dodaj opcję" -#: ../../include/conversation.php:1462 +#: ../../include/conversation.php:1471 msgid "Minutes" msgstr "Minuty" -#: ../../include/conversation.php:1462 +#: ../../include/conversation.php:1471 msgid "Hours" msgstr "Godziny" -#: ../../include/conversation.php:1462 +#: ../../include/conversation.php:1471 msgid "Days" msgstr "Dni" -#: ../../include/conversation.php:1463 +#: ../../include/conversation.php:1472 msgid "Allow multiple answers" msgstr "Zezwalaj na wiele odpowiedzi" -#: ../../include/conversation.php:1465 +#: ../../include/conversation.php:1474 #: ../../extend/addon/hubzilla-addons/hsse/hsse.php:215 msgid "Disable comments" msgstr "Wyłącz komentarze" -#: ../../include/conversation.php:1466 +#: ../../include/conversation.php:1475 #: ../../extend/addon/hubzilla-addons/hsse/hsse.php:216 msgid "Toggle comments" msgstr "Przełącz komentarze" -#: ../../include/conversation.php:1473 +#: ../../include/conversation.php:1482 msgid "Summary (optional)" msgstr "Streszczenie (opcjonalnie)" -#: ../../include/conversation.php:1476 +#: ../../include/conversation.php:1485 #: ../../extend/addon/hubzilla-addons/hsse/hsse.php:224 msgid "Categories (optional, comma-separated list)" msgstr "Kategorie (opcjonalnie, lista rozdzielana przecinkami)" -#: ../../include/conversation.php:1477 +#: ../../include/conversation.php:1486 #: ../../extend/addon/hubzilla-addons/hsse/hsse.php:225 msgid "Permission settings" msgstr "Ustawienia dostępu" -#: ../../include/conversation.php:1499 +#: ../../include/conversation.php:1508 #: ../../extend/addon/hubzilla-addons/hsse/hsse.php:247 msgid "Other networks and post services" msgstr "Inne sieci i usługi społecznościowe" -#: ../../include/conversation.php:1502 +#: ../../include/conversation.php:1511 #: ../../extend/addon/hubzilla-addons/hsse/hsse.php:250 -#: ../../extend/addon/hubzilla-addons/mail/Mod_Mail.php:171 -#: ../../extend/addon/hubzilla-addons/mail/Mod_Mail.php:314 +#: ../../extend/addon/hubzilla-addons/mail/Mod_Mail.php:209 msgid "Set expiration date" msgstr "Ustaw datę wygaśnięcia" -#: ../../include/conversation.php:1505 +#: ../../include/conversation.php:1514 #: ../../extend/addon/hubzilla-addons/hsse/hsse.php:253 msgid "Set publish date" msgstr "Ustaw datę publikacji" -#: ../../include/conversation.php:1750 +#: ../../include/conversation.php:1760 msgctxt "noun" msgid "Attending" msgid_plural "Attending" @@ -10897,7 +10898,7 @@ msgstr[0] "Uczestniczy" msgstr[1] "Uczestniczy" msgstr[2] "Uczestniczy" -#: ../../include/conversation.php:1753 +#: ../../include/conversation.php:1763 msgctxt "noun" msgid "Not Attending" msgid_plural "Not Attending" @@ -10905,7 +10906,7 @@ msgstr[0] "Nie uczestniczy" msgstr[1] "Nie uczestniczy" msgstr[2] "Nie uczestniczy" -#: ../../include/conversation.php:1756 +#: ../../include/conversation.php:1766 msgctxt "noun" msgid "Undecided" msgid_plural "Undecided" @@ -10913,7 +10914,7 @@ msgstr[0] "Niezdecydowany" msgstr[1] "Niezdecydowane" msgstr[2] "Niezdecydowanych" -#: ../../include/conversation.php:1759 +#: ../../include/conversation.php:1769 msgctxt "noun" msgid "Agree" msgid_plural "Agrees" @@ -10921,7 +10922,7 @@ msgstr[0] "Zgadza się" msgstr[1] "Zgadają się" msgstr[2] "Zgadza się" -#: ../../include/conversation.php:1762 +#: ../../include/conversation.php:1772 msgctxt "noun" msgid "Disagree" msgid_plural "Disagrees" @@ -10929,7 +10930,7 @@ msgstr[0] "Nie zgadza się" msgstr[1] "Nie zgadzają się" msgstr[2] "Nie zgadza się" -#: ../../include/conversation.php:1765 +#: ../../include/conversation.php:1775 msgctxt "noun" msgid "Abstain" msgid_plural "Abstains" @@ -10974,7 +10975,7 @@ msgid "Create New Profile" msgstr "Utwórz nowy profil" #: ../../include/channel.php:1490 ../../include/nav.php:120 -#: ../../extend/addon/hubzilla-addons/openclipatar/openclipatar.php:58 +#: ../../extend/addon/hubzilla-addons/openclipatar/openclipatar.php:59 msgid "Edit Profile" msgstr "Edytuj profil" @@ -11426,390 +11427,391 @@ msgstr "Uwierzytelnianie nie powiodło się" msgid "Login failed." msgstr "Logowanie nie powiodło się." -#: ../../include/text.php:523 +#: ../../include/text.php:524 msgid "prev" msgstr "poprzedni" -#: ../../include/text.php:525 +#: ../../include/text.php:526 msgid "first" msgstr "pierwszy" -#: ../../include/text.php:554 +#: ../../include/text.php:555 msgid "last" msgstr "ostatni" -#: ../../include/text.php:557 +#: ../../include/text.php:558 msgid "next" msgstr "następny" -#: ../../include/text.php:575 +#: ../../include/text.php:576 msgid "older" msgstr "starszy" -#: ../../include/text.php:577 +#: ../../include/text.php:578 msgid "newer" msgstr "nowszy" -#: ../../include/text.php:1018 +#: ../../include/text.php:1019 msgid "No connections" msgstr "Brak połączeń" -#: ../../include/text.php:1070 +#: ../../include/text.php:1071 #, php-format msgid "View all %s connections" msgstr "Wyświetl wszystkie połączenia %s" -#: ../../include/text.php:1133 +#: ../../include/text.php:1134 #, php-format msgid "Network: %s" msgstr "Sieć: %s" -#: ../../include/text.php:1236 ../../include/text.php:1240 +#: ../../include/text.php:1237 ../../include/text.php:1241 msgid "poke" msgstr "szturchnij" -#: ../../include/text.php:1241 +#: ../../include/text.php:1242 msgid "ping" msgstr "spinguj" -#: ../../include/text.php:1241 +#: ../../include/text.php:1242 msgid "pinged" msgstr "spingowany" -#: ../../include/text.php:1242 +#: ../../include/text.php:1243 msgid "prod" msgstr "zaczep" -#: ../../include/text.php:1242 +#: ../../include/text.php:1243 msgid "prodded" msgstr "zaczepiony" -#: ../../include/text.php:1243 +#: ../../include/text.php:1244 msgid "slap" msgstr "uderz" -#: ../../include/text.php:1243 +#: ../../include/text.php:1244 msgid "slapped" msgstr "uderzony" -#: ../../include/text.php:1244 +#: ../../include/text.php:1245 msgid "finger" msgstr "dotknij" -#: ../../include/text.php:1244 +#: ../../include/text.php:1245 msgid "fingered" msgstr "dotknięty" -#: ../../include/text.php:1245 +#: ../../include/text.php:1246 msgid "rebuff" msgstr "odpraw" -#: ../../include/text.php:1245 +#: ../../include/text.php:1246 msgid "rebuffed" msgstr "odprawiony" -#: ../../include/text.php:1268 +#: ../../include/text.php:1269 msgid "happy" msgstr "szczęśliwy" -#: ../../include/text.php:1269 +#: ../../include/text.php:1270 msgid "sad" msgstr "smutny" -#: ../../include/text.php:1270 +#: ../../include/text.php:1271 msgid "mellow" msgstr "łagodny" -#: ../../include/text.php:1271 +#: ../../include/text.php:1272 msgid "tired" msgstr "zmęczony" -#: ../../include/text.php:1272 +#: ../../include/text.php:1273 msgid "perky" msgstr "dziarski" -#: ../../include/text.php:1273 +#: ../../include/text.php:1274 msgid "angry" msgstr "gniewny" -#: ../../include/text.php:1274 +#: ../../include/text.php:1275 msgid "stupefied" msgstr "oszołomiony" -#: ../../include/text.php:1275 +#: ../../include/text.php:1276 msgid "puzzled" msgstr "zdziwiony" -#: ../../include/text.php:1276 +#: ../../include/text.php:1277 msgid "interested" msgstr "zainteresowany" -#: ../../include/text.php:1277 +#: ../../include/text.php:1278 msgid "bitter" msgstr "gorzki" -#: ../../include/text.php:1278 +#: ../../include/text.php:1279 msgid "cheerful" msgstr "wesoły" -#: ../../include/text.php:1279 +#: ../../include/text.php:1280 msgid "alive" msgstr "ożywiony" -#: ../../include/text.php:1280 +#: ../../include/text.php:1281 msgid "annoyed" msgstr "zirytowany" -#: ../../include/text.php:1281 +#: ../../include/text.php:1282 msgid "anxious" msgstr "niespokojny" -#: ../../include/text.php:1282 +#: ../../include/text.php:1283 msgid "cranky" msgstr "zepsuty" -#: ../../include/text.php:1283 +#: ../../include/text.php:1284 msgid "disturbed" msgstr "zaniepokojony" -#: ../../include/text.php:1284 +#: ../../include/text.php:1285 msgid "frustrated" msgstr "sfrustrowany" -#: ../../include/text.php:1285 +#: ../../include/text.php:1286 msgid "depressed" msgstr "przygnębiony" -#: ../../include/text.php:1286 +#: ../../include/text.php:1287 msgid "motivated" msgstr "zmotywowany" -#: ../../include/text.php:1287 +#: ../../include/text.php:1288 msgid "relaxed" msgstr "zrelaksowany" -#: ../../include/text.php:1288 +#: ../../include/text.php:1289 msgid "surprised" msgstr "zaskoczony" -#: ../../include/text.php:1476 ../../include/js_strings.php:99 +#: ../../include/text.php:1477 ../../include/js_strings.php:99 msgid "Monday" msgstr "Poniedziałek" -#: ../../include/text.php:1476 ../../include/js_strings.php:100 +#: ../../include/text.php:1477 ../../include/js_strings.php:100 msgid "Tuesday" msgstr "Wtorek" -#: ../../include/text.php:1476 ../../include/js_strings.php:101 +#: ../../include/text.php:1477 ../../include/js_strings.php:101 msgid "Wednesday" msgstr "Środa" -#: ../../include/text.php:1476 ../../include/js_strings.php:102 +#: ../../include/text.php:1477 ../../include/js_strings.php:102 msgid "Thursday" msgstr "Czwartek" -#: ../../include/text.php:1476 ../../include/js_strings.php:103 +#: ../../include/text.php:1477 ../../include/js_strings.php:103 msgid "Friday" msgstr "Piątek" -#: ../../include/text.php:1476 ../../include/js_strings.php:104 +#: ../../include/text.php:1477 ../../include/js_strings.php:104 msgid "Saturday" msgstr "Sobota" -#: ../../include/text.php:1476 ../../include/js_strings.php:98 +#: ../../include/text.php:1477 ../../include/js_strings.php:98 msgid "Sunday" msgstr "Niedziela" -#: ../../include/text.php:1480 ../../include/js_strings.php:74 +#: ../../include/text.php:1481 ../../include/js_strings.php:74 msgid "January" msgstr "Styczeń" -#: ../../include/text.php:1480 ../../include/js_strings.php:75 +#: ../../include/text.php:1481 ../../include/js_strings.php:75 msgid "February" msgstr "Luty" -#: ../../include/text.php:1480 ../../include/js_strings.php:76 +#: ../../include/text.php:1481 ../../include/js_strings.php:76 msgid "March" msgstr "Marzec" -#: ../../include/text.php:1480 ../../include/js_strings.php:77 +#: ../../include/text.php:1481 ../../include/js_strings.php:77 msgid "April" msgstr "Kwiecień" -#: ../../include/text.php:1480 +#: ../../include/text.php:1481 msgid "May" msgstr "Maj" -#: ../../include/text.php:1480 ../../include/js_strings.php:79 +#: ../../include/text.php:1481 ../../include/js_strings.php:79 msgid "June" msgstr "Czerwiec" -#: ../../include/text.php:1480 ../../include/js_strings.php:80 +#: ../../include/text.php:1481 ../../include/js_strings.php:80 msgid "July" msgstr "Lipiec" -#: ../../include/text.php:1480 ../../include/js_strings.php:81 +#: ../../include/text.php:1481 ../../include/js_strings.php:81 msgid "August" msgstr "Sierpień" -#: ../../include/text.php:1480 ../../include/js_strings.php:82 +#: ../../include/text.php:1481 ../../include/js_strings.php:82 msgid "September" msgstr "Wrzesień" -#: ../../include/text.php:1480 ../../include/js_strings.php:83 +#: ../../include/text.php:1481 ../../include/js_strings.php:83 msgid "October" msgstr "Pażdziernik" -#: ../../include/text.php:1480 ../../include/js_strings.php:84 +#: ../../include/text.php:1481 ../../include/js_strings.php:84 msgid "November" msgstr "Listopad" -#: ../../include/text.php:1480 ../../include/js_strings.php:85 +#: ../../include/text.php:1481 ../../include/js_strings.php:85 msgid "December" msgstr "Grudzień" -#: ../../include/text.php:1538 +#: ../../include/text.php:1539 msgid "Unknown Attachment" msgstr "Nieznany załącznik" -#: ../../include/text.php:1540 ../../include/feedutils.php:874 +#: ../../include/text.php:1541 ../../include/feedutils.php:874 msgid "unknown" msgstr "nieznany" -#: ../../include/text.php:1581 +#: ../../include/text.php:1582 msgid "remove category" msgstr "usuń kategorię" -#: ../../include/text.php:1658 +#: ../../include/text.php:1659 msgid "remove from file" msgstr "usuń z pliku" -#: ../../include/text.php:1827 +#: ../../include/text.php:1842 +#: ../../extend/addon/hubzilla-addons/mail/Mod_Mail.php:401 msgid "Download binary/encrypted content" msgstr "Pobierz zawartość binarną/zaszyfrowaną" -#: ../../include/text.php:1898 +#: ../../include/text.php:1913 msgid "Poll has ended." msgstr "Ankieta zakończyła się." -#: ../../include/text.php:1901 +#: ../../include/text.php:1916 #, php-format msgid "Poll ends: %s" msgstr "Ankieta kończy się : %s" -#: ../../include/text.php:2058 +#: ../../include/text.php:2073 msgid "Link to Source" msgstr "Link do źródła" -#: ../../include/text.php:2080 ../../include/language.php:428 +#: ../../include/text.php:2095 ../../include/language.php:428 msgid "default" msgstr "domyślnie" -#: ../../include/text.php:2088 +#: ../../include/text.php:2103 msgid "Page layout" msgstr "Układ strony" -#: ../../include/text.php:2088 +#: ../../include/text.php:2103 msgid "You can create your own with the layouts tool" msgstr "Możesz tworzyć własne za pomocą narzędzia układów" -#: ../../include/text.php:2099 +#: ../../include/text.php:2114 msgid "HTML" msgstr "HTML" -#: ../../include/text.php:2102 +#: ../../include/text.php:2117 msgid "Comanche Layout" msgstr "Układ Comanche" -#: ../../include/text.php:2107 +#: ../../include/text.php:2122 msgid "PHP" msgstr "PHP" -#: ../../include/text.php:2116 +#: ../../include/text.php:2131 msgid "Page content type" msgstr "Typ treści strony" -#: ../../include/text.php:2249 +#: ../../include/text.php:2264 msgid "activity" msgstr "aktywność" -#: ../../include/text.php:2252 +#: ../../include/text.php:2267 msgid "poll" msgstr "ankieta" -#: ../../include/text.php:2365 +#: ../../include/text.php:2380 msgid "a-z, 0-9, -, and _ only" msgstr "tylko a-z, 0-9, - i _" -#: ../../include/text.php:2670 +#: ../../include/text.php:2685 msgid "Design Tools" msgstr "Narzędzia projektanckie" -#: ../../include/text.php:2676 +#: ../../include/text.php:2691 msgid "Pages" msgstr "Strony" -#: ../../include/text.php:2688 +#: ../../include/text.php:2703 msgid "Import" msgstr "Import" -#: ../../include/text.php:2689 +#: ../../include/text.php:2704 msgid "Import website..." msgstr "Import witryny..." -#: ../../include/text.php:2690 +#: ../../include/text.php:2705 msgid "Select folder to import" msgstr "Wybierz folder do zaimportowania" -#: ../../include/text.php:2691 +#: ../../include/text.php:2706 msgid "Import from a zipped folder:" msgstr "Import z pliku archiwum ZIP:" -#: ../../include/text.php:2692 +#: ../../include/text.php:2707 msgid "Import from cloud files:" msgstr "Import plików z chmury:" -#: ../../include/text.php:2693 +#: ../../include/text.php:2708 msgid "/cloud/channel/path/to/folder" msgstr "/chmura/kanał/ścieżka/do/folderu" -#: ../../include/text.php:2694 +#: ../../include/text.php:2709 msgid "Enter path to website files" msgstr "Wprowadź ścieżkę do plików poretalu" -#: ../../include/text.php:2695 +#: ../../include/text.php:2710 msgid "Select folder" msgstr "Wybierz folder" -#: ../../include/text.php:2696 +#: ../../include/text.php:2711 msgid "Export website..." msgstr "Eksport witryny..." -#: ../../include/text.php:2697 +#: ../../include/text.php:2712 msgid "Export to a zip file" msgstr "Eksport do pliku ZIP" -#: ../../include/text.php:2698 +#: ../../include/text.php:2713 msgid "website.zip" msgstr "nazwa_witryny.zip" -#: ../../include/text.php:2699 +#: ../../include/text.php:2714 msgid "Enter a name for the zip file." msgstr "Wprowadź nazwę pliku zip." -#: ../../include/text.php:2700 +#: ../../include/text.php:2715 msgid "Export to cloud files" msgstr "Eksport do plików w chmurze" -#: ../../include/text.php:2701 +#: ../../include/text.php:2716 msgid "/path/to/export/folder" msgstr "/ścieżka/do/eksportu/folder" -#: ../../include/text.php:2702 +#: ../../include/text.php:2717 msgid "Enter a path to a cloud files destination." msgstr "Wprowadź ścieżkę do miejsca docelowego plików w chmurze." -#: ../../include/text.php:2703 +#: ../../include/text.php:2718 msgid "Specify folder" msgstr "Wybierz folder" @@ -11937,7 +11939,7 @@ msgid "Account/Channel Settings" msgstr "Ustawienia kanału/konta" #: ../../include/nav.php:112 ../../include/nav.php:142 -#: ../../include/nav.php:163 ../../boot.php:1719 +#: ../../include/nav.php:163 ../../boot.php:1720 msgid "Logout" msgstr "Wyloguj się" @@ -11993,43 +11995,47 @@ msgstr "Proszę czekać ..." msgid "Add Apps" msgstr "Zainstalowane aplikacje" -#: ../../include/nav.php:338 +#: ../../include/nav.php:339 +msgid "Channel Apps" +msgstr "Aplikacje kanałowe" + +#: ../../include/nav.php:340 +msgid "System Apps" +msgstr "Aplikacje systemowe" + +#: ../../include/nav.php:341 msgid "Arrange Apps" msgstr "Rozmieść aplikacje" -#: ../../include/nav.php:339 -msgid "Toggle System Apps" -msgstr "Przełącz aplikacje systemowe" - -#: ../../include/nav.php:424 +#: ../../include/nav.php:428 msgid "Status Messages and Posts" msgstr "Komunikaty o stanie i wpisach" -#: ../../include/nav.php:437 +#: ../../include/nav.php:441 msgid "Profile Details" msgstr "Szczegóły profilu" -#: ../../include/nav.php:447 ../../include/photos.php:666 +#: ../../include/nav.php:451 ../../include/photos.php:714 msgid "Photo Albums" msgstr "Albumy zdjęć" -#: ../../include/nav.php:455 +#: ../../include/nav.php:459 msgid "Files and Storage" msgstr "Pliki i ich magazyn" -#: ../../include/nav.php:493 +#: ../../include/nav.php:497 msgid "Saved Bookmarks" msgstr "Zapisane zakładki" -#: ../../include/nav.php:504 +#: ../../include/nav.php:508 msgid "View Cards" msgstr "Wyświetl karty" -#: ../../include/nav.php:515 +#: ../../include/nav.php:519 msgid "View Articles" msgstr "Wyświetl artykuły" -#: ../../include/nav.php:527 +#: ../../include/nav.php:531 msgid "View Webpages" msgstr "Wyświetl strony internetowe" @@ -12094,30 +12100,30 @@ msgstr "ODRZUCONO NIEPRAWIDŁOWĄ KARTĘ!" msgid "Name: " msgstr "Nazwa: " -#: ../../include/photos.php:151 +#: ../../include/photos.php:154 #, php-format msgid "Image exceeds website size limit of %lu bytes" msgstr "Obraz przekracza limit rozmiaru dla tego portali, wynoszący %lu bajtów" -#: ../../include/photos.php:162 +#: ../../include/photos.php:165 msgid "Image file is empty." msgstr "Plik obrazu jest pusty." -#: ../../include/photos.php:324 +#: ../../include/photos.php:327 msgid "Photo storage failed." msgstr "Zapis zdjęcia nie powiódł się." -#: ../../include/photos.php:373 +#: ../../include/photos.php:376 msgid "a new photo" msgstr "nowe zdjęcie" -#: ../../include/photos.php:377 +#: ../../include/photos.php:380 #, php-format msgctxt "photo_upload" msgid "%1$s posted %2$s to %3$s" msgstr "%1$s wysłał %2$s do %3$s" -#: ../../include/photos.php:671 +#: ../../include/photos.php:719 msgid "Upload New Photos" msgstr "Prześlij nowe zdjęcia" @@ -13011,7 +13017,7 @@ msgstr "Wiek: " msgid "YYYY-MM-DD or MM-DD" msgstr "RRRR-MM-DD lub MM-DD" -#: ../../include/datetime.php:238 ../../boot.php:2734 +#: ../../include/datetime.php:238 ../../boot.php:2735 msgid "never" msgstr "nigdy" @@ -13161,11 +13167,11 @@ msgid "Comment" msgstr "Komentarz" #: ../../include/bbcode.php:233 ../../include/bbcode.php:928 -#: ../../include/bbcode.php:1525 ../../include/bbcode.php:1533 +#: ../../include/bbcode.php:1546 ../../include/bbcode.php:1554 msgid "Image/photo" msgstr "Obraz/zdjęcie" -#: ../../include/bbcode.php:280 ../../include/bbcode.php:1550 +#: ../../include/bbcode.php:280 ../../include/bbcode.php:1571 msgid "Encrypted content" msgstr "Zaszyfrowana treść" @@ -13203,36 +13209,10 @@ msgstr "Wyświetl artykuł" msgid "View summary" msgstr "Wyświetl podsumowanie" -#: ../../include/bbcode.php:1501 +#: ../../include/bbcode.php:1522 msgid "$1 wrote:" msgstr "$1 napisał:" -#: ../../extend/addon/hubzilla-addons/gnusoc/gnusoc.php:453 -msgid "Follow" -msgstr "Obserwuj" - -#: ../../extend/addon/hubzilla-addons/gnusoc/gnusoc.php:456 -#, php-format -msgid "%1$s is now following %2$s" -msgstr "%1$s obserwujesz teraz %2$s" - -#: ../../extend/addon/hubzilla-addons/gnusoc/Mod_Gnusoc.php:16 -msgid "" -"The GNU-Social protocol does not support location independence. Connections " -"you make within that network may be unreachable from alternate channel " -"locations." -msgstr "" -"Protokół GNU-Social nie obsługuje niezależności od lokalizacji. Połączenia " -"nawiązane w tej sieci mogą być niedostępne z innych lokalizacji kanałów." - -#: ../../extend/addon/hubzilla-addons/gnusoc/Mod_Gnusoc.php:22 -msgid "GNU-Social Protocol App" -msgstr "Aplikacja Protokół GNU-Social" - -#: ../../extend/addon/hubzilla-addons/gnusoc/Mod_Gnusoc.php:34 -msgid "GNU-Social Protocol" -msgstr "GNU-Social Protocol" - #: ../../extend/addon/hubzilla-addons/qrator/qrator.php:48 msgid "QR code" msgstr "Kod QR" @@ -13781,7 +13761,7 @@ msgstr "Nazwa kanału Hubzilla" #: ../../extend/addon/hubzilla-addons/redred/Mod_Redred.php:75 #: ../../extend/addon/hubzilla-addons/openid/MysqlProvider.php:54 -#: ../../boot.php:1714 +#: ../../boot.php:1715 msgid "Nickname" msgstr "Pseudonim" @@ -13997,78 +13977,78 @@ msgstr "Etykieta" msgid "Instructions" msgstr "Instukcje" -#: ../../extend/addon/hubzilla-addons/cart/submodules/hzservices.php:63 +#: ../../extend/addon/hubzilla-addons/cart/submodules/hzservices.php:64 msgid "Enable Hubzilla Services Module" msgstr "Włącz moduł usług Hubzilla" -#: ../../extend/addon/hubzilla-addons/cart/submodules/hzservices.php:162 +#: ../../extend/addon/hubzilla-addons/cart/submodules/hzservices.php:163 #: ../../extend/addon/hubzilla-addons/cart/submodules/manualcat.php:172 msgid "New Sku" msgstr "Nowy SKU" -#: ../../extend/addon/hubzilla-addons/cart/submodules/hzservices.php:197 +#: ../../extend/addon/hubzilla-addons/cart/submodules/hzservices.php:198 #: ../../extend/addon/hubzilla-addons/cart/submodules/manualcat.php:208 msgid "Cannot save edits to locked item." msgstr "Nie można zapisać zmian w zablokowanym elemencie." -#: ../../extend/addon/hubzilla-addons/cart/submodules/hzservices.php:246 -#: ../../extend/addon/hubzilla-addons/cart/submodules/hzservices.php:333 +#: ../../extend/addon/hubzilla-addons/cart/submodules/hzservices.php:247 +#: ../../extend/addon/hubzilla-addons/cart/submodules/hzservices.php:334 msgid "SKU not found." msgstr "Nie znaleziono SKU." -#: ../../extend/addon/hubzilla-addons/cart/submodules/hzservices.php:299 -#: ../../extend/addon/hubzilla-addons/cart/submodules/hzservices.php:303 +#: ../../extend/addon/hubzilla-addons/cart/submodules/hzservices.php:300 +#: ../../extend/addon/hubzilla-addons/cart/submodules/hzservices.php:304 msgid "Invalid Activation Directive." msgstr "Nieprawidłowa dyrektywa aktywacyjna." -#: ../../extend/addon/hubzilla-addons/cart/submodules/hzservices.php:374 -#: ../../extend/addon/hubzilla-addons/cart/submodules/hzservices.php:378 +#: ../../extend/addon/hubzilla-addons/cart/submodules/hzservices.php:375 +#: ../../extend/addon/hubzilla-addons/cart/submodules/hzservices.php:379 msgid "Invalid Deactivation Directive." msgstr "Nieprawidłowa dyrektywa dezaktywacyjna." -#: ../../extend/addon/hubzilla-addons/cart/submodules/hzservices.php:564 +#: ../../extend/addon/hubzilla-addons/cart/submodules/hzservices.php:565 msgid "Add to this privacy group" msgstr "Dodaj do tej grupy prywatności" -#: ../../extend/addon/hubzilla-addons/cart/submodules/hzservices.php:580 +#: ../../extend/addon/hubzilla-addons/cart/submodules/hzservices.php:581 msgid "Set user service class" msgstr "Ustaw klasę usług użytkownika" -#: ../../extend/addon/hubzilla-addons/cart/submodules/hzservices.php:607 +#: ../../extend/addon/hubzilla-addons/cart/submodules/hzservices.php:608 msgid "You must be using a local account to purchase this service." msgstr "Aby kupić tę usługę, musisz korzystać z konta lokalnego." -#: ../../extend/addon/hubzilla-addons/cart/submodules/hzservices.php:647 +#: ../../extend/addon/hubzilla-addons/cart/submodules/hzservices.php:648 #: ../../extend/addon/hubzilla-addons/cart/submodules/manualcat.php:252 msgid "Changes Locked" msgstr "Zmiany zablokowane" -#: ../../extend/addon/hubzilla-addons/cart/submodules/hzservices.php:651 +#: ../../extend/addon/hubzilla-addons/cart/submodules/hzservices.php:652 #: ../../extend/addon/hubzilla-addons/cart/submodules/manualcat.php:256 msgid "Item available for purchase." msgstr "Element dostępny do zakupu." -#: ../../extend/addon/hubzilla-addons/cart/submodules/hzservices.php:658 +#: ../../extend/addon/hubzilla-addons/cart/submodules/hzservices.php:659 #: ../../extend/addon/hubzilla-addons/cart/submodules/manualcat.php:263 #: ../../extend/addon/hubzilla-addons/cart/widgets/catalogitem.php:57 msgid "Price" msgstr "Cena" -#: ../../extend/addon/hubzilla-addons/cart/submodules/hzservices.php:661 +#: ../../extend/addon/hubzilla-addons/cart/submodules/hzservices.php:662 #: ../../extend/addon/hubzilla-addons/cart/submodules/manualcat.php:266 msgid "Photo URL" msgstr "Adres URL zdjęcia" -#: ../../extend/addon/hubzilla-addons/cart/submodules/hzservices.php:665 +#: ../../extend/addon/hubzilla-addons/cart/submodules/hzservices.php:666 msgid "Add buyer to privacy group" msgstr "Dodaj kupującego do grupy prywatności" -#: ../../extend/addon/hubzilla-addons/cart/submodules/hzservices.php:670 +#: ../../extend/addon/hubzilla-addons/cart/submodules/hzservices.php:671 msgid "Add buyer as connection" msgstr "Dodaj kupującego jako połączenie" -#: ../../extend/addon/hubzilla-addons/cart/submodules/hzservices.php:678 -#: ../../extend/addon/hubzilla-addons/cart/submodules/hzservices.php:720 +#: ../../extend/addon/hubzilla-addons/cart/submodules/hzservices.php:679 +#: ../../extend/addon/hubzilla-addons/cart/submodules/hzservices.php:721 msgid "Set Service Class" msgstr "Ustaw klasę usługi" @@ -14353,29 +14333,33 @@ msgstr "Protokół Diaspora" msgid "No username found in import file." msgstr "W pliku importu nie znaleziono nazwy użytkownika." -#: ../../extend/addon/hubzilla-addons/diaspora/Receiver.php:1599 +#: ../../extend/addon/hubzilla-addons/diaspora/Receiver.php:1571 #, php-format msgid "%1$s dislikes %2$s's %3$s" msgstr "%1$s zganień %2$s %3$s" -#: ../../extend/addon/hubzilla-addons/diaspora/diaspora.php:70 +#: ../../extend/addon/hubzilla-addons/diaspora/diaspora.php:75 msgid "" "Please install the statistics addon to be able to configure a diaspora relay" msgstr "" "Zainstaluj dodatek do statystyk, aby móc skonfigurować konektor Diaspory" -#: ../../extend/addon/hubzilla-addons/diaspora/diaspora.php:80 +#: ../../extend/addon/hubzilla-addons/diaspora/diaspora.php:85 msgid "Diaspora Relay Handle" msgstr "Uchwyt konektora Diaspory" -#: ../../extend/addon/hubzilla-addons/diaspora/diaspora.php:80 +#: ../../extend/addon/hubzilla-addons/diaspora/diaspora.php:85 msgid "Address of a diaspora relay. Example: relay@diasporarelay.tld" msgstr "Adres konektora diaspory. Przykład: relay@diasporarelay.tld" -#: ../../extend/addon/hubzilla-addons/diaspora/diaspora.php:100 +#: ../../extend/addon/hubzilla-addons/diaspora/diaspora.php:105 msgid "Diaspora relay could not be imported" msgstr "Nie można zaimportować konektora diaspory" +#: ../../extend/addon/hubzilla-addons/diaspora/diaspora.php:999 +msgid "No subject" +msgstr "Brak tematu" + #: ../../extend/addon/hubzilla-addons/dirstats/dirstats.php:94 msgid "Hubzilla Directory Stats" msgstr "Statystyki katalogowe Hubzilla" @@ -15750,70 +15734,43 @@ msgstr "Ostatnio wyświetlający mój kanał lub profil" msgid "No entries." msgstr "Brak wpisów." -#: ../../extend/addon/hubzilla-addons/mail/Mod_Mail.php:40 +#: ../../extend/addon/hubzilla-addons/mail/Mod_Mail.php:36 msgid "Messages" msgstr "Wiadomości" -#: ../../extend/addon/hubzilla-addons/mail/Mod_Mail.php:53 +#: ../../extend/addon/hubzilla-addons/mail/Mod_Mail.php:48 msgid "message" msgstr "wiadomość" -#: ../../extend/addon/hubzilla-addons/mail/Mod_Mail.php:93 -msgid "Message recalled." -msgstr "Wiadomość przywołana." - -#: ../../extend/addon/hubzilla-addons/mail/Mod_Mail.php:106 +#: ../../extend/addon/hubzilla-addons/mail/Mod_Mail.php:75 msgid "Conversation removed." msgstr "Rozmowa został usunięty." -#: ../../extend/addon/hubzilla-addons/mail/Mod_Mail.php:121 -#: ../../extend/addon/hubzilla-addons/mail/Mod_Mail.php:242 +#: ../../extend/addon/hubzilla-addons/mail/Mod_Mail.php:136 msgid "Expires YYYY-MM-DD HH:MM" msgstr "Wygasa YYYY-MM-DD HH:MM" -#: ../../extend/addon/hubzilla-addons/mail/Mod_Mail.php:149 -msgid "Requested channel is not in this network" -msgstr "Żądanego kanału nie ma w tej sieci" - -#: ../../extend/addon/hubzilla-addons/mail/Mod_Mail.php:157 -msgid "Send Private Message" -msgstr "Wyślij prywatną wiadomość" - -#: ../../extend/addon/hubzilla-addons/mail/Mod_Mail.php:158 -#: ../../extend/addon/hubzilla-addons/mail/Mod_Mail.php:301 -msgid "To:" -msgstr "Do:" - -#: ../../extend/addon/hubzilla-addons/mail/Mod_Mail.php:166 -#: ../../extend/addon/hubzilla-addons/mail/Mod_Mail.php:309 -msgid "Attach file" -msgstr "Dołącz plik" - -#: ../../extend/addon/hubzilla-addons/mail/Mod_Mail.php:168 -msgid "Send" -msgstr "Wyślij" - -#: ../../extend/addon/hubzilla-addons/mail/Mod_Mail.php:272 +#: ../../extend/addon/hubzilla-addons/mail/Mod_Mail.php:167 msgid "Delete message" msgstr "Usuń wiadomość" -#: ../../extend/addon/hubzilla-addons/mail/Mod_Mail.php:273 +#: ../../extend/addon/hubzilla-addons/mail/Mod_Mail.php:168 msgid "Delivery report" msgstr "Raport dostawy" -#: ../../extend/addon/hubzilla-addons/mail/Mod_Mail.php:274 +#: ../../extend/addon/hubzilla-addons/mail/Mod_Mail.php:169 msgid "Recall message" msgstr "Odwołaj wiadomość" -#: ../../extend/addon/hubzilla-addons/mail/Mod_Mail.php:276 +#: ../../extend/addon/hubzilla-addons/mail/Mod_Mail.php:171 msgid "Message has been recalled." msgstr "Wiadomość została odwołana." -#: ../../extend/addon/hubzilla-addons/mail/Mod_Mail.php:294 +#: ../../extend/addon/hubzilla-addons/mail/Mod_Mail.php:189 msgid "Delete Conversation" msgstr "Usuń rozmowę" -#: ../../extend/addon/hubzilla-addons/mail/Mod_Mail.php:296 +#: ../../extend/addon/hubzilla-addons/mail/Mod_Mail.php:191 msgid "" "No secure communications available. You <strong>may</strong> be able to " "respond from the sender's profile page." @@ -15821,133 +15778,123 @@ msgstr "" "Brak bezpiecznej komunikacji. <strong>Możesz</strong> odpowiedzieć ze strony " "profilu nadawcy." -#: ../../extend/addon/hubzilla-addons/mail/Mod_Mail.php:300 +#: ../../extend/addon/hubzilla-addons/mail/Mod_Mail.php:195 msgid "Send Reply" msgstr "Wyślij odpowiedź" -#: ../../extend/addon/hubzilla-addons/mail/Mod_Mail.php:305 +#: ../../extend/addon/hubzilla-addons/mail/Mod_Mail.php:196 +msgid "To:" +msgstr "Do:" + +#: ../../extend/addon/hubzilla-addons/mail/Mod_Mail.php:200 #, php-format msgid "Your message for %s (%s):" msgstr "Twoja wiadomość dla %s (%s):" -#: ../../extend/addon/hubzilla-addons/mail/Mod_Mail.php:385 -msgid "Unable to lookup recipient." -msgstr "Nie można znaleźć adresata." - -#: ../../extend/addon/hubzilla-addons/mail/Mod_Mail.php:392 -msgid "Unable to communicate with requested channel." -msgstr "Nie można skomunikować się z żądanym kanałem." - -#: ../../extend/addon/hubzilla-addons/mail/Mod_Mail.php:399 -msgid "Cannot verify requested channel." -msgstr "Nie można zweryfikować żądanego kanału." - -#: ../../extend/addon/hubzilla-addons/mail/Mod_Mail.php:417 -msgid "Selected channel has private message restrictions. Send failed." -msgstr "" -"Wybrany kanał ma ograniczenia dotyczące wiadomości prywatnych. Wysyłanie nie " -"powiodło się." +#: ../../extend/addon/hubzilla-addons/mail/Mod_Mail.php:204 +msgid "Attach file" +msgstr "Dołącz plik" -#: ../../extend/addon/hubzilla-addons/openclipatar/openclipatar.php:50 -#: ../../extend/addon/hubzilla-addons/openclipatar/openclipatar.php:128 +#: ../../extend/addon/hubzilla-addons/openclipatar/openclipatar.php:51 +#: ../../extend/addon/hubzilla-addons/openclipatar/openclipatar.php:129 msgid "System defaults:" msgstr "Domyślne wartości systemowe:" -#: ../../extend/addon/hubzilla-addons/openclipatar/openclipatar.php:54 +#: ../../extend/addon/hubzilla-addons/openclipatar/openclipatar.php:55 msgid "Preferred Clipart IDs" msgstr "Identyfikatory preferowanych clipartów" -#: ../../extend/addon/hubzilla-addons/openclipatar/openclipatar.php:54 +#: ../../extend/addon/hubzilla-addons/openclipatar/openclipatar.php:55 msgid "List of preferred clipart ids. These will be shown first." msgstr "Lista identyfikatorów preferowanych clipartów." -#: ../../extend/addon/hubzilla-addons/openclipatar/openclipatar.php:55 +#: ../../extend/addon/hubzilla-addons/openclipatar/openclipatar.php:56 msgid "Default Search Term" msgstr "Domyślna fraza wyszukiwania" -#: ../../extend/addon/hubzilla-addons/openclipatar/openclipatar.php:55 +#: ../../extend/addon/hubzilla-addons/openclipatar/openclipatar.php:56 msgid "The default search term. These will be shown second." msgstr "Domyślna fraza wyszukiwania. Będzie ona wyświetlana jako druga." -#: ../../extend/addon/hubzilla-addons/openclipatar/openclipatar.php:56 +#: ../../extend/addon/hubzilla-addons/openclipatar/openclipatar.php:57 msgid "Return After" msgstr "Wróć po" -#: ../../extend/addon/hubzilla-addons/openclipatar/openclipatar.php:56 +#: ../../extend/addon/hubzilla-addons/openclipatar/openclipatar.php:57 msgid "Page to load after image selection." msgstr "Strona do załadowania po wybraniu obrazu." -#: ../../extend/addon/hubzilla-addons/openclipatar/openclipatar.php:59 +#: ../../extend/addon/hubzilla-addons/openclipatar/openclipatar.php:60 msgid "Profile List" msgstr "Lista profili" -#: ../../extend/addon/hubzilla-addons/openclipatar/openclipatar.php:61 +#: ../../extend/addon/hubzilla-addons/openclipatar/openclipatar.php:62 msgid "Order of Preferred" msgstr "Kolejność preferowanych" -#: ../../extend/addon/hubzilla-addons/openclipatar/openclipatar.php:61 +#: ../../extend/addon/hubzilla-addons/openclipatar/openclipatar.php:62 msgid "Sort order of preferred clipart ids." msgstr "Sortuj preferowane identyfikatory clipart." -#: ../../extend/addon/hubzilla-addons/openclipatar/openclipatar.php:62 -#: ../../extend/addon/hubzilla-addons/openclipatar/openclipatar.php:68 +#: ../../extend/addon/hubzilla-addons/openclipatar/openclipatar.php:63 +#: ../../extend/addon/hubzilla-addons/openclipatar/openclipatar.php:69 msgid "Newest first" msgstr "Od najnowszych" -#: ../../extend/addon/hubzilla-addons/openclipatar/openclipatar.php:65 +#: ../../extend/addon/hubzilla-addons/openclipatar/openclipatar.php:66 msgid "As entered" msgstr "Jak wprowadzono" -#: ../../extend/addon/hubzilla-addons/openclipatar/openclipatar.php:67 +#: ../../extend/addon/hubzilla-addons/openclipatar/openclipatar.php:68 msgid "Order of other" msgstr "Kolejność innych" -#: ../../extend/addon/hubzilla-addons/openclipatar/openclipatar.php:67 +#: ../../extend/addon/hubzilla-addons/openclipatar/openclipatar.php:68 msgid "Sort order of other clipart ids." msgstr "Kolejność sortowania innych identyfikatorów clipartów." -#: ../../extend/addon/hubzilla-addons/openclipatar/openclipatar.php:69 +#: ../../extend/addon/hubzilla-addons/openclipatar/openclipatar.php:70 msgid "Most downloaded first" msgstr "Najczęściej pobierane jako pierwsze" -#: ../../extend/addon/hubzilla-addons/openclipatar/openclipatar.php:70 +#: ../../extend/addon/hubzilla-addons/openclipatar/openclipatar.php:71 msgid "Most liked first" msgstr "Najbardziej chwalone jako pierwsze" -#: ../../extend/addon/hubzilla-addons/openclipatar/openclipatar.php:72 +#: ../../extend/addon/hubzilla-addons/openclipatar/openclipatar.php:73 msgid "Preferred IDs Message" msgstr "Komunikat o preferowanych identyfikatorach" -#: ../../extend/addon/hubzilla-addons/openclipatar/openclipatar.php:72 +#: ../../extend/addon/hubzilla-addons/openclipatar/openclipatar.php:73 msgid "Message to display above preferred results." msgstr "Wiadomość do wyświetlenia powyżej preferowanych wyników." -#: ../../extend/addon/hubzilla-addons/openclipatar/openclipatar.php:78 +#: ../../extend/addon/hubzilla-addons/openclipatar/openclipatar.php:79 msgid "Uploaded by: " msgstr "Przesłane przez: " -#: ../../extend/addon/hubzilla-addons/openclipatar/openclipatar.php:78 +#: ../../extend/addon/hubzilla-addons/openclipatar/openclipatar.php:79 msgid "Drawn by: " msgstr "Narysowane przez: " -#: ../../extend/addon/hubzilla-addons/openclipatar/openclipatar.php:182 -#: ../../extend/addon/hubzilla-addons/openclipatar/openclipatar.php:194 +#: ../../extend/addon/hubzilla-addons/openclipatar/openclipatar.php:183 +#: ../../extend/addon/hubzilla-addons/openclipatar/openclipatar.php:195 msgid "Use this image" msgstr "Użyj tego obrazu" -#: ../../extend/addon/hubzilla-addons/openclipatar/openclipatar.php:192 +#: ../../extend/addon/hubzilla-addons/openclipatar/openclipatar.php:193 msgid "Or select from a free OpenClipart.org image:" msgstr "Lub wybierz bezpłatny obraz z OpenClipart.org:" -#: ../../extend/addon/hubzilla-addons/openclipatar/openclipatar.php:195 +#: ../../extend/addon/hubzilla-addons/openclipatar/openclipatar.php:196 msgid "Search Term" msgstr "Fraza wyszukiwania" -#: ../../extend/addon/hubzilla-addons/openclipatar/openclipatar.php:232 +#: ../../extend/addon/hubzilla-addons/openclipatar/openclipatar.php:233 msgid "Unknown error. Please try again later." msgstr "Nieznany błąd. Spróbuj ponownie później." -#: ../../extend/addon/hubzilla-addons/openclipatar/openclipatar.php:308 +#: ../../extend/addon/hubzilla-addons/openclipatar/openclipatar.php:309 msgid "Profile photo updated successfully." msgstr "Zdjęcie profilowe zostało pomyślnie zaktualizowane." @@ -16036,7 +15983,7 @@ msgstr "Rozmiar pliku dziennika w bajtach przed dokonaniem odnowienia" msgid "Number of logfiles to retain" msgstr "Liczba plików dziennika do przechowania" -#: ../../extend/addon/hubzilla-addons/wppost/wppost.php:46 +#: ../../extend/addon/hubzilla-addons/wppost/wppost.php:47 msgid "Post to WordPress" msgstr "Publikowanie w WordPress" @@ -16532,44 +16479,140 @@ msgstr "Ustaw rozmiar kolejnych zdjęć autora" msgid "Show advanced settings" msgstr "Pokaż ustawienia zaawansowane" -#: ../../boot.php:1696 +#: ../../boot.php:1697 msgid "Create an account to access services and applications" msgstr "Utwórz konto, aby uzyskać dostęp do usług i aplikacji" -#: ../../boot.php:1714 +#: ../../boot.php:1715 msgid "Email or nickname" msgstr "Adres e-mail lub pseudonim" -#: ../../boot.php:1724 +#: ../../boot.php:1725 msgid "Password" msgstr "Hasło" -#: ../../boot.php:1725 +#: ../../boot.php:1726 msgid "Remember me" msgstr "Zapamiętaj mnie" -#: ../../boot.php:1728 +#: ../../boot.php:1729 msgid "Forgot your password?" msgstr "Nie pamiętasz hasła?" -#: ../../boot.php:2607 +#: ../../boot.php:2608 #, php-format msgid "[$Projectname] Website SSL error for %s" msgstr "[$Projectname] Błąd SSL portalu dla %s" -#: ../../boot.php:2612 +#: ../../boot.php:2613 msgid "Website SSL certificate is not valid. Please correct." msgstr "Certyfikat SSL portalu jest nieprawidłowy. Proszę poprawić." -#: ../../boot.php:2728 +#: ../../boot.php:2729 #, php-format msgid "[$Projectname] Cron tasks not running on %s" msgstr "[$Projectname] Zadania Crona nie działają na %s" -#: ../../boot.php:2733 +#: ../../boot.php:2734 msgid "Cron/Scheduled tasks not running." msgstr "Zadania Crona (zaplanowane) nie działają." +#~ msgid "Welcome to Hubzilla!" +#~ msgstr "Witamy w Hubzilla!" + +#~ msgid "You have got no unseen posts..." +#~ msgstr "Nie masz żadnych nieoglądniętych wpisów..." + +#~ msgid "a private message" +#~ msgstr "prywatna wiadomość" + +#~ msgid "Conversation Tools" +#~ msgstr "Narzędzia do konwersacji" + +#~ msgid "HQ Control Panel" +#~ msgstr "Panel kontrolny HQ" + +#~ msgid "Create a new post" +#~ msgstr "Utwórz nowy wpis" + +#~ msgid "New Network Activity" +#~ msgstr "Nowa aktywność sieciowa" + +#~ msgid "View your network activity" +#~ msgstr "Wyświetl swoją aktywność w sieci" + +# Sprawdzić w kontekście! +#~ msgid "New Home Activity" +#~ msgstr "Nowa aktywność domowa" + +#~ msgid "View your home activity" +#~ msgstr "Wyświetl swoją aktywność domową" + +#~ msgid "New Direct Messages" +#~ msgstr "Nowe bezpośrednie wiadomości" + +#~ msgid "View your direct messages" +#~ msgstr "Wyświetl swoje bezpośrednie wiadomości" + +#~ msgid "New Events" +#~ msgstr "Nowe wydarzenia" + +#~ msgid "New Files" +#~ msgstr "Nowe pliki" + +#~ msgid "New Registrations" +#~ msgstr "Nowe rejestracje" + +#~ msgid "View the public stream" +#~ msgstr "Pokaż strumień publiczny" + +#~ msgid "Follow" +#~ msgstr "Obserwuj" + +#~ msgid "%1$s is now following %2$s" +#~ msgstr "%1$s obserwujesz teraz %2$s" + +#~ msgid "" +#~ "The GNU-Social protocol does not support location independence. " +#~ "Connections you make within that network may be unreachable from " +#~ "alternate channel locations." +#~ msgstr "" +#~ "Protokół GNU-Social nie obsługuje niezależności od lokalizacji. " +#~ "Połączenia nawiązane w tej sieci mogą być niedostępne z innych " +#~ "lokalizacji kanałów." + +#~ msgid "GNU-Social Protocol App" +#~ msgstr "Aplikacja Protokół GNU-Social" + +#~ msgid "GNU-Social Protocol" +#~ msgstr "GNU-Social Protocol" + +#~ msgid "Message recalled." +#~ msgstr "Wiadomość przywołana." + +#~ msgid "Requested channel is not in this network" +#~ msgstr "Żądanego kanału nie ma w tej sieci" + +#~ msgid "Send Private Message" +#~ msgstr "Wyślij prywatną wiadomość" + +#~ msgid "Send" +#~ msgstr "Wyślij" + +#~ msgid "Unable to lookup recipient." +#~ msgstr "Nie można znaleźć adresata." + +#~ msgid "Unable to communicate with requested channel." +#~ msgstr "Nie można skomunikować się z żądanym kanałem." + +#~ msgid "Cannot verify requested channel." +#~ msgstr "Nie można zweryfikować żądanego kanału." + +#~ msgid "Selected channel has private message restrictions. Send failed." +#~ msgstr "" +#~ "Wybrany kanał ma ograniczenia dotyczące wiadomości prywatnych. Wysyłanie " +#~ "nie powiodło się." + #~ msgid "Edit event title" #~ msgstr "Edytuj tytuł wydarzenia" @@ -16692,9 +16735,6 @@ msgstr "Zadania Crona (zaplanowane) nie działają." #~ msgid "No recipient provided." #~ msgstr "Nie podano odbiorcy." -#~ msgid "[no subject]" -#~ msgstr "[brak tematu]" - #~ msgid "Stored post could not be verified." #~ msgstr "Nie można zweryfikować zapisanego wpisu." diff --git a/view/pl/hmessages.pot b/view/pl/hmessages.pot index 38c7c2e11..7071fd910 100644 --- a/view/pl/hmessages.pot +++ b/view/pl/hmessages.pot @@ -1,14 +1,14 @@ -# PLATFORM_NAME -# Copyright (C) 2012-2016 PLATFORM_NAME -# This file is distributed under the same license as the PLATFORM_NAME package. +# hubzilla +# Copyright (C) 2012-2021 hubzilla +# This file is distributed under the same license as the hubzilla package. # Mike Macgirvin, 2012 # #, fuzzy msgid "" msgstr "" -"Project-Id-Version: STD_VERSION\n" +"Project-Id-Version: 6.1.2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-06-12 02:13+0200\n" +"POT-Creation-Date: 2021-08-01 02:30+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -150,7 +150,7 @@ msgid "Special - Group Repository" msgstr "" #: ../../Zotlabs/Access/PermissionRoles.php:310 -#: ../../Zotlabs/Module/Cdav.php:1385 ../../Zotlabs/Module/Profiles.php:796 +#: ../../Zotlabs/Module/Cdav.php:1386 ../../Zotlabs/Module/Profiles.php:796 #: ../../Zotlabs/Module/Connedit.php:920 ../../include/selectors.php:60 #: ../../include/selectors.php:77 ../../include/selectors.php:115 #: ../../include/selectors.php:151 ../../include/connections.php:741 @@ -189,8 +189,8 @@ msgstr "" #: ../../Zotlabs/Module/Sharedwithme.php:19 #: ../../Zotlabs/Module/Editlayout.php:67 #: ../../Zotlabs/Module/Editlayout.php:90 ../../Zotlabs/Module/Manage.php:10 -#: ../../Zotlabs/Module/Item.php:506 ../../Zotlabs/Module/Item.php:525 -#: ../../Zotlabs/Module/Item.php:535 ../../Zotlabs/Module/Item.php:1446 +#: ../../Zotlabs/Module/Item.php:507 ../../Zotlabs/Module/Item.php:526 +#: ../../Zotlabs/Module/Item.php:536 ../../Zotlabs/Module/Item.php:1447 #: ../../Zotlabs/Module/Page.php:34 ../../Zotlabs/Module/Page.php:133 #: ../../Zotlabs/Module/Achievements.php:34 ../../Zotlabs/Module/Regmod.php:20 #: ../../Zotlabs/Module/Editblock.php:67 ../../Zotlabs/Module/Chat.php:113 @@ -222,7 +222,7 @@ msgstr "" #: ../../Zotlabs/Module/Attach_edit.php:106 #: ../../Zotlabs/Module/Settings.php:58 ../../Zotlabs/Module/Viewsrc.php:19 #: ../../Zotlabs/Web/WebServer.php:116 ../../Zotlabs/Lib/Chatroom.php:135 -#: ../../include/photos.php:27 ../../include/attach.php:156 +#: ../../include/photos.php:30 ../../include/attach.php:156 #: ../../include/attach.php:205 ../../include/attach.php:278 #: ../../include/attach.php:329 ../../include/attach.php:424 #: ../../include/attach.php:438 ../../include/attach.php:445 @@ -231,7 +231,7 @@ msgstr "" #: ../../include/items.php:3744 #: ../../extend/addon/hubzilla-addons/openid/Mod_Id.php:53 #: ../../extend/addon/hubzilla-addons/keepout/keepout.php:36 -#: ../../extend/addon/hubzilla-addons/mail/Mod_Mail.php:26 +#: ../../extend/addon/hubzilla-addons/mail/Mod_Mail.php:22 #: ../../extend/addon/hubzilla-addons/pumpio/pumpio.php:44 msgid "Permission denied." msgstr "" @@ -258,7 +258,6 @@ msgstr "" #: ../../Zotlabs/Module/Invite.php:310 ../../Zotlabs/Module/Lang.php:20 #: ../../Zotlabs/Module/Lang.php:63 ../../Zotlabs/Module/Sources.php:88 #: ../../Zotlabs/Module/Poke.php:165 -#: ../../extend/addon/hubzilla-addons/gnusoc/Mod_Gnusoc.php:22 #: ../../extend/addon/hubzilla-addons/skeleton/Mod_Skeleton.php:32 #: ../../extend/addon/hubzilla-addons/redred/Mod_Redred.php:50 #: ../../extend/addon/hubzilla-addons/diaspora/Mod_Diaspora.php:58 @@ -388,14 +387,14 @@ msgstr "" #: ../../extend/addon/hubzilla-addons/cart/cart.php:1376 #: ../../extend/addon/hubzilla-addons/cart/submodules/orderoptions.php:312 #: ../../extend/addon/hubzilla-addons/cart/submodules/orderoptions.php:412 -#: ../../extend/addon/hubzilla-addons/cart/submodules/hzservices.php:643 +#: ../../extend/addon/hubzilla-addons/cart/submodules/hzservices.php:644 #: ../../extend/addon/hubzilla-addons/cart/submodules/subscriptions.php:410 #: ../../extend/addon/hubzilla-addons/cart/submodules/manualcat.php:248 #: ../../extend/addon/hubzilla-addons/cart/Settings/Cart.php:132 #: ../../extend/addon/hubzilla-addons/cart/Settings/Cart.php:142 #: ../../extend/addon/hubzilla-addons/hzfiles/hzfiles.php:86 #: ../../extend/addon/hubzilla-addons/diaspora/Mod_Diaspora.php:102 -#: ../../extend/addon/hubzilla-addons/diaspora/diaspora.php:79 +#: ../../extend/addon/hubzilla-addons/diaspora/diaspora.php:84 #: ../../extend/addon/hubzilla-addons/openstreetmap/openstreetmap.php:155 #: ../../extend/addon/hubzilla-addons/ljpost/Mod_Ljpost.php:82 #: ../../extend/addon/hubzilla-addons/workflow/workflow.php:1461 @@ -421,8 +420,8 @@ msgstr "" #: ../../extend/addon/hubzilla-addons/nofed/Mod_Nofed.php:53 #: ../../extend/addon/hubzilla-addons/content_import/Mod_content_import.php:142 #: ../../extend/addon/hubzilla-addons/pageheader/Mod_Pageheader.php:54 -#: ../../extend/addon/hubzilla-addons/mail/Mod_Mail.php:311 -#: ../../extend/addon/hubzilla-addons/openclipatar/openclipatar.php:53 +#: ../../extend/addon/hubzilla-addons/mail/Mod_Mail.php:206 +#: ../../extend/addon/hubzilla-addons/openclipatar/openclipatar.php:54 #: ../../extend/addon/hubzilla-addons/smileybutton/Mod_Smileybutton.php:55 #: ../../extend/addon/hubzilla-addons/rtof/Mod_Rtof.php:72 #: ../../extend/addon/hubzilla-addons/logrot/logrot.php:35 @@ -538,7 +537,7 @@ msgstr "" msgid "Profile Visibility Editor" msgstr "" -#: ../../Zotlabs/Module/Profperm.php:113 ../../Zotlabs/Lib/Apps.php:362 +#: ../../Zotlabs/Module/Profperm.php:113 ../../Zotlabs/Lib/Apps.php:363 #: ../../include/channel.php:1834 msgid "Profile" msgstr "" @@ -626,7 +625,7 @@ msgstr "" #: ../../Zotlabs/Module/Cdav.php:1015 ../../Zotlabs/Module/Appman.php:145 #: ../../Zotlabs/Module/Rbmark.php:100 #: ../../extend/addon/hubzilla-addons/rendezvous/rendezvous.php:173 -#: ../../extend/addon/hubzilla-addons/cart/submodules/hzservices.php:655 +#: ../../extend/addon/hubzilla-addons/cart/submodules/hzservices.php:656 #: ../../extend/addon/hubzilla-addons/cart/submodules/manualcat.php:260 msgid "Description" msgstr "" @@ -683,11 +682,11 @@ msgstr "" msgid "Less" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:1054 ../../Zotlabs/Module/Cdav.php:1389 +#: ../../Zotlabs/Module/Cdav.php:1054 ../../Zotlabs/Module/Cdav.php:1390 #: ../../Zotlabs/Module/Profiles.php:800 ../../Zotlabs/Module/Oauth.php:53 #: ../../Zotlabs/Module/Oauth.php:137 ../../Zotlabs/Module/Oauth2.php:58 #: ../../Zotlabs/Module/Oauth2.php:144 ../../Zotlabs/Module/Connedit.php:924 -#: ../../Zotlabs/Module/Admin/Addons.php:457 ../../Zotlabs/Lib/Apps.php:536 +#: ../../Zotlabs/Module/Admin/Addons.php:457 ../../Zotlabs/Lib/Apps.php:537 msgid "Update" msgstr "" @@ -704,7 +703,7 @@ msgstr "" msgid "CalDAV Calendars" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:1057 ../../Zotlabs/Module/Cdav.php:1390 +#: ../../Zotlabs/Module/Cdav.php:1057 ../../Zotlabs/Module/Cdav.php:1391 #: ../../Zotlabs/Module/Webpages.php:256 ../../Zotlabs/Module/Profiles.php:801 #: ../../Zotlabs/Module/Oauth.php:174 ../../Zotlabs/Module/Card_edit.php:130 #: ../../Zotlabs/Module/Oauth2.php:195 ../../Zotlabs/Module/Blocks.php:162 @@ -717,9 +716,9 @@ msgstr "" #: ../../Zotlabs/Module/Admin/Accounts.php:320 #: ../../Zotlabs/Module/Admin/Channels.php:149 #: ../../Zotlabs/Module/Admin/Profs.php:176 ../../Zotlabs/Module/Thing.php:269 -#: ../../Zotlabs/Storage/Browser.php:384 ../../Zotlabs/Lib/Apps.php:558 +#: ../../Zotlabs/Storage/Browser.php:384 ../../Zotlabs/Lib/Apps.php:559 #: ../../Zotlabs/Lib/ThreadItem.php:171 ../../include/conversation.php:730 -#: ../../include/conversation.php:777 +#: ../../include/conversation.php:784 msgid "Delete" msgstr "" @@ -727,7 +726,7 @@ msgstr "" msgid "Delete all" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:1059 ../../Zotlabs/Module/Cdav.php:1391 +#: ../../Zotlabs/Module/Cdav.php:1059 ../../Zotlabs/Module/Cdav.php:1392 #: ../../Zotlabs/Module/Filer.php:56 ../../Zotlabs/Module/Profiles.php:802 #: ../../Zotlabs/Module/Oauth.php:112 ../../Zotlabs/Module/Oauth.php:138 #: ../../Zotlabs/Module/Card_edit.php:132 ../../Zotlabs/Module/Oauth2.php:117 @@ -742,14 +741,14 @@ msgstr "" #: ../../Zotlabs/Module/Article_edit.php:130 #: ../../Zotlabs/Module/Admin/Addons.php:427 #: ../../Zotlabs/Module/Cover_photo.php:428 -#: ../../Zotlabs/Storage/Browser.php:383 ../../include/conversation.php:1455 -#: ../../include/conversation.php:1510 +#: ../../Zotlabs/Storage/Browser.php:383 ../../include/conversation.php:1464 +#: ../../include/conversation.php:1519 #: ../../extend/addon/hubzilla-addons/hsse/hsse.php:209 #: ../../extend/addon/hubzilla-addons/hsse/hsse.php:258 msgid "Cancel" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:1060 ../../Zotlabs/Module/Cdav.php:1388 +#: ../../Zotlabs/Module/Cdav.php:1060 ../../Zotlabs/Module/Cdav.php:1389 #: ../../Zotlabs/Module/Webpages.php:253 ../../Zotlabs/Module/Profiles.php:799 #: ../../Zotlabs/Module/Layouts.php:185 #: ../../Zotlabs/Module/New_channel.php:189 ../../Zotlabs/Module/Blocks.php:159 @@ -763,7 +762,12 @@ msgstr "" msgid "Sorry! Editing of recurrent events is not yet implemented." msgstr "" -#: ../../Zotlabs/Module/Cdav.php:1071 ../../Zotlabs/Storage/Browser.php:293 +#: ../../Zotlabs/Module/Cdav.php:1062 +msgid "" +"Could not fetch calendar resource. The selected calendar might be disabled." +msgstr "" + +#: ../../Zotlabs/Module/Cdav.php:1072 ../../Zotlabs/Storage/Browser.php:293 #: ../../Zotlabs/Storage/Browser.php:388 ../../Zotlabs/Storage/Browser.php:403 #: ../../Zotlabs/Widget/Appcategories.php:43 #: ../../include/contact_widgets.php:112 ../../include/contact_widgets.php:156 @@ -773,7 +777,7 @@ msgstr "" msgid "Categories" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:1373 ../../Zotlabs/Module/Group.php:155 +#: ../../Zotlabs/Module/Cdav.php:1374 ../../Zotlabs/Module/Group.php:155 #: ../../Zotlabs/Module/Oauth.php:113 ../../Zotlabs/Module/Oauth.php:139 #: ../../Zotlabs/Module/Oauth2.php:118 ../../Zotlabs/Module/Oauth2.php:146 #: ../../Zotlabs/Module/Wiki.php:217 ../../Zotlabs/Module/Connedit.php:908 @@ -786,22 +790,22 @@ msgstr "" msgid "Name" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:1374 ../../Zotlabs/Module/Connedit.php:909 +#: ../../Zotlabs/Module/Cdav.php:1375 ../../Zotlabs/Module/Connedit.php:909 msgid "Organisation" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:1375 ../../Zotlabs/Module/Connedit.php:910 +#: ../../Zotlabs/Module/Cdav.php:1376 ../../Zotlabs/Module/Connedit.php:910 #: ../../extend/addon/hubzilla-addons/workflow/workflow.php:2617 #: ../../extend/addon/hubzilla-addons/workflow/workflow.php:2678 msgid "Title" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:1376 ../../Zotlabs/Module/Profiles.php:787 +#: ../../Zotlabs/Module/Cdav.php:1377 ../../Zotlabs/Module/Profiles.php:787 #: ../../Zotlabs/Module/Connedit.php:911 msgid "Phone" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:1377 ../../Zotlabs/Module/Profiles.php:788 +#: ../../Zotlabs/Module/Cdav.php:1378 ../../Zotlabs/Module/Profiles.php:788 #: ../../Zotlabs/Module/Connedit.php:912 #: ../../Zotlabs/Module/Admin/Accounts.php:316 #: ../../Zotlabs/Module/Admin/Accounts.php:330 ../../include/network.php:1743 @@ -812,90 +816,91 @@ msgstr "" msgid "Email" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:1378 ../../Zotlabs/Module/Profiles.php:789 +#: ../../Zotlabs/Module/Cdav.php:1379 ../../Zotlabs/Module/Profiles.php:789 #: ../../Zotlabs/Module/Connedit.php:913 msgid "Instant messenger" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:1379 ../../Zotlabs/Module/Profiles.php:790 +#: ../../Zotlabs/Module/Cdav.php:1380 ../../Zotlabs/Module/Profiles.php:790 #: ../../Zotlabs/Module/Connedit.php:914 msgid "Website" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:1380 ../../Zotlabs/Module/Profiles.php:504 +#: ../../Zotlabs/Module/Cdav.php:1381 ../../Zotlabs/Module/Profiles.php:504 #: ../../Zotlabs/Module/Profiles.php:791 ../../Zotlabs/Module/Locs.php:127 #: ../../Zotlabs/Module/Connedit.php:915 #: ../../Zotlabs/Module/Admin/Channels.php:160 msgid "Address" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:1381 ../../Zotlabs/Module/Profiles.php:792 +#: ../../Zotlabs/Module/Cdav.php:1382 ../../Zotlabs/Module/Profiles.php:792 #: ../../Zotlabs/Module/Connedit.php:916 msgid "Note" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:1382 ../../Zotlabs/Module/Profiles.php:793 +#: ../../Zotlabs/Module/Cdav.php:1383 ../../Zotlabs/Module/Profiles.php:793 #: ../../Zotlabs/Module/Connedit.php:917 ../../include/connections.php:734 #: ../../include/event.php:1422 msgid "Mobile" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:1383 ../../Zotlabs/Module/Profiles.php:794 -#: ../../Zotlabs/Module/Connedit.php:918 ../../include/connections.php:735 +#: ../../Zotlabs/Module/Cdav.php:1384 ../../Zotlabs/Module/Profiles.php:794 +#: ../../Zotlabs/Module/Connedit.php:918 +#: ../../Zotlabs/Widget/Notifications.php:36 ../../include/connections.php:735 #: ../../include/event.php:1423 msgid "Home" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:1384 ../../Zotlabs/Module/Profiles.php:795 +#: ../../Zotlabs/Module/Cdav.php:1385 ../../Zotlabs/Module/Profiles.php:795 #: ../../Zotlabs/Module/Connedit.php:919 ../../include/connections.php:738 #: ../../include/event.php:1426 msgid "Work" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:1386 ../../Zotlabs/Module/Profiles.php:797 +#: ../../Zotlabs/Module/Cdav.php:1387 ../../Zotlabs/Module/Profiles.php:797 #: ../../Zotlabs/Module/Connedit.php:921 msgid "Add Contact" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:1387 ../../Zotlabs/Module/Profiles.php:798 +#: ../../Zotlabs/Module/Cdav.php:1388 ../../Zotlabs/Module/Profiles.php:798 #: ../../Zotlabs/Module/Connedit.php:922 msgid "Add Field" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:1392 ../../Zotlabs/Module/Connedit.php:927 +#: ../../Zotlabs/Module/Cdav.php:1393 ../../Zotlabs/Module/Connedit.php:927 msgid "P.O. Box" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:1393 ../../Zotlabs/Module/Connedit.php:928 +#: ../../Zotlabs/Module/Cdav.php:1394 ../../Zotlabs/Module/Connedit.php:928 msgid "Additional" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:1394 ../../Zotlabs/Module/Connedit.php:929 +#: ../../Zotlabs/Module/Cdav.php:1395 ../../Zotlabs/Module/Connedit.php:929 msgid "Street" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:1395 ../../Zotlabs/Module/Connedit.php:930 +#: ../../Zotlabs/Module/Cdav.php:1396 ../../Zotlabs/Module/Connedit.php:930 msgid "Locality" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:1396 ../../Zotlabs/Module/Connedit.php:931 +#: ../../Zotlabs/Module/Cdav.php:1397 ../../Zotlabs/Module/Connedit.php:931 msgid "Region" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:1397 ../../Zotlabs/Module/Connedit.php:932 +#: ../../Zotlabs/Module/Cdav.php:1398 ../../Zotlabs/Module/Connedit.php:932 msgid "ZIP Code" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:1398 ../../Zotlabs/Module/Profiles.php:758 +#: ../../Zotlabs/Module/Cdav.php:1399 ../../Zotlabs/Module/Profiles.php:758 #: ../../Zotlabs/Module/Connedit.php:933 msgid "Country" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:1457 +#: ../../Zotlabs/Module/Cdav.php:1458 msgid "Default Calendar" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:1468 +#: ../../Zotlabs/Module/Cdav.php:1469 msgid "Default Addressbook" msgstr "" @@ -935,9 +940,7 @@ msgstr "" #: ../../Zotlabs/Storage/Browser.php:312 ../../Zotlabs/Storage/Browser.php:389 #: ../../Zotlabs/Storage/Browser.php:391 ../../Zotlabs/Storage/Browser.php:552 #: ../../Zotlabs/Lib/Libzotdir.php:165 ../../Zotlabs/Lib/Libzotdir.php:166 -#: ../../Zotlabs/Lib/Libzotdir.php:168 ../../include/conversation.php:1463 -#: ../../include/dir_fns.php:144 ../../include/dir_fns.php:145 -#: ../../include/dir_fns.php:146 +#: ../../Zotlabs/Lib/Libzotdir.php:168 ../../include/conversation.php:1472 #: ../../extend/addon/hubzilla-addons/channelreputation/channelreputation.php:111 #: ../../extend/addon/hubzilla-addons/redred/Mod_Redred.php:63 #: ../../extend/addon/hubzilla-addons/cart/cart.php:1370 @@ -946,9 +949,9 @@ msgstr "" #: ../../extend/addon/hubzilla-addons/cart/submodules/orderoptions.php:361 #: ../../extend/addon/hubzilla-addons/cart/submodules/orderoptions.php:437 #: ../../extend/addon/hubzilla-addons/cart/submodules/orderoptions.php:461 -#: ../../extend/addon/hubzilla-addons/cart/submodules/hzservices.php:65 -#: ../../extend/addon/hubzilla-addons/cart/submodules/hzservices.php:649 -#: ../../extend/addon/hubzilla-addons/cart/submodules/hzservices.php:653 +#: ../../extend/addon/hubzilla-addons/cart/submodules/hzservices.php:66 +#: ../../extend/addon/hubzilla-addons/cart/submodules/hzservices.php:650 +#: ../../extend/addon/hubzilla-addons/cart/submodules/hzservices.php:654 #: ../../extend/addon/hubzilla-addons/cart/submodules/subscriptions.php:153 #: ../../extend/addon/hubzilla-addons/cart/submodules/subscriptions.php:425 #: ../../extend/addon/hubzilla-addons/cart/submodules/paypalbuttonV2.php:88 @@ -987,7 +990,7 @@ msgstr "" #: ../../extend/addon/hubzilla-addons/pumpio/Mod_Pumpio.php:98 #: ../../extend/addon/hubzilla-addons/pumpio/Mod_Pumpio.php:102 #: ../../view/theme/redbasic/php/config.php:99 -#: ../../view/theme/redbasic/php/config.php:116 ../../boot.php:1725 +#: ../../view/theme/redbasic/php/config.php:116 ../../boot.php:1726 msgid "Yes" msgstr "" @@ -1009,9 +1012,7 @@ msgstr "" #: ../../Zotlabs/Storage/Browser.php:312 ../../Zotlabs/Storage/Browser.php:389 #: ../../Zotlabs/Storage/Browser.php:391 ../../Zotlabs/Storage/Browser.php:552 #: ../../Zotlabs/Lib/Libzotdir.php:165 ../../Zotlabs/Lib/Libzotdir.php:166 -#: ../../Zotlabs/Lib/Libzotdir.php:168 ../../include/conversation.php:1463 -#: ../../include/dir_fns.php:144 ../../include/dir_fns.php:145 -#: ../../include/dir_fns.php:146 +#: ../../Zotlabs/Lib/Libzotdir.php:168 ../../include/conversation.php:1472 #: ../../extend/addon/hubzilla-addons/channelreputation/channelreputation.php:111 #: ../../extend/addon/hubzilla-addons/redred/Mod_Redred.php:63 #: ../../extend/addon/hubzilla-addons/cart/cart.php:1370 @@ -1020,9 +1021,9 @@ msgstr "" #: ../../extend/addon/hubzilla-addons/cart/submodules/orderoptions.php:362 #: ../../extend/addon/hubzilla-addons/cart/submodules/orderoptions.php:438 #: ../../extend/addon/hubzilla-addons/cart/submodules/orderoptions.php:462 -#: ../../extend/addon/hubzilla-addons/cart/submodules/hzservices.php:65 -#: ../../extend/addon/hubzilla-addons/cart/submodules/hzservices.php:649 -#: ../../extend/addon/hubzilla-addons/cart/submodules/hzservices.php:653 +#: ../../extend/addon/hubzilla-addons/cart/submodules/hzservices.php:66 +#: ../../extend/addon/hubzilla-addons/cart/submodules/hzservices.php:650 +#: ../../extend/addon/hubzilla-addons/cart/submodules/hzservices.php:654 #: ../../extend/addon/hubzilla-addons/cart/submodules/subscriptions.php:153 #: ../../extend/addon/hubzilla-addons/cart/submodules/subscriptions.php:425 #: ../../extend/addon/hubzilla-addons/cart/submodules/paypalbuttonV2.php:88 @@ -1061,7 +1062,7 @@ msgstr "" #: ../../extend/addon/hubzilla-addons/pumpio/Mod_Pumpio.php:98 #: ../../extend/addon/hubzilla-addons/pumpio/Mod_Pumpio.php:102 #: ../../view/theme/redbasic/php/config.php:99 -#: ../../view/theme/redbasic/php/config.php:116 ../../boot.php:1725 +#: ../../view/theme/redbasic/php/config.php:116 ../../boot.php:1726 msgid "No" msgstr "" @@ -1086,7 +1087,7 @@ msgstr "" #: ../../Zotlabs/Module/Admin/Profs.php:114 #: ../../Zotlabs/Module/Articles.php:117 ../../Zotlabs/Module/Rbmark.php:31 #: ../../Zotlabs/Module/Rbmark.php:103 ../../Zotlabs/Widget/Notes.php:23 -#: ../../include/text.php:1145 ../../include/text.php:1157 +#: ../../include/text.php:1146 ../../include/text.php:1158 #: ../../extend/addon/hubzilla-addons/queueworker/Mod_Queueworker.php:116 msgid "Save" msgstr "" @@ -1099,7 +1100,7 @@ msgstr "" msgid "Documentation Search" msgstr "" -#: ../../Zotlabs/Module/Help.php:83 ../../include/nav.php:434 +#: ../../Zotlabs/Module/Help.php:83 ../../include/nav.php:438 msgid "About" msgstr "" @@ -1183,8 +1184,8 @@ msgstr "" msgid "Export selected" msgstr "" -#: ../../Zotlabs/Module/Webpages.php:251 ../../Zotlabs/Lib/Apps.php:341 -#: ../../include/nav.php:524 +#: ../../Zotlabs/Module/Webpages.php:251 ../../Zotlabs/Lib/Apps.php:342 +#: ../../include/nav.php:528 msgid "Webpages" msgstr "" @@ -1200,7 +1201,7 @@ msgstr "" #: ../../Zotlabs/Module/Editwebpage.php:142 #: ../../Zotlabs/Module/Article_edit.php:97 #: ../../Zotlabs/Module/Admin/Profs.php:175 ../../Zotlabs/Module/Thing.php:268 -#: ../../Zotlabs/Module/Menu.php:176 ../../Zotlabs/Lib/Apps.php:557 +#: ../../Zotlabs/Module/Menu.php:176 ../../Zotlabs/Lib/Apps.php:558 #: ../../Zotlabs/Lib/ThreadItem.php:149 ../../Zotlabs/Widget/Cdav.php:138 #: ../../Zotlabs/Widget/Cdav.php:175 ../../include/channel.php:1486 #: ../../include/channel.php:1490 ../../include/menu.php:120 @@ -1210,7 +1211,7 @@ msgstr "" #: ../../Zotlabs/Module/Webpages.php:255 ../../Zotlabs/Module/Layouts.php:194 #: ../../Zotlabs/Module/Wiki.php:300 ../../Zotlabs/Module/Blocks.php:161 #: ../../Zotlabs/Module/Photos.php:1078 ../../Zotlabs/Widget/Cdav.php:136 -#: ../../include/conversation.php:1432 +#: ../../include/conversation.php:1441 #: ../../extend/addon/hubzilla-addons/hsse/hsse.php:186 msgid "Share" msgstr "" @@ -1222,7 +1223,7 @@ msgid "View" msgstr "" #: ../../Zotlabs/Module/Webpages.php:261 ../../Zotlabs/Module/Photos.php:1099 -#: ../../Zotlabs/Lib/ThreadItem.php:837 ../../include/conversation.php:1399 +#: ../../Zotlabs/Lib/ThreadItem.php:837 ../../include/conversation.php:1408 #: ../../extend/addon/hubzilla-addons/hsse/hsse.php:153 msgid "Preview" msgstr "" @@ -1702,38 +1703,38 @@ msgid "Previous action reversed." msgstr "" #: ../../Zotlabs/Module/Like.php:439 ../../Zotlabs/Module/Tagger.php:71 -#: ../../Zotlabs/Module/Subthread.php:115 ../../Zotlabs/Lib/Activity.php:3248 -#: ../../include/conversation.php:128 ../../include/text.php:2236 -#: ../../extend/addon/hubzilla-addons/diaspora/Receiver.php:1649 -#: ../../extend/addon/hubzilla-addons/pubcrawl/as.php:2111 +#: ../../Zotlabs/Module/Subthread.php:115 ../../Zotlabs/Lib/Activity.php:3252 +#: ../../include/conversation.php:128 ../../include/text.php:2251 +#: ../../extend/addon/hubzilla-addons/diaspora/Receiver.php:1621 +#: ../../extend/addon/hubzilla-addons/pubcrawl/as.php:1926 #: ../../extend/addon/hubzilla-addons/redphotos/redphotohelper.php:71 msgid "photo" msgstr "" #: ../../Zotlabs/Module/Like.php:439 ../../Zotlabs/Module/Subthread.php:115 -#: ../../extend/addon/hubzilla-addons/diaspora/Receiver.php:1649 -#: ../../extend/addon/hubzilla-addons/pubcrawl/as.php:2111 +#: ../../extend/addon/hubzilla-addons/diaspora/Receiver.php:1621 +#: ../../extend/addon/hubzilla-addons/pubcrawl/as.php:1926 msgid "status" msgstr "" #: ../../Zotlabs/Module/Like.php:441 ../../Zotlabs/Module/Tagger.php:75 #: ../../Zotlabs/Module/Channel_calendar.php:221 -#: ../../include/conversation.php:132 ../../include/text.php:2239 +#: ../../include/conversation.php:132 ../../include/text.php:2254 #: ../../include/event.php:1259 msgid "event" msgstr "" -#: ../../Zotlabs/Module/Like.php:471 ../../Zotlabs/Lib/Activity.php:3281 +#: ../../Zotlabs/Module/Like.php:471 ../../Zotlabs/Lib/Activity.php:3285 #: ../../include/conversation.php:174 -#: ../../extend/addon/hubzilla-addons/diaspora/Receiver.php:1595 -#: ../../extend/addon/hubzilla-addons/pubcrawl/as.php:2148 +#: ../../extend/addon/hubzilla-addons/diaspora/Receiver.php:1567 +#: ../../extend/addon/hubzilla-addons/pubcrawl/as.php:1963 #, php-format msgid "%1$s likes %2$s's %3$s" msgstr "" -#: ../../Zotlabs/Module/Like.php:473 ../../Zotlabs/Lib/Activity.php:3283 +#: ../../Zotlabs/Module/Like.php:473 ../../Zotlabs/Lib/Activity.php:3287 #: ../../include/conversation.php:177 -#: ../../extend/addon/hubzilla-addons/pubcrawl/as.php:2150 +#: ../../extend/addon/hubzilla-addons/pubcrawl/as.php:1965 #, php-format msgid "%1$s doesn't like %2$s's %3$s" msgstr "" @@ -1754,19 +1755,19 @@ msgid "%1$s abstains from a decision on %2$s's %3$s" msgstr "" #: ../../Zotlabs/Module/Like.php:481 -#: ../../extend/addon/hubzilla-addons/diaspora/Receiver.php:2226 +#: ../../extend/addon/hubzilla-addons/diaspora/Receiver.php:2200 #, php-format msgid "%1$s is attending %2$s's %3$s" msgstr "" #: ../../Zotlabs/Module/Like.php:483 -#: ../../extend/addon/hubzilla-addons/diaspora/Receiver.php:2228 +#: ../../extend/addon/hubzilla-addons/diaspora/Receiver.php:2202 #, php-format msgid "%1$s is not attending %2$s's %3$s" msgstr "" #: ../../Zotlabs/Module/Like.php:485 -#: ../../extend/addon/hubzilla-addons/diaspora/Receiver.php:2230 +#: ../../extend/addon/hubzilla-addons/diaspora/Receiver.php:2204 #, php-format msgid "%1$s may attend %2$s's %3$s" msgstr "" @@ -1788,7 +1789,7 @@ msgstr "" #: ../../extend/addon/hubzilla-addons/msgfooter/msgfooter.php:54 #: ../../extend/addon/hubzilla-addons/piwik/piwik.php:116 #: ../../extend/addon/hubzilla-addons/rendezvous/rendezvous.php:82 -#: ../../extend/addon/hubzilla-addons/diaspora/diaspora.php:97 +#: ../../extend/addon/hubzilla-addons/diaspora/diaspora.php:102 #: ../../extend/addon/hubzilla-addons/openstreetmap/openstreetmap.php:171 #: ../../extend/addon/hubzilla-addons/xmpp/xmpp.php:54 #: ../../extend/addon/hubzilla-addons/twitter/twitter.php:487 @@ -1825,8 +1826,8 @@ msgstr "" #: ../../Zotlabs/Module/Defperms.php:257 #: ../../Zotlabs/Module/New_channel.php:157 #: ../../Zotlabs/Module/New_channel.php:164 -#: ../../Zotlabs/Module/Connedit.php:854 -#: ../../Zotlabs/Widget/Notifications.php:167 ../../include/nav.php:324 +#: ../../Zotlabs/Module/Connedit.php:854 ../../Zotlabs/Widget/Messages.php:27 +#: ../../Zotlabs/Widget/Notifications.php:166 ../../include/nav.php:324 msgid "Loading" msgstr "" @@ -1874,11 +1875,11 @@ msgstr "" msgid "Layout Description (Optional)" msgstr "" -#: ../../Zotlabs/Module/Layouts.php:184 ../../include/text.php:2675 +#: ../../Zotlabs/Module/Layouts.php:184 ../../include/text.php:2690 msgid "Layouts" msgstr "" -#: ../../Zotlabs/Module/Layouts.php:186 ../../Zotlabs/Lib/Apps.php:348 +#: ../../Zotlabs/Module/Layouts.php:186 ../../Zotlabs/Lib/Apps.php:349 #: ../../include/nav.php:180 ../../include/nav.php:320 #: ../../include/help.php:118 ../../include/help.php:126 msgid "Help" @@ -1905,21 +1906,21 @@ msgid "The unmoderated public stream of this hub" msgstr "" #: ../../Zotlabs/Module/Pubstream.php:95 ../../Zotlabs/Module/Display.php:76 -#: ../../Zotlabs/Module/Channel.php:269 ../../Zotlabs/Module/Hq.php:125 +#: ../../Zotlabs/Module/Channel.php:269 ../../Zotlabs/Module/Hq.php:113 #: ../../Zotlabs/Module/Network.php:209 msgid "Reset form" msgstr "" -#: ../../Zotlabs/Module/Pubstream.php:105 ../../Zotlabs/Lib/Apps.php:375 +#: ../../Zotlabs/Module/Pubstream.php:105 ../../Zotlabs/Lib/Apps.php:376 #: ../../Zotlabs/Widget/Notifications.php:147 msgid "Public Stream" msgstr "" -#: ../../Zotlabs/Module/Sse_bs.php:569 +#: ../../Zotlabs/Module/Sse_bs.php:572 msgid "Private forum" msgstr "" -#: ../../Zotlabs/Module/Sse_bs.php:569 +#: ../../Zotlabs/Module/Sse_bs.php:572 msgid "Public forum" msgstr "" @@ -1949,7 +1950,7 @@ msgid "Management of privacy groups" msgstr "" #: ../../Zotlabs/Module/Group.php:142 ../../Zotlabs/Module/Group.php:154 -#: ../../Zotlabs/Lib/Group.php:324 ../../Zotlabs/Lib/Apps.php:364 +#: ../../Zotlabs/Lib/Group.php:324 ../../Zotlabs/Lib/Apps.php:365 #: ../../Zotlabs/Widget/Activity_filter.php:88 ../../include/group.php:327 #: ../../include/acl_selectors.php:87 ../../include/nav.php:104 msgid "Privacy Groups" @@ -2030,7 +2031,7 @@ msgid "Please enter your password for verification:" msgstr "" #: ../../Zotlabs/Module/Removeme.php:64 -#: ../../Zotlabs/Module/Settings/Channel.php:596 +#: ../../Zotlabs/Module/Settings/Channel.php:597 msgid "Remove Channel" msgstr "" @@ -2224,20 +2225,20 @@ msgstr "" msgid "Public access denied." msgstr "" -#: ../../Zotlabs/Module/Search.php:45 ../../Zotlabs/Module/Connections.php:379 -#: ../../Zotlabs/Lib/Apps.php:353 ../../Zotlabs/Widget/Sitesearch.php:31 -#: ../../Zotlabs/Widget/Activity_filter.php:203 ../../include/text.php:1144 -#: ../../include/text.php:1156 ../../include/acl_selectors.php:149 +#: ../../Zotlabs/Module/Search.php:44 ../../Zotlabs/Module/Connections.php:379 +#: ../../Zotlabs/Lib/Apps.php:354 ../../Zotlabs/Widget/Sitesearch.php:31 +#: ../../Zotlabs/Widget/Activity_filter.php:203 ../../include/text.php:1145 +#: ../../include/text.php:1157 ../../include/acl_selectors.php:149 #: ../../include/nav.php:194 msgid "Search" msgstr "" -#: ../../Zotlabs/Module/Search.php:250 +#: ../../Zotlabs/Module/Search.php:249 #, php-format msgid "Items tagged with: %s" msgstr "" -#: ../../Zotlabs/Module/Search.php:252 +#: ../../Zotlabs/Module/Search.php:251 #, php-format msgid "Search results for: %s" msgstr "" @@ -2278,14 +2279,14 @@ msgstr "" msgid "Post not found." msgstr "" -#: ../../Zotlabs/Module/Tagger.php:79 ../../Zotlabs/Lib/Activity.php:3248 -#: ../../include/conversation.php:158 ../../include/text.php:2242 +#: ../../Zotlabs/Module/Tagger.php:79 ../../Zotlabs/Lib/Activity.php:3252 +#: ../../include/conversation.php:158 ../../include/text.php:2257 #: ../../include/markdown.php:205 ../../include/bbcode.php:555 msgid "post" msgstr "" #: ../../Zotlabs/Module/Tagger.php:81 ../../include/conversation.php:160 -#: ../../include/text.php:2244 +#: ../../include/text.php:2259 msgid "comment" msgstr "" @@ -2544,10 +2545,9 @@ msgstr "" #: ../../Zotlabs/Module/Card_edit.php:101 #: ../../Zotlabs/Module/Editblock.php:116 ../../Zotlabs/Module/Chat.php:220 #: ../../Zotlabs/Module/Editwebpage.php:143 -#: ../../Zotlabs/Module/Article_edit.php:99 ../../include/conversation.php:1340 +#: ../../Zotlabs/Module/Article_edit.php:99 ../../include/conversation.php:1348 #: ../../extend/addon/hubzilla-addons/hsse/hsse.php:95 -#: ../../extend/addon/hubzilla-addons/mail/Mod_Mail.php:167 -#: ../../extend/addon/hubzilla-addons/mail/Mod_Mail.php:310 +#: ../../extend/addon/hubzilla-addons/mail/Mod_Mail.php:205 msgid "Insert web link" msgstr "" @@ -2555,7 +2555,7 @@ msgstr "" #: ../../Zotlabs/Module/Editblock.php:129 ../../Zotlabs/Module/Photos.php:674 #: ../../Zotlabs/Module/Photos.php:1044 #: ../../Zotlabs/Module/Article_edit.php:116 -#: ../../include/conversation.php:1472 +#: ../../include/conversation.php:1481 #: ../../extend/addon/hubzilla-addons/hsse/hsse.php:221 msgid "Title (optional)" msgstr "" @@ -2569,27 +2569,27 @@ msgid "No connections." msgstr "" #: ../../Zotlabs/Module/Viewconnections.php:80 -#: ../../Zotlabs/Module/Connections.php:289 ../../include/text.php:1038 +#: ../../Zotlabs/Module/Connections.php:289 ../../include/text.php:1039 msgid "Accepts" msgstr "" #: ../../Zotlabs/Module/Viewconnections.php:83 -#: ../../Zotlabs/Module/Connections.php:292 ../../include/text.php:1041 +#: ../../Zotlabs/Module/Connections.php:292 ../../include/text.php:1042 msgid "Comments" msgstr "" #: ../../Zotlabs/Module/Viewconnections.php:88 -#: ../../Zotlabs/Module/Connections.php:297 ../../include/text.php:1046 +#: ../../Zotlabs/Module/Connections.php:297 ../../include/text.php:1047 msgid "Stream items" msgstr "" #: ../../Zotlabs/Module/Viewconnections.php:93 -#: ../../Zotlabs/Module/Connections.php:302 ../../include/text.php:1051 +#: ../../Zotlabs/Module/Connections.php:302 ../../include/text.php:1052 msgid "Wall posts" msgstr "" #: ../../Zotlabs/Module/Viewconnections.php:97 -#: ../../Zotlabs/Module/Connections.php:306 ../../include/text.php:1055 +#: ../../Zotlabs/Module/Connections.php:306 ../../include/text.php:1056 msgid "Nothing" msgstr "" @@ -2678,11 +2678,12 @@ msgid "Error downloading wiki: " msgstr "" #: ../../Zotlabs/Module/Wiki.php:205 ../../Zotlabs/Widget/Wiki_list.php:15 -#: ../../include/nav.php:536 +#: ../../include/nav.php:540 msgid "Wikis" msgstr "" #: ../../Zotlabs/Module/Wiki.php:211 ../../Zotlabs/Storage/Browser.php:404 +#: ../../extend/addon/hubzilla-addons/mail/Mod_Mail.php:166 msgid "Download" msgstr "" @@ -2696,19 +2697,19 @@ msgstr "" #: ../../Zotlabs/Module/Wiki.php:216 ../../Zotlabs/Module/Wiki.php:370 #: ../../Zotlabs/Widget/Wiki_pages.php:38 -#: ../../Zotlabs/Widget/Wiki_pages.php:95 ../../include/text.php:2100 +#: ../../Zotlabs/Widget/Wiki_pages.php:95 ../../include/text.php:2115 #: ../../extend/addon/hubzilla-addons/mdpost/mdpost.php:41 msgid "Markdown" msgstr "" #: ../../Zotlabs/Module/Wiki.php:216 ../../Zotlabs/Module/Wiki.php:370 #: ../../Zotlabs/Widget/Wiki_pages.php:38 -#: ../../Zotlabs/Widget/Wiki_pages.php:95 ../../include/text.php:2098 +#: ../../Zotlabs/Widget/Wiki_pages.php:95 ../../include/text.php:2113 msgid "BBcode" msgstr "" #: ../../Zotlabs/Module/Wiki.php:216 ../../Zotlabs/Widget/Wiki_pages.php:38 -#: ../../Zotlabs/Widget/Wiki_pages.php:95 ../../include/text.php:2101 +#: ../../Zotlabs/Widget/Wiki_pages.php:95 ../../include/text.php:2116 msgid "Text" msgstr "" @@ -2765,7 +2766,7 @@ msgstr "" #: ../../extend/addon/hubzilla-addons/ljpost/ljpost.php:134 #: ../../extend/addon/hubzilla-addons/dwpost/Mod_Dwpost.php:69 #: ../../extend/addon/hubzilla-addons/dwpost/dwpost.php:134 -#: ../../extend/addon/hubzilla-addons/wppost/wppost.php:173 +#: ../../extend/addon/hubzilla-addons/wppost/wppost.php:174 #: ../../extend/addon/hubzilla-addons/wppost/Mod_Wppost.php:98 msgid "Source" msgstr "" @@ -2778,27 +2779,27 @@ msgstr "" msgid "Embed image from photo albums" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:399 ../../include/conversation.php:1454 +#: ../../Zotlabs/Module/Wiki.php:399 ../../include/conversation.php:1463 #: ../../extend/addon/hubzilla-addons/hsse/hsse.php:208 msgid "Embed an image from your albums" msgstr "" #: ../../Zotlabs/Module/Wiki.php:401 ../../Zotlabs/Module/Profile_photo.php:508 -#: ../../Zotlabs/Module/Cover_photo.php:429 ../../include/conversation.php:1456 -#: ../../include/conversation.php:1509 +#: ../../Zotlabs/Module/Cover_photo.php:429 ../../include/conversation.php:1465 +#: ../../include/conversation.php:1518 #: ../../extend/addon/hubzilla-addons/hsse/hsse.php:210 #: ../../extend/addon/hubzilla-addons/hsse/hsse.php:257 msgid "OK" msgstr "" #: ../../Zotlabs/Module/Wiki.php:402 ../../Zotlabs/Module/Profile_photo.php:509 -#: ../../Zotlabs/Module/Cover_photo.php:430 ../../include/conversation.php:1382 +#: ../../Zotlabs/Module/Cover_photo.php:430 ../../include/conversation.php:1390 #: ../../extend/addon/hubzilla-addons/hsse/hsse.php:139 msgid "Choose images to embed" msgstr "" #: ../../Zotlabs/Module/Wiki.php:403 ../../Zotlabs/Module/Profile_photo.php:510 -#: ../../Zotlabs/Module/Cover_photo.php:431 ../../include/conversation.php:1383 +#: ../../Zotlabs/Module/Cover_photo.php:431 ../../include/conversation.php:1391 #: ../../extend/addon/hubzilla-addons/hsse/hsse.php:140 msgid "Choose an album" msgstr "" @@ -2809,19 +2810,19 @@ msgid "Choose a different album" msgstr "" #: ../../Zotlabs/Module/Wiki.php:405 ../../Zotlabs/Module/Profile_photo.php:512 -#: ../../Zotlabs/Module/Cover_photo.php:433 ../../include/conversation.php:1385 +#: ../../Zotlabs/Module/Cover_photo.php:433 ../../include/conversation.php:1393 #: ../../extend/addon/hubzilla-addons/hsse/hsse.php:142 msgid "Error getting album list" msgstr "" #: ../../Zotlabs/Module/Wiki.php:406 ../../Zotlabs/Module/Profile_photo.php:513 -#: ../../Zotlabs/Module/Cover_photo.php:434 ../../include/conversation.php:1386 +#: ../../Zotlabs/Module/Cover_photo.php:434 ../../include/conversation.php:1394 #: ../../extend/addon/hubzilla-addons/hsse/hsse.php:143 msgid "Error getting photo link" msgstr "" #: ../../Zotlabs/Module/Wiki.php:407 ../../Zotlabs/Module/Profile_photo.php:514 -#: ../../Zotlabs/Module/Cover_photo.php:435 ../../include/conversation.php:1387 +#: ../../Zotlabs/Module/Cover_photo.php:435 ../../include/conversation.php:1395 #: ../../extend/addon/hubzilla-addons/hsse/hsse.php:144 msgid "Error getting album" msgstr "" @@ -2887,7 +2888,7 @@ msgstr "" msgid "Block Name" msgstr "" -#: ../../Zotlabs/Module/Blocks.php:154 ../../include/text.php:2673 +#: ../../Zotlabs/Module/Blocks.php:154 ../../include/text.php:2688 msgid "Blocks" msgstr "" @@ -2964,13 +2965,14 @@ msgstr "" msgid "Online" msgstr "" -#: ../../Zotlabs/Module/Fbrowser.php:29 ../../Zotlabs/Lib/Apps.php:345 -#: ../../include/features.php:368 ../../include/nav.php:444 +#: ../../Zotlabs/Module/Fbrowser.php:29 ../../Zotlabs/Lib/Apps.php:346 +#: ../../include/features.php:368 ../../include/nav.php:448 msgid "Photos" msgstr "" #: ../../Zotlabs/Module/Fbrowser.php:85 ../../Zotlabs/Storage/Browser.php:351 -#: ../../Zotlabs/Lib/Apps.php:340 ../../include/nav.php:452 +#: ../../Zotlabs/Lib/Apps.php:341 ../../Zotlabs/Widget/Notifications.php:101 +#: ../../include/nav.php:456 msgid "Files" msgstr "" @@ -3008,9 +3010,9 @@ msgstr "" msgid "Connection has been removed." msgstr "" -#: ../../Zotlabs/Module/Connedit.php:593 ../../Zotlabs/Lib/Apps.php:344 -#: ../../include/conversation.php:1078 ../../include/nav.php:115 -#: ../../extend/addon/hubzilla-addons/openclipatar/openclipatar.php:57 +#: ../../Zotlabs/Module/Connedit.php:593 ../../Zotlabs/Lib/Apps.php:345 +#: ../../include/conversation.php:1086 ../../include/nav.php:115 +#: ../../extend/addon/hubzilla-addons/openclipatar/openclipatar.php:58 msgid "View Profile" msgstr "" @@ -3035,7 +3037,7 @@ msgstr "" msgid "Fetch updated photo" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:614 ../../include/conversation.php:1088 +#: ../../Zotlabs/Module/Connedit.php:614 ../../include/conversation.php:1096 msgid "Recent Activity" msgstr "" @@ -3455,14 +3457,14 @@ msgid "Image resize failed." msgstr "" #: ../../Zotlabs/Module/Profile_photo.php:254 -#: ../../extend/addon/hubzilla-addons/openclipatar/openclipatar.php:298 +#: ../../extend/addon/hubzilla-addons/openclipatar/openclipatar.php:299 msgid "" "Shift-reload the page or clear browser cache if the new photo does not " "display immediately." msgstr "" #: ../../Zotlabs/Module/Profile_photo.php:261 -#: ../../Zotlabs/Module/Cover_photo.php:241 ../../include/photos.php:196 +#: ../../Zotlabs/Module/Cover_photo.php:241 ../../include/photos.php:199 msgid "Unable to process image" msgstr "" @@ -3570,7 +3572,7 @@ msgid "NEW" msgstr "" #: ../../Zotlabs/Module/Sharedwithme.php:108 -#: ../../Zotlabs/Storage/Browser.php:379 ../../include/text.php:1540 +#: ../../Zotlabs/Storage/Browser.php:379 ../../include/text.php:1541 msgid "Size" msgstr "" @@ -3595,7 +3597,7 @@ msgstr "" msgid "Create a new channel" msgstr "" -#: ../../Zotlabs/Module/Manage.php:160 ../../Zotlabs/Lib/Apps.php:337 +#: ../../Zotlabs/Module/Manage.php:160 ../../Zotlabs/Lib/Apps.php:338 #: ../../include/nav.php:101 msgid "Channel Manager" msgstr "" @@ -3629,36 +3631,36 @@ msgstr "" msgid "Connection added." msgstr "" -#: ../../Zotlabs/Module/Item.php:471 ../../Zotlabs/Module/Pin.php:36 +#: ../../Zotlabs/Module/Item.php:472 ../../Zotlabs/Module/Pin.php:36 msgid "Unable to locate original post." msgstr "" -#: ../../Zotlabs/Module/Item.php:757 +#: ../../Zotlabs/Module/Item.php:758 msgid "Empty post discarded." msgstr "" -#: ../../Zotlabs/Module/Item.php:1191 +#: ../../Zotlabs/Module/Item.php:1192 msgid "Duplicate post suppressed." msgstr "" -#: ../../Zotlabs/Module/Item.php:1336 +#: ../../Zotlabs/Module/Item.php:1337 msgid "System error. Post not saved." msgstr "" -#: ../../Zotlabs/Module/Item.php:1370 +#: ../../Zotlabs/Module/Item.php:1371 msgid "Your comment is awaiting approval." msgstr "" -#: ../../Zotlabs/Module/Item.php:1500 +#: ../../Zotlabs/Module/Item.php:1501 msgid "Unable to obtain post information from database." msgstr "" -#: ../../Zotlabs/Module/Item.php:1507 +#: ../../Zotlabs/Module/Item.php:1508 #, php-format msgid "You have reached your limit of %1$.0f top level posts." msgstr "" -#: ../../Zotlabs/Module/Item.php:1514 +#: ../../Zotlabs/Module/Item.php:1515 #, php-format msgid "You have reached your limit of %1$.0f webpages." msgstr "" @@ -3779,7 +3781,7 @@ msgstr "" msgid "Software" msgstr "" -#: ../../Zotlabs/Module/Pubsites.php:35 ../../include/conversation.php:1128 +#: ../../Zotlabs/Module/Pubsites.php:35 ../../include/conversation.php:1136 msgid "Ratings" msgstr "" @@ -3824,18 +3826,16 @@ msgstr "" msgid "Bookmark this room" msgstr "" -#: ../../Zotlabs/Module/Chat.php:218 ../../include/conversation.php:1377 +#: ../../Zotlabs/Module/Chat.php:218 ../../include/conversation.php:1385 #: ../../extend/addon/hubzilla-addons/hsse/hsse.php:134 -#: ../../extend/addon/hubzilla-addons/mail/Mod_Mail.php:120 -#: ../../extend/addon/hubzilla-addons/mail/Mod_Mail.php:241 +#: ../../extend/addon/hubzilla-addons/mail/Mod_Mail.php:135 msgid "Please enter a link URL:" msgstr "" #: ../../Zotlabs/Module/Chat.php:219 ../../Zotlabs/Lib/ThreadItem.php:841 -#: ../../include/conversation.php:1507 +#: ../../include/conversation.php:1516 #: ../../extend/addon/hubzilla-addons/hsse/hsse.php:255 -#: ../../extend/addon/hubzilla-addons/mail/Mod_Mail.php:173 -#: ../../extend/addon/hubzilla-addons/mail/Mod_Mail.php:316 +#: ../../extend/addon/hubzilla-addons/mail/Mod_Mail.php:211 msgid "Encrypt text" msgstr "" @@ -3958,7 +3958,7 @@ msgid "" "Password reset failed." msgstr "" -#: ../../Zotlabs/Module/Lostpass.php:91 ../../boot.php:1729 +#: ../../Zotlabs/Module/Lostpass.php:91 ../../boot.php:1730 msgid "Password Reset" msgstr "" @@ -4174,13 +4174,12 @@ msgid "View Photo" msgstr "" #: ../../Zotlabs/Module/Photos.php:793 ../../Zotlabs/Module/Photos.php:1253 -#: ../../Zotlabs/Module/Embedphotos.php:177 ../../Zotlabs/Lib/Apps.php:1112 -#: ../../Zotlabs/Lib/Apps.php:1196 ../../Zotlabs/Lib/Activity.php:1553 +#: ../../Zotlabs/Module/Embedphotos.php:177 ../../Zotlabs/Lib/Apps.php:1113 +#: ../../Zotlabs/Lib/Apps.php:1197 ../../Zotlabs/Lib/Activity.php:1555 #: ../../Zotlabs/Widget/Portfolio.php:95 ../../Zotlabs/Widget/Pinned.php:268 -#: ../../Zotlabs/Widget/Album.php:84 ../../include/conversation.php:1209 +#: ../../Zotlabs/Widget/Album.php:84 ../../include/conversation.php:1217 #: ../../include/cdav.php:158 ../../include/cdav.php:159 #: ../../include/cdav.php:167 -#: ../../extend/addon/hubzilla-addons/pubcrawl/as.php:1196 msgid "Unknown" msgstr "" @@ -4262,7 +4261,7 @@ msgid "I don't like this (toggle)" msgstr "" #: ../../Zotlabs/Module/Photos.php:1079 ../../Zotlabs/Lib/ThreadItem.php:503 -#: ../../include/conversation.php:830 +#: ../../include/conversation.php:838 msgid "Please wait" msgstr "" @@ -4328,7 +4327,7 @@ msgid "View all" msgstr "" #: ../../Zotlabs/Module/Photos.php:1136 ../../Zotlabs/Lib/ThreadItem.php:243 -#: ../../include/conversation.php:1744 ../../include/channel.php:1729 +#: ../../include/conversation.php:1754 ../../include/channel.php:1729 #: ../../include/taxonomy.php:670 msgctxt "noun" msgid "Like" @@ -4337,7 +4336,7 @@ msgstr[0] "" msgstr[1] "" #: ../../Zotlabs/Module/Photos.php:1141 ../../Zotlabs/Lib/ThreadItem.php:248 -#: ../../include/conversation.php:1747 +#: ../../include/conversation.php:1757 msgctxt "noun" msgid "Dislike" msgid_plural "Dislikes" @@ -4374,7 +4373,7 @@ msgid "Close" msgstr "" #: ../../Zotlabs/Module/Photos.php:1346 ../../Zotlabs/Module/Photos.php:1359 -#: ../../Zotlabs/Module/Photos.php:1360 ../../include/photos.php:667 +#: ../../Zotlabs/Module/Photos.php:1360 ../../include/photos.php:715 msgid "Recent Photos" msgstr "" @@ -4408,8 +4407,8 @@ msgstr "" msgid "Add Card" msgstr "" -#: ../../Zotlabs/Module/Cards.php:207 ../../Zotlabs/Lib/Apps.php:326 -#: ../../include/nav.php:501 +#: ../../Zotlabs/Module/Cards.php:207 ../../Zotlabs/Lib/Apps.php:327 +#: ../../include/nav.php:505 msgid "Cards" msgstr "" @@ -4577,7 +4576,8 @@ msgstr "" msgid "Channel address" msgstr "" -#: ../../Zotlabs/Module/Connections.php:333 ../../include/features.php:290 +#: ../../Zotlabs/Module/Connections.php:333 +#: ../../Zotlabs/Widget/Notifications.php:16 ../../include/features.php:290 msgid "Network" msgstr "" @@ -4599,7 +4599,7 @@ msgstr "" #: ../../Zotlabs/Module/Connections.php:343 #: ../../Zotlabs/Module/Admin/Accounts.php:318 -#: ../../include/conversation.php:776 +#: ../../include/conversation.php:783 msgid "Approve" msgstr "" @@ -4613,7 +4613,7 @@ msgstr "" #: ../../Zotlabs/Module/Connections.php:350 ../../Zotlabs/Module/Suggest.php:71 #: ../../Zotlabs/Module/Directory.php:369 ../../Zotlabs/Widget/Follow.php:32 -#: ../../Zotlabs/Widget/Suggestions.php:46 ../../include/conversation.php:1098 +#: ../../Zotlabs/Widget/Suggestions.php:46 ../../include/conversation.php:1106 #: ../../include/channel.php:1566 ../../include/connections.php:110 msgid "Connect" msgstr "" @@ -4622,8 +4622,8 @@ msgstr "" msgid "Connect at this location" msgstr "" -#: ../../Zotlabs/Module/Connections.php:375 ../../Zotlabs/Lib/Apps.php:333 -#: ../../include/features.php:133 ../../include/text.php:1030 +#: ../../Zotlabs/Module/Connections.php:375 ../../Zotlabs/Lib/Apps.php:334 +#: ../../include/features.php:133 ../../include/text.php:1031 msgid "Connections" msgstr "" @@ -4720,7 +4720,7 @@ msgstr "" msgid "View Common Connections" msgstr "" -#: ../../Zotlabs/Module/Share.php:104 ../../Zotlabs/Lib/Activity.php:2182 +#: ../../Zotlabs/Module/Share.php:104 ../../Zotlabs/Lib/Activity.php:2187 #, php-format msgid "🔁 Repeated %1$s's %2$s" msgstr "" @@ -4750,7 +4750,7 @@ msgid "Authentication failed." msgstr "" #: ../../Zotlabs/Module/Rmagic.php:96 ../../include/channel.php:2545 -#: ../../boot.php:1721 +#: ../../boot.php:1722 msgid "Remote Authentication" msgstr "" @@ -4822,7 +4822,7 @@ msgid "Toggle" msgstr "" #: ../../Zotlabs/Module/Admin/Themes.php:125 -#: ../../Zotlabs/Module/Admin/Addons.php:345 ../../Zotlabs/Lib/Apps.php:339 +#: ../../Zotlabs/Module/Admin/Addons.php:345 ../../Zotlabs/Lib/Apps.php:340 #: ../../Zotlabs/Widget/Settings_menu.php:61 #: ../../Zotlabs/Widget/Newmember.php:53 ../../include/nav.php:106 msgid "Settings" @@ -5113,7 +5113,7 @@ msgid "" msgstr "" #: ../../Zotlabs/Module/Admin/Accounts.php:347 -#: ../../include/conversation.php:1118 +#: ../../include/conversation.php:1126 msgid "Message" msgstr "" @@ -5302,7 +5302,7 @@ msgstr "" msgid "Disallow Code" msgstr "" -#: ../../Zotlabs/Module/Admin/Channels.php:154 ../../include/nav.php:421 +#: ../../Zotlabs/Module/Admin/Channels.php:154 ../../include/nav.php:425 msgid "Channel" msgstr "" @@ -5446,7 +5446,7 @@ msgstr "" msgid "Install new repo" msgstr "" -#: ../../Zotlabs/Module/Admin/Addons.php:426 ../../Zotlabs/Lib/Apps.php:536 +#: ../../Zotlabs/Module/Admin/Addons.php:426 ../../Zotlabs/Lib/Apps.php:537 msgid "Install" msgstr "" @@ -5478,7 +5478,7 @@ msgstr "" msgid "Site settings updated." msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:251 ../../include/text.php:3356 +#: ../../Zotlabs/Module/Admin/Site.php:251 ../../include/text.php:3366 #: ../../extend/addon/hubzilla-addons/cart/submodules/orderoptions.php:335 #: ../../extend/addon/hubzilla-addons/cart/submodules/orderoptions.php:359 #: ../../extend/addon/hubzilla-addons/cart/submodules/orderoptions.php:435 @@ -6108,12 +6108,12 @@ msgstr "" msgid "Create Custom Field" msgstr "" -#: ../../Zotlabs/Module/Notify.php:61 +#: ../../Zotlabs/Module/Notify.php:69 #: ../../Zotlabs/Module/Notifications.php:106 msgid "No more system notifications." msgstr "" -#: ../../Zotlabs/Module/Notify.php:65 +#: ../../Zotlabs/Module/Notify.php:73 #: ../../Zotlabs/Module/Notifications.php:110 msgid "System Notifications" msgstr "" @@ -6330,8 +6330,8 @@ msgstr "" msgid "Add Article" msgstr "" -#: ../../Zotlabs/Module/Articles.php:225 ../../Zotlabs/Lib/Apps.php:325 -#: ../../include/nav.php:512 +#: ../../Zotlabs/Module/Articles.php:225 ../../Zotlabs/Lib/Apps.php:326 +#: ../../include/nav.php:516 msgid "Articles" msgstr "" @@ -7018,7 +7018,7 @@ msgstr "" msgid "Set your current mood and tell your friends" msgstr "" -#: ../../Zotlabs/Module/Mood.php:154 ../../Zotlabs/Lib/Apps.php:350 +#: ../../Zotlabs/Module/Mood.php:154 ../../Zotlabs/Lib/Apps.php:351 msgid "Mood" msgstr "" @@ -7044,7 +7044,7 @@ msgid "" "connections." msgstr "" -#: ../../Zotlabs/Module/Permcats.php:113 ../../Zotlabs/Lib/Apps.php:374 +#: ../../Zotlabs/Module/Permcats.php:113 ../../Zotlabs/Lib/Apps.php:375 msgid "Permission Categories" msgstr "" @@ -7186,7 +7186,7 @@ msgid "I have an invite code" msgstr "" #: ../../Zotlabs/Module/Register.php:542 ../../include/nav.php:168 -#: ../../boot.php:1697 +#: ../../boot.php:1698 msgid "Register" msgstr "" @@ -7766,40 +7766,50 @@ msgstr "" msgid "Show new wall posts, private messages and connections under Notices" msgstr "" +#: ../../Zotlabs/Module/Settings/Channel.php:584 +msgid "" +"Desktop notifications are unavailable because the required browser " +"permission has not been granted" +msgstr "" + #: ../../Zotlabs/Module/Settings/Channel.php:585 +msgid "Grant permission" +msgstr "" + +#: ../../Zotlabs/Module/Settings/Channel.php:586 msgid "Notify me of events this many days in advance" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:585 +#: ../../Zotlabs/Module/Settings/Channel.php:586 msgid "Must be greater than 0" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:590 +#: ../../Zotlabs/Module/Settings/Channel.php:591 msgid "Advanced Account/Page Type Settings" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:591 +#: ../../Zotlabs/Module/Settings/Channel.php:592 msgid "Change the behaviour of this account for special situations" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:593 +#: ../../Zotlabs/Module/Settings/Channel.php:594 msgid "Miscellaneous Settings" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:594 +#: ../../Zotlabs/Module/Settings/Channel.php:595 msgid "Default photo upload folder" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:594 #: ../../Zotlabs/Module/Settings/Channel.php:595 +#: ../../Zotlabs/Module/Settings/Channel.php:596 msgid "%Y - current year, %m - current month" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:595 +#: ../../Zotlabs/Module/Settings/Channel.php:596 msgid "Default file upload folder" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:597 +#: ../../Zotlabs/Module/Settings/Channel.php:598 msgid "Remove this channel." msgstr "" @@ -7964,7 +7974,6 @@ msgid "Enter email addresses, one per line:" msgstr "" #: ../../Zotlabs/Module/Invite.php:539 -#: ../../extend/addon/hubzilla-addons/mail/Mod_Mail.php:164 msgid "Your message:" msgstr "" @@ -7973,8 +7982,7 @@ msgid "Invite template" msgstr "" #: ../../Zotlabs/Module/Invite.php:542 -#: ../../extend/addon/hubzilla-addons/mail/Mod_Mail.php:161 -#: ../../extend/addon/hubzilla-addons/mail/Mod_Mail.php:303 +#: ../../extend/addon/hubzilla-addons/mail/Mod_Mail.php:198 msgid "Subject:" msgstr "" @@ -8052,14 +8060,6 @@ msgstr "" msgid "Change UI language" msgstr "" -#: ../../Zotlabs/Module/Hq.php:131 -msgid "Welcome to Hubzilla!" -msgstr "" - -#: ../../Zotlabs/Module/Hq.php:131 -msgid "You have got no unseen posts..." -msgstr "" - #: ../../Zotlabs/Module/Cover_photo.php:196 #: ../../Zotlabs/Module/Cover_photo.php:254 msgid "Cover Photos" @@ -8136,7 +8136,7 @@ msgstr "" msgid "Submit and proceed" msgstr "" -#: ../../Zotlabs/Module/Menu.php:171 ../../include/text.php:2674 +#: ../../Zotlabs/Module/Menu.php:171 ../../include/text.php:2689 msgid "Menus" msgstr "" @@ -8212,7 +8212,7 @@ msgstr "" msgid "*" msgstr "" -#: ../../Zotlabs/Module/Sources.php:107 ../../Zotlabs/Lib/Apps.php:368 +#: ../../Zotlabs/Module/Sources.php:107 ../../Zotlabs/Lib/Apps.php:369 msgid "Channel Sources" msgstr "" @@ -8284,8 +8284,8 @@ msgstr "" msgid "Poke somebody in your addressbook" msgstr "" -#: ../../Zotlabs/Module/Poke.php:199 ../../Zotlabs/Lib/Apps.php:351 -#: ../../include/conversation.php:1138 +#: ../../Zotlabs/Module/Poke.php:199 ../../Zotlabs/Lib/Apps.php:352 +#: ../../include/conversation.php:1146 msgid "Poke" msgstr "" @@ -8423,7 +8423,7 @@ msgstr "" msgid "Rename" msgstr "" -#: ../../Zotlabs/Storage/Browser.php:407 ../../Zotlabs/Lib/Apps.php:360 +#: ../../Zotlabs/Storage/Browser.php:407 ../../Zotlabs/Lib/Apps.php:361 msgid "Post" msgstr "" @@ -8532,181 +8532,181 @@ msgstr "" msgid "error saving data" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:323 +#: ../../Zotlabs/Lib/Apps.php:324 ../../include/nav.php:338 msgid "Apps" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:324 +#: ../../Zotlabs/Lib/Apps.php:325 msgid "Affinity Tool" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:327 +#: ../../Zotlabs/Lib/Apps.php:328 msgid "Site Admin" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:328 +#: ../../Zotlabs/Lib/Apps.php:329 #: ../../extend/addon/hubzilla-addons/buglink/buglink.php:16 msgid "Report Bug" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:329 ../../include/nav.php:490 +#: ../../Zotlabs/Lib/Apps.php:330 ../../include/nav.php:494 msgid "Bookmarks" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:330 ../../Zotlabs/Widget/Chatroom_list.php:16 -#: ../../include/nav.php:477 ../../include/nav.php:480 +#: ../../Zotlabs/Lib/Apps.php:331 ../../Zotlabs/Widget/Chatroom_list.php:16 +#: ../../include/nav.php:481 ../../include/nav.php:484 msgid "Chatrooms" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:331 +#: ../../Zotlabs/Lib/Apps.php:332 msgid "Content Filter" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:332 +#: ../../Zotlabs/Lib/Apps.php:333 #: ../../extend/addon/hubzilla-addons/content_import/Mod_content_import.php:135 msgid "Content Import" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:334 +#: ../../Zotlabs/Lib/Apps.php:335 msgid "Remote Diagnostics" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:335 +#: ../../Zotlabs/Lib/Apps.php:336 msgid "Suggest Channels" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:336 ../../include/nav.php:127 -#: ../../include/nav.php:131 ../../boot.php:1720 +#: ../../Zotlabs/Lib/Apps.php:337 ../../include/nav.php:127 +#: ../../include/nav.php:131 ../../boot.php:1721 msgid "Login" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:338 +#: ../../Zotlabs/Lib/Apps.php:339 msgid "Stream" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:342 ../../include/nav.php:539 +#: ../../Zotlabs/Lib/Apps.php:343 ../../include/nav.php:543 msgid "Wiki" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:343 ../../include/features.php:104 +#: ../../Zotlabs/Lib/Apps.php:344 ../../include/features.php:104 msgid "Channel Home" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:346 ../../include/features.php:82 -#: ../../include/nav.php:463 ../../include/nav.php:466 +#: ../../Zotlabs/Lib/Apps.php:347 ../../include/features.php:82 +#: ../../include/nav.php:467 ../../include/nav.php:470 msgid "Calendar" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:347 ../../include/features.php:192 +#: ../../Zotlabs/Lib/Apps.php:348 ../../include/features.php:192 msgid "Directory" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:349 +#: ../../Zotlabs/Lib/Apps.php:350 msgid "Mail" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:352 +#: ../../Zotlabs/Lib/Apps.php:353 msgid "Chat" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:354 +#: ../../Zotlabs/Lib/Apps.php:355 msgid "Probe" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:355 +#: ../../Zotlabs/Lib/Apps.php:356 msgid "Suggest" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:356 +#: ../../Zotlabs/Lib/Apps.php:357 msgid "Random Channel" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:357 +#: ../../Zotlabs/Lib/Apps.php:358 msgid "Invite" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:358 ../../Zotlabs/Widget/Admin.php:26 +#: ../../Zotlabs/Lib/Apps.php:359 ../../Zotlabs/Widget/Admin.php:26 msgid "Features" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:359 +#: ../../Zotlabs/Lib/Apps.php:360 #: ../../extend/addon/hubzilla-addons/openid/MysqlProvider.php:69 msgid "Language" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:361 +#: ../../Zotlabs/Lib/Apps.php:362 #: ../../extend/addon/hubzilla-addons/openid/MysqlProvider.php:58 #: ../../extend/addon/hubzilla-addons/openid/MysqlProvider.php:59 #: ../../extend/addon/hubzilla-addons/openid/MysqlProvider.php:60 msgid "Profile Photo" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:363 ../../include/features.php:382 +#: ../../Zotlabs/Lib/Apps.php:364 ../../include/features.php:382 msgid "Profiles" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:365 +#: ../../Zotlabs/Lib/Apps.php:366 msgid "Notifications" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:366 +#: ../../Zotlabs/Lib/Apps.php:367 msgid "Order Apps" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:367 +#: ../../Zotlabs/Lib/Apps.php:368 msgid "CardDAV" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:369 +#: ../../Zotlabs/Lib/Apps.php:370 msgid "Guest Access" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:370 ../../Zotlabs/Widget/Notes.php:21 +#: ../../Zotlabs/Lib/Apps.php:371 ../../Zotlabs/Widget/Notes.php:21 #: ../../extend/addon/hubzilla-addons/workflow/workflow.php:2625 msgid "Notes" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:371 +#: ../../Zotlabs/Lib/Apps.php:372 msgid "OAuth Apps Manager" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:372 +#: ../../Zotlabs/Lib/Apps.php:373 msgid "OAuth2 Apps Manager" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:373 +#: ../../Zotlabs/Lib/Apps.php:374 msgid "PDL Editor" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:376 +#: ../../Zotlabs/Lib/Apps.php:377 msgid "My Chatrooms" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:377 +#: ../../Zotlabs/Lib/Apps.php:378 msgid "Channel Export" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:554 +#: ../../Zotlabs/Lib/Apps.php:555 msgid "Purchase" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:559 +#: ../../Zotlabs/Lib/Apps.php:560 msgid "Undelete" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:569 +#: ../../Zotlabs/Lib/Apps.php:570 msgid "Add to app-tray" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:570 +#: ../../Zotlabs/Lib/Apps.php:571 msgid "Remove from app-tray" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:571 +#: ../../Zotlabs/Lib/Apps.php:572 msgid "Pin to navbar" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:572 +#: ../../Zotlabs/Lib/Apps.php:573 msgid "Unpin from navbar" msgstr "" @@ -8838,84 +8838,84 @@ msgstr "" msgid "%s <!item_type!>" msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:127 +#: ../../Zotlabs/Lib/Enotify.php:128 #, php-format -msgid "[$Projectname:Notify] New mail received at %s" +msgid "[$Projectname:Notify] New direct message received at %s" msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:129 +#: ../../Zotlabs/Lib/Enotify.php:130 #, php-format -msgid "%1$s sent you a new private message at %2$s." +msgid "%1$s sent you a new direct message at %2$s." msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:130 +#: ../../Zotlabs/Lib/Enotify.php:131 #, php-format msgid "%1$s sent you %2$s." msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:130 -msgid "a private message" +#: ../../Zotlabs/Lib/Enotify.php:131 +msgid "a direct message" msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:131 +#: ../../Zotlabs/Lib/Enotify.php:132 #, php-format -msgid "Please visit %s to view and/or reply to your private messages." +msgid "Please visit %s to view and/or reply to your direct messages." msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:144 +#: ../../Zotlabs/Lib/Enotify.php:145 msgid "commented on" msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:157 +#: ../../Zotlabs/Lib/Enotify.php:158 msgid "liked" msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:160 +#: ../../Zotlabs/Lib/Enotify.php:161 msgid "disliked" msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:165 +#: ../../Zotlabs/Lib/Enotify.php:166 msgid "voted on" msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:208 +#: ../../Zotlabs/Lib/Enotify.php:209 #, php-format msgid "%1$s %2$s [zrl=%3$s]a %4$s[/zrl]" msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:216 +#: ../../Zotlabs/Lib/Enotify.php:217 #, php-format msgid "%1$s %2$s [zrl=%3$s]%4$s's %5$s[/zrl]" msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:225 +#: ../../Zotlabs/Lib/Enotify.php:226 #, php-format msgid "%1$s %2$s [zrl=%3$s]your %4$s[/zrl]" msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:237 +#: ../../Zotlabs/Lib/Enotify.php:238 #, php-format msgid "[$Projectname:Notify] Moderated Comment to conversation #%1$d by %2$s" msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:239 +#: ../../Zotlabs/Lib/Enotify.php:240 #, php-format msgid "[$Projectname:Notify] Comment to conversation #%1$d by %2$s" msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:240 +#: ../../Zotlabs/Lib/Enotify.php:241 #, php-format msgid "%1$s commented on an item/conversation you have been following." msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:243 ../../Zotlabs/Lib/Enotify.php:324 -#: ../../Zotlabs/Lib/Enotify.php:340 ../../Zotlabs/Lib/Enotify.php:365 -#: ../../Zotlabs/Lib/Enotify.php:382 ../../Zotlabs/Lib/Enotify.php:395 +#: ../../Zotlabs/Lib/Enotify.php:244 ../../Zotlabs/Lib/Enotify.php:324 +#: ../../Zotlabs/Lib/Enotify.php:340 ../../Zotlabs/Lib/Enotify.php:364 +#: ../../Zotlabs/Lib/Enotify.php:381 ../../Zotlabs/Lib/Enotify.php:394 #, php-format msgid "Please visit %s to view and/or reply to the conversation." msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:247 ../../Zotlabs/Lib/Enotify.php:248 +#: ../../Zotlabs/Lib/Enotify.php:248 ../../Zotlabs/Lib/Enotify.php:249 #, php-format msgid "Please visit %s to approve or reject this comment." msgstr "" @@ -8950,130 +8950,130 @@ msgstr "" msgid "%1$s posted to [zrl=%2$s]your wall[/zrl]" msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:359 +#: ../../Zotlabs/Lib/Enotify.php:358 #, php-format msgid "[$Projectname:Notify] %s tagged you" msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:360 +#: ../../Zotlabs/Lib/Enotify.php:359 #, php-format msgid "%1$s tagged you at %2$s" msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:361 +#: ../../Zotlabs/Lib/Enotify.php:360 #, php-format msgid "%1$s [zrl=%2$s]tagged you[/zrl]." msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:372 +#: ../../Zotlabs/Lib/Enotify.php:371 #, php-format msgid "[$Projectname:Notify] %1$s poked you" msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:373 +#: ../../Zotlabs/Lib/Enotify.php:372 #, php-format msgid "%1$s poked you at %2$s" msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:374 +#: ../../Zotlabs/Lib/Enotify.php:373 #, php-format msgid "%1$s [zrl=%2$s]poked you[/zrl]." msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:389 +#: ../../Zotlabs/Lib/Enotify.php:388 #, php-format msgid "[$Projectname:Notify] %s tagged your post" msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:390 +#: ../../Zotlabs/Lib/Enotify.php:389 #, php-format msgid "%1$s tagged your post at %2$s" msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:391 +#: ../../Zotlabs/Lib/Enotify.php:390 #, php-format msgid "%1$s tagged [zrl=%2$s]your post[/zrl]" msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:402 +#: ../../Zotlabs/Lib/Enotify.php:401 msgid "[$Projectname:Notify] Introduction received" msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:403 +#: ../../Zotlabs/Lib/Enotify.php:402 #, php-format msgid "You've received an new connection request from '%1$s' at %2$s" msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:404 +#: ../../Zotlabs/Lib/Enotify.php:403 #, php-format msgid "You've received [zrl=%1$s]a new connection request[/zrl] from %2$s." msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:407 ../../Zotlabs/Lib/Enotify.php:425 +#: ../../Zotlabs/Lib/Enotify.php:406 ../../Zotlabs/Lib/Enotify.php:424 #, php-format msgid "You may visit their profile at %s" msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:409 +#: ../../Zotlabs/Lib/Enotify.php:408 #, php-format msgid "Please visit %s to approve or reject the connection request." msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:416 +#: ../../Zotlabs/Lib/Enotify.php:415 msgid "[$Projectname:Notify] Friend suggestion received" msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:417 +#: ../../Zotlabs/Lib/Enotify.php:416 #, php-format msgid "You've received a friend suggestion from '%1$s' at %2$s" msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:418 +#: ../../Zotlabs/Lib/Enotify.php:417 #, php-format msgid "You've received [zrl=%1$s]a friend suggestion[/zrl] for %2$s from %3$s." msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:423 +#: ../../Zotlabs/Lib/Enotify.php:422 msgid "Name:" msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:424 +#: ../../Zotlabs/Lib/Enotify.php:423 msgid "Photo:" msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:427 +#: ../../Zotlabs/Lib/Enotify.php:426 #, php-format msgid "Please visit %s to approve or reject the suggestion." msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:652 +#: ../../Zotlabs/Lib/Enotify.php:651 msgid "[$Projectname:Notify]" msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:820 +#: ../../Zotlabs/Lib/Enotify.php:819 msgid "created a new poll" msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:820 +#: ../../Zotlabs/Lib/Enotify.php:819 msgid "created a new post" msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:821 +#: ../../Zotlabs/Lib/Enotify.php:820 #, php-format msgid "voted on %s's poll" msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:821 +#: ../../Zotlabs/Lib/Enotify.php:820 #, php-format msgid "commented on %s's post" msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:825 +#: ../../Zotlabs/Lib/Enotify.php:824 #, php-format msgid "repeated %s's post" msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:829 ../../Zotlabs/Lib/Enotify.php:931 +#: ../../Zotlabs/Lib/Enotify.php:828 ../../Zotlabs/Lib/Enotify.php:927 msgid "shared a file with you" msgstr "" @@ -9082,32 +9082,32 @@ msgstr "" msgid "edited a post dated %s" msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:841 +#: ../../Zotlabs/Lib/Enotify.php:840 #, php-format msgid "edited a comment dated %s" msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:914 +#: ../../Zotlabs/Lib/Enotify.php:912 msgid "added your channel" msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:948 -msgid "sent you a private message" +#: ../../Zotlabs/Lib/Enotify.php:942 +msgid "sent you a direct message" msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:957 +#: ../../Zotlabs/Lib/Enotify.php:949 msgid "g A l F d" msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:960 +#: ../../Zotlabs/Lib/Enotify.php:952 msgid "[today]" msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:970 +#: ../../Zotlabs/Lib/Enotify.php:962 msgid "created an event" msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:986 +#: ../../Zotlabs/Lib/Enotify.php:977 msgid "status verified" msgstr "" @@ -9190,11 +9190,11 @@ msgid "Compare" msgstr "" #: ../../Zotlabs/Lib/NativeWikiPage.php:618 ../../include/bbcode.php:1050 -#: ../../include/bbcode.php:1217 +#: ../../include/bbcode.php:1238 msgid "Different viewers will see this text differently" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:103 ../../include/conversation.php:739 +#: ../../Zotlabs/Lib/ThreadItem.php:103 ../../include/conversation.php:742 msgid "Private Message" msgstr "" @@ -9230,22 +9230,22 @@ msgstr "" msgid "I abstain" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:274 ../../include/conversation.php:734 +#: ../../Zotlabs/Lib/ThreadItem.php:274 ../../include/conversation.php:736 msgid "Toggle Star Status" msgstr "" #: ../../Zotlabs/Lib/ThreadItem.php:285 ../../Zotlabs/Widget/Pinned.php:88 -#: ../../include/conversation.php:748 +#: ../../include/conversation.php:751 msgid "Message signature validated" msgstr "" #: ../../Zotlabs/Lib/ThreadItem.php:286 ../../Zotlabs/Widget/Pinned.php:89 -#: ../../include/conversation.php:749 +#: ../../include/conversation.php:752 msgid "Message signature incorrect" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:302 ../../include/conversation.php:935 -msgid "Conversation Tools" +#: ../../Zotlabs/Lib/ThreadItem.php:302 ../../include/conversation.php:943 +msgid "Conversation Features" msgstr "" #: ../../Zotlabs/Lib/ThreadItem.php:318 ../../include/taxonomy.php:584 @@ -9296,7 +9296,8 @@ msgstr "" msgid "to" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:414 ../../Zotlabs/Widget/Pinned.php:127 +#: ../../Zotlabs/Lib/ThreadItem.php:414 ../../Zotlabs/Widget/Messages.php:93 +#: ../../Zotlabs/Widget/Pinned.php:127 msgid "via" msgstr "" @@ -9309,19 +9310,19 @@ msgid "via Wall-To-Wall:" msgstr "" #: ../../Zotlabs/Lib/ThreadItem.php:430 ../../Zotlabs/Widget/Pinned.php:132 -#: ../../include/conversation.php:809 +#: ../../include/conversation.php:817 #, php-format msgid "from %s" msgstr "" #: ../../Zotlabs/Lib/ThreadItem.php:433 ../../Zotlabs/Widget/Pinned.php:135 -#: ../../include/conversation.php:812 +#: ../../include/conversation.php:820 #, php-format msgid "last edited: %s" msgstr "" #: ../../Zotlabs/Lib/ThreadItem.php:434 ../../Zotlabs/Widget/Pinned.php:136 -#: ../../include/conversation.php:813 +#: ../../include/conversation.php:821 #, php-format msgid "Expires: %s" msgstr "" @@ -9334,7 +9335,7 @@ msgstr "" msgid "Attendance Options" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:446 ../../include/text.php:1906 +#: ../../Zotlabs/Lib/ThreadItem.php:446 ../../include/text.php:1921 msgid "Vote" msgstr "" @@ -9377,27 +9378,27 @@ msgstr "" msgid "%s show all" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:828 ../../include/conversation.php:1446 +#: ../../Zotlabs/Lib/ThreadItem.php:828 ../../include/conversation.php:1455 #: ../../extend/addon/hubzilla-addons/hsse/hsse.php:200 msgid "Bold" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:829 ../../include/conversation.php:1447 +#: ../../Zotlabs/Lib/ThreadItem.php:829 ../../include/conversation.php:1456 #: ../../extend/addon/hubzilla-addons/hsse/hsse.php:201 msgid "Italic" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:830 ../../include/conversation.php:1448 +#: ../../Zotlabs/Lib/ThreadItem.php:830 ../../include/conversation.php:1457 #: ../../extend/addon/hubzilla-addons/hsse/hsse.php:202 msgid "Underline" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:831 ../../include/conversation.php:1449 +#: ../../Zotlabs/Lib/ThreadItem.php:831 ../../include/conversation.php:1458 #: ../../extend/addon/hubzilla-addons/hsse/hsse.php:203 msgid "Quote" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:832 ../../include/conversation.php:1450 +#: ../../Zotlabs/Lib/ThreadItem.php:832 ../../include/conversation.php:1459 #: ../../extend/addon/hubzilla-addons/hsse/hsse.php:204 msgid "Code" msgstr "" @@ -9406,7 +9407,7 @@ msgstr "" msgid "Image" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:834 ../../include/conversation.php:1451 +#: ../../Zotlabs/Lib/ThreadItem.php:834 ../../include/conversation.php:1460 #: ../../extend/addon/hubzilla-addons/hsse/hsse.php:205 msgid "Attach/Upload file" msgstr "" @@ -9431,41 +9432,41 @@ msgstr "" msgid "Your website URL (optional)" msgstr "" -#: ../../Zotlabs/Lib/Activity.php:2159 +#: ../../Zotlabs/Lib/Activity.php:2164 #, php-format msgid "Likes %1$s's %2$s" msgstr "" -#: ../../Zotlabs/Lib/Activity.php:2162 +#: ../../Zotlabs/Lib/Activity.php:2167 #, php-format msgid "Doesn't like %1$s's %2$s" msgstr "" -#: ../../Zotlabs/Lib/Activity.php:2168 +#: ../../Zotlabs/Lib/Activity.php:2173 #, php-format msgid "Will attend %s's event" msgstr "" -#: ../../Zotlabs/Lib/Activity.php:2171 +#: ../../Zotlabs/Lib/Activity.php:2176 #, php-format msgid "Will not attend %s's event" msgstr "" -#: ../../Zotlabs/Lib/Activity.php:2174 +#: ../../Zotlabs/Lib/Activity.php:2179 #, php-format msgid "May attend %s's event" msgstr "" -#: ../../Zotlabs/Lib/Activity.php:2177 +#: ../../Zotlabs/Lib/Activity.php:2182 #, php-format msgid "May not attend %s's event" msgstr "" -#: ../../Zotlabs/Lib/Activity.php:3098 ../../Zotlabs/Lib/Activity.php:3290 +#: ../../Zotlabs/Lib/Activity.php:3102 ../../Zotlabs/Lib/Activity.php:3294 #: ../../include/network.php:1742 -#: ../../extend/addon/hubzilla-addons/pubcrawl/as.php:1500 -#: ../../extend/addon/hubzilla-addons/pubcrawl/as.php:1949 -#: ../../extend/addon/hubzilla-addons/pubcrawl/as.php:2157 +#: ../../extend/addon/hubzilla-addons/pubcrawl/as.php:1292 +#: ../../extend/addon/hubzilla-addons/pubcrawl/as.php:1764 +#: ../../extend/addon/hubzilla-addons/pubcrawl/as.php:1972 msgid "ActivityPub" msgstr "" @@ -9477,19 +9478,19 @@ msgstr "" msgid "Wiki files deleted successfully" msgstr "" -#: ../../Zotlabs/Lib/Libzotdir.php:163 ../../include/dir_fns.php:142 +#: ../../Zotlabs/Lib/Libzotdir.php:163 msgid "Directory Options" msgstr "" -#: ../../Zotlabs/Lib/Libzotdir.php:165 ../../include/dir_fns.php:144 +#: ../../Zotlabs/Lib/Libzotdir.php:165 msgid "Safe Mode" msgstr "" -#: ../../Zotlabs/Lib/Libzotdir.php:166 ../../include/dir_fns.php:145 +#: ../../Zotlabs/Lib/Libzotdir.php:166 msgid "Public Forums Only" msgstr "" -#: ../../Zotlabs/Lib/Libzotdir.php:168 ../../include/dir_fns.php:146 +#: ../../Zotlabs/Lib/Libzotdir.php:168 msgid "This Website Only" msgstr "" @@ -9669,6 +9670,22 @@ msgstr "" msgid "Saved Folders" msgstr "" +#: ../../Zotlabs/Widget/Messages.php:24 +msgid "Public and restricted messages" +msgstr "" + +#: ../../Zotlabs/Widget/Messages.php:25 +msgid "Direct messages" +msgstr "" + +#: ../../Zotlabs/Widget/Messages.php:26 +msgid "Starred messages" +msgstr "" + +#: ../../Zotlabs/Widget/Messages.php:28 +msgid "No messages" +msgstr "" + #: ../../Zotlabs/Widget/Tagcloud.php:22 ../../include/taxonomy.php:323 #: ../../include/taxonomy.php:460 ../../include/taxonomy.php:481 msgid "Tags" @@ -9840,12 +9857,12 @@ msgstr "" msgid "Refresh" msgstr "" -#: ../../Zotlabs/Widget/Hq_controls.php:14 -msgid "HQ Control Panel" +#: ../../Zotlabs/Widget/Hq_controls.php:17 +msgid "Toggle post editor" msgstr "" -#: ../../Zotlabs/Widget/Hq_controls.php:17 -msgid "Create a new post" +#: ../../Zotlabs/Widget/Hq_controls.php:28 +msgid "Toggle personal notes" msgstr "" #: ../../Zotlabs/Widget/Eventstools.php:13 @@ -9861,6 +9878,7 @@ msgid "Import Calendar" msgstr "" #: ../../Zotlabs/Widget/Activity_filter.php:37 +#: ../../Zotlabs/Widget/Notifications.php:55 msgid "Direct Messages" msgstr "" @@ -9869,6 +9887,7 @@ msgid "Show direct (private) messages" msgstr "" #: ../../Zotlabs/Widget/Activity_filter.php:46 +#: ../../Zotlabs/Widget/Notifications.php:74 msgid "Events" msgstr "" @@ -9947,16 +9966,12 @@ msgctxt "widget" msgid "Activity" msgstr "" -#: ../../Zotlabs/Widget/Notifications.php:16 -msgid "New Network Activity" -msgstr "" - #: ../../Zotlabs/Widget/Notifications.php:17 -msgid "New Network Activity Notifications" +msgid "New network activity notifications" msgstr "" #: ../../Zotlabs/Widget/Notifications.php:20 -msgid "View your network activity" +msgid "Network stream" msgstr "" #: ../../Zotlabs/Widget/Notifications.php:23 @@ -9979,16 +9994,12 @@ msgstr "" msgid "Filter by name or address" msgstr "" -#: ../../Zotlabs/Widget/Notifications.php:36 -msgid "New Home Activity" -msgstr "" - #: ../../Zotlabs/Widget/Notifications.php:37 -msgid "New Home Activity Notifications" +msgid "New home activity notifications" msgstr "" #: ../../Zotlabs/Widget/Notifications.php:40 -msgid "View your home activity" +msgid "Home stream" msgstr "" #: ../../Zotlabs/Widget/Notifications.php:43 @@ -9996,24 +10007,16 @@ msgstr "" msgid "Mark all notifications seen" msgstr "" -#: ../../Zotlabs/Widget/Notifications.php:55 -msgid "New Direct Messages" -msgstr "" - #: ../../Zotlabs/Widget/Notifications.php:56 -msgid "New Direct Messages Notifications" +msgid "New direct messages notifications" msgstr "" #: ../../Zotlabs/Widget/Notifications.php:59 -msgid "View your direct messages" -msgstr "" - -#: ../../Zotlabs/Widget/Notifications.php:74 -msgid "New Events" +msgid "Direct messages stream" msgstr "" #: ../../Zotlabs/Widget/Notifications.php:75 -msgid "New Events Notifications" +msgid "New events notifications" msgstr "" #: ../../Zotlabs/Widget/Notifications.php:78 @@ -10025,19 +10028,15 @@ msgid "Mark all events seen" msgstr "" #: ../../Zotlabs/Widget/Notifications.php:90 -msgid "New Connections Notifications" +msgid "New connections notifications" msgstr "" #: ../../Zotlabs/Widget/Notifications.php:93 msgid "View all connections" msgstr "" -#: ../../Zotlabs/Widget/Notifications.php:101 -msgid "New Files" -msgstr "" - #: ../../Zotlabs/Widget/Notifications.php:102 -msgid "New Files Notifications" +msgid "New files notifications" msgstr "" #: ../../Zotlabs/Widget/Notifications.php:109 @@ -10054,22 +10053,22 @@ msgid "Mark all notices seen" msgstr "" #: ../../Zotlabs/Widget/Notifications.php:137 -msgid "New Registrations" +msgid "Registrations" msgstr "" #: ../../Zotlabs/Widget/Notifications.php:138 -msgid "New Registrations Notifications" +msgid "New registrations notifications" msgstr "" #: ../../Zotlabs/Widget/Notifications.php:148 -msgid "Public Stream Notifications" +msgid "New public stream notifications" msgstr "" #: ../../Zotlabs/Widget/Notifications.php:151 -msgid "View the public stream" +msgid "Public stream" msgstr "" -#: ../../Zotlabs/Widget/Notifications.php:166 +#: ../../Zotlabs/Widget/Notifications.php:165 msgid "Sorry, you have got no notifications at the moment" msgstr "" @@ -10254,261 +10253,260 @@ msgstr "" msgid "%1$s poked %2$s" msgstr "" -#: ../../include/conversation.php:267 ../../include/text.php:1236 -#: ../../include/text.php:1240 +#: ../../include/conversation.php:267 ../../include/text.php:1237 +#: ../../include/text.php:1241 msgid "poked" msgstr "" -#: ../../include/conversation.php:781 +#: ../../include/conversation.php:789 #, php-format msgid "View %s's profile @ %s" msgstr "" -#: ../../include/conversation.php:802 +#: ../../include/conversation.php:810 msgid "Categories:" msgstr "" -#: ../../include/conversation.php:803 +#: ../../include/conversation.php:811 msgid "Filed under:" msgstr "" -#: ../../include/conversation.php:828 +#: ../../include/conversation.php:836 msgid "View in context" msgstr "" -#: ../../include/conversation.php:930 +#: ../../include/conversation.php:938 msgid "remove" msgstr "" -#: ../../include/conversation.php:934 +#: ../../include/conversation.php:942 msgid "Loading..." msgstr "" -#: ../../include/conversation.php:936 +#: ../../include/conversation.php:944 msgid "Delete Selected Items" msgstr "" -#: ../../include/conversation.php:980 +#: ../../include/conversation.php:988 msgid "View Source" msgstr "" -#: ../../include/conversation.php:990 +#: ../../include/conversation.php:998 msgid "Follow Thread" msgstr "" -#: ../../include/conversation.php:999 +#: ../../include/conversation.php:1007 msgid "Unfollow Thread" msgstr "" -#: ../../include/conversation.php:1108 +#: ../../include/conversation.php:1116 msgid "Edit Connection" msgstr "" -#: ../../include/conversation.php:1260 +#: ../../include/conversation.php:1268 #, php-format msgid "%s likes this." msgstr "" -#: ../../include/conversation.php:1260 +#: ../../include/conversation.php:1268 #, php-format msgid "%s doesn't like this." msgstr "" -#: ../../include/conversation.php:1264 +#: ../../include/conversation.php:1272 #, php-format msgid "<span %1$s>%2$d people</span> like this." msgid_plural "<span %1$s>%2$d people</span> like this." msgstr[0] "" msgstr[1] "" -#: ../../include/conversation.php:1266 +#: ../../include/conversation.php:1274 #, php-format msgid "<span %1$s>%2$d people</span> don't like this." msgid_plural "<span %1$s>%2$d people</span> don't like this." msgstr[0] "" msgstr[1] "" -#: ../../include/conversation.php:1272 +#: ../../include/conversation.php:1280 msgid "and" msgstr "" -#: ../../include/conversation.php:1275 +#: ../../include/conversation.php:1283 #, php-format msgid ", and %d other people" msgid_plural ", and %d other people" msgstr[0] "" msgstr[1] "" -#: ../../include/conversation.php:1276 +#: ../../include/conversation.php:1284 #, php-format msgid "%s like this." msgstr "" -#: ../../include/conversation.php:1276 +#: ../../include/conversation.php:1284 #, php-format msgid "%s don't like this." msgstr "" -#: ../../include/conversation.php:1327 +#: ../../include/conversation.php:1335 #: ../../extend/addon/hubzilla-addons/hsse/hsse.php:82 msgid "Set your location" msgstr "" -#: ../../include/conversation.php:1328 +#: ../../include/conversation.php:1336 #: ../../extend/addon/hubzilla-addons/hsse/hsse.php:83 msgid "Clear browser location" msgstr "" -#: ../../include/conversation.php:1344 +#: ../../include/conversation.php:1352 #: ../../extend/addon/hubzilla-addons/hsse/hsse.php:99 msgid "Embed (existing) photo from your photo albums" msgstr "" -#: ../../include/conversation.php:1378 +#: ../../include/conversation.php:1386 #: ../../extend/addon/hubzilla-addons/hsse/hsse.php:135 msgid "Tag term:" msgstr "" -#: ../../include/conversation.php:1379 +#: ../../include/conversation.php:1387 #: ../../extend/addon/hubzilla-addons/hsse/hsse.php:136 msgid "Where are you right now?" msgstr "" -#: ../../include/conversation.php:1384 +#: ../../include/conversation.php:1392 #: ../../extend/addon/hubzilla-addons/hsse/hsse.php:141 msgid "Choose a different album..." msgstr "" -#: ../../include/conversation.php:1388 +#: ../../include/conversation.php:1396 #: ../../extend/addon/hubzilla-addons/hsse/hsse.php:145 msgid "Comments enabled" msgstr "" -#: ../../include/conversation.php:1389 +#: ../../include/conversation.php:1397 #: ../../extend/addon/hubzilla-addons/hsse/hsse.php:146 msgid "Comments disabled" msgstr "" -#: ../../include/conversation.php:1441 +#: ../../include/conversation.php:1450 #: ../../extend/addon/hubzilla-addons/hsse/hsse.php:195 msgid "Page link name" msgstr "" -#: ../../include/conversation.php:1444 +#: ../../include/conversation.php:1453 #: ../../extend/addon/hubzilla-addons/hsse/hsse.php:198 msgid "Post as" msgstr "" -#: ../../include/conversation.php:1458 +#: ../../include/conversation.php:1467 #: ../../extend/addon/hubzilla-addons/hsse/hsse.php:212 msgid "Toggle voting" msgstr "" -#: ../../include/conversation.php:1459 +#: ../../include/conversation.php:1468 msgid "Toggle poll" msgstr "" -#: ../../include/conversation.php:1460 +#: ../../include/conversation.php:1469 msgid "Option" msgstr "" -#: ../../include/conversation.php:1461 +#: ../../include/conversation.php:1470 msgid "Add option" msgstr "" -#: ../../include/conversation.php:1462 +#: ../../include/conversation.php:1471 msgid "Minutes" msgstr "" -#: ../../include/conversation.php:1462 +#: ../../include/conversation.php:1471 msgid "Hours" msgstr "" -#: ../../include/conversation.php:1462 +#: ../../include/conversation.php:1471 msgid "Days" msgstr "" -#: ../../include/conversation.php:1463 +#: ../../include/conversation.php:1472 msgid "Allow multiple answers" msgstr "" -#: ../../include/conversation.php:1465 +#: ../../include/conversation.php:1474 #: ../../extend/addon/hubzilla-addons/hsse/hsse.php:215 msgid "Disable comments" msgstr "" -#: ../../include/conversation.php:1466 +#: ../../include/conversation.php:1475 #: ../../extend/addon/hubzilla-addons/hsse/hsse.php:216 msgid "Toggle comments" msgstr "" -#: ../../include/conversation.php:1473 +#: ../../include/conversation.php:1482 msgid "Summary (optional)" msgstr "" -#: ../../include/conversation.php:1476 +#: ../../include/conversation.php:1485 #: ../../extend/addon/hubzilla-addons/hsse/hsse.php:224 msgid "Categories (optional, comma-separated list)" msgstr "" -#: ../../include/conversation.php:1477 +#: ../../include/conversation.php:1486 #: ../../extend/addon/hubzilla-addons/hsse/hsse.php:225 msgid "Permission settings" msgstr "" -#: ../../include/conversation.php:1499 +#: ../../include/conversation.php:1508 #: ../../extend/addon/hubzilla-addons/hsse/hsse.php:247 msgid "Other networks and post services" msgstr "" -#: ../../include/conversation.php:1502 +#: ../../include/conversation.php:1511 #: ../../extend/addon/hubzilla-addons/hsse/hsse.php:250 -#: ../../extend/addon/hubzilla-addons/mail/Mod_Mail.php:171 -#: ../../extend/addon/hubzilla-addons/mail/Mod_Mail.php:314 +#: ../../extend/addon/hubzilla-addons/mail/Mod_Mail.php:209 msgid "Set expiration date" msgstr "" -#: ../../include/conversation.php:1505 +#: ../../include/conversation.php:1514 #: ../../extend/addon/hubzilla-addons/hsse/hsse.php:253 msgid "Set publish date" msgstr "" -#: ../../include/conversation.php:1750 +#: ../../include/conversation.php:1760 msgctxt "noun" msgid "Attending" msgid_plural "Attending" msgstr[0] "" msgstr[1] "" -#: ../../include/conversation.php:1753 +#: ../../include/conversation.php:1763 msgctxt "noun" msgid "Not Attending" msgid_plural "Not Attending" msgstr[0] "" msgstr[1] "" -#: ../../include/conversation.php:1756 +#: ../../include/conversation.php:1766 msgctxt "noun" msgid "Undecided" msgid_plural "Undecided" msgstr[0] "" msgstr[1] "" -#: ../../include/conversation.php:1759 +#: ../../include/conversation.php:1769 msgctxt "noun" msgid "Agree" msgid_plural "Agrees" msgstr[0] "" msgstr[1] "" -#: ../../include/conversation.php:1762 +#: ../../include/conversation.php:1772 msgctxt "noun" msgid "Disagree" msgid_plural "Disagrees" msgstr[0] "" msgstr[1] "" -#: ../../include/conversation.php:1765 +#: ../../include/conversation.php:1775 msgctxt "noun" msgid "Abstain" msgid_plural "Abstains" @@ -10552,7 +10550,7 @@ msgid "Create New Profile" msgstr "" #: ../../include/channel.php:1490 ../../include/nav.php:120 -#: ../../extend/addon/hubzilla-addons/openclipatar/openclipatar.php:58 +#: ../../extend/addon/hubzilla-addons/openclipatar/openclipatar.php:59 msgid "Edit Profile" msgstr "" @@ -10987,390 +10985,391 @@ msgstr "" msgid "Login failed." msgstr "" -#: ../../include/text.php:523 +#: ../../include/text.php:524 msgid "prev" msgstr "" -#: ../../include/text.php:525 +#: ../../include/text.php:526 msgid "first" msgstr "" -#: ../../include/text.php:554 +#: ../../include/text.php:555 msgid "last" msgstr "" -#: ../../include/text.php:557 +#: ../../include/text.php:558 msgid "next" msgstr "" -#: ../../include/text.php:575 +#: ../../include/text.php:576 msgid "older" msgstr "" -#: ../../include/text.php:577 +#: ../../include/text.php:578 msgid "newer" msgstr "" -#: ../../include/text.php:1018 +#: ../../include/text.php:1019 msgid "No connections" msgstr "" -#: ../../include/text.php:1070 +#: ../../include/text.php:1071 #, php-format msgid "View all %s connections" msgstr "" -#: ../../include/text.php:1133 +#: ../../include/text.php:1134 #, php-format msgid "Network: %s" msgstr "" -#: ../../include/text.php:1236 ../../include/text.php:1240 +#: ../../include/text.php:1237 ../../include/text.php:1241 msgid "poke" msgstr "" -#: ../../include/text.php:1241 +#: ../../include/text.php:1242 msgid "ping" msgstr "" -#: ../../include/text.php:1241 +#: ../../include/text.php:1242 msgid "pinged" msgstr "" -#: ../../include/text.php:1242 +#: ../../include/text.php:1243 msgid "prod" msgstr "" -#: ../../include/text.php:1242 +#: ../../include/text.php:1243 msgid "prodded" msgstr "" -#: ../../include/text.php:1243 +#: ../../include/text.php:1244 msgid "slap" msgstr "" -#: ../../include/text.php:1243 +#: ../../include/text.php:1244 msgid "slapped" msgstr "" -#: ../../include/text.php:1244 +#: ../../include/text.php:1245 msgid "finger" msgstr "" -#: ../../include/text.php:1244 +#: ../../include/text.php:1245 msgid "fingered" msgstr "" -#: ../../include/text.php:1245 +#: ../../include/text.php:1246 msgid "rebuff" msgstr "" -#: ../../include/text.php:1245 +#: ../../include/text.php:1246 msgid "rebuffed" msgstr "" -#: ../../include/text.php:1268 +#: ../../include/text.php:1269 msgid "happy" msgstr "" -#: ../../include/text.php:1269 +#: ../../include/text.php:1270 msgid "sad" msgstr "" -#: ../../include/text.php:1270 +#: ../../include/text.php:1271 msgid "mellow" msgstr "" -#: ../../include/text.php:1271 +#: ../../include/text.php:1272 msgid "tired" msgstr "" -#: ../../include/text.php:1272 +#: ../../include/text.php:1273 msgid "perky" msgstr "" -#: ../../include/text.php:1273 +#: ../../include/text.php:1274 msgid "angry" msgstr "" -#: ../../include/text.php:1274 +#: ../../include/text.php:1275 msgid "stupefied" msgstr "" -#: ../../include/text.php:1275 +#: ../../include/text.php:1276 msgid "puzzled" msgstr "" -#: ../../include/text.php:1276 +#: ../../include/text.php:1277 msgid "interested" msgstr "" -#: ../../include/text.php:1277 +#: ../../include/text.php:1278 msgid "bitter" msgstr "" -#: ../../include/text.php:1278 +#: ../../include/text.php:1279 msgid "cheerful" msgstr "" -#: ../../include/text.php:1279 +#: ../../include/text.php:1280 msgid "alive" msgstr "" -#: ../../include/text.php:1280 +#: ../../include/text.php:1281 msgid "annoyed" msgstr "" -#: ../../include/text.php:1281 +#: ../../include/text.php:1282 msgid "anxious" msgstr "" -#: ../../include/text.php:1282 +#: ../../include/text.php:1283 msgid "cranky" msgstr "" -#: ../../include/text.php:1283 +#: ../../include/text.php:1284 msgid "disturbed" msgstr "" -#: ../../include/text.php:1284 +#: ../../include/text.php:1285 msgid "frustrated" msgstr "" -#: ../../include/text.php:1285 +#: ../../include/text.php:1286 msgid "depressed" msgstr "" -#: ../../include/text.php:1286 +#: ../../include/text.php:1287 msgid "motivated" msgstr "" -#: ../../include/text.php:1287 +#: ../../include/text.php:1288 msgid "relaxed" msgstr "" -#: ../../include/text.php:1288 +#: ../../include/text.php:1289 msgid "surprised" msgstr "" -#: ../../include/text.php:1476 ../../include/js_strings.php:99 +#: ../../include/text.php:1477 ../../include/js_strings.php:99 msgid "Monday" msgstr "" -#: ../../include/text.php:1476 ../../include/js_strings.php:100 +#: ../../include/text.php:1477 ../../include/js_strings.php:100 msgid "Tuesday" msgstr "" -#: ../../include/text.php:1476 ../../include/js_strings.php:101 +#: ../../include/text.php:1477 ../../include/js_strings.php:101 msgid "Wednesday" msgstr "" -#: ../../include/text.php:1476 ../../include/js_strings.php:102 +#: ../../include/text.php:1477 ../../include/js_strings.php:102 msgid "Thursday" msgstr "" -#: ../../include/text.php:1476 ../../include/js_strings.php:103 +#: ../../include/text.php:1477 ../../include/js_strings.php:103 msgid "Friday" msgstr "" -#: ../../include/text.php:1476 ../../include/js_strings.php:104 +#: ../../include/text.php:1477 ../../include/js_strings.php:104 msgid "Saturday" msgstr "" -#: ../../include/text.php:1476 ../../include/js_strings.php:98 +#: ../../include/text.php:1477 ../../include/js_strings.php:98 msgid "Sunday" msgstr "" -#: ../../include/text.php:1480 ../../include/js_strings.php:74 +#: ../../include/text.php:1481 ../../include/js_strings.php:74 msgid "January" msgstr "" -#: ../../include/text.php:1480 ../../include/js_strings.php:75 +#: ../../include/text.php:1481 ../../include/js_strings.php:75 msgid "February" msgstr "" -#: ../../include/text.php:1480 ../../include/js_strings.php:76 +#: ../../include/text.php:1481 ../../include/js_strings.php:76 msgid "March" msgstr "" -#: ../../include/text.php:1480 ../../include/js_strings.php:77 +#: ../../include/text.php:1481 ../../include/js_strings.php:77 msgid "April" msgstr "" -#: ../../include/text.php:1480 +#: ../../include/text.php:1481 msgid "May" msgstr "" -#: ../../include/text.php:1480 ../../include/js_strings.php:79 +#: ../../include/text.php:1481 ../../include/js_strings.php:79 msgid "June" msgstr "" -#: ../../include/text.php:1480 ../../include/js_strings.php:80 +#: ../../include/text.php:1481 ../../include/js_strings.php:80 msgid "July" msgstr "" -#: ../../include/text.php:1480 ../../include/js_strings.php:81 +#: ../../include/text.php:1481 ../../include/js_strings.php:81 msgid "August" msgstr "" -#: ../../include/text.php:1480 ../../include/js_strings.php:82 +#: ../../include/text.php:1481 ../../include/js_strings.php:82 msgid "September" msgstr "" -#: ../../include/text.php:1480 ../../include/js_strings.php:83 +#: ../../include/text.php:1481 ../../include/js_strings.php:83 msgid "October" msgstr "" -#: ../../include/text.php:1480 ../../include/js_strings.php:84 +#: ../../include/text.php:1481 ../../include/js_strings.php:84 msgid "November" msgstr "" -#: ../../include/text.php:1480 ../../include/js_strings.php:85 +#: ../../include/text.php:1481 ../../include/js_strings.php:85 msgid "December" msgstr "" -#: ../../include/text.php:1538 +#: ../../include/text.php:1539 msgid "Unknown Attachment" msgstr "" -#: ../../include/text.php:1540 ../../include/feedutils.php:874 +#: ../../include/text.php:1541 ../../include/feedutils.php:874 msgid "unknown" msgstr "" -#: ../../include/text.php:1581 +#: ../../include/text.php:1582 msgid "remove category" msgstr "" -#: ../../include/text.php:1658 +#: ../../include/text.php:1659 msgid "remove from file" msgstr "" -#: ../../include/text.php:1827 +#: ../../include/text.php:1842 +#: ../../extend/addon/hubzilla-addons/mail/Mod_Mail.php:401 msgid "Download binary/encrypted content" msgstr "" -#: ../../include/text.php:1898 +#: ../../include/text.php:1913 msgid "Poll has ended." msgstr "" -#: ../../include/text.php:1901 +#: ../../include/text.php:1916 #, php-format msgid "Poll ends: %s" msgstr "" -#: ../../include/text.php:2058 +#: ../../include/text.php:2073 msgid "Link to Source" msgstr "" -#: ../../include/text.php:2080 ../../include/language.php:428 +#: ../../include/text.php:2095 ../../include/language.php:428 msgid "default" msgstr "" -#: ../../include/text.php:2088 +#: ../../include/text.php:2103 msgid "Page layout" msgstr "" -#: ../../include/text.php:2088 +#: ../../include/text.php:2103 msgid "You can create your own with the layouts tool" msgstr "" -#: ../../include/text.php:2099 +#: ../../include/text.php:2114 msgid "HTML" msgstr "" -#: ../../include/text.php:2102 +#: ../../include/text.php:2117 msgid "Comanche Layout" msgstr "" -#: ../../include/text.php:2107 +#: ../../include/text.php:2122 msgid "PHP" msgstr "" -#: ../../include/text.php:2116 +#: ../../include/text.php:2131 msgid "Page content type" msgstr "" -#: ../../include/text.php:2249 +#: ../../include/text.php:2264 msgid "activity" msgstr "" -#: ../../include/text.php:2252 +#: ../../include/text.php:2267 msgid "poll" msgstr "" -#: ../../include/text.php:2365 +#: ../../include/text.php:2380 msgid "a-z, 0-9, -, and _ only" msgstr "" -#: ../../include/text.php:2670 +#: ../../include/text.php:2685 msgid "Design Tools" msgstr "" -#: ../../include/text.php:2676 +#: ../../include/text.php:2691 msgid "Pages" msgstr "" -#: ../../include/text.php:2688 +#: ../../include/text.php:2703 msgid "Import" msgstr "" -#: ../../include/text.php:2689 +#: ../../include/text.php:2704 msgid "Import website..." msgstr "" -#: ../../include/text.php:2690 +#: ../../include/text.php:2705 msgid "Select folder to import" msgstr "" -#: ../../include/text.php:2691 +#: ../../include/text.php:2706 msgid "Import from a zipped folder:" msgstr "" -#: ../../include/text.php:2692 +#: ../../include/text.php:2707 msgid "Import from cloud files:" msgstr "" -#: ../../include/text.php:2693 +#: ../../include/text.php:2708 msgid "/cloud/channel/path/to/folder" msgstr "" -#: ../../include/text.php:2694 +#: ../../include/text.php:2709 msgid "Enter path to website files" msgstr "" -#: ../../include/text.php:2695 +#: ../../include/text.php:2710 msgid "Select folder" msgstr "" -#: ../../include/text.php:2696 +#: ../../include/text.php:2711 msgid "Export website..." msgstr "" -#: ../../include/text.php:2697 +#: ../../include/text.php:2712 msgid "Export to a zip file" msgstr "" -#: ../../include/text.php:2698 +#: ../../include/text.php:2713 msgid "website.zip" msgstr "" -#: ../../include/text.php:2699 +#: ../../include/text.php:2714 msgid "Enter a name for the zip file." msgstr "" -#: ../../include/text.php:2700 +#: ../../include/text.php:2715 msgid "Export to cloud files" msgstr "" -#: ../../include/text.php:2701 +#: ../../include/text.php:2716 msgid "/path/to/export/folder" msgstr "" -#: ../../include/text.php:2702 +#: ../../include/text.php:2717 msgid "Enter a path to a cloud files destination." msgstr "" -#: ../../include/text.php:2703 +#: ../../include/text.php:2718 msgid "Specify folder" msgstr "" @@ -11492,7 +11491,7 @@ msgid "Account/Channel Settings" msgstr "" #: ../../include/nav.php:112 ../../include/nav.php:142 -#: ../../include/nav.php:163 ../../boot.php:1719 +#: ../../include/nav.php:163 ../../boot.php:1720 msgid "Logout" msgstr "" @@ -11548,43 +11547,47 @@ msgstr "" msgid "Add Apps" msgstr "" -#: ../../include/nav.php:338 -msgid "Arrange Apps" +#: ../../include/nav.php:339 +msgid "Channel Apps" msgstr "" -#: ../../include/nav.php:339 -msgid "Toggle System Apps" +#: ../../include/nav.php:340 +msgid "System Apps" +msgstr "" + +#: ../../include/nav.php:341 +msgid "Arrange Apps" msgstr "" -#: ../../include/nav.php:424 +#: ../../include/nav.php:428 msgid "Status Messages and Posts" msgstr "" -#: ../../include/nav.php:437 +#: ../../include/nav.php:441 msgid "Profile Details" msgstr "" -#: ../../include/nav.php:447 ../../include/photos.php:666 +#: ../../include/nav.php:451 ../../include/photos.php:714 msgid "Photo Albums" msgstr "" -#: ../../include/nav.php:455 +#: ../../include/nav.php:459 msgid "Files and Storage" msgstr "" -#: ../../include/nav.php:493 +#: ../../include/nav.php:497 msgid "Saved Bookmarks" msgstr "" -#: ../../include/nav.php:504 +#: ../../include/nav.php:508 msgid "View Cards" msgstr "" -#: ../../include/nav.php:515 +#: ../../include/nav.php:519 msgid "View Articles" msgstr "" -#: ../../include/nav.php:527 +#: ../../include/nav.php:531 msgid "View Webpages" msgstr "" @@ -11649,30 +11652,30 @@ msgstr "" msgid "Name: " msgstr "" -#: ../../include/photos.php:151 +#: ../../include/photos.php:154 #, php-format msgid "Image exceeds website size limit of %lu bytes" msgstr "" -#: ../../include/photos.php:162 +#: ../../include/photos.php:165 msgid "Image file is empty." msgstr "" -#: ../../include/photos.php:324 +#: ../../include/photos.php:327 msgid "Photo storage failed." msgstr "" -#: ../../include/photos.php:373 +#: ../../include/photos.php:376 msgid "a new photo" msgstr "" -#: ../../include/photos.php:377 +#: ../../include/photos.php:380 #, php-format msgctxt "photo_upload" msgid "%1$s posted %2$s to %3$s" msgstr "" -#: ../../include/photos.php:671 +#: ../../include/photos.php:719 msgid "Upload New Photos" msgstr "" @@ -12553,7 +12556,7 @@ msgstr "" msgid "YYYY-MM-DD or MM-DD" msgstr "" -#: ../../include/datetime.php:238 ../../boot.php:2734 +#: ../../include/datetime.php:238 ../../boot.php:2735 msgid "never" msgstr "" @@ -12696,11 +12699,11 @@ msgid "Comment" msgstr "" #: ../../include/bbcode.php:233 ../../include/bbcode.php:928 -#: ../../include/bbcode.php:1525 ../../include/bbcode.php:1533 +#: ../../include/bbcode.php:1546 ../../include/bbcode.php:1554 msgid "Image/photo" msgstr "" -#: ../../include/bbcode.php:280 ../../include/bbcode.php:1550 +#: ../../include/bbcode.php:280 ../../include/bbcode.php:1571 msgid "Encrypted content" msgstr "" @@ -12736,34 +12739,10 @@ msgstr "" msgid "View summary" msgstr "" -#: ../../include/bbcode.php:1501 +#: ../../include/bbcode.php:1522 msgid "$1 wrote:" msgstr "" -#: ../../extend/addon/hubzilla-addons/gnusoc/gnusoc.php:453 -msgid "Follow" -msgstr "" - -#: ../../extend/addon/hubzilla-addons/gnusoc/gnusoc.php:456 -#, php-format -msgid "%1$s is now following %2$s" -msgstr "" - -#: ../../extend/addon/hubzilla-addons/gnusoc/Mod_Gnusoc.php:16 -msgid "" -"The GNU-Social protocol does not support location independence. Connections " -"you make within that network may be unreachable from alternate channel " -"locations." -msgstr "" - -#: ../../extend/addon/hubzilla-addons/gnusoc/Mod_Gnusoc.php:22 -msgid "GNU-Social Protocol App" -msgstr "" - -#: ../../extend/addon/hubzilla-addons/gnusoc/Mod_Gnusoc.php:34 -msgid "GNU-Social Protocol" -msgstr "" - #: ../../extend/addon/hubzilla-addons/qrator/qrator.php:48 msgid "QR code" msgstr "" @@ -13274,7 +13253,7 @@ msgstr "" #: ../../extend/addon/hubzilla-addons/redred/Mod_Redred.php:75 #: ../../extend/addon/hubzilla-addons/openid/MysqlProvider.php:54 -#: ../../boot.php:1714 +#: ../../boot.php:1715 msgid "Nickname" msgstr "" @@ -13479,78 +13458,78 @@ msgstr "" msgid "Instructions" msgstr "" -#: ../../extend/addon/hubzilla-addons/cart/submodules/hzservices.php:63 +#: ../../extend/addon/hubzilla-addons/cart/submodules/hzservices.php:64 msgid "Enable Hubzilla Services Module" msgstr "" -#: ../../extend/addon/hubzilla-addons/cart/submodules/hzservices.php:162 +#: ../../extend/addon/hubzilla-addons/cart/submodules/hzservices.php:163 #: ../../extend/addon/hubzilla-addons/cart/submodules/manualcat.php:172 msgid "New Sku" msgstr "" -#: ../../extend/addon/hubzilla-addons/cart/submodules/hzservices.php:197 +#: ../../extend/addon/hubzilla-addons/cart/submodules/hzservices.php:198 #: ../../extend/addon/hubzilla-addons/cart/submodules/manualcat.php:208 msgid "Cannot save edits to locked item." msgstr "" -#: ../../extend/addon/hubzilla-addons/cart/submodules/hzservices.php:246 -#: ../../extend/addon/hubzilla-addons/cart/submodules/hzservices.php:333 +#: ../../extend/addon/hubzilla-addons/cart/submodules/hzservices.php:247 +#: ../../extend/addon/hubzilla-addons/cart/submodules/hzservices.php:334 msgid "SKU not found." msgstr "" -#: ../../extend/addon/hubzilla-addons/cart/submodules/hzservices.php:299 -#: ../../extend/addon/hubzilla-addons/cart/submodules/hzservices.php:303 +#: ../../extend/addon/hubzilla-addons/cart/submodules/hzservices.php:300 +#: ../../extend/addon/hubzilla-addons/cart/submodules/hzservices.php:304 msgid "Invalid Activation Directive." msgstr "" -#: ../../extend/addon/hubzilla-addons/cart/submodules/hzservices.php:374 -#: ../../extend/addon/hubzilla-addons/cart/submodules/hzservices.php:378 +#: ../../extend/addon/hubzilla-addons/cart/submodules/hzservices.php:375 +#: ../../extend/addon/hubzilla-addons/cart/submodules/hzservices.php:379 msgid "Invalid Deactivation Directive." msgstr "" -#: ../../extend/addon/hubzilla-addons/cart/submodules/hzservices.php:564 +#: ../../extend/addon/hubzilla-addons/cart/submodules/hzservices.php:565 msgid "Add to this privacy group" msgstr "" -#: ../../extend/addon/hubzilla-addons/cart/submodules/hzservices.php:580 +#: ../../extend/addon/hubzilla-addons/cart/submodules/hzservices.php:581 msgid "Set user service class" msgstr "" -#: ../../extend/addon/hubzilla-addons/cart/submodules/hzservices.php:607 +#: ../../extend/addon/hubzilla-addons/cart/submodules/hzservices.php:608 msgid "You must be using a local account to purchase this service." msgstr "" -#: ../../extend/addon/hubzilla-addons/cart/submodules/hzservices.php:647 +#: ../../extend/addon/hubzilla-addons/cart/submodules/hzservices.php:648 #: ../../extend/addon/hubzilla-addons/cart/submodules/manualcat.php:252 msgid "Changes Locked" msgstr "" -#: ../../extend/addon/hubzilla-addons/cart/submodules/hzservices.php:651 +#: ../../extend/addon/hubzilla-addons/cart/submodules/hzservices.php:652 #: ../../extend/addon/hubzilla-addons/cart/submodules/manualcat.php:256 msgid "Item available for purchase." msgstr "" -#: ../../extend/addon/hubzilla-addons/cart/submodules/hzservices.php:658 +#: ../../extend/addon/hubzilla-addons/cart/submodules/hzservices.php:659 #: ../../extend/addon/hubzilla-addons/cart/submodules/manualcat.php:263 #: ../../extend/addon/hubzilla-addons/cart/widgets/catalogitem.php:57 msgid "Price" msgstr "" -#: ../../extend/addon/hubzilla-addons/cart/submodules/hzservices.php:661 +#: ../../extend/addon/hubzilla-addons/cart/submodules/hzservices.php:662 #: ../../extend/addon/hubzilla-addons/cart/submodules/manualcat.php:266 msgid "Photo URL" msgstr "" -#: ../../extend/addon/hubzilla-addons/cart/submodules/hzservices.php:665 +#: ../../extend/addon/hubzilla-addons/cart/submodules/hzservices.php:666 msgid "Add buyer to privacy group" msgstr "" -#: ../../extend/addon/hubzilla-addons/cart/submodules/hzservices.php:670 +#: ../../extend/addon/hubzilla-addons/cart/submodules/hzservices.php:671 msgid "Add buyer as connection" msgstr "" -#: ../../extend/addon/hubzilla-addons/cart/submodules/hzservices.php:678 -#: ../../extend/addon/hubzilla-addons/cart/submodules/hzservices.php:720 +#: ../../extend/addon/hubzilla-addons/cart/submodules/hzservices.php:679 +#: ../../extend/addon/hubzilla-addons/cart/submodules/hzservices.php:721 msgid "Set Service Class" msgstr "" @@ -13822,28 +13801,32 @@ msgstr "" msgid "No username found in import file." msgstr "" -#: ../../extend/addon/hubzilla-addons/diaspora/Receiver.php:1599 +#: ../../extend/addon/hubzilla-addons/diaspora/Receiver.php:1571 #, php-format msgid "%1$s dislikes %2$s's %3$s" msgstr "" -#: ../../extend/addon/hubzilla-addons/diaspora/diaspora.php:70 +#: ../../extend/addon/hubzilla-addons/diaspora/diaspora.php:75 msgid "" "Please install the statistics addon to be able to configure a diaspora relay" msgstr "" -#: ../../extend/addon/hubzilla-addons/diaspora/diaspora.php:80 +#: ../../extend/addon/hubzilla-addons/diaspora/diaspora.php:85 msgid "Diaspora Relay Handle" msgstr "" -#: ../../extend/addon/hubzilla-addons/diaspora/diaspora.php:80 +#: ../../extend/addon/hubzilla-addons/diaspora/diaspora.php:85 msgid "Address of a diaspora relay. Example: relay@diasporarelay.tld" msgstr "" -#: ../../extend/addon/hubzilla-addons/diaspora/diaspora.php:100 +#: ../../extend/addon/hubzilla-addons/diaspora/diaspora.php:105 msgid "Diaspora relay could not be imported" msgstr "" +#: ../../extend/addon/hubzilla-addons/diaspora/diaspora.php:999 +msgid "No subject" +msgstr "" + #: ../../extend/addon/hubzilla-addons/dirstats/dirstats.php:94 msgid "Hubzilla Directory Stats" msgstr "" @@ -15103,200 +15086,165 @@ msgstr "" msgid "No entries." msgstr "" -#: ../../extend/addon/hubzilla-addons/mail/Mod_Mail.php:40 +#: ../../extend/addon/hubzilla-addons/mail/Mod_Mail.php:36 msgid "Messages" msgstr "" -#: ../../extend/addon/hubzilla-addons/mail/Mod_Mail.php:53 +#: ../../extend/addon/hubzilla-addons/mail/Mod_Mail.php:48 msgid "message" msgstr "" -#: ../../extend/addon/hubzilla-addons/mail/Mod_Mail.php:93 -msgid "Message recalled." -msgstr "" - -#: ../../extend/addon/hubzilla-addons/mail/Mod_Mail.php:106 +#: ../../extend/addon/hubzilla-addons/mail/Mod_Mail.php:75 msgid "Conversation removed." msgstr "" -#: ../../extend/addon/hubzilla-addons/mail/Mod_Mail.php:121 -#: ../../extend/addon/hubzilla-addons/mail/Mod_Mail.php:242 +#: ../../extend/addon/hubzilla-addons/mail/Mod_Mail.php:136 msgid "Expires YYYY-MM-DD HH:MM" msgstr "" -#: ../../extend/addon/hubzilla-addons/mail/Mod_Mail.php:149 -msgid "Requested channel is not in this network" -msgstr "" - -#: ../../extend/addon/hubzilla-addons/mail/Mod_Mail.php:157 -msgid "Send Private Message" -msgstr "" - -#: ../../extend/addon/hubzilla-addons/mail/Mod_Mail.php:158 -#: ../../extend/addon/hubzilla-addons/mail/Mod_Mail.php:301 -msgid "To:" -msgstr "" - -#: ../../extend/addon/hubzilla-addons/mail/Mod_Mail.php:166 -#: ../../extend/addon/hubzilla-addons/mail/Mod_Mail.php:309 -msgid "Attach file" -msgstr "" - -#: ../../extend/addon/hubzilla-addons/mail/Mod_Mail.php:168 -msgid "Send" -msgstr "" - -#: ../../extend/addon/hubzilla-addons/mail/Mod_Mail.php:272 +#: ../../extend/addon/hubzilla-addons/mail/Mod_Mail.php:167 msgid "Delete message" msgstr "" -#: ../../extend/addon/hubzilla-addons/mail/Mod_Mail.php:273 +#: ../../extend/addon/hubzilla-addons/mail/Mod_Mail.php:168 msgid "Delivery report" msgstr "" -#: ../../extend/addon/hubzilla-addons/mail/Mod_Mail.php:274 +#: ../../extend/addon/hubzilla-addons/mail/Mod_Mail.php:169 msgid "Recall message" msgstr "" -#: ../../extend/addon/hubzilla-addons/mail/Mod_Mail.php:276 +#: ../../extend/addon/hubzilla-addons/mail/Mod_Mail.php:171 msgid "Message has been recalled." msgstr "" -#: ../../extend/addon/hubzilla-addons/mail/Mod_Mail.php:294 +#: ../../extend/addon/hubzilla-addons/mail/Mod_Mail.php:189 msgid "Delete Conversation" msgstr "" -#: ../../extend/addon/hubzilla-addons/mail/Mod_Mail.php:296 +#: ../../extend/addon/hubzilla-addons/mail/Mod_Mail.php:191 msgid "" "No secure communications available. You <strong>may</strong> be able to " "respond from the sender's profile page." msgstr "" -#: ../../extend/addon/hubzilla-addons/mail/Mod_Mail.php:300 +#: ../../extend/addon/hubzilla-addons/mail/Mod_Mail.php:195 msgid "Send Reply" msgstr "" -#: ../../extend/addon/hubzilla-addons/mail/Mod_Mail.php:305 -#, php-format -msgid "Your message for %s (%s):" -msgstr "" - -#: ../../extend/addon/hubzilla-addons/mail/Mod_Mail.php:385 -msgid "Unable to lookup recipient." -msgstr "" - -#: ../../extend/addon/hubzilla-addons/mail/Mod_Mail.php:392 -msgid "Unable to communicate with requested channel." +#: ../../extend/addon/hubzilla-addons/mail/Mod_Mail.php:196 +msgid "To:" msgstr "" -#: ../../extend/addon/hubzilla-addons/mail/Mod_Mail.php:399 -msgid "Cannot verify requested channel." +#: ../../extend/addon/hubzilla-addons/mail/Mod_Mail.php:200 +#, php-format +msgid "Your message for %s (%s):" msgstr "" -#: ../../extend/addon/hubzilla-addons/mail/Mod_Mail.php:417 -msgid "Selected channel has private message restrictions. Send failed." +#: ../../extend/addon/hubzilla-addons/mail/Mod_Mail.php:204 +msgid "Attach file" msgstr "" -#: ../../extend/addon/hubzilla-addons/openclipatar/openclipatar.php:50 -#: ../../extend/addon/hubzilla-addons/openclipatar/openclipatar.php:128 +#: ../../extend/addon/hubzilla-addons/openclipatar/openclipatar.php:51 +#: ../../extend/addon/hubzilla-addons/openclipatar/openclipatar.php:129 msgid "System defaults:" msgstr "" -#: ../../extend/addon/hubzilla-addons/openclipatar/openclipatar.php:54 +#: ../../extend/addon/hubzilla-addons/openclipatar/openclipatar.php:55 msgid "Preferred Clipart IDs" msgstr "" -#: ../../extend/addon/hubzilla-addons/openclipatar/openclipatar.php:54 +#: ../../extend/addon/hubzilla-addons/openclipatar/openclipatar.php:55 msgid "List of preferred clipart ids. These will be shown first." msgstr "" -#: ../../extend/addon/hubzilla-addons/openclipatar/openclipatar.php:55 +#: ../../extend/addon/hubzilla-addons/openclipatar/openclipatar.php:56 msgid "Default Search Term" msgstr "" -#: ../../extend/addon/hubzilla-addons/openclipatar/openclipatar.php:55 +#: ../../extend/addon/hubzilla-addons/openclipatar/openclipatar.php:56 msgid "The default search term. These will be shown second." msgstr "" -#: ../../extend/addon/hubzilla-addons/openclipatar/openclipatar.php:56 +#: ../../extend/addon/hubzilla-addons/openclipatar/openclipatar.php:57 msgid "Return After" msgstr "" -#: ../../extend/addon/hubzilla-addons/openclipatar/openclipatar.php:56 +#: ../../extend/addon/hubzilla-addons/openclipatar/openclipatar.php:57 msgid "Page to load after image selection." msgstr "" -#: ../../extend/addon/hubzilla-addons/openclipatar/openclipatar.php:59 +#: ../../extend/addon/hubzilla-addons/openclipatar/openclipatar.php:60 msgid "Profile List" msgstr "" -#: ../../extend/addon/hubzilla-addons/openclipatar/openclipatar.php:61 +#: ../../extend/addon/hubzilla-addons/openclipatar/openclipatar.php:62 msgid "Order of Preferred" msgstr "" -#: ../../extend/addon/hubzilla-addons/openclipatar/openclipatar.php:61 +#: ../../extend/addon/hubzilla-addons/openclipatar/openclipatar.php:62 msgid "Sort order of preferred clipart ids." msgstr "" -#: ../../extend/addon/hubzilla-addons/openclipatar/openclipatar.php:62 -#: ../../extend/addon/hubzilla-addons/openclipatar/openclipatar.php:68 +#: ../../extend/addon/hubzilla-addons/openclipatar/openclipatar.php:63 +#: ../../extend/addon/hubzilla-addons/openclipatar/openclipatar.php:69 msgid "Newest first" msgstr "" -#: ../../extend/addon/hubzilla-addons/openclipatar/openclipatar.php:65 +#: ../../extend/addon/hubzilla-addons/openclipatar/openclipatar.php:66 msgid "As entered" msgstr "" -#: ../../extend/addon/hubzilla-addons/openclipatar/openclipatar.php:67 +#: ../../extend/addon/hubzilla-addons/openclipatar/openclipatar.php:68 msgid "Order of other" msgstr "" -#: ../../extend/addon/hubzilla-addons/openclipatar/openclipatar.php:67 +#: ../../extend/addon/hubzilla-addons/openclipatar/openclipatar.php:68 msgid "Sort order of other clipart ids." msgstr "" -#: ../../extend/addon/hubzilla-addons/openclipatar/openclipatar.php:69 +#: ../../extend/addon/hubzilla-addons/openclipatar/openclipatar.php:70 msgid "Most downloaded first" msgstr "" -#: ../../extend/addon/hubzilla-addons/openclipatar/openclipatar.php:70 +#: ../../extend/addon/hubzilla-addons/openclipatar/openclipatar.php:71 msgid "Most liked first" msgstr "" -#: ../../extend/addon/hubzilla-addons/openclipatar/openclipatar.php:72 +#: ../../extend/addon/hubzilla-addons/openclipatar/openclipatar.php:73 msgid "Preferred IDs Message" msgstr "" -#: ../../extend/addon/hubzilla-addons/openclipatar/openclipatar.php:72 +#: ../../extend/addon/hubzilla-addons/openclipatar/openclipatar.php:73 msgid "Message to display above preferred results." msgstr "" -#: ../../extend/addon/hubzilla-addons/openclipatar/openclipatar.php:78 +#: ../../extend/addon/hubzilla-addons/openclipatar/openclipatar.php:79 msgid "Uploaded by: " msgstr "" -#: ../../extend/addon/hubzilla-addons/openclipatar/openclipatar.php:78 +#: ../../extend/addon/hubzilla-addons/openclipatar/openclipatar.php:79 msgid "Drawn by: " msgstr "" -#: ../../extend/addon/hubzilla-addons/openclipatar/openclipatar.php:182 -#: ../../extend/addon/hubzilla-addons/openclipatar/openclipatar.php:194 +#: ../../extend/addon/hubzilla-addons/openclipatar/openclipatar.php:183 +#: ../../extend/addon/hubzilla-addons/openclipatar/openclipatar.php:195 msgid "Use this image" msgstr "" -#: ../../extend/addon/hubzilla-addons/openclipatar/openclipatar.php:192 +#: ../../extend/addon/hubzilla-addons/openclipatar/openclipatar.php:193 msgid "Or select from a free OpenClipart.org image:" msgstr "" -#: ../../extend/addon/hubzilla-addons/openclipatar/openclipatar.php:195 +#: ../../extend/addon/hubzilla-addons/openclipatar/openclipatar.php:196 msgid "Search Term" msgstr "" -#: ../../extend/addon/hubzilla-addons/openclipatar/openclipatar.php:232 +#: ../../extend/addon/hubzilla-addons/openclipatar/openclipatar.php:233 msgid "Unknown error. Please try again later." msgstr "" -#: ../../extend/addon/hubzilla-addons/openclipatar/openclipatar.php:308 +#: ../../extend/addon/hubzilla-addons/openclipatar/openclipatar.php:309 msgid "Profile photo updated successfully." msgstr "" @@ -15385,7 +15333,7 @@ msgstr "" msgid "Number of logfiles to retain" msgstr "" -#: ../../extend/addon/hubzilla-addons/wppost/wppost.php:46 +#: ../../extend/addon/hubzilla-addons/wppost/wppost.php:47 msgid "Post to WordPress" msgstr "" @@ -15867,40 +15815,40 @@ msgstr "" msgid "Show advanced settings" msgstr "" -#: ../../boot.php:1696 +#: ../../boot.php:1697 msgid "Create an account to access services and applications" msgstr "" -#: ../../boot.php:1714 +#: ../../boot.php:1715 msgid "Email or nickname" msgstr "" -#: ../../boot.php:1724 +#: ../../boot.php:1725 msgid "Password" msgstr "" -#: ../../boot.php:1725 +#: ../../boot.php:1726 msgid "Remember me" msgstr "" -#: ../../boot.php:1728 +#: ../../boot.php:1729 msgid "Forgot your password?" msgstr "" -#: ../../boot.php:2607 +#: ../../boot.php:2608 #, php-format msgid "[$Projectname] Website SSL error for %s" msgstr "" -#: ../../boot.php:2612 +#: ../../boot.php:2613 msgid "Website SSL certificate is not valid. Please correct." msgstr "" -#: ../../boot.php:2728 +#: ../../boot.php:2729 #, php-format msgid "[$Projectname] Cron tasks not running on %s" msgstr "" -#: ../../boot.php:2733 +#: ../../boot.php:2734 msgid "Cron/Scheduled tasks not running." msgstr "" diff --git a/view/pl/htconfig.tpl b/view/pl/htconfig.tpl index 22b01d772..f9d4600e7 100644 --- a/view/pl/htconfig.tpl +++ b/view/pl/htconfig.tpl @@ -63,12 +63,12 @@ App::$config['system']['verify_email'] = 1; // Ograniczenia dostępu do portalu. Domyślnie tworzone są portale prywatne. // Masz do wyboru ACCESS_PRIVATE, ACCESS_PAID, ACCESS_TIERED i ACCESS_FREE. -// Jeśli opuścisz ustawienie REGISTER_OPEN powyżej, każdy bedzie się mógł +// Jeśli pozostawisz ustawienie REGISTER_OPEN powyżej, każdy bedzie się mógł // zarejestrować na Twoim portalu, jednak portal ten nie będzie nigdzie -// wyświetlany jako portal z otwartą resjestracją. +// wyświetlany jako witryna z otwartą resjestracją. // Używamy polityki dostępu do systemu (poniżej) aby określić, czy portal ma być // umieszczony w katalogu jako portal otwarty, w którym każdy może tworzyć konta. -// Twój wybór, to: paid, tiered lub free. +// Twój inny wybór to: paid, tiered lub free. App::$config['system']['access_policy'] = ACCESS_PRIVATE; @@ -79,7 +79,7 @@ App::$config['system']['access_policy'] = ACCESS_PRIVATE; App::$config['system']['sellpage'] = ''; -// Maksymalny rozmiar importowanej wiadomości, 0 jest nieograniczony +// Maksymalny rozmiar importowanej wiadomości, 0 to brak ograniczeń App::$config['system']['max_import_size'] = 200000; @@ -95,7 +95,7 @@ App::$config['system']['php_path'] = '{{$phpath}}'; App::$config['system']['directory_mode'] = DIRECTORY_MODE_NORMAL; -// domyślny moty systemowy +// domyślny motyw systemowy App::$config['system']['theme'] = 'redbasic'; diff --git a/view/pl/lostpass_eml.tpl b/view/pl/lostpass_eml.tpl index 9a860f26c..99457e0e0 100644 --- a/view/pl/lostpass_eml.tpl +++ b/view/pl/lostpass_eml.tpl @@ -1,11 +1,11 @@ Drogi/Droga {{$username}}, Niedawno otrzymaliśmy prośbę o zresetowanie hasła do konta na {{$ sitename}}. -Aby potwierdzić tę prośbę, wybierz link weryfikacyjny poniżej lub wklej go w pasku -adresu przeglądarki internetowej. +Aby potwierdzić tę prośbę, wybierz link weryfikacyjny podany poniżej lub wklej go +w pasku adresu przeglądarki internetowej (jeśli obawiasz się fałszerstwa). Jeśli jest to pomyłka i nie chcesz zmieniać hasła, NIE klikaj podanego linku i -zignoruj albo usuń tą wiadomość e-mail. +zignoruj albo usuń tą wiadomość. Twoje hasło nie zostanie zmienione, chyba że potwierdzisz prawdziwość tego żądania. @@ -29,5 +29,5 @@ Z poważaniem, -- Warunki świadczenia usług: -{{$siteurl}}/help/TermsOfService +{{$siteurl}}/help/pl/TermsOfService diff --git a/view/pl/register_open_eml.tpl b/view/pl/register_open_eml.tpl index 5d168ef80..ff365f985 100644 --- a/view/pl/register_open_eml.tpl +++ b/view/pl/register_open_eml.tpl @@ -1,5 +1,5 @@ -Na serwisie {{$ sitename}} zostało utworzone konto dla tego adresu e-mail. +Na portalu {{$ sitename}} zostało utworzone konto dla tego adresu e-mail. Dane logowania są następujące: Lokalizacja serwisu: {{$siteurl}} @@ -10,7 +10,7 @@ Jeśli to konto zostało utworzone bez Twojej wiedzy i nie jest pożądane, moż odwiedić nasz serwis i zresetować ustawione hasło. Umożliwi to usunięcie konta linkiem na stronie "Ustawienia", a my przepraszamy za wszelkie niedogodności. -Dziękujemy i witamu na serwisie {{$sitename}}. +Dziękujemy i witamy na serwisie {{$sitename}}. Z poważaniem, {{$sitename}} Administrator diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 3b74c5ea1..9c3596f1b 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -1195,6 +1195,12 @@ img.mail-conv-sender-photo { border-radius: $radius; } +.widget h3 { + font-size: 0.9rem; + text-transform: uppercase; +} + + #note-text { border-radius: $radius; } @@ -1272,7 +1278,7 @@ img.mail-conv-sender-photo { border-radius: $radius; } -#nav-app-link { +#nav-app-link-wrapper.has_location .nav-link { padding: 0 !important; line-height: 1.175; white-space: nowrap; @@ -1468,7 +1474,6 @@ blockquote { .dropdown-menu { color: $font_colour; - font-size: 0.9rem; border-radius: $radius; } @@ -1626,17 +1631,17 @@ dl.bb-dl > dd > li { /* Turn checkboxes into switches */ -.form-group.checkbox > div { +.onoffswitch.checkbox > div { position: relative; width: 60px; -webkit-user-select:none; -moz-user-select:none; -ms-user-select: none; display:inline-block; } -.form-group.checkbox input { +.onoffswitch.checkbox input { display: none; } -.form-group.checkbox > div label { +.onoffswitch.checkbox > div label { display: block; overflow: hidden; cursor: pointer; border: 1px solid #ccc; border-radius: 12px; @@ -1647,11 +1652,11 @@ dl.bb-dl > dd > li { font-weight: normal; } -.form-group.checkbox:hover label { +.onoffswitch.checkbox:hover label { color: $link_colour; } -.form-group.checkbox:hover > div label { +.onoffswitch.checkbox:hover > div label { border-color: $link_colour; } @@ -1690,17 +1695,17 @@ dl.bb-dl > dd > li { -o-transition: all 0.3s ease-in 0s; transition: all 0.3s ease-in 0s; } -.form-group.checkbox > div > input:checked + label .onoffswitch-inner { +.onoffswitch.checkbox > div > input:checked + label .onoffswitch-inner { margin-left: 0px; } -.form-group.checkbox > div > input:checked + label .onoffswitch-switch { +.onoffswitch.checkbox > div > input:checked + label .onoffswitch-switch { right: 0px; background-color: #0275d8; } -.form-group.checkbox > div > input:disabled + label .onoffswitch-switch { +.onoffswitch.checkbox > div > input:disabled + label .onoffswitch-switch { background-color: red; opacity: 0.3; filter:alpha(opacity=30); @@ -1744,7 +1749,7 @@ dl.bb-dl > dd > li { border-left: 0.2rem solid #eee; } -.app-icon { +.app-icon i { color: #777; font-size: 80px; text-shadow: 3px 3px 3px lightgrey; diff --git a/view/theme/redbasic/js/redbasic.js b/view/theme/redbasic/js/redbasic.js index a354682d7..c0c03d4f8 100644 --- a/view/theme/redbasic/js/redbasic.js +++ b/view/theme/redbasic/js/redbasic.js @@ -50,7 +50,7 @@ $(document).ready(function() { }); $("input[data-role=cat-tagsinput]").tagsinput({ - tagClass: 'badge badge-pill badge-warning text-dark' + tagClass: 'badge rounded-pill bg-warning text-dark' }); $('a.disabled').click(function(e) { @@ -71,7 +71,7 @@ $(document).ready(function() { setInterval(function () {checkNotify();}, 10 * 1000); var touch_start = null; - var touch_max = 70; + var touch_max = window.innerWidth / 10; window.addEventListener('touchstart', function(e) { if (e.touches.length === 1){ @@ -90,7 +90,7 @@ $(document).ready(function() { window.addEventListener('touchend', function(e) { $('html, body').css('overflow-y', ''); - let touch_offset = 30; //at least 100px are a swipe + let touch_offset = 30; //at least 30px are a swipe if (touch_start) { //the only finger that hit the screen left it let touch_end = e.changedTouches.item(0).clientX; diff --git a/view/theme/redbasic/php/style.php b/view/theme/redbasic/php/style.php index d278aa309..3ea94f9aa 100644 --- a/view/theme/redbasic/php/style.php +++ b/view/theme/redbasic/php/style.php @@ -69,7 +69,7 @@ if ((!$schema) || ($schema == '---')) { } } - + //Set some defaults - we have to do this after pulling owner settings, and we have to check for each setting //individually. If we don't, we'll have problems if a user has set one, but not all options. if (! $nav_bg) @@ -79,7 +79,7 @@ if (! $nav_icon_colour) if (! $nav_active_icon_colour) $nav_active_icon_colour = 'rgba(255, 255, 255, 0.75)'; if (! $link_colour) - $link_colour = '#007bff'; + $link_colour = '#0d6efd'; if (! $banner_colour) $banner_colour = '#fff'; if (! $bgcolour) @@ -158,7 +158,7 @@ if(file_exists('view/theme/redbasic/css/style.css')) { } -// Set the schema to the default schema in derived themes. See the documentation for creating derived themes how to override this. +// Set the schema to the default schema in derived themes. See the documentation for creating derived themes how to override this. if(local_channel() && App::$channel && App::$channel['channel_theme'] != 'redbasic') set_pconfig(local_channel(), 'redbasic', 'schema', '---'); diff --git a/view/tpl/abook_edit.tpl b/view/tpl/abook_edit.tpl index 6ff7bffcd..380d5886c 100644 --- a/view/tpl/abook_edit.tpl +++ b/view/tpl/abook_edit.tpl @@ -1,12 +1,12 @@ <div class="generic-content-wrapper"> <div class="section-title-wrapper"> {{if $notself}} - <div class="pull-right"> + <div class="float-end"> <div class="btn-group"> - <button id="connection-dropdown" class="btn btn-outline-secondary btn-sm dropdown-toggle" type="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> + <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}} @@ -25,8 +25,8 @@ <div class="btn-group"> <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-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"> + <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-end" aria-labelledby="dLabel"> {{foreach $sections as $s}} <a class="dropdown-item" href="{{$s.url}}" title="{{$s.title}}">{{$s.label}}</a> {{/foreach}} @@ -52,7 +52,7 @@ {{/foreach}} <div class="section-content-info-wrapper"> <div> - {{$addr_text}} <strong>'{{if $addr}}{{$addr}}{{else}}{{$primeurl}}{{/if}}'</strong> + {{$addr_text}} <strong>'{{if $addr}}{{$addr}}{{else}}{{$primeurl}}{{/if}}'</strong> </div> {{if $locstr}} <div> @@ -85,7 +85,7 @@ <div class="panel"> <div class="section-subtitle-wrapper" role="tab" id="pending-tool"> <h3> - <a data-toggle="collapse" data-parent="#contact-edit-tools" href="#pending-tool-collapse" aria-expanded="true" aria-controls="pending-tool-collapse"> + <a data-bs-toggle="collapse" data-parent="#contact-edit-tools" href="#pending-tool-collapse" aria-expanded="true" aria-controls="pending-tool-collapse"> {{$pending_label}} </a> </h3> @@ -101,21 +101,21 @@ </div> {{/if}} {{if ! $is_pending}} - <div id="template-form-vcard-org" class="form-group form-vcard-org"> - <div class="form-group form-vcard-org"> + <div id="template-form-vcard-org" class="mb-3 form-vcard-org"> + <div class="mb-3 form-vcard-org"> <input type="text" name="org" value="" placeholder="{{$org_label}}"> <i data-remove="vcard-org" data-id="" class="fa fa-trash-o remove-field drop-icons fakelink"></i> </div> </div> - <div id="template-form-vcard-title" class="form-group form-vcard-title"> - <div class="form-group form-vcard-title"> + <div id="template-form-vcard-title" class="mb-3 form-vcard-title"> + <div class="mb-3 form-vcard-title"> <input type="text" name="title" value="" placeholder="{{$title_label}}"> <i data-remove="vcard-title" data-id="" class="fa fa-trash-o remove-field drop-icons fakelink"></i> </div> </div> - <div id="template-form-vcard-tel" class="form-group form-vcard-tel"> + <div id="template-form-vcard-tel" class="mb-3 form-vcard-tel"> <select name="tel_type[]"> <option value="CELL">{{$mobile}}</option> <option value="HOME">{{$home}}</option> @@ -126,7 +126,7 @@ <i data-remove="vcard-tel" data-id="" class="fa fa-trash-o remove-field drop-icons fakelink"></i> </div> - <div id="template-form-vcard-email" class="form-group form-vcard-email"> + <div id="template-form-vcard-email" class="mb-3 form-vcard-email"> <select name="email_type[]"> <option value="HOME">{{$home}}</option> <option value="WORK">{{$work}}</option> @@ -136,7 +136,7 @@ <i data-remove="vcard-email" data-id="" class="fa fa-trash-o remove-field drop-icons fakelink"></i> </div> - <div id="template-form-vcard-impp" class="form-group form-vcard-impp"> + <div id="template-form-vcard-impp" class="mb-3 form-vcard-impp"> <select name="impp_type[]"> <option value="HOME">{{$home}}</option> <option value="WORK">{{$work}}</option> @@ -146,7 +146,7 @@ <i data-remove="vcard-impp" data-id="" class="fa fa-trash-o remove-field drop-icons fakelink"></i> </div> - <div id="template-form-vcard-url" class="form-group form-vcard-url"> + <div id="template-form-vcard-url" class="mb-3 form-vcard-url"> <select name="url_type[]"> <option value="HOME">{{$home}}</option> <option value="WORK">{{$work}}</option> @@ -156,8 +156,8 @@ <i data-remove="vcard-url" data-id="" class="fa fa-trash-o remove-field drop-icons fakelink"></i> </div> - <div id="template-form-vcard-adr" class="form-group form-vcard-adr"> - <div class="form-group"> + <div id="template-form-vcard-adr" class="mb-3 form-vcard-adr"> + <div class="mb-3"> <select name="adr_type[]"> <option value="HOME">{{$home}}</option> <option value="WORK">{{$work}}</option> @@ -166,30 +166,30 @@ <label>{{$adr_label}}</label> <i data-remove="vcard-adr" data-id="" class="fa fa-trash-o remove-field drop-icons fakelink"></i> </div> - <div class="form-group"> + <div class="mb-3"> <input type="text" name="" value="" placeholder="{{$po_box}}"> </div> - <div class="form-group"> + <div class="mb-3"> <input type="text" name="" value="" placeholder="{{$extra}}"> </div> - <div class="form-group"> + <div class="mb-3"> <input type="text" name="" value="" placeholder="{{$street}}"> </div> - <div class="form-group"> + <div class="mb-3"> <input type="text" name="" value="" placeholder="{{$locality}}"> </div> - <div class="form-group"> + <div class="mb-3"> <input type="text" name="" value="" placeholder="{{$region}}"> </div> - <div class="form-group"> + <div class="mb-3"> <input type="text" name="" value="" placeholder="{{$zip_code}}"> </div> - <div class="form-group"> + <div class="mb-3"> <input type="text" name="" value="" placeholder="{{$country}}"> </div> </div> - <div id="template-form-vcard-note" class="form-group form-vcard-note"> + <div id="template-form-vcard-note" class="mb-3 form-vcard-note"> <label>{{$note_label}}</label> <i data-remove="vcard-note" data-id="" class="fa fa-trash-o remove-field drop-icons fakelink"></i> <textarea name="note" class="form-control"></textarea> @@ -197,8 +197,8 @@ <div class="section-content-wrapper-np"> <div id="vcard-cancel-{{$vcard.id}}" class="vcard-cancel vcard-cancel-btn" data-id="{{$vcard.id}}" data-action="cancel"><i class="fa fa-close"></i></div> - <div id="vcard-add-field-{{$vcard.id}}" class="dropdown pull-right vcard-add-field"> - <button data-toggle="dropdown" type="button" class="btn btn-outline-secondary btn-sm dropdown-toggle"><i class="fa fa-plus"></i> {{$add_field}}</button> + <div id="vcard-add-field-{{$vcard.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> <ul class="dropdown-menu"> <li class="add-vcard-org"{{if $vcard.org}} style="display: none"{{/if}}><a href="#" data-add="vcard-org" data-id="{{$vcard.id}}" class="add-field" onclick="return false;">{{$org_label}}</a></li> <li class="add-vcard-title"{{if $vcard.title}} style="display: none"{{/if}}><a href="#" data-add="vcard-title" data-id="{{$vcard.id}}" class="add-field" onclick="return false;">{{$title_label}}</a></li> @@ -222,10 +222,10 @@ </div> <div id="vcard-info-{{$vcard.id}}" class="vcard-info section-content-wrapper"> - <div class="vcard-org form-group"> + <div class="vcard-org mb-3"> <div class="form-vcard-org-wrapper"> {{if $vcard.org}} - <div class="form-group form-vcard-org"> + <div class="mb-3 form-vcard-org"> <input type="text" name="org" value="{{$vcard.org}}" size="{{$vcard.org|count_characters:true}}" placeholder="{{$org_label}}"> <i data-remove="vcard-org" data-id="{{$vcard.id}}" class="fa fa-trash-o remove-field drop-icons fakelink"></i> </div> @@ -233,10 +233,10 @@ </div> </div> - <div class="vcard-title form-group"> + <div class="vcard-title mb-3"> <div class="form-vcard-title-wrapper"> {{if $vcard.title}} - <div class="form-group form-vcard-title"> + <div class="mb-3 form-vcard-title"> <input type="text" name="title" value="{{$vcard.title}}" size="{{$vcard.title|count_characters:true}}" placeholder="{{$title_label}}"> <i data-remove="vcard-title" data-id="{{$vcard.id}}" class="fa fa-trash-o remove-field drop-icons fakelink"></i> </div> @@ -245,11 +245,11 @@ </div> - <div class="vcard-tel form-group"> + <div class="vcard-tel mb-3"> <div class="form-vcard-tel-wrapper"> {{if $vcard.tels}} {{foreach $vcard.tels as $tel}} - <div class="form-group form-vcard-tel"> + <div class="mb-3 form-vcard-tel"> <select name="tel_type[]"> <option value=""{{if $tel.type.0 != 'CELL' && $tel.type.0 != 'HOME' && $tel.type.0 != 'WORK' && $tel.type.0 != 'OTHER'}} selected="selected"{{/if}}>{{$tel.type.1}}</option> <option value="CELL"{{if $tel.type.0 == 'CELL'}} selected="selected"{{/if}}>{{$mobile}}</option> @@ -266,11 +266,11 @@ </div> - <div class="vcard-email form-group"> + <div class="vcard-email mb-3"> <div class="form-vcard-email-wrapper"> {{if $vcard.emails}} {{foreach $vcard.emails as $email}} - <div class="form-group form-vcard-email"> + <div class="mb-3 form-vcard-email"> <select name="email_type[]"> <option value=""{{if $email.type.0 != 'HOME' && $email.type.0 != 'WORK' && $email.type.0 != 'OTHER'}} selected="selected"{{/if}}>{{$email.type.1}}</option> <option value="HOME"{{if $email.type.0 == 'HOME'}} selected="selected"{{/if}}>{{$home}}</option> @@ -285,11 +285,11 @@ </div> </div> - <div class="vcard-impp form-group"> + <div class="vcard-impp mb-3"> <div class="form-vcard-impp-wrapper"> {{if $vcard.impps}} {{foreach $vcard.impps as $impp}} - <div class="form-group form-vcard-impp"> + <div class="mb-3 form-vcard-impp"> <select name="impp_type[]"> <option value=""{{if $impp.type.0 != 'HOME' && $impp.type.0 != 'WORK' && $impp.type.0 != 'OTHER'}} selected="selected"{{/if}}>{{$impp.type.1}}</option> <option value="HOME"{{if $impp.type.0 == 'HOME'}} selected="selected"{{/if}}>{{$home}}</option> @@ -304,11 +304,11 @@ </div> </div> - <div class="vcard-url form-group"> + <div class="vcard-url mb-3"> <div class="form-vcard-url-wrapper"> {{if $vcard.urls}} {{foreach $vcard.urls as $url}} - <div class="form-group form-vcard-url"> + <div class="mb-3 form-vcard-url"> <select name="url_type[]"> <option value=""{{if $url.type.0 != 'HOME' && $url.type.0 != 'WORK' && $url.type.0 != 'OTHER'}} selected="selected"{{/if}}>{{$url.type.1}}</option> <option value="HOME"{{if $url.type.0 == 'HOME'}} selected="selected"{{/if}}>{{$home}}</option> @@ -323,12 +323,12 @@ </div> </div> - <div class="vcard-adr form-group"> + <div class="vcard-adr mb-3"> <div class="form-vcard-adr-wrapper"> {{if $vcard.adrs}} {{foreach $vcard.adrs as $adr}} - <div class="form-group form-vcard-adr"> - <div class="form-group"> + <div class="mb-3 form-vcard-adr"> + <div class="mb-3"> <label>{{$adr_label}}</label> <select name="adr_type[]"> <option value=""{{if $adr.type.0 != 'HOME' && $adr.type.0 != 'WORK' && $adr.type.0 != 'OTHER'}} selected="selected"{{/if}}>{{$adr.type.1}}</option> @@ -338,25 +338,25 @@ </select> <i data-remove="vcard-adr" data-id="{{$vcard.id}}" class="fa fa-trash-o remove-field drop-icons fakelink"></i> </div> - <div class="form-group"> + <div class="mb-3"> <input type="text" name="adr[{{$adr@index}}][]" value="{{$adr.address.0}}" size="{{$adr.address.0|count_characters:true}}" placeholder="{{$po_box}}"> </div> - <div class="form-group"> + <div class="mb-3"> <input type="text" name="adr[{{$adr@index}}][]" value="{{$adr.address.1}}" size="{{$adr.address.1|count_characters:true}}" placeholder="{{$extra}}"> </div> - <div class="form-group"> + <div class="mb-3"> <input type="text" name="adr[{{$adr@index}}][]" value="{{$adr.address.2}}" size="{{$adr.address.2|count_characters:true}}" placeholder="{{$street}}"> </div> - <div class="form-group"> + <div class="mb-3"> <input type="text" name="adr[{{$adr@index}}][]" value="{{$adr.address.3}}" size="{{$adr.address.3|count_characters:true}}" placeholder="{{$locality}}"> </div> - <div class="form-group"> + <div class="mb-3"> <input type="text" name="adr[{{$adr@index}}][]" value="{{$adr.address.4}}" size="{{$adr.address.4|count_characters:true}}" placeholder="{{$region}}"> </div> - <div class="form-group"> + <div class="mb-3"> <input type="text" name="adr[{{$adr@index}}][]" value="{{$adr.address.5}}" size="{{$adr.address.5|count_characters:true}}" placeholder="{{$zip_code}}"> </div> - <div class="form-group"> + <div class="mb-3"> <input type="text" name="adr[{{$adr@index}}][]" value="{{$adr.address.6}}" size="{{$adr.address.6|count_characters:true}}" placeholder="{{$country}}"> </div> </div> @@ -365,7 +365,7 @@ </div> </div> - <div class="vcard-note form-group form-vcard-note"> + <div class="vcard-note mb-3 form-vcard-note"> <div class="form-vcard-note-wrapper"> {{if $vcard.note}} <label>{{$note_label}}</label> @@ -387,7 +387,7 @@ <div class="panel"> <div class="section-subtitle-wrapper" role="tab" id="affinity-tool"> <h3> - <a data-toggle="collapse" data-parent="#contact-edit-tools" href="#affinity-tool-collapse" aria-expanded="true" aria-controls="affinity-tool-collapse"> + <a data-bs-toggle="collapse" data-parent="#contact-edit-tools" href="#affinity-tool-collapse" aria-expanded="true" aria-controls="affinity-tool-collapse"> {{$affinity}} </a> </h3> @@ -395,13 +395,13 @@ <div id="affinity-tool-collapse" class="panel-collapse collapse{{if $section == 'affinity'}} show{{/if}}" role="tabpanel" aria-labelledby="affinity-tool"> <div class="section-content-tools-wrapper"> {{if $slide}} - <div class="form-group"><strong>{{$lbl_slider}}</strong></div> + <div class="mb-3"><strong>{{$lbl_slider}}</strong></div> {{$slide}} <input id="contact-closeness-mirror" type="hidden" name="closeness" value="{{$close}}" /> {{/if}} {{if $multiprofs}} - <div class="form-group"> + <div class="mb-3"> <strong>{{$lbl_vis2}}</strong> {{$profile_select}} </div> @@ -418,7 +418,7 @@ <div class="panel"> <div class="section-subtitle-wrapper" role="tab" id="fitert-tool"> <h3> - <a data-toggle="collapse" data-parent="#contact-edit-tools" href="#fitert-tool-collapse" aria-expanded="true" aria-controls="fitert-tool-collapse"> + <a data-bs-toggle="collapse" data-parent="#contact-edit-tools" href="#fitert-tool-collapse" aria-expanded="true" aria-controls="fitert-tool-collapse"> {{$connfilter_label}} </a> </h3> @@ -442,7 +442,7 @@ <div class="panel"> <div class="section-subtitle-wrapper" role="tab" id="rating-tool"> <h3> - <a data-toggle="collapse" data-parent="#contact-edit-tools" href="#rating-tool-collapse" aria-expanded="true" aria-controls="rating-tool-collapse"> + <a data-bs-toggle="collapse" data-parent="#contact-edit-tools" href="#rating-tool-collapse" aria-expanded="true" aria-controls="rating-tool-collapse"> {{$lbl_rating}} </a> </h3> @@ -452,7 +452,7 @@ <div class="section-content-warning-wrapper"> {{$rating_info}} </div> - <div class="form-group"><strong>{{$lbl_rating_label}}</strong></div> + <div class="mb-3"><strong>{{$lbl_rating_label}}</strong></div> {{$rating}} {{include file="field_textarea.tpl" field=$rating_text}} <input id="contact-rating-mirror" type="hidden" name="rating" value="{{$rating_val}}" /> @@ -471,7 +471,7 @@ {{if $notself}} <div class="section-subtitle-wrapper" role="tab" id="perms-tool"> <h3> - <a data-toggle="collapse" data-parent="#contact-edit-tools" href="#perms-tool-collapse" aria-expanded="true" aria-controls="perms-tool-collapse"> + <a data-bs-toggle="collapse" data-parent="#contact-edit-tools" href="#perms-tool-collapse" aria-expanded="true" aria-controls="perms-tool-collapse"> {{$permlbl}} </a> </h3> @@ -485,11 +485,11 @@ </div> {{if $permcat_enable}} - <a href="permcats" class="pull-right"><i class="fa fa-plus"></i> {{$permcat_new}}</a> + <a href="permcats" class="float-end"><i class="fa fa-plus"></i> {{$permcat_new}}</a> {{include file="field_select.tpl" field=$permcat}} {{/if}} - <table id="perms-tool-table" class=form-group> + <table id="perms-tool-table" class=mb-3> <tr> <td></td> {{if $notself}} diff --git a/view/tpl/acl_selector.tpl b/view/tpl/acl_selector.tpl index c58a345e5..bc33b8b6f 100644 --- a/view/tpl/acl_selector.tpl +++ b/view/tpl/acl_selector.tpl @@ -9,14 +9,14 @@ <a target="hubzilla-help" href="{{$helpUrl}}" class="contextual-help-tool" title="Help and documentation"><i class="fa fa-fw fa-question"></i></a> {{/if}} </h4> - <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button> + <button type="button" class="btn-close" data-bs-dismiss="modal" aria-hidden="true"></button> </div> <div class="section-content-wrapper"> {{if $aclModalDesc}} <div id="acl-dialog-description" class="section-content-info-wrapper">{{$aclModalDesc}}</div> {{/if}} <label for="acl-select">{{if $aclModalDesc}}<i class="fa fa-send-o"></i> {{/if}}{{$select_label}}</label> - <select id="acl-select" name="optionsRadios" class="form-control form-group"> + <select id="acl-select" name="optionsRadios" class="form-control mb-3"> <option id="acl-showall" value="public" {{$public_selected}}>{{$showall}}</option> <option id="acl-onlyme" value="onlyme" {{$justme_selected}}>{{$onlyme}}</option> {{$groups}} @@ -26,7 +26,7 @@ </select> {{if $showallOrigin}} - <div id="acl-info" class="form-group"> + <div id="acl-info" class="mb-3"> <i class="fa fa-info-circle"></i> {{$showallOrigin}} </div> {{/if}} @@ -50,7 +50,7 @@ </div> </div> <div class="modal-footer clear"> - <button type="button" class="btn btn-outline-secondary" data-dismiss="modal">{{$aclModalDismiss}}</button> + <button type="button" class="btn btn-outline-secondary" data-bs-dismiss="modal">{{$aclModalDismiss}}</button> </div> </div><!-- /.modal-content --> </div><!-- /.modal-dialog --> @@ -58,7 +58,7 @@ </form> <script> // compatibility issue with bootstrap v4 - //$('[data-toggle="popover"]').popover(); // Init the popover, if present + //$('[data-bs-toggle="popover"]').popover(); // Init the popover, if present if(typeof acl=="undefined"){ acl = new ACL( diff --git a/view/tpl/admin_accounts.tpl b/view/tpl/admin_accounts.tpl index f4865f7a0..78a68a8a1 100644 --- a/view/tpl/admin_accounts.tpl +++ b/view/tpl/admin_accounts.tpl @@ -36,7 +36,7 @@ {{/foreach}} </tbody> </table> - <div class="float-right"> + <div class="float-end"> <a id="zar2sat" class="btn btn-sm btn-primary" href="javascript:;">{{$sel_tall}}</a> <a id="zar2aas" class="zar2xas btn btn-sm btn-success" href="javascript:;"><i class="fa fa-check"></i> {{$sel_aprv}}</a> <a id="zar2das" class="zar2xas btn btn-sm btn-danger" href="javascript:;"><i class="fa fa-close"></i> {{$sel_deny}}</a> @@ -46,7 +46,7 @@ {{$no_pending}} </div> {{/if}} - <div class="float-left"> + <div class="float-start"> <a class="btn btn-sm btn-link" href="{{$get_all_link}}">{{$get_all}}</a> </div> <div class="clearfix"></div> diff --git a/view/tpl/admin_plugins.tpl b/view/tpl/admin_plugins.tpl index d8e1a6711..7d413d085 100644 --- a/view/tpl/admin_plugins.tpl +++ b/view/tpl/admin_plugins.tpl @@ -1,7 +1,7 @@ <div class="generic-content-wrapper"> <div class="section-title-wrapper"> {{if $allowManageRepos}} - <div class="pull-right"> + <div class="float-end"> <button class="btn btn-success btn-sm" onclick="openClose('form');">{{$managerepos}}</button> </div> {{/if}} @@ -20,13 +20,13 @@ {{foreach $addonrepos as $repo}} <tr> <td style="width: 70%;"> - <span class="pull-left">{{$repo.name}}</span><span id="update-message-{{$repo.name}}" style="margin-left: 20px;"></span> + <span class="float-start">{{$repo.name}}</span><span id="update-message-{{$repo.name}}" style="margin-left: 20px;"></span> </td> <td style="width: 15%;"> - <button class="btn btn-sm btn-primary pull-right" style="margin-left: 10px; margin-right: 10px;" onclick="updateAddonRepo('{{$repo.name}}'); return false;"><i class='fa fa-download'></i> {{$repoUpdateButton}}</button> + <button class="btn btn-sm btn-primary float-end" style="margin-left: 10px; margin-right: 10px;" onclick="updateAddonRepo('{{$repo.name}}'); return false;"><i class='fa fa-download'></i> {{$repoUpdateButton}}</button> </td> <td style="width: 15%;"> - <button class="btn btn-sm btn-danger pull-right" style="margin-left: 10px; margin-right: 0px;" onclick="removeAddonRepo('{{$repo.name}}'); return false;"><i class='fa fa-trash-o'></i> {{$repoRemoveButton}}</button> + <button class="btn btn-sm btn-danger float-end" style="margin-left: 10px; margin-right: 0px;" onclick="removeAddonRepo('{{$repo.name}}'); return false;"><i class='fa fa-trash-o'></i> {{$repoRemoveButton}}</button> </td> <div class="clear"></div> </td></tr> diff --git a/view/tpl/admin_plugins_addrepo.tpl b/view/tpl/admin_plugins_addrepo.tpl index de7b465bb..e0e271d5a 100644 --- a/view/tpl/admin_plugins_addrepo.tpl +++ b/view/tpl/admin_plugins_addrepo.tpl @@ -3,7 +3,7 @@ <p class="descriptive-text">{{$desc}}</p> {{include file="field_input.tpl" field=$repoURL}} {{include file="field_input.tpl" field=$repoName}} - <div class="btn-group pull-right"> + <div class="btn-group float-end"> <button id="add-plugin-repo-submit" class="btn btn-primary" type="submit" name="submit" onclick="adminPluginsAddRepo(); return false;">{{$submit}}</button> </div> </form> diff --git a/view/tpl/admin_profiles.tpl b/view/tpl/admin_profiles.tpl index b3bb687c0..1df3f5492 100644 --- a/view/tpl/admin_profiles.tpl +++ b/view/tpl/admin_profiles.tpl @@ -1,5 +1,5 @@ <div class="generic-content-wrapper"> -<div class="section-title-wrapper"><a title="{{$new}}" class="btn btn-primary btn-sm pull-right" href="admin/profs/new"><i class="fa fa-plus-circle"></i> {{$new}}</a><h2>{{$title}}</h2> +<div class="section-title-wrapper"><a title="{{$new}}" class="btn btn-primary btn-sm float-end" href="admin/profs/new"><i class="fa fa-plus-circle"></i> {{$new}}</a><h2>{{$title}}</h2> <div class="clear"></div> </div> diff --git a/view/tpl/admin_settings_features.tpl b/view/tpl/admin_settings_features.tpl index 86f978e08..330251dce 100644 --- a/view/tpl/admin_settings_features.tpl +++ b/view/tpl/admin_settings_features.tpl @@ -9,7 +9,7 @@ <div class="panel"> <div class="section-subtitle-wrapper" role="tab" id="{{$g}}-settings-title"> <h3> - <a data-toggle="collapse" data-target="#{{$g}}-settings-content" href="#" aria-expanded="true" aria-controls="{{$g}}-settings-collapse"> + <a data-bs-toggle="collapse" data-bs-target="#{{$g}}-settings-content" href="#" aria-expanded="true" aria-controls="{{$g}}-settings-collapse"> {{$f.0}} </a> </h3> diff --git a/view/tpl/admin_site.tpl b/view/tpl/admin_site.tpl index 5d51932eb..6882c3b8a 100644 --- a/view/tpl/admin_site.tpl +++ b/view/tpl/admin_site.tpl @@ -1,6 +1,6 @@ <div id="adminpage" class="generic-content-wrapper-styled"> <h1>{{$title}} - {{$page}}</h1> - + <form action="{{$baseurl}}/admin/site" method="post"> <input type='hidden' name='form_security_token' value='{{$form_security_token}}'> @@ -24,11 +24,11 @@ {{if $directory_server}} {{include file="field_select.tpl" field=$directory_server}} {{/if}} - + <div class="submit"> <input type="submit" name="page_site" class="btn btn-primary" value="{{$submit}}" /> </div> - + <h3>{{$registration}}</h3> {{include file="field_input.tpl" field=$register_text}} {{include file="field_select_grouped.tpl" field=$role}} @@ -61,11 +61,11 @@ {{include file="field_textarea.tpl" field=$incl}} {{include file="field_textarea.tpl" field=$excl}} {{include file="field_input.tpl" field=$abandon_days}} - + <div class="submit"> - <input type="submit" name="page_site" class="btn btn-primary" value="{{$submit}}" /></div> + <input type="submit" name="page_site" class="btn btn-primary" value="{{$submit}}" /> </div> - + <h3>{{$advanced}}</h3> {{include file="field_checkbox.tpl" field=$sse_enabled}} {{include file="field_input.tpl" field=$imagick_path}} @@ -80,29 +80,29 @@ {{include file="field_input.tpl" field=$default_expire_days}} {{include file="field_input.tpl" field=$active_expire_days}} - + <div class="submit"> <input type="submit" name="page_site" class="btn btn-primary" value="{{$submit}}" /> </div> - + </form> </div> -{{* +{{* COMMENTS for this template: hilmar, 2020.01 script placed at the end *}} <script> $(function(){ - + $("#cnftheme").colorbox({ width: 800, onLoad: function(){ var theme = $("#id_theme :selected").val(); $("#cnftheme").attr('href',"{{$baseurl}}/admin/themes/"+theme); - }, + }, onComplete: function(){ - $(this).colorbox.resize(); + $(this).colorbox.resize(); $("#colorbox form").submit(function(e){ var url = $(this).attr('action'); // can't get .serialize() to work... @@ -114,16 +114,16 @@ data[$(this).attr('name')] = $(this).children(":selected").val(); }); console.log(":)", url, data); - + $.post(url, data, function(data) { if(timer) clearTimeout(timer); updateInit(); $.colorbox.close(); }) - + return false; }); - + } }); }); diff --git a/view/tpl/album_edit.tpl b/view/tpl/album_edit.tpl index f5495f149..95a6a7b14 100644 --- a/view/tpl/album_edit.tpl +++ b/view/tpl/album_edit.tpl @@ -1,6 +1,6 @@ <div id="photo-album-edit-wrapper" class="section-content-tools-wrapper"> <form name="photo-album-edit-form" id="photo-album-edit-form" action="photos/{{$nickname}}/album/{{$hexalbum}}" method="post" > - <div class="form-group"> + <div class="mb-3"> <label id="photo-album-edit-name-label" for="photo-album-edit-name">{{$nametext}}</label> <input type="text" name="albumname" placeholder="{{$name_placeholder}}" value="{{$album}}" class="form-control" list="dl-album-edit" /> <datalist id="dl-album-edit"> @@ -11,9 +11,9 @@ {{/foreach}} </datalist> </div> - <div class="form-group"> - <button id="photo-album-edit-submit" type="submit" name="submit" class="btn btn-primary btn-sm pull-right" />{{$submit}}</button> - <button id="photo-album-edit-drop" type="submit" name="dropalbum" value="{{$dropsubmit}}" class="btn btn-danger btn-sm pull-left" onclick="return confirmDelete();" />{{$dropsubmit}}</button> + <div class="mb-3"> + <button id="photo-album-edit-submit" type="submit" name="submit" class="btn btn-primary btn-sm float-end" />{{$submit}}</button> + <button id="photo-album-edit-drop" type="submit" name="dropalbum" value="{{$dropsubmit}}" class="btn btn-danger btn-sm float-start" onclick="return confirmDelete();" />{{$dropsubmit}}</button> </div> </form> <div id="photo-album-edit-end" class="clear"></div> diff --git a/view/tpl/app.tpl b/view/tpl/app.tpl index 774b75b31..f3f6ae58b 100644 --- a/view/tpl/app.tpl +++ b/view/tpl/app.tpl @@ -1,38 +1,41 @@ -{{if ! ($navapps || $order)}} -<div class="app-container"> - <div class="app-detail{{if $deleted}} app-deleted{{/if}}"> - <a href="{{$app.url}}"{{if $app.target}} target="{{$app.target}}"{{/if}}{{if $app.desc}} title="{{$app.desc}}{{if $app.price}} ({{$app.price}}){{/if}}"{{else}}title="{{$app.name}}"{{/if}}>{{if $icon}}<i class="app-icon fa fa-fw fa-{{$icon}}"></i>{{else}}<img src="{{$app.photo}}" width="80" height="80" />{{/if}} - <div class="app-name" style="text-align:center;">{{$app.name}}</div> - </a> - </div> - {{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> +<div class="section-subtitle-wrapper clearfix"> + <div class="float-end"> + {{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> + </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}} + </form> + </div> + {{/if}} + {{/if}} </div> - {{/if}} - {{if $action_label || $update || $delete || $feature}} - <div class="text-center 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-outline-{{if $installed}}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 $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 $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}} - </form> + <h3>{{$app.name}}{{if $app.price}} ({{$app.price}}){{/if}}</h3> +</div> +<div class="section-content-tools-wrapper container"> + <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> + {{else}} + <img src="{{$app.photo}}" width="80" height="80" /> + {{/if}} + </a> + <div class="app-info"> + {{if $app.desc}}{{$app.desc}}{{/if}} + </div> </div> - {{/if}} - {{/if}} </div> -{{/if}} -{{if $navapps}} -<a class="dropdown-item{{if $app.active}} active{{/if}}" href="{{$app.url}}">{{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> -{{/if}} -{{if $order}} -<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> -{{/if}} + diff --git a/view/tpl/app_create.tpl b/view/tpl/app_create.tpl index 5075ce5e2..0a455d07f 100644 --- a/view/tpl/app_create.tpl +++ b/view/tpl/app_create.tpl @@ -33,7 +33,7 @@ {{include file="field_textarea.tpl" field=$embed}} {{/if}} - <button class="btn btn-primary float-right" type="submit" name="submit" value="{{$submit}}">{{$submit}}</button> + <button class="btn btn-primary float-end" type="submit" name="submit" value="{{$submit}}">{{$submit}}</button> </form> </div> diff --git a/view/tpl/app_inline.tpl b/view/tpl/app_inline.tpl new file mode 100644 index 000000000..fc3675380 --- /dev/null +++ b/view/tpl/app_inline.tpl @@ -0,0 +1,26 @@ +<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> + {{else}} + <img src="{{$app.photo}}" width="80" height="80" class="mb-3" /> + {{/if}} +</a> +<div class="mb-3"> + {{if $app.desc}}{{$app.desc}}{{/if}} +</div> +{{if $action_label}} +<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 $purchase && $app.type !== 'system'}} + <a href="{{$app.page}}" class="btn btn-sm btn-link" title="{{$purchase}}" ><i class="fa fa-external-link"></i></a> + {{/if}} + </form> +</div> +{{/if}} + + diff --git a/view/tpl/app_install.tpl b/view/tpl/app_install.tpl new file mode 100644 index 000000000..16b89d350 --- /dev/null +++ b/view/tpl/app_install.tpl @@ -0,0 +1,13 @@ +<div> + <h2>{{$papp.name}}</h2> +</div> +<div class="mb-3"> + {{$papp.desc}} +</div> +<form action="appman" method="post"> + <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}} + </button> +</form> diff --git a/view/tpl/app_nav.tpl b/view/tpl/app_nav.tpl index 817c74763..0d6e66892 100644 --- a/view/tpl/app_nav.tpl +++ b/view/tpl/app_nav.tpl @@ -1 +1 @@ -<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>{{else}}<img src="{{$app.photo}}" width="16" height="16" />{{/if}}<span class="d-lg-none">{{$app.name}}</span></a> +<a class="dropdown-item{{if $app.active}} active{{/if}}" href="{{$app.url}}">{{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> diff --git a/view/tpl/app_nav_pinned.tpl b/view/tpl/app_nav_pinned.tpl new file mode 100644 index 000000000..817c74763 --- /dev/null +++ b/view/tpl/app_nav_pinned.tpl @@ -0,0 +1 @@ +<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>{{else}}<img src="{{$app.photo}}" width="16" height="16" />{{/if}}<span class="d-lg-none">{{$app.name}}</span></a> diff --git a/view/tpl/app_order.tpl b/view/tpl/app_order.tpl new file mode 100644 index 000000000..53c770cb7 --- /dev/null +++ b/view/tpl/app_order.tpl @@ -0,0 +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> diff --git a/view/tpl/attach_edit.tpl b/view/tpl/attach_edit.tpl index 62442ff7a..0de4404ec 100644 --- a/view/tpl/attach_edit.tpl +++ b/view/tpl/attach_edit.tpl @@ -5,7 +5,7 @@ <input type="hidden" name="fileid" value="{{$file.id}}" /> {{if !$isadir}}{{include file="field_checkbox.tpl" field=$notify}}{{/if}} {{if $isadir}}{{include file="field_checkbox.tpl" field=$recurse}}{{/if}} - <div id="attach-edit-tools-share" class="btn-group form-group"> + <div id="attach-edit-tools-share" class="btn-group mb-3"> {{if !$isadir}} <a href="/rpost?attachment=[attachment]{{$file.hash}},{{$file.revision}}[/attachment]" id="attach-btn" class="btn btn-outline-secondary btn-sm" title="{{$attach_btn_title}}"> <i class="fa fa-share-square-o jot-icons"></i> @@ -15,15 +15,15 @@ <i class="fa fa-link jot-icons"></i> </button> </div> - <div id="attach-edit-perms" class="btn-group pull-right"> - <button id="dbtn-acl" class="btn btn-outline-secondary btn-sm" data-toggle="modal" data-target="#aclModal" title="{{$permset}}" type="button"> + <div id="attach-edit-perms" class="btn-group float-end"> + <button id="dbtn-acl" class="btn btn-outline-secondary btn-sm" data-bs-toggle="modal" data-bs-target="#aclModal" title="{{$permset}}" type="button"> <i id="jot-perms-icon" class="fa fa-{{$lockstate}} jot-icons"></i> </button> <button id="dbtn-submit" class="btn btn-primary btn-sm" type="submit" name="submit"> {{$submit}} </button> </div> - <div id="link-code" class="form-group"> + <div id="link-code" class="mb-3"> <label for="">{{$cpldesc}}</label> <input type="text" class="form-control" id="linkpasteinput" name="cutpasteextlink" value="{{$cloudpath}}" onclick="this.select();"/> </div> diff --git a/view/tpl/blocklist.tpl b/view/tpl/blocklist.tpl index 7f400bba2..0d859166e 100644 --- a/view/tpl/blocklist.tpl +++ b/view/tpl/blocklist.tpl @@ -1,7 +1,7 @@ <div class="generic-content-wrapper"> <div class="section-title-wrapper"> {{if $editor}} - <div class="pull-right"> + <div class="float-end"> <button id="webpage-create-btn" class="btn btn-sm btn-success" onclick="openClose('block-editor');"><i class="fa fa-pencil-square-o"></i> {{$create}}</button> </div> {{/if}} diff --git a/view/tpl/cal_calendar.tpl b/view/tpl/cal_calendar.tpl index 93ebaa235..a928e98f6 100644 --- a/view/tpl/cal_calendar.tpl +++ b/view/tpl/cal_calendar.tpl @@ -87,7 +87,7 @@ function updateSize() { <div class="generic-content-wrapper"> <div class="section-title-wrapper"> - <div class="float-right"> + <div class="float-end"> <div class="btn-group"> <button id="prev-btn" class="btn btn-outline-secondary btn-sm" title="{{$prev}}"><i class="fa fa-backward"></i></button> <button id="today-btn" class="btn btn-outline-secondary btn-sm" title="{{$today}}"><div id="events-spinner" class="spinner s"></div><i class="fa fa-bullseye" style="display: none; width: 1rem;"></i></button> diff --git a/view/tpl/cdav_addressbook.tpl b/view/tpl/cdav_addressbook.tpl index 587a95caa..ab0b43ffc 100644 --- a/view/tpl/cdav_addressbook.tpl +++ b/view/tpl/cdav_addressbook.tpl @@ -69,21 +69,21 @@ $(document).ready(function() { }); </script> -<div id="template-form-vcard-org" class="form-group form-vcard-org"> - <div class="form-group form-vcard-org"> +<div id="template-form-vcard-org" class="mb-3 form-vcard-org"> + <div class="mb-3 form-vcard-org"> <input type="text" name="org" value="" placeholder="{{$org_label}}"> <i data-remove="vcard-org" data-id="" class="fa fa-trash-o remove-field drop-icons fakelink"></i> </div> </div> -<div id="template-form-vcard-title" class="form-group form-vcard-title"> - <div class="form-group form-vcard-title"> +<div id="template-form-vcard-title" class="mb-3 form-vcard-title"> + <div class="mb-3 form-vcard-title"> <input type="text" name="title" value="" placeholder="{{$title_label}}"> <i data-remove="vcard-title" data-id="" class="fa fa-trash-o remove-field drop-icons fakelink"></i> </div> </div> -<div id="template-form-vcard-tel" class="form-group form-vcard-tel"> +<div id="template-form-vcard-tel" class="mb-3 form-vcard-tel"> <select name="tel_type[]"> <option value="CELL">{{$mobile}}</option> <option value="HOME">{{$home}}</option> @@ -94,7 +94,7 @@ $(document).ready(function() { <i data-remove="vcard-tel" data-id="" class="fa fa-trash-o remove-field drop-icons fakelink"></i> </div> -<div id="template-form-vcard-email" class="form-group form-vcard-email"> +<div id="template-form-vcard-email" class="mb-3 form-vcard-email"> <select name="email_type[]"> <option value="HOME">{{$home}}</option> <option value="WORK">{{$work}}</option> @@ -104,7 +104,7 @@ $(document).ready(function() { <i data-remove="vcard-email" data-id="" class="fa fa-trash-o remove-field drop-icons fakelink"></i> </div> -<div id="template-form-vcard-impp" class="form-group form-vcard-impp"> +<div id="template-form-vcard-impp" class="mb-3 form-vcard-impp"> <select name="impp_type[]"> <option value="HOME">{{$home}}</option> <option value="WORK">{{$work}}</option> @@ -114,7 +114,7 @@ $(document).ready(function() { <i data-remove="vcard-impp" data-id="" class="fa fa-trash-o remove-field drop-icons fakelink"></i> </div> -<div id="template-form-vcard-url" class="form-group form-vcard-url"> +<div id="template-form-vcard-url" class="mb-3 form-vcard-url"> <select name="url_type[]"> <option value="HOME">{{$home}}</option> <option value="WORK">{{$work}}</option> @@ -124,8 +124,8 @@ $(document).ready(function() { <i data-remove="vcard-url" data-id="" class="fa fa-trash-o remove-field drop-icons fakelink"></i> </div> -<div id="template-form-vcard-adr" class="form-group form-vcard-adr"> - <div class="form-group"> +<div id="template-form-vcard-adr" class="mb-3 form-vcard-adr"> + <div class="mb-3"> <select name="adr_type[]"> <option value="HOME">{{$home}}</option> <option value="WORK">{{$work}}</option> @@ -134,30 +134,30 @@ $(document).ready(function() { <label>{{$adr_label}}</label> <i data-remove="vcard-adr" data-id="" class="fa fa-trash-o remove-field drop-icons fakelink"></i> </div> - <div class="form-group"> + <div class="mb-3"> <input type="text" name="" value="" placeholder="{{$po_box}}"> </div> - <div class="form-group"> + <div class="mb-3"> <input type="text" name="" value="" placeholder="{{$extra}}"> </div> - <div class="form-group"> + <div class="mb-3"> <input type="text" name="" value="" placeholder="{{$street}}"> </div> - <div class="form-group"> + <div class="mb-3"> <input type="text" name="" value="" placeholder="{{$locality}}"> </div> - <div class="form-group"> + <div class="mb-3"> <input type="text" name="" value="" placeholder="{{$region}}"> </div> - <div class="form-group"> + <div class="mb-3"> <input type="text" name="" value="" placeholder="{{$zip_code}}"> </div> - <div class="form-group"> + <div class="mb-3"> <input type="text" name="" value="" placeholder="{{$country}}"> </div> </div> -<div id="template-form-vcard-note" class="form-group form-vcard-note"> +<div id="template-form-vcard-note" class="mb-3 form-vcard-note"> <label>{{$note_label}}</label> <i data-remove="vcard-note" data-id="" class="fa fa-trash-o remove-field drop-icons fakelink"></i> <textarea name="note" class="form-control"></textarea> @@ -165,15 +165,15 @@ $(document).ready(function() { <div class="generic-content-wrapper"> <div class="section-title-wrapper"> - <button type="button" class="btn btn-success btn-sm float-right" onclick="openClose('create_form')"><i class="fa fa-plus-circle"></i> {{$add_card}}</button> + <button type="button" class="btn btn-success btn-sm float-end" onclick="openClose('create_form')"><i class="fa fa-plus-circle"></i> {{$add_card}}</button> <h2>{{$displayname}}</h2> </div> <div id="create_form" class="section-content-tools-wrapper"> <form id="card_form_new" method="post" action=""> <input type="hidden" name="target" value="{{$id}}"> - <div class="dropdown pull-right"> - <button data-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 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-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> @@ -185,35 +185,35 @@ $(document).ready(function() { </div> </div> - <div class="vcard-fn-create form-group"> + <div class="vcard-fn-create mb-3"> <div class="form-vcard-fn-wrapper"> - <div class="form-group form-vcard-fn"> + <div class="mb-3 form-vcard-fn"> <div class="vcard-nophoto"><i class="fa fa-user"></i></div><input type="text" name="fn" value="" placeholder="{{$name_label}}"> </div> </div> </div> - <div class="vcard-org form-group"> + <div class="vcard-org mb-3"> <div class="form-vcard-org-wrapper"> - <div class="form-group form-vcard-org"> + <div class="mb-3 form-vcard-org"> <input type="text" name="org" value="" placeholder="{{$org_label}}"> <i data-remove="vcard-org" data-id="new" class="fa fa-trash-o remove-field drop-icons fakelink"></i> </div> </div> </div> - <div class="vcard-title form-group"> + <div class="vcard-title mb-3"> <div class="form-vcard-title-wrapper"> - <div class="form-group form-vcard-title"> + <div class="mb-3 form-vcard-title"> <input type="text" name="title" value="" placeholder="{{$title_label}}"> <i data-remove="vcard-title" data-id="new" class="fa fa-trash-o remove-field drop-icons fakelink"></i> </div> </div> </div> - <div class="vcard-tel form-group"> + <div class="vcard-tel mb-3"> <div class="form-vcard-tel-wrapper"> - <div class="form-group form-vcard-tel"> + <div class="mb-3 form-vcard-tel"> <select name="tel_type[]"> <option value="CELL">{{$mobile}}</option> <option value="HOME">{{$home}}</option> @@ -227,9 +227,9 @@ $(document).ready(function() { </div> - <div class="vcard-email form-group"> + <div class="vcard-email mb-3"> <div class="form-vcard-email-wrapper"> - <div class="form-group form-vcard-email"> + <div class="mb-3 form-vcard-email"> <select name="email_type[]"> <option value="HOME">{{$home}}</option> <option value="WORK">{{$work}}</option> @@ -241,27 +241,27 @@ $(document).ready(function() { </div> </div> - <div class="vcard-impp form-group"> + <div class="vcard-impp mb-3"> <div class="form-vcard-impp-wrapper"> </div> </div> - <div class="vcard-url form-group"> + <div class="vcard-url mb-3"> <div class="form-vcard-url-wrapper"> </div> </div> - <div class="vcard-adr form-group"> + <div class="vcard-adr mb-3"> <div class="form-vcard-adr-wrapper"> </div> </div> - <div class="vcard-note form-group"> + <div class="vcard-note mb-3"> <div class="form-vcard-note-wrapper"> </div> </div> - <button type="submit" name="create" value="create_card" class="btn btn-primary btn-sm pull-right">{{$create}}</button> + <button type="submit" name="create" value="create_card" class="btn btn-primary btn-sm float-end">{{$create}}</button> <button type="button" class="btn btn-outline-secondary btn-sm" onclick="openClose('create_form')">{{$cancel}}</button> <div class="clear"></div> </form> @@ -273,9 +273,9 @@ $(document).ready(function() { <input type="hidden" name="uri" value="{{$card.uri}}"> <div class="section-content-wrapper-np"> <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 pull-right vcard-add-field"> - <button data-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 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-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> @@ -298,10 +298,10 @@ $(document).ready(function() { </div> <div id="vcard-info-{{$card.id}}" class="vcard-info section-content-wrapper"> - <div class="vcard-org form-group"> + <div class="vcard-org mb-3"> <div class="form-vcard-org-wrapper"> {{if $card.org}} - <div class="form-group form-vcard-org"> + <div class="mb-3 form-vcard-org"> <input type="text" name="org" value="{{$card.org}}" size="{{$card.org|count_characters:true}}" placeholder="{{$org_label}}"> <i data-remove="vcard-org" data-id="{{$card.id}}" class="fa fa-trash-o remove-field drop-icons fakelink"></i> </div> @@ -309,10 +309,10 @@ $(document).ready(function() { </div> </div> - <div class="vcard-title form-group"> + <div class="vcard-title mb-3"> <div class="form-vcard-title-wrapper"> {{if $card.title}} - <div class="form-group form-vcard-title"> + <div class="mb-3 form-vcard-title"> <input type="text" name="title" value="{{$card.title}}" size="{{$card.title|count_characters:true}}" placeholder="{{$title_label}}"> <i data-remove="vcard-title" data-id="{{$card.id}}" class="fa fa-trash-o remove-field drop-icons fakelink"></i> </div> @@ -321,11 +321,11 @@ $(document).ready(function() { </div> - <div class="vcard-tel form-group"> + <div class="vcard-tel mb-3"> <div class="form-vcard-tel-wrapper"> {{if $card.tels}} {{foreach $card.tels as $tel}} - <div class="form-group form-vcard-tel"> + <div class="mb-3 form-vcard-tel"> <select name="tel_type[]"> <option value=""{{if $tel.type.0 != 'CELL' && $tel.type.0 != 'HOME' && $tel.type.0 != 'WORK' && $tel.type.0 != 'OTHER'}} selected="selected"{{/if}}>{{$tel.type.1}}</option> <option value="CELL"{{if $tel.type.0 == 'CELL'}} selected="selected"{{/if}}>{{$mobile}}</option> @@ -342,11 +342,11 @@ $(document).ready(function() { </div> - <div class="vcard-email form-group"> + <div class="vcard-email mb-3"> <div class="form-vcard-email-wrapper"> {{if $card.emails}} {{foreach $card.emails as $email}} - <div class="form-group form-vcard-email"> + <div class="mb-3 form-vcard-email"> <select name="email_type[]"> <option value=""{{if $email.type.0 != 'HOME' && $email.type.0 != 'WORK' && $email.type.0 != 'OTHER'}} selected="selected"{{/if}}>{{$email.type.1}}</option> <option value="HOME"{{if $email.type.0 == 'HOME'}} selected="selected"{{/if}}>{{$home}}</option> @@ -361,11 +361,11 @@ $(document).ready(function() { </div> </div> - <div class="vcard-impp form-group"> + <div class="vcard-impp mb-3"> <div class="form-vcard-impp-wrapper"> {{if $card.impps}} {{foreach $card.impps as $impp}} - <div class="form-group form-vcard-impp"> + <div class="mb-3 form-vcard-impp"> <select name="impp_type[]"> <option value=""{{if $impp.type.0 != 'HOME' && $impp.type.0 != 'WORK' && $impp.type.0 != 'OTHER'}} selected="selected"{{/if}}>{{$impp.type.1}}</option> <option value="HOME"{{if $impp.type.0 == 'HOME'}} selected="selected"{{/if}}>{{$home}}</option> @@ -380,11 +380,11 @@ $(document).ready(function() { </div> </div> - <div class="vcard-url form-group"> + <div class="vcard-url mb-3"> <div class="form-vcard-url-wrapper"> {{if $card.urls}} {{foreach $card.urls as $url}} - <div class="form-group form-vcard-url"> + <div class="mb-3 form-vcard-url"> <select name="url_type[]"> <option value=""{{if $url.type.0 != 'HOME' && $url.type.0 != 'WORK' && $url.type.0 != 'OTHER'}} selected="selected"{{/if}}>{{$url.type.1}}</option> <option value="HOME"{{if $url.type.0 == 'HOME'}} selected="selected"{{/if}}>{{$home}}</option> @@ -399,12 +399,12 @@ $(document).ready(function() { </div> </div> - <div class="vcard-adr form-group"> + <div class="vcard-adr mb-3"> <div class="form-vcard-adr-wrapper"> {{if $card.adrs}} {{foreach $card.adrs as $adr}} - <div class="form-group form-vcard-adr"> - <div class="form-group"> + <div class="mb-3 form-vcard-adr"> + <div class="mb-3"> <label>{{$adr_label}}</label> <select name="adr_type[]"> <option value=""{{if $adr.type.0 != 'HOME' && $adr.type.0 != 'WORK' && $adr.type.0 != 'OTHER'}} selected="selected"{{/if}}>{{$adr.type.1}}</option> @@ -414,25 +414,25 @@ $(document).ready(function() { </select> <i data-remove="vcard-adr" data-id="{{$card.id}}" class="fa fa-trash-o remove-field drop-icons fakelink"></i> </div> - <div class="form-group"> + <div class="mb-3"> <input type="text" name="adr[{{$adr@index}}][]" value="{{$adr.address.0}}" size="{{$adr.address.0|count_characters:true}}" placeholder="{{$po_box}}"> </div> - <div class="form-group"> + <div class="mb-3"> <input type="text" name="adr[{{$adr@index}}][]" value="{{$adr.address.1}}" size="{{$adr.address.1|count_characters:true}}" placeholder="{{$extra}}"> </div> - <div class="form-group"> + <div class="mb-3"> <input type="text" name="adr[{{$adr@index}}][]" value="{{$adr.address.2}}" size="{{$adr.address.2|count_characters:true}}" placeholder="{{$street}}"> </div> - <div class="form-group"> + <div class="mb-3"> <input type="text" name="adr[{{$adr@index}}][]" value="{{$adr.address.3}}" size="{{$adr.address.3|count_characters:true}}" placeholder="{{$locality}}"> </div> - <div class="form-group"> + <div class="mb-3"> <input type="text" name="adr[{{$adr@index}}][]" value="{{$adr.address.4}}" size="{{$adr.address.4|count_characters:true}}" placeholder="{{$region}}"> </div> - <div class="form-group"> + <div class="mb-3"> <input type="text" name="adr[{{$adr@index}}][]" value="{{$adr.address.5}}" size="{{$adr.address.5|count_characters:true}}" placeholder="{{$zip_code}}"> </div> - <div class="form-group"> + <div class="mb-3"> <input type="text" name="adr[{{$adr@index}}][]" value="{{$adr.address.6}}" size="{{$adr.address.6|count_characters:true}}" placeholder="{{$country}}"> </div> </div> @@ -441,7 +441,7 @@ $(document).ready(function() { </div> </div> - <div class="vcard-note form-group form-vcard-note"> + <div class="vcard-note mb-3 form-vcard-note"> <div class="form-vcard-note-wrapper"> {{if $card.note}} <label>{{$note_label}}</label> @@ -452,7 +452,7 @@ $(document).ready(function() { </div> - <button type="submit" name="update" value="update_card" class="btn btn-primary btn-sm pull-right">{{$update}}</button> + <button type="submit" name="update" value="update_card" class="btn btn-primary btn-sm float-end">{{$update}}</button> <button type="submit" name="delete" value="delete_card" class="btn btn-danger btn-sm">{{$delete}}</button> <button type="button" class="btn btn-outline-secondary btn-sm vcard-cancel-btn" data-id="{{$card.id}}" data-action="cancel">{{$cancel}}</button> <div class="clear"></div> diff --git a/view/tpl/cdav_calendar.tpl b/view/tpl/cdav_calendar.tpl index 823453843..2d6853513 100644 --- a/view/tpl/cdav_calendar.tpl +++ b/view/tpl/cdav_calendar.tpl @@ -114,7 +114,7 @@ $(document).ready(function() { if(event.extendedProps.plink) { if(! $('#l2s').length) - $('#id_title_wrapper').prepend('<span id="l2s" class="float-right"></span>'); + $('#id_title_wrapper').prepend('<span id="l2s" class="float-end"></span>'); $('#l2s').html('<a href="' + event.extendedProps.plink[0] + '" target="_blank"><i class="fa fa-external-link"></i> ' + event.extendedProps.plink[1] + '</a>'); } @@ -358,7 +358,7 @@ $(document).ready(function() { if(resource !== null) { $('.section-content-tools-wrapper, #event_form_wrapper').show(); - $('#id_title_wrapper').prepend('<span id="l2s" class="float-right"></span>'); + $('#id_title_wrapper').prepend('<span id="l2s" class="float-end"></span>'); $('#l2s').html('<a href="' + resource.plink[0] + '" target="_blank"><i class="fa fa-external-link"></i> ' + resource.plink[1] + '</a>'); event_id = resource.id; @@ -581,9 +581,9 @@ function exportDate() { <div class="generic-content-wrapper"> <div class="section-title-wrapper"> - <div class="float-right"> + <div class="float-end"> <div class="dropdown"> - <button id="view_selector" type="button" class="btn btn-outline-secondary btn-sm dropdown-toggle" data-toggle="dropdown"></button> + <button id="view_selector" type="button" class="btn btn-outline-secondary btn-sm dropdown-toggle" data-bs-toggle="dropdown"></button> <div class="dropdown-menu"> <a class="dropdown-item" href="#" onclick="changeView('dayGridMonth'); return false;">{{$month}}</a></li> <a class="dropdown-item" href="#" onclick="changeView('timeGridWeek'); return false;">{{$week}}</a></li> @@ -619,7 +619,7 @@ function exportDate() { <form id="event_form" method="post" action="" class="acl-form" data-form_id="event_form" data-allow_cid='{{$allow_cid}}' data-allow_gid='{{$allow_gid}}' data-deny_cid='{{$deny_cid}}' data-deny_gid='{{$deny_gid}}'> {{include file="field_input.tpl" field=$title}} <label for="calendar_select">{{$calendar_select_label}}</label> - <select id="calendar_select" name="target" class="form-control form-group"> + <select id="calendar_select" name="target" class="form-control mb-3"> <optgroup label="{{$calendar_optiopns_label.0}}"> {{foreach $channel_calendars as $channel_calendar}} <option value="channel_calendar">{{$channel_calendar.displayname}}</option> @@ -636,7 +636,7 @@ function exportDate() { {{/if}} <div id="more_block" style="display: none;"> {{if $catsenabled}} - <div id="id_categories_wrapper" class="form-group"> + <div id="id_categories_wrapper" class="mb-3"> <label id="label_categories" for="id_categories">{{$categories_label}}</label> <input name="categories" id="id_categories" class="form-control" type="text" value="{{$categories}}" data-role="cat-tagsinput" /> </div> @@ -646,10 +646,10 @@ function exportDate() { {{include file="field_textarea.tpl" field=$description}} {{include file="field_textarea.tpl" field=$location}} </div> - <div class="form-group"> - <div class="pull-right"> + <div class="mb-3"> + <div class="float-end"> <button id="event_more" type="button" class="btn btn-outline-secondary btn-sm"><i class="fa fa-caret-down"></i> {{$more}}</button> - <button id="dbtn-acl" class="btn btn-outline-secondary btn-sm d-none" type="button" data-toggle="modal" data-target="#aclModal"><i id="jot-perms-icon" class="fa fa-{{$lockstate}}"></i></button> + <button id="dbtn-acl" class="btn btn-outline-secondary btn-sm d-none" type="button" data-bs-toggle="modal" data-bs-target="#aclModal"><i id="jot-perms-icon" class="fa fa-{{$lockstate}}"></i></button> <button id="event_submit" type="button" value="" class="btn btn-primary btn-sm"></button> </div> diff --git a/view/tpl/cdav_widget_addressbook.tpl b/view/tpl/cdav_widget_addressbook.tpl index 80b5feaf6..fdaa26710 100644 --- a/view/tpl/cdav_widget_addressbook.tpl +++ b/view/tpl/cdav_widget_addressbook.tpl @@ -2,9 +2,9 @@ <h3>{{$addressbooks_label}}</h3> {{foreach $addressbooks as $addressbook}} <div id="addressbook-{{$addressbook.id}}" class="ml-3"> - <div class="form-group"> + <div class="mb-3"> <i class="fa fa-user generic-icons"></i><a href="/cdav/addressbook/{{$addressbook.id}}">{{$addressbook.displayname}}</a> - <div class="float-right"> + <div class="float-end"> <i id="edit-icon" class="fa fa-pencil fakelink generic-icons" onclick="openClose('edit-addressbook-{{$addressbook.id}}')"></i> <a href="/cdav/addressbooks/{{$addressbook.ownernick}}/{{$addressbook.uri}}/?export"><i id="download-icon" class="fa fa-cloud-download fakelink generic-icons"></i></a> <a href="#" onclick="dropItem('/cdav/addressbook/drop/{{$addressbook.id}}', '#addressbook-{{$addressbook.id}}'); return false;"><i class="fa fa-trash-o drop-icons"></i></a> @@ -13,11 +13,11 @@ <div id="edit-addressbook-{{$addressbook.id}}" class="sub-menu" style="display: none;"> <form id="edit-addressbook-{{$addressbook.id}}" method="post" action=""> <label for="edit-{{$addressbook.id}}">{{$edit_label}}</label> - <div id="edit-form-{{$addressbook.id}}" class="form-group"> + <div id="edit-form-{{$addressbook.id}}" class="mb-3"> <input id="id-{{$addressbook.id}}" name="id" type="hidden" value="{{$addressbook.id}}"> <input id="edit-{{$addressbook.id}}" name="{DAV:}displayname" type="text" value="{{$addressbook.displayname}}" class="form-control"> </div> - <div class="form-group"> + <div class="mb-3"> <button type="submit" name="edit" value="edit" class="btn btn-primary btn-sm">{{$edit}}</button> </div> </form> @@ -35,8 +35,8 @@ <div id="create-addressbook" class="sub-menu-wrapper"> <div class="sub-menu"> <form method="post" action=""> - <div class="form-group"> - <input id="create" name="{DAV:}displayname" type="text" placeholder="{{$create_placeholder}}" class="form-control form-group"> + <div class="mb-3"> + <input id="create" name="{DAV:}displayname" type="text" placeholder="{{$create_placeholder}}" class="form-control mb-3"> <button type="submit" name="create" value="create" class="btn btn-primary btn-sm">{{$create}}</button> </div> </form> @@ -48,7 +48,7 @@ <div id="upload-form" class="sub-menu-wrapper"> <div class="sub-menu"> <form enctype="multipart/form-data" method="post" action=""> - <div class="form-group"> + <div class="mb-3"> <select id="import" name="target" class="form-control"> <option value="">{{$import_placeholder}}</option> {{foreach $addressbooks as $addressbook}} @@ -56,7 +56,7 @@ {{/foreach}} </select> </div> - <div class="form-group"> + <div class="mb-3"> <input class="form-control-file w-100" id="addressbook-upload-choose" type="file" name="userfile" /> </div> <button class="btn btn-primary btn-sm" type="submit" name="a_upload" value="a_upload">{{$upload}}</button> diff --git a/view/tpl/cdav_widget_calendar.tpl b/view/tpl/cdav_widget_calendar.tpl index 93ff50fd3..c27f4789e 100644 --- a/view/tpl/cdav_widget_calendar.tpl +++ b/view/tpl/cdav_widget_calendar.tpl @@ -2,9 +2,9 @@ <h3>{{$channel_calendars_label}}</h3> {{foreach $channel_calendars as $channel_calendar}} <div id="calendar-{{$channel_calendar.calendarid}}"> - <div class="ml-3{{if !$channel_calendar@last}} form-group{{/if}}"> + <div class="ml-3{{if !$channel_calendar@last}} mb-3{{/if}}"> <i id="calendar-btn-{{$channel_calendar.calendarid}}" class="fa {{if $channel_calendar.switch}}fa-calendar-check-o{{else}}fa-calendar-o{{/if}} generic-icons fakelink" onclick="add_remove_json_source('{{$channel_calendar.json_source}}', '{{$channel_calendar.color}}', {{$channel_calendar.editable}})" style="color: {{$channel_calendar.color}};"></i>{{$channel_calendar.displayname}} - <div class="float-right"> + <div class="float-end"> <a href="#" onclick="exportDate(); return false;"><i id="download-icon" class="fa fa-cloud-download fakelink generic-icons-right"></i></a> </div> </div> @@ -17,9 +17,9 @@ <h3>{{$my_calendars_label}}</h3> {{foreach $my_calendars as $calendar}} <div id="calendar-{{$calendar.calendarid}}"> - <div class="ml-3{{if !$calendar@last}} form-group{{/if}}"> + <div class="ml-3{{if !$calendar@last}} mb-3{{/if}}"> <i id="calendar-btn-{{$calendar.calendarid}}" class="fa {{if $calendar.switch}}fa-calendar-check-o{{else}}fa-calendar-o{{/if}} generic-icons fakelink" onclick="add_remove_json_source('{{$calendar.json_source}}', '{{$calendar.color}}', {{$calendar.editable}})" style="color: {{$calendar.color}};"></i>{{$calendar.displayname}} - <div class="float-right"> + <div class="float-end"> <i id="edit-icon" class="fa fa-pencil fakelink generic-icons" onclick="openClose('edit-calendar-{{$calendar.calendarid}}')"></i> <a href="/cdav/calendars/{{$calendar.ownernick}}/{{$calendar.uri}}/?export"><i id="download-icon" class="fa fa-cloud-download fakelink generic-icons"></i></a> <i id="share-icon" class="fa fa-share-alt fakelink generic-icons" onclick="openClose('share-calendar-{{$calendar.calendarid}}')"></i> @@ -28,9 +28,9 @@ <div id="share-calendar-{{$calendar.calendarid}}" class="sub-menu" style="display: none; border-color: {{$calendar.color}};"> {{if $calendar.sharees}} {{foreach $calendar.sharees as $sharee}} - <div id="sharee-{{$calendar.calendarid}}-{{$sharee@iteration}}" class="form-group"> + <div id="sharee-{{$calendar.calendarid}}-{{$sharee@iteration}}" class="mb-3"> <i class="fa fa-share generic-icons"></i>{{$sharee.name}} {{$sharee.access}} - <div class="pull-right"> + <div class="float-end"> <a href="#" onclick="dropItem('/cdav/calendar/dropsharee/{{$calendar.calendarid}}/{{$calendar.instanceid}}/{{$sharee.hash}}', '#sharee-{{$calendar.calendarid}}-{{$sharee@iteration}}'); return false;"><i class="fa fa-trash-o drop-icons"></i></a> </div> </div> @@ -40,17 +40,17 @@ <label for="share-{{$calendar.calendarid}}">{{$share_label}}</label> <input name="calendarid" type="hidden" value="{{$calendar.calendarid}}"> <input name="instanceid" type="hidden" value="{{$calendar.instanceid}}"> - <div class="form-group"> + <div class="mb-3"> <select id="share-{{$calendar.calendarid}}" name="sharee" class="form-control"> {{$sharee_options}} </select> </div> - <div class="form-group"> + <div class="mb-3"> <select name="access" class="form-control"> {{$access_options}} </select> </div> - <div class="form-group"> + <div class="mb-3"> <button type="submit" name="share" value="share" class="btn btn-primary btn-sm">{{$share}}</button> </div> </form> @@ -60,13 +60,11 @@ <input id="id-{{$calendar.calendarid}}" name="id" type="hidden" value="{{$calendar.calendarid}}:{{$calendar.instanceid}}"> <input id="color-{{$calendar.calendarid}}" name="color" type="hidden" value="{{$calendar.color}}" class="color-edit-input"> <label for="edit-form-{{$calendar.calendarid}}">{{$edit_label}}</label> - <div id="edit-form-{{$calendar.calendarid}}" class="input-group form-group"> + <div id="edit-form-{{$calendar.calendarid}}" class="input-group mb-3"> <input id="create-{{$calendar.calendarid}}" name="{DAV:}displayname" type="text" value="{{$calendar.displayname}}" class="form-control"> - <div class="input-group-append"> - <div class="input-group-addon p-3"></div> - </div> + <div class="input-group-addon p-3"></div> </div> - <div class="form-group"> + <div class="mb-3"> <button type="submit" name="edit" value="edit" class="btn btn-primary btn-sm">{{$edit}}</button> </div> </form> @@ -81,9 +79,9 @@ <div class="widget"> <h3>{{$shared_calendars_label}}</h3> {{foreach $shared_calendars as $calendar}} - <div id="shared-calendar-{{$calendar.calendarid}}" class="ml-3{{if !$calendar@last}} form-group{{/if}}"> + <div id="shared-calendar-{{$calendar.calendarid}}" class="ml-3{{if !$calendar@last}} mb-3{{/if}}"> <i id="calendar-btn-{{$calendar.calendarid}}" class="fa {{if $calendar.switch}}{{if $calendar.access == 'read-write'}}fa-calendar-check-o{{else}}fa-calendar-times-o{{/if}}{{else}}fa-calendar-o{{/if}} generic-icons fakelink" onclick="add_remove_json_source('{{$calendar.json_source}}', '{{$calendar.color}}', {{$calendar.editable}}, {{if $calendar.access == 'read-write'}}'fa-calendar-check-o'{{else}}'fa-calendar-times-o'{{/if}})" style="color: {{$calendar.color}};"></i>{{$calendar.displayname}} ({{$calendar.sharer}}) - <div class="pull-right"> + <div class="float-end"> <a href="/cdav/calendars/{{$calendar.ownernick}}/{{$calendar.uri}}/?export"><i id="download-icon" class="fa fa-cloud-download fakelink generic-icons"></i></a> <a href="#" onclick="var drop = dropItem('/cdav/calendar/drop/{{$calendar.calendarid}}/{{$calendar.instanceid}}', '#shared-calendar-{{$calendar.calendarid}}'); if(drop) { add_remove_json_source('{{$calendar.json_source}}', '{{$calendar.color}}', {{$calendar.editable}}, 'drop'); } return false;"><i class="fa fa-trash-o drop-icons"></i></a> </div> @@ -102,13 +100,11 @@ <div class="sub-menu"> <form method="post" action="" class="colorpicker-component color-edit"> <input id="color" name="color" type="hidden" value="#ff8f00" class="color-edit-input"> - <div id="create-form" class="input-group form-group"> + <div id="create-form" class="input-group mb-3"> <input id="create" name="{DAV:}displayname" type="text" placeholder="{{$create_placeholder}}" class="form-control"> - <div class="input-group-append"> - <div class="input-group-addon p-3"></div> - </div> + <div class="input-group-addon p-3"></div> </div> - <div class="form-group"> + <div class="mb-3"> <button type="submit" name="create" value="create" class="btn btn-primary btn-sm">{{$create}}</button> </div> </form> @@ -120,7 +116,7 @@ <div id="upload-form" class="sub-menu-wrapper"> <div class="sub-menu"> <form enctype="multipart/form-data" method="post" action=""> - <div class="form-group"> + <div class="mb-3"> <select id="import" name="target" class="form-control"> <option value="">{{$import_placeholder}}</option> <optgroup label="{{$tools_options_label.0}}"> @@ -131,7 +127,7 @@ {{/foreach}} </select> </div> - <div class="form-group"> + <div class="mb-3"> <input class="form-control-file w-100" id="event-upload-choose" type="file" name="userfile" /> </div> <button class="btn btn-primary btn-sm" type="submit" name="c_upload" value="c_upload">{{$upload}}</button> diff --git a/view/tpl/channel.tpl b/view/tpl/channel.tpl index 0ff52831d..04278fbf4 100644 --- a/view/tpl/channel.tpl +++ b/view/tpl/channel.tpl @@ -1,5 +1,5 @@ <div class="section-subtitle-wrapper"> - <div class="pull-right"> + <div class="float-end"> {{if $channel.default_links}} {{if $channel.default}} <div> diff --git a/view/tpl/channel_rename.tpl b/view/tpl/channel_rename.tpl index 9948dc647..6df416a44 100644 --- a/view/tpl/channel_rename.tpl +++ b/view/tpl/channel_rename.tpl @@ -8,7 +8,7 @@ <div class="section-content-tools-wrapper"> <form action="{{$basedir}}/changeaddr" autocomplete="off" method="post" > <input type="hidden" name="verify" value="{{$hash}}" /> - <div class="form-group" id="rename-channel-pass-wrapper"> + <div class="mb-3" id="rename-channel-pass-wrapper"> <label id="rename-channel-pass-label" for="rename-channel-pass">{{$passwd}}</label> <input class="form-control" type="password" id="rename-channel-pass" autocomplete="off" name="qxz_password" value=" " /> </div> diff --git a/view/tpl/channels.tpl b/view/tpl/channels.tpl index 695b3b30f..60bc85933 100644 --- a/view/tpl/channels.tpl +++ b/view/tpl/channels.tpl @@ -1,6 +1,6 @@ <div class="generic-content-wrapper"> <div class="section-title-wrapper"> - <a class="btn btn-success btn-sm pull-right" href="{{$create.0}}" title="{{$create.1}}"><i class="fa fa-plus-circle"></i> {{$create.2}}</a> + <a class="btn btn-success btn-sm float-end" href="{{$create.0}}" title="{{$create.1}}"><i class="fa fa-plus-circle"></i> {{$create.2}}</a> <h2>{{$header}}</h2> </div> <div class="section-content-wrapper-np"> diff --git a/view/tpl/chat.tpl b/view/tpl/chat.tpl index 2f224b3cf..da8da30f2 100644 --- a/view/tpl/chat.tpl +++ b/view/tpl/chat.tpl @@ -1,6 +1,6 @@ <div class="generic-content-wrapper"> <div class="section-title-wrapper"> - <div class="pull-right"> + <div class="float-end"> {{if $is_owner}} <form id="chat-destroy" method="post" action="chat"> <input type="hidden" name="room_name" value="{{$room_name}}" /> @@ -25,14 +25,14 @@ <div id="chatBottomBar" > <form id="chat-form" method="post" action="#"> <input type="hidden" name="room_id" value="{{$room_id}}" /> - <div class="form-group"> + <div class="mb-3"> <textarea id="chatText" name="chat_text" class="form-control"></textarea> </div> <div id="chat-submit-wrapper" class="clearfix"> - <div id="chat-submit" class="dropup pull-right"> - <button class="btn btn-outline-secondary btn-sm dropdown-toggle" type="button" data-toggle="dropdown"><i class="fa fa-cog"></i></button> + <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> @@ -46,7 +46,7 @@ </div> </div> <div id="chat-tools" class="btn-toolbar"> - <div class="btn-group mr-2"> + <div class="btn-group me-2"> <button id="main-editor-bold" class="btn btn-outline-secondary btn-sm" title="{{$bold}}" onclick="inserteditortag('b', 'chatText'); return false;"> <i class="fa fa-bold jot-icons"></i> </button> @@ -63,20 +63,20 @@ <i class="fa fa-terminal jot-icons"></i> </button> </div> - <div class="btn-group mr-2 d-none d-md-flex"> + <div class="btn-group me-2 d-none d-md-flex"> <button id="chat-link-wrapper" class="btn btn-outline-secondary btn-sm" onclick="chatJotGetLink(); return false;" > <i id="chat-link" class="fa fa-link jot-icons" title="{{$insert}}" ></i> </button> </div> {{if $feature_encrypt}} - <div class="btn-group mr-2 d-none d-md-flex"> + <div class="btn-group me-2 d-none d-md-flex"> <button id="chat-encrypt-wrapper" class="btn btn-outline-secondary btn-sm" onclick="hz_encrypt('{{$cipher}}', '#chatText'); return false;"> <i id="chat-encrypt" class="fa fa-key jot-icons" title="{{$encrypt}}" ></i> </button> </div> {{/if}} <div class="btn-group dropup d-md-none"> - <button type="button" id="more-tools" class="btn btn-outline-secondary btn-sm dropdown-toggle" data-toggle="dropdown" aria-expanded="false"> + <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"> diff --git a/view/tpl/chatroom_new.tpl b/view/tpl/chatroom_new.tpl index 1497939f6..2977563f9 100644 --- a/view/tpl/chatroom_new.tpl +++ b/view/tpl/chatroom_new.tpl @@ -2,8 +2,8 @@ <form id="chatroom-new-form" action="chat" method="post" class="acl-form" data-form_id="chatroom-new-form" data-allow_cid='{{$allow_cid}}' data-allow_gid='{{$allow_gid}}' data-deny_cid='{{$deny_cid}}' data-deny_gid='{{$deny_gid}}'> {{include file="field_input.tpl" field=$name}} {{include file="field_input.tpl" field=$chat_expire}} - <div class="btn-group pull-right"> - <button id="dbtn-acl" class="btn btn-outline-secondary" data-toggle="modal" data-target="#aclModal" title="{{$permissions}}" onclick="return false;" ><i id="jot-perms-icon" class="fa fa-{{$lockstate}}"></i></button> + <div class="btn-group float-end"> + <button id="dbtn-acl" class="btn btn-outline-secondary" data-bs-toggle="modal" data-bs-target="#aclModal" title="{{$permissions}}" onclick="return false;" ><i id="jot-perms-icon" class="fa fa-{{$lockstate}}"></i></button> <button id="dbtn-submit" class="acl-submit btn btn-primary" type="submit" name="submit" value="{{$submit}}" data-formid="chatroom-new-form">{{$submit}}</button> </div> <div class="clear"></div> diff --git a/view/tpl/chatroomlist.tpl b/view/tpl/chatroomlist.tpl index a81b8ec1e..2825a3f9e 100644 --- a/view/tpl/chatroomlist.tpl +++ b/view/tpl/chatroomlist.tpl @@ -3,7 +3,7 @@ <ul class="nav nav-pills flex-column"> <li class="nav-item"><a class="nav-link" href="{{$baseurl}}/chat/{{$nickname}}">{{$overview}}</a></li> {{foreach $items as $item}} - <li class="nav-item"><a class="nav-link" href="{{$baseurl}}/chat/{{$nickname}}/{{$item.cr_id}}"><span class="badge pull-right">{{$item.cr_inroom}}</span>{{$item.cr_name}}</a></li> + <li class="nav-item"><a class="nav-link" href="{{$baseurl}}/chat/{{$nickname}}/{{$item.cr_id}}"><span class="badge bg-secondary float-end">{{$item.cr_inroom}}</span>{{$item.cr_name}}</a></li> {{/foreach}} </ul> </div> diff --git a/view/tpl/chatrooms.tpl b/view/tpl/chatrooms.tpl index 0e6847608..88c42882c 100644 --- a/view/tpl/chatrooms.tpl +++ b/view/tpl/chatrooms.tpl @@ -1,7 +1,7 @@ <div class="generic-content-wrapper"> <div class="section-title-wrapper clearfix"> {{if $is_owner}} - <button type="button" class="btn btn-success btn-sm pull-right acl-form-trigger" onclick="openClose('chatroom-new');" data-form_id="chatroom-new-form"><i class="fa fa-plus-circle"></i> {{$newroom}}</button> + <button type="button" class="btn btn-success btn-sm float-end acl-form-trigger" onclick="openClose('chatroom-new');" data-form_id="chatroom-new-form"><i class="fa fa-plus-circle"></i> {{$newroom}}</button> {{/if}} <h2>{{$header}}</h2> </div> @@ -21,13 +21,13 @@ <tr class="chatroom-index-row"> <td><a href="{{$baseurl}}/chat/{{$nickname}}/{{$room.cr_id}}">{{$room.cr_name}}</a></td> <td>{{$room.cr_expire}} min</td> - <td class="chatrooms-index-tool{{if $room.allow_cid || $room.allow_gid || $room.deny_cid || $room.deny_gid}} dropdown float-right{{/if}}"> + <td class="chatrooms-index-tool{{if $room.allow_cid || $room.allow_gid || $room.deny_cid || $room.deny_gid}} dropdown float-end{{/if}}"> {{if $room.allow_cid || $room.allow_gid || $room.deny_cid || $room.deny_gid}} - <i class="fa fa-lock lockview" data-toggle="dropdown" onclick="lockview('chatroom',{{$room.cr_id}});"></i> + <i class="fa fa-lock lockview" data-bs-toggle="dropdown" onclick="lockview('chatroom',{{$room.cr_id}});"></i> <ul id="panel-{{$room.cr_id}}" class="lockview-panel dropdown-menu"></ul> {{/if}} </td> - <td><span class="badge badge-secondary">{{$room.cr_inroom}}</span></td> + <td><span class="badge bg-secondary">{{$room.cr_inroom}}</span></td> </tr> {{/foreach}} </table> diff --git a/view/tpl/cloud_actionspanel.tpl b/view/tpl/cloud_actionspanel.tpl index 8cab175ff..53e509a83 100644 --- a/view/tpl/cloud_actionspanel.tpl +++ b/view/tpl/cloud_actionspanel.tpl @@ -6,15 +6,15 @@ <input type="hidden" name="folder" value="{{$folder}}" /> <input type="hidden" name="channick" value="{{$channick}}" /> <input type="hidden" name="return_url" value="{{$return_url}}" /> - <input id="files-mkdir" type="text" name="filename" class="form-control form-group"> - <div class="pull-right btn-group"> + <input id="files-mkdir" type="text" name="filename" class="form-control mb-3"> + <div class="float-end btn-group"> <div class="btn-group"> {{if $lockstate}} - <button class="btn btn-outline-secondary btn-sm" data-toggle="modal" data-target="#aclModal" type="button"> + <button class="btn btn-outline-secondary btn-sm" data-bs-toggle="modal" data-bs-target="#aclModal" type="button"> <i class="jot-perms-icon fa fa-{{$lockstate}}"></i> </button> {{/if}} - <button class="btn btn-primary btn-sm pull-right" type="submit" value="{{$folder_submit}}">{{$folder_submit}}</button> + <button class="btn btn-primary btn-sm float-end" type="submit" value="{{$folder_submit}}">{{$folder_submit}}</button> </div> </div> </form> @@ -33,14 +33,14 @@ <div class="cloud-index attach-drop attach-drop-zone text-center p-4 mb-3" data-folder="{{$folder}}"> <span class="text-muted">{{$drop_area_label}}</span> </div> - <div class="pull-right btn-group"> + <div class="float-end btn-group"> <div class="btn-group"> {{if $lockstate}} - <button class="btn btn-outline-secondary btn-sm" data-toggle="modal" data-target="#aclModal" type="button"> + <button class="btn btn-outline-secondary btn-sm" data-bs-toggle="modal" data-bs-target="#aclModal" type="button"> <i class="jot-perms-icon fa fa-{{$lockstate}}"></i> </button> {{/if}} - <button id="upload-submit" class="btn btn-primary btn-sm pull-right">{{$upload_submit}}</button> + <button id="upload-submit" class="btn btn-primary btn-sm float-end">{{$upload_submit}}</button> </div> </div> </form> diff --git a/view/tpl/cloud_directory.tpl b/view/tpl/cloud_directory.tpl index ac8304b96..b5ac93204 100644 --- a/view/tpl/cloud_directory.tpl +++ b/view/tpl/cloud_directory.tpl @@ -74,10 +74,10 @@ <td colspan="3"> {{if $is_owner}} <div class="dropdown"> - <button class="btn btn-warning btn-sm" id="multi-dropdown-button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> + <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}} @@ -89,10 +89,10 @@ </div> {{else if $is_admin}} <div class="dropdown"> - <button class="btn btn-warning btn-sm" id="multi-dropdown-button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> + <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> @@ -116,13 +116,13 @@ {{if $is_owner}} {{include file="field_checkbox.tpl" field=$recurse}} {{/if}} - <div id="attach-multi-submit" class="form-group"> + <div id="attach-multi-submit" class="mb-3"> <button id="cloud-multi-tool-cancel-btn" class="btn btn-outline-secondary btn-sm cloud-multi-tool-cancel-btn" type="button"> {{$cancel_label}} </button> - <div id="attach-multi-edit-perms" class="btn-group float-right"> + <div id="attach-multi-edit-perms" class="btn-group float-end"> {{if $is_owner}} - <button id="multi-dbtn-acl" class="btn btn-outline-secondary btn-sm" data-toggle="modal" data-target="#aclModal" title="{{$permset}}" type="button"> + <button id="multi-dbtn-acl" class="btn btn-outline-secondary btn-sm" data-bs-toggle="modal" data-bs-target="#aclModal" title="{{$permset}}" type="button"> <i id="multi-jot-perms-icon" class="fa fa-{{$lockstate}} jot-icons jot-perms-icon"></i> </button> {{/if}} @@ -151,17 +151,17 @@ <td>{{$item.terms}}</td> <td class="cloud-index-tool p-2"> {{if $item.lockstate == 'lock'}} - <i class="fa fa-lock lockview" data-toggle="dropdown" onclick="lockview('attach',{{$item.attach_id}});"></i> - <ul id="panel-{{$item.attach_id}}" class="lockview-panel dropdown-menu dropdown-menu-right"></ul> + <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-end"></ul> {{/if}} </td> <td class="cloud-index-tool"> {{if ($is_owner || $item.is_creator) && $item.attach_id}} <div class="dropdown"> - <button class="btn btn-link btn-sm" id="dropdown-button-{{$item.attach_id}}" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> + <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> @@ -183,10 +183,10 @@ {{else}} {{if $is_admin || $item.attach_id}} <div class="dropdown"> - <button class="btn btn-link btn-sm" id="dropdown-button-{{$item.attach_id}}" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> + <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}} @@ -214,22 +214,22 @@ </div> <div id="cloud-tool-info-{{$item.attach_id}}" class="cloud-tool"> {{if ! $item.collection}} - <div class="form-group"> + <div class="mb-3"> <label for="attach-code-input-{{$item.attach_id}}">{{$attach_bbcode_label}}</label> <input type="text" class="form-control" id="attach-code-input-{{$item.attach_id}}" name="attach-code-input-{{$item.attach_id}}" value="{{$item.attach_bbcode}}" onclick="this.select();" /> </div> {{if $item.embed_bbcode}} - <div class="form-group"> + <div class="mb-3"> <label for="embed-code-input-{{$item.attach_id}}">{{$embed_bbcode_label}}</label> <input type="text" class="form-control" id="embed-code-input-{{$item.attach_id}}" name="embed-code-input-{{$item.attach_id}}" value="{{$item.embed_bbcode}}" onclick="this.select();" /> </div> {{/if}} {{/if}} - <div class="form-group"> + <div class="mb-3"> <label for="link-code-input-{{$item.attach_id}}">{{$link_bbcode_label}}</label> <input type="text" class="form-control" id="link-code-input-{{$item.attach_id}}" name="link-code-input-{{$item.attach_id}}" value="{{$item.link_bbcode}}" onclick="this.select();" /> </div> - <div class="form-group"> + <div class="mb-3"> <button id="cloud-tool-close-btn-{{$item.attach_id}}" class="btn btn-outline-secondary btn-sm cloud-tool-cancel-btn" type="button" data-id="{{$item.attach_id}}"> {{$close_label}} </button> @@ -247,13 +247,13 @@ {{if !$item.collection}}{{include file="field_checkbox.tpl" field=$item.notify}}{{/if}} {{if $item.collection}}{{include file="field_checkbox.tpl" field=$item.recurse}}{{/if}} {{/if}} - <div id="attach-submit-{{$item.attach_id}}" class="form-group"> + <div id="attach-submit-{{$item.attach_id}}" class="mb-3"> <button id="cloud-tool-cancel-btn-{{$item.attach_id}}" class="btn btn-outline-secondary btn-sm cloud-tool-cancel-btn" type="button" data-id="{{$item.attach_id}}"> {{$cancel_label}} </button> - <div id="attach-edit-perms-{{$item.attach_id}}" class="btn-group float-right"> + <div id="attach-edit-perms-{{$item.attach_id}}" class="btn-group float-end"> {{if $is_owner}} - <button id="dbtn-acl-{{$item.attach_id}}" class="btn btn-outline-secondary btn-sm" data-toggle="modal" data-target="#aclModal" title="{{$permset}}" type="button"> + <button id="dbtn-acl-{{$item.attach_id}}" class="btn btn-outline-secondary btn-sm" data-bs-toggle="modal" data-bs-target="#aclModal" title="{{$permset}}" type="button"> <i id="jot-perms-icon-{{$item.attach_id}}" class="fa fa-{{$item.lockstate}} jot-icons jot-perms-icon"></i> </button> {{/if}} diff --git a/view/tpl/cloud_header.tpl b/view/tpl/cloud_header.tpl index 285363a12..48ada325f 100644 --- a/view/tpl/cloud_header.tpl +++ b/view/tpl/cloud_header.tpl @@ -1,5 +1,5 @@ <div class="section-title-wrapper"> - <div class="pull-right"> + <div class="float-end"> <a href="cloud_tiles/{{$cpath}}" class="btn btn-sm btn-outline-secondary"><i class="fa fa-fw {{if $tiles}}fa-th-list{{else}}fa-th-large{{/if}}"></i></a> {{if $actionspanel}} {{if $is_owner}} diff --git a/view/tpl/comment_item.tpl b/view/tpl/comment_item.tpl index 0b2ef1a1c..d34eec7f8 100644 --- a/view/tpl/comment_item.tpl +++ b/view/tpl/comment_item.tpl @@ -20,8 +20,8 @@ {{/if}} <textarea id="comment-edit-text-{{$id}}" class="comment-edit-text" placeholder="{{$comment}}" name="body" ondragenter="linkdropper(event);" ondragleave="linkdropexit(event);" ondragover="linkdropper(event);" ondrop="linkdrop(event);" ></textarea> <div id="comment-tools-{{$id}}" class="pt-2 comment-tools"> - <div id="comment-edit-bb-{{$id}}" class="btn-toolbar pull-left"> - <div class="btn-group mr-2"> + <div id="comment-edit-bb-{{$id}}" class="btn-toolbar float-start"> + <div class="btn-group me-2"> <button class="btn btn-outline-secondary btn-sm" title="{{$edbold}}" onclick="insertbbcomment('{{$comment}}','b', {{$id}}); return false;"> <i class="fa fa-bold comment-icon"></i> </button> @@ -38,7 +38,7 @@ <i class="fa fa-terminal comment-icon"></i> </button> </div> - <div class="btn-group mr-2"> + <div class="btn-group me-2"> {{if $can_upload}} <button class="btn btn-outline-secondary btn-sm" title="{{$edatt}}" onclick="insertCommentAttach('{{$comment}}',{{$id}}); return false;"> <i class="fa fa-paperclip comment-icon"></i> @@ -49,7 +49,7 @@ </button> </div> {{if $feature_encrypt}} - <div class="btn-group mr-2"> + <div class="btn-group me-2"> <button class="btn btn-outline-secondary btn-sm" title="{{$encrypt}}" onclick="hz_encrypt('{{$cipher}}','#comment-edit-text-' + '{{$id}}'); return false;"> <i class="fa fa-key comment-icon"></i> </button> @@ -57,7 +57,7 @@ {{/if}} {{$comment_buttons}} </div> - <div class="btn-group float-right" id="comment-edit-submit-wrapper-{{$id}}"> + <div class="btn-group float-end" id="comment-edit-submit-wrapper-{{$id}}"> {{if $preview}} <button id="comment-edit-presubmit-{{$id}}" class="btn btn-outline-secondary btn-sm" onclick="preview_comment({{$id}}); return false;" title="{{$preview}}"> <i class="fa fa-eye comment-icon" ></i> diff --git a/view/tpl/common_friends.tpl b/view/tpl/common_friends.tpl index b99075210..e772780da 100644 --- a/view/tpl/common_friends.tpl +++ b/view/tpl/common_friends.tpl @@ -4,7 +4,7 @@ </div> <div class="section-content-wrapper clearfix"> {{foreach $items as $item}} - <div class="float-left mr-4"> + <div class="float-start mr-4"> <a href="{{$item.url}}"> <img class="contact-block-img" src="{{$item.photo}}" alt="{{$item.name}}" title="{{$item.name}} [{{$item.url}}]" /> </a> diff --git a/view/tpl/common_tabs.tpl b/view/tpl/common_tabs.tpl index 29c46369b..429cc561d 100644 --- a/view/tpl/common_tabs.tpl +++ b/view/tpl/common_tabs.tpl @@ -6,10 +6,10 @@ </ul> </div> <div class="d-md-none dropdown clearfix" style="position:fixed; right:7px; top:4.5rem; z-index:1020"> - <button type="button" class="btn btn-outline-secondary btn-sm float-right" data-toggle="dropdown"> + <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/connection_template.tpl b/view/tpl/connection_template.tpl index 86a230c7f..e7ab559cb 100644 --- a/view/tpl/connection_template.tpl +++ b/view/tpl/connection_template.tpl @@ -1,6 +1,6 @@ <div id="contact-entry-wrapper-{{$contact.id}}"> <div class="section-subtitle-wrapper clearfix"> - <div class="pull-right"> + <div class="float-end"> {{if $contact.approve && $contact.ignore}} <form action="connedit/{{$contact.id}}" method="post" > <button type="submit" class="btn btn-success btn-sm" name="pending" value="1" title="{{$contact.approve_hover}}"><i class="fa fa-check"></i> {{$contact.approve}}</button> diff --git a/view/tpl/connections.tpl b/view/tpl/connections.tpl index fedcff1e3..f6ee1b1db 100644 --- a/view/tpl/connections.tpl +++ b/view/tpl/connections.tpl @@ -1,13 +1,13 @@ <div class="generic-content-wrapper"> <div class="section-title-wrapper clearfix"> - <div class="dropdown pull-right"> + <div class="dropdown float-end"> <button type="button" class="btn btn-primary btn-sm" onclick="openClose('contacts-search-form'); $('#contacts-search').focus();"> <i class="fa fa-search"></i> {{$label}} </button> - <button type="button" class="btn btn-outline-secondary btn-sm dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" title="{{$sort}}"> + <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}} @@ -17,11 +17,9 @@ </div> <div id="contacts-search-form" class="section-content-tools-wrapper"> <form action="{{$cmd}}" method="get" id="mimimi" name="contacts-search-form"> - <div class="input-group form-group"> + <div class="input-group mb-3"> <input type="text" name="search" id="contacts-search" class="form-control" onfocus="this.select();" value="{{$search}}" placeholder="{{$desc}}" /> - <div class="input-group-append"> - <button id="contacts-search-submit" class="btn btn-sm btn-outline-secondary" type="submit"><i class="fa fa-fw fa-search"></i></button> - </div> + <button id="contacts-search-submit" class="btn btn-sm btn-outline-secondary" type="submit"><i class="fa fa-fw fa-search"></i></button> </div> </form> </div> diff --git a/view/tpl/contact_slider.tpl b/view/tpl/contact_slider.tpl index 0848df673..dfaaa3967 100644 --- a/view/tpl/contact_slider.tpl +++ b/view/tpl/contact_slider.tpl @@ -1,4 +1,4 @@ -<div id="contact-slider" class="slider form-group"><input id="contact-range" type="text" name="fake-closeness" value="{{$val}}" /></div> +<div id="contact-slider" class="slider mb-3"><input id="contact-range" type="text" name="fake-closeness" value="{{$val}}" /></div> <script> $(document).ready(function() { // The slider does not render correct if width is given in % and diff --git a/view/tpl/conv_frame.tpl b/view/tpl/conv_frame.tpl index be74dea39..c28bb732a 100644 --- a/view/tpl/conv_frame.tpl +++ b/view/tpl/conv_frame.tpl @@ -10,7 +10,7 @@ <div class="modal-content"> <div class="modal-header"> <h3 class="modal-title" id="conversation_settings_label">{{$conversation_tools}}</h3> - <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button> + <button type="button" class="btn-close" data-bs-dismiss="modal" aria-hidden="true"></button> </div> <div class="modal-body" id="conversation_settings_body"> {{$wait}} diff --git a/view/tpl/conv_item.tpl b/view/tpl/conv_item.tpl index 2134f86e7..7c3505410 100644 --- a/view/tpl/conv_item.tpl +++ b/view/tpl/conv_item.tpl @@ -28,16 +28,16 @@ {{/if}} <div class="p-2 clearfix wall-item-head{{if !$item.title && !$item.event && !$item.photo}} rounded-top{{/if}}{{if $item.is_new && !$item.event && !$item.is_comment}} wall-item-head-new{{/if}}" > {{if $item.thr_parent}} - <a href="javascript:doscroll('{{$item.thr_parent}}',{{$item.parent}});" title="{{$item.top_hint}}" class="float-right"><i class="fa fa-angle-double-up"> </i></a> + <a href="javascript:doscroll('{{$item.thr_parent}}',{{$item.parent}});" title="{{$item.top_hint}}" class="float-end"><i class="fa fa-angle-double-up"> </i></a> {{/if}} {{if $item.pinned}} - <span class="float-right wall-item-pinned" title="{{$item.pinned}}" id="wall-item-pinned-{{$item.id}}"><i class="fa fa-thumb-tack"> </i></span> + <span class="float-end wall-item-pinned" title="{{$item.pinned}}" id="wall-item-pinned-{{$item.id}}"><i class="fa fa-thumb-tack"> </i></span> {{/if}} <div class="wall-item-info" id="wall-item-info-{{$item.id}}" > <div class="wall-item-photo-wrapper{{if $item.owner_url}} wwfrom{{/if}} h-card p-author" id="wall-item-photo-wrapper-{{$item.id}}"> - <img src="{{$item.thumb}}" class="fakelink wall-item-photo{{$item.sparkle}} u-photo p-name" id="wall-item-photo-{{$item.id}}" alt="{{$item.name}}" loading="lazy" data-toggle="dropdown" /> + <img src="{{$item.thumb}}" class="fakelink wall-item-photo{{$item.sparkle}} u-photo p-name" id="wall-item-photo-{{$item.id}}" alt="{{$item.name}}" loading="lazy" data-bs-toggle="dropdown" /> {{if $item.thread_author_menu}} - <i class="fa fa-caret-down wall-item-photo-caret cursor-pointer" data-toggle="dropdown"></i> + <i class="fa fa-caret-down wall-item-photo-caret cursor-pointer" data-bs-toggle="dropdown"></i> <div class="dropdown-menu"> {{foreach $item.thread_author_menu as $mitem}} <a class="dropdown-item" {{if $mitem.href}}href="{{$mitem.href}}"{{/if}} {{if $mitem.action}}onclick="{{$mitem.action}}"{{/if}} {{if $mitem.title}}title="{{$mitem.title}}"{{/if}} >{{$mitem.title}}</a> @@ -48,7 +48,7 @@ </div> {{if $item.lock}} <div class="wall-item-lock dropdown"> - <i class="fa {{if $item.locktype == 2}}fa-envelope-o{{else}}fa-lock{{/if}} lockview{{if $item.privacy_warning}} text-danger{{/if}}" data-toggle="dropdown" title="{{$item.lock}}" onclick="lockview('item',{{$item.id}});" ></i> + <i class="fa {{if $item.locktype == 2}}fa-envelope-o{{else}}fa-lock{{/if}} lockview{{if $item.privacy_warning}} text-danger{{/if}}" data-bs-toggle="dropdown" title="{{$item.lock}}" onclick="lockview('item',{{$item.id}});" ></i> <div id="panel-{{$item.id}}" class="dropdown-menu"></div> </div> {{/if}} @@ -78,7 +78,7 @@ </div> {{/if}} <div class="p-2 clearfix wall-item-tools"> - <div class="float-right wall-item-tools-right"> + <div class="float-end wall-item-tools-right"> <div class="btn-group"> <div id="like-rotator-{{$item.id}}" class="spinner-wrapper"> <div class="spinner s"></div> @@ -86,10 +86,10 @@ </div> {{if $item.toplevel && $item.emojis && $item.reactions}} <div class="btn-group"> - <button type="button" class="btn btn-outline-secondary btn-sm dropdown-toggle" data-toggle="dropdown" id="wall-item-react-{{$item.id}}"> + <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}} @@ -114,10 +114,10 @@ {{/if}} {{if $item.isevent}} <div class="btn-group"> - <button type="button" class="btn btn-outline-secondary btn-sm dropdown-toggle" data-toggle="dropdown" id="wall-item-attend-menu-{{$item.id}}" title="{{$item.attend_title}}"> + <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> @@ -132,10 +132,10 @@ {{/if}} {{if $item.canvote}} <div class="btn-group"> - <button type="button" class="btn btn-outline-secondary btn-sm dropdown-toggle" data-toggle="dropdown" id="wall-item-consensus-menu-{{$item.id}}" title="{{$item.vote_title}}"> + <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> @@ -149,10 +149,10 @@ </div> {{/if}} <div class="btn-group"> - <button type="button" class="btn btn-outline-secondary btn-sm dropdown-toggle" data-toggle="dropdown" id="wall-item-menu-{{$item.id}}"> + <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}} @@ -201,7 +201,7 @@ {{/if}} {{if $item.settings}} <div class="dropdown-divider"></div> - <a class="dropdown-item conversation-settings-link" href="" data-toggle="modal" data-target="#conversation_settings">{{$item.settings}}</a> + <a class="dropdown-item conversation-settings-link" href="" data-bs-toggle="modal" data-bs-target="#conversation_settings">{{$item.settings}}</a> {{/if}} </div> </div> @@ -217,27 +217,27 @@ {{/if}} {{if $item.attachments}} <div class="btn-group"> - <button type="button" class="btn btn-outline-secondary btn-sm wall-item-like dropdown-toggle" data-toggle="dropdown" id="attachment-menu-{{$item.id}}"><i class="fa fa-paperclip"></i></button> + <button type="button" class="btn btn-outline-secondary btn-sm wall-item-like dropdown-toggle" data-bs-toggle="dropdown" id="attachment-menu-{{$item.id}}"><i class="fa fa-paperclip"></i></button> <div class="dropdown-menu">{{$item.attachments}}</div> </div> {{/if}} {{foreach $item.responses as $verb=>$response}} {{if $response.count}} <div class="btn-group"> - <button type="button" class="btn btn-outline-secondary btn-sm wall-item-like dropdown-toggle"{{if $response.modal}} data-toggle="modal" data-target="#{{$verb}}Modal-{{$item.id}}"{{else}} data-toggle="dropdown"{{/if}} id="wall-item-{{$verb}}-{{$item.id}}">{{$response.count}} {{$response.button}}</button> + <button type="button" class="btn btn-outline-secondary btn-sm wall-item-like dropdown-toggle"{{if $response.modal}} data-bs-toggle="modal" data-bs-target="#{{$verb}}Modal-{{$item.id}}"{{else}} data-bs-toggle="dropdown"{{/if}} id="wall-item-{{$verb}}-{{$item.id}}">{{$response.count}} {{$response.button}}</button> {{if $response.modal}} <div class="modal" id="{{$verb}}Modal-{{$item.id}}"> <div class="modal-dialog"> <div class="modal-content"> <div class="modal-header"> <h3 class="modal-title">{{$response.count}} {{$response.button}}</h3> - <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button> + <button type="button" class="btn-close" data-bs-dismiss="modal" aria-hidden="true"></button> </div> <div class="modal-body response-list"> <ul class="nav nav-pills flex-column">{{foreach $response.list as $liker}}<li class="nav-item">{{$liker}}</li>{{/foreach}}</ul> </div> <div class="modal-footer clear"> - <button type="button" class="btn btn-outline-secondary" data-dismiss="modal">{{$item.modal_dismiss}}</button> + <button type="button" class="btn btn-outline-secondary" data-bs-dismiss="modal">{{$item.modal_dismiss}}</button> </div> </div><!-- /.modal-content --> </div><!-- /.modal-dialog --> diff --git a/view/tpl/conv_list.tpl b/view/tpl/conv_list.tpl index af6cc0557..a20a6de8d 100644 --- a/view/tpl/conv_list.tpl +++ b/view/tpl/conv_list.tpl @@ -29,9 +29,9 @@ <div class="p-2 clearfix wall-item-head{{if !$item.title && !$item.event && !$item.photo}} rounded-top{{/if}}{{if $item.is_new && !$item.event && !$item.is_comment}} wall-item-head-new{{/if}}"> <div class="wall-item-info" id="wall-item-info-{{$item.id}}" > <div class="wall-item-photo-wrapper{{if $item.owner_url}} wwfrom{{/if}} h-card p-author" id="wall-item-photo-wrapper-{{$item.id}}"> - <img src="{{$item.thumb}}" class="fakelink wall-item-photo{{$item.sparkle}} u-photo p-name" id="wall-item-photo-{{$item.id}}" alt="{{$item.name}}" data-toggle="dropdown" loading="lazy" /></a> + <img src="{{$item.thumb}}" class="fakelink wall-item-photo{{$item.sparkle}} u-photo p-name" id="wall-item-photo-{{$item.id}}" alt="{{$item.name}}" data-bs-toggle="dropdown" loading="lazy" /></a> {{if $item.thread_author_menu}} - <i class="fa fa-caret-down wall-item-photo-caret cursor-pointer" data-toggle="dropdown"></i> + <i class="fa fa-caret-down wall-item-photo-caret cursor-pointer" data-bs-toggle="dropdown"></i> <div class="dropdown-menu"> {{foreach $item.thread_author_menu as $mitem}} <a class="dropdown-item" {{if $mitem.href}}href="{{$mitem.href}}"{{/if}} {{if $mitem.action}}onclick="{{$mitem.action}}"{{/if}} {{if $mitem.title}}title="{{$mitem.title}}"{{/if}} >{{$mitem.title}}</a> @@ -43,7 +43,7 @@ </div> {{if $item.lock}} <div class="wall-item-lock dropdown"> - <i class="fa {{if $item.locktype == 2}}fa-envelope-o{{else}}fa-lock{{/if}} lockview" data-toggle="dropdown" title="{{$item.lock}}" onclick="lockview('item',{{$item.id}});" ></i> + <i class="fa {{if $item.locktype == 2}}fa-envelope-o{{else}}fa-lock{{/if}} lockview" data-bs-toggle="dropdown" title="{{$item.lock}}" onclick="lockview('item',{{$item.id}});" ></i> <div id="panel-{{$item.id}}" class="dropdown-menu"></div> </div> {{/if}} @@ -71,13 +71,13 @@ </div> {{/if}} <div class="p-2 clearfix wall-item-tools"> - <div class="float-right wall-item-tools-right"> + <div class="float-end wall-item-tools-right"> {{if $item.toplevel && $item.emojis && $item.reactions}} <div class="btn-group"> - <button type="button" class="btn btn-outline-secondary btn-sm dropdown-toggle" data-toggle="dropdown" id="wall-item-react-{{$item.id}}"> + <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}} @@ -97,7 +97,7 @@ {{/if}} {{if $item.isevent}} <div class="btn-group"> - <button type="button" class="btn btn-outline-secondary btn-sm dropdown-toggle" data-toggle="dropdown" id="wall-item-attend-menu-{{$item.id}}" title="{{$item.attend_title}}"> + <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"> @@ -115,7 +115,7 @@ {{/if}} {{if $item.canvote}} <div class="btn-group"> - <button type="button" class="btn btn-outline-secondary btn-sm dropdown-toggle" data-toggle="dropdown" id="wall-item-consensus-menu-{{$item.id}}" title="{{$item.vote_title}}"> + <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" role="menu" aria-labelledby="wall-item-consensus-menu-{{$item.id}}"> @@ -132,10 +132,10 @@ </div> {{/if}} <div class="btn-group"> - <button type="button" class="btn btn-outline-secondary btn-sm dropdown-toggle" data-toggle="dropdown" id="wall-item-menu-{{$item.id}}"> + <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}} @@ -192,7 +192,7 @@ {{/if}} {{if $item.attachments}} <div class="btn-group"> - <button type="button" class="btn btn-outline-secondary btn-sm wall-item-like dropdown-toggle" data-toggle="dropdown" id="attachment-menu-{{$item.id}}"><i class="fa fa-paperclip"></i></button> + <button type="button" class="btn btn-outline-secondary btn-sm wall-item-like dropdown-toggle" data-bs-toggle="dropdown" id="attachment-menu-{{$item.id}}"><i class="fa fa-paperclip"></i></button> <ul class="dropdown-menu" role="menu" aria-labelledby="attachment-menu-{{$item.id}}">{{$item.attachments}}</ul> </div> {{/if}} @@ -212,20 +212,20 @@ {{foreach $item.responses as $verb=>$response}} {{if $response.count}} <div class="btn-group"> - <button type="button" class="btn btn-outline-secondary btn-sm wall-item-like dropdown-toggle"{{if $response.modal}} data-toggle="modal" data-target="#{{$verb}}Modal-{{$item.id}}"{{else}} data-toggle="dropdown"{{/if}} id="wall-item-{{$verb}}-{{$item.id}}">{{$response.count}} {{$response.button}}</button> + <button type="button" class="btn btn-outline-secondary btn-sm wall-item-like dropdown-toggle"{{if $response.modal}} data-bs-toggle="modal" data-bs-target="#{{$verb}}Modal-{{$item.id}}"{{else}} data-bs-toggle="dropdown"{{/if}} id="wall-item-{{$verb}}-{{$item.id}}">{{$response.count}} {{$response.button}}</button> {{if $response.modal}} <div class="modal" id="{{$verb}}Modal-{{$item.id}}"> <div class="modal-dialog"> <div class="modal-content"> <div class="modal-header"> <h4 class="modal-title">{{$response.count}} {{$response.button}}</h4> - <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button> + <button type="button" class="btn-close" data-bs-dismiss="modal" aria-hidden="true"></button> </div> <div class="modal-body response-list"> <ul class="nav nav-pills flex-column">{{foreach $response.list as $liker}}<li class="nav-item">{{$liker}}</li>{{/foreach}}</ul> </div> <div class="modal-footer clear"> - <button type="button" class="btn btn-outline-secondary" data-dismiss="modal">{{$item.modal_dismiss}}</button> + <button type="button" class="btn btn-outline-secondary" data-bs-dismiss="modal">{{$item.modal_dismiss}}</button> </div> </div><!-- /.modal-content --> </div><!-- /.modal-dialog --> diff --git a/view/tpl/cover_photo.tpl b/view/tpl/cover_photo.tpl index a1c4a922d..7bc72158b 100644 --- a/view/tpl/cover_photo.tpl +++ b/view/tpl/cover_photo.tpl @@ -121,7 +121,7 @@ <div class="modal-content"> <div class="modal-header"> <h4 class="modal-title" id="embedPhotoModalLabel">{{$embedPhotosModalTitle}}</h4> - <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button> + <button type="button" class="btn-close" data-bs-dismiss="modal" aria-hidden="true"></button> </div> <div class="modal-body" id="embedPhotoModalBody" > <div id="embedPhotoModalBodyAlbumListDialog" class="d-none"> diff --git a/view/tpl/defperms.tpl b/view/tpl/defperms.tpl index 29f642cff..5e15a43c9 100644 --- a/view/tpl/defperms.tpl +++ b/view/tpl/defperms.tpl @@ -17,7 +17,7 @@ <p>{{$permnote_self}}</p> </div> {{if $permcat_enable}} - <a href="permcats" class="pull-right"><i class="fa fa-plus"></i> {{$permcat_new}}</a> + <a href="permcats" class="float-end"><i class="fa fa-plus"></i> {{$permcat_new}}</a> {{include file="field_select.tpl" field=$permcat}} {{/if}} diff --git a/view/tpl/directory_header.tpl b/view/tpl/directory_header.tpl index 568e03cd0..f5ce7ce0a 100644 --- a/view/tpl/directory_header.tpl +++ b/view/tpl/directory_header.tpl @@ -1,10 +1,10 @@ <div class="generic-content-wrapper"> <div class="section-title-wrapper clearfix"> - <div class="btn-group pull-right"> - <button type="button" class="btn btn-outline-secondary btn-sm dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" title="{{$sort}}"> + <div class="btn-group float-end"> + <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> @@ -17,7 +17,7 @@ {{include file="direntry.tpl"}} {{/foreach}} {{** make sure this element is at the bottom - we rely on that in endless scroll **}} - <div id="page-end" class="float-left w-100"></div> + <div id="page-end" class="float-start w-100"></div> </div> <script>$(document).ready(function() { loadingPage = false;});</script> <div id="page-spinner" class="spinner-wrapper"> diff --git a/view/tpl/direntry.tpl b/view/tpl/direntry.tpl index 015f1102d..5a8e19d12 100644 --- a/view/tpl/direntry.tpl +++ b/view/tpl/direntry.tpl @@ -1,6 +1,6 @@ <div class="directory-item{{if $entry.safe}} safe{{/if}}" id="directory-item-{{$entry.hash}}" > <div class="section-subtitle-wrapper clearfix"> - <div class="pull-right"> + <div class="float-end"> {{if $entry.viewrate}} {{if $entry.total_ratings}}<a href="ratings/{{$entry.hash}}" id="dir-rating-{{$entry.hash}}" class="btn btn-outline-secondary btn-sm">{{$entry.total_ratings}}</a>{{/if}} {{/if}} diff --git a/view/tpl/dreport.tpl b/view/tpl/dreport.tpl index 89188891d..87ec1c35f 100644 --- a/view/tpl/dreport.tpl +++ b/view/tpl/dreport.tpl @@ -1,8 +1,8 @@ <div class="generic-content-wrapper"> <div class="section-title-wrapper"> {{if $table == 'item'}} - <div class="dropdown pull-right"> - <button type="button" class="btn btn-outline-secondary btn-sm dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" title="{{$options}}"> + <div class="dropdown float-end"> + <button type="button" class="btn btn-outline-secondary btn-sm dropdown-toggle" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false" title="{{$options}}"> <i class="fa fa-cog"></i> </button> <div class="dropdown-menu"> diff --git a/view/tpl/edpost_head.tpl b/view/tpl/edpost_head.tpl index 4f39137ab..94c882d53 100644 --- a/view/tpl/edpost_head.tpl +++ b/view/tpl/edpost_head.tpl @@ -1,6 +1,6 @@ <div class="generic-content-wrapper"> <div class="section-title-wrapper"> - <div class="pull-right"> + <div class="float-end"> {{if $cancel}} <button id="dbtn-cancel" class="btn btn-warning btn-sm" onclick="itemCancel(); return false;">{{$cancel}}</button> {{/if}} diff --git a/view/tpl/email_validation.tpl b/view/tpl/email_validation.tpl index 9913e0971..e16b47dff 100644 --- a/view/tpl/email_validation.tpl +++ b/view/tpl/email_validation.tpl @@ -5,7 +5,7 @@ <form action="email_validation/{{$email}}" method="post"> {{include file="field_input.tpl" field=$token}} -<div class="pull-right submit-wrapper"> +<div class="float-end submit-wrapper"> <button type="submit" name="submit" class="btn btn-primary">{{$submit}}</button> </div> <div class="resend-email" > diff --git a/view/tpl/event_form.tpl b/view/tpl/event_form.tpl index d07a06b67..c56c5d82f 100644 --- a/view/tpl/event_form.tpl +++ b/view/tpl/event_form.tpl @@ -31,14 +31,14 @@ </div> {{/if}} - <div class="form-group"> - <div class="form-group"> + <div class="mb-3"> + <div class="mb-3"> <div id="event-desc-text"><b>{{$d_text}}</b></div> <textarea id="comment-edit-text-desc" class="form-control" name="desc" >{{$d_orig}}</textarea> </div> <div id="comment-tools-desc" class="comment-tools" style="display: block;" > <div id="comment-edit-bb-desc" class="btn-toolbar"> - <div class='btn-group mr-2'> + <div class='btn-group me-2'> <button type="button" class="btn btn-outline-secondary btn-sm" title="{{$edbold}}" onclick="insertbbcomment('none','b', 'desc');"> <i class="fa fa-bold comment-icon"></i> </button> @@ -69,14 +69,14 @@ </div> </div> </div> - <div class="form-group"> - <div class="form-group"> + <div class="mb-3"> + <div class="mb-3"> <div id="event-location-text"><b>{{$l_text}}</b></div> <textarea id="comment-edit-text-loc" class="form-control" name="location">{{$l_orig}}</textarea> </div> <div id="comment-tools-loc" class="comment-tools" style="display: block;" > <div id="comment-edit-bb-loc" class="btn-toolbar"> - <div class='btn-group mr-2'> + <div class='btn-group me-2'> <button type="button" class="btn btn-outline-secondary btn-sm" title="{{$edbold}}" onclick="insertbbcomment('none','b', 'loc');"> <i class="fa fa-bold comment-icon"></i> </button> @@ -116,10 +116,10 @@ <div class="clear"></div> <button type="button" class="btn btn-outline-secondary btn-sm" onclick="openClose('advanced');">{{$advanced}}</button> - <div class="btn-group float-right"> + <div class="btn-group float-end"> <button id="event-edit-preview-btn" class="btn btn-outline-secondary btn-sm" type="button" title="{{$preview}}" onclick="doEventPreview();"><i class="fa fa-eye" ></i></button> {{if ! $eid}} - <button id="dbtn-acl" class="btn btn-outline-secondary btn-sm" type="button" data-toggle="modal" data-target="#aclModal" title="{{$perms_label}}"><i id="jot-perms-icon" class="fa fa-{{$lockstate}}"></i></button> + <button id="dbtn-acl" class="btn btn-outline-secondary btn-sm" type="button" data-bs-toggle="modal" data-bs-target="#aclModal" title="{{$perms_label}}"><i id="jot-perms-icon" class="fa fa-{{$lockstate}}"></i></button> {{/if}} <button id="event-submit" class="btn btn-primary btn-sm" type="submit" name="submit">{{$submit}}</button> </div> diff --git a/view/tpl/events-js.tpl b/view/tpl/events-js.tpl index d3f3414ff..5aa5b7ef8 100644 --- a/view/tpl/events-js.tpl +++ b/view/tpl/events-js.tpl @@ -1,8 +1,8 @@ <div class="generic-content-wrapper"> <div class="section-title-wrapper"> - <div class="pull-right"> + <div class="float-end"> <div class="dropdown"> - <button type="button" class="btn btn-outline-secondary btn-sm dropdown-toggle" data-toggle="dropdown"><i class="fa fa-cog"></i> {{$view_label}}</button> + <button type="button" class="btn btn-outline-secondary btn-sm dropdown-toggle" data-bs-toggle="dropdown"><i class="fa fa-cog"></i> {{$view_label}}</button> <div class="dropdown-menu"> <a class="dropdown-item" href="#" onclick="changeView('changeView', 'month'); return false;">{{$month}}</a> <a class="dropdown-item" href="#" onclick="changeView('changeView', 'agendaWeek'); return false;">{{$week}}</a> diff --git a/view/tpl/events_cal-js.tpl b/view/tpl/events_cal-js.tpl index 2c4d961f9..a56c8b348 100644 --- a/view/tpl/events_cal-js.tpl +++ b/view/tpl/events_cal-js.tpl @@ -1,7 +1,7 @@ {{$tabs}} <div class="generic-content-wrapper"> <div class="section-title-wrapper"> - <div class="pull-right"> + <div class="float-end"> <div class="btn-group"> <button class="btn btn-outline-secondary btn-sm" onclick="changeView('prev', false);" title="{{$prev}}"><i class="fa fa-backward"></i></button> <button id="today-btn" class="btn btn-outline-secondary btn-sm" onclick="changeView('today', false);" title="{{$today}}"><div id="events-spinner" class="spinner s"></div><i class="fa fa-bullseye" style="display: none; width: 1rem;"></i></button> diff --git a/view/tpl/events_tools_side.tpl b/view/tpl/events_tools_side.tpl index e22f95c1e..bad1038a3 100644 --- a/view/tpl/events_tools_side.tpl +++ b/view/tpl/events_tools_side.tpl @@ -7,7 +7,7 @@ <div id="event-upload-form" class="sub-menu-wrapper"> <div class="sub-menu"> <form action="events" enctype="multipart/form-data" method="post" name="event-upload-form" id="event-upload-form"> - <div class="form-group"> + <div class="mb-3"> <input id="event-upload-choose" class="form-control-file w-100" type="file" name="userfile" /> </div> <button id="dbtn-submit" class="btn btn-primary btn-sm" type="submit" name="submit" >{{$submit}}</button> diff --git a/view/tpl/field_checkbox.tpl b/view/tpl/field_checkbox.tpl index b1665f75f..a1ab42d5e 100644 --- a/view/tpl/field_checkbox.tpl +++ b/view/tpl/field_checkbox.tpl @@ -1,9 +1,9 @@ - <div id="{{$field.0}}_container" class="clearfix form-group checkbox"> + <div id="{{$field.0}}_container" class="clearfix onoffswitch checkbox mb-3"> <label for="id_{{$field.0}}">{{$field.1}}{{if $field.6}}<sup class="required zuiqmid"> {{$field.6}}</sup>{{/if}}</label> - <div class="float-right"><input type="checkbox" name='{{$field.0}}' id='id_{{$field.0}}' value="1" {{if $field.2}}checked="checked"{{/if}} {{if $field.5}}{{$field.5}}{{/if}} /><label class="switchlabel" for='id_{{$field.0}}'> <span class="onoffswitch-inner" data-on='{{if $field.4}}{{$field.4.1}}{{/if}}' data-off='{{if $field.4}}{{$field.4.0}}{{/if}}'></span><span class="onoffswitch-switch"></span></label></div> + <div class="float-end"><input type="checkbox" name='{{$field.0}}' id='id_{{$field.0}}' value="1" {{if $field.2}}checked="checked"{{/if}} {{if $field.5}}{{$field.5}}{{/if}} /><label class="switchlabel" for='id_{{$field.0}}'> <span class="onoffswitch-inner" data-on='{{if $field.4}}{{$field.4.1}}{{/if}}' data-off='{{if $field.4}}{{$field.4.0}}{{/if}}'></span><span class="onoffswitch-switch"></span></label></div> <small class="form-text text-muted">{{$field.3}}</small> </div> -{{* +{{* COMMENTS for this template: @author hilmar runge, 2020.01 $field array index: diff --git a/view/tpl/field_colorinput.tpl b/view/tpl/field_colorinput.tpl index 9b6f33462..f04d70c3e 100644 --- a/view/tpl/field_colorinput.tpl +++ b/view/tpl/field_colorinput.tpl @@ -1,4 +1,4 @@ - <div class='form-group field input color'> + <div class='mb-3 field input color'> <label for='id_{{$field.0}}' id='label_{{$field.0}}'>{{$field.1}}</label> <input class='form-control color' name='{{$field.0}}' id='id_{{$field.0}}' type="text" value="{{$field.2}}">{{if $field.4}} <span class="required">{{$field.4}}</span> {{/if}} <span id='help_{{$field.0}}' class='help-block'>{{$field.3}}</span> diff --git a/view/tpl/field_combobox.tpl b/view/tpl/field_combobox.tpl index 12d00a08d..a3e5ff8e2 100644 --- a/view/tpl/field_combobox.tpl +++ b/view/tpl/field_combobox.tpl @@ -1,4 +1,4 @@ -<div class="form-group"> +<div class="mb-3"> <label class="" for='id_{{$field.0}}' id='id_{{$field.0}}_label'>{{$field.1}}</label> <input class="form-control" id="id_{{$field.0}}" type="text" list="data_{{$field.0}}"{{if $field.5}} {{$field.5}}{{/if}}> <datalist id="data_{{$field.0}}" > diff --git a/view/tpl/field_custom.tpl b/view/tpl/field_custom.tpl index 907b4c50e..c7716a1de 100644 --- a/view/tpl/field_custom.tpl +++ b/view/tpl/field_custom.tpl @@ -1,4 +1,4 @@ - <div class='form-group field custom'> + <div class='mb-3 field custom'> <label for='{{$field.0}}'>{{$field.1}}</label> {{$field.2}} <span class='help-block'>{{$field.3}}</span> diff --git a/view/tpl/field_duration.qmc.tpl b/view/tpl/field_duration.qmc.tpl index e38d4621c..0bc78f2f5 100644 --- a/view/tpl/field_duration.qmc.tpl +++ b/view/tpl/field_duration.qmc.tpl @@ -1,4 +1,4 @@ -{{if $wrapper!="no"}}<div id="{{$qmc}}{{$field.name}}_wrapper" class="form-group">{{/if}} +{{if $wrapper!="no"}}<div id="{{$qmc}}{{$field.name}}_wrapper" class="mb-3">{{/if}} <label for="{{$qmc}}{{$field.name}}fs">{{$label}} {{if $qmcid}}<sup class="zuiqmid required">{{$qmcid}}</sup>{{/if}} diff --git a/view/tpl/field_input.tpl b/view/tpl/field_input.tpl index c7007c159..2f9f83ac5 100644 --- a/view/tpl/field_input.tpl +++ b/view/tpl/field_input.tpl @@ -1,9 +1,9 @@ - <div id="id_{{$field.0}}_wrapper" class="form-group"> + <div id="id_{{$field.0}}_wrapper" class="mb-3"> <label for="id_{{$field.0}}" id="label_{{$field.0}}">{{$field.1}}{{if $field.4}}<sup class="required zuiqmid"> {{$field.4}}</sup>{{/if}}</label> <input class="form-control" name="{{$field.0}}" id="id_{{$field.0}}" type="text" value="{{$field.2}}"{{if $field.5}} {{$field.5}}{{/if}}> <small id="help_{{$field.0}}" class="form-text text-muted">{{$field.3}}</small> </div> -{{* +{{* COMMENTS for this template: @author hilmar runge, 2020.01 $field array index: diff --git a/view/tpl/field_intcheckbox.tpl b/view/tpl/field_intcheckbox.tpl index abfe6e189..7b7b6de8a 100644 --- a/view/tpl/field_intcheckbox.tpl +++ b/view/tpl/field_intcheckbox.tpl @@ -1,5 +1,5 @@ - <div class="clearfix form-group checkbox"> + <div id="{{$field.0}}_container" class="clearfix onoffswitch mb-3 checkbox"> <label for="id_{{$field.0}}">{{$field.1}}</label> - <div class="pull-right"><input type="checkbox" name="{{$field.0}}" id="id_{{$field.0}}" value="{{$field.3}}" {{if $field.2}}checked="checked"{{/if}}><label class="switchlabel" for="id_{{$field.0}}"> <span class="onoffswitch-inner" data-on="{{if $field.5}}{{$field.5.1}}{{/if}}" data-off="{{if $field.5}}{{$field.5.0}}{{/if}}"></span><span class="onoffswitch-switch"></span> </label></div> + <div class="float-end"><input type="checkbox" name="{{$field.0}}" id="id_{{$field.0}}" value="{{$field.3}}" {{if $field.2}}checked="checked"{{/if}}><label class="switchlabel" for="id_{{$field.0}}"> <span class="onoffswitch-inner" data-on="{{if $field.5}}{{$field.5.1}}{{/if}}" data-off="{{if $field.5}}{{$field.5.0}}{{/if}}"></span><span class="onoffswitch-switch"></span> </label></div> <small class="form-text text-muted">{{$field.4}}</small> </div> diff --git a/view/tpl/field_password.tpl b/view/tpl/field_password.tpl index fa5e14582..7baad7d48 100644 --- a/view/tpl/field_password.tpl +++ b/view/tpl/field_password.tpl @@ -1,4 +1,4 @@ - <div class="form-group"> + <div class="mb-3"> <label for="id_{{$field.0}}">{{$field.1}}</label> <input class="form-control" type="password" name="{{$field.0}}" id="id_{{$field.0}}" value="{{$field.2}}"{{if $field.5}} {{$field.5}}{{/if}}>{{if $field.4}} <span class="required">{{$field.4}}</span> {{/if}} <small id="help_{{$field.0}}" class="form-text text-muted">{{$field.3}}</small> diff --git a/view/tpl/field_radio.tpl b/view/tpl/field_radio.tpl index 6b5f52de6..2e4afd426 100644 --- a/view/tpl/field_radio.tpl +++ b/view/tpl/field_radio.tpl @@ -1,4 +1,4 @@ - <div class="form-group field radio"> + <div class="mb-3 field radio"> <label for='id_{{$field.0}}_{{$field.2}}'> <input type="radio" name='{{$field.0}}' id='id_{{$field.0}}_{{$field.2}}' value="{{$field.2}}" {{if $field.4}}checked="true"{{/if}}> {{$field.1}} diff --git a/view/tpl/field_select.tpl b/view/tpl/field_select.tpl index 57be3b1ab..a98a26799 100644 --- a/view/tpl/field_select.tpl +++ b/view/tpl/field_select.tpl @@ -1,4 +1,4 @@ - <div id="id_{{$field.0}}_wrapper" class="form-group"> + <div id="id_{{$field.0}}_wrapper" class="mb-3"> <label for="id_{{$field.0}}">{{$field.1}}{{if $field.5}}<sup class="required zuiqmid"> {{$field.5}}</sup>{{/if}}</label> <select class="form-control" name="{{$field.0}}" id="id_{{$field.0}}"> {{foreach $field.4 as $opt=>$val}}<option value="{{$opt}}" {{if $opt==$field.2}}selected="selected"{{/if}}>{{$val}}</option>{{/foreach}} @@ -17,6 +17,6 @@ .5 label text addition, used for qmc css classes used: .required, .code - .form-group, .form-control, .form-text, .text-muted + .mb-3, .form-control, .form-text, .text-muted *}} diff --git a/view/tpl/field_select_disabled.tpl b/view/tpl/field_select_disabled.tpl index ee5e1508f..448c097c3 100644 --- a/view/tpl/field_select_disabled.tpl +++ b/view/tpl/field_select_disabled.tpl @@ -1,4 +1,4 @@ - <div class='form-group field select'> + <div class='mb-3 field select'> <label style="font-weight: normal;" for='id_{{$field.0}}'>{{$field.1}}</label> <select class="form-control" disabled="true" name='{{$field.0}}' id='id_{{$field.0}}'> {{foreach $field.4 as $opt=>$val}}<option value="{{$opt}}" {{if $opt==$field.2}}selected="selected"{{/if}}>{{$val}}</option>{{/foreach}} diff --git a/view/tpl/field_select_grouped.tpl b/view/tpl/field_select_grouped.tpl index eb228b086..9816a97f1 100644 --- a/view/tpl/field_select_grouped.tpl +++ b/view/tpl/field_select_grouped.tpl @@ -1,4 +1,4 @@ - <div id='id_{{$field.0}}_wrapper' class='form-group field select'> + <div id='id_{{$field.0}}_wrapper' class='mb-3 field select'> <label for='id_{{$field.0}}'>{{$field.1}}</label> <select class="form-control" name='{{$field.0}}' id='id_{{$field.0}}'> {{foreach $field.4 as $group=>$opts}} diff --git a/view/tpl/field_select_raw.tpl b/view/tpl/field_select_raw.tpl index 2780df58c..0f36e18c6 100644 --- a/view/tpl/field_select_raw.tpl +++ b/view/tpl/field_select_raw.tpl @@ -1,4 +1,4 @@ - <div class='form-group field select'> + <div class='mb-3 field select'> <label for='id_{{$field.0}}'>{{$field.1}}</label> <select class="form-control" name='{{$field.0}}' id='id_{{$field.0}}'> {{$field.4}} diff --git a/view/tpl/field_textarea.tpl b/view/tpl/field_textarea.tpl index 437dece93..684043830 100644 --- a/view/tpl/field_textarea.tpl +++ b/view/tpl/field_textarea.tpl @@ -1,4 +1,4 @@ - <div class="form-group"> + <div class="mb-3"> <label for="id_{{$field.0}}">{{$field.1}}</label> <textarea class="form-control" name="{{$field.0}}" id="id_{{$field.0}}" {{if $field.4}}{{$field.4}}{{/if}} >{{$field.2}}</textarea> <small class="form-text text-muted">{{$field.3}}</small> diff --git a/view/tpl/field_themeselect.tpl b/view/tpl/field_themeselect.tpl index 7a529774c..99d36b0d2 100644 --- a/view/tpl/field_themeselect.tpl +++ b/view/tpl/field_themeselect.tpl @@ -1,7 +1,7 @@ {{if $field.5 == 'preview'}} <script>$(document).ready(function(){ previewTheme($("#id_{{$field.0}}")[0]); });</script> {{/if}} - <div class='form-group field select'> + <div class='mb-3 field select'> <label for='id_{{$field.0}}'>{{$field.1}}</label> <select class="form-control" name='{{$field.0}}' id='id_{{$field.0}}' {{if $field.5 == 'preview'}}onchange="previewTheme(this);"{{/if}} > {{foreach $field.4 as $opt=>$val}}<option value="{{$opt}}" {{if $opt==$field.2}}selected="selected"{{/if}}>{{$val}}</option>{{/foreach}} diff --git a/view/tpl/field_yesno.tpl b/view/tpl/field_yesno.tpl index 8a4cda55b..cd05b06d0 100644 --- a/view/tpl/field_yesno.tpl +++ b/view/tpl/field_yesno.tpl @@ -1,4 +1,4 @@ - <div class='clearfix form-group'> + <!--div class='clearfix mb-3'> <label class="mainlabel" for='id_{{$field.0}}'>{{$field.1}}</label> <div class='onoff' id="id_{{$field.0}}_onoff"> <input type="hidden" name='{{$field.0}}' id='id_{{$field.0}}' value="{{$field.2}}"> @@ -10,4 +10,10 @@ </a> </div> <small class='form-text text-muted'>{{$field.3}}</small> - </div> + </div--> + +<div class="form-check form-switch"> + <input class="form-check-input" type="checkbox" id="id_{{$field.0}}" value="{{$field.2}}" name="{{$field.0}}"> + <label class="form-check-label" for="id_{{$field.0}}">{{$field.1}}</label> + <small class='form-text text-muted'>{{$field.3}}</small> +</div> diff --git a/view/tpl/filer_dialog.tpl b/view/tpl/filer_dialog.tpl index 61860d10f..9786aa310 100644 --- a/view/tpl/filer_dialog.tpl +++ b/view/tpl/filer_dialog.tpl @@ -3,15 +3,14 @@ <div class="modal-content"> <div class="modal-header"> <h4 class="modal-title">{{$title}}</h4> - <button type="button" class="close" data-dismiss="modal" aria-label="Close"> - <span aria-hidden="true">×</span> + <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"> </button> </div> <div class="modal-body"> {{include file="field_combobox.tpl"}} </div> <div class="modal-footer"> - <button type="button" class="btn btn-secondary" data-dismiss="modal">{{$cancel}}</button> + <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">{{$cancel}}</button> <button id="filer_save" type="button" class="btn btn-primary">{{$submit}}</button> </div> </div> diff --git a/view/tpl/follow.tpl b/view/tpl/follow.tpl index da472fa9b..53325fdce 100644 --- a/view/tpl/follow.tpl +++ b/view/tpl/follow.tpl @@ -3,9 +3,7 @@ <form action="follow" method="post" /> <div class="input-group"> <input class="form-control" type="text" name="url" title="{{$hint}}" placeholder="{{$desc}}" /> - <div class="input-group-append"> - <button class="btn btn-sm btn-success" type="submit" name="submit" value="{{$follow}}" title="{{$follow}}"><i class="fa fa-fw fa-plus"></i></button> - </div> + <button class="btn btn-sm btn-success" type="submit" name="submit" value="{{$follow}}" title="{{$follow}}"><i class="fa fa-fw fa-plus"></i></button> </div> </form> {{if $abook_usage_message}} diff --git a/view/tpl/generic_addon_settings.tpl b/view/tpl/generic_addon_settings.tpl index ae603056b..92896aec4 100644 --- a/view/tpl/generic_addon_settings.tpl +++ b/view/tpl/generic_addon_settings.tpl @@ -1,7 +1,7 @@ <div class="panel" id="settings"> <div class="section-subtitle-wrapper" role="tab" id="{{$addon.0}}-settings"> <h3> - <a title="{{$addon.2}}" data-toggle="collapse" data-target="#{{$addon.0}}-settings-content" href="#" aria-controls="{{$addon.0}}-settings-content"> + <a title="{{$addon.2}}" data-bs-toggle="collapse" data-bs-target="#{{$addon.0}}-settings-content" href="#" aria-controls="{{$addon.0}}-settings-content"> {{if $addon.1|substr:0:1 === '<'}} {{$addon.1}} {{else}} diff --git a/view/tpl/generic_modal.tpl b/view/tpl/generic_modal.tpl index 18279b6f7..84e8e66cf 100644 --- a/view/tpl/generic_modal.tpl +++ b/view/tpl/generic_modal.tpl @@ -3,11 +3,11 @@ <div class="modal-content"> <div class="modal-header"> <h4 class="modal-title" id="generic-modal-title-{{$id}}">{{$title}}</h4> - <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button> + <button type="button" class="btn-close" data-bs-dismiss="modal" aria-hidden="true"></button> </div> <div class="modal-body" id="generic-modal-body-{{$id}}"></div> <div class="modal-footer"> - <button id="generic-modal-cancel-{{$id}}" type="button" class="btn btn-outline-secondary" data-dismiss="modal">{{$cancel}}</button> + <button id="generic-modal-cancel-{{$id}}" type="button" class="btn btn-outline-secondary" data-bs-dismiss="modal">{{$cancel}}</button> {{if $ok}} <button id="generic-modal-ok-{{$id}}" type="button" class="btn btn-primary">{{$ok}}</button> {{/if}} diff --git a/view/tpl/group_edit.tpl b/view/tpl/group_edit.tpl index 60038701e..5568179af 100644 --- a/view/tpl/group_edit.tpl +++ b/view/tpl/group_edit.tpl @@ -1,6 +1,6 @@ <div class="generic-content-wrapper"> <div class="section-title-wrapper"> - <div class="float-right"> + <div class="float-end"> <button type="button" class="btn btn-sm btn-outline-secondary" onclick="openClose('group_tools')"><i class="fa fa-pencil"></i> {{$details_label}}</button> <button id="fullscreen-btn" type="button" class="btn btn-outline-secondary btn-sm" onclick="makeFullScreen();"><i class="fa fa-expand"></i></button> <button id="inline-btn" type="button" class="btn btn-outline-secondary btn-sm" onclick="makeFullScreen(false);"><i class="fa fa-compress"></i></button> @@ -17,7 +17,7 @@ <a href="group/drop/{{$gid}}?t={{$form_security_token_drop}}" onclick="return confirmDelete();" class="btn btn-sm btn-danger"> {{$delete}} </a> - <button type="submit" name="submit" class="btn btn-sm btn-primary float-right">{{$submit}}</button> + <button type="submit" name="submit" class="btn btn-sm btn-primary float-end">{{$submit}}</button> </form> </div> <div class="section-content-info-wrapper"> diff --git a/view/tpl/group_selection.tpl b/view/tpl/group_selection.tpl index 270d2aa79..a91658464 100644 --- a/view/tpl/group_selection.tpl +++ b/view/tpl/group_selection.tpl @@ -1,4 +1,4 @@ -<div class="form-group field custom"> +<div class="mb-3 field custom"> <label for="group-selection" id="group-selection-lbl">{{$label}}</label> <select class="form-control" name="group-selection" id="group-selection" > {{foreach $groups as $group}} diff --git a/view/tpl/groupeditor.tpl b/view/tpl/groupeditor.tpl index 94c275c7e..4ccedaa39 100644 --- a/view/tpl/groupeditor.tpl +++ b/view/tpl/groupeditor.tpl @@ -1,10 +1,10 @@ -<div id="contacts" class="list-group float-left w-50 pr-2"> +<div id="contacts" class="list-group float-start w-50 pr-2"> <h3>{{$groupeditor.label_contacts}}</h3> <div id="group-all-contacts" class="contact_list"> {{foreach $groupeditor.contacts as $m}} {{$m}} {{/foreach}} </div> </div> -<div id="group" class="list-group float-right w-50"> +<div id="group" class="list-group float-end w-50"> <h3>{{$groupeditor.label_members}}</h3> <div id="group-members" class="contact_list"> {{foreach $groupeditor.members as $c}} {{$c}} {{/foreach}} diff --git a/view/tpl/help.tpl b/view/tpl/help.tpl index c523c4115..5022e7b1b 100644 --- a/view/tpl/help.tpl +++ b/view/tpl/help.tpl @@ -1,11 +1,11 @@ <div id="help-content" class="generic-content-wrapper"> <div class="clearfix section-title-wrapper"> - <div class="pull-right"> + <div class="float-end"> <div class="btn-group"> - <button type="button" class="btn btn-outline-secondary btn-sm dropdown-toggle" data-toggle="dropdown"> + <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/invite.tpl b/view/tpl/invite.tpl index e51e8e87b..304816e0b 100644 --- a/view/tpl/invite.tpl +++ b/view/tpl/invite.tpl @@ -16,7 +16,7 @@ <pre id="zai-remsg"></pre> </div> - <div id="invite-recipient-textarea" class="form-group field custom"> + <div id="invite-recipient-textarea" class="mb-3 field custom"> <label for="zaito">{{$m11}}<sup class="zai_qmc">({{$n11}})</sup></label> <textarea id="zai-to" name="zaito" rows="6" class="form-control"></textarea> @@ -35,7 +35,7 @@ <span id="zai-subject">{{$subject}}</span> </div> - <div id="invite-message-textarea" class="form-group field custom"> + <div id="invite-message-textarea" class="mb-3 field custom"> <label for="zaitxt">{{$m12}}<sup class="zai_qmc">({{$n12}})</sup></label> <textarea id="zai-txt" name="zaitxt" rows="6" class="form-control">{{$personal_message}}</textarea> </div> @@ -49,7 +49,7 @@ {{$due}} </pre> - <div id="invite-submit-wrapper" class="form-group"> + <div id="invite-submit-wrapper" class="mb-3"> <button class="btn btn-primary btn-sm" type="submit" id="invite-submit" name="submit" value="{{$submit}}">{{$submit}}</button> </div> <input type='hidden' id="zai-reon" name='zaireon' value=''> diff --git a/view/tpl/item_categories.tpl b/view/tpl/item_categories.tpl index fa07fa39f..68f8944bc 100644 --- a/view/tpl/item_categories.tpl +++ b/view/tpl/item_categories.tpl @@ -1,7 +1,7 @@ {{if $categories}} <!--div class="categorytags"--> {{foreach $categories as $cat}} -<span class="item-category badge badge-pill badge-warning"><i class="fa fa-asterisk"></i> {{if $cat.url}}<a class="text-dark" href="{{$cat.url}}">{{$cat.term}}</a>{{else}}{{$cat.term}}{{/if}}</span> +<span class="item-category badge rounded-pill bg-warning text-dark"><i class="fa fa-asterisk"></i> {{if $cat.url}}<a class="text-dark" href="{{$cat.url}}">{{$cat.term}}</a>{{else}}{{$cat.term}}{{/if}}</span> {{/foreach}} <!--/div--> {{/if}} diff --git a/view/tpl/item_filer.tpl b/view/tpl/item_filer.tpl index f814b374c..3ecf9aa41 100644 --- a/view/tpl/item_filer.tpl +++ b/view/tpl/item_filer.tpl @@ -1,7 +1,7 @@ {{if $categories}} <!--div class="filesavetags"--> {{foreach $categories as $cat}} -<span class="item-category badge badge-pill badge-danger"><i class="fa fa-folder-o"></i> {{$cat.term}} <a href="{{$cat.removelink}}" class="text-white" title="{{$remove}}" onClick="itemFilerRm({{$cat.id}}, '{{$cat.term}}'); return false;"><i class="fa fa-close"></i></a></span> +<span class="item-category badge rounded-pill bg-danger"><i class="fa fa-folder-o"></i> {{$cat.term}} <a href="{{$cat.removelink}}" class="text-white" title="{{$remove}}" onClick="itemFilerRm({{$cat.id}}, '{{$cat.term}}'); return false;"><i class="fa fa-close"></i></a></span> {{/foreach}} <!--/div--> {{/if}} diff --git a/view/tpl/jot-header.tpl b/view/tpl/jot-header.tpl index 8da7b429d..2ee78cd28 100644 --- a/view/tpl/jot-header.tpl +++ b/view/tpl/jot-header.tpl @@ -534,7 +534,7 @@ var activeCommentText = ''; } function jotAddOption() { - var option = '<div class="jot-poll-option form-group"><input class="w-100 border-0" name="poll_answers[]" type="text" value="" placeholder="Option"><div class="poll-option-close"><i class="fa fa-close"></i></div></div>'; + var option = '<div class="jot-poll-option mb-3"><input class="w-100 border-0" name="poll_answers[]" type="text" value="" placeholder="Option"><div class="poll-option-close"><i class="fa fa-close"></i></div></div>'; $('#jot-poll-options').append(option); } diff --git a/view/tpl/jot.tpl b/view/tpl/jot.tpl index 23b18ffac..a44b5b868 100644 --- a/view/tpl/jot.tpl +++ b/view/tpl/jot.tpl @@ -69,21 +69,21 @@ {{/if}} <div id="jot-poll-wrap" class="p-2 d-none"> <div id="jot-poll-options"> - <div class="jot-poll-option form-group"> + <div class="jot-poll-option mb-3"> <input class="w-100 border-0" name="poll_answers[]" type="text" value="" placeholder="{{$poll_option_label}}"> </div> - <div class="jot-poll-option form-group"> + <div class="jot-poll-option mb-3"> <input class="w-100 border-0" name="poll_answers[]" type="text" value="" placeholder="{{$poll_option_label}}"> </div> </div> {{include file="field_checkbox.tpl" field=$multiple_answers}} <div id="jot-poll-tools" class="clearfix"> - <div id="poll-tools-left" class="float-left"> + <div id="poll-tools-left" class="float-start"> <button id="jot-add-option" class="btn btn-outline-secondary btn-sm" type="button"> <i class="fa fa-plus"></i> {{$poll_add_option_label}} </button> </div> - <div id="poll-tools-right" class="float-right"> + <div id="poll-tools-right" class="float-end"> <div class="input-group"> <input type="text" name="poll_expire_value" class="form-control" value="10" size="3"> <select class="form-control" id="duration-select" name="poll_expire_unit"> @@ -96,9 +96,9 @@ </div> </div> <div id="profile-jot-submit-wrapper" class="clearfix p-2 jothidden"> - <div id="profile-jot-submit-left" class="btn-toolbar float-left"> + <div id="profile-jot-submit-left" class="btn-toolbar float-start"> {{if $bbcode}} - <div class="btn-group mr-2"> + <div class="btn-group me-2"> <button type="button" id="main-editor-bold" class="btn btn-outline-secondary btn-sm" title="{{$bold}}" onclick="inserteditortag('b', 'profile-jot-text'); return false;"> <i class="fa fa-bold jot-icons"></i> </button> @@ -117,7 +117,7 @@ </div> {{/if}} {{if $visitor}} - <div class="btn-group mr-2 d-none d-lg-flex"> + <div class="btn-group me-2 d-none d-lg-flex"> {{if $writefiles}} <button type="button" id="wall-file-upload" class="btn btn-outline-secondary btn-sm" title="{{$attach}}" > <i id="wall-file-upload-icon" class="fa fa-paperclip jot-icons"></i> @@ -134,7 +134,7 @@ </button> {{/if}} </div> - <div class="btn-group mr-2 d-none d-lg-flex"> + <div class="btn-group me-2 d-none d-lg-flex"> {{if $setloc}} <button type="button" id="profile-location-wrapper" class="btn btn-outline-secondary btn-sm" title="{{$setloc}}" onclick="jotGetLocation();return false;"> <i id="profile-location" class="fa fa-globe jot-icons"></i> @@ -177,7 +177,7 @@ </div> {{if $writefiles || $weblink || $setloc || $clearloc || $feature_expire || $feature_encrypt || $custommoretoolsdropdown}} <div class="btn-group d-lg-none"> - <button type="button" id="more-tools" class="btn btn-outline-secondary btn-sm dropdown-toggle" data-toggle="dropdown" aria-expanded="false"> + <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"> @@ -222,7 +222,7 @@ </div> </div> </div> - <div id="profile-jot-submit-right" class="btn-group float-right"> + <div id="profile-jot-submit-right" class="btn-group float-end"> {{foreach $customsubmitright as $csr}} <button type="button" class="btn btn-outline-secondary btn-sm" {{$csr.buttonparams}} title="{{$csr.preview}}"> {{$csr.buttoncontent}} @@ -234,12 +234,12 @@ </button> {{/if}} {{if $jotnets}} - <button type="button" id="dbtn-jotnets" class="btn btn-outline-secondary btn-sm" data-toggle="modal" data-target="#jotnetsModal" type="button" title="{{$jotnets_label}}" style="{{if $lockstate == 'lock'}}display: none;{{/if}}"> + <button type="button" id="dbtn-jotnets" class="btn btn-outline-secondary btn-sm" data-bs-toggle="modal" data-bs-target="#jotnetsModal" type="button" title="{{$jotnets_label}}" style="{{if $lockstate == 'lock'}}display: none;{{/if}}"> <i class="fa fa-share-alt jot-icons"></i> </button> {{/if}} {{if $showacl}} - <button type="button" id="dbtn-acl" class="btn btn-outline-secondary btn-sm" data-toggle="modal" data-target="#aclModal" title="{{$permset}}" type="button" data-form_id="profile-jot-form"> + <button type="button" id="dbtn-acl" class="btn btn-outline-secondary btn-sm" data-bs-toggle="modal" data-bs-target="#aclModal" title="{{$permset}}" type="button" data-form_id="profile-jot-form"> <i id="jot-perms-icon" class="fa fa-{{$lockstate}} jot-icons{{if $bang}} jot-lock-warn{{/if}}"></i> </button> {{/if}} @@ -257,13 +257,13 @@ <div class="modal-content"> <div class="modal-header"> <h3 class="modal-title" id="expiryModalLabel">{{$jotnets_label}}</h3> - <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button> + <button type="button" class="btn-close" data-bs-dismiss="modal" aria-hidden="true">×</button> </div> <div class="modal-body"> {{$jotnets}} </div> <div class="modal-footer"> - <button type="button" class="btn btn-outline-secondary" data-dismiss="modal">Close</button> + <button type="button" class="btn btn-outline-secondary" data-bs-dismiss="modal">Close</button> </div> </div><!-- /.modal-content --> </div><!-- /.modal-dialog --> @@ -284,9 +284,9 @@ <div class="modal-content"> <div class="modal-header"> <h3 class="modal-title" id="expiryModalLabel">{{$expires}}</h3> - <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button> + <button type="button" class="btn-close" data-bs-dismiss="modal" aria-hidden="true"></button> </div> - <div class="modal-body form-group" style="width:90%"> + <div class="modal-body mb-3" style="width:90%"> <div class="date"> <input type="text" placeholder="yyyy-mm-dd HH:MM" name="start_text" id="expiration-date" class="form-control" /> </div> @@ -297,7 +297,7 @@ </script> </div> <div class="modal-footer"> - <button type="button" class="btn btn-outline-secondary" data-dismiss="modal">{{$expiryModalCANCEL}}</button> + <button type="button" class="btn btn-outline-secondary" data-bs-dismiss="modal">{{$expiryModalCANCEL}}</button> <button id="expiry-modal-OKButton" type="button" class="btn btn-primary">{{$expiryModalOK}}</button> </div> </div><!-- /.modal-content --> @@ -311,9 +311,9 @@ <div class="modal-content"> <div class="modal-header"> <h3 class="modal-title" id="createdModalLabel">{{$future_txt}}</h3> - <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button> + <button type="button" class="btn-close" data-bs-dismiss="modal" aria-hidden="true"></button> </div> - <div class="modal-body form-group" style="width:90%"> + <div class="modal-body mb-3" style="width:90%"> <div class="date"> <input type="text" placeholder="yyyy-mm-dd HH:MM" name="created_text" id="created-date" class="form-control" /> </div> @@ -324,7 +324,7 @@ </script> </div> <div class="modal-footer"> - <button type="button" class="btn btn-outline-secondary" data-dismiss="modal">{{$expiryModalCANCEL}}</button> + <button type="button" class="btn btn-outline-secondary" data-bs-dismiss="modal">{{$expiryModalCANCEL}}</button> <button id="created-modal-OKButton" type="button" class="btn btn-primary">{{$expiryModalOK}}</button> </div> </div><!-- /.modal-content --> @@ -338,7 +338,7 @@ <div class="modal-content"> <div class="modal-header"> <h3 class="modal-title" id="embedPhotoModalLabel">{{$embedPhotosModalTitle}}</h3> - <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button> + <button type="button" class="btn-close" data-bs-dismiss="modal" aria-hidden="true"></button> </div> <div class="modal-body" id="embedPhotoModalBody" > <div id="embedPhotoModalBodyAlbumListDialog" class="d-none"> diff --git a/view/tpl/layoutlist.tpl b/view/tpl/layoutlist.tpl index 1bbe14893..723452839 100644 --- a/view/tpl/layoutlist.tpl +++ b/view/tpl/layoutlist.tpl @@ -1,7 +1,7 @@ <div class="generic-content-wrapper"> <div class="section-title-wrapper"> {{if $editor}} - <div class="pull-right"> + <div class="float-end"> <button id="webpage-create-btn" class="btn btn-sm btn-success" onclick="openClose('layout-editor');"><i class="fa fa-pencil-square-o"></i> {{$create}}</button> <a href="{{$help.url}}" target="_blank" class="btn btn-sm btn-warning" title="{{$help.title}}"><i class="fa fa-info"></i> {{$help.text}}</a> </div> diff --git a/view/tpl/locmanage.tpl b/view/tpl/locmanage.tpl index a8c75b6a8..9b988c9c5 100644 --- a/view/tpl/locmanage.tpl +++ b/view/tpl/locmanage.tpl @@ -8,7 +8,7 @@ $.post(baseurl + '/locs','drop='+id,function(data) { window.location.href=window.location.href; }); } </script> - <button class="btn btn-success btn-sm pull-right" onclick="window.location.href='/locs/f=&sync=1'; return false;"><i class="fa fa-refresh"></i> {{$sync}}</button> + <button class="btn btn-success btn-sm float-end" onclick="window.location.href='/locs/f=&sync=1'; return false;"><i class="fa fa-refresh"></i> {{$sync}}</button> <h2>{{$header}}</h2> </div> <div class="section-content-wrapper-np"> diff --git a/view/tpl/login.tpl b/view/tpl/login.tpl index 1a47d122c..cc4616b16 100644 --- a/view/tpl/login.tpl +++ b/view/tpl/login.tpl @@ -1,18 +1,14 @@ <form action="{{$dest_url}}" id="{{$form_id}}" method="post" > <input type="hidden" name="auth-params" value="login" /> - <div id="login-main"> - <div id="login-input" class="form-group"> - {{include file="field_input.tpl" field=$lname}} - {{include file="field_password.tpl" field=$lpassword}} - {{include file="field_checkbox.tpl" field=$remember_me}} - <button type="submit" name="submit" class="btn btn-block btn-primary">{{$login}}</button> - </div> - <div id="login-extra-links" class="clearfix"> - {{if $register}}<a href="{{$register.link}}" title="{{$register.title}}" id="register-link" class="float-right">{{$register.desc}}</a>{{/if}} - <a href="lostpass" title="{{$lostpass}}" id="lost-password-link" >{{$lostlink}}</a> - </div> - <hr> - <a href="rmagic" class="btn btn-block btn-outline-success rmagic-button">{{$remote_login}}</a> + <div id="login-main" class="d-grid gap-2"> + {{include file="field_input.tpl" field=$lname}} + {{include file="field_password.tpl" field=$lpassword}} + {{include file="field_checkbox.tpl" field=$remember_me}} + <button type="submit" name="submit" class="btn btn-primary">{{$login}}</button> + {{if $register}}<a href="{{$register.link}}" title="{{$register.title}}" id="register-link" class="float-end">{{$register.desc}}</a>{{/if}} + {{if $lostlink}}<a href="lostpass" title="{{$lostpass}}" id="lost-password-link" >{{$lostlink}}</a>{{/if}} +<hr> + <a href="rmagic" class="btn btn-outline-success">{{$remote_login}}</a> </div> {{foreach $hiddens as $k=>$v}} <input type="hidden" name="{{$k}}" value="{{$v}}" /> diff --git a/view/tpl/mail_conv.tpl b/view/tpl/mail_conv.tpl index adc7734ec..948890312 100644 --- a/view/tpl/mail_conv.tpl +++ b/view/tpl/mail_conv.tpl @@ -14,16 +14,16 @@ {{$mail.body}} </div> {{if $mail.attachments}} - <div class="dropdown float-left"> - <button type="button" class="btn btn-outline-secondary btn-sm wall-item-like dropdown-toggle" data-toggle="dropdown" id="attachment-menu-{{$item.id}}"><i class="fa fa-fw fa-paperclip"></i></button> + <div class="dropdown float-start"> + <button type="button" class="btn btn-outline-secondary btn-sm wall-item-like dropdown-toggle" data-bs-toggle="dropdown" id="attachment-menu-{{$item.id}}"><i class="fa fa-fw fa-paperclip"></i></button> <div class="dropdown-menu" role="menu" aria-labelledby="attachment-menu-{{$item.id}}">{{$mail.attachments}}</div> </div> {{/if}} - <div class="float-right dropdown"> - <button type="button" class="btn btn-outline-secondary btn-sm dropdown-toggle" data-toggle="dropdown" id="mail-item-menu-{{$mail.id}}"> + <div class="float-end dropdown"> + <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/mail_display.tpl b/view/tpl/mail_display.tpl index e8549a49b..80ce40838 100644 --- a/view/tpl/mail_display.tpl +++ b/view/tpl/mail_display.tpl @@ -1,6 +1,6 @@ <div class="generic-content-wrapper"> <div class="section-title-wrapper"> - <div class="pull-right"> + <div class="float-end"> <button id="fullscreen-btn" type="button" class="btn btn-outline-secondary btn-sm" onclick="makeFullScreen();"><i class="fa fa-expand"></i></button> <button id="inline-btn" type="button" class="btn btn-outline-secondary btn-sm" onclick="makeFullScreen(false);"><i class="fa fa-compress"></i></button> {{if $mailbox == 'combined'}} diff --git a/view/tpl/menuedit.tpl b/view/tpl/menuedit.tpl index 3558bdbaa..ad698f2c9 100644 --- a/view/tpl/menuedit.tpl +++ b/view/tpl/menuedit.tpl @@ -2,7 +2,7 @@ <div class="generic-content-wrapper"> <div class="section-title-wrapper"> {{if $menu_edit_link}} - <div class="pull-right"> + <div class="float-end"> <a href="{{$menu_edit_link}}" title="{{$hintedit}}" class="btn btn-sm btn-success"><i class="fa fa-pencil-square-o"></i> {{$editcontents}}</a> </div> {{/if}} @@ -22,7 +22,7 @@ {{include file="field_input.tpl" field=$menu_desc}} {{include file="field_checkbox.tpl" field=$menu_bookmark}} - <div class="menuedit-submit-wrapper form-group pull-right" > + <div class="menuedit-submit-wrapper mb-3 float-end" > <button type="submit" name="submit" class="btn btn-primary">{{$submit}} <i class="fa fa-caret-right"></i></button> </div> <div class="clear"></div> diff --git a/view/tpl/menulist.tpl b/view/tpl/menulist.tpl index f9c925472..a173cd5f9 100644 --- a/view/tpl/menulist.tpl +++ b/view/tpl/menulist.tpl @@ -1,6 +1,6 @@ <div class="generic-content-wrapper"> <div class="section-title-wrapper"> - <div class="pull-right"> + <div class="float-end"> <button id="webpage-create-btn" class="btn btn-sm btn-success" onclick="openClose('menu-creator');"><i class="fa fa-pencil-square-o"></i> {{$hintnew}}</button> </div> <h2>{{$title}}</h2> diff --git a/view/tpl/mitemedit.tpl b/view/tpl/mitemedit.tpl index 36be0b207..c973e8cbd 100644 --- a/view/tpl/mitemedit.tpl +++ b/view/tpl/mitemedit.tpl @@ -22,9 +22,9 @@ {{include file="field_input.tpl" field=$mitem_order}} {{include file="field_checkbox.tpl" field=$usezid}} {{include file="field_checkbox.tpl" field=$newwin}} - <div class="pull-right form-group"> + <div class="float-end mb-3"> <div class="btn-group"> - <button id="dbtn-acl" class="btn btn-outline-secondary btn-sm" data-toggle="modal" data-target="#aclModal" onclick="return false;"> + <button id="dbtn-acl" class="btn btn-outline-secondary btn-sm" data-bs-toggle="modal" data-bs-target="#aclModal" onclick="return false;"> <i id="jot-perms-icon" class="fa fa-{{$lockstate}}"></i> </button> {{if $submit_more}} diff --git a/view/tpl/mitemlist.tpl b/view/tpl/mitemlist.tpl index 1e6302868..a430e18cc 100644 --- a/view/tpl/mitemlist.tpl +++ b/view/tpl/mitemlist.tpl @@ -1,6 +1,6 @@ <div class="generic-content-wrapper"> <div class="section-title-wrapper"> - <div class="pull-right"> + <div class="float-end"> <button id="webpage-create-btn" class="btn btn-sm btn-success" onclick="openClose('menu-element-creator');"><i class="fa fa-pencil-square-o"></i> {{$hintnew}}</button> </div> <h2>{{$title}} {{if $menudesc}}{{$menudesc}}{{else}}{{$menuname}}{{/if}}</h2> @@ -23,7 +23,7 @@ <tr id="mitem-list-item-{{$m.mitem_id}}"> <td width="1%">{{$m.mitem_desc}}</td> <td width="96%"><a href="{{$m.mitem_link}}">{{$m.mitem_link}}</a></td> - <td width="1%" class="mitem-list-tool dropdown">{{if $m.allow_cid || $m.allow_gid || $m.deny_cid || $m.deny_gid}}<i class="fa fa-lock lockview" data-toggle="dropdown" onclick="lockview('menu_item',{{$m.mitem_id}});" ></i><ul id="panel-{{$m.mitem_id}}" class="lockview-panel dropdown-menu"></ul>{{/if}}</td> + <td width="1%" class="mitem-list-tool dropdown">{{if $m.allow_cid || $m.allow_gid || $m.deny_cid || $m.deny_gid}}<i class="fa fa-lock lockview" data-bs-toggle="dropdown" onclick="lockview('menu_item',{{$m.mitem_id}});" ></i><ul id="panel-{{$m.mitem_id}}" class="lockview-panel dropdown-menu"></ul>{{/if}}</td> <td width="1%" class="mitem-list-tool"><a href="mitem/{{$nick}}/{{$menu_id}}/{{$m.mitem_id}}" title="{{$hintedit}}"><i class="fa fa-pencil"></i></a></td> <td width="1%" class="mitem-list-tool"><a href="#" title="{{$hintdrop}}" onclick="dropItem('mitem/{{$nick}}/{{$menu_id}}/{{$m.mitem_id}}/drop', '#mitem-list-item-{{$m.mitem_id}}, #pmenu-item-{{$m.mitem_id}}'); return false;"><i class="fa fa-trash-o drop-icons"></i></a></td> </tr> diff --git a/view/tpl/mood_content.tpl b/view/tpl/mood_content.tpl index 315ee4c8a..4cb5207f6 100644 --- a/view/tpl/mood_content.tpl +++ b/view/tpl/mood_content.tpl @@ -17,7 +17,7 @@ <input id="mood-parent" type="hidden" value="{{$parent}}" name="parent" /> - <div class="form-group field custom"> + <div class="mb-3 field custom"> <select name="verb" id="mood-verb-select" class="form-control" > {{foreach $verbs as $v}} <option value="{{$v.0}}">{{$v.1}}</option> diff --git a/view/tpl/myapps.tpl b/view/tpl/myapps.tpl index 2cc747436..404ab73d3 100644 --- a/view/tpl/myapps.tpl +++ b/view/tpl/myapps.tpl @@ -2,14 +2,14 @@ <div class="section-title-wrapper clearfix"> {{if $authed}} {{if $create}} - <a href="appman" class="pull-right 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="fa fa-pencil-square-o"></i> {{$create}}</a> {{elseif $manage}} - <a href="apps/edit{{if $cat.0}}/?f=&cat={{$cat.0}}{{/if}}" class="pull-right btn btn-primary btn-sm">{{$manage}}</a> + <a href="apps/edit{{if $cat.0}}/?f=&cat={{$cat.0}}{{/if}}" class="float-end btn btn-primary btn-sm">{{$manage}}</a> {{/if}} {{/if}} <h2>{{$title}}{{if $cat.0}} - {{$cat.0}}{{/if}}</h2> </div> - <div class="clearfix section-content-wrapper"> + <div class="clearfix section-content-wrapper-np"> {{foreach $apps as $ap}} {{$ap}} {{/foreach}} diff --git a/view/tpl/nav_login.tpl b/view/tpl/nav_login.tpl index 4a94908f0..da9249e1a 100644 --- a/view/tpl/nav_login.tpl +++ b/view/tpl/nav_login.tpl @@ -4,10 +4,10 @@ <div class="modal-content"> <div class="modal-header"> <h4 class="modal-title">{{$nav.loginmenu.1.1}}</h4> - <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">×</span></button> + <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button> </div> <div class="modal-body"> - <div class="form-group"> + <div class="mb-3"> {{$nav.login}} </div> </div> diff --git a/view/tpl/navbar_default.tpl b/view/tpl/navbar_default.tpl index 0c8be512d..df8e5b69a 100644 --- a/view/tpl/navbar_default.tpl +++ b/view/tpl/navbar_default.tpl @@ -1,233 +1,397 @@ -{{if $nav.login && !$userinfo}} -<div class="d-lg-none pt-1 pb-1"> - {{if $nav.loginmenu.1.4}} - <a class="btn btn-primary btn-sm text-white" href="#" title="{{$nav.loginmenu.1.3}}" id="{{$nav.loginmenu.1.4}}_collapse" data-toggle="modal" data-target="#nav-login"> - {{$nav.loginmenu.1.1}} - </a> - {{else}} - <a class="btn btn-primary btn-sm text-white" href="login" title="{{$nav.loginmenu.1.3}}"> - {{$nav.loginmenu.1.1}} - </a> - {{/if}} - {{if $nav.register}} - <a class="btn btn-warning btn-sm text-dark" href="{{$nav.register.0}}" title="{{$nav.register.3}}" id="{{$nav.register.4}}" > - {{$nav.register.1}} - </a> - {{/if}} -</div> -{{/if}} -{{if $userinfo}} -<div class="dropdown"> - <div class="fakelink usermenu" data-toggle="dropdown"> - <img id="avatar" src="{{$userinfo.icon}}" alt="{{$userinfo.name}}"> - <i class="fa fa-caret-down"></i> - </div> - {{if $is_owner}} - <div class="dropdown-menu"> - {{foreach $nav.usermenu as $usermenu}} - <a class="dropdown-item{{if $usermenu.2}} active{{/if}}" href="{{$usermenu.0}}" title="{{$usermenu.3}}" role="menuitem" id="{{$usermenu.4}}">{{$usermenu.1}}</a> - {{/foreach}} - {{if $nav.group}} - <a class="dropdown-item" href="{{$nav.group.0}}" title="{{$nav.group.3}}" role="menuitem" id="{{$nav.group.4}}">{{$nav.group.1}}</a> - {{/if}} - {{if $nav.manage}} - <a class="dropdown-item{{if $sel.name == Manage}} active{{/if}}" href="{{$nav.manage.0}}" title="{{$nav.manage.3}}" role="menuitem" id="{{$nav.manage.4}}">{{$nav.manage.1}}</a> - {{/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> - {{/foreach}} - {{/if}} - {{if $nav.profiles}} - <a class="dropdown-item" href="{{$nav.profiles.0}}" title="{{$nav.profiles.3}}" role="menuitem" id="{{$nav.profiles.4}}">{{$nav.profiles.1}}</a> - {{/if}} - {{if $nav.settings}} - <div class="dropdown-divider"></div> - <a class="dropdown-item{{if $sel.name == Settings}} active{{/if}}" href="{{$nav.settings.0}}" title="{{$nav.settings.3}}" role="menuitem" id="{{$nav.settings.4}}">{{$nav.settings.1}}</a> - {{/if}} - {{if $nav.admin}} - <div class="dropdown-divider"></div> - <a class="dropdown-item{{if $sel.name == Admin}} active{{/if}}" href="{{$nav.admin.0}}" title="{{$nav.admin.3}}" role="menuitem" id="{{$nav.admin.4}}">{{$nav.admin.1}}</a> +<div class="container-fluid"> + {{if $nav.login && !$userinfo}} + <div class="d-lg-none pt-1 pb-1"> + {{if $nav.loginmenu.1.4}} + <a class="btn btn-primary btn-sm text-white" href="#" title="{{$nav.loginmenu.1.3}}" id="{{$nav.loginmenu.1.4}}_collapse" data-bs-toggle="modal" data-bs-target="#nav-login"> + {{$nav.loginmenu.1.1}} + </a> + {{else}} + <a class="btn btn-primary btn-sm text-white" href="login" title="{{$nav.loginmenu.1.3}}"> + {{$nav.loginmenu.1.1}} + </a> {{/if}} - {{if $nav.logout}} - <div class="dropdown-divider"></div> - <a class="dropdown-item" href="{{$nav.logout.0}}" title="{{$nav.logout.3}}" role="menuitem" id="{{$nav.logout.4}}">{{$nav.logout.1}}</a> + {{if $nav.register}} + <a class="btn btn-warning btn-sm text-dark" href="{{$nav.register.0}}" title="{{$nav.register.3}}" id="{{$nav.register.4}}" > + {{$nav.register.1}} + </a> {{/if}} </div> {{/if}} - {{if ! $is_owner}} - <div class="dropdown-menu" role="menu" aria-labelledby="avatar"> - <a class="dropdown-item" href="{{$nav.rusermenu.0}}" role="menuitem">{{$nav.rusermenu.1}}</a> - <a class="dropdown-item" href="{{$nav.rusermenu.2}}" role="menuitem">{{$nav.rusermenu.3}}</a> - </div> - {{/if}} -</div> -{{if $sel.name}} -<div id="nav-app-link-wrapper" class="navbar-nav{{if $sitelocation || ! $settings_url}} has_location mr-auto{{/if}}"> - <a id="nav-app-link" href="{{$url}}" class="nav-link text-truncate"> - {{$sel.name}} - {{if $sitelocation}} - <br><small>{{$sitelocation}}</small> - {{/if}} - </a> - -</div> -{{if $settings_url}} -<div id="nav-app-settings-link-wrapper" class="navbar-nav mr-auto"> - <a id="nav-app-settings-link" href="{{$settings_url}}/?f=&rpath={{$url}}" class="nav-link"> - <i class="fa fa-fw fa-cog"></i> - </a> -</div> -{{/if}} -{{/if}} -{{/if}} -<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> - </button> - {{/if}} - <button id="expand-aside" type="button" class="d-lg-none navbar-toggler border-0" data-toggle="offcanvas" data-target="#region_1"> - <i class="fa fa-arrow-circle-right" 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> - </button> - {{/if}} - <button id="menu-btn" class="navbar-toggler border-0" type="button" data-toggle="collapse" data-target="#navbar-collapse-2"> - <i class="fa fa-bars"></i> - </button> -</div> -<div class="collapse navbar-collapse" id="navbar-collapse-1"> - <ul class="navbar-nav mr-auto"> - {{if $nav.login && !$userinfo}} - <li class="nav-item d-lg-flex"> - {{if $nav.loginmenu.1.4}} - <a class="nav-link" href="#" title="{{$nav.loginmenu.1.3}}" id="{{$nav.loginmenu.1.4}}" data-toggle="modal" data-target="#nav-login"> - {{$nav.loginmenu.1.1}} + {{if $userinfo}} + <div class="d-flex justify-content-start"> + <div class="dropdown"> + <div class="fakelink usermenu" data-bs-toggle="dropdown"> + <img id="avatar" src="{{$userinfo.icon}}" alt="{{$userinfo.name}}"> + <i class="fa fa-caret-down"></i> + </div> + {{if $is_owner}} + <div class="dropdown-menu"> + {{foreach $nav.usermenu as $usermenu}} + <a class="dropdown-item{{if $usermenu.2}} active{{/if}}" href="{{$usermenu.0}}" title="{{$usermenu.3}}" role="menuitem" id="{{$usermenu.4}}">{{$usermenu.1}}</a> + {{/foreach}} + {{if $nav.group}} + <a class="dropdown-item" href="{{$nav.group.0}}" title="{{$nav.group.3}}" role="menuitem" id="{{$nav.group.4}}">{{$nav.group.1}}</a> + {{/if}} + {{if $nav.manage}} + <a class="dropdown-item{{if $sel.name == Manage}} active{{/if}}" href="{{$nav.manage.0}}" title="{{$nav.manage.3}}" role="menuitem" id="{{$nav.manage.4}}">{{$nav.manage.1}}</a> + {{/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> + {{/foreach}} + {{/if}} + {{if $nav.profiles}} + <a class="dropdown-item" href="{{$nav.profiles.0}}" title="{{$nav.profiles.3}}" role="menuitem" id="{{$nav.profiles.4}}">{{$nav.profiles.1}}</a> + {{/if}} + {{if $nav.settings}} + <div class="dropdown-divider"></div> + <a class="dropdown-item{{if $sel.name == Settings}} active{{/if}}" href="{{$nav.settings.0}}" title="{{$nav.settings.3}}" role="menuitem" id="{{$nav.settings.4}}">{{$nav.settings.1}}</a> + {{/if}} + {{if $nav.admin}} + <div class="dropdown-divider"></div> + <a class="dropdown-item{{if $sel.name == Admin}} active{{/if}}" href="{{$nav.admin.0}}" title="{{$nav.admin.3}}" role="menuitem" id="{{$nav.admin.4}}">{{$nav.admin.1}}</a> + {{/if}} + {{if $nav.logout}} + <div class="dropdown-divider"></div> + <a class="dropdown-item" href="{{$nav.logout.0}}" title="{{$nav.logout.3}}" role="menuitem" id="{{$nav.logout.4}}">{{$nav.logout.1}}</a> + {{/if}} + </div> + {{/if}} + {{if ! $is_owner}} + <div class="dropdown-menu" role="menu" aria-labelledby="avatar"> + <a class="dropdown-item" href="{{$nav.rusermenu.0}}" role="menuitem">{{$nav.rusermenu.1}}</a> + <a class="dropdown-item" href="{{$nav.rusermenu.2}}" role="menuitem">{{$nav.rusermenu.3}}</a> + </div> + {{/if}} + </div> + {{if $sel.name}} + <div id="nav-app-link-wrapper" class="navbar-nav{{if $sitelocation}} has_location{{/if}}"> + <a id="nav-app-link" href="{{$url}}" class="nav-link text-truncate"> + {{$sel.name}} + {{if $sitelocation}} + <br><small>{{$sitelocation}}</small> + {{/if}} </a> - {{else}} - <a class="nav-link" href="login" title="{{$nav.loginmenu.1.3}}"> - {{$nav.loginmenu.1.1}} + </div> + {{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> </a> - {{/if}} - </li> - {{/if}} - {{if $nav.register}} - <li class="nav-item {{$nav.register.2}} d-lg-flex"> - <a class="nav-link" href="{{$nav.register.0}}" title="{{$nav.register.3}}" id="{{$nav.register.4}}">{{$nav.register.1}}</a> - </li> + </div> {{/if}} - {{if $nav.alogout}} - <li class="nav-item {{$nav.alogout.2}} d-lg-flex"> - <a class="nav-link" href="{{$nav.alogout.0}}" title="{{$nav.alogout.3}}" id="{{$nav.alogout.4}}">{{$nav.alogout.1}}</a> - </li> {{/if}} - </ul> - - <div id="banner" class="navbar-text">{{$banner}}</div> + </div> + {{/if}} - <ul id="nav-right" class="navbar-nav ml-auto"> - <li class="nav-item collapse clearfix" id="nav-search"> - <form class="form-inline" method="get" action="{{$nav.search.4}}" role="search"> - <input class="form-control form-control-sm mt-1 mr-2" id="nav-search-text" type="text" value="" placeholder="{{$help}}" name="search" title="{{$nav.search.3}}" onclick="this.submit();" onblur="closeMenu('nav-search'); openMenu('nav-search-btn');"/> - </form> - <div id="nav-search-spinner" class="spinner-wrapper"> - <div class="spinner s"></div> - </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> - </li> + <div class="navbar-toggler-right"> {{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> - </li> + <button id="context-help-btn" class="navbar-toggler border-0" type="button" onclick="contextualHelp(); return false;"> + <i class="fa fa-question-circle"></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> + </button> {{if $localuser || $nav.pubs}} - <li id="notifications-btn" class="nav-item d-xl-none"> - <a class="nav-link text-white notifications-btn" href="#"><i id="notifications-btn-icon" class="fa fa-exclamation-circle notifications-btn-icon"></i></a> - </li> + <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> + </button> {{/if}} - {{if $channel_menu && $channel_apps.0}} - <li class="nav-item dropdown" id="channel-menu"> - <a class="nav-link" href="#" data-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"> - {{foreach $channel_apps as $channel_app}} - {{$channel_app}} - {{/foreach}} - </div> - </li> - {{/if}} - {{if $navbar_apps}} - {{foreach $navbar_apps as $navbar_app}} - <li> - {{$navbar_app}} - </li> - {{/foreach}} - {{/if}} - <li class="nav-item dropdown" id="app-menu"> - <a class="nav-link" href="#" data-toggle="dropdown"><i class="fa fa-fw fa-bars"></i></a> - <div id="dropdown-menu" class="dropdown-menu dropdown-menu-right"> - {{if $channel_apps.0 && ! $channel_menu}} - {{foreach $channel_apps as $channel_app}} - {{$channel_app}} - {{/foreach}} - <div class="dropdown-divider"></div> - <div class="dropdown-header text-black-50 sys-apps-toggle" onclick="$('#dropdown-menu').click(function(e) { e.stopPropagation(); }); openClose('sys_apps');"> - {{$sysapps_toggle}} - </div> - <div id="sys_apps" style="display:none;"> + <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> + </button> + </div> + <div class="collapse navbar-collapse justify-content-between" id="navbar-collapse-1"> + <ul class="navbar-nav"> + {{if $nav.login && !$userinfo}} + <li class="nav-item d-lg-flex"> + {{if $nav.loginmenu.1.4}} + <a class="nav-link" href="#" title="{{$nav.loginmenu.1.3}}" id="{{$nav.loginmenu.1.4}}" data-bs-toggle="modal" data-bs-target="#nav-login"> + {{$nav.loginmenu.1.1}} + </a> + {{else}} + <a class="nav-link" href="login" title="{{$nav.loginmenu.1.3}}"> + {{$nav.loginmenu.1.1}} + </a> {{/if}} - {{foreach $nav_apps as $nav_app}} - {{$nav_app}} - {{/foreach}} - {{if $channel_apps.0 && ! $channel_menu}} + </li> + {{/if}} + {{if $nav.register}} + <li class="nav-item {{$nav.register.2}} d-lg-flex"> + <a class="nav-link" href="{{$nav.register.0}}" title="{{$nav.register.3}}" id="{{$nav.register.4}}">{{$nav.register.1}}</a> + </li> + {{/if}} + {{if $nav.alogout}} + <li class="nav-item {{$nav.alogout.2}} d-lg-flex"> + <a class="nav-link" href="{{$nav.alogout.0}}" title="{{$nav.alogout.3}}" id="{{$nav.alogout.4}}">{{$nav.alogout.1}}</a> + </li> + {{/if}} + </ul> + + <div id="banner" class="navbar-text">{{$banner}}</div> + + <ul id="nav-right" class="navbar-nav"> + <li class="nav-item collapse clearfix" id="nav-search"> + <form class="form-inline" method="get" action="{{$nav.search.4}}" role="search"> + <input class="form-control form-control-sm mt-1 me-2" id="nav-search-text" type="text" value="" placeholder="{{$help}}" name="search" title="{{$nav.search.3}}" onclick="this.submit();" onblur="closeMenu('nav-search'); openMenu('nav-search-btn');"/> + </form> + <div id="nav-search-spinner" class="spinner-wrapper"> + <div class="spinner s"></div> </div> - {{/if}} - {{if $is_owner}} - <div class="dropdown-divider"></div> - <a class="dropdown-item" href="/apps"><i class="generic-icons-nav fa fa-fw fa-plus-circle"></i>{{$addapps}}</a> - <a class="dropdown-item" href="/apporder"><i class="generic-icons-nav fa fa-fw fa-sort"></i>{{$orderapps}}</a> - {{/if}} - </div> - </li> - </ul> + </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> + </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> + </li> + {{/if}} + {{if $localuser || $nav.pubs}} + <li id="notifications-btn" class="nav-item d-xl-none"> + <a class="nav-link text-white notifications-btn" href="#"><i id="notifications-btn-icon" class="fa fa-exclamation-circle notifications-btn-icon"></i></a> + </li> + {{/if}} + {{if $navbar_apps}} + {{foreach $navbar_apps as $navbar_app}} + <li class="nav-app-sortable"> + {{$navbar_app}} + </li> + {{/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> + </li> + </ul> + </div> + {{if $nav.help.6}} + <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> + </div> + </div> + {{/if}} </div> -<div class="collapse d-lg-none" id="navbar-collapse-2"> - <div class="navbar-nav mr-auto"> +<div class="offcanvas offcanvas-end" tabindex="-1" id="app-bin" aria-labelledby="app-bin-label"> + <div class="offcanvas-header"> + <div class="lh-1" id="app-bin-label"> + {{if $name}} + <img src="{{$thumb}}" class="menu-img-2"> + <div class="float-start pe-2"> + <div class="fw-bold">{{$name}}</div> + <div class="text-muted">{{$sitelocation}}</div> + </div> + {{/if}} + </div> + <button type="button" class="btn-close text-reset" data-bs-dismiss="offcanvas" aria-label="Close"></button> + </div> + <div class="offcanvas-body pt-0"> {{if $channel_apps.0}} + <div class="dropdown-header text-uppercase"> + {{$channelapps}} + </div> {{foreach $channel_apps as $channel_app}} - {{$channel_app|replace:'dropdown-item':'nav-link'}} + {{$channel_app}} {{/foreach}} - <div class="dropdown-header text-white-50 sys-apps-toggle" onclick="openClose('sys-apps-collapsed');"> - {{$sysapps_toggle}} - </div> - <div id="sys-apps-collapsed" style="display:none;"> {{/if}} - {{foreach $navbar_apps as $navbar_app}} - {{$navbar_app}} - {{/foreach}} - {{foreach $nav_apps as $nav_app}} - {{$nav_app|replace:'dropdown-item':'nav-link'}} - {{/foreach}} - {{if $channel_apps.0}} + {{if $navbar_apps.0}} + <div id="nav-app-bin-container" class="d-lg-none"> + <div class="dropdown-header text-uppercase"> + {{$pinned_apps}} + </div> + {{foreach $navbar_apps as $navbar_app}} + {{$navbar_app|replace:'navbar-app nav-link':'dropdown-item nav-app-sortable'|replace:'fa':'generic-icons-nav fa'}} + {{/foreach}} </div> {{/if}} {{if $is_owner}} + <div id="app-bin-container" data-token="{{$form_security_token}}"> + <div class="dropdown-header text-uppercase"> + {{$featured_apps}} + </div> + {{foreach $nav_apps as $nav_app}} + {{$nav_app}} + {{/foreach}} + </div> <div class="dropdown-divider"></div> - <a class="nav-link" href="/apps"><i class="generic-icons-nav fa fa-fw fa-plus-circle"></i>{{$addapps}}</a> - <a class="nav-link" href="/apporder"><i class="generic-icons-nav fa fa-fw fa-sort"></i>{{$orderapps}}</a> + <a class="dropdown-item" href="/apps"><i class="generic-icons-nav fa fa-fw fa-plus"></i>{{$addapps}}</a> + {{else}} + <div class="dropdown-header text-uppercase"> + {{$sysapps}} + </div> + {{foreach $nav_apps as $nav_app}} + {{$nav_app}} + {{/foreach}} {{/if}} </div> </div> -{{if $nav.help.6}} -<div id="contextual-help-content" class="contextual-help-content"> - {{$nav.help.5}} - <div class="float-right"> - <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> - </div> -</div> +{{if $is_owner}} +<script> + var app_bin = document.getElementById('app-bin-container'); + new Sortable(app_bin, { + animation: 150, + delay: 200, + delayOnTouchOnly: true, + onEnd: function (e) { + let app_str = ''; + $('#app-bin-container a').each(function () { + if(app_str.length) { + app_str = app_str.concat(',', $(this).text()); + } + else { + app_str = app_str.concat($(this).text()); + } + }); + $.post( + 'pconfig', + { + 'aj' : 1, + 'cat' : 'system', + 'k' : 'app_order', + 'v' : app_str, + 'form_security_token' : $('#app-bin-container').data('token') + } + ); + + } + }); + + var nav_app_bin = document.getElementById('nav-right'); + new Sortable(nav_app_bin, { + animation: 150, + delay: 200, + delayOnTouchOnly: true, + draggable: '.nav-app-sortable', + onEnd: function (e) { + let nav_app_str = ''; + $('#nav-right .nav-app-sortable').each(function () { + if(nav_app_str.length) { + nav_app_str = nav_app_str.concat(',', $(this).text()); + } + else { + nav_app_str = nav_app_str.concat($(this).text()); + } + }); + $.post( + 'pconfig', + { + 'aj' : 1, + 'cat' : 'system', + 'k' : 'app_pin_order', + 'v' : nav_app_str, + 'form_security_token' : $('#app-bin-container').data('token') + } + ); + + } + }); + + var nav_app_bin_container = document.getElementById('nav-app-bin-container'); + new Sortable(nav_app_bin_container, { + animation: 150, + delay: 200, + delayOnTouchOnly: true, + onEnd: function (e) { + let nav_app_str = ''; + $('#nav-app-bin-container a').each(function () { + if(nav_app_str.length) { + nav_app_str = nav_app_str.concat(',', $(this).text()); + } + else { + nav_app_str = nav_app_str.concat($(this).text()); + } + }); + $.post( + 'pconfig', + { + 'aj' : 1, + 'cat' : 'system', + 'k' : 'app_pin_order', + 'v' : nav_app_str, + 'form_security_token' : $('#app-bin-container').data('token') + } + ); + + } + }); + + $('#nav-right').on('dragover', function (e) { + e.preventDefault(); + e.stopPropagation(); + $(this).css('box-shadow', '0px 0px 3px red inset'); + }); + $('#nav-right').on('dragleave', function (e) { + e.preventDefault(); + e.stopPropagation(); + $(this).css('box-shadow', ''); + + }); + $('#nav-right').on('drop', function (e) { + e.preventDefault(); + e.stopPropagation(); + $(this).css('box-shadow', ''); + + if (papp === null) + return; + + $.ajax({ + type: 'post', + url: 'appman', + data: { + 'aj' : 1, + 'feature' : 'nav_pinned_app', + 'papp' : papp + } + }) + .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'); + }); + + }); + + $('#app-menu').on('dragover', function (e) { + e.preventDefault(); + e.stopPropagation(); + $(this).css('box-shadow', '0px 0px 1px red inset'); + }); + $('#app-menu').on('dragleave', function (e) { + e.preventDefault(); + e.stopPropagation(); + $(this).css('box-shadow', ''); + + }); + $('#app-menu').on('drop', function (e) { + e.preventDefault(); + e.stopPropagation(); + $(this).css('box-shadow', ''); + + if (papp === null) + return; + + $.ajax({ + type: 'post', + url: 'appman', + data: { + 'aj' : 1, + 'feature' : 'nav_featured_app', + 'papp' : papp + } + }) + .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'); + }); + + }); + + var papp, app_icon, app_url; + $(document).on('dragstart', function (e) { + papp = e.target.dataset.papp || null; + app_icon = e.target.dataset.icon || null; + app_url = e.target.dataset.url || null; + app_name = e.target.dataset.name || null; + }); +</script> {{/if}} diff --git a/view/tpl/navbar_tucson.tpl b/view/tpl/navbar_tucson.tpl index 362b261c5..6a8b5872d 100644 --- a/view/tpl/navbar_tucson.tpl +++ b/view/tpl/navbar_tucson.tpl @@ -1,7 +1,7 @@ {{if $nav.login && !$userinfo}} <div class="d-lg-none pt-1 pb-1"> {{if $nav.loginmenu.1.4}} - <a class="btn btn-primary btn-sm text-white" href="#" title="{{$nav.loginmenu.1.3}}" id="{{$nav.loginmenu.1.4}}_collapse" data-toggle="modal" data-target="#nav-login"> + <a class="btn btn-primary btn-sm text-white" href="#" title="{{$nav.loginmenu.1.3}}" id="{{$nav.loginmenu.1.4}}_collapse" data-bs-toggle="modal" data-bs-target="#nav-login"> {{$nav.loginmenu.1.1}} </a> {{else}} @@ -18,7 +18,7 @@ {{/if}} {{if $userinfo}} <div class="dropdown"> - <div class="fakelink usermenu" data-toggle="dropdown"> + <div class="fakelink usermenu" data-bs-toggle="dropdown"> <img id="avatar" src="{{$userinfo.icon}}" alt="{{$userinfo.name}}"> <i class="fa fa-caret-down"></i> </div> @@ -76,7 +76,7 @@ <i class="fa fa-question-circle"></i> </button> {{/if}} - <button id="expand-aside" type="button" class="d-lg-none navbar-toggler border-0" data-toggle="offcanvas" data-target="#region_1"> + <button id="expand-aside" type="button" class="d-lg-none navbar-toggler border-0" data-bs-toggle="offcanvas" data-bs-target="#region_1"> <i class="fa fa-arrow-circle-right" id="expand-aside-icon"></i> </button> {{if $localuser || $nav.pubs}} @@ -84,7 +84,7 @@ <i id="notifications-btn-icon-1" class="fa fa-exclamation-circle notifications-btn-icon"></i> </button> {{/if}} - <button id="menu-btn" class="navbar-toggler border-0" type="button" data-toggle="collapse" data-target="#navbar-collapse-2"> + <button id="menu-btn" class="navbar-toggler border-0" type="button" data-bs-toggle="collapse" data-bs-target="#navbar-collapse-2"> <i class="fa fa-bars"></i> </button> </div> @@ -93,7 +93,7 @@ {{if $nav.login && !$userinfo}} <li class="nav-item d-lg-flex"> {{if $nav.loginmenu.1.4}} - <a class="nav-link" href="#" title="{{$nav.loginmenu.1.3}}" id="{{$nav.loginmenu.1.4}}" data-toggle="modal" data-target="#nav-login"> + <a class="nav-link" href="#" title="{{$nav.loginmenu.1.3}}" id="{{$nav.loginmenu.1.4}}" data-bs-toggle="modal" data-bs-target="#nav-login"> {{$nav.loginmenu.1.1}} </a> {{else}} @@ -120,7 +120,7 @@ <ul id="nav-right" class="navbar-nav ml-auto"> <li class="nav-item collapse clearfix" id="nav-search"> <form class="form-inline" method="get" action="search" role="search"> - <input class="form-control form-control-sm mt-1 mr-2" id="nav-search-text" type="text" value="" placeholder="{{$help}}" name="search" title="{{$nav.search.3}}" onclick="this.submit();" onblur="closeMenu('nav-search'); openMenu('nav-search-btn');"/> + <input class="form-control form-control-sm mt-1 me-2" id="nav-search-text" type="text" value="" placeholder="{{$help}}" name="search" title="{{$nav.search.3}}" onclick="this.submit();" onblur="closeMenu('nav-search'); openMenu('nav-search-btn');"/> </form> <div id="nav-search-spinner" class="spinner-wrapper"> <div class="spinner s"></div> @@ -141,8 +141,8 @@ {{/if}} {{if $channel_menu && $channel_apps.0}} <li class="nav-item dropdown" id="channel-menu"> - <a class="nav-link" href="#" data-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"> + <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-end"> {{foreach $channel_apps as $channel_app}} {{$channel_app}} {{/foreach}} @@ -157,8 +157,8 @@ {{/foreach}} {{/if}} <li class="nav-item dropdown" id="app-menu"> - <a class="nav-link" href="#" data-toggle="dropdown"><i class="fa fa-fw fa-bars"></i></a> - <div id="dropdown-menu" class="dropdown-menu dropdown-menu-right"> + <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-end"> {{if $channel_apps.0 && ! $channel_menu}} {{foreach $channel_apps as $channel_app}} {{$channel_app}} @@ -214,7 +214,7 @@ {{if $nav.help.6}} <div id="contextual-help-content" class="contextual-help-content"> {{$nav.help.5}} - <div class="float-right"> + <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> </div> diff --git a/view/tpl/notifications.tpl b/view/tpl/notifications.tpl index 53ff8de52..92ffa1fdd 100644 --- a/view/tpl/notifications.tpl +++ b/view/tpl/notifications.tpl @@ -1,7 +1,7 @@ <div class="generic-content-wrapper"> <div class="section-title-wrapper clearfix"> {{if $notifications_available}} - <a href="#" class="btn btn-outline-secondary btn-sm float-right" onclick="markRead('notify'); setTimeout(function() { window.location.href=window.location.href; },1500); return false;">{{$notif_link_mark_seen}}</a> + <a href="#" class="btn btn-outline-secondary btn-sm float-end" onclick="markRead('notify'); setTimeout(function() { window.location.href=window.location.href; },1500); return false;">{{$notif_link_mark_seen}}</a> {{/if}} <h2>{{$notif_header}}</h2> </div> diff --git a/view/tpl/notifications_widget.tpl b/view/tpl/notifications_widget.tpl index 5cbfcc214..76b0851a7 100644 --- a/view/tpl/notifications_widget.tpl +++ b/view/tpl/notifications_widget.tpl @@ -139,6 +139,18 @@ }); + $(document).on('hz:sse_setNotificationsStatus', function(e, data) { + sse_setNotificationsStatus(data); + }); + + $(document).on('hz:sse_bs_init', function() { + sse_bs_init(); + }); + + $(document).on('hz:sse_bs_counts', function() { + sse_bs_counts(); + }); + {{foreach $notifications as $notification}} {{if $notification.filter}} $(document).on('click', '#tt-{{$notification.type}}-only', function(e) { @@ -421,7 +433,7 @@ } - function sse_setNotificationsStatus() { + function sse_setNotificationsStatus(data) { var primary_notifications = ['dm', 'home', 'intros', 'register', 'notify', 'files']; var secondary_notifications = ['network', 'forums', 'all_events', 'pubs']; var all_notifications = primary_notifications.concat(secondary_notifications); @@ -458,6 +470,39 @@ $('#notifications').hide(); } + if (typeof data !== typeof undefined) { + data.forEach(function(nmid, index) { + + sse_rmids.push(nmid); + + if($('.notification[data-b64mid=\'' + nmid + '\']').length) { + $('.notification[data-b64mid=\'' + nmid + '\']').each(function() { + var n = this.parentElement.id.split('-'); + return sse_updateNotifications(n[1], nmid); + }); + } + + // special handling for forum notifications + $('.notification-forum').filter(function() { + var fmids = decodeURIComponent($(this).data('b64mids')); + var n = this.parentElement.id.split('-'); + if(fmids.indexOf(nmid) > -1) { + var fcount = Number($('.' + n[1] + '-update').html()); + fcount--; + $('.' + n[1] + '-update').html(fcount); + if(fcount < 1) + $('.' + n[1] + '-button').fadeOut(); + + var count = Number($(this).find('.bg-secondary').html()); + count--; + $(this).find('.bg-secondary').html(count); + if(count < 1) + $(this).remove(); + } + }); + }); + } + } function sse_fallback() { @@ -480,14 +525,14 @@ <div id="nav-notifications-template" rel="template"> <a class="list-group-item text-decoration-none text-dark clearfix notification {6}" href="{0}" title="{13}" data-b64mid="{7}" data-notify_id="{8}" data-thread_top="{9}" data-contact_name="{2}" data-contact_addr="{3}" data-when="{5}"> <img class="menu-img-3" data-src="{1}" loading="lazy"> - <div class="contactname"><span class="text-dark font-weight-bold">{2}</span> <span class="text-muted">{3}</span></div> + <div class="contactname"><span class="text-dark fw-bold">{2}</span> <span class="text-muted">{3}</span></div> <span class="text-muted">{4}</span><br> <span class="text-muted notifications-autotime" title="{5}">{5}</span> </a> </div> <div id="nav-notifications-forums-template" rel="template"> <a class="list-group-item text-decoration-none clearfix notification notification-forum" href="{0}" title="{4} - {3}" data-b64mid="{7}" data-notify_id="{8}" data-thread_top="{9}" data-contact_name="{2}" data-contact_addr="{3}" data-b64mids='{12}'> - <span class="float-right badge badge-secondary">{10}</span> + <span class="float-end badge bg-secondary">{10}</span> <img class="menu-img-1" data-src="{1}" loading="lazy"> <span class="">{2}</span> <i class="fa fa-{11} text-muted"></i> @@ -496,11 +541,11 @@ <div id="notifications" class="border border-bottom-0 rounded navbar-nav collapse"> {{foreach $notifications as $notification}} <div class="rounded list-group list-group-flush collapse {{$notification.type}}-button"> - <a id="notification-link-{{$notification.type}}" class="collapsed list-group-item text-decoration-none notification-link" href="#" title="{{$notification.title}}" data-target="#nav-{{$notification.type}}-sub" data-toggle="collapse" data-sse_type="{{$notification.type}}"> + <a id="notification-link-{{$notification.type}}" class="collapsed list-group-item fakelink notification-link" href="#" title="{{$notification.title}}" data-bs-target="#nav-{{$notification.type}}-sub" data-bs-toggle="collapse" data-sse_type="{{$notification.type}}"> <i class="fa fa-fw fa-{{$notification.icon}}"></i> {{$notification.label}} - <span class="float-right badge badge-{{$notification.severity}} {{$notification.type}}-update"></span> + <span class="float-end badge bg-{{$notification.severity}} {{$notification.type}}-update"></span> </a> - <div id="nav-{{$notification.type}}-sub" class="list-group list-group-flush border border-left-0 border-top-0 border-right-0 collapse notification-content" data-parent="#notifications" data-sse_type="{{$notification.type}}"> + <div id="nav-{{$notification.type}}-sub" class="list-group list-group-flush border-bottom collapse notification-content" data-bs-parent="#notifications" data-sse_type="{{$notification.type}}"> {{if $notification.viewall}} <a class="list-group-item text-decoration-none text-dark" id="nav-{{$notification.type}}-see-all" href="{{$notification.viewall.url}}"> <i class="fa fa-fw fa-external-link"></i> {{$notification.viewall.label}} diff --git a/view/tpl/notify.tpl b/view/tpl/notify.tpl index b5bccc8a4..029e5aa3e 100644 --- a/view/tpl/notify.tpl +++ b/view/tpl/notify.tpl @@ -1,6 +1,6 @@ <div class="mb-4 notif-item"> {{if ! $item_seen}} - <span class="float-right badge badge-pill badge-success text-uppercase">{{$new}}</span> + <span class="float-end badge badge-pill badge-success text-uppercase">{{$new}}</span> {{/if}} <a href="{{$item_link}}"> <img src="{{$item_image}}" class="menu-img-3"> diff --git a/view/tpl/peoplefind.tpl b/view/tpl/peoplefind.tpl index bbcc0b85b..2ede221f3 100644 --- a/view/tpl/peoplefind.tpl +++ b/view/tpl/peoplefind.tpl @@ -1,11 +1,9 @@ <div id="peoplefind-sidebar" class="widget"> <h3>{{$findpeople}}</h3> <form action="directory" method="post" /> - <div class="input-group form-group"> + <div class="input-group mb-3"> <input class="form-control" type="text" name="search" title="{{$hint}}{{if $advanced_search}}{{$advanced_hint}}{{/if}}" placeholder="{{$desc}}" /> - <div class="input-group-append"> - <button class="btn btn-sm btn-outline-secondary" type="submit" name="submit"><i class="fa fa-fw fa-search"></i></button> - </div> + <button class="btn btn-sm btn-outline-secondary" type="submit" name="submit"><i class="fa fa-fw fa-search"></i></button> </div> </form> <ul class="nav nav-pills flex-column"> diff --git a/view/tpl/permcats.tpl b/view/tpl/permcats.tpl index 442b3e11a..83a04210e 100644 --- a/view/tpl/permcats.tpl +++ b/view/tpl/permcats.tpl @@ -12,7 +12,7 @@ <input type='hidden' name='form_security_token' value='{{$form_security_token}}'> {{include file="field_input.tpl" field=$name}} - <div class="settings-submit-wrapper form-group"> + <div class="settings-submit-wrapper mb-3"> <button type="submit" name="submit" class="btn btn-primary">{{$submit}}</button> </div> </div> @@ -20,7 +20,7 @@ <div class="panel" id="permission-settings"> <div class="section-subtitle-wrapper" role="tab" id="perms-tool"> <h3> - <a data-toggle="collapse" data-parent="#permission-settings" href="#perms-tool-collapse" aria-expanded="true" aria-controls="perms-tool-collapse"> + <a data-bs-toggle="collapse" data-parent="#permission-settings" href="#perms-tool-collapse" aria-expanded="true" aria-controls="perms-tool-collapse"> {{$permlbl}} </a> </h3> @@ -31,7 +31,7 @@ {{$permnote}} </div> - <table id="perms-tool-table" class=form-group> + <table id="perms-tool-table" class=mb-3> <tr> <td></td><td colspan="2" class="abook-me">{{$me}}</td> </tr> diff --git a/view/tpl/photo_album.tpl b/view/tpl/photo_album.tpl index ad4e2a38c..d01260f07 100644 --- a/view/tpl/photo_album.tpl +++ b/view/tpl/photo_album.tpl @@ -1,6 +1,6 @@ <div class="{{if !$no_fullscreen_btn}}generic-content-wrapper{{/if}}"> <div class="section-title-wrapper"> - <div class="pull-right"> + <div class="float-end"> {{if $order}} <a class="btn btn-outline-secondary btn-sm" href="{{$order.1}}" title="{{$order.0}}"><i class="fa fa-sort"></i></a> {{/if}} @@ -24,7 +24,7 @@ {{include file="photo_top.tpl"}} {{/foreach}} {{** make sure this element is at the bottom - we rely on that for endless scroll **}} - <span id="page-end" class="d-block float-left w-100" style="position: absolute; bottom: 0px"></span> + <span id="page-end" class="d-block float-start w-100" style="position: absolute; bottom: 0px"></span> </div> </div> </div> diff --git a/view/tpl/photo_albums.tpl b/view/tpl/photo_albums.tpl index 83bdd95e7..e2edec687 100644 --- a/view/tpl/photo_albums.tpl +++ b/view/tpl/photo_albums.tpl @@ -5,7 +5,7 @@ {{if $albums}} {{foreach $albums as $al}} {{if $al.shorttext}} - <li class="nav-item"><a class="nav-link" href="{{$baseurl}}/photos/{{$nick}}/album/{{$al.bin2hex}}"><span class="badge badge-secondary float-right">{{$al.total}}</span>{{$al.shorttext}}</a></li> + <li class="nav-item"><a class="nav-link" href="{{$baseurl}}/photos/{{$nick}}/album/{{$al.bin2hex}}"><span class="badge bg-secondary float-end">{{$al.total}}</span>{{$al.shorttext}}</a></li> {{/if}} {{/foreach}} {{/if}} diff --git a/view/tpl/photo_item.tpl b/view/tpl/photo_item.tpl index b6ee4508b..6ddca70e3 100644 --- a/view/tpl/photo_item.tpl +++ b/view/tpl/photo_item.tpl @@ -21,7 +21,7 @@ </div> {{if $drop}} <div class="p-2 clearfix wall-item-tools" id="wall-item-tools-{{$id}}" > - <div class="wall-item-tools-right pull-right"> + <div class="wall-item-tools-right float-end"> {{$drop}} </div> </div> diff --git a/view/tpl/photo_view.tpl b/view/tpl/photo_view.tpl index 7698fb437..473e34123 100644 --- a/view/tpl/photo_view.tpl +++ b/view/tpl/photo_view.tpl @@ -1,13 +1,13 @@ <div id="live-photos"></div> <div class="generic-content-wrapper"> <div class="section-title-wrapper"> - <div class="pull-right"> + <div class="float-end"> {{if $tools || $map || $edit}} <div class="btn-group"> - <button type="button" class="btn btn-outline-secondary btn-sm dropdown-toggle" data-toggle="dropdown"> + <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> @@ -23,8 +23,8 @@ {{/if}} {{if $lock}} <div class="btn-group"> - <button id="lockview" class="btn btn-outline-secondary btn-sm dropdown-toggle" data-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> + <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-end"></ul> </div> {{/if}} {{if $prevlink || $nextlink}} @@ -48,7 +48,7 @@ <form action="photos/{{$edit.nickname}}/{{$edit.resource_id}}" method="post" id="photo_edit_form" class="acl-form" data-form_id="photo_edit_form" data-allow_cid='{{$edit.allow_cid}}' data-allow_gid='{{$edit.allow_gid}}' data-deny_cid='{{$edit.deny_cid}}' data-deny_gid='{{$edit.deny_gid}}'> <input type="hidden" name="item_id" value="{{$edit.item_id}}" /> {{* album renaming is not supported atm. - <div class="form-group"> + <div class="mb-3"> <label id="photo-edit-albumname-label" for="photo-edit-albumname">{{$edit.newalbum_label}}</label> <input id="photo-edit-albumname" class="form-control" type="text" name="albname" value="{{$edit.album}}" placeholder="{{$edit.newalbum_placeholder}}" list="dl-albums" /> {{if $edit.albums}} @@ -62,7 +62,7 @@ {{/if}} </div> *}} - <div class="form-group"> + <div class="mb-3"> <label id="photo-edit-caption-label" for="photo-edit-caption">{{$edit.capt_label}}</label> <input id="photo-edit-caption" class="form-control" type="text" name="desc" value="{{$edit.caption}}" /> </div> @@ -75,22 +75,22 @@ <div class="form-group"> {{include file="field_select.tpl" field=$edit.album_select}} </div> - <div class="form-group"> + <div class="mb-3"> <label class="radio-inline" id="photo-edit-rotate-cw-label" for="photo-edit-rotate-cw"><input id="photo-edit-rotate-cw" type="radio" name="rotate" value="1" />{{$edit.rotatecw}}</label> <label class="radio-inline" id="photo-edit-rotate-ccw-label" for="photo-edit-rotate-ccw"><input id="photo-edit-rotate-ccw" type="radio" name="rotate" value="2" />{{$edit.rotateccw}}</label> </div> {{if $edit.adult_enabled}} - <div class="form-group"> + <div class="mb-3"> {{include file="field_checkbox.tpl" field=$edit.adult}} </div> {{/if}} - <div class="form-group pull-left"> + <div class="mb-3 float-start"> <button class="btn btn-danger btn-sm" id="photo-edit-delete-button" type="submit" name="delete" value="{{$edit.delete}}" onclick="return confirmDelete();" />{{$edit.delete}}</button> </div> - <div class="form-group btn-group pull-right"> + <div class="mb-3 btn-group float-end"> {{if $edit.aclselect}} - <button id="dbtn-acl" class="btn btn-outline-secondary btn-sm" data-toggle="modal" data-target="#aclModal" onclick="return false;"> + <button id="dbtn-acl" class="btn btn-outline-secondary btn-sm" data-bs-toggle="modal" data-bs-target="#aclModal" onclick="return false;"> <i id="jot-perms-icon" class="fa fa-{{$edit.lockstate}}"></i> </button> {{/if}} @@ -113,12 +113,12 @@ {{/if}} <div class="photo-item-tools"> {{if $responses.count }} - <div class="photo-item-tools-left pull-left"> + <div class="photo-item-tools-left float-start"> <div class="{{if $responses.count > 1}}btn-group{{/if}}"> {{foreach $responses as $verb=>$response}} {{if $response.count}} <div class="btn-group"> - <button type="button" class="btn btn-outline-secondary btn-sm wall-item-like dropdown-toggle" data-toggle="dropdown" id="wall-item-{{$verb}}-{{$id}}">{{$response.count}} {{$response.button}}</button> + <button type="button" class="btn btn-outline-secondary btn-sm wall-item-like dropdown-toggle" data-bs-toggle="dropdown" id="wall-item-{{$verb}}-{{$id}}">{{$response.count}} {{$response.button}}</button> {{if $response.list_part}} <ul class="dropdown-menu" role="menu" aria-labelledby="wall-item-{{$verb}}-{{$id}}">{{foreach $response.list_part as $liker}}<li role="presentation">{{$liker}}</li>{{/foreach}}</ul> {{else}} @@ -129,14 +129,14 @@ <div class="modal-dialog"> <div class="modal-content"> <div class="modal-header"> - <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button> + <button type="button" class="btn-close" data-bs-dismiss="modal" aria-hidden="true"></button> <h4 class="modal-title">{{$response.title}}</h4> </div> <div class="modal-body"> <ul>{{foreach $response.list as $liker}}<li role="presentation">{{$liker}}</li>{{/foreach}}</ul> </div> <div class="modal-footer clear"> - <button type="button" class="btn btn-outline-secondary" data-dismiss="modal">{{$modal_dismiss}}</button> + <button type="button" class="btn btn-outline-secondary" data-bs-dismiss="modal">{{$modal_dismiss}}</button> </div> </div><!-- /.modal-content --> </div><!-- /.modal-dialog --> @@ -149,7 +149,7 @@ </div> {{/if}} {{if $likebuttons}} - <div class="photo-item-tools-right btn-group pull-right"> + <div class="photo-item-tools-right btn-group float-end"> <button type="button" class="btn btn-outline-secondary btn-sm" onclick="dolike({{$likebuttons.id}},'like'); return false"> <i class="fa fa-thumbs-o-up" title="{{$likebuttons.likethis}}"></i> </button> @@ -157,7 +157,7 @@ <i class="fa fa-thumbs-o-down" title="{{$likebuttons.nolike}}"></i> </button> </div> - <div id="like-rotator-{{$likebuttons.id}}" class="photo-like-rotator pull-right"></div> + <div id="like-rotator-{{$likebuttons.id}}" class="photo-like-rotator float-end"></div> {{/if}} <div class="clear"></div> </div> diff --git a/view/tpl/photos_recent.tpl b/view/tpl/photos_recent.tpl index 63c8b3515..fe770d72e 100644 --- a/view/tpl/photos_recent.tpl +++ b/view/tpl/photos_recent.tpl @@ -1,6 +1,6 @@ <div class="generic-content-wrapper"> <div class="section-title-wrapper"> - <div class="pull-right"> + <div class="float-end"> {{if $can_post}} <button class="btn btn-sm btn-success acl-form-trigger" title="{{$usage}}" onclick="openClose('photo-upload-form');" data-form_id="photos-upload-form"><i class="fa fa-plus-circle"></i> {{$upload.0}}</button> {{/if}} @@ -15,7 +15,7 @@ {{include file="photo_top.tpl"}} {{/foreach}} {{** make sure this element is at the bottom - we rely on that in endless scroll **}} - <span id="page-end" class="d-block float-left w-100" style="position: absolute; bottom: 0px"></span> + <span id="page-end" class="d-block float-start w-100" style="position: absolute; bottom: 0px"></span> </div> </div> </div> diff --git a/view/tpl/photos_upload.tpl b/view/tpl/photos_upload.tpl index ea173049b..95cf4e295 100644 --- a/view/tpl/photos_upload.tpl +++ b/view/tpl/photos_upload.tpl @@ -4,7 +4,7 @@ <form action="#" enctype="multipart/form-data" method="post" name="photos-upload-form" id="photos-upload-form" class="acl-form" data-form_id="photos-upload-form" data-allow_cid='{{$allow_cid}}' data-allow_gid='{{$allow_gid}}' data-deny_cid='{{$deny_cid}}' data-deny_gid='{{$deny_gid}}'> <input type="hidden" id="photos-upload-source" name="source" value="photos" /> - <div class="form-group"> + <div class="mb-3"> <label for="photos-upload-album">{{$newalbum_label}}</label> <input type="text" class="form-control" id="photos-upload-album" name="newalbum" placeholder="{{$newalbum_placeholder}}" value="{{$selname}}" list="dl-photo-upload"> <datalist id="dl-photo-upload"> @@ -16,18 +16,16 @@ </datalist> </div> {{if $default}} - <!-- div class="form-group"> + <!-- div class="mb-3"> <input id="photos-upload-choose" type="file" name="userfile" /> </div --> {{include file="field_input.tpl" field=$caption}} - {{include file="field_checkbox.tpl" field=$visible}} - <div id="body-textarea"> {{include file="field_textarea.tpl" field=$body}} - </div> + {{include file="field_checkbox.tpl" field=$visible}} <div class="pull-right btn-group"> <div class="btn-group"> {{if $lockstate}} - <button id="dbtn-acl" class="btn btn-outline-secondary btn-sm" data-toggle="modal" data-target="#aclModal" onclick="return false;"> + <button id="dbtn-acl" class="btn btn-outline-secondary btn-sm" data-bs-toggle="modal" data-bs-target="#aclModal" onclick="return false;"> <i id="jot-perms-icon" class="fa fa-{{$lockstate}}"></i> </button> {{/if}} @@ -40,17 +38,16 @@ {{if $uploader}} {{include file="field_input.tpl" field=$caption}} - {{include file="field_checkbox.tpl" field=$visible}} - <div id="body-textarea"> {{include file="field_textarea.tpl" field=$body}} - </div> + {{include file="field_checkbox.tpl" field=$visible}} + <div id="photos-upload-perms" class="btn-group pull-right"> {{if $lockstate}} - <button class="btn btn-outline-secondary btn-sm" data-toggle="modal" data-target="#aclModal" onclick="return false;"> + <button class="btn btn-outline-secondary btn-sm" data-bs-toggle="modal" data-bs-target="#aclModal" onclick="return false;"> <i id="jot-perms-icon" class="fa fa-{{$lockstate}}"></i> </button> {{/if}} - <div class="pull-right"> + <div class="float-end"> {{$uploader}} </div> </div> diff --git a/view/tpl/pinned_item.tpl b/view/tpl/pinned_item.tpl index a24c4ae44..4d059e0a4 100644 --- a/view/tpl/pinned_item.tpl +++ b/view/tpl/pinned_item.tpl @@ -41,12 +41,12 @@ {{/if}} {{/if}} <div class="p-2 clearfix wall-item-head{{if !$title && !$event && !$photo}} rounded-top{{/if}}{{if $is_new && !$event}} wall-item-head-new{{/if}}"> - <span class="float-right" title="{{$pinned}}"><i class="fa fa-thumb-tack"> </i></span> + <span class="float-end" title="{{$pinned}}"><i class="fa fa-thumb-tack"> </i></span> <div class="wall-item-info" id="pinned-item-info-{{$id}}" > <div class="wall-item-photo-wrapper{{if $owner_url}} wwfrom{{/if}} h-card p-author" id="pinned-item-photo-wrapper-{{$id}}"> - <img src="{{$thumb}}" class="fakelink wall-item-photo u-photo p-name" id="pinned-item-photo-{{$id}}" alt="{{$name}}" data-toggle="dropdown" /> + <img src="{{$thumb}}" class="fakelink wall-item-photo u-photo p-name" id="pinned-item-photo-{{$id}}" alt="{{$name}}" data-bs-toggle="dropdown" /> {{if $thread_author_menu}} - <i class="fa fa-caret-down wall-item-photo-caret cursor-pointer" data-toggle="dropdown"></i> + <i class="fa fa-caret-down wall-item-photo-caret cursor-pointer" data-bs-toggle="dropdown"></i> <div class="dropdown-menu"> {{foreach $thread_author_menu as $mitem}} <a class="dropdown-item" {{if $mitem.href}}href="{{$mitem.href}}"{{/if}} {{if $mitem.action}}onclick="{{$mitem.action}}"{{/if}} {{if $mitem.title}}title="{{$mitem.title}}"{{/if}} >{{$mitem.title}}</a> @@ -80,7 +80,7 @@ </div> {{/if}} <div class="p-2 clearfix wall-item-tools"> - <div class="float-right wall-item-tools-right"> + <div class="float-end wall-item-tools-right"> <div class="btn-group"> <div id="pinned-rotator-{{$id}}" class="spinner-wrapper"> <div class="spinner s"></div> @@ -89,10 +89,10 @@ <div class="btn-group"> {{if $isevent}} <div class="btn-group"> - <button type="button" class="btn btn-outline-secondary btn-sm dropdown-toggle" data-toggle="dropdown" id="pinned-item-attend-menu-{{$id}}" title="{{$attend_title}}"> + <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> @@ -107,16 +107,16 @@ {{/if}} {{if $canvote}} <div class="btn-group"> - <button type="button" class="btn btn-outline-secondary btn-sm dropdown-toggle" data-toggle="dropdown" id="pinned-item-consensus-menu-{{$id}}" title="{{$vote_title}}"> + <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> <a class="dropdown-item" href="#" title="{{$conlabels.1}}" onclick="dolike({{$id}},'disagree'); return false;"> <i class="item-act-list fa fa-times{{if $my_responses.disagree}} ivoted{{/if}}" ></i> {{$conlabels.1}} - </a> + </a> <a class="dropdown-item" href="#" title="{{$conlabels.2}}" onclick="dolike({{$id}},'abstain'); return false;"> <i class="item-act-list fa fa-question{{if $my_responses.abstain}} ivoted{{/if}}" ></i> {{$conlabels.2}} </a> @@ -124,10 +124,10 @@ </div> {{/if}} <div class="btn-group"> - <button type="button" class="btn btn-outline-secondary btn-sm dropdown-toggle" data-toggle="dropdown" id="pinned-item-menu-{{$id}}"> + <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}} @@ -152,7 +152,7 @@ {{if $attachments}} <div class="wall-item-tools-left btn-group" id="pinned-item-tools-left-{{$id}}"> <div class="btn-group"> - <button type="button" class="btn btn-outline-secondary btn-sm wall-item-like dropdown-toggle" data-toggle="dropdown" id="pinned-attachment-menu-{{$id}}"> + <button type="button" class="btn btn-outline-secondary btn-sm wall-item-like dropdown-toggle" data-bs-toggle="dropdown" id="pinned-attachment-menu-{{$id}}"> <i class="fa fa-paperclip"></i> </button> <div class="dropdown-menu">{{$attachments}}</div> @@ -162,14 +162,14 @@ {{foreach $responses as $verb=>$response}} {{if $response.count}} <div class="btn-group"> - <button type="button" class="btn btn-outline-secondary btn-sm wall-item-like dropdown-toggle"{{if $response.modal}} data-toggle="modal" data-target="#{{$verb}}Modal-{{$id}}"{{else}} data-toggle="dropdown"{{/if}} id="pinned-item-{{$verb}}-{{$id}}">{{$response.count}} {{$response.button}}</button> + <button type="button" class="btn btn-outline-secondary btn-sm wall-item-like dropdown-toggle"{{if $response.modal}} data-bs-toggle="modal" data-bs-target="#{{$verb}}Modal-{{$id}}"{{else}} data-bs-toggle="dropdown"{{/if}} id="pinned-item-{{$verb}}-{{$id}}">{{$response.count}} {{$response.button}}</button> {{if $response.modal}} <div class="modal" id="pinned-{{$verb}}Modal-{{$id}}"> <div class="modal-dialog"> <div class="modal-content"> <div class="modal-header"> <h3 class="modal-title">{{$response.count}} {{$response.button}}</h3> - <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button> + <button type="button" class="btn-close" data-bs-dismiss="modal" aria-hidden="true"></button> </div> <div class="modal-body response-list"> <ul class="nav nav-pills flex-column"> @@ -177,7 +177,7 @@ </ul> </div> <div class="modal-footer clear"> - <button type="button" class="btn btn-outline-secondary" data-dismiss="modal">{{$modal_dismiss}}</button> + <button type="button" class="btn btn-outline-secondary" data-bs-dismiss="modal">{{$modal_dismiss}}</button> </div> </div> </div> diff --git a/view/tpl/poke_content.tpl b/view/tpl/poke_content.tpl index f368cb024..3872d21ff 100644 --- a/view/tpl/poke_content.tpl +++ b/view/tpl/poke_content.tpl @@ -14,7 +14,7 @@ <form action="poke" method="get"> -<div class="form-group field input"> +<div class="mb-3 field input"> <label id="poke-recip-label" for="poke-recip">{{$clabel}}</label> <input class="form-control" id="poke-recip" type="text" value="{{$name}}" name="pokename" autocomplete="off" /> </div> @@ -26,7 +26,7 @@ {{if $poke_basic}} <input type="hidden" name="verb" value="poke" /> {{else}} -<div class="form-group field custom"> +<div class="mb-3 field custom"> <label for="poke-verb-select" id="poke-verb-lbl">{{$choice}}</label> <select class="form-control" name="verb" id="poke-verb-select" > {{foreach $verbs as $v}} diff --git a/view/tpl/privacy_groups.tpl b/view/tpl/privacy_groups.tpl index 327a15aee..c06f5b0ca 100644 --- a/view/tpl/privacy_groups.tpl +++ b/view/tpl/privacy_groups.tpl @@ -1,6 +1,6 @@ <div class="generic-content-wrapper"> <div class="clearfix section-title-wrapper"> - <button type="button" class="btn btn-sm btn-success float-right" onclick="openClose('group_tools')"><i class="fa fa-plus-circle"></i> {{$add_new_label}}</button> + <button type="button" class="btn btn-sm btn-success float-end" onclick="openClose('group_tools')"><i class="fa fa-plus-circle"></i> {{$add_new_label}}</button> <h2>{{$title}}</h2> </div> <div id="group_tools" class="clearfix section-content-tools-wrapper"{{if ! $new}} style="display: none"{{/if}}> @@ -9,7 +9,7 @@ {{include file="field_input.tpl" field=$gname}} {{include file="field_checkbox.tpl" field=$public}} {{$pgrp_extras}} - <button type="submit" name="submit" class="btn btn-sm btn-primary float-right">{{$submit}}</button> + <button type="submit" name="submit" class="btn btn-sm btn-primary float-end">{{$submit}}</button> </form> </div> diff --git a/view/tpl/profile_advanced.tpl b/view/tpl/profile_advanced.tpl index e6653c130..a4f6c9525 100644 --- a/view/tpl/profile_advanced.tpl +++ b/view/tpl/profile_advanced.tpl @@ -1,11 +1,11 @@ <div id="profile-content-wrapper" class="generic-content-wrapper"> <div class="section-title-wrapper"> - <div class="float-right"> + <div class="float-end"> {{if $profile.like_count}} <div class="btn-group"> - <button type="button" class="btn btn-outline-secondary btn-sm dropdown-toggle" data-toggle="dropdown" id="profile-like">{{$profile.like_count}} {{$profile.like_button_label}}</button> + <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}} @@ -18,8 +18,8 @@ {{/if}} {{if $editmenu.multi}} <div class="btn-group"> - <a class="btn btn-primary btn-sm dropdown-toggle" data-toggle="dropdown" href="#" ><i class="fa fa-pencil"></i> {{$editmenu.edit.3}}</a> - <div class="dropdown-menu dropdown-menu-right"> + <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-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}} @@ -325,7 +325,7 @@ {{/if}} {{if $item.like_count}} <div class="btn-group"> - <button type="button" class="btn btn-outline-secondary btn-sm dropdown-toggle" data-toggle="dropdown" id="thing-like-{{$item.term_hash}}">{{$item.like_count}} {{$item.like_label}}</button> + <button type="button" class="btn btn-outline-secondary btn-sm dropdown-toggle" data-bs-toggle="dropdown" id="thing-like-{{$item.term_hash}}">{{$item.like_count}} {{$item.like_label}}</button> {{if $item.likes}} <ul class="dropdown-menu" role="menu" aria-labelledby="thing-like-{{$item.term_hash}}">{{foreach $item.likes as $liker}}<li role="presentation"><a href="{{$liker.xchan_url}}"><img class="dropdown-menu-img-xs" src="{{$liker.xchan_photo_s}}" alt="{{$liker.name}}" /> {{$liker.xchan_name}}</a></li>{{/foreach}}</ul> {{/if}} diff --git a/view/tpl/profile_edit.tpl b/view/tpl/profile_edit.tpl index 8add9bb9d..14430bf89 100644 --- a/view/tpl/profile_edit.tpl +++ b/view/tpl/profile_edit.tpl @@ -1,10 +1,10 @@ <div class="generic-content-wrapper"> <div class="section-title-wrapper"> - <div class="dropdown float-right" id="profile-edit-links"> - <button type="button" class="btn btn-outline-secondary btn-sm dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> + <div class="dropdown float-end" id="profile-edit-links"> + <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> @@ -49,7 +49,7 @@ <div class="panel"> <div class="section-subtitle-wrapper" role="tab" id="personal"> <h3> - <a data-toggle="collapse" data-target="#personal-collapse" href="#" aria-expanded="true" aria-controls="personal-collapse"> + <a data-bs-toggle="collapse" data-bs-target="#personal-collapse" href="#" aria-expanded="true" aria-controls="personal-collapse"> {{$personal}} </a> </h3> @@ -69,7 +69,7 @@ {{/if}} {{if $fields.gender}} - <div id="profile-edit-gender-wrapper" class="form-group field select" > + <div id="profile-edit-gender-wrapper" class="mb-3 field select" > <label id="profile-edit-gender-label" for="gender-select" >{{$lbl_gender}}</label> {{if $advanced}} {{$gender}} @@ -86,7 +86,7 @@ {{include file="field_checkbox.tpl" field=$hide_friends}} - <div class="form-group" > + <div class="mb-3" > <button type="submit" name="submit" class="btn btn-primary" value="{{$submit}}">{{$submit}}</button> </div> <div class="clear"></div> @@ -96,7 +96,7 @@ {{if $fields.comms }} - <div id="template-form-vcard-tel" class="form-group form-vcard-tel"> + <div id="template-form-vcard-tel" class="mb-3 form-vcard-tel"> <select name="tel_type[]"> <option value="CELL">{{$mobile}}</option> <option value="HOME">{{$home}}</option> @@ -107,7 +107,7 @@ <i data-remove="vcard-tel" data-id="" class="fa fa-trash-o remove-field drop-icons fakelink"></i> </div> - <div id="template-form-vcard-email" class="form-group form-vcard-email"> + <div id="template-form-vcard-email" class="mb-3 form-vcard-email"> <select name="email_type[]"> <option value="HOME">{{$home}}</option> <option value="WORK">{{$work}}</option> @@ -117,7 +117,7 @@ <i data-remove="vcard-email" data-id="" class="fa fa-trash-o remove-field drop-icons fakelink"></i> </div> - <div id="template-form-vcard-impp" class="form-group form-vcard-impp"> + <div id="template-form-vcard-impp" class="mb-3 form-vcard-impp"> <select name="impp_type[]"> <option value="HOME">{{$home}}</option> <option value="WORK">{{$work}}</option> @@ -129,8 +129,8 @@ <div class="section-content-wrapper-np"> <div id="vcard-cancel-{{$vcard.id}}" class="vcard-cancel vcard-cancel-btn" data-id="{{$vcard.id}}" data-action="cancel"><i class="fa fa-close"></i></div> - <div id="vcard-add-field-{{$vcard.id}}" class="dropdown pull-right vcard-add-field"> - <button data-toggle="dropdown" type="button" class="btn btn-outline-secondary btn-sm dropdown-toggle"><i class="fa fa-plus"></i> {{$add_field}}</button> + <div id="vcard-add-field-{{$vcard.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> <ul class="dropdown-menu"> <li class="add-vcard-tel"><a href="#" data-add="vcard-tel" data-id="{{$vcard.id}}" class="add-field" onclick="return false;">{{$tel_label}}</a></li> <li class="add-vcard-email"><a href="#" data-add="vcard-email" data-id="{{$vcard.id}}" class="add-field" onclick="return false;">{{$email_label}}</a></li> @@ -149,11 +149,11 @@ </div> <div id="vcard-info-{{$vcard.id}}" class="vcard-info section-content-wrapper"> - <div class="vcard-tel form-group"> + <div class="vcard-tel mb-3"> <div class="form-vcard-tel-wrapper"> {{if $vcard.tels}} {{foreach $vcard.tels as $tel}} - <div class="form-group form-vcard-tel"> + <div class="mb-3 form-vcard-tel"> <select name="tel_type[]"> <option value=""{{if $tel.type.0 != 'CELL' && $tel.type.0 != 'HOME' && $tel.type.0 != 'WORK' && $tel.type.0 != 'OTHER'}} selected="selected"{{/if}}>{{$tel.type.1}}</option> <option value="CELL"{{if $tel.type.0 == 'CELL'}} selected="selected"{{/if}}>{{$mobile}}</option> @@ -170,11 +170,11 @@ </div> - <div class="vcard-email form-group"> + <div class="vcard-email mb-3"> <div class="form-vcard-email-wrapper"> {{if $vcard.emails}} {{foreach $vcard.emails as $email}} - <div class="form-group form-vcard-email"> + <div class="mb-3 form-vcard-email"> <select name="email_type[]"> <option value=""{{if $email.type.0 != 'HOME' && $email.type.0 != 'WORK' && $email.type.0 != 'OTHER'}} selected="selected"{{/if}}>{{$email.type.1}}</option> <option value="HOME"{{if $email.type.0 == 'HOME'}} selected="selected"{{/if}}>{{$home}}</option> @@ -189,11 +189,11 @@ </div> </div> - <div class="vcard-impp form-group"> + <div class="vcard-impp mb-3"> <div class="form-vcard-impp-wrapper"> {{if $vcard.impps}} {{foreach $vcard.impps as $impp}} - <div class="form-group form-vcard-impp"> + <div class="mb-3 form-vcard-impp"> <select name="impp_type[]"> <option value=""{{if $impp.type.0 != 'HOME' && $impp.type.0 != 'WORK' && $impp.type.0 != 'OTHER'}} selected="selected"{{/if}}>{{$impp.type.1}}</option> <option value="HOME"{{if $impp.type.0 == 'HOME'}} selected="selected"{{/if}}>{{$home}}</option> @@ -219,7 +219,7 @@ <div class="panel"> <div class="section-subtitle-wrapper" role="tab" id="location"> <h3> - <a data-toggle="collapse" data-target="#location-collapse" href="#" aria-expanded="true" aria-controls="location-collapse"> + <a data-bs-toggle="collapse" data-bs-target="#location-collapse" href="#" aria-expanded="true" aria-controls="location-collapse"> {{$location}} </a> </h3> @@ -250,7 +250,7 @@ {{include file="field_input.tpl" field=$hometown}} {{/if}} - <div class="form-group" > + <div class="mb-3" > <button type="submit" name="submit" class="btn btn-primary" value="{{$submit}}">{{$submit}}</button> </div> <div class="clear"></div> @@ -264,7 +264,7 @@ <div class="panel"> <div class="section-subtitle-wrapper" role="tab" id="relation"> <h3> - <a data-toggle="collapse" data-target="#relation-collapse" href="#" aria-expanded="true" aria-controls="relation-collapse"> + <a data-bs-toggle="collapse" data-bs-target="#relation-collapse" href="#" aria-expanded="true" aria-controls="relation-collapse"> {{$relation}} </a> </h3> @@ -272,7 +272,7 @@ <div id="relation-collapse" class="panel-collapse collapse" data-parent="#profile-edit-wrapper" role="tabpanel" aria-labelledby="relation"> <div class="section-content-tools-wrapper"> {{if $fields.marital }} - <div id="profile-edit-marital-wrapper" class="form-group field" > + <div id="profile-edit-marital-wrapper" class="mb-3 field" > <label id="profile-edit-marital-label" for="profile-edit-marital" ><span class="heart"><i class="fa fa-heart"></i> </span>{{$lbl_marital}}</label> {{if $advanced}} {{$marital}} @@ -292,7 +292,7 @@ {{/if}} {{if $fields.sexual}} - <div id="profile-edit-sexual-wrapper" class="form-group field" > + <div id="profile-edit-sexual-wrapper" class="mb-3 field" > <label id="profile-edit-sexual-label" for="sexual-select" >{{$lbl_sexual}}</label> {{if $advanced}} {{$sexual}} @@ -303,7 +303,7 @@ <div class="clear"></div> {{/if}} - <div class="form-group" > + <div class="mb-3" > <button type="submit" name="submit" class="btn btn-primary" value="{{$submit}}">{{$submit}}</button> </div> <div class="clear"></div> @@ -315,7 +315,7 @@ <div class="panel"> <div class="section-subtitle-wrapper" role="tab" id="miscellaneous"> <h3> - <a data-toggle="collapse" data-target="#miscellaneous-collapse" href="#" aria-expanded="true" aria-controls="miscellaneous-collapse"> + <a data-bs-toggle="collapse" data-bs-target="#miscellaneous-collapse" href="#" aria-expanded="true" aria-controls="miscellaneous-collapse"> {{$miscellaneous}} </a> </h3> @@ -395,7 +395,7 @@ {{include file="field_input.tpl" field=$field}} {{/foreach}} {{/if}} - <div class="form-group" > + <div class="mb-3" > <button type="submit" name="submit" class="btn btn-primary" value="{{$submit}}">{{$submit}}</button> </div> <div class="clear"></div> diff --git a/view/tpl/profile_listing_header.tpl b/view/tpl/profile_listing_header.tpl index 42abf2735..4fa2d6783 100644 --- a/view/tpl/profile_listing_header.tpl +++ b/view/tpl/profile_listing_header.tpl @@ -1,6 +1,6 @@ <div class="generic-content-wrapper"> <div class="section-title-wrapper"> - <a class="btn btn-success btn-sm pull-right" href="{{$cr_new_link}}" id="profile-listing-new-link" title="{{$cr_new}}" ><i class="fa fa-plus-circle"></i> {{$cr_new}}</a> + <a class="btn btn-success btn-sm float-end" href="{{$cr_new_link}}" id="profile-listing-new-link" title="{{$cr_new}}" ><i class="fa fa-plus-circle"></i> {{$cr_new}}</a> <h2>{{$header}}</h2> </div> <div class="section-content-wrapper"> diff --git a/view/tpl/profile_photo.tpl b/view/tpl/profile_photo.tpl index 61d8f4254..c608806ca 100644 --- a/view/tpl/profile_photo.tpl +++ b/view/tpl/profile_photo.tpl @@ -144,7 +144,7 @@ <div class="modal-content"> <div class="modal-header"> <h4 class="modal-title" id="embedPhotoModalLabel">{{$embedPhotosModalTitle}}</h4> - <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button> + <button type="button" class="btn-close" data-bs-dismiss="modal" aria-hidden="true"></button> </div> <div class="modal-body" id="embedPhotoModalBody" > <div id="embedPhotoModalBodyAlbumListDialog" class="d-none"> diff --git a/view/tpl/profile_tabs.tpl b/view/tpl/profile_tabs.tpl index dd9fbc52b..84ebf12bd 100644 --- a/view/tpl/profile_tabs.tpl +++ b/view/tpl/profile_tabs.tpl @@ -1,5 +1,3 @@ -<div class="dropdown-header text-white-50 d-lg-none" ><img src="{{$thumb}}" class="menu-img-1"> {{$name}}</div> -<div class="dropdown-header text-black-50 d-none d-lg-block"><img src="{{$thumb}}" class="menu-img-1"> {{$name}}</div> {{foreach $tabs as $tab}} <a class="dropdown-item{{if $tab.sel}} {{$tab.sel}}{{/if}}" href="{{$tab.url}}"{{if $tab.title}} title="{{$tab.title}}"{{/if}}><i class="fa fa-fw fa-{{$tab.icon}} generic-icons-nav"></i>{{$tab.label}}</a> {{/foreach}} diff --git a/view/tpl/profile_vcard.tpl b/view/tpl/profile_vcard.tpl index 262bf257f..13caf5603 100644 --- a/view/tpl/profile_vcard.tpl +++ b/view/tpl/profile_vcard.tpl @@ -7,9 +7,9 @@ {{/if}} {{if ! $zcard}} {{if $editmenu.multi}} - <div class="dropdown float-right"> - <a class="dropdown-toggle" data-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 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-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 ea7de0b4c..4646d9f88 100644 --- a/view/tpl/prv_message.tpl +++ b/view/tpl/prv_message.tpl @@ -15,12 +15,12 @@ <input type="hidden" name="preview" id="mail-preview" value="0" /> <input type="hidden" name="signature" id="mail-sig" value="" /> {{if $new}} - <div class="form-group"> + <div class="mb-3"> <label for="recip">{{$to}}</label> <input class="form-control" type="text" id="recip" name="messagerecip" value="{{$prefill}}" maxlength="255" /> <input type="hidden" id="recip-complete" name="messageto" value="{{$preid}}"> </div> - <div class="form-group"> + <div class="mb-3"> <label for="prvmail-subject">{{$subject}}</label> <input class="form-control" type="text" maxlength="255" id="prvmail-subject" name="subject" value="{{$subjtxt}}" /> </div> @@ -30,17 +30,17 @@ <input type="hidden" name="messageto" value="{{$recphash}}" /> <input type="hidden" name="subject" value="{{$subjtxt}}" /> {{/if}} - <div class="form-group"> + <div class="mb-3"> <label for="prvmail-text">{{$yourmessage}}</label> <textarea class="form-control" id="prvmail-text" name="body"{{if $new}} style="height: 10em;"{{/if}}>{{$text}}</textarea> </div> - <div id="prvmail-submit-wrapper" class="form-group clearfix"> - <div id="prvmail-submit" class="float-right btn-group"> + <div id="prvmail-submit-wrapper" class="mb-3 clearfix"> + <div id="prvmail-submit" class="float-end btn-group"> <button class="btn btn-outline-secondary btn-sm" id="prvmail-preview" title="{{$preview}}" onclick="preview_mail(); return false;"><i class="fa fa-eye"></i></button> <button class="btn btn-primary btn-sm" type="submit" id="prvmail-submit" name="submit" value="{{$submit}}">{{$submit}}</button> </div> <div id="prvmail-tools" class="btn-toolbar"> - <div class="btn-group mr-2"> + <div class="btn-group me-2"> <button id="main-editor-bold" class="btn btn-outline-secondary btn-sm" title="{{$bold}}" onclick="inserteditortag('b', 'prvmail-text'); return false;"> <i class="fa fa-bold jot-icons"></i> </button> @@ -57,7 +57,7 @@ <i class="fa fa-terminal jot-icons"></i> </button> </div> - <div class="btn-group d-none d-lg-flex mr-2"> + <div class="btn-group d-none d-lg-flex me-2"> <button id="prvmail-attach-wrapper" class="btn btn-outline-secondary btn-sm" > <i id="prvmail-attach" class="fa fa-paperclip jot-icons" title="{{$attach}}"></i> </button> @@ -80,10 +80,10 @@ </div> {{/if}} <div class="btn-group d-lg-none"> - <button type="button" id="more-tools" class="btn btn-outline-secondary btn-sm dropdown-toggle" data-toggle="dropdown" aria-expanded="false"> + <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/rating_slider.tpl b/view/tpl/rating_slider.tpl index 4c36504e6..667dafdd0 100644 --- a/view/tpl/rating_slider.tpl +++ b/view/tpl/rating_slider.tpl @@ -1,4 +1,4 @@ -<div id="rating-slider" class="slider form-group"><input id="rating-range" type="text" name="fake-rating" value="{{$val}}" /></div> +<div id="rating-slider" class="slider mb-3"><input id="rating-range" type="text" name="fake-rating" value="{{$val}}" /></div> <script> $(document).ready(function() { // The slider does not render correct if width is given in % and diff --git a/view/tpl/regate.tpl b/view/tpl/regate.tpl index 57ca2c1b3..e50738b19 100644 --- a/view/tpl/regate.tpl +++ b/view/tpl/regate.tpl @@ -19,7 +19,7 @@ <input type='hidden' name='form_security_token' value='{{$form_security_token}}'> {{include file="field_input.tpl" field=[$acpin.0,$acpin.1,"","","",$atform]}} - <div class="pull-right submit-wrapper"> + <div class="float-end submit-wrapper"> <button type="submit" name="submit" class="btn btn-primary" {{$atform}}>{{$submit}}</button> </div> diff --git a/view/tpl/removeaccount.tpl b/view/tpl/removeaccount.tpl index 6cd554082..3ea2ef070 100644 --- a/view/tpl/removeaccount.tpl +++ b/view/tpl/removeaccount.tpl @@ -8,7 +8,7 @@ <div class="section-content-tools-wrapper"> <form action="{{$basedir}}/removeaccount" autocomplete="off" method="post" > <input type="hidden" name="verify" value="{{$hash}}" /> - <div class="form-group" id="remove-account-pass-wrapper"> + <div class="mb-3" id="remove-account-pass-wrapper"> <label id="remove-account-pass-label" for="remove-account-pass">{{$passwd}}</label> <input class="form-control" type="password" id="remove-account-pass" autocomplete="off" name="qxz_password" value=" " /> </div> diff --git a/view/tpl/removeme.tpl b/view/tpl/removeme.tpl index 814701fff..382808b4d 100644 --- a/view/tpl/removeme.tpl +++ b/view/tpl/removeme.tpl @@ -8,7 +8,7 @@ <div class="section-content-tools-wrapper"> <form action="{{$basedir}}/removeme" autocomplete="off" method="post" > <input type="hidden" name="verify" value="{{$hash}}" /> - <div class="form-group" id="remove-account-pass-wrapper"> + <div class="mb-3" id="remove-account-pass-wrapper"> <label id="remove-account-pass-label" for="remove-account-pass">{{$passwd}}</label> <input class="form-control" type="password" id="remove-account-pass" autocomplete="off" name="qxz_password" value=" " /> </div> diff --git a/view/tpl/rmagic.tpl b/view/tpl/rmagic.tpl index 9d84e4a36..bc181c323 100644 --- a/view/tpl/rmagic.tpl +++ b/view/tpl/rmagic.tpl @@ -1,7 +1,7 @@ <div class="generic-content-wrapper-styled"> <h3>{{$title}}</h3> <form action="rmagic" method="post" > - <div class="form-group"> + <div class="mb-3"> {{include file="field_input.tpl" field=$address}} <input class="btn btn-primary" type="submit" name="submit" id="rmagic-submit-button" value="{{$submit}}" /> </div> diff --git a/view/tpl/search_item.tpl b/view/tpl/search_item.tpl index 49b324f9d..ee89973a8 100644 --- a/view/tpl/search_item.tpl +++ b/view/tpl/search_item.tpl @@ -23,9 +23,9 @@ <div class="p-2 clearfix wall-item-head{{if !$item.title && !$item.event && !$item.photo}} rounded-top{{/if}}{{if $item.is_new && !$item.event && !$item.is_comment}} wall-item-head-new{{/if}}" > <div class="wall-item-info" id="wall-item-info-{{$item.id}}" > <div class="wall-item-photo-wrapper{{if $item.owner_url}} wwfrom{{/if}}" id="wall-item-photo-wrapper-{{$item.id}}"> - <img src="{{$item.thumb}}" class="fakelink wall-item-photo{{$item.sparkle}} u-photo p-name" id="wall-item-photo-{{$item.id}}" alt="{{$item.name}}" data-toggle="dropdown" loading="lazy" /> + <img src="{{$item.thumb}}" class="fakelink wall-item-photo{{$item.sparkle}} u-photo p-name" id="wall-item-photo-{{$item.id}}" alt="{{$item.name}}" data-bs-toggle="dropdown" loading="lazy" /> {{if $item.thread_author_menu}} - <i class="fa fa-caret-down wall-item-photo-caret cursor-pointer" data-toggle="dropdown"></i> + <i class="fa fa-caret-down wall-item-photo-caret cursor-pointer" data-bs-toggle="dropdown"></i> <div class="dropdown-menu"> {{foreach $item.thread_author_menu as $mitem}} <a class="dropdown-item" {{if $mitem.href}}href="{{$mitem.href}}"{{/if}} {{if $mitem.action}}onclick="{{$mitem.action}}"{{/if}} {{if $mitem.title}}title="{{$mitem.title}}"{{/if}} >{{$mitem.title}}</a> @@ -36,7 +36,7 @@ </div> {{if $item.lock}} <div class="wall-item-lock dropdown"> - <i class="fa {{if $item.locktype == 2}}fa-envelope-o{{else}}fa-lock{{/if}} lockview" data-toggle="dropdown" title="{{$item.lock}}" onclick="lockview('item',{{$item.id}});" ></i><ul id="panel-{{$item.id}}" class="lockview-panel dropdown-menu"></ul> + <i class="fa {{if $item.locktype == 2}}fa-envelope-o{{else}}fa-lock{{/if}} lockview" data-bs-toggle="dropdown" title="{{$item.lock}}" onclick="lockview('item',{{$item.id}});" ></i><ul id="panel-{{$item.id}}" class="lockview-panel dropdown-menu"></ul> </div> {{/if}} <div class="wall-item-author"> @@ -65,7 +65,7 @@ </div> {{/if}} <div class="p-2 clearfix wall-item-tools"> - <div class="float-right wall-item-tools-right"> + <div class="float-end wall-item-tools-right"> <div class="btn-group"> <div id="like-rotator-{{$item.id}}" class="spinner-wrapper"> <div class="spinner s"></div> @@ -73,10 +73,10 @@ </div> {{if $item.star || $item.thread_action_menu || $item.drop.dropping}} <div class="btn-group"> - <button type="button" class="btn btn-outline-secondary btn-sm dropdown-toggle" data-toggle="dropdown"> + <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}} @@ -99,7 +99,7 @@ {{/if}} {{if $item.attachments}} <div class="wall-item-tools-left btn-group"> - <button type="button" class="btn btn-outline-secondary btn-sm wall-item-like dropdown-toggle" data-toggle="dropdown" id="attachment-menu-{{$item.id}}"><i class="fa fa-paperclip"></i></button> + <button type="button" class="btn btn-outline-secondary btn-sm wall-item-like dropdown-toggle" data-bs-toggle="dropdown" id="attachment-menu-{{$item.id}}"><i class="fa fa-paperclip"></i></button> <div class="dropdown-menu">{{$item.attachments}}</div> </div> {{/if}} diff --git a/view/tpl/searchbox.tpl b/view/tpl/searchbox.tpl index 0ff526847..ec855dc5c 100644 --- a/view/tpl/searchbox.tpl +++ b/view/tpl/searchbox.tpl @@ -2,11 +2,9 @@ <input type="hidden" name="f" value="" /> <div id="{{$id}}" class="input-group"> <input class="form-control" type="text" name="search" id="search-text" value="{{$s}}" onclick="this.submit();" /> - <div class="input-group-append"> - <button type="submit" name="submit" class="btn btn-sm btn-outline-secondary" id="search-submit" value="{{$search_label}}"><i class="fa fa-search"></i></button> - {{if $savedsearch}} - <button type="submit" name="searchsave" class="btn btn-sm btn-outline-secondary" id="search-save" value="{{$save_label}}"><i class="fa fa-floppy-o"></i></button> - {{/if}} - </div> + <button type="submit" name="submit" class="btn btn-sm btn-outline-secondary" id="search-submit" value="{{$search_label}}"><i class="fa fa-search"></i></button> + {{if $savedsearch}} + <button type="submit" name="searchsave" class="btn btn-sm btn-outline-secondary" id="search-save" value="{{$save_label}}"><i class="fa fa-floppy-o"></i></button> + {{/if}} </div> </form> diff --git a/view/tpl/settings.tpl b/view/tpl/settings.tpl index e185707a8..a3e68f60a 100644 --- a/view/tpl/settings.tpl +++ b/view/tpl/settings.tpl @@ -1,6 +1,6 @@ <div class="generic-content-wrapper"> <div class="section-title-wrapper"> - <a title="{{$removechannel}}" class="btn btn-danger btn-sm pull-right" href="removeme"><i class="fa fa-trash-o"></i> {{$removeme}}</a> + <a title="{{$removechannel}}" class="btn btn-danger btn-sm float-end" href="removeme"><i class="fa fa-trash-o"></i> {{$removeme}}</a> <h2>{{$ptitle}}</h2> <div class="clear"></div> </div> @@ -11,7 +11,7 @@ <div class="panel"> <div class="section-subtitle-wrapper" role="tab" id="basic-settings"> <h3> - <a data-toggle="collapse" data-target="#basic-settings-collapse" href="#"> + <a data-bs-toggle="collapse" data-bs-target="#basic-settings-collapse" href="#"> {{$h_basic}} </a> </h3> @@ -37,7 +37,7 @@ <div class="panel"> <div class="section-subtitle-wrapper" role="tab" id="privacy-settings"> <h3> - <a data-toggle="collapse" data-target="#privacy-settings-collapse" href="#"> + <a data-bs-toggle="collapse" data-bs-target="#privacy-settings-collapse" href="#"> {{$h_prv}} </a> </h3> @@ -47,15 +47,15 @@ {{include file="field_select_grouped.tpl" field=$role}} {{$autoperms}} <div id="advanced-perm" style="display:{{if $permissions_set}}none{{else}}block{{/if}};"> - <div class="form-group"> - <button type="button" class="btn btn-outline-secondary" data-toggle="modal" data-target="#apsModal">{{$lbl_p2macro}}</button> + <div class="mb-3"> + <button type="button" class="btn btn-outline-secondary" data-bs-toggle="modal" data-bs-target="#apsModal">{{$lbl_p2macro}}</button> </div> <div class="modal" id="apsModal"> <div class="modal-dialog"> <div class="modal-content"> <div class="modal-header"> <h4 class="modal-title">{{$lbl_p2macro}}</h4> - <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">×</span></button> + <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button> </div> <div class="modal-body"> {{foreach $permiss_arr as $permit}} @@ -63,14 +63,14 @@ {{/foreach}} </div> <div class="modal-footer"> - <button type="button" class="btn btn-outline-secondary" data-dismiss="modal">Close</button> + <button type="button" class="btn btn-outline-secondary" data-bs-dismiss="modal">Close</button> </div> </div><!-- /.modal-content --> </div><!-- /.modal-dialog --> </div><!-- /.modal --> - <div id="settings-default-perms" class="form-group" > - <button type="button" class="btn btn-outline-secondary" data-toggle="modal" data-target="#aclModal"><i id="jot-perms-icon" class="fa"></i> {{$permissions}}</button> + <div id="settings-default-perms" class="mb-3" > + <button type="button" class="btn btn-outline-secondary" data-bs-toggle="modal" data-bs-target="#aclModal"><i id="jot-perms-icon" class="fa"></i> {{$permissions}}</button> </div> {{$group_select}} {{include file="field_checkbox.tpl" field=$hide_presence}} @@ -97,7 +97,7 @@ <div class="panel"> <div class="section-subtitle-wrapper" role="tab" id="notification-settings"> <h3> - <a data-toggle="collapse" data-target="#notification-settings-collapse" href="#"> + <a data-bs-toggle="collapse" data-bs-target="#notification-settings-collapse" href="#"> {{$h_not}} </a> </h3> diff --git a/view/tpl/settings_account.tpl b/view/tpl/settings_account.tpl index 3eacf3f7a..c81f1abbb 100644 --- a/view/tpl/settings_account.tpl +++ b/view/tpl/settings_account.tpl @@ -1,6 +1,6 @@ <div class="generic-content-wrapper"> <div class="section-title-wrapper"> - <a title="{{$removeaccount}}" class="btn btn-danger btn-sm pull-right" href="removeaccount"><i class="fa fa-trash-o"></i> {{$removeme}}</a> + <a title="{{$removeaccount}}" class="btn btn-danger btn-sm float-end" href="removeaccount"><i class="fa fa-trash-o"></i> {{$removeme}}</a> <h2>{{$title}}</h2> <div class="clear"></div> </div> diff --git a/view/tpl/settings_display.tpl b/view/tpl/settings_display.tpl index c2dd94175..4d6e3f512 100644 --- a/view/tpl/settings_display.tpl +++ b/view/tpl/settings_display.tpl @@ -10,7 +10,7 @@ <div class="panel"> <div class="section-subtitle-wrapper" role="tab" id="theme-settings-title"> <h3> - <a data-toggle="collapse" data-target="#theme-settings-content" href="#" aria-expanded="true" aria-controls="theme-settings-content"> + <a data-bs-toggle="collapse" data-bs-target="#theme-settings-content" href="#" aria-expanded="true" aria-controls="theme-settings-content"> {{$d_tset}} </a> </h3> @@ -33,7 +33,7 @@ <div class="panel"> <div class="section-subtitle-wrapper" role="tab" id="custom-settings-title"> <h3> - <a data-toggle="collapse" data-target="#custom-settings-content" href="" aria-expanded="true" aria-controls="custom-settings-content"> + <a data-bs-toggle="collapse" data-bs-target="#custom-settings-content" href="" aria-expanded="true" aria-controls="custom-settings-content"> {{$d_ctset}} </a> </h3> @@ -49,7 +49,7 @@ <div class="panel"> <div class="section-subtitle-wrapper" role="tab" id="content-settings-title"> <h3> - <a data-toggle="collapse" data-target="#content-settings-content" href="" aria-expanded="true" aria-controls="content-settings-content"> + <a data-bs-toggle="collapse" data-bs-target="#content-settings-content" href="" aria-expanded="true" aria-controls="content-settings-content"> {{$d_cset}} </a> </h3> @@ -59,7 +59,6 @@ {{include file="field_input.tpl" field=$ajaxint}} {{include file="field_input.tpl" field=$itemspage}} {{include file="field_checkbox.tpl" field=$nosmile}} - {{include file="field_checkbox.tpl" field=$channel_menu}} {{include file="field_checkbox.tpl" field=$title_tosource}} {{include file="field_checkbox.tpl" field=$user_scalable}} {{include file="field_checkbox.tpl" field=$preload_images}} diff --git a/view/tpl/settings_features.tpl b/view/tpl/settings_features.tpl index 12c4f44f3..2c359f111 100644 --- a/view/tpl/settings_features.tpl +++ b/view/tpl/settings_features.tpl @@ -10,7 +10,7 @@ <div class="panel"> <div class="section-subtitle-wrapper" role="tab" id="{{$g}}-settings-title"> <h3> - <a data-toggle="collapse" data-target="#{{$g}}-settings-content" href="#" aria-expanded="true" aria-controls="{{$g}}-settings-collapse"> + <a data-bs-toggle="collapse" data-bs-target="#{{$g}}-settings-content" href="#" aria-expanded="true" aria-controls="{{$g}}-settings-collapse"> {{$f.0}} </a> </h3> diff --git a/view/tpl/sharedwithme.tpl b/view/tpl/sharedwithme.tpl index 8474ccd52..653077196 100644 --- a/view/tpl/sharedwithme.tpl +++ b/view/tpl/sharedwithme.tpl @@ -1,6 +1,6 @@ <div class="generic-content-wrapper"> <div class="section-title-wrapper"> - <a href="/sharedwithme/dropall" onclick="return confirmDelete();" class="btn btn-sm btn-outline-secondary pull-right"><i class="fa fa-trash-o"></i> {{$dropall}}</a> + <a href="/sharedwithme/dropall" onclick="return confirmDelete();" class="btn btn-sm btn-outline-secondary float-end"><i class="fa fa-trash-o"></i> {{$dropall}}</a> <h2>{{$header}}</h2> </div> <div class="section-content-wrapper-np"> diff --git a/view/tpl/thing_edit.tpl b/view/tpl/thing_edit.tpl index 62a7c02c8..63b48f6fc 100644 --- a/view/tpl/thing_edit.tpl +++ b/view/tpl/thing_edit.tpl @@ -30,7 +30,7 @@ <div class="thing-end"></div> {{if $lockstate}} - <button id="dbtn-acl" class="btn btn-outline-secondary btn-sm" data-toggle="modal" data-target="#aclModal" onclick="return false;"> + <button id="dbtn-acl" class="btn btn-outline-secondary btn-sm" data-bs-toggle="modal" data-bs-target="#aclModal" onclick="return false;"> <i id="jot-perms-icon" class="fa fa-{{$lockstate}}"></i> </button> {{/if}} diff --git a/view/tpl/thing_input.tpl b/view/tpl/thing_input.tpl index 90fb093e4..d1495aba0 100644 --- a/view/tpl/thing_input.tpl +++ b/view/tpl/thing_input.tpl @@ -30,7 +30,7 @@ <div class="thing-end"></div> {{if $lockstate}} - <button id="dbtn-acl" class="btn btn-outline-secondary btn-sm" data-toggle="modal" data-target="#aclModal" onclick="return false;"> + <button id="dbtn-acl" class="btn btn-outline-secondary btn-sm" data-bs-toggle="modal" data-bs-target="#aclModal" onclick="return false;"> <i id="jot-perms-icon" class="fa fa-{{$lockstate}}"></i> </button> {{/if}} diff --git a/view/tpl/tokens.tpl b/view/tpl/tokens.tpl index 587965832..d1e6d04bc 100644 --- a/view/tpl/tokens.tpl +++ b/view/tpl/tokens.tpl @@ -14,7 +14,7 @@ {{include file="field_input.tpl" field=$name}} {{include file="field_input.tpl" field=$token}} {{include file="field_input.tpl" field=$expires}} - <div class="settings-submit-wrapper form-group"> + <div class="settings-submit-wrapper mb-3"> <button type="submit" name="submit" class="btn btn-primary">{{$submit}}</button> </div> </div> @@ -22,7 +22,7 @@ <div class="panel" id="permission-settings"> <div class="section-subtitle-wrapper" role="tab" id="perms-tool"> <h3> - <a data-toggle="collapse" data-parent="#permission-settings" href="#perms-tool-collapse" aria-expanded="true" aria-controls="perms-tool-collapse"> + <a data-bs-toggle="collapse" data-parent="#permission-settings" href="#perms-tool-collapse" aria-expanded="true" aria-controls="perms-tool-collapse"> {{$permlbl}} </a> </h3> @@ -33,7 +33,7 @@ {{$permnote}} </div> - <table id="perms-tool-table" class=form-group> + <table id="perms-tool-table" class=mb-3> <tr> <td></td><td colspan="2" class="abook-me">{{$me}}</td> </tr> diff --git a/view/tpl/usermenu.tpl b/view/tpl/usermenu.tpl index 535d5b5a8..5a316e806 100644 --- a/view/tpl/usermenu.tpl +++ b/view/tpl/usermenu.tpl @@ -8,7 +8,7 @@ <ul class="pmenu-body{{if $wrap || !$class}} nav nav-pills flex-column{{elseif !$wrap || $class}} {{$class}}{{/if}}"> {{foreach $items as $mitem }} <li id="pmenu-item-{{$mitem.mitem_id}}" class="nav-item pmenu-item{{if $mitem.submenu}} dropdown{{/if}}"> - <a href="{{if $mitem.submenu}}#{{else}}{{$mitem.mitem_link}}{{/if}}" class="nav-link {{if $mitem.submenu}} dropdown-toggle{{/if}}"{{if $mitem.submenu}} data-toggle="dropdown"{{/if}}{{if $mitem.newwin}}target="_blank"{{/if}} rel="nofollow noopener">{{$mitem.mitem_desc}}{{if $mitem.submenu}}<span class="caret"></span>{{/if}}</a> + <a href="{{if $mitem.submenu}}#{{else}}{{$mitem.mitem_link}}{{/if}}" class="nav-link {{if $mitem.submenu}} dropdown-toggle{{/if}}"{{if $mitem.submenu}} data-bs-toggle="dropdown"{{/if}}{{if $mitem.newwin}}target="_blank"{{/if}} rel="nofollow noopener">{{$mitem.mitem_desc}}{{if $mitem.submenu}}<span class="caret"></span>{{/if}}</a> {{if $mitem.submenu}}{{$mitem.submenu}}{{/if}} </li> {{/foreach }} diff --git a/view/tpl/viewcontact_template.tpl b/view/tpl/viewcontact_template.tpl index cbbf3a97c..317cb20ce 100644 --- a/view/tpl/viewcontact_template.tpl +++ b/view/tpl/viewcontact_template.tpl @@ -7,7 +7,7 @@ {{include file="contact_template.tpl"}} {{/foreach}} {{** make sure this element is at the bottom - we rely on that in endless scroll **}} - <div id="page-end" class="float-left w-100"></div> + <div id="page-end" class="float-start w-100"></div> </div> </div> <script>$(document).ready(function() { loadingPage = false;});</script> diff --git a/view/tpl/webpage_export_list.tpl b/view/tpl/webpage_export_list.tpl index b22b3818a..6360500d8 100644 --- a/view/tpl/webpage_export_list.tpl +++ b/view/tpl/webpage_export_list.tpl @@ -2,14 +2,14 @@ <form action="" method="post" autocomplete="on" > <input type="hidden" name="action" value="{{$action}}"> <div class="section-title-wrapper"> - <div class="pull-right"> + <div class="float-end"> <button class="btn btn-md btn-success" type="submit" name="submit" value="{{$exportbtn}}">{{$exportbtn}}</button> </div> <h2>{{$title}}</h2> <div class="clear"></div> </div> <div id="import-website-content-wrapper" class="section-content-wrapper"> - <div class="pull-left"> + <div class="float-start"> <button id="toggle-select-all" class="btn btn-sm btn-primary" onclick="checkedAll(window.isChecked); return false;"><i class="fa fa-check"></i> Toggle Select All</button> </div> <div class="clear"></div> diff --git a/view/tpl/webpage_import.tpl b/view/tpl/webpage_import.tpl index 955288c1e..5af42ea04 100644 --- a/view/tpl/webpage_import.tpl +++ b/view/tpl/webpage_import.tpl @@ -2,14 +2,14 @@ <form action="" method="post" autocomplete="on" > <input type="hidden" name="action" value="importselected"> <div class="section-title-wrapper"> - <div class="pull-right"> + <div class="float-end"> <button class="btn btn-md btn-success" type="submit" name="submit" value="{{$importbtn}}">{{$importbtn}}</button> </div> <h2>{{$title}}</h2> <div class="clear"></div> </div> <div id="import-website-content-wrapper" class="section-content-wrapper"> - <div class="pull-left"> + <div class="float-start"> <button id="toggle-select-all" class="btn btn-sm btn-primary" onclick="checkedAll(window.isChecked); return false;"><i class="fa fa-check"></i> Toggle Select All</button> </div> <div class="clear"></div> diff --git a/view/tpl/webpagelist.tpl b/view/tpl/webpagelist.tpl index 1c909b9b8..995a73930 100644 --- a/view/tpl/webpagelist.tpl +++ b/view/tpl/webpagelist.tpl @@ -1,7 +1,7 @@ <div class="generic-content-wrapper"> <div class="section-title-wrapper"> {{if $editor}} - <div class="pull-right"> + <div class="float-end"> <button id="webpage-create-btn" class="btn btn-sm btn-success acl-form-trigger" onclick="openClose('webpage-editor');" data-form_id="profile-jot-form"><i class="fa fa-pencil-square-o"></i> {{$create}}</button> </div> {{/if}} @@ -41,7 +41,7 @@ </td> <td class="webpage-list-tool dropdown"> {{if $item.lockstate=='lock'}} - <i class="fa fa-lock lockview" data-toggle="dropdown" onclick="lockview('item',{{$item.url}});" ></i> + <i class="fa fa-lock lockview" data-bs-toggle="dropdown" onclick="lockview('item',{{$item.url}});" ></i> <ul id="panel-{{$item.url}}" class="lockview-panel dropdown-menu"></ul> {{/if}} </td> diff --git a/view/tpl/website_portation_tools.tpl b/view/tpl/website_portation_tools.tpl index 0d131cb17..f27d67ca2 100644 --- a/view/tpl/website_portation_tools.tpl +++ b/view/tpl/website_portation_tools.tpl @@ -6,18 +6,18 @@ <form enctype="multipart/form-data" method="post" action=""> <input type="hidden" name="action" value="scan"> <p class="descriptive-text">{{$file_import_text}}</p> - <div class="form-group"> + <div class="mb-3"> <input class="form-control" type="text" name="path" title="{{$hint}}" placeholder="{{$desc}}" /> </div> - <div class="form-group"> + <div class="mb-3"> <button class="btn btn-primary btn-sm" type="submit" name="cloudsubmit" value="{{$select}}">Submit</button> </div> <!-- Or upload a zipped file containing the website --> <p class="descriptive-text">{{$file_upload_text}}</p> - <div class="form-group"> + <div class="mb-3"> <input class="form-control-file w-100" type="file" name="zip_file" /> </div> - <div class="form-group"> + <div class="mb-3"> <button class="btn btn-primary btn-sm" type="submit" name="w_upload" value="w_upload">Submit</button> </div> </form> @@ -32,10 +32,10 @@ <input type="hidden" name="action" value="exportzipfile"> <!-- Or download a zipped file containing the website --> <p class="descriptive-text">{{$file_download_text}}</p> - <div class="form-group"> + <div class="mb-3"> <input class="form-control" type="text" name="zipfilename" title="{{$filename_hint}}" placeholder="{{$filename_desc}}" value="" /> </div> - <div class="form-group"> + <div class="mb-3"> <button class="btn btn-primary btn-sm" type="submit" name="w_download" value="w_download">Submit</button> </div> </form> @@ -47,10 +47,10 @@ <input type="hidden" name="action" value="exportcloud"> <!-- Or export the website elements to a cloud files folder --> <p style="margin-top: 10px;" class="descriptive-text">{{$cloud_export_text}}</p> - <div class="form-group"> + <div class="mb-3"> <input class="form-control" type="text" name="exportcloudpath" title="{{$cloud_export_hint}}" placeholder="{{$cloud_export_desc}}" /> </div> - <div class="form-group"> + <div class="mb-3"> <button class="btn btn-primary btn-sm" type="submit" name="exportcloudsubmit" value="{{$cloud_export_select}}">Submit</button> </div> </form> diff --git a/view/tpl/wiki.tpl b/view/tpl/wiki.tpl index 8556d8bad..33d4dd097 100644 --- a/view/tpl/wiki.tpl +++ b/view/tpl/wiki.tpl @@ -1,19 +1,19 @@ <div class="generic-content-wrapper"> <div class="section-title-wrapper"> - <div class="pull-right"> + <div class="float-end"> <span class="text-muted wiki-typename">[{{$typename}}] </span> {{if $showPageControls}} <div id="page-tools" class="btn-group" style="display: none;"> - <button type="button" class="btn btn-outline-secondary btn-sm dropdown-toggle" data-toggle="dropdown"> + <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}} <a id="embed-image" class="dropdown-item" href="#"><i class="fa fa-fw fa-picture-o"></i> Embed Image</a> </div> - </div> + </div> {{/if}} <button type="button" class="btn btn-outline-secondary btn-sm" title="{{$sharePage}}" onclick="window.location.href='rpost?f=&body={{$shareLink}}';"><i class="fa fa-fw fa-share"></i></button> <button id="fullscreen-btn" type="button" class="btn btn-outline-secondary btn-sm" onclick="makeFullScreen(); adjustFullscreenEditorHeight();"><i class="fa fa-expand"></i></button> @@ -28,8 +28,8 @@ <div id="rename-page-form-wrapper" class="section-content-tools-wrapper" style="display:none;"> <form id="rename-page-form" action="wiki/rename/page" method="post" > {{include file="field_input.tpl" field=$pageRename}} - <div class="form-group"> - <div class="pull-right"> + <div class="mb-3"> + <div class="float-end"> <button id="rename-page-submit" class="btn btn-primary" type="submit" name="submit">Submit</button> </div> <div> @@ -41,9 +41,9 @@ </div> <div id="wiki-content-container" class="section-content-wrapper"> <ul class="nav nav-tabs" id="wiki-nav-tabs"> - <li class="nav-item" id="edit-pane-tab"><a class="nav-link" data-toggle="tab" href="#edit-pane">{{$editOrSourceLabel}}</a></li> - <li class="nav-item"><a class="nav-link active" data-toggle="tab" href="#preview-pane" id="wiki-get-preview">{{$view_lbl}}</a></li> - <li class="nav-item"><a class="nav-link" data-toggle="tab" href="#page-history-pane" id="wiki-get-history">{{$history_lbl}}</a></li> + <li class="nav-item" id="edit-pane-tab"><a class="nav-link" data-bs-toggle="tab" href="#edit-pane">{{$editOrSourceLabel}}</a></li> + <li class="nav-item"><a class="nav-link active" data-bs-toggle="tab" href="#preview-pane" id="wiki-get-preview">{{$view_lbl}}</a></li> + <li class="nav-item"><a class="nav-link" data-bs-toggle="tab" href="#page-history-pane" id="wiki-get-history">{{$history_lbl}}</a></li> </ul> <div class="tab-content" id="wiki-page-tabs"> <div id="edit-pane" class="tab-pane"> @@ -67,9 +67,7 @@ <div id="id_{{$commitMsg.0}}_wrapper" class="field input" style="display: none"> <div class="input-group"> <input class="form-control" name="{{$commitMsg.0}}" id="id_{{$commitMsg.0}}" type="text" value="{{$commitMsg.2}}"{{if $commitMsg.5}} {{$commitMsg.5}}{{/if}}> - <div class="input-group-append"> - <button id="save-page" type="button" class="btn btn-sm btn-primary disabled">Save</button> - </div> + <button id="save-page" type="button" class="btn btn-sm btn-primary disabled">Save</button> </div> </div> {{/if}} @@ -84,7 +82,7 @@ <div class="modal-content"> <div class="modal-header"> <h4 class="modal-title" id="embedPhotoModalLabel">{{$embedPhotosModalTitle}}</h4> - <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button> + <button type="button" class="btn-close" data-bs-dismiss="modal" aria-hidden="true"></button> </div> <div class="modal-body" id="embedPhotoModalBody" > <div id="embedPhotoModalBodyAlbumListDialog" class="d-none"> @@ -114,10 +112,10 @@ $( "#rename-page-form" ).submit(function( event ) { $.post("wiki/{{$channel_address}}/rename/page", { - oldName: window.wiki_page_name, - newName: $('#id_pageRename').val(), + oldName: window.wiki_page_name, + newName: $('#id_pageRename').val(), resource_id: window.wiki_resource_id - }, + }, function (data) { if (data.success) { $('#rename-page-form-wrapper').hide(); @@ -128,7 +126,7 @@ } else { window.console.log('Error renaming page.'); } - }, 'json'); + }, 'json'); event.preventDefault(); }); @@ -253,11 +251,11 @@ return false; } $.post("wiki/{{$channel_address}}/save/page", { - content: currentContent, + content: currentContent, commitMsg: $('#id_commitMsg').val(), - name: window.wiki_page_name, + name: window.wiki_page_name, resource_id: window.wiki_resource_id - }, + }, function (data) { if (data.success) { window.saved = true; @@ -273,7 +271,7 @@ window.editor.focus(); // Return focus to the editor for continued editing // $('#wiki-get-history').click(); } else { - alert('Error saving page.'); // TODO: Replace alerts with auto-timeout popups + alert('Error saving page.'); // TODO: Replace alerts with auto-timeout popups window.console.log('Error saving page.'); } }, 'json'); @@ -309,11 +307,11 @@ return false; } $.post("wiki/{{$channel_address}}/compare/page", { - compareCommit: compareCommit, - currentCommit: window.wiki_page_commit, - name: window.wiki_page_name, + compareCommit: compareCommit, + currentCommit: window.wiki_page_commit, + name: window.wiki_page_name, resource_id: window.wiki_resource_id - }, + }, function (data) { console.log(data); if (data.success) { diff --git a/view/tpl/wiki_page_list.tpl b/view/tpl/wiki_page_list.tpl index e11f3b145..4f99587c2 100644 --- a/view/tpl/wiki_page_list.tpl +++ b/view/tpl/wiki_page_list.tpl @@ -27,7 +27,7 @@ <div id="wiki_page_options" style="display: none"> {{$mimetype}} </div> - <div class="float-right fakelink" onClick="openClose('wiki_page_options')"> + <div class="float-end fakelink" onClick="openClose('wiki_page_options')"> {{$options}} </div> {{/if}} diff --git a/view/tpl/wiki_page_not_found.tpl b/view/tpl/wiki_page_not_found.tpl index bc8afeb53..8fdee4596 100644 --- a/view/tpl/wiki_page_not_found.tpl +++ b/view/tpl/wiki_page_not_found.tpl @@ -10,7 +10,7 @@ <div id="wiki_missing_page_options" style="display: none"> {{$mimetype}} </div> - <div class="float-right fakelink" onClick="openClose('wiki_missing_page_options')"> + <div class="float-end fakelink" onClick="openClose('wiki_missing_page_options')"> {{$options}} </div> {{/if}} diff --git a/view/tpl/wikilist.tpl b/view/tpl/wikilist.tpl index 5f28d6b12..bc8461dac 100644 --- a/view/tpl/wikilist.tpl +++ b/view/tpl/wikilist.tpl @@ -1,7 +1,7 @@ <div class="generic-content-wrapper"> <div class="section-title-wrapper clearfix"> {{if $owner}} - <button type="button" class="btn btn-success btn-sm pull-right acl-form-trigger" onclick="openClose('new-wiki-form-wrapper');" data-form_id="new-wiki-form"><i class="fa fa-plus-circle"></i> {{$create}}</button> + <button type="button" class="btn btn-success btn-sm float-end acl-form-trigger" onclick="openClose('new-wiki-form-wrapper');" data-form_id="new-wiki-form"><i class="fa fa-plus-circle"></i> {{$create}}</button> {{/if}} <h2>{{$header}}</h2> </div> @@ -13,8 +13,8 @@ {{include file="field_checkbox.tpl" field=$typelock}} {{include file="field_checkbox.tpl" field=$notify}} <div> - <div class="btn-group pull-right"> - <button id="dbtn-acl" class="btn btn-outline-secondary btn-sm" data-toggle="modal" data-target="#aclModal" title="Permission settings" onclick="return false;"> + <div class="btn-group float-end"> + <button id="dbtn-acl" class="btn btn-outline-secondary btn-sm" data-bs-toggle="modal" data-bs-target="#aclModal" title="Permission settings" onclick="return false;"> <i id="jot-perms-icon" class="fa fa-{{$lockstate}} jot-icons"></i> </button> <button id="new-wiki-submit" class="btn btn-primary btn-sm" type="submit" name="submit" >{{$submit}}</button> @@ -47,8 +47,8 @@ {{/if}} <td class="dropdown"> {{if $wiki.lockstate == 'lock'}} - <i class="fa fa-lock lockview" data-toggle="dropdown" onclick="lockview('item',{{$wiki.id}});"></i> - <ul id="panel-{{$wiki.id}}" class="lockview-panel dropdown-menu dropdown-menu-right"></ul> + <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-end"></ul> {{/if}} </td> <td><i class="fa fa-download" onclick="wiki_download_wiki('{{$wiki.resource_id}}'); return false;"></i></td> @@ -62,8 +62,8 @@ <form id="edit-wiki-form-{{$wiki.id}}" method="post" action="wiki/{{$channel}}/update/wiki" class="acl-form" data-form_id="edit-wiki-form-{{$wiki.id}}" data-allow_cid='{{$wiki.json_allow_cid}}' data-allow_gid='{{$wiki.json_allow_gid}}' data-deny_cid='{{$wiki.json_deny_cid}}' data-deny_gid='{{$wiki.json_deny_gid}}'> <input type="hidden" name="origRawName" value="{{$wiki.title}}"> {{include file="field_input.tpl" field=['updateRawName', $edit_wiki_name, $wiki.title]}} - <div class="btn-group float-right"> - <button class="btn btn-outline-secondary btn-sm" data-toggle="modal" data-target="#aclModal" type="button"> + <div class="btn-group float-end"> + <button class="btn btn-outline-secondary btn-sm" data-bs-toggle="modal" data-bs-target="#aclModal" type="button"> <i class="jot-perms-icon fa fa-{{$wiki.lockstate}}"></i> </button> <button class="btn btn-primary btn-sm" type="submit" value="edit">Submit</button> |