]> git.mxchange.org Git - friendica.git/commitdiff
Accessibility: Widgets and other menues
authorMichael <heluecht@pirati.ca>
Wed, 5 Feb 2025 22:46:01 +0000 (22:46 +0000)
committerMichael <heluecht@pirati.ca>
Wed, 5 Feb 2025 22:52:39 +0000 (22:52 +0000)
36 files changed:
view/js/main.js
view/lang/C/messages.po
view/templates/admin/aside.tpl
view/templates/circle_side.tpl
view/templates/generic_links_widget.tpl
view/templates/message_side.tpl
view/templates/moderation/aside.tpl
view/templates/moderation/report/create/aside.tpl
view/templates/photo_albums.tpl
view/templates/shared_content.tpl
view/templates/widget/accounts.tpl
view/templates/widget/community_sharer.tpl
view/templates/widget/events.tpl
view/templates/widget/filter.tpl
view/templates/widget/follow.tpl
view/templates/widget/group_list.tpl
view/templates/widget/peoplefind.tpl
view/templates/widget/posted_date.tpl
view/templates/widget/saved_searches.tpl
view/templates/widget/tagcloud.tpl
view/templates/widget/trending_tags.tpl
view/theme/frio/css/style.css
view/theme/frio/php/standard.php
view/theme/frio/templates/admin/aside.tpl
view/theme/frio/templates/circle_side.tpl
view/theme/frio/templates/common_tabs.tpl
view/theme/frio/templates/message_side.tpl
view/theme/frio/templates/moderation/aside.tpl
view/theme/frio/templates/nav.tpl
view/theme/frio/templates/photo_albums.tpl
view/theme/frio/templates/profile/vcard.tpl
view/theme/frio/templates/sub/direction.tpl
view/theme/frio/templates/wall_thread.tpl
view/theme/frio/templates/widget/follow.tpl
view/theme/frio/templates/widget/peoplefind.tpl
view/theme/frio/templates/widget/saved_searches.tpl

index 01501a5b270d7c378e7dd15ff12a645d30e73485..76c105a005637d344c0f55098700ffcc9062ac17 100644 (file)
@@ -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) {
index bd75b8803f88ce4b79bae564d88794b7f1e1a9e7..3cfb90c7310426485fd31c5e3f7653a370426bad 100644 (file)
@@ -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 <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\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 ""
 
index 65ecafa4c05d66971990646c0ff9ea6ab66a12d6..27b48dc45369581dc14d3cec666cb23fa9e53baa 100644 (file)
@@ -6,43 +6,42 @@
   *}}
 <script>
        // update pending count //
-       $(function(){
+       $(function() {
 
-               $("nav").bind('nav-update',  function(e,data){
+               $('#topbar-first').bind('nav-update', function(e, data) {
                        var elm = $('#pending-update');
                        var register = $(data).find('register').html();
-                       if (register=="0") { register=""; elm.hide();} else { elm.show(); }
+                       if (register == "0") { register = "";
+                               elm.hide(); } else { elm.show(); }
                        elm.html(register);
                });
        });
 </script>
 
 {{foreach $subpages as $page}}
-<h4>{{$page.0}}</h4>
-<ul class="admin linklist" role="menu">
-{{foreach $page.1 as $item}}
-       <li class='admin link button {{$item.2}}' role="menuitem"><a href='{{$item.0}}'>{{$item.1}}</a></li>
-{{/foreach}}
-</ul>
+       <h4>{{$page.0}}</h4>
+       <ul class="admin linklist" role="menu">
+               {{foreach $page.1 as $item}}
+                       <li class='admin link button {{$item.2}}' role="menuitem"><a href='{{$item.0}}'>{{$item.1}}</a></li>
+               {{/foreach}}
+       </ul>
 {{/foreach}}
 
 
 
 {{if $admin.update}}
-<ul class='admin linklist'>
-       <li class='admin link button {{$admin.update.2}}'><a href='{{$admin.update.0}}'>{{$admin.update.1}}</a></li>
-</ul>
+       <ul class='admin linklist'>
+               <li class='admin link button {{$admin.update.2}}'><a href='{{$admin.update.0}}'>{{$admin.update.1}}</a></li>
+       </ul>
 {{/if}}
 
 
 {{if $admin.addons_admin}}<h4>{{$plugadmtxt}}</h4>
-<ul class='admin linklist'>
-       {{foreach $admin.addons_admin as $name => $item}}
-       <li role="menuitem" class="admin link button {{$item.class}}">
-               <a href="{{$item.url}}">{{$item.name}}</a>
-       </li>
-       {{/foreach}}
-</ul>
-{{/if}}
-       
-       
+       <ul class='admin linklist'>
+               {{foreach $admin.addons_admin as $name => $item}}
+                       <li role="menuitem" class="admin link button {{$item.class}}">
+                               <a href="{{$item.url}}">{{$item.name}}</a>
+                       </li>
+               {{/foreach}}
+       </ul>
+{{/if}}
\ No newline at end of file
index 200205eb0c1930943ad21411141cdc77317526e1..2407cb70eed08ac3851b86cf587bf8d07d084d91 100644 (file)
@@ -4,51 +4,51 @@
   *
   * SPDX-License-Identifier: AGPL-3.0-or-later
   *}}
-<span id="circle-sidebar-inflated" class="widget inflated fakelink" onclick="openCloseWidget('circle-sidebar', 'circle-sidebar-inflated');">
-       <h3>{{$title}}</h3>
-</span>
-<div class="widget" id="circle-sidebar">
-       <span class="fakelink" onclick="openCloseWidget('circle-sidebar', 'circle-sidebar-inflated');">
-               <h3>{{$title}}</h3>
+<nav>
+       <span id="circle-sidebar-inflated" class="widget inflated fakelink">
+               <button class="fakelink" onclick="openCloseWidget('circle-sidebar', 'circle-sidebar-inflated');" aria-expanded="false">
+                       <h3>{{$title}}</h3>
+               </button>
        </span>
+       <div class="widget" id="circle-sidebar">
+               <button class="fakelink" onclick="openCloseWidget('circle-sidebar', 'circle-sidebar-inflated');" aria-expanded="false">
+                       <h3>{{$title}}</h3>
+               </button>
 
-       <div id="sidebar-circle-list">
-               <ul role="menu" id="sidebar-circle-ul">
-                       {{foreach $circles as $circle}}
-                               <li role="menuitem" class="sidebar-circle-li circle-{{$circle.id}}">
-                                       {{if ! $new_circle}}<span class="notify badge pull-right"></span>{{/if}}
-                                       {{if $circle.cid}}
-                                               <input type="checkbox"
-                                                       class="{{if $circle.selected}}ticked{{else}}unticked {{/if}} action"
-                                                       onclick="return contactCircleChangeMember(this, '{{$circle.id}}','{{$circle.cid}}');"
-                                                       {{if $circle.ismember}}checked="checked"{{/if}}
-                                               />
-                                       {{/if}}
-                                       {{if $circle.edit}}
-                                               <a class="circlesideedit" href="{{$circle.edit.href}}" title="{{$edittext}}">
-                                                       <span id="edit-sidebar-circle-element-{{$circle.id}}" class="circle-edit-icon iconspacer small-pencil"><span class="sr-only">{{$edittext}}</span></span>
-                                               </a>
-                                       {{/if}}
-                                       <a id="sidebar-circle-element-{{$circle.id}}" class="sidebar-circle-element {{if $circle.selected}}circle-selected{{/if}}" href="{{$circle.href}}">{{$circle.text}}</a>
-                               </li>
-                       {{/foreach}}
-               </ul>
-       </div>
+               <div id="sidebar-circle-list">
+                       <ul id="sidebar-circle-ul">
+                               {{foreach $circles as $circle}}
+                                       <li class="sidebar-circle-li circle-{{$circle.id}}">
+                                               {{if ! $new_circle}}<span class="notify badge pull-right"></span>{{/if}}
+                                               {{if $circle.cid}}
+                                                       <input type="checkbox" class="{{if $circle.selected}}ticked{{else}}unticked {{/if}} action" onclick="return contactCircleChangeMember(this, '{{$circle.id}}','{{$circle.cid}}');" {{if $circle.ismember}}checked="checked" {{/if}} />
+                                               {{/if}}
+                                               {{if $circle.edit}}
+                                                       <a class="circlesideedit" href="{{$circle.edit.href}}" title="{{$edittext}}">
+                                                               <span id="edit-sidebar-circle-element-{{$circle.id}}" class="circle-edit-icon iconspacer small-pencil"><span class="sr-only">{{$edittext}}</span></span>
+                                                       </a>
+                                               {{/if}}
+                                               <a id="sidebar-circle-element-{{$circle.id}}" class="sidebar-circle-element {{if $circle.selected}}circle-selected{{/if}}" href="{{$circle.href}}">{{$circle.text}}</a>
+                                       </li>
+                               {{/foreach}}
+                       </ul>
+               </div>
 
-       {{if $new_circle}}
-       <div id="sidebar-new-circle">
-               <a onclick="javascript:$('#circle-new-form').fadeIn('fast');return false;">{{$createtext}}</a>
-               <form id="circle-new-form" action="circle/new" method="post" style="display:none;">
-                       <input type="hidden" name="form_security_token" value="{{$form_security_token}}">
-                       <input name="circle_name" id="id_circle_name" placeholder="{{$create_circle}}">
-               </form>
-       </div>
-       {{else}}
-       <div id="sidebar-edit-circles"><a href="{{$circle_page}}">{{$edit_circles_text}}</a></div>
-       {{/if}}
+               {{if $new_circle}}
+                       <div id="sidebar-new-circle">
+                               <a onclick="javascript:$('#circle-new-form').fadeIn('fast');return false;">{{$createtext}}</a>
+                               <form id="circle-new-form" action="circle/new" method="post" style="display:none;">
+                                       <input type="hidden" name="form_security_token" value="{{$form_security_token}}">
+                                       <input name="circle_name" id="id_circle_name" placeholder="{{$create_circle}}">
+                               </form>
+                       </div>
+               {{else}}
+                       <div id="sidebar-edit-circles"><a href="{{$circle_page}}">{{$edit_circles_text}}</a></div>
+               {{/if}}
 
-       {{if $uncircled}}<div id="sidebar-uncircled"><a class="{{if $uncircled_selected}}circle-selected{{/if}}" href="nocircle">{{$uncircled}}</a></div>{{/if}}
-</div>
+               {{if $uncircled}}<div id="sidebar-uncircled"><a class="{{if $uncircled_selected}}circle-selected{{/if}}" href="nocircle">{{$uncircled}}</a></div>{{/if}}
+       </div>
+</nav>
 <script>
-initWidget('circle-sidebar', 'circle-sidebar-inflated');
-</script>
+       initWidget('circle-sidebar', 'circle-sidebar-inflated');
+</script>
\ No newline at end of file
index 45b058a1be8f0ead80f11f73dd34fdcd91d7918e..2cd3056b8f1b51de75d818982f270ac66c9657f5 100644 (file)
@@ -5,14 +5,14 @@
   * SPDX-License-Identifier: AGPL-3.0-or-later
   *}}
 
-<div class="widget{{if $class}} {{$class}}{{/if}}">
+<nav class="widget{{if $class}} {{$class}}{{/if}}">
        {{if $title}}<h3>{{$title}}</h3>{{/if}}
        {{if $desc}}<div class="desc">{{$desc nofilter}}</div>{{/if}}
-       
-       <ul role="menu">
+
+       <ul>
                {{foreach $items as $item}}
-                       <li role="menuitem" class="tool"><a href="{{$item.url}}" {{if $item.accesskey}}accesskey="{{$item.accesskey}}"{{/if}} class="{{if $item.selected}}selected{{/if}}">{{$item.label}}</a></li>
+                       <li class="tool"><a href="{{$item.url}}" {{if $item.accesskey}}accesskey="{{$item.accesskey}}" {{/if}} class="{{if $item.selected}}selected{{/if}}">{{$item.label}}</a></li>
                {{/foreach}}
        </ul>
-       
-</div>
+
+</nav>
\ No newline at end of file
index e2295fee2149f4507327914c2ed2fa85092e4cb3..05fb79a16b022b908e5ab00e46776e333fa2bc80 100644 (file)
@@ -4,13 +4,13 @@
   *
   * SPDX-License-Identifier: AGPL-3.0-or-later
   *}}
