From 58d1d4c1fb7d25cff6e82f1011ee1e2439720e27 Mon Sep 17 00:00:00 2001 From: Michael Date: Wed, 5 Feb 2025 22:46:01 +0000 Subject: [PATCH] Accessibility: Widgets and other menues --- view/js/main.js | 6 +- view/lang/C/messages.po | 272 +++++++++--------- view/templates/admin/aside.tpl | 43 ++- view/templates/circle_side.tpl | 88 +++--- view/templates/generic_links_widget.tpl | 12 +- view/templates/message_side.tpl | 12 +- view/templates/moderation/aside.tpl | 21 +- .../moderation/report/create/aside.tpl | 46 +-- view/templates/photo_albums.tpl | 24 +- view/templates/shared_content.tpl | 12 +- view/templates/widget/accounts.tpl | 36 +-- view/templates/widget/community_sharer.tpl | 30 +- view/templates/widget/events.tpl | 14 +- view/templates/widget/filter.tpl | 42 +-- view/templates/widget/follow.tpl | 15 +- view/templates/widget/group_list.tpl | 83 +++--- view/templates/widget/peoplefind.tpl | 14 +- view/templates/widget/posted_date.tpl | 97 ++++--- view/templates/widget/saved_searches.tpl | 42 +-- view/templates/widget/tagcloud.tpl | 38 +-- view/templates/widget/trending_tags.tpl | 111 ++++--- view/theme/frio/css/style.css | 11 +- view/theme/frio/php/standard.php | 2 +- view/theme/frio/templates/admin/aside.tpl | 79 +++-- view/theme/frio/templates/circle_side.tpl | 111 ++++--- view/theme/frio/templates/common_tabs.tpl | 23 +- view/theme/frio/templates/message_side.tpl | 14 +- .../theme/frio/templates/moderation/aside.tpl | 36 +-- view/theme/frio/templates/nav.tpl | 4 +- view/theme/frio/templates/photo_albums.tpl | 34 +-- view/theme/frio/templates/profile/vcard.tpl | 157 +++++----- view/theme/frio/templates/sub/direction.tpl | 50 ++-- view/theme/frio/templates/wall_thread.tpl | 10 +- view/theme/frio/templates/widget/follow.tpl | 5 +- .../frio/templates/widget/peoplefind.tpl | 8 +- .../frio/templates/widget/saved_searches.tpl | 50 ++-- 36 files changed, 848 insertions(+), 804 deletions(-) diff --git a/view/js/main.js b/view/js/main.js index 01501a5b27..76c105a005 100644 --- a/view/js/main.js +++ b/view/js/main.js @@ -65,10 +65,12 @@ function openCloseWidget(inflated, deflated) { elInf.style.display = "block"; elDef.style.display = "none"; localStorage.setItem(window.location.pathname.split("/")[1] + ":" + inflated, "block"); + elInf.querySelector("button").focus(); } else { elInf.style.display = "none"; elDef.style.display = "block"; localStorage.setItem(window.location.pathname.split("/")[1] + ":" + inflated, "none"); + elDef.querySelector("button").focus(); } } @@ -251,7 +253,7 @@ $(function() { $('#nav-notifications-menu, aside').perfectScrollbar(); /* nav update event */ - $('nav').bind('nav-update', function(e, data) { + $('#topbar-first').bind('nav-update', function(e, data) { var invalid = data.invalid || 0; if (invalid == 1) { window.location.href=window.location.href @@ -495,7 +497,7 @@ function NavUpdate() { $.get(pingCmd, function(data) { if (data.result) { // send nav-update event - $('nav').trigger('nav-update', data.result); + $('#topbar-first').trigger('nav-update', data.result); // start live update ['network', 'profile', 'channel', 'community', 'notes', 'display', 'contact'].forEach(function (src) { diff --git a/view/lang/C/messages.po b/view/lang/C/messages.po index bd75b8803f..3cfb90c731 100644 --- a/view/lang/C/messages.po +++ b/view/lang/C/messages.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: 2025.02-dev\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2025-02-04 05:51+0000\n" +"POT-Creation-Date: 2025-02-05 22:44+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -210,7 +210,7 @@ msgstr "" msgid "Your password has been changed at %s" msgstr "" -#: mod/message.php:33 mod/message.php:115 src/Content/Nav.php:308 +#: mod/message.php:33 mod/message.php:115 src/Content/Nav.php:317 msgid "New Message" msgstr "" @@ -236,7 +236,7 @@ msgstr "" msgid "Discard" msgstr "" -#: mod/message.php:122 src/Content/Nav.php:305 view/theme/frio/theme.php:230 +#: mod/message.php:122 src/Content/Nav.php:314 view/theme/frio/theme.php:230 msgid "Messages" msgstr "" @@ -646,108 +646,108 @@ msgstr "" msgid "Map" msgstr "" -#: src/App.php:415 +#: src/App.php:442 msgid "Apologies but the website is unavailable at the moment." msgstr "" -#: src/App/Page.php:241 +#: src/App/Page.php:247 msgid "Delete this item?" msgstr "" -#: src/App/Page.php:242 +#: src/App/Page.php:248 msgid "Block this author? They won't be able to follow you nor see your public posts, and you won't be able to see their posts and their notifications." msgstr "" -#: src/App/Page.php:243 +#: src/App/Page.php:249 msgid "Ignore this author? You won't be able to see their posts and their notifications." msgstr "" -#: src/App/Page.php:244 +#: src/App/Page.php:250 msgid "Collapse this author's posts?" msgstr "" -#: src/App/Page.php:245 +#: src/App/Page.php:251 msgid "Ignore this author's server?" msgstr "" -#: src/App/Page.php:246 src/Module/Settings/Server/Action.php:47 +#: src/App/Page.php:252 src/Module/Settings/Server/Action.php:47 #: src/Module/Settings/Server/Index.php:94 msgid "You won't see any content from this server including reshares in your Network page, the community pages and individual conversations." msgstr "" -#: src/App/Page.php:248 +#: src/App/Page.php:254 msgid "Like not successful" msgstr "" -#: src/App/Page.php:249 +#: src/App/Page.php:255 msgid "Dislike not successful" msgstr "" -#: src/App/Page.php:250 +#: src/App/Page.php:256 msgid "Sharing not successful" msgstr "" -#: src/App/Page.php:251 +#: src/App/Page.php:257 msgid "Attendance unsuccessful" msgstr "" -#: src/App/Page.php:252 +#: src/App/Page.php:258 msgid "Backend error" msgstr "" -#: src/App/Page.php:253 +#: src/App/Page.php:259 msgid "Network error" msgstr "" -#: src/App/Page.php:256 +#: src/App/Page.php:262 msgid "Drop files here to upload" msgstr "" -#: src/App/Page.php:257 +#: src/App/Page.php:263 msgid "Your browser does not support drag and drop file uploads." msgstr "" -#: src/App/Page.php:258 +#: src/App/Page.php:264 msgid "Please use the fallback form below to upload your files like in the olden days." msgstr "" -#: src/App/Page.php:259 +#: src/App/Page.php:265 msgid "File is too big ({{filesize}}MiB). Max filesize: {{maxFilesize}}MiB." msgstr "" -#: src/App/Page.php:260 +#: src/App/Page.php:266 msgid "You can't upload files of this type." msgstr "" -#: src/App/Page.php:261 +#: src/App/Page.php:267 msgid "Server responded with {{statusCode}} code." msgstr "" -#: src/App/Page.php:262 +#: src/App/Page.php:268 msgid "Cancel upload" msgstr "" -#: src/App/Page.php:263 +#: src/App/Page.php:269 msgid "Upload canceled." msgstr "" -#: src/App/Page.php:264 +#: src/App/Page.php:270 msgid "Are you sure you want to cancel this upload?" msgstr "" -#: src/App/Page.php:265 +#: src/App/Page.php:271 msgid "Remove file" msgstr "" -#: src/App/Page.php:266 +#: src/App/Page.php:272 msgid "You can't upload any more files." msgstr "" -#: src/App/Page.php:350 +#: src/App/Page.php:356 msgid "toggle mobile" msgstr "" -#: src/App/Page.php:359 src/Module/Admin/Logs/View.php:92 +#: src/App/Page.php:367 src/Module/Admin/Logs/View.php:92 #: view/theme/frio/php/minimal.php:39 view/theme/frio/php/standard.php:138 msgid "Close" msgstr "" @@ -1645,178 +1645,178 @@ msgstr "" msgid "Favourite Posts" msgstr "" -#: src/Content/Feature.php:93 +#: src/Content/Feature.php:104 msgid "General Features" msgstr "" -#: src/Content/Feature.php:95 +#: src/Content/Feature.php:106 msgid "Photo Location" msgstr "" -#: src/Content/Feature.php:95 +#: src/Content/Feature.php:106 msgid "Photo metadata is normally stripped. This extracts the location (if present) prior to stripping metadata and links it to a map." msgstr "" -#: src/Content/Feature.php:96 +#: src/Content/Feature.php:107 msgid "Display the community in the navigation" msgstr "" -#: src/Content/Feature.php:96 +#: src/Content/Feature.php:107 msgid "If enabled, the community can be accessed via the navigation menu. Independent from this setting, the community timelines can always be accessed via the channels." msgstr "" -#: src/Content/Feature.php:101 +#: src/Content/Feature.php:112 msgid "Post Composition Features" msgstr "" -#: src/Content/Feature.php:102 +#: src/Content/Feature.php:113 msgid "Explicit Mentions" msgstr "" -#: src/Content/Feature.php:102 +#: src/Content/Feature.php:113 msgid "Add explicit mentions to comment box for manual control over who gets mentioned in replies." msgstr "" -#: src/Content/Feature.php:103 +#: src/Content/Feature.php:114 msgid "Add an abstract from ActivityPub content warnings" msgstr "" -#: src/Content/Feature.php:103 +#: src/Content/Feature.php:114 msgid "Add an abstract when commenting on ActivityPub posts with a content warning. Abstracts are displayed as content warning on systems like Mastodon or Pleroma." msgstr "" -#: src/Content/Feature.php:108 +#: src/Content/Feature.php:119 msgid "Post/Comment Tools" msgstr "" -#: src/Content/Feature.php:109 +#: src/Content/Feature.php:120 msgid "Post Categories" msgstr "" -#: src/Content/Feature.php:109 +#: src/Content/Feature.php:120 msgid "Add categories to your posts" msgstr "" -#: src/Content/Feature.php:114 +#: src/Content/Feature.php:125 msgid "Network Widgets" msgstr "" -#: src/Content/Feature.php:115 src/Content/Widget.php:230 +#: src/Content/Feature.php:126 src/Content/Widget.php:230 #: src/Model/Circle.php:587 src/Module/Contact.php:380 #: src/Module/Welcome.php:62 msgid "Circles" msgstr "" -#: src/Content/Feature.php:115 +#: src/Content/Feature.php:126 msgid "Display posts that have been created by accounts of the selected circle." msgstr "" -#: src/Content/Feature.php:116 src/Content/GroupManager.php:128 -#: src/Content/Nav.php:265 src/Content/Text/HTML.php:868 +#: src/Content/Feature.php:127 src/Content/GroupManager.php:128 +#: src/Content/Nav.php:274 src/Content/Text/HTML.php:868 #: src/Content/Widget.php:555 src/Model/User.php:1393 msgid "Groups" msgstr "" -#: src/Content/Feature.php:116 +#: src/Content/Feature.php:127 msgid "Display posts that have been distributed by the selected group." msgstr "" -#: src/Content/Feature.php:117 src/Content/Widget.php:524 +#: src/Content/Feature.php:128 src/Content/Widget.php:524 msgid "Archives" msgstr "" -#: src/Content/Feature.php:117 +#: src/Content/Feature.php:128 msgid "Display an archive where posts can be selected by month and year." msgstr "" -#: src/Content/Feature.php:118 src/Content/Widget.php:303 +#: src/Content/Feature.php:129 src/Content/Widget.php:303 msgid "Protocols" msgstr "" -#: src/Content/Feature.php:118 +#: src/Content/Feature.php:129 msgid "Display posts with the selected protocols." msgstr "" -#: src/Content/Feature.php:119 src/Content/Widget.php:561 +#: src/Content/Feature.php:130 src/Content/Widget.php:561 #: src/Module/Settings/Account.php:391 msgid "Account Types" msgstr "" -#: src/Content/Feature.php:119 +#: src/Content/Feature.php:130 msgid "Display posts done by accounts with the selected account type." msgstr "" -#: src/Content/Feature.php:120 src/Content/Widget.php:610 +#: src/Content/Feature.php:131 src/Content/Widget.php:610 #: src/Module/Admin/Site.php:463 src/Module/BaseSettings.php:113 #: src/Module/Settings/Channels.php:211 src/Module/Settings/Display.php:323 msgid "Channels" msgstr "" -#: src/Content/Feature.php:120 +#: src/Content/Feature.php:131 msgid "Display posts in the system channels and user defined channels." msgstr "" -#: src/Content/Feature.php:121 src/Content/Widget/SavedSearches.php:46 +#: src/Content/Feature.php:132 src/Content/Widget/SavedSearches.php:46 msgid "Saved Searches" msgstr "" -#: src/Content/Feature.php:121 +#: src/Content/Feature.php:132 msgid "Display posts that contain subscribed hashtags." msgstr "" -#: src/Content/Feature.php:122 src/Content/Widget.php:333 +#: src/Content/Feature.php:133 src/Content/Widget.php:333 msgid "Saved Folders" msgstr "" -#: src/Content/Feature.php:122 +#: src/Content/Feature.php:133 msgid "Display a list of folders in which posts are stored." msgstr "" -#: src/Content/Feature.php:123 src/Module/Conversation/Timeline.php:189 +#: src/Content/Feature.php:134 src/Module/Conversation/Timeline.php:189 msgid "Own Contacts" msgstr "" -#: src/Content/Feature.php:123 +#: src/Content/Feature.php:134 msgid "Include or exclude posts from subscribed accounts. This widget is not visible on all channels." msgstr "" -#: src/Content/Feature.php:124 +#: src/Content/Feature.php:135 msgid "Trending Tags" msgstr "" -#: src/Content/Feature.php:124 +#: src/Content/Feature.php:135 msgid "Display a list of the most popular tags in recent public posts." msgstr "" -#: src/Content/Feature.php:129 +#: src/Content/Feature.php:140 msgid "Advanced Profile Settings" msgstr "" -#: src/Content/Feature.php:130 +#: src/Content/Feature.php:141 msgid "Tag Cloud" msgstr "" -#: src/Content/Feature.php:130 +#: src/Content/Feature.php:141 msgid "Provide a personal tag cloud on your profile page" msgstr "" -#: src/Content/Feature.php:131 +#: src/Content/Feature.php:142 msgid "Display Membership Date" msgstr "" -#: src/Content/Feature.php:131 +#: src/Content/Feature.php:142 msgid "Display membership date in profile" msgstr "" -#: src/Content/Feature.php:136 +#: src/Content/Feature.php:147 msgid "Advanced Calendar Settings" msgstr "" -#: src/Content/Feature.php:137 +#: src/Content/Feature.php:148 msgid "Allow anonymous access to your calendar" msgstr "" -#: src/Content/Feature.php:137 +#: src/Content/Feature.php:148 msgid "Allows anonymous visitors to consult your calendar and your public events. Contact birthday events are private to you." msgstr "" @@ -1932,83 +1932,83 @@ msgstr "" msgid "Unable to fetch user." msgstr "" -#: src/Content/Nav.php:107 +#: src/Content/Nav.php:112 msgid "Nothing new here" msgstr "" -#: src/Content/Nav.php:111 src/Content/Nav.php:238 src/Content/Nav.php:295 +#: src/Content/Nav.php:116 src/Content/Nav.php:247 src/Content/Nav.php:304 msgid "Home" msgstr "" -#: src/Content/Nav.php:112 +#: src/Content/Nav.php:117 msgid "Skip to main content" msgstr "" -#: src/Content/Nav.php:113 +#: src/Content/Nav.php:118 msgid "Clear notifications" msgstr "" -#: src/Content/Nav.php:114 src/Content/Text/HTML.php:855 +#: src/Content/Nav.php:119 src/Content/Text/HTML.php:855 msgid "@name, !group, #tags, content" msgstr "" -#: src/Content/Nav.php:209 src/Module/Security/Login.php:146 +#: src/Content/Nav.php:218 src/Module/Security/Login.php:146 msgid "Logout" msgstr "" -#: src/Content/Nav.php:209 +#: src/Content/Nav.php:218 msgid "End this session" msgstr "" -#: src/Content/Nav.php:211 src/Module/Bookmarklet.php:30 +#: src/Content/Nav.php:220 src/Module/Bookmarklet.php:30 #: src/Module/Security/Login.php:147 msgid "Login" msgstr "" -#: src/Content/Nav.php:211 +#: src/Content/Nav.php:220 msgid "Sign in" msgstr "" -#: src/Content/Nav.php:216 src/Module/BaseProfile.php:42 +#: src/Content/Nav.php:225 src/Module/BaseProfile.php:42 #: src/Module/Contact.php:492 msgid "Conversations" msgstr "" -#: src/Content/Nav.php:216 +#: src/Content/Nav.php:225 msgid "Conversations you started" msgstr "" -#: src/Content/Nav.php:217 src/Module/BaseProfile.php:34 +#: src/Content/Nav.php:226 src/Module/BaseProfile.php:34 #: src/Module/BaseSettings.php:86 src/Module/Contact.php:484 #: src/Module/Contact/Profile.php:431 src/Module/Profile/Profile.php:259 #: src/Module/Welcome.php:43 view/theme/frio/theme.php:219 msgid "Profile" msgstr "" -#: src/Content/Nav.php:217 view/theme/frio/theme.php:219 +#: src/Content/Nav.php:226 view/theme/frio/theme.php:219 msgid "Your profile page" msgstr "" -#: src/Content/Nav.php:218 src/Module/BaseProfile.php:50 +#: src/Content/Nav.php:227 src/Module/BaseProfile.php:50 #: src/Module/Media/Photo/Browser.php:62 view/theme/frio/theme.php:223 msgid "Photos" msgstr "" -#: src/Content/Nav.php:218 view/theme/frio/theme.php:223 +#: src/Content/Nav.php:227 view/theme/frio/theme.php:223 msgid "Your photos" msgstr "" -#: src/Content/Nav.php:219 src/Module/BaseProfile.php:58 +#: src/Content/Nav.php:228 src/Module/BaseProfile.php:58 #: src/Module/BaseProfile.php:61 src/Module/Contact.php:508 #: view/theme/frio/theme.php:224 msgid "Media" msgstr "" -#: src/Content/Nav.php:219 view/theme/frio/theme.php:224 +#: src/Content/Nav.php:228 view/theme/frio/theme.php:224 msgid "Your postings with media" msgstr "" -#: src/Content/Nav.php:220 src/Content/Nav.php:280 +#: src/Content/Nav.php:229 src/Content/Nav.php:289 #: src/Module/BaseProfile.php:70 src/Module/BaseProfile.php:73 #: src/Module/BaseProfile.php:81 src/Module/BaseProfile.php:84 #: src/Module/Settings/Display.php:324 view/theme/frio/theme.php:225 @@ -2016,32 +2016,32 @@ msgstr "" msgid "Calendar" msgstr "" -#: src/Content/Nav.php:220 view/theme/frio/theme.php:225 +#: src/Content/Nav.php:229 view/theme/frio/theme.php:225 msgid "Your calendar" msgstr "" -#: src/Content/Nav.php:221 +#: src/Content/Nav.php:230 msgid "Personal notes" msgstr "" -#: src/Content/Nav.php:221 +#: src/Content/Nav.php:230 msgid "Your personal notes" msgstr "" -#: src/Content/Nav.php:238 src/Module/Settings/OAuth.php:59 +#: src/Content/Nav.php:247 src/Module/Settings/OAuth.php:59 msgid "Home Page" msgstr "" -#: src/Content/Nav.php:242 src/Module/Register.php:161 +#: src/Content/Nav.php:251 src/Module/Register.php:161 #: src/Module/Security/Login.php:113 msgid "Register" msgstr "" -#: src/Content/Nav.php:242 +#: src/Content/Nav.php:251 msgid "Create an account" msgstr "" -#: src/Content/Nav.php:248 src/Module/Help.php:53 +#: src/Content/Nav.php:257 src/Module/Help.php:53 #: src/Module/Settings/TwoFactor/AppSpecific.php:118 #: src/Module/Settings/TwoFactor/Index.php:125 #: src/Module/Settings/TwoFactor/Recovery.php:96 @@ -2049,158 +2049,158 @@ msgstr "" msgid "Help" msgstr "" -#: src/Content/Nav.php:248 +#: src/Content/Nav.php:257 msgid "Help and documentation" msgstr "" -#: src/Content/Nav.php:252 +#: src/Content/Nav.php:261 msgid "Apps" msgstr "" -#: src/Content/Nav.php:252 +#: src/Content/Nav.php:261 msgid "Addon applications, utilities, games" msgstr "" -#: src/Content/Nav.php:256 src/Content/Text/HTML.php:853 +#: src/Content/Nav.php:265 src/Content/Text/HTML.php:853 #: src/Module/Admin/Logs/View.php:74 src/Module/Search/Index.php:99 msgid "Search" msgstr "" -#: src/Content/Nav.php:256 +#: src/Content/Nav.php:265 msgid "Search site content" msgstr "" -#: src/Content/Nav.php:259 src/Content/Text/HTML.php:862 +#: src/Content/Nav.php:268 src/Content/Text/HTML.php:862 msgid "Full Text" msgstr "" -#: src/Content/Nav.php:260 src/Content/Text/HTML.php:863 +#: src/Content/Nav.php:269 src/Content/Text/HTML.php:863 #: src/Content/Widget/TagCloud.php:54 msgid "Tags" msgstr "" -#: src/Content/Nav.php:261 src/Content/Nav.php:316 +#: src/Content/Nav.php:270 src/Content/Nav.php:325 #: src/Content/Text/HTML.php:864 src/Module/BaseProfile.php:112 #: src/Module/BaseProfile.php:115 src/Module/Contact.php:406 #: src/Module/Contact.php:516 view/theme/frio/theme.php:232 msgid "Contacts" msgstr "" -#: src/Content/Nav.php:276 +#: src/Content/Nav.php:285 msgid "Community" msgstr "" -#: src/Content/Nav.php:276 +#: src/Content/Nav.php:285 msgid "Conversations on this and other servers" msgstr "" -#: src/Content/Nav.php:283 +#: src/Content/Nav.php:292 msgid "Directory" msgstr "" -#: src/Content/Nav.php:283 +#: src/Content/Nav.php:292 msgid "People directory" msgstr "" -#: src/Content/Nav.php:285 src/Module/BaseAdmin.php:71 +#: src/Content/Nav.php:294 src/Module/BaseAdmin.php:71 #: src/Module/BaseModeration.php:97 msgid "Information" msgstr "" -#: src/Content/Nav.php:285 +#: src/Content/Nav.php:294 msgid "Information about this friendica instance" msgstr "" -#: src/Content/Nav.php:288 src/Module/Admin/Tos.php:64 +#: src/Content/Nav.php:297 src/Module/Admin/Tos.php:64 #: src/Module/BaseAdmin.php:81 src/Module/Register.php:169 #: src/Module/Tos.php:87 msgid "Terms of Service" msgstr "" -#: src/Content/Nav.php:288 +#: src/Content/Nav.php:297 msgid "Terms of Service of this Friendica instance" msgstr "" -#: src/Content/Nav.php:293 view/theme/frio/theme.php:228 +#: src/Content/Nav.php:302 view/theme/frio/theme.php:228 msgid "Network" msgstr "" -#: src/Content/Nav.php:293 view/theme/frio/theme.php:228 +#: src/Content/Nav.php:302 view/theme/frio/theme.php:228 msgid "Conversations from your friends" msgstr "" -#: src/Content/Nav.php:295 view/theme/frio/theme.php:218 +#: src/Content/Nav.php:304 view/theme/frio/theme.php:218 msgid "Your posts and conversations" msgstr "" -#: src/Content/Nav.php:299 +#: src/Content/Nav.php:308 msgid "Introductions" msgstr "" -#: src/Content/Nav.php:299 +#: src/Content/Nav.php:308 msgid "Friend Requests" msgstr "" -#: src/Content/Nav.php:300 src/Module/BaseNotifications.php:134 +#: src/Content/Nav.php:309 src/Module/BaseNotifications.php:134 #: src/Module/Notifications/Introductions.php:61 msgid "Notifications" msgstr "" -#: src/Content/Nav.php:301 +#: src/Content/Nav.php:310 msgid "See all notifications" msgstr "" -#: src/Content/Nav.php:302 src/Module/Settings/Connectors.php:226 +#: src/Content/Nav.php:311 src/Module/Settings/Connectors.php:226 msgid "Mark as seen" msgstr "" -#: src/Content/Nav.php:302 +#: src/Content/Nav.php:311 msgid "Mark all system notifications as seen" msgstr "" -#: src/Content/Nav.php:305 view/theme/frio/theme.php:230 +#: src/Content/Nav.php:314 view/theme/frio/theme.php:230 msgid "Private mail" msgstr "" -#: src/Content/Nav.php:306 +#: src/Content/Nav.php:315 msgid "Inbox" msgstr "" -#: src/Content/Nav.php:307 +#: src/Content/Nav.php:316 msgid "Outbox" msgstr "" -#: src/Content/Nav.php:311 +#: src/Content/Nav.php:320 msgid "Accounts" msgstr "" -#: src/Content/Nav.php:311 +#: src/Content/Nav.php:320 msgid "Manage other pages" msgstr "" -#: src/Content/Nav.php:314 src/Module/Admin/Addons/Details.php:98 +#: src/Content/Nav.php:323 src/Module/Admin/Addons/Details.php:98 #: src/Module/Admin/Themes/Details.php:85 src/Module/BaseSettings.php:177 #: src/Module/Welcome.php:38 view/theme/frio/theme.php:231 msgid "Settings" msgstr "" -#: src/Content/Nav.php:314 view/theme/frio/theme.php:231 +#: src/Content/Nav.php:323 view/theme/frio/theme.php:231 msgid "Account settings" msgstr "" -#: src/Content/Nav.php:316 view/theme/frio/theme.php:232 +#: src/Content/Nav.php:325 view/theme/frio/theme.php:232 msgid "Manage/edit friends and contacts" msgstr "" -#: src/Content/Nav.php:321 src/Module/BaseAdmin.php:105 +#: src/Content/Nav.php:330 src/Module/BaseAdmin.php:105 msgid "Admin" msgstr "" -#: src/Content/Nav.php:321 +#: src/Content/Nav.php:330 msgid "Site setup and configuration" msgstr "" -#: src/Content/Nav.php:322 src/Module/BaseModeration.php:117 +#: src/Content/Nav.php:331 src/Module/BaseModeration.php:117 #: src/Module/Moderation/Blocklist/Contact.php:98 #: src/Module/Moderation/Blocklist/Server/Add.php:110 #: src/Module/Moderation/Blocklist/Server/Import.php:105 @@ -2214,15 +2214,15 @@ msgstr "" msgid "Moderation" msgstr "" -#: src/Content/Nav.php:322 +#: src/Content/Nav.php:331 msgid "Content and user moderation" msgstr "" -#: src/Content/Nav.php:325 +#: src/Content/Nav.php:334 msgid "Navigation" msgstr "" -#: src/Content/Nav.php:325 +#: src/Content/Nav.php:334 msgid "Site map" msgstr "" diff --git a/view/templates/admin/aside.tpl b/view/templates/admin/aside.tpl index 65ecafa4c0..27b48dc453 100644 --- a/view/templates/admin/aside.tpl +++ b/view/templates/admin/aside.tpl @@ -6,43 +6,42 @@ *}} {{foreach $subpages as $page}} -

{{$page.0}}

- +

{{$page.0}}

+ {{/foreach}} {{if $admin.update}} - + {{/if}} {{if $admin.addons_admin}}

{{$plugadmtxt}}

-
    - {{foreach $admin.addons_admin as $name => $item}} - - {{/foreach}} -
-{{/if}} - - +
    + {{foreach $admin.addons_admin as $name => $item}} + + {{/foreach}} +
+{{/if}} \ No newline at end of file diff --git a/view/templates/circle_side.tpl b/view/templates/circle_side.tpl index 200205eb0c..2407cb70ee 100644 --- a/view/templates/circle_side.tpl +++ b/view/templates/circle_side.tpl @@ -4,51 +4,51 @@ * * SPDX-License-Identifier: AGPL-3.0-or-later *}} - -

{{$title}}

- -
- -

{{$title}}

+ + initWidget('circle-sidebar', 'circle-sidebar-inflated'); + \ No newline at end of file diff --git a/view/templates/generic_links_widget.tpl b/view/templates/generic_links_widget.tpl index 45b058a1be..2cd3056b8f 100644 --- a/view/templates/generic_links_widget.tpl +++ b/view/templates/generic_links_widget.tpl @@ -5,14 +5,14 @@ * SPDX-License-Identifier: AGPL-3.0-or-later *}} -
+
+ + \ No newline at end of file diff --git a/view/templates/message_side.tpl b/view/templates/message_side.tpl index e2295fee21..05fb79a16b 100644 --- a/view/templates/message_side.tpl +++ b/view/templates/message_side.tpl @@ -4,13 +4,13 @@ * * SPDX-License-Identifier: AGPL-3.0-or-later *}} -
- +
+ \ No newline at end of file diff --git a/view/templates/moderation/aside.tpl b/view/templates/moderation/aside.tpl index ca95ab3ff2..3515c4a06f 100644 --- a/view/templates/moderation/aside.tpl +++ b/view/templates/moderation/aside.tpl @@ -6,21 +6,22 @@ *}} {{foreach $subpages as $page}} -

{{$page.0}}

- -{{/foreach}} +

{{$page.0}}

+ +{{/foreach}} \ No newline at end of file diff --git a/view/templates/moderation/report/create/aside.tpl b/view/templates/moderation/report/create/aside.tpl index 91b380945e..920051597c 100644 --- a/view/templates/moderation/report/create/aside.tpl +++ b/view/templates/moderation/report/create/aside.tpl @@ -4,28 +4,28 @@ * * SPDX-License-Identifier: AGPL-3.0-or-later *}} -
+
+ {{if $category}} +

{{$category}}

+ {{/if}} + {{if $rules}} +

{{$l10n.rules_title}}

+
    + {{foreach $rules as $rule_id => $rule_text}} +
  1. {{$rule_text}}
    2. + {{/foreach}} +
+ {{/if}} + {{if $comment}} +

{{$l10n.comment_title}}

+

{{$comment nofilter}}

+ {{/if}} + {{if $posts}} +

{{$l10n.posts_title}} ({{$posts}})

+ {{/if}} + \ No newline at end of file diff --git a/view/templates/photo_albums.tpl b/view/templates/photo_albums.tpl index 3e0d37e338..dcf9f344b3 100644 --- a/view/templates/photo_albums.tpl +++ b/view/templates/photo_albums.tpl @@ -4,7 +4,7 @@ * * SPDX-License-Identifier: AGPL-3.0-or-later *}} - + \ No newline at end of file diff --git a/view/templates/shared_content.tpl b/view/templates/shared_content.tpl index 6430bdbe24..c729104d1f 100644 --- a/view/templates/shared_content.tpl +++ b/view/templates/shared_content.tpl @@ -7,7 +7,7 @@
{{if $avatar}} - + {{/if}} @@ -19,25 +19,25 @@