-<div id="message-sidebar" class="widget">
-       <div id="message-new"><a href="{{$new.url}}" accesskey="m" class="{{if $new.sel}}newmessage-selected{{/if}}">{{$new.label}}</a> </div>
+<nav id="message-sidebar" class="widget">
+  <div id="message-new"><a href="{{$new.url}}" accesskey="m" class="{{if $new.sel}}newmessage-selected{{/if}}">{{$new.label}}</a> </div>
 
   {{if $tabs}}
-       <div id="message-preview">
-               {{$tabs nofilter}}
-       </div>
+    <div id="message-preview">
+      {{$tabs nofilter}}
+    </div>
   {{/if}}
 
-</div>
+</nav>
\ No newline at end of file
index ca95ab3ff2ed3df8314257aa1b29ca89c3131250..3515c4a06fd02893a6e2e56b04264e301f5d815b 100644 (file)
@@ -6,21 +6,22 @@
   *}}
 <script>
        // update pending count //
-       $(function(){
-               $("nav").bind('nav-update',  function(e,data){
+       $(function() {
+               $('#topbar-first').bind('nav-update', function(e, data) {
                        var elm = $('#pending-update');
                        var register = $(data).find('register').html();
-                       if (register=="0") { register=""; elm.hide();} else { elm.show(); }
+                       if (register == "0") { register = "";
+                               elm.hide(); } else { elm.show(); }
                        elm.html(register);
                });
        });
 </script>
 
 {{foreach $subpages as $page}}
-<h4>{{$page.0}}</h4>
-<ul class="admin linklist" role="menu">
-{{foreach $page.1 as $item}}
-       <li class="admin link button {{$item.2}}" role="menuitem"><a href="{{$item.0}}">{{$item.1}}</a></li>
-{{/foreach}}
-</ul>
-{{/foreach}}
+       <h4>{{$page.0}}</h4>
+       <ul class="admin linklist" role="menu">
+               {{foreach $page.1 as $item}}
+                       <li class="admin link button {{$item.2}}" role="menuitem"><a href="{{$item.0}}">{{$item.1}}</a></li>
+               {{/foreach}}
+       </ul>
+{{/foreach}}
\ No newline at end of file
index 91b380945e55a53e4d24b12b47aec1100b0eb178..920051597cb96b809bb1f40d62df02731ae49a53 100644 (file)
@@ -4,28 +4,28 @@
   *
   * SPDX-License-Identifier: AGPL-3.0-or-later
   *}}
-<div class="widget">
+<nav class="widget">
        <p><strong>{{$l10n.contact_title}}</strong></p>
-{{if $contact}}
-    {{include file="contact/entry.tpl"}}
-{{/if}}
+       {{if $contact}}
+               {{include file="contact/entry.tpl"}}
+       {{/if}}
        <p><strong>{{$l10n.category_title}}</strong></p>
-{{if $category}}
-       <p>{{$category}}</p>
-{{/if}}
-{{if $rules}}
-       <p><strong>{{$l10n.rules_title}}</strong></p>
-       <ol>
-{{foreach $rules as $rule_id => $rule_text}}
-               <li value="{{$rule_id}}">{{$rule_text}}</li>
-{{/foreach}}
-       </ol>
-{{/if}}
-{{if $comment}}
-       <p><strong>{{$l10n.comment_title}}</strong></p>
-       <p>{{$comment nofilter}}</p>
-{{/if}}
-{{if $posts}}
-       <p><strong>{{$l10n.posts_title}} ({{$posts}})</strong></p>
-{{/if}}
-</div>
+       {{if $category}}
+               <p>{{$category}}</p>
+       {{/if}}
+       {{if $rules}}
+               <p><strong>{{$l10n.rules_title}}</strong></p>
+               <ol>
+                       {{foreach $rules as $rule_id => $rule_text}}
+                               <li value="{{$rule_id}}">{{$rule_text}}</li>
+                       {{/foreach}}
+               </ol>
+       {{/if}}
+       {{if $comment}}
+               <p><strong>{{$l10n.comment_title}}</strong></p>
+               <p>{{$comment nofilter}}</p>
+       {{/if}}
+       {{if $posts}}
+               <p><strong>{{$l10n.posts_title}} ({{$posts}})</strong></p>
+       {{/if}}
+</nav>
\ No newline at end of file
index 3e0d37e3384e04a8e3d40e458b17f3cf406c2647..dcf9f344b3cb24191ed80b3d0bc58dcf5859d7c0 100644 (file)
@@ -4,7 +4,7 @@
   *
   * SPDX-License-Identifier: AGPL-3.0-or-later
   *}}
-<div id="sidebar-photos-albums" class="widget">
+<nav id="sidebar-photos-albums" class="widget">
        <h3>{{$title}}</h3>
        <ul role="menubar" class="sidebar-photos-albums-ul">
                <li role="menuitem" class="sidebar-photos-albums-li">
                </li>
 
                {{if $albums}}
-               {{foreach $albums as $al}}
-               {{if $al.text}}
-               <li role="menuitem" class="sidebar-photos-albums-li">
-                       <a href="photos/{{$nick}}/album/{{$al.bin2hex}}" class="sidebar-photos-albums-element">
-                               <span class="badge pull-right">{{$al.total}}</span>{{$al.text}}
-                       </a>
-               </li>
-               {{/if}}
-               {{/foreach}}
+                       {{foreach $albums as $al}}
+                               {{if $al.text}}
+                                       <li role="menuitem" class="sidebar-photos-albums-li">
+                                               <a href="photos/{{$nick}}/album/{{$al.bin2hex}}" class="sidebar-photos-albums-element">
+                                                       <span class="badge pull-right">{{$al.total}}</span>{{$al.text}}
+                                               </a>
+                                       </li>
+                               {{/if}}
+                       {{/foreach}}
                {{/if}}
        </ul>
 
        {{if $can_post}}
-       <div class="photos-upload-link"><a href="{{$upload.1}}">{{$upload.0}}</a></div>
+               <div class="photos-upload-link"><a href="{{$upload.1}}">{{$upload.0}}</a></div>
        {{/if}}
-</div>
+</nav>
\ No newline at end of file
index 6430bdbe24aa054329f27f3c36b390ec0b3444ae..c729104d1f25d5df5e22281ab1f712c3a886a202 100644 (file)
@@ -7,7 +7,7 @@
 <div class="shared-wrapper well well-sm">
        <div class="shared_header">
                {{if $avatar}}
-                       <a href="{{$profile}}" target="_blank" rel="noopener noreferrer" class="avatar shared-userinfo">
+                       <a href="{{$profile}}" target="_blank" rel="noopener noreferrer" class="avatar shared-userinfo" aria-hidden="true">
                                <img src="{{$avatar}}" alt="">
                        </a>
                {{/if}}
                        </p>
                        <p class="shared-wall-item-ago">
                                {{if $guid}}
-                               <a href="/display/{{$guid}}">
+                                       <a href="/display/{{$guid}}">
                                        {{/if}}
                                        <span class="shared-time">{{$posted}}</span>
                                        {{if $guid}}
-                               </a>
+                                       </a>
                                {{/if}}
                        </p>
                </div>
                <div class="preferences">
                        {{if $network_svg && $link}}
-                               <span class="wall-item-network"><a href="{{$link}}" class="plink u-url" target="_blank"><img class="network-svg" src="{{$network_svg}}" alt="{{$network_name}} - {{$link_title}}" title="{{$network_name}} - {{$link_title}}" loading="lazy"/></a></span>
+                               <span class="wall-item-network"><a href="{{$link}}" class="plink u-url" target="_blank"><img class="network-svg" src="{{$network_svg}}" alt="{{$network_name}} - {{$link_title}}" title="{{$network_name}} - {{$link_title}}" loading="lazy" /></a></span>
                        {{elseif $link}}
                                <a href="{{$link}}" class="plink u-url" aria-label="{{$link_title}}" title="{{$network_name}} - {{$link_title}}" target="_blank">{{$network_name}}</a>
                        {{elseif $network_svg}}
-                               <span class="wall-item-network"><img class="network-svg" src="{{$network_svg}}" alt="{{$network_name}} - {{$link_title}}" title="{{$network_name}} - {{$link_title}}" loading="lazy"/></span>
+                               <span class="wall-item-network"><img class="network-svg" src="{{$network_svg}}" alt="{{$network_name}} - {{$link_title}}" title="{{$network_name}} - {{$link_title}}" loading="lazy" /></span>
                        {{else}}
                                <span class="wall-item-network" title="{{$app}}">{{$network_name}}</span>
                        {{/if}}
                </div>
        </div>
        <blockquote class="shared_content" dir="auto">{{$content nofilter}}</blockquote>
-</div>
+</div>
\ No newline at end of file
index da784872e9942056ec69986e1a239640271b0b65..5c01d0cd2cba88743a672d11e181062f3fdbdc8a 100644 (file)
@@ -4,21 +4,25 @@
   *
   * SPDX-License-Identifier: AGPL-3.0-or-later
   *}}
-<span id="sidebar-accounts-inflated" class="widget inflated fakelink" onclick="openCloseWidget('sidebar-accounts', 'sidebar-accounts-inflated');">
-       <h3>{{$title}}</h3>
-</span>
-<div id="sidebar-accounts" class="widget">
-       <span class="fakelink" onclick="openCloseWidget('sidebar-accounts', 'sidebar-accounts-inflated');">
-               <h3>{{$title}}</h3>
+<nav>
+       <span id="sidebar-accounts-inflated" class="widget inflated fakelink">
+               <button class="fakelink" onclick="openCloseWidget('sidebar-accounts', 'sidebar-accounts-inflated');" aria-expanded="false">
+                       <h3>{{$title}}</h3>
+               </button>
        </span>
-       <ul class="sidebar-accounts-ul">
-               <li role="menuitem" class="sidebar-accounts-li{{if !$accounttype}} selected{{/if}}"><a href="{{$content}}">{{$all}}</a></li>
-               <li role="menuitem" class="sidebar-accounts-li{{if $accounttype == 'person'}} selected{{/if}}"><a href="{{$content}}/person">{{$person}}</a></li>
-               <li role="menuitem" class="sidebar-accounts-li{{if $accounttype == 'organisation'}} selected{{/if}}"><a href="{{$content}}/organisation">{{$organisation}}</a></li>
-               <li role="menuitem" class="sidebar-accounts-li{{if $accounttype == 'news'}} selected{{/if}}"><a href="{{$content}}/news">{{$news}}</a></li>
-               <li role="menuitem" class="sidebar-accounts-li{{if $accounttype == 'community'}} selected{{/if}}"><a href="{{$content}}/community">{{$community}}</a></li>
-       </ul>
-</div>
+       <div id="sidebar-accounts" class="widget">
+               <button class="fakelink" onclick="openCloseWidget('sidebar-accounts', 'sidebar-accounts-inflated');" aria-expanded="true">
+                       <h3>{{$title}}</h3>
+               </button>
+               <ul class="sidebar-accounts-ul">
+                       <li class="sidebar-accounts-li{{if !$accounttype}} selected{{/if}}"><a href="{{$content}}">{{$all}}</a></li>
+                       <li class="sidebar-accounts-li{{if $accounttype == 'person'}} selected{{/if}}"><a href="{{$content}}/person">{{$person}}</a></li>
+                       <li class="sidebar-accounts-li{{if $accounttype == 'organisation'}} selected{{/if}}"><a href="{{$content}}/organisation">{{$organisation}}</a></li>
+                       <li class="sidebar-accounts-li{{if $accounttype == 'news'}} selected{{/if}}"><a href="{{$content}}/news">{{$news}}</a></li>
+                       <li class="sidebar-accounts-li{{if $accounttype == 'community'}} selected{{/if}}"><a href="{{$content}}/community">{{$community}}</a></li>
+               </ul>
+       </div>
+</nav>
 <script>
-initWidget('sidebar-accounts', 'sidebar-accounts-inflated');
-</script>
+       initWidget('sidebar-accounts', 'sidebar-accounts-inflated');
+</script>
\ No newline at end of file
index f4e1527c28817f3b63bb9048f7aeda4e712754e0..d72befda8864f3773e1461189dc2e95b66a97159 100644 (file)
@@ -4,18 +4,22 @@
   *
   * SPDX-License-Identifier: AGPL-3.0-or-later
   *}}