{{if $guid}} - + {{/if}} {{$posted}} {{if $guid}} - + {{/if}}

{{if $network_svg && $link}} - {{$network_name}} - {{$link_title}} + {{$network_name}} - {{$link_title}} {{elseif $link}} {{$network_name}} {{elseif $network_svg}} - {{$network_name}} - {{$link_title}} + {{$network_name}} - {{$link_title}} {{else}} {{$network_name}} {{/if}}
{{$content nofilter}}
-
+ \ No newline at end of file diff --git a/view/templates/widget/accounts.tpl b/view/templates/widget/accounts.tpl index da784872e9..5c01d0cd2c 100644 --- a/view/templates/widget/accounts.tpl +++ b/view/templates/widget/accounts.tpl @@ -4,21 +4,25 @@ * * SPDX-License-Identifier: AGPL-3.0-or-later *}} - -

{{$title}}

- - + + + initWidget('sidebar-accounts', 'sidebar-accounts-inflated'); + \ No newline at end of file diff --git a/view/templates/widget/community_sharer.tpl b/view/templates/widget/community_sharer.tpl index f4e1527c28..d72befda88 100644 --- a/view/templates/widget/community_sharer.tpl +++ b/view/templates/widget/community_sharer.tpl @@ -4,18 +4,22 @@ * * SPDX-License-Identifier: AGPL-3.0-or-later *}} - -

{{$title}}

- - + + + initWidget('sidebar-community-no-sharer', 'sidebar-community-no-sharer-inflated'); + \ No newline at end of file diff --git a/view/templates/widget/events.tpl b/view/templates/widget/events.tpl index 54df4f282d..151738871f 100644 --- a/view/templates/widget/events.tpl +++ b/view/templates/widget/events.tpl @@ -5,11 +5,11 @@ * SPDX-License-Identifier: AGPL-3.0-or-later *}} - + + \ No newline at end of file diff --git a/view/templates/widget/filter.tpl b/view/templates/widget/filter.tpl index 3e502fd95a..9390cb5fee 100644 --- a/view/templates/widget/filter.tpl +++ b/view/templates/widget/filter.tpl @@ -4,23 +4,29 @@ * * SPDX-License-Identifier: AGPL-3.0-or-later *}} - -

{{$title}}

- -
- -

{{$title}}

+
+
+ +
{{$desc nofilter}}
+ +
+ + initWidget('{{$type}}-sidebar', '{{$type}}-sidebar-inflated'); + \ No newline at end of file diff --git a/view/templates/widget/follow.tpl b/view/templates/widget/follow.tpl index f980dacd3a..f7840ab2cb 100644 --- a/view/templates/widget/follow.tpl +++ b/view/templates/widget/follow.tpl @@ -5,11 +5,10 @@ * SPDX-License-Identifier: AGPL-3.0-or-later *}} -
-