-<span id="sidebar-community-no-sharer-inflated" class="widget inflated fakelink" onclick="openCloseWidget('sidebar-community-no-sharer', 'sidebar-community-no-sharer-inflated');">
-       <h3>{{$title}}</h3>
-</span>
-<div id="sidebar-community-no-sharer" class="widget">
-       <span class="fakelink" onclick="openCloseWidget('sidebar-community-no-sharer', 'sidebar-community-no-sharer-inflated');">
-               <h3>{{$title}}</h3>
+<nav>
+       <span id="sidebar-community-no-sharer-inflated" class="widget inflated fakelink">
+               <button class="fakelink" onclick="openCloseWidget('sidebar-community-no-sharer', 'sidebar-community-no-sharer-inflated');" aria-expanded="false">
+                       <h3>{{$title}}</h3>
+               </button>
        </span>
-       <ul class="sidebar-community-no-sharer-ul">
-               <li role="menuitem" class="sidebar-community-no-sharer-li{{if !$no_sharer}} selected{{/if}}"><a href="{{$base}}/{{$path_all}}">{{$all}}</a></li>
-               <li role="menuitem" class="sidebar-community-no-sharer-li{{if $no_sharer}} selected{{/if}}"><a href="{{$base}}/{{$path_no_sharer}}">{{$no_sharer_label}}</a></li>
-       </ul>
-</div>
+       <div id="sidebar-community-no-sharer" class="widget">
+               <button class="fakelink" onclick="openCloseWidget('sidebar-community-no-sharer', 'sidebar-community-no-sharer-inflated');" aria-expanded="true">
+                       <h3>{{$title}}</h3>
+               </button>
+               <ul class="sidebar-community-no-sharer-ul">
+                       <li class="sidebar-community-no-sharer-li{{if !$no_sharer}} selected{{/if}}"><a href="{{$base}}/{{$path_all}}">{{$all}}</a></li>
+                       <li class="sidebar-community-no-sharer-li{{if $no_sharer}} selected{{/if}}"><a href="{{$base}}/{{$path_no_sharer}}">{{$no_sharer_label}}</a></li>
+               </ul>
+       </div>
+</nav>
 <script>
-initWidget('sidebar-community-no-sharer', 'sidebar-community-no-sharer-inflated');
-</script>
+       initWidget('sidebar-community-no-sharer', 'sidebar-community-no-sharer-inflated');
+</script>
\ No newline at end of file
index 54df4f282dea1f9efd4848d6a461c7962dbd36f4..151738871f02f357886e5651a4e1142b462c65aa 100644 (file)
@@ -5,11 +5,11 @@
   * SPDX-License-Identifier: AGPL-3.0-or-later
   *}}
 
-<div id="sidebar-calendar" class="widget">
-       <h3>{{$etitle}}</h3>
+<nav id="sidebar-calendar" class="widget">
+  <h3>{{$etitle}}</h3>
 
-       <ul class="sidebar-calendar-export-ul">
-               <li role="menuitem" class="sidebar-calendar-export-li"><a href="calendar/export/{{$user}}/ical">{{$export_ical}}</a></li>
-               <li role="menuitem" class="sidebar-calendar-export-li"><a href="calendar/export/{{$user}}/csv">{{$export_csv}}</a></li>
-       </ul>
-</div>
+  <ul class="sidebar-calendar-export-ul">
+    <li class="sidebar-calendar-export-li"><a href="calendar/export/{{$user}}/ical">{{$export_ical}}</a></li>
+    <li class="sidebar-calendar-export-li"><a href="calendar/export/{{$user}}/csv">{{$export_csv}}</a></li>
+  </ul>
+</nav>
\ No newline at end of file
index 3e502fd95ac751bd952b69695db747d3a4e420c6..9390cb5fee89d748f956cbb22befbcc6bd03be90 100644 (file)
@@ -4,23 +4,29 @@
   *
   * SPDX-License-Identifier: AGPL-3.0-or-later
   *}}
-<span id="{{$type}}-sidebar-inflated" class="widget inflated fakelink" onclick="openCloseWidget('{{$type}}-sidebar', '{{$type}}-sidebar-inflated');">
-       <h3>{{$title}}</h3>
-</span>
-<div id="{{$type}}-sidebar" class="widget">
-       <span class="fakelink" onclick="openCloseWidget('{{$type}}-sidebar', '{{$type}}-sidebar-inflated');">
-               <h3>{{$title}}</h3>
+<nav>
+       <span id="{{$type}}-sidebar-inflated" class="widget inflated fakelink">
+               <button class="fakelink" onclick="openCloseWidget('{{$type}}-sidebar', '{{$type}}-sidebar-inflated');" aria-expanded="false">
+                       <h3>{{$title}}</h3>
+               </button>
        </span>
-       <div id="{{$type}}-desc">{{$desc nofilter}}</div>
-       <ul role="menu" class="{{$type}}-ul">
-               {{if $all_label}}
-               <li role="menuitem" {{if !is_null($selected) && !$selected}}class="selected"{{/if}}><a href="{{$base}}" class="{{$type}}-link{{if !$selected}} {{$type}}-selected{{/if}} {{$type}}-all">{{$all_label}}</a></li>
-               {{/if}}
-               {{foreach $options as $option}}
-                       <li role="menuitem" {{if $selected == $option.ref}}class="selected"{{/if}}><a href="{{$base}}{{$type}}={{$option.ref}}" class="{{$type}}-link{{if $selected == $option.ref}} {{$type}}-selected{{/if}}">{{$option.name}}</a></li>
-               {{/foreach}}
-       </ul>
-</div>
+       <div id="{{$type}}-sidebar" class="widget">
+               <button class="fakelink" onclick="openCloseWidget('{{$type}}-sidebar', '{{$type}}-sidebar-inflated');" aria-expanded="true">
+                       <h3>{{$title}}</h3>
+               </button>
+               <div id="{{$type}}-desc">{{$desc nofilter}}</div>
+               <ul class="{{$type}}-ul">
+                       {{if $all_label}}
+                               <li {{if !is_null($selected) && !$selected}}class="selected" {{/if}}><a href="{{$base}}" class="{{$type}}-link{{if !$selected}} {{$type}}-selected{{/if}} {{$type}}-all">{{$all_label}}</a>
+                               </li>
+                       {{/if}}
+                       {{foreach $options as $option}}
+                               <li {{if $selected == $option.ref}}class="selected" {{/if}}><a href="{{$base}}{{$type}}={{$option.ref}}" class="{{$type}}-link{{if $selected == $option.ref}} {{$type}}-selected{{/if}}">{{$option.name}}</a>
+                               </li>
+                       {{/foreach}}
+               </ul>
+       </div>
+</nav>
 <script>
-initWidget('{{$type}}-sidebar', '{{$type}}-sidebar-inflated');
-</script>
+       initWidget('{{$type}}-sidebar', '{{$type}}-sidebar-inflated');
+</script>
\ No newline at end of file
index f980dacd3a0253958428cc2048260ac2b1e80451..f7840ab2cb1932d33c2d1c7cdd3408ac9f772bee 100644 (file)
@@ -5,11 +5,10 @@
   * SPDX-License-Identifier: AGPL-3.0-or-later
   *}}
 
-<div id="follow-sidebar" class="widget">
-       <h3>{{$connect}}</h3>
-       <div id="connect-desc">{{$desc nofilter}}</div>
-       <form action="contact/follow" method="post">
-               <input id="side-follow-url" type="text" name="follow-url" value="{{$value}}" size="24" placeholder="{{$hint}}" title="{{$hint}}" /><input id="side-follow-submit" type="submit" name="submit" value="{{$follow}}" />
-       </form>
-</div>
-
+<nav id="follow-sidebar" class="widget">
+  <h3>{{$connect}}</h3>
+  <div id="connect-desc">{{$desc nofilter}}</div>
+  <form action="contact/follow" method="post">
+    <input id="side-follow-url" type="text" name="follow-url" value="{{$value}}" size="24" placeholder="{{$hint}}" title="{{$hint}}" /><input id="side-follow-submit" type="submit" name="submit" value="{{$follow}}" />
+  </form>
+</nav>
\ No newline at end of file
index b42041a7b6e3fc4da37b47214659cb8005bfc19f..e2b966de2b2dd3cbcfc5b0c3c5f51326cbd869ce 100644 (file)
@@ -5,67 +5,66 @@
   * SPDX-License-Identifier: AGPL-3.0-or-later
   *}}
 <script>
-function showHideGroupList() {
-       if( $("li[id^='group-widget-entry-extended-']").is(':visible')) {
-               $("li[id^='group-widget-entry-extended-']").hide();
-               $("li#group-widget-collapse").html('{{$showmore}}');
+       function showHideGroupList() {
+               if ($("li[id^='group-widget-entry-extended-']").is(':visible')) {
+                       $("li[id^='group-widget-entry-extended-']").hide();
+                       $("li#group-widget-collapse").html('{{$showmore}}');
 
+               } else {
+                       $("li[id^='group-widget-entry-extended-']").show();
+                       $("li#group-widget-collapse").html('{{$showless}}');
+               }
        }
-       else {
-               $("li[id^='group-widget-entry-extended-']").show();
-               $("li#group-widget-collapse").html('{{$showless}}');
-       }
-}
 </script>
-<span id="group-list-sidebar-frame">
-       <span id="group-list-sidebar-inflated" class="widget inflated fakelink" onclick="openCloseWidget('group-list-sidebar', 'group-list-sidebar-inflated');">
-               <h3>{{$title}}</h3>
+<nav id="group-list-sidebar-frame">
+       <span id="group-list-sidebar-inflated" class="widget inflated fakelink">
+               <button class="fakelink" onclick="openCloseWidget('group-list-sidebar', 'group-list-sidebar-inflated');"
+                       aria-expanded="false">
+                       <h3>{{$title}}</h3>
+               </button>
        </span>
        <div id="group-list-sidebar" class="widget">
                <div id="sidebar-group-header" class="sidebar-widget-header">
-                       <span class="fakelink" onclick="openCloseWidget('group-list-sidebar', 'group-list-sidebar-inflated');">
+                       <button class="fakelink" onclick="openCloseWidget('group-list-sidebar', 'group-list-sidebar-inflated');" aria-expanded="true">
                                <h3>{{$title}}</h3>
-                       </span>
-                       {{if $groups}}
-                       <a class="group-new-tool pull-right widget-action faded-icon" id="sidebar-new-group" href="{{$new_group_page}}" data-toggle="tooltip" title="{{$create_new_group}}">
+                       </button>
+                       <a class="group-new-tool pull-right widget-action faded-icon" id="sidebar-new-group"
+                               href="{{$new_group_page}}" data-toggle="tooltip" title="{{$create_new_group}}">
                                <i class="fa fa-plus" aria-hidden="true"></i>
                        </a>
-                       {{/if}}
                </div>
                <div id="sidebar-group-list" class="sidebar-widget-list">
                        {{* The list of available groups *}}
-                       <ul id="group-list-sidebar-ul" role="menu">
+                       <ul id="group-list-sidebar-ul">
                                {{foreach $groups as $group}}
-                               {{if $group.id <= $visible_groups}}
-                               <li class="group-widget-entry group-{{$group.cid}}" id="group-widget-entry-{{$group.id}}" role="menuitem">
-                                       <span class="notify badge pull-right"></span>
-                                       <a href="{{$group.external_url}}" title="{{$group.link_desc}}" class="label sparkle" target="_blank" rel="noopener noreferrer">
-                                               <img class="group-list-img" src="{{$group.micro}}" alt="{{$group.link_desc}}" />
-                                       </a>
-                                       <a class="group-widget-link" id="group-widget-link-{{$group.id}}" href="{{$group.url}}">{{$group.name}}</a>
-                               </li>
-                               {{/if}}
+                                       {{if $group.id <= $visible_groups}}
+                                               <li class="group-widget-entry group-{{$group.cid}}" id="group-widget-entry-{{$group.id}}">
+                                                       <span class="notify badge pull-right"></span>
+                                                       <a href="{{$group.external_url}}" title="{{$group.link_desc}}" class="label sparkle" target="_blank" rel="noopener noreferrer">
+                                                               <img class="group-list-img" src="{{$group.micro}}" alt="{{$group.link_desc}}" />
+                                                       </a>
+                                                       <a class="group-widget-link" id="group-widget-link-{{$group.id}}" href="{{$group.url}}">{{$group.name}}</a>
+                                               </li>
+                                       {{/if}}
 
-                               {{if $group.id > $visible_groups}}
-                               <li class="group-widget-entry group-{{$group.cid}}" id="group-widget-entry-extended-{{$group.id}}" role="menuitem" style="display: none;">
-                                       <span class="notify badge pull-right"></span>
-                                       <a href="{{$group.external_url}}" title="{{$group.link_desc}}" class="label sparkle" target="_blank" rel="noopener noreferrer">
-                                               <img class="group-list-img" src="{{$group.micro}}" alt="{{$group.link_desc}}" />
-                                       </a>
-                                       <a class="group-widget-link" id="group-widget-link-{{$group.id}}" href="{{$group.url}}">{{$group.name}}</a>
-                               </li>
-                               {{/if}}
-                               {{foreachelse}}
-                                       <li><a href="{{$new_group_page}}"><i class="fa fa-plus" aria-hidden="true"></i> {{$create_new_group}}</a></li>
+                                       {{if $group.id > $visible_groups}}
+                                               <li class="group-widget-entry group-{{$group.cid}}" id="group-widget-entry-extended-{{$group.id}}" style="display: none;">
+                                                       <span class="notify badge pull-right"></span>
+                                                       <a href="{{$group.external_url}}" title="{{$group.link_desc}}" class="label sparkle" target="_blank" rel="noopener noreferrer">
+                                                               <img class="group-list-img" src="{{$group.micro}}" alt="{{$group.link_desc}}" />
+                                                       </a>
+                                                       <a class="group-widget-link" id="group-widget-link-{{$group.id}}" href="{{$group.url}}">{{$group.name}}</a>
+                                               </li>
+                                       {{/if}}
                                {{/foreach}}
 
                                {{if $total > $visible_groups }}
-                               <li onclick="showHideGroupList(); return false;" id="group-widget-collapse" class="group-widget-link fakelink tool">{{$showmore}}</li>
+                                       <li onclick="showHideGroupList(); return false;" id="group-widget-collapse" class="group-widget-link fakelink tool">{{$showmore}}</li>
                                {{/if}}
                        </ul>
                </div>
        </div>
-</span>
+</nav>
 <script>
-initWidget('group-list-sidebar', 'group-list-sidebar-inflated');
-</script>
+       initWidget('group-list-sidebar', 'group-list-sidebar-inflated');
+</script>
\ No newline at end of file
index 17ea7cb07dbac22243af23f5c2dc9bfc65ae9349..86c1040bae34f178ead42b2dae7240e51608f455 100644 (file)
@@ -5,19 +5,19 @@
   * SPDX-License-Identifier: AGPL-3.0-or-later
   *}}
 