{{$connect}}

-
{{$desc nofilter}}
-
- -
-
- + \ No newline at end of file diff --git a/view/templates/widget/group_list.tpl b/view/templates/widget/group_list.tpl index b42041a7b6..e2b966de2b 100644 --- a/view/templates/widget/group_list.tpl +++ b/view/templates/widget/group_list.tpl @@ -5,67 +5,66 @@ * SPDX-License-Identifier: AGPL-3.0-or-later *}} - - -

{{$title}}

+ + initWidget('group-list-sidebar', 'group-list-sidebar-inflated'); + \ No newline at end of file diff --git a/view/templates/widget/peoplefind.tpl b/view/templates/widget/peoplefind.tpl index 17ea7cb07d..86c1040bae 100644 --- a/view/templates/widget/peoplefind.tpl +++ b/view/templates/widget/peoplefind.tpl @@ -5,19 +5,19 @@ * SPDX-License-Identifier: AGPL-3.0-or-later *}} -
+
- + \ No newline at end of file diff --git a/view/templates/widget/posted_date.tpl b/view/templates/widget/posted_date.tpl index 2b34e18ba1..07831f6070 100644 --- a/view/templates/widget/posted_date.tpl +++ b/view/templates/widget/posted_date.tpl @@ -5,59 +5,64 @@ * SPDX-License-Identifier: AGPL-3.0-or-later *}} - -

{{$title}}

- -
- -

{{$title}}

+
+ + initWidget('datebrowse-sidebar', 'datebrowse-sidebar-inflated'); + \ No newline at end of file diff --git a/view/templates/widget/saved_searches.tpl b/view/templates/widget/saved_searches.tpl index 2439ef04e5..e4e1c2f2e8 100644 --- a/view/templates/widget/saved_searches.tpl +++ b/view/templates/widget/saved_searches.tpl @@ -4,25 +4,29 @@ * * SPDX-License-Identifier: AGPL-3.0-or-later *}} - -

{{$title}}

- -
- - +
> + + initWidget('saved-search-list', 'saved-search-list-inflated'); + \ No newline at end of file diff --git a/view/templates/widget/tagcloud.tpl b/view/templates/widget/tagcloud.tpl index ae44c081ef..0eb69f8bc2 100644 --- a/view/templates/widget/tagcloud.tpl +++ b/view/templates/widget/tagcloud.tpl @@ -4,23 +4,27 @@ * * SPDX-License-Identifier: AGPL-3.0-or-later *}} - -

{{$title}}

- -
- -

{{$title}}

- + + initWidget('tagblock', 'tagblock-inflated'); + \ No newline at end of file diff --git a/view/templates/widget/trending_tags.tpl b/view/templates/widget/trending_tags.tpl index 06be1e0e4f..9058da5480 100644 --- a/view/templates/widget/trending_tags.tpl +++ b/view/templates/widget/trending_tags.tpl @@ -4,66 +4,65 @@ * * SPDX-License-Identifier: AGPL-3.0-or-later *}} - -