-<div id="peoplefind-sidebar" class="widget">
+<nav id="peoplefind-sidebar" class="widget">
        <h3>{{$nv.findpeople}}</h3>
        <div id="peoplefind-desc">{{$nv.desc}}</div>
        <form action="dirfind" method="get" />
-               <input id="side-peoplefind-url" type="text" name="search" size="24" title="{{$nv.hint}}" /><input id="side-peoplefind-submit" type="submit" name="submit" value="{{$nv.findthem}}" />
+       <input id="side-peoplefind-url" type="text" name="search" size="24" title="{{$nv.hint}}" /><input id="side-peoplefind-submit" type="submit" name="submit" value="{{$nv.findthem}}" />
        </form>
        <div class="side-link" id="side-match-link"><a href="contact/match">{{$nv.similar}}</a></div>
        <div class="side-link" id="side-suggest-link"><a href="contact/suggestions">{{$nv.suggest}}</a></div>
        <div class="side-link" id="side-directory-link"><a href="directory">{{$nv.local_directory}}</a></div>
-       <div class="side-link" id="side-directory-link"><a href="{{$nv.global_dir}}" target="extlink">{{$nv.directory}}</a></div>
+       <div class="side-link" id="side-directory-link"><a href="{{$nv.global_dir}}" target="extlink">{{$nv.directory}}</a>
+       </div>
        <div class="side-link" id="side-random-profile-link"><a href="randprof" target="extlink">{{$nv.random}}</a></div>
-       {{if $nv.inv}} 
-       <div class="side-link" id="side-invite-link"><a href="invite">{{$nv.inv}}</a></div>
+       {{if $nv.inv}}
+               <div class="side-link" id="side-invite-link"><a href="invite">{{$nv.inv}}</a></div>
        {{/if}}
-</div>
-
+</nav>
\ No newline at end of file
index 2b34e18ba1299cfee26a4aef000ee20a30b824c4..07831f607056046f197abfc01d74764220076ab4 100644 (file)
@@ -5,59 +5,64 @@
   * SPDX-License-Identifier: AGPL-3.0-or-later
   *}}
 <script>
-function showHideDates() {
-       if( $('#posted-date-selector-drop').is(':visible')) {
-               $('#posted-date-selector-drop').hide();
-               $('#posted-date-collapse').html('{{$showmore}}');
+       function showHideDates() {
+               if ($('#posted-date-selector-drop').is(':visible')) {
+                       $('#posted-date-selector-drop').hide();
+                       $('#posted-date-collapse').html('{{$showmore}}');
 
-       } else {
-               $('#posted-date-selector-drop').show();
-               $('#posted-date-collapse').html('{{$showless}}');
+               } else {
+                       $('#posted-date-selector-drop').show();
+                       $('#posted-date-collapse').html('{{$showless}}');
+               }
        }
-}
 </script>
 
-<span id="datebrowse-sidebar-inflated" class="widget inflated fakelink" onclick="openCloseWidget('datebrowse-sidebar', 'datebrowse-sidebar-inflated');">
-       <h3>{{$title}}</h3>
-</span>
-<div id="datebrowse-sidebar" class="widget">
-       <span class="fakelink" onclick="openCloseWidget('datebrowse-sidebar', 'datebrowse-sidebar-inflated');">
-               <h3>{{$title}}</h3>
+<nav>
+       <span id="datebrowse-sidebar-inflated" class="widget inflated fakelink">
+               <button class="fakelink" onclick="openCloseWidget('datebrowse-sidebar', 'datebrowse-sidebar-inflated');" aria-expanded="false">
+                       <h3>{{$title}}</h3>
+               </button>
        </span>
-       <ul id="posted-date-selector" class="datebrowse-ul">
-               {{foreach $dates as $y => $arr}}
+       <div id="datebrowse-sidebar" class="widget">
+               <button class="fakelink" onclick="openCloseWidget('datebrowse-sidebar', 'datebrowse-sidebar-inflated');" aria-expanded="false">
+                       <h3>{{$title}}</h3>
+               </button>
+               <ul id="posted-date-selector" class="datebrowse-ul">
+                       {{foreach $dates as $y => $arr}}
 
-               {{if $y == $cutoff_year}}
-               </ul>
-               <ul id="posted-date-selector-drop" class="datebrowse-ul" style="display: none;">
-               {{/if}}
-
-               <li id="posted-date-selector-year-{{$y}}" class="tool">
-                       <a class="datebrowse-link" href="#" onclick="openClose('posted-date-selector-{{$y}}'); return false;">{{$y}}</a>
-               </li>
-               <li id="posted-date-selector-{{$y}}" class="tool posted-date-selector-months" style="display: none;">
-                       <ul class="datebrowse-ul">
-                               {{if $y|cat:$thisday >= $cutoffday}}
-                               <li class="tool">
-                                       <a class="datebrowse-link" href="{{$url}}/{{$y|cat:$nextday}}/{{$y|cat:$thisday}}">{{$onthisdate}}</a>
-                               </li>
+                               {{if $y == $cutoff_year}}
+                               </ul>
+                               <ul id="posted-date-selector-drop" class="datebrowse-ul" style="display: none;">
                                {{/if}}
-                               {{foreach $arr as $d}}
-                               <li class="tool">
-                                       <a class="datebrowse-link" href="{{$url}}/{{$d.1}}/{{$d.2}}">{{$d.0}}</a>
+
+                               <li id="posted-date-selector-year-{{$y}}" class="tool">
+                                       <a class="datebrowse-link" href="#" onclick="openClose('posted-date-selector-{{$y}}'); return false;">{{$y}}</a>
                                </li>
+                               <li id="posted-date-selector-{{$y}}" class="tool posted-date-selector-months" style="display: none;">
+                                       <ul class="datebrowse-ul">
+                                               {{if $y|cat:$thisday >= $cutoffday}}
+                                                       <li class="tool">
+                                                               <a class="datebrowse-link" href="{{$url}}/{{$y|cat:$nextday}}/{{$y|cat:$thisday}}">{{$onthisdate}}</a>
+                                                       </li>
+                                               {{/if}}
+                                               {{foreach $arr as $d}}
+                                                       <li class="tool">
+                                                               <a class="datebrowse-link" href="{{$url}}/{{$d.1}}/{{$d.2}}">{{$d.0}}</a>
+                                                       </li>
 
-                               {{/foreach}}
+                                               {{/foreach}}
+                                       </ul>
+                               </li>
+                       {{/foreach}}
+               </ul>
+               {{if $cutoff}}
+                       <ul class="datebrowse-ul">
+                               <li onclick="showHideDates(); return false;" id="posted-date-collapse" class="fakelink tool">{{$showmore}}
+                               </li>
                        </ul>
-               </li>
-               {{/foreach}}
-       </ul>
-       {{if $cutoff}}
-       <ul class="datebrowse-ul">
-               <li onclick="showHideDates(); return false;" id="posted-date-collapse" class="fakelink tool">{{$showmore}}</li>
-       </ul>
-       {{/if}}
-</div>
+               {{/if}}
+       </div>
+</nav>
 <script>
-initWidget('datebrowse-sidebar', 'datebrowse-sidebar-inflated');
-</script>
+       initWidget('datebrowse-sidebar', 'datebrowse-sidebar-inflated');
+</script>
\ No newline at end of file
index 2439ef04e5a6a054a0ba95771f491ff79d86b442..e4e1c2f2e8f7c550e54fde56f711f1808dac9c60 100644 (file)
@@ -4,25 +4,29 @@
   *
   * SPDX-License-Identifier: AGPL-3.0-or-later
   *}}
-<span id="saved-search-list-inflated" class="widget inflated fakelink" onclick="openCloseWidget('saved-search-list', 'saved-search-list-inflated');">
-       <h3>{{$title}}</h3>
-</span>
-<div class="widget" id="saved-search-list">
-       <span class="fakelink" onclick="openCloseWidget('saved-search-list', 'saved-search-list-inflated');">
-               <h3 id="search">{{$title}}</h3>
+<nav>
+       <span id="saved-search-list-inflated" class="widget inflated fakelink">
+               <button class="fakelink" onclick="openCloseWidget('saved-search-list', 'saved-search-list-inflated');" aria-expanded="false">
+                       <h3>{{$title}}</h3>
+               </button>
        </span>
-       {{$searchbox nofilter}}
+       <div class="widget" id="saved-search-list">
+               <button class="fakelink" onclick="openCloseWidget('saved-search-list', 'saved-search-list-inflated');" aria-expanded="true">
+                       <h3 id="search">{{$title}}</h3>
+               </button>
+               {{$searchbox nofilter}}
 
-       <ul role="menu" id="saved-search-ul">
-               {{foreach $saved as $search}}
-               <li role="menuitem" class="saved-search-li clear">
-                       <a href="search/saved/remove?term={{$search.encodedterm}}&amp;return_url={{$return_url}}" title="{{$search.delete}}" onclick="return confirmDelete();" id="drop-saved-search-term-{{$search.id}}" class="iconspacer savedsearchdrop"></a>
-                       <a href="{{$search.searchpath}}" id="saved-search-term-{{$search.id}}" class="savedsearchterm">{{$search.term}}</a>
-               </li>
-               {{/foreach}}
-       </ul>
-       <div class="clear"></div>
-</div>
+               <ul id="saved-search-ul">
+                       {{foreach $saved as $search}}
+                               <li class="saved-search-li clear">
+                                       <a href="search/saved/remove?term={{$search.encodedterm}}&amp;return_url={{$return_url}}" title="{{$search.delete}}" onclick="return confirmDelete();" id="drop-saved-search-term-{{$search.id}}" class="iconspacer savedsearchdrop"></a>
+                                       <a href="{{$search.searchpath}}" id="saved-search-term-{{$search.id}}" class="savedsearchterm">{{$search.term}}</a>
+                               </li>
+                       {{/foreach}}
+               </ul>
+               <div class="clear"></div>
+       </div>>
+</nav>
 <script>