{{$title}}

- - +
+ + {{/if}} + + + initWidget('trending-tags-sidebar', 'trending-tags-sidebar-inflated'); + \ No newline at end of file diff --git a/view/theme/frio/css/style.css b/view/theme/frio/css/style.css index 85acd0a3bc..af73b8b9fe 100644 --- a/view/theme/frio/css/style.css +++ b/view/theme/frio/css/style.css @@ -3120,17 +3120,24 @@ details.profile-jot-net[open] summary:before { .fakelink > h3:before { padding-right: 10px; } -.widget.fakelink > h3:before { +span.widget > .fakelink > h3:before { font-family: ForkAwesome; content: "\f0da"; /* Right Plain Pointer */ + margin-left: 4px; } -.widget > .fakelink > h3:before, +div.widget > .fakelink > h3:before, #sidebar-circle-header > .fakelink > h3:before, #sidebar-group-header > .fakelink > h3:before { font-family: ForkAwesome; content: "\f0d7"; /* Bottom Plain Pointer */ } +.widget button.fakelink { + border-style: none; + background-color: transparent; + padding: 0px; +} + h3.connector { line-height: 40px; } diff --git a/view/theme/frio/php/standard.php b/view/theme/frio/php/standard.php index 2e67828ea1..b8e6a125e3 100644 --- a/view/theme/frio/php/standard.php +++ b/view/theme/frio/php/standard.php @@ -109,7 +109,7 @@ if(!empty($page['content'])) { {{foreach $subpages as $page}} - {{/foreach}} {{if $admin.addons_admin}} - -{{/if}} - + +{{/if}} \ No newline at end of file diff --git a/view/theme/frio/templates/circle_side.tpl b/view/theme/frio/templates/circle_side.tpl index 3c2930841a..50d335ede5 100644 --- a/view/theme/frio/templates/circle_side.tpl +++ b/view/theme/frio/templates/circle_side.tpl @@ -4,63 +4,62 @@ * * SPDX-License-Identifier: AGPL-3.0-or-later *}} - -

{{$title}}

- -
- -
- + + initWidget('circle-sidebar', 'circle-sidebar-inflated'); + \ No newline at end of file diff --git a/view/theme/frio/templates/common_tabs.tpl b/view/theme/frio/templates/common_tabs.tpl index f1d2d6959e..64dc9aedfb 100644 --- a/view/theme/frio/templates/common_tabs.tpl +++ b/view/theme/frio/templates/common_tabs.tpl @@ -4,7 +4,7 @@ * * SPDX-License-Identifier: AGPL-3.0-or-later *}} - + \ No newline at end of file diff --git a/view/theme/frio/templates/message_side.tpl b/view/theme/frio/templates/message_side.tpl index 160acd02d4..cf35a2333f 100644 --- a/view/theme/frio/templates/message_side.tpl +++ b/view/theme/frio/templates/message_side.tpl @@ -4,13 +4,13 @@ * * SPDX-License-Identifier: AGPL-3.0-or-later *}} -
+
+ \ No newline at end of file diff --git a/view/theme/frio/templates/moderation/aside.tpl b/view/theme/frio/templates/moderation/aside.tpl index 49f96aa9af..6e149239ae 100644 --- a/view/theme/frio/templates/moderation/aside.tpl +++ b/view/theme/frio/templates/moderation/aside.tpl @@ -6,8 +6,8 @@ *}} {{foreach $subpages as $page}} -
-

{{$page.0}}

- -
-{{/foreach}} + +{{/foreach}} \ No newline at end of file diff --git a/view/theme/frio/templates/nav.tpl b/view/theme/frio/templates/nav.tpl index 0f2c30e2f3..6aa876a002 100644 --- a/view/theme/frio/templates/nav.tpl +++ b/view/theme/frio/templates/nav.tpl @@ -31,7 +31,7 @@
- +
{{* This is the right part of the NavBar. It includes the search and the user menu *}}
diff --git a/view/theme/frio/templates/photo_albums.tpl b/view/theme/frio/templates/photo_albums.tpl index c37381897d..956102df02 100644 --- a/view/theme/frio/templates/photo_albums.tpl +++ b/view/theme/frio/templates/photo_albums.tpl @@ -4,18 +4,18 @@ * * SPDX-License-Identifier: AGPL-3.0-or-later *}} - + \ No newline at end of file diff --git a/view/theme/frio/templates/profile/vcard.tpl b/view/theme/frio/templates/profile/vcard.tpl index ac1fe54eae..a3f6d28df0 100644 --- a/view/theme/frio/templates/profile/vcard.tpl +++ b/view/theme/frio/templates/profile/vcard.tpl @@ -10,9 +10,10 @@ {{$profile.name}}
{{if $profile.edit}} -
- -
+
+ +
{{/if}}
@@ -36,7 +37,8 @@