-initWidget('saved-search-list', 'saved-search-list-inflated');
-</script>
+       initWidget('saved-search-list', 'saved-search-list-inflated');
+</script>
\ No newline at end of file
index ae44c081efe2f23cc8ae4c39a2e0678389a387aa..0eb69f8bc23496c466a1bb131e0c1b12f7f3c88c 100644 (file)
@@ -4,23 +4,27 @@
   *
   * SPDX-License-Identifier: AGPL-3.0-or-later
   *}}
-<span id="tagblock-inflated" class="widget inflated fakelink" onclick="openCloseWidget('tagblock', 'tagblock-inflated');">
-       <h3>{{$title}}</h3>
-</span>
-<div id="tagblock" class="tagblock widget">
-       <span class="fakelink" onclick="openCloseWidget('tagblock', 'tagblock-inflated');">
-               <h3>{{$title}}</h3>
-        </span>
+<nav>
+       <span id="tagblock-inflated" class="widget inflated fakelink">
+               <button class="fakelink" onclick="openCloseWidget('tagblock', 'tagblock-inflated');" aria-expanded="false">
+                       <h3>{{$title}}</h3>
+               </button>
+       </span>
+       <div id="tagblock" class="tagblock widget">
+               <button class="fakelink" onclick="openCloseWidget('tagblock', 'tagblock-inflated');" aria-expanded="true">
+                       <h3>{{$title}}</h3>
+               </button>
 
-       <div class="tag-cloud">
-               {{foreach $tags as $tag}}
-               <span class="tags">
-                       <span class="tag{{$tag.level}}">#</span><a href="{{$tag.url}}" class="tag{{$tag.level}}">{{$tag.name}}</a>
-               </span>
-               {{/foreach}}
+               <div class="tag-cloud">
+                       {{foreach $tags as $tag}}
+                               <span class="tags">
+                                       <span class="tag{{$tag.level}}">#</span><a href="{{$tag.url}}" class="tag{{$tag.level}}">{{$tag.name}}</a>
+                               </span>
+                       {{/foreach}}
+               </div>
+               <div class="tagblock-widget-end clear"></div>
        </div>
-       <div class="tagblock-widget-end clear"></div>
-</div>
+</nav>
 <script>
-initWidget('tagblock', 'tagblock-inflated');
-</script>
+       initWidget('tagblock', 'tagblock-inflated');
+</script>
\ No newline at end of file
index 06be1e0e4faa6d28affc0a533a60cb42aef0a427..9058da54808ef195f68d4dbea44232eed109dfef 100644 (file)
@@ -4,66 +4,65 @@
   *
   * SPDX-License-Identifier: AGPL-3.0-or-later
   *}}
-<span id="trending-tags-sidebar-inflated" class="widget inflated fakelink" onclick="openCloseWidget('trending-tags-sidebar', 'trending-tags-sidebar-inflated');">
-       <h3>{{$title}}</h3>
-</span>
-<div id="trending-tags-sidebar" class="widget">
-       <span class="fakelink" onclick="openCloseWidget('trending-tags-sidebar', 'trending-tags-sidebar-inflated');">
-               <h3>{{$title}}</h3>
+<nav>
+       <span id="trending-tags-sidebar-inflated" class="widget inflated fakelink">
+               <button class="fakelink" onclick="openCloseWidget('trending-tags-sidebar', 'trending-tags-sidebar-inflated');" aria-expanded="false">
+                       <h3>{{$title}}</h3>
+               </button>
        </span>
-       <ul id="tags-list" style="list-style-type: none; padding: 0; margin: 0;">
-       {{section name=ol loop=$tags max=10}}
-               <li style="margin-bottom: 5px;">
-                       <a href="search?tag={{$tags[ol].term}}" style="text-decoration: none; color: inherit;">
-                               <i class="fa fa-hashtag" aria-hidden="true"></i> {{$tags[ol].term}}
-                       </a>
-               </li>
-       {{/section}}
-       </ul>
-       {{if $tags|count > 10}}
-       <div style="text-align: left; margin-top: 10px;">
-               <a href="#"
-                       onclick="toggleTags(event)"
-                       role="button"
-                       aria-expanded="false"
-                       aria-controls="more-tags"
-                       style="text-decoration: none; color: inherit; cursor: pointer; display: inline-flex; align-items: center; font-weight: bold;">
-                       <i id="caret-icon" class="fa fa-caret-right" aria-hidden="true" style="margin-right: 5px;"></i>
-                       <span id="link-text">Show More</span>
-               </a>
-       </div>
-       <ul id="more-tags" style="display:none; list-style-type: none; padding: 0; margin: 0;">
-               {{section name=ul loop=$tags start=10}}
-                       <li style="margin-bottom: 5px;">
-                               <a href="search?tag={{$tags[ul].term}}" style="text-decoration: none; color: inherit;">
-                                       <i class="fa fa-hashtag" aria-hidden="true"></i> {{$tags[ul].term}}
+       <div id="trending-tags-sidebar" class="widget">
+               <button class="fakelink" onclick="openCloseWidget('trending-tags-sidebar', 'trending-tags-sidebar-inflated');">
+                       <h3>{{$title}}</h3>
+               </button>
+               <ul id="tags-list" style="list-style-type: none; padding: 0; margin: 0;">
+                       {{section name=ol loop=$tags max=10}}
+                               <li style="margin-bottom: 5px;">
+                                       <a href="search?tag={{$tags[ol].term}}" style="text-decoration: none; color: inherit;">
+                                               <i class="fa fa-hashtag" aria-hidden="true"></i> {{$tags[ol].term}}
+                                       </a>
+                               </li>
+                       {{/section}}
+               </ul>
+               {{if $tags|count > 10}}
+                       <div style="text-align: left; margin-top: 10px;">
+                               <a href="#" onclick="toggleTags(event)" role="button" aria-expanded="false" aria-controls="more-tags" style="text-decoration: none; color: inherit; cursor: pointer; display: inline-flex; align-items: center; font-weight: bold;">
+                                       <i id="caret-icon" class="fa fa-caret-right" aria-hidden="true" style="margin-right: 5px;"></i>
+                                       <span id="link-text">Show More</span>
                                </a>
-                       </li>
-               {{/section}}
-       </ul>
-       {{/if}}
-</div>
+                       </div>
+                       <ul id="more-tags" style="display:none; list-style-type: none; padding: 0; margin: 0;">
+                               {{section name=ul loop=$tags start=10}}
+                                       <li style="margin-bottom: 5px;">
+                                               <a href="search?tag={{$tags[ul].term}}" style="text-decoration: none; color: inherit;">
+                                                       <i class="fa fa-hashtag" aria-hidden="true"></i> {{$tags[ul].term}}
+                                               </a>
+                                       </li>
+                               {{/section}}
+                       </ul>
+               {{/if}}
+       </div>
+</nav>
 
 <script>
-function toggleTags(event) {
-       event.preventDefault();
-       var moreTags = document.getElementById('more-tags');
-       var link = event.target.closest('a');
-       var caretIcon = document.getElementById('caret-icon');
-       var linkText = document.getElementById('link-text');
+       function toggleTags(event) {
+               event.preventDefault();
+               var moreTags = document.getElementById('more-tags');
+               var link = event.target.closest('a');
+               var caretIcon = document.getElementById('caret-icon');
+               var linkText = document.getElementById('link-text');
 
-       if (moreTags.style.display === 'none') {
-               moreTags.style.display = 'block';
-               linkText.textContent = 'Show Less';
-               link.setAttribute('aria-expanded', 'true');
-               caretIcon.className = 'fa fa-caret-down';
-       } else {
-               moreTags.style.display = 'none';
-               linkText.textContent = 'Show More';
-               link.setAttribute('aria-expanded', 'false');
-               caretIcon.className = 'fa fa-caret-right';
+               if (moreTags.style.display === 'none') {
+                       moreTags.style.display = 'block';
+                       linkText.textContent = 'Show Less';
+                       link.setAttribute('aria-expanded', 'true');
+                       caretIcon.className = 'fa fa-caret-down';
+               } else {
+                       moreTags.style.display = 'none';
+                       linkText.textContent = 'Show More';
+                       link.setAttribute('aria-expanded', 'false');
+                       caretIcon.className = 'fa fa-caret-right';
+               }
        }
-}
 
-initWidget('trending-tags-sidebar', 'trending-tags-sidebar-inflated');
-</script>
+       initWidget('trending-tags-sidebar', 'trending-tags-sidebar-inflated');
+</script>
\ No newline at end of file
index 85acd0a3bc62b726160bc0e096699bfa172a1ad0..af73b8b9fee0840f84c8d9f8a18a8495619531f6 100644 (file)
@@ -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;
 }
index 2e67828ea13f1a0a563a228bb35a10d59425880b..b8e6a125e30926726930bbfcdeacd004c2212251 100644 (file)
@@ -109,7 +109,7 @@ if(!empty($page['content'])) {
 
 <script>
 var pagetitle = null;
-$('nav').bind('nav-update', function(e,data)
+$('#topbar-first').bind('nav-update', function(e,data)
 {
        if (pagetitle==null) pagetitle = document.title;
        var count = $(data).find('notif').attr('count');
index 4159076904a948702c0555116bed2b8d9c32442a..46abf51f449f1ce7d9b61231139355f85cc4f513 100644 (file)
@@ -6,8 +6,8 @@
   *}}
 <script type="text/javascript">
        // update pending count //
-       $(function(){
-               $("nav").bind('nav-update', function(e,data){
+       $(function() {
+               $('#topbar-first').bind('nav-update', function(e, data) {
                        var elm = $('#pending-update');
                        var register = parseInt($(data).find('register').text());
                        if (register > 0) {
 </script>
 
 {{foreach $subpages as $page}}
-<nav class="widget">
-       <h3>{{$page.0}}</h3>
-       <ul>
-               {{foreach $page.1 as $item}}
-               <li class="{{$item.2}}">
-                       <a href="{{$item.0}}" {{if $item.accesskey}}accesskey="{{$item.accesskey}}"{{/if}}>
-                               {{$item.1}}
-                               {{if $name == "users"}}
-                               <span id="pending-update" class="badge pull-right"></span>
-                               {{/if}}
-                       </a>
-               </li>
-               {{/foreach}}
-       </ul>
+       <nav class="widget">
+               <h3>{{$page.0}}</h3>
+               <ul>
+                       {{foreach $page.1 as $item}}
+                               <li class="{{$item.2}}">
+                                       <a href="{{$item.0}}" {{if $item.accesskey}}accesskey="{{$item.accesskey}}" {{/if}}>
+                                               {{$item.1}}
+                                               {{if $name == "users"}}
+                                                       <span id="pending-update" class="badge pull-right"></span>
+                                               {{/if}}
+                                       </a>
+                               </li>
+                       {{/foreach}}
+               </ul>
 
-       {{if $admin.update}}
-       <ul role="menu">
-               <li role="menuitem" class="{{$admin.update.2}}">
-                       <a href="{{$admin.update.0}}" {{if $admin.update.accesskey}}accesskey="{{$admin.update.accesskey}}"{{/if}}>
-                               {{$admin.update.1}}
-                       </a>
-               </li>
-       </ul>
-       {{/if}}
-</nav>
+               {{if $admin.update}}
+                       <ul>
+                               <li class="{{$admin.update.2}}">
+                                       <a href="{{$admin.update.0}}" {{if $admin.update.accesskey}}accesskey="{{$admin.update.accesskey}}" {{/if}}>
+                                               {{$admin.update.1}}
+                                       </a>
+                               </li>
+                       </ul>
+               {{/if}}
+       </nav>
 {{/foreach}}
 
 {{if $admin.addons_admin}}
-<nav class="widget">
-       <h3>{{$plugadmtxt}}</h3>
-       <ul role="menu">
-               {{foreach $admin.addons_admin as $name => $item}}
-               <li role="menuitem" class="{{$item.class}}">
-                       <a href="{{$item.url}}" {{if $item.accesskey}}accesskey="{{$item.accesskey}}"{{/if}}>
-                               {{$item.name}}
-                       </a>
-               </li>
-               {{/foreach}}
-       </ul>
-</nav>
-{{/if}}
-
+       <nav class="widget">
+               <h3>{{$plugadmtxt}}</h3>
+               <ul>
+                       {{foreach $admin.addons_admin as $name => $item}}
+                               <li class="{{$item.class}}">
+                                       <a href="{{$item.url}}" {{if $item.accesskey}}accesskey="{{$item.accesskey}}" {{/if}}>
+                                               {{$item.name}}
+                                       </a>
+                               </li>
+                       {{/foreach}}
+               </ul>
+       </nav>
+{{/if}}
\ No newline at end of file
index 3c2930841a0872a83e9294d6c4d5a895d873f115..50d335ede5b78f9b4d99d6c7a558169b3c71ebb0 100644 (file)
@@ -4,63 +4,62 @@
   *
   * SPDX-License-Identifier: AGPL-3.0-or-later
   *}}
-<span id="circle-sidebar-inflated" class="widget inflated fakelink" onclick="openCloseWidget('circle-sidebar', 'circle-sidebar-inflated');">
-        <h3>{{$title}}</h3>
-</span>
-<div class="widget" id="circle-sidebar">
-       <div id="sidebar-circle-header" class="sidebar-widget-header">
-               <span class="fakelink" onclick="openCloseWidget('circle-sidebar', 'circle-sidebar-inflated');">
+<nav>
+       <span id="circle-sidebar-inflated" class="widget inflated fakelink">
+               <button class="fakelink" onclick="openCloseWidget('circle-sidebar', 'circle-sidebar-inflated');" aria-expanded="false">
                        <h3>{{$title}}</h3>
-               </span>
-               {{if ! $new_circle}}
-               <a class="circle-edit-tool pull-right widget-action faded-icon" id="sidebar-edit-circle" href="{{$circle_page}}" data-toggle="tooltip" title="{{$edit_circles_text}}">
-                       <i class="fa fa-pencil" aria-hidden="true"></i>
-               </a>
-               {{else}}
-               <a class="circle-edit-tool pull-right widget-action faded-icon" id="sidebar-new-circle" onclick="javascript:$('#circle-new-form').fadeIn('fast');" data-toggle="tooltip" title="{{$createtext}}">
-                       <i class="fa fa-plus" aria-hidden="true"></i>
-               </a>
-               <form id="circle-new-form" action="circle/new" method="post" style="display:none;">
-                       <div class="form-group">
-                               <input type="hidden" name="form_security_token" value="{{$form_security_token}}">
-                               <input name="circle_name" id="id_circle_name" class="form-control input-sm" placeholder="{{$create_circle}}">
-                       </div>
-               </form>
-               {{/if}}
-       </div>
-       <div id="sidebar-circle-list" class="sidebar-widget-list">
-               {{* The list of available circles *}}
-               <ul role="menu" id="sidebar-circle-ul">
-                       {{foreach $circles as $circle}}
-                               <li role="menuitem" class="sidebar-circle-li circle-{{$circle.id}} {{if $circle.selected}}selected{{/if}}">
-                                       {{if ! $new_circle}}<span class="notify badge pull-right"></span>{{/if}}
-                                       {{if $circle.cid}}
-                                               <div class="checkbox pull-right circle-checkbox ">
-                                                       <input type="checkbox"
-                                                               id="sidebar-circle-checkbox-{{$circle.id}}"
-                                                               class="{{if $circle.selected}}ticked{{else}}unticked {{/if}} action"
-                                                               onclick="return contactCircleChangeMember(this, '{{$circle.id}}','{{$circle.cid}}');"
-                                                               {{if $circle.ismember}}checked="checked"{{/if}}
-                                                               aria-checked="{{if $circle.ismember}}true{{else}}false{{/if}}"
-                                                       />
-                                                       <label for="sidebar-circle-checkbox-{{$circle.id}}"></label>
-                                                       <div class="clearfix"></div>
-                                               </div>
-                                       {{/if}}
-                                       {{if $circle.edit}}
-                                               {{* if the circle is editable show a little pencil for editing *}}
-                                               <a id="edit-sidebar-circle-element-{{$circle.id}}" class="circle-edit-tool pull-right faded-icon" href="{{$circle.edit.href}}" data-toggle="tooltip" title="{{$edittext}}">
-                                                       <i class="fa fa-pencil" aria-hidden="true"></i>
-                                               </a>
-                                       {{/if}}
-                                       <a id="sidebar-circle-element-{{$circle.id}}" class="sidebar-circle-element" href="{{$circle.href}}">{{$circle.text}}</a>
-                               </li>
-                       {{/foreach}}
+               </button>
+       </span>
+       <div class="widget" id="circle-sidebar">
+               <div id="sidebar-circle-header" class="sidebar-widget-header">
+                       <button class="fakelink" onclick="openCloseWidget('circle-sidebar', 'circle-sidebar-inflated');" aria-expanded="true">
+                               <h3>{{$title}}</h3>
+                       </button>
+                       {{if ! $new_circle}}
+                               <a class="circle-edit-tool pull-right widget-action faded-icon" id="sidebar-edit-circle" href="{{$circle_page}}" data-toggle="tooltip" title="{{$edit_circles_text}}">
+                                       <i class="fa fa-pencil" aria-hidden="true"></i>
+                               </a>
+                       {{else}}
+                               <a class="circle-edit-tool pull-right widget-action faded-icon" id="sidebar-new-circle"
+                                       onclick="javascript:$('#circle-new-form').fadeIn('fast');" data-toggle="tooltip" title="{{$createtext}}">
+                                       <i class="fa fa-plus" aria-hidden="true"></i>
+                               </a>
+                               <form id="circle-new-form" action="circle/new" method="post" style="display:none;">
+                                       <div class="form-group">
+                                               <input type="hidden" name="form_security_token" value="{{$form_security_token}}">
+                                               <input name="circle_name" id="id_circle_name" class="form-control input-sm" placeholder="{{$create_circle}}">
+                                       </div>
+                               </form>
+                       {{/if}}
+               </div>
+               <div id="sidebar-circle-list" class="sidebar-widget-list">
+                       {{* The list of available circles *}}
+                       <ul id="sidebar-circle-ul">
+                               {{foreach $circles as $circle}}
+                                       <li class="sidebar-circle-li circle-{{$circle.id}} {{if $circle.selected}}selected{{/if}}">
+                                               {{if ! $new_circle}}<span class="notify badge pull-right"></span>{{/if}}
+                                               {{if $circle.cid}}
+                                                       <div class="checkbox pull-right circle-checkbox ">
+                                                               <input type="checkbox" id="sidebar-circle-checkbox-{{$circle.id}}" class="{{if $circle.selected}}ticked{{else}}unticked {{/if}} action" onclick="return contactCircleChangeMember(this, '{{$circle.id}}','{{$circle.cid}}');" {{if $circle.ismember}}checked="checked" {{/if}} aria-checked="{{if $circle.ismember}}true{{else}}false{{/if}}" />
+                                                               <label for="sidebar-circle-checkbox-{{$circle.id}}"></label>
+                                                               <div class="clearfix"></div>
+                                                       </div>
+                                               {{/if}}
+                                               {{if $circle.edit}}
+                                                       {{* if the circle is editable show a little pencil for editing *}}
+                                                       <a id="edit-sidebar-circle-element-{{$circle.id}}" class="circle-edit-tool pull-right faded-icon" href="{{$circle.edit.href}}" data-toggle="tooltip" title="{{$edittext}}">
+                                                               <i class="fa fa-pencil" aria-hidden="true"></i>
+                                                       </a>
+                                               {{/if}}
+                                               <a id="sidebar-circle-element-{{$circle.id}}" class="sidebar-circle-element" href="{{$circle.href}}">{{$circle.text}}</a>
+                                       </li>
+                               {{/foreach}}
 
-                       {{if $uncircled}}<li class="{{if $uncircled_selected}}selected{{/if}} sidebar-circle-li" id="sidebar-uncircled"><a href="nocircle">{{$uncircled}}</a></li>{{/if}}
-               </ul>
+                               {{if $uncircled}}<li class="{{if $uncircled_selected}}selected{{/if}} sidebar-circle-li" id="sidebar-uncircled"><a href="nocircle">{{$uncircled}}</a></li>{{/if}}
+                       </ul>
+               </div>
        </div>
-</div>
+</nav>
 <script>
-initWidget('circle-sidebar', 'circle-sidebar-inflated');
-</script>
+       initWidget('circle-sidebar', 'circle-sidebar-inflated');
+</script>
\ No newline at end of file
index f1d2d6959ee6586bb01f9c72ccd430c81be01677..64dc9aedfb5cc70af8f02fb415bd85bb9b424d64 100644 (file)
@@ -4,7 +4,7 @@
   *
   * SPDX-License-Identifier: AGPL-3.0-or-later
   *}}
-       <div class="tabbar-wrapper" role="menubar" >
+<nav class="tabbar-wrapper" role="menubar">
        {{* Tab navigation bar for tablets and computer *}}
        <ul class="tabbar list-inline visible-lg visible-md visible-sm hidden-xs">
                {{* The normal tabbar *}}
                        <ul class="tabs flex-nav">
                                {{foreach $tabs as $tab}}
                                        <li id="{{$tab.id}}" {{if $tab.sel}} class="{{$tab.sel}}" {{/if}}>
-                                               <a role="menuitem" class="tabbar-wrapper__link" href="{{$tab.url}}" {{if $tab.accesskey}}accesskey="{{$tab.accesskey}}" {{/if}}
-                                                       {{if $tab.title}} title="{{$tab.title}}" {{/if}}>
-                                                       {{$tab.label}}
-                                               </a>
-                                       </li>
+                                               <a role="menuitem" class="tabbar-wrapper__link" href="{{$tab.url}}"
+                                                       {{if $tab.accesskey}}accesskey="{{$tab.accesskey}}" {{/if}} {{if $tab.title}}
+                                               title="{{$tab.title}}" {{/if}}>
+                                               {{$tab.label}}
+                                       </a>
+                               </li>
                                {{/foreach}}
                        </ul>
                </li>
 
                {{* The extended dropdown menu - this would be shown if the tab menu points
-                       doesn't fit in the available space. This is done through flexMenu.js *}}
+                 doesn't fit in the available space. This is done through flexMenu.js *}}
                <li class="pull-right">
                        <ul class="tabs tabs-extended" role="menu">
                                <li class="dropdown flex-target">
-                                       <button type="button" class="btn-link dropdown-toggle" id="dropdownMenuTools" data-toggle="dropdown"
-                                               aria-expanded="false" title="{{$more}}">
+                                       <button type="button" class="btn-link dropdown-toggle" id="dropdownMenuTools" data-toggle="dropdown" aria-expanded="false" title="{{$more}}">
                                                <i class="fa fa-chevron-down" aria-hidden="true"></i>
                                        </button>
                                </li>
@@ -58,8 +58,7 @@
                <li>
                        <ul class="tabs tabs-extended">
                                <li class="dropdown">
-                                       <button type="button" class="btn-link dropdown-toggle" id="dropdownMenuTools-xs"
-                                               data-toggle="dropdown" aria-expanded="false" title="{{$more}}">
+                                       <button type="button" class="btn-link dropdown-toggle" id="dropdownMenuTools-xs" data-toggle="dropdown" aria-expanded="false" title="{{$more}}">
                                                <i class="fa fa-chevron-down" aria-hidden="true"></i>
                                        </button>
                                        <ul class="dropdown-menu" role="menu" aria-labelledby="dropdownMenuTools">
@@ -75,4 +74,4 @@
                        </ul>
                </li>
        </ul>
-</div>
+</nav>
\ No newline at end of file
index 160acd02d4806b266e6179aaf371a1f53a2aca1b..cf35a2333fb1f212724ba2d0e8d6316e9ddfce2d 100644 (file)
@@ -4,13 +4,13 @@
   *
   * SPDX-License-Identifier: AGPL-3.0-or-later
   *}}
-<div id="message-sidebar" class="widget">
+<nav id="message-sidebar" class="widget">
        {{if $tabs}}
-       <div id="message-preview" class="panel panel-default">
-               <ul class="media-list">
-               {{$tabs nofilter}}
-               </ul>
-       </div>
+               <div id="message-preview" class="panel panel-default">
+                       <ul class="media-list">
+                               {{$tabs nofilter}}
+                       </ul>
+               </div>
        {{/if}}
 
-</div>
+</nav>
\ No newline at end of file
index 49f96aa9af19ed8c65209146abcafe92510da20b..6e149239ae22474ee31f2bdf7643a657584efc77 100644 (file)
@@ -6,8 +6,8 @@
   *}}
 <script type="text/javascript">
        // update pending count //
-       $(function(){
-               $("nav").bind('nav-update', function(e,data){
+       $(function() {
+               $('#topbar-first').bind('nav-update', function(e, data) {
                        var elm = $('#pending-update');
                        var register = parseInt($(data).find('register').text());
                        if (register > 0) {
 </script>
 
 {{foreach $subpages as $page}}
-<div class="widget">
-       <h3>{{$page.0}}</h3>
-       <ul role="menu">
-               {{foreach $page.1 as $item}}
-               <li role="menuitem" class="{{$item.2}}">
-                       <a href="{{$item.0}}" {{if $item.accesskey}}accesskey="{{$item.accesskey}}"{{/if}}>
-                               {{$item.1}}
-                               {{if $name == "users"}}
-                                <span id="pending-update" class="badge pull-right"></span>
-                               {{/if}}
-                       </a>
-               </li>
-               {{/foreach}}
-       </ul>
-</div>
-{{/foreach}}
+       <nav class="widget">
+               <h3>{{$page.0}}</h3>
+               <ul>
+                       {{foreach $page.1 as $item}}
+                               <li class="{{$item.2}}">
+                                       <a href="{{$item.0}}" {{if $item.accesskey}}accesskey="{{$item.accesskey}}" {{/if}}>
+                                               {{$item.1}}
+                                               {{if $name == "users"}}
+                                                       <span id="pending-update" class="badge pull-right"></span>
+                                               {{/if}}
+                                       </a>
+                               </li>
+                       {{/foreach}}
+               </ul>
+       </nav>
+{{/foreach}}
\ No newline at end of file
index 0f2c30e2f361051deff1c2c9d88a5e3d080e802c..6aa876a0024f835e1d87e53514377015af8eba8e 100644 (file)
@@ -31,7 +31,7 @@
                        <div class="col-lg-12 col-md-12 col-sm-12 col-xs-12 no-padding">
                                <!-- div for navbar width-->
                                <!-- Brand and toggle get grouped for better mobile display -->
-                               <nav class="topbar-nav">
+                               <div class="topbar-nav">
 
                                        {{* Buttons for the mobile view *}}
                                        <button type="button" class="navbar-toggle offcanvas-right-toggle pull-right"
                                                {{/if}}
 
                                        </ul>
-                               </nav>
+                               </div>
 
                                {{* This is the right part of the NavBar. It includes the search and the user menu *}}
                                <div class="topbar-actions pull-right">
index c37381897dd1def7214626d798e5ca0fde6c00de..956102df0261c249a7f4421d214484fc56015a1c 100644 (file)
@@ -4,18 +4,18 @@
   *
   * SPDX-License-Identifier: AGPL-3.0-or-later
   *}}
-<div id="sidebar-photos-albums" class="widget">
+<nav id="sidebar-photos-albums" class="widget">
        <div class="pull-left">
                <h3>{{$title}}</h3>
        </div>
 
        <div class="pull-right">
-       {{if $can_post}}
-               <div class="photos-upload-link">
-                       <a href="{{$upload.1}}" title="{{$upload.0}}" class="widget-action faded-icon" data-toggle="tooltip">
-                               <i class="fa fa-plus"></i>
-                       </a>
-               </div>
+               {{if $can_post}}
+                       <div class="photos-upload-link">
+                               <a href="{{$upload.1}}" title="{{$upload.0}}" class="widget-action faded-icon" data-toggle="tooltip">
+                                       <i class="fa fa-plus"></i>
+                               </a>
+                       </div>
                {{/if}}
        </div>
 
                </li>
 
                {{if $albums}}
-               {{foreach $albums as $al}}
-                       {{if $al.text}}
-                       <li role="menuitem" class="sidebar-photos-albums-li">
-                               <a href="photos/{{$nick}}/album/{{$al.bin2hex}}" class="sidebar-photos-albums-element">
-                                       <span class="badge pull-right">{{$al.total}}</span>{{$al.text}}
-                               </a>
-                       </li>
-                       {{/if}}
-               {{/foreach}}
+                       {{foreach $albums as $al}}
+                               {{if $al.text}}
+                                       <li role="menuitem" class="sidebar-photos-albums-li">
+                                               <a href="photos/{{$nick}}/album/{{$al.bin2hex}}" class="sidebar-photos-albums-element">
+                                                       <span class="badge pull-right">{{$al.total}}</span>{{$al.text}}
+                                               </a>
+                                       </li>
+                               {{/if}}
+                       {{/foreach}}
                {{/if}}
        </ul>
-</div>
+</nav>
\ No newline at end of file
index ac1fe54eae85de9c75b9169455e9ef55c5fcab13..a3f6d28df07083be8d3a496de1e0d381907ff3ee 100644 (file)
                <a href="{{$profile.url}}"><img class="photo u-photo" src="{{$profile.photo}}" alt="{{$profile.name}}" /></a>
                <div class="tool visible-lg visible-md">
                        {{if $profile.edit}}
-                       <div class="action">
-                               <a class="" href="{{$profile.edit.0}}" title="{{$profile.edit.3}}"><i class="fa fa-pencil-square-o"></i></a>
-                       </div>
+                               <div class="action">
+                                       <a class="" href="{{$profile.edit.0}}" title="{{$profile.edit.3}}"><i
+                                                       class="fa fa-pencil-square-o"></i></a>
+                               </div>
                        {{/if}}
                </div>
 
@@ -36,7 +37,8 @@
                <div class="profile-header">
                        <h3 class="fn p-name" dir="auto">{{$profile.name}}</h3>
 
-                       {{if $profile.addr}}<div class="p-addr">{{include file="sub/punct_wrap.tpl" text=$profile.addr}}</div>{{/if}}
+                       {{if $profile.addr}}<div class="p-addr">{{include file="sub/punct_wrap.tpl" text=$profile.addr}}</div>
+                       {{/if}}
 
                        {{if $profile.about}}<div class="title" dir="auto">{{$profile.about nofilter}}</div>{{/if}}
 
                </div>
 
                {{if $follow_link || $unfollow_link || $wallmessage_link}}
-               <div id="profile-extra-links">
-                       {{if $follow_link || $unfollow_link}}
-                       <div id="dfrn-request-link-button">
-                               {{if $unfollow_link}}
-                               <a id="dfrn-request-link" class="btn btn-labeled btn-primary" href="{{$unfollow_link}}">
-                                       <span class=""><i class="fa fa-user-times"></i></span>
-                                       <span class="">{{$unfollow}}</span>
-                               </a>
-                               {{else}}
-                               <a id="dfrn-request-link" class="btn btn-labeled btn-primary" href="{{$follow_link}}">
-                                       <span class=""><i class="fa fa-user-plus"></i></span>
-                                       <span class="">{{$follow}}</span>
-                               </a>
+                       <div id="profile-extra-links">
+                               {{if $follow_link || $unfollow_link}}
+                                       <div id="dfrn-request-link-button">
+                                               {{if $unfollow_link}}
+                                                       <a id="dfrn-request-link" class="btn btn-labeled btn-primary" href="{{$unfollow_link}}">
+                                                               <span class=""><i class="fa fa-user-times"></i></span>
+                                                               <span class="">{{$unfollow}}</span>
+                                                       </a>
+                                               {{else}}
+                                                       <a id="dfrn-request-link" class="btn btn-labeled btn-primary" href="{{$follow_link}}">
+                                                               <span class=""><i class="fa fa-user-plus"></i></span>
+                                                               <span class="">{{$follow}}</span>
+                                                       </a>
+                                               {{/if}}
+                                       </div>
+                               {{/if}}
+                               {{if $subscribe_feed_link}}
+                                       <div id="subscribe-feed-link-button">
+                                               <a id="subscribe-feed-link" class="btn btn-labeled btn-primary" href="{{$subscribe_feed_link}}">
+                                                       <span class=""><i class="fa fa-rss"></i></span>
+                                                       <span class="">{{$subscribe_feed}}</span>
+                                               </a>
+                                       </div>
+                               {{/if}}
+                               {{if $wallmessage_link}}
+                                       <div id="wallmessage-link-button">
+                                               <button type="button" id="wallmessage-link" class="btn btn-labeled btn-primary" onclick="openWallMessage('{{$wallmessage_link}}')">
+                                                       <span class=""><i class="fa fa-envelope"></i></span>
+                                                       <span class="">{{$wallmessage}}</span>
+                                               </button>
+                                       </div>
+                               {{/if}}
+                               {{if $profile.addr}}
+                                       <div id="mention-link-button">
+                                               <button type="button" id="mention-link" class="btn btn-labeled btn-primary" onclick="openWallMessage('{{$mention_url}}')">
+                                                       <span class=""><i class="fa fa-pencil-square-o"></i></span>
+                                                       <span class="">{{$mention_label}}</span>
+                                               </button>
+                                       </div>
+                               {{/if}}
+                               {{if $network_label}}
+                                       <div id="showgroup-button">
+                                               <a id="showgroup" class="btn btn-labeled btn-primary" href="{{$network_url}}">
+                                                       <span class=""><i class="fa fa-group"></i></span>
+                                                       <span class="">{{$network_label}}</span>
+                                               </a>
+                                       </div>
                                {{/if}}
                        </div>
-                       {{/if}}
-                       {{if $subscribe_feed_link}}
-                       <div id="subscribe-feed-link-button">
-                               <a id="subscribe-feed-link" class="btn btn-labeled btn-primary" href="{{$subscribe_feed_link}}">
-                                       <span class=""><i class="fa fa-rss"></i></span>
-                                       <span class="">{{$subscribe_feed}}</span>
-                               </a>
-                       </div>
-                       {{/if}}
-                       {{if $wallmessage_link}}
-                       <div id="wallmessage-link-button">
-                               <button type="button" id="wallmessage-link" class="btn btn-labeled btn-primary" onclick="openWallMessage('{{$wallmessage_link}}')">
-                                       <span class=""><i class="fa fa-envelope"></i></span>
-                                       <span class="">{{$wallmessage}}</span>
-                               </button>
-                       </div>
-                       {{/if}}
-            {{if $profile.addr}}
-                       <div id="mention-link-button">
-                               <button type="button" id="mention-link" class="btn btn-labeled btn-primary" onclick="openWallMessage('{{$mention_url}}')">
-                                       <span class=""><i class="fa fa-pencil-square-o"></i></span>
-                                       <span class="">{{$mention_label}}</span>
-                               </button>
-                       </div>
-                       {{/if}}
-            {{if $network_label}}
-                       <div id="showgroup-button">
-                               <a id="showgroup" class="btn btn-labeled btn-primary" href="{{$network_url}}">
-                                       <span class=""><i class="fa fa-group"></i></span>
-                                       <span class="">{{$network_label}}</span>
-                               </a>
-                       </div>
-                       {{/if}}
-               </div>
                {{/if}}
 
                <div class="clear"></div>
 
                {{if $location}}
-               <div class="location detail">
-                       <span class="location-label icon"><i class="fa fa-map-marker" title="{{$location}}"></i></span>
-                       <span class="adr">
-                               {{if $profile.address}}<p class="street-address p-street-address">{{$profile.address nofilter}}</p>{{/if}}
-                               {{if $profile.location}}<p class="p-location">{{$profile.location}}</p>{{/if}}
-                       </span>
-               </div>
+                       <div class="location detail">
+                               <span class="location-label icon"><i class="fa fa-map-marker" title="{{$location}}"></i></span>
+                               <span class="adr">
+                                       {{if $profile.address}}<p class="street-address p-street-address">{{$profile.address nofilter}}</p>
+                                       {{/if}}
+                                       {{if $profile.location}}<p class="p-location">{{$profile.location}}</p>{{/if}}
+                               </span>
+                       </div>
                {{/if}}
 
                {{if $profile.xmpp}}
-               <div class="xmpp">
-                       <span class="xmpp-label icon"><i class="fa fa-xmpp" title="{{$xmpp}}"></i></span>
-                       <span class="xmpp-data"><a href="xmpp:{{$profile.xmpp}}" rel="me" target="_blank" rel="noopener noreferrer">{{include file="sub/punct_wrap.tpl" text=$profile.xmpp}}</a></span>
-               </div>
+                       <div class="xmpp">
+                               <span class="xmpp-label icon"><i class="fa fa-xmpp" title="{{$xmpp}}"></i></span>
+                               <span class="xmpp-data"><a href="xmpp:{{$profile.xmpp}}" rel="me" target="_blank" rel="noopener noreferrer">{{include file="sub/punct_wrap.tpl" text=$profile.xmpp}}</a></span>
+                       </div>
                {{/if}}
 
                {{if $profile.matrix}}
-               <div class="matrix">
-                       <span class="matrix-label icon"><i class="fa fa-matrix-org" title="{{$matrix}}"></i></span>
-                       <span class="matrix-data"><a href="matrix:{{$profile.matrix}}" rel="me" target="_blank" rel="noopener noreferrer">{{include file="sub/punct_wrap.tpl" text=$profile.matrix}}</a></span>
-               </div>
+                       <div class="matrix">
+                               <span class="matrix-label icon"><i class="fa fa-matrix-org" title="{{$matrix}}"></i></span>
+                               <span class="matrix-data"><a href="matrix:{{$profile.matrix}}" rel="me" target="_blank" rel="noopener noreferrer">{{include file="sub/punct_wrap.tpl" text=$profile.matrix}}</a></span>
+                       </div>
                {{/if}}
 
                {{if $profile.upubkey}}<div class="key u-key" style="display:none;">{{$profile.upubkey}}</div>{{/if}}
                {{if $updated}}<div class="updated" style="display:none;">{{$updated}}</div>{{/if}}
 
                {{if $homepage}}
-               <div class="homepage detail">
-                       <span class="homepage-label icon"><i class="fa fa-external-link" title="{{$homepage}}"></i></span>
-                       <span class="homepage-url u-url"><a href="{{$profile.homepage}}" rel="me" target="_blank" rel="noopener noreferrer">{{include file="sub/punct_wrap.tpl" text=$profile.homepage}}</a>{{if $profile.homepage_verified}} <span title="{{$homepage_verified}}">✔</span>{{/if}}</span>
-               </div>
+                       <div class="homepage detail">
+                               <span class="homepage-label icon"><i class="fa fa-external-link" title="{{$homepage}}"></i></span>
+                               <span class="homepage-url u-url"><a href="{{$profile.homepage}}" rel="me" target="_blank" rel="noopener noreferrer">{{include file="sub/punct_wrap.tpl" text=$profile.homepage}}</a>{{if $profile.homepage_verified}}
+                                       <span title="{{$homepage_verified}}">✔</span>{{/if}}</span>
+                       </div>
                {{/if}}
 
-               {{if $about}}<dl class="about"  style="display:none;"><dt class="about-label">{{$about}}</dt><dd class="x-network">{{$profile.about nofilter}}</dd></dl>{{/if}}
+               {{if $about}}<dl class="about" style="display:none;">
+                               <dt class="about-label">{{$about}}</dt>
+                               <dd class="x-network">{{$profile.about nofilter}}</dd>
+               </dl>{{/if}}
 
                {{include file="diaspora_vcard.tpl"}}
        </div>
 </div>
 
 {{if $contact_block}}
-<div class="widget" id="widget-contacts">
-       {{$contact_block nofilter}}
-</div>
-{{/if}}
+       <nav class="widget" id="widget-contacts">
+               {{$contact_block nofilter}}
+       </nav>
+{{/if}}
\ No newline at end of file
index 0b48dad6e5c38147cc558fcdb0d145bbdf53da23..c3944d1c6c9fd712332d99392a7dbadf4ff6b4a0 100644 (file)
@@ -5,28 +5,28 @@
   * SPDX-License-Identifier: AGPL-3.0-or-later
   *}}
 {{if $direction.direction > 0}}
-<span class="direction">
-       <span aria-hidden="true">&bull;</span>
-       {{if $direction.direction == 1}}
-               <i class="fa fa-inbox" title="{{$direction.title}}"></i>
-       {{elseif $direction.direction == 2}}
-               <i class="fa fa-download" title="{{$direction.title}}"></i>
-       {{elseif $direction.direction == 3}}
-               <i class="fa fa-retweet" title="{{$direction.title}}"></i>
-       {{elseif $direction.direction == 4}}
-               <i class="fa fa-hashtag" title="{{$direction.title}}"></i>
-       {{elseif $direction.direction == 5}}
-               <i class="fa fa-comment-o" title="{{$direction.title}}"></i>
-       {{elseif $direction.direction == 6}}
-               <i class="fa fa-user" title="{{$direction.title}}"></i>
-       {{elseif $direction.direction == 7}}
-               <i class="fa fa-at" title="{{$direction.title}}"></i>
-       {{elseif $direction.direction == 8}}
-               <i class="fa fa-share" title="{{$direction.title}}"></i>
-       {{elseif $direction.direction == 9}}
-               <i class="fa fa-globe" title="{{$direction.title}}"></i>
-       {{elseif $direction.direction == 10}}
-               <i class="fa fa-inbox" title="{{$direction.title}}"></i>
-       {{/if}}
-</span>
-{{/if}}
+       <span class="direction" title="{{$direction.title}}">
+               <span aria-hidden="true">&bull;</span>
+               {{if $direction.direction == 1}}
+                       <i class="fa fa-inbox"></i>
+               {{elseif $direction.direction == 2}}
+                       <i class="fa fa-download"></i>
+               {{elseif $direction.direction == 3}}
+                       <i class="fa fa-retweet"></i>
+               {{elseif $direction.direction == 4}}
+                       <i class="fa fa-hashtag"></i>
+               {{elseif $direction.direction == 5}}
+                       <i class="fa fa-comment-o"></i>
+               {{elseif $direction.direction == 6}}
+                       <i class="fa fa-user"></i>
+               {{elseif $direction.direction == 7}}
+                       <i class="fa fa-at"></i>
+               {{elseif $direction.direction == 8}}
+                       <i class="fa fa-share"></i>
+               {{elseif $direction.direction == 9}}
+                       <i class="fa fa-globe"></i>
+               {{elseif $direction.direction == 10}}
+                       <i class="fa fa-inbox"></i>
+               {{/if}}
+       </span>
+{{/if}}
\ No newline at end of file
index c573749bafadf15466ed598d830994bb71afbb39..60bea3f9cfabc0ce2ec45f952401ca1d78eef888 100644 (file)
@@ -203,7 +203,9 @@ as the value of $top_child_total (this is done at the end of this file)
                                                        {{/if}}
                                                        {{if $item.connector}}
                                                                <span aria-hidden="true">&bull;</span>
-                                                               <i class="fa fa-plug" title="{{$item.connector}}"></i>
+                                                               <span title="{{$item.connector}}">
+                                                                       <i class="fa fa-plug" aria-hidden="true"></i>
+                                                               </span>
                                                        {{else}}
                                                                <span aria-hidden="true">&bull;</span>
                                                                <span class="navicon lock fakelink" onClick="lockview(event, 'item', {{$item.id}});" title="{{$item.privacy}}" data-toggle="tooltip">
@@ -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}}
-                                               <span aria-hidden="true">&bull;</span>
-                                               <i class="fa fa-plug" title="{{$item.connector}}"></i>
+                                               <span title="{{$item.connector}}">
+                                                       <span aria-hidden="true">&bull;</span>
+                                                       <i class="fa fa-plug" aria-hidden="true"></i>
+                                               </span>
                                        {{else}}
                                                <span class="navicon lock fakelink" onClick="lockview(event, 'item', {{$item.id}});" title="{{$item.privacy}}" data-toggle="tooltip">
                                                        <span aria-hidden="true">&bull;</span>
index 2e679f9f5db3ea2293920dca4038cea738bc0542..b469bfd368aa531dd066867d92e0c80e47c7d983 100644 (file)
@@ -5,7 +5,7 @@
   * SPDX-License-Identifier: AGPL-3.0-or-later
   *}}
 
-<div id="follow-sidebar" class="widget">
+<nav id="follow-sidebar" class="widget">
        <h3>{{$connect}}</h3>
 
        <form action="contact/follow" method="post">
@@ -15,5 +15,4 @@
                        <button id="side-follow-submit" class="btn btn-default btn-sm form-button-search" type="submit">{{$follow}}</button>
                </div>
        </form>
-</div>
-
+</nav>
\ No newline at end of file
index 3ead29c9a5d892fe5f2f4b2db7f7fed89f04be0a..02b35017949366b3035b3a79b9b7e0bec0e8fb24 100644 (file)
@@ -4,7 +4,7 @@
   *
   * SPDX-License-Identifier: AGPL-3.0-or-later
   *}}
-<div id="peoplefind-sidebar" class="widget">
+<nav id="peoplefind-sidebar" class="widget">
        <h3>{{$nv.findpeople}}</h3>
 
        <form action="dirfind" method="get">
@@ -24,7 +24,7 @@
        <div class="side-link" id="side-suggest-link"><a href="contact/suggestions" class="side-link-link">{{$nv.suggest}}</a></div>
        <div class="side-link" id="side-random-profile-link"><a href="randprof" class="side-link-link" target="extlink">{{$nv.random}}</a></div>
 
-       {{if $nv.inv}} 
-       <div class="side-link" id="side-invite-link"><button type="button" class="btn-link side-link-link" onclick="addToModal('invite'); return false;">{{$nv.inv}}</button></div>
+       {{if $nv.inv}}
+               <div class="side-link" id="side-invite-link"><button type="button" class="btn-link side-link-link" onclick="addToModal('invite'); return false;">{{$nv.inv}}</button></div>
        {{/if}}
-</div>
+</nav>
\ No newline at end of file
index d3d12edda983459f315c64d20eda939d1aeca956..7c47ec1b2ff123ac16254dc5987803d3956d1077 100644 (file)
@@ -5,26 +5,30 @@
   * SPDX-License-Identifier: AGPL-3.0-or-later
   *}}
 {{if $saved}}
-<span id="saved-search-list-inflated" class="widget inflated fakelink" onclick="openCloseWidget('saved-search-list', 'saved-search-list-inflated');">
-       <h3>{{$title}}</h3>
-</span>
-<div class="widget" id="saved-search-list">
-       <span class="fakelink" onclick="openCloseWidget('saved-search-list', 'saved-search-list-inflated');">
-               <h3 id="search">{{$title}}</h3>
-       </span>
-       <ul role="menu" id="saved-search-ul">
-               {{foreach $saved as $search}}
-               <li role="menuitem" class="saved-search-li clear">
-                       <a href="search/saved/remove?term={{$search.encodedterm}}&amp;return_url={{$return_url}}" title="{{$search.delete}}" onclick="return confirmDelete();" id="drop-saved-search-term-{{$search.id}}" class="savedsearchdrop pull-right widget-action faded-icon">
-                               <i class="fa fa-trash" aria-hidden="true"></i>
-                       </a>
-                       <a href="{{$search.searchpath}}" id="saved-search-term-{{$search.id}}" class="savedsearchterm">{{$search.term}}</a>
-               </li>
-               {{/foreach}}
-       </ul>
-       <div class="clearfix"></div>
-</div>
-<script>
-initWidget('saved-search-list', 'saved-search-list-inflated');
-</script>
-{{/if}}
+       <nav>
+               <span id="saved-search-list-inflated" class="widget inflated fakelink">
+                       <button class="fakelink" onclick="openCloseWidget('saved-search-list', 'saved-search-list-inflated');" aria-expanded="false">
+                               <h3>{{$title}}</h3>
+                       </button>
+               </span>
+               <div class="widget" id="saved-search-list">
+                       <button class="fakelink" onclick="openCloseWidget('saved-search-list', 'saved-search-list-inflated');">
+                               <h3 id="search">{{$title}}</h3>
+                       </button>
+                       <ul id="saved-search-ul">
+                               {{foreach $saved as $search}}
+                                       <li class="saved-search-li clear">
+                                               <a href="search/saved/remove?term={{$search.encodedterm}}&amp;return_url={{$return_url}}" title="{{$search.delete}}" onclick="return confirmDelete();" id="drop-saved-search-term-{{$search.id}}" class="savedsearchdrop pull-right widget-action faded-icon">
+                                                       <i class="fa fa-trash" aria-hidden="true"></i>
+                                               </a>
+                                               <a href="{{$search.searchpath}}" id="saved-search-term-{{$search.id}}" class="savedsearchterm">{{$search.term}}</a>
+                                       </li>
+                               {{/foreach}}
+                       </ul>
+                       <div class="clearfix"></div>
+               </div>
+       </nav>
+       <script>
+               initWidget('saved-search-list', 'saved-search-list-inflated');
+       </script>
+{{/if}}
\ No newline at end of file