{{$profile.name}}

- {{if $profile.addr}}
{{include file="sub/punct_wrap.tpl" text=$profile.addr}}
{{/if}} + {{if $profile.addr}}
{{include file="sub/punct_wrap.tpl" text=$profile.addr}}
+ {{/if}} {{if $profile.about}}
{{$profile.about nofilter}}
{{/if}} @@ -44,81 +46,82 @@
{{if $follow_link || $unfollow_link || $wallmessage_link}} -
{{if $contact_block}} -
- {{$contact_block nofilter}} -
-{{/if}} + +{{/if}} \ No newline at end of file diff --git a/view/theme/frio/templates/sub/direction.tpl b/view/theme/frio/templates/sub/direction.tpl index 0b48dad6e5..c3944d1c6c 100644 --- a/view/theme/frio/templates/sub/direction.tpl +++ b/view/theme/frio/templates/sub/direction.tpl @@ -5,28 +5,28 @@ * SPDX-License-Identifier: AGPL-3.0-or-later *}} {{if $direction.direction > 0}} - - - {{if $direction.direction == 1}} - - {{elseif $direction.direction == 2}} - - {{elseif $direction.direction == 3}} - - {{elseif $direction.direction == 4}} - - {{elseif $direction.direction == 5}} - - {{elseif $direction.direction == 6}} - - {{elseif $direction.direction == 7}} - - {{elseif $direction.direction == 8}} - - {{elseif $direction.direction == 9}} - - {{elseif $direction.direction == 10}} - - {{/if}} - -{{/if}} + + + {{if $direction.direction == 1}} + + {{elseif $direction.direction == 2}} + + {{elseif $direction.direction == 3}} + + {{elseif $direction.direction == 4}} + + {{elseif $direction.direction == 5}} + + {{elseif $direction.direction == 6}} + + {{elseif $direction.direction == 7}} + + {{elseif $direction.direction == 8}} + + {{elseif $direction.direction == 9}} + + {{elseif $direction.direction == 10}} + + {{/if}} + +{{/if}} \ No newline at end of file diff --git a/view/theme/frio/templates/wall_thread.tpl b/view/theme/frio/templates/wall_thread.tpl index c573749baf..60bea3f9cf 100644 --- a/view/theme/frio/templates/wall_thread.tpl +++ b/view/theme/frio/templates/wall_thread.tpl @@ -203,7 +203,9 @@ as the value of $top_child_total (this is done at the end of this file) {{/if}} {{if $item.connector}} - + + + {{else}} @@ -246,8 +248,10 @@ as the value of $top_child_total (this is done at the end of this file) {{include file="sub/direction.tpl" direction=$item.direction}} {{/if}} {{if $item.connector}} - - + + + + {{else}} diff --git a/view/theme/frio/templates/widget/follow.tpl b/view/theme/frio/templates/widget/follow.tpl index 2e679f9f5d..b469bfd368 100644 --- a/view/theme/frio/templates/widget/follow.tpl +++ b/view/theme/frio/templates/widget/follow.tpl @@ -5,7 +5,7 @@ * SPDX-License-Identifier: AGPL-3.0-or-later *}} -
+
- - + \ No newline at end of file diff --git a/view/theme/frio/templates/widget/peoplefind.tpl b/view/theme/frio/templates/widget/peoplefind.tpl index 3ead29c9a5..02b3501794 100644 --- a/view/theme/frio/templates/widget/peoplefind.tpl +++ b/view/theme/frio/templates/widget/peoplefind.tpl @@ -4,7 +4,7 @@ * * SPDX-License-Identifier: AGPL-3.0-or-later *}} -
+
+ \ No newline at end of file diff --git a/view/theme/frio/templates/widget/saved_searches.tpl b/view/theme/frio/templates/widget/saved_searches.tpl index d3d12edda9..7c47ec1b2f 100644 --- a/view/theme/frio/templates/widget/saved_searches.tpl +++ b/view/theme/frio/templates/widget/saved_searches.tpl @@ -5,26 +5,30 @@ * SPDX-License-Identifier: AGPL-3.0-or-later *}} {{if $saved}} - -

{{$title}}

- -
- - - - -
-
- -{{/if}} + + +{{/if}} \ No newline at end of file