]> git.mxchange.org Git - friendica.git/commitdiff
Some more screenreader improvements
authorMichael <heluecht@pirati.ca>
Sun, 2 Feb 2025 18:19:32 +0000 (18:19 +0000)
committerMichael <heluecht@pirati.ca>
Tue, 4 Feb 2025 04:49:05 +0000 (04:49 +0000)
23 files changed:
src/Content/Nav.php
view/lang/C/messages.po
view/templates/item/compose.tpl
view/theme/frio/js/mod_events.js
view/theme/frio/php/default.php
view/theme/frio/php/standard.php
view/theme/frio/templates/admin/aside.tpl
view/theme/frio/templates/admin/logs/view.tpl
view/theme/frio/templates/calendar/calendar.tpl
view/theme/frio/templates/common_tabs.tpl
view/theme/frio/templates/contact/entry.tpl
view/theme/frio/templates/contact_edit.tpl
view/theme/frio/templates/event_stream_item.tpl
view/theme/frio/templates/generic_links_widget.tpl
view/theme/frio/templates/jot.tpl
view/theme/frio/templates/media/browser.tpl
view/theme/frio/templates/nav.tpl
view/theme/frio/templates/page_tabs.tpl
view/theme/frio/templates/photo_item.tpl
view/theme/frio/templates/search_item.tpl
view/theme/frio/templates/settings/profile/index.tpl
view/theme/frio/templates/threaded_conversation.tpl
view/theme/frio/templates/wall_thread.tpl

index 177a7945c2e98f657de452a8ed441a83a7216551..383ec14df9bce30123e56ca8429b0e666b4491e6 100644 (file)
@@ -108,7 +108,7 @@ class Nav
                        '$userinfo'     => $nav_info['userinfo'],
                        '$sel'          => self::$selected,
                        '$apps'         => $this->getAppMenu(),
-                       '$home'         => $this->l10n->t('Go back'),
+                       '$home'         => $this->l10n->t('Home'),
                        '$clear_notifs' => $this->l10n->t('Clear notifications'),
                        '$search_hint'  => $this->l10n->t('@name, !group, #tags, content')
                ]);
index a9f86dc68a62727bf0020ebd83ced65a27be4afb..903115971a21c742639880c3d040451f485d2b0e 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-03 21:49+0000\n"
+"POT-Creation-Date: 2025-02-04 04:48+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"
@@ -1936,8 +1936,8 @@ msgstr ""
 msgid "Nothing new here"
 msgstr ""
 
-#: src/Content/Nav.php:111 src/Module/Special/HTTPException.php:64
-msgid "Go back"
+#: src/Content/Nav.php:111 src/Content/Nav.php:237 src/Content/Nav.php:294
+msgid "Home"
 msgstr ""
 
 #: src/Content/Nav.php:112
@@ -2024,10 +2024,6 @@ msgstr ""
 msgid "Your personal notes"
 msgstr ""
 
-#: src/Content/Nav.php:237 src/Content/Nav.php:294
-msgid "Home"
-msgstr ""
-
 #: src/Content/Nav.php:237 src/Module/Settings/OAuth.php:59
 msgid "Home Page"
 msgstr ""
@@ -10756,6 +10752,10 @@ msgstr ""
 msgid "Possible reasons include:"
 msgstr ""
 
+#: src/Module/Special/HTTPException.php:64
+msgid "Go back"
+msgstr ""
+
 #: src/Module/Special/HTTPException.php:65
 msgid "Stack trace:"
 msgstr ""
index 4c7bdebfdb3cf8a41cd08ead5d7815a0b13173cf..3f28ec3f43f72fbafff020329e55bd338669bee5 100644 (file)
@@ -65,7 +65,7 @@
                        </div>
                        <p class="comment-edit-submit-wrapper">
 {{if $type == 'post'}}
-                               <span role="presentation" class="form-inline">
+                               <span class="form-inline">
                                        <button type="button" name="permissions" class="btn btn-sm template-icon" id="toggle-permissions" title="{{$l10n.toggle_permissions_tooltip}}" onclick="togglePermissions()" style="margin-right: 10px;" tabindex="5">
                                                <i class="fa fa-ellipsis-h"></i> {{$l10n.toggle_permissions}}
                                        </button>
                                        </button>
                                </span>
 {{/if}}
-                               <span role="presentation" id="profile-rotator-wrapper">
-                                       <img role="presentation" id="profile-rotator" src="images/rotator.gif" alt="{{$l10n.wait}}" title="{{$l10n.wait}}" style="display: none;" />
+                               <span id="profile-rotator-wrapper">
+                                       <img id="profile-rotator" src="images/rotator.gif" alt="{{$l10n.wait}}" title="{{$l10n.wait}}" style="display: none;" />
                                </span>
-                               <span role="presentation" id="character-counter" class="grey text-info"></span>
+                               <span id="character-counter" class="grey text-info"></span>
                                <button type="button" class="btn btn-default" onclick="preview_comment({{$id}});" id="comment-edit-preview-link-{{$id}}" tabindex="8"><i class="fa fa-eye"></i> {{$l10n.preview}}</button>
                                <button type="submit" class="btn btn-primary" id="comment-edit-submit-{{$id}}" name="submit" tabindex="9"><i class="fa fa-envelope"></i> {{$l10n.submit}}</button>
                        </p>
index bae61a07596fa3cb95904ab9ff4d73e775bda5b2..736c4d201bf7c5f62311de8ef35c6b7f834dc5f6 100644 (file)
@@ -218,7 +218,7 @@ function eventHoverBodyTemplate() {
 // The template for presenting the event location in the event hover-card
 function eventHoverLocationTemplate() {
        var template =
-               '<span role="presentation" aria-hidden="true"> · </span>\
+               '<span aria-hidden="true"> · </span>\
                        <span class="event-card-location"> {0}</span></div>';
        return template;
 }
index 450d9aedc660037c90fc14f799c406dc7628248a..01bace9161a235c544998ad393e601590e45a274 100644 (file)
@@ -115,7 +115,7 @@ if ($minimal) {
                                                echo '
                                        </aside>
 
-                                       <div class="col-lg-7 col-md-7 col-sm-12 col-xs-12" id="content">
+                                       <div class="col-lg-7 col-md-7 col-sm-12 col-xs-12" id="content" tabindex="0">
                                                <section class="sectiontop ';
                                                echo $page['section'] ?? '';
                                                echo '-content-wrapper">';
index 52f41eb0f48ace5787b8f83e7c9191e8061bafb3..31fb0dd588daed660357c288125ecc937b9006e7 100644 (file)
@@ -65,7 +65,7 @@ include('includes/photo_side.php');
 echo'
                                        </aside>
 
-                                       <div class="col-lg-8 col-md-8 col-sm-12 col-xs-12" id="content">
+                                       <div class="col-lg-8 col-md-8 col-sm-12 col-xs-12" id="content" tabindex="0">
                                                <section class="sectiontop">
                                                                <div class="panel ' . DI::args()->get(0, 'generic') . '-content-wrapper">
                                                                        <div class="panel-body">';
index ba4798589dc9e1967585147b213212d7bfd4db9a..4159076904a948702c0555116bed2b8d9c32442a 100644 (file)
 </script>
 
 {{foreach $subpages as $page}}
-<div class="widget">
+<nav class="widget">
        <h3>{{$page.0}}</h3>
-       <ul role="menu">
+       <ul>
                {{foreach $page.1 as $item}}
-               <li role="menuitem" class="{{$item.2}}">
+               <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>
+                               <span id="pending-update" class="badge pull-right"></span>
                                {{/if}}
                        </a>
                </li>
                </li>
        </ul>
        {{/if}}
-</div>
+</nav>
 {{/foreach}}
 
 {{if $admin.addons_admin}}
-<div class="widget">
+<nav class="widget">
        <h3>{{$plugadmtxt}}</h3>
        <ul role="menu">
                {{foreach $admin.addons_admin as $name => $item}}
@@ -57,6 +57,6 @@
                </li>
                {{/foreach}}
        </ul>
-</div>
+</nav>
 {{/if}}
 
index b959a8291ee5f85a59a7517bc8dd617c729aef0d..2ef960d7af061b2e5dc0368c360f3596aebebdc5 100644 (file)
@@ -91,7 +91,7 @@
 </div>
 
 <div id="logdetail" class="modal fade" tabindex="-1" role="dialog">
-       <div class="modal-dialog modal-lg" style="width:90%" role="document">
+       <div class="modal-dialog modal-lg" style="width:90%">
                <div class="modal-content">
                        <div class="modal-header">
                                <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
index c6578bcf5c299f6d610c3ff9d8336a83ef9932da..06535790a5595510df35c4b1cea9e0019f506710 100644 (file)
                                                <i class="fa fa-angle-down" aria-hidden="true"></i> {{$view}}
                                        </button>
                                        <ul class="dropdown-menu pull-right" role="menu" aria-labelledby="event-calendar-views">
-                                               <li role="presentation">
+                                               <li>
                                                        <button role="menuitem" type="button" class="btn-link" onclick="changeView('changeView', 'month');$('#events-calendar').fullCalendar('option', {contentHeight: '', aspectRatio: 1});">{{$month}}</button>
                                                </li>
-                                               <li role="presentation">
+                                               <li>
                                                        <button role="menuitem" type="button" class="btn-link" onclick="changeView('changeView', 'agendaWeek');$('#events-calendar').fullCalendar('option', 'contentHeight', 'auto');">{{$week}}</button>
                                                </li>
-                                               <li role="presentation">
+                                               <li>
                                                        <button role="menuitem" type="button" class="btn-link" onclick="changeView('changeView', 'agendaDay');$('#events-calendar').fullCalendar('option', 'contentHeight', 'auto');">{{$day}}</button>
                                                </li>
-                                               <li role="presentation">
+                                               <li>
                                                        <button role="menuitem" type="button" class="btn-link" onclick="changeView('changeView', 'listMonth');$('#events-calendar').fullCalendar('option', 'contentHeight', 'auto');">{{$list}}</button>
                                                </li>
                                        </ul>
index fa28c938ecc15ab356b2afa445a353ab0c21233e..f1d2d6959ee6586bb01f9c72ccd430c81be01677 100644 (file)
@@ -4,14 +4,14 @@
   *
   * SPDX-License-Identifier: AGPL-3.0-or-later
   *}}
-<div class="tabbar-wrapper">
+       <div class="tabbar-wrapper" role="menubar" >
        {{* Tab navigation bar for tablets and computer *}}
-       <ul role="menubar" class="tabbar list-inline visible-lg visible-md visible-sm hidden-xs">
+       <ul class="tabbar list-inline visible-lg visible-md visible-sm hidden-xs">
                {{* The normal tabbar *}}
                <li>
-                       <ul class="tabs flex-nav" role="menu">
+                       <ul class="tabs flex-nav">
                                {{foreach $tabs as $tab}}
-                                       <li id="{{$tab.id}}" role="presentation" {{if $tab.sel}} class="{{$tab.sel}}" {{/if}}>
+                                       <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}}
@@ -25,7 +25,7 @@
                        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 role="presentation" class="dropdown flex-target">
+                               <li class="dropdown flex-target">
                                        <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>
@@ -42,7 +42,7 @@
                        <ul class="tabs" role="menu">
                                {{foreach $tabs as $tab}}
                                        {{if $tab.sel}}
-                                               <li id="{{$tab.id}}-xs" role="presentation" {{if $tab.sel}} class="{{$tab.sel}}" {{/if}}>
+                                               <li id="{{$tab.id}}-xs" {{if $tab.sel}} class="{{$tab.sel}}" {{/if}}>
                                                        <a role="menuitem" class="tabbar-wrapper__link" href="{{$tab.url}}" {{if $tab.title}} title="{{$tab.title}}" {{/if}}>
                                                                {{$tab.label}}
                                                        </a>
@@ -64,7 +64,7 @@
                                        </button>
                                        <ul class="dropdown-menu" role="menu" aria-labelledby="dropdownMenuTools">
                                                {{foreach $exttabs as $tab}}
-                                                       <li id="{{$tab.id}}-xs" role="presentation" {{if $tab.sel}} class="{{$tab.sel}}" {{/if}}>
+                                                       <li id="{{$tab.id}}-xs" {{if $tab.sel}} class="{{$tab.sel}}" {{/if}}>
                                                                <a role="menuitem" href="{{$tab.url}}" {{if $tab.title}} title="{{$tab.title}}" {{/if}}>
                                                                        {{$tab.label}}
                                                                </a>
index e69f448793233b364b77be2c28ddc8ea866b5381..93b3599d27f941fe344d55e8b5a1215195ea5c09 100644 (file)
                                <ul class="contact-photo-menu menu-popup dropdown-menu hidden-lg hidden-md hidden-sm" id="contact-photo-menu-{{$contact.id}}" role="menu" aria-labelledby="contact-photo-menu-{{$contact.id}}">
                                        {{foreach $contact.photo_menu as $c}}
                                        {{if $c.2}}
-                                       <li role="presentation"><a role="menuitem" target="redir" href="{{$c.1}}">{{$c.0}}</a></li>
+                                       <li><a role="menuitem" target="redir" href="{{$c.1}}">{{$c.0}}</a></li>
                                        {{elseif $c.3}}
-                                       <li role="presentation"><button role="menuitem" type="button" class="btn-link" onclick="addToModal('{{$c.1}}')">{{$c.0}}</button></li>
+                                       <li><button role="menuitem" type="button" class="btn-link" onclick="addToModal('{{$c.1}}')">{{$c.0}}</button></li>
                                        {{else}}
-                                       <li role="presentation"><a role="menuitem" href="{{$c.1}}">{{$c.0}}</a></li>
+                                       <li><a role="menuitem" href="{{$c.1}}">{{$c.0}}</a></li>
                                        {{/if}}
                                        {{/foreach}}
                                </ul>
index 85af4058e1aaa1cb95bd08a2f2386c30cf7846ac..5753a1e229b4aa9abf6eccae2ec844011a03b641 100644 (file)
                                                </button>
 
                                                <ul class="dropdown-menu pull-right" role="menu" aria-labelledby="contact-edit-actions-button" aria-haspopup="true" id="contact-actions-menu">
-                                                       {{if $contact_actions.follow}}<li role="presentation"><a role="menuitem" href="{{$contact_actions.follow.url}}" title="{{$contact_actions.follow.title}}">{{$contact_actions.follow.label}}</a></li>{{/if}}
-                                                       {{if $contact_actions.unfollow}}<li role="presentation"><a role="menuitem" href="{{$contact_actions.unfollow.url}}" title="{{$contact_actions.unfollow.title}}">{{$contact_actions.unfollow.label}}</a></li>{{/if}}
-                                                       {{if $lblsuggest}}<li role="presentation"><a role="menuitem" href="{{$contact_actions.suggest.url}}" title="{{$contact_actions.suggest.title}}">{{$contact_actions.suggest.label}}</a></li>{{/if}}
-                                                       {{if $poll_enabled}}<li role="presentation"><a role="menuitem" href="{{$contact_actions.update.url}}" title="{{$contact_actions.update.title}}">{{$contact_actions.update.label}}</a></li>{{/if}}
-                                                       {{if $contact_actions.updateprofile}}<li role="presentation"><a role="menuitem" href="{{$contact_actions.updateprofile.url}}" title="{{$contact_actions.updateprofile.title}}">{{$contact_actions.updateprofile.label}}</a></li>{{/if}}
+                                                       {{if $contact_actions.follow}}<li><a role="menuitem" href="{{$contact_actions.follow.url}}" title="{{$contact_actions.follow.title}}">{{$contact_actions.follow.label}}</a></li>{{/if}}
+                                                       {{if $contact_actions.unfollow}}<li><a role="menuitem" href="{{$contact_actions.unfollow.url}}" title="{{$contact_actions.unfollow.title}}">{{$contact_actions.unfollow.label}}</a></li>{{/if}}
+                                                       {{if $lblsuggest}}<li><a role="menuitem" href="{{$contact_actions.suggest.url}}" title="{{$contact_actions.suggest.title}}">{{$contact_actions.suggest.label}}</a></li>{{/if}}
+                                                       {{if $poll_enabled}}<li><a role="menuitem" href="{{$contact_actions.update.url}}" title="{{$contact_actions.update.title}}">{{$contact_actions.update.label}}</a></li>{{/if}}
+                                                       {{if $contact_actions.updateprofile}}<li><a role="menuitem" href="{{$contact_actions.updateprofile.url}}" title="{{$contact_actions.updateprofile.title}}">{{$contact_actions.updateprofile.label}}</a></li>{{/if}}
                                                        {{if $lblsuggest || $poll_enabled || $contact_actions.updateprofile}}
-                                                       <li role="presentation" class="divider"></li>
+                                                       <li class="divider"></li>
                                                        {{/if}}
-                                                       <li role="presentation"><a role="menuitem" href="{{$contact_actions.block.url}}" title="{{$contact_actions.block.title}}">{{$contact_actions.block.label}}</a></li>
-                                                       <li role="presentation"><a role="menuitem" href="{{$contact_actions.ignore.url}}" title="{{$contact_actions.ignore.title}}">{{$contact_actions.ignore.label}}</a></li>
-                                                       <li role="presentation"><a role="menuitem" href="{{$contact_actions.collapse.url}}" title="{{$contact_actions.collapse.title}}">{{$contact_actions.collapse.label}}</a></li>
-                                                       {{if $contact_actions.revoke_follow.url}}<li role="presentation"><button role="menuitem" type="button" class="btn-link" title="{{$contact_actions.revoke_follow.title}}" onclick="addToModal('{{$contact_actions.revoke_follow.url}}');">{{$contact_actions.revoke_follow.label}}</button></li>{{/if}}
+                                                       <li><a role="menuitem" href="{{$contact_actions.block.url}}" title="{{$contact_actions.block.title}}">{{$contact_actions.block.label}}</a></li>
+                                                       <li><a role="menuitem" href="{{$contact_actions.ignore.url}}" title="{{$contact_actions.ignore.title}}">{{$contact_actions.ignore.label}}</a></li>
+                                                       <li><a role="menuitem" href="{{$contact_actions.collapse.url}}" title="{{$contact_actions.collapse.title}}">{{$contact_actions.collapse.label}}</a></li>
+                                                       {{if $contact_actions.revoke_follow.url}}<li><button role="menuitem" type="button" class="btn-link" title="{{$contact_actions.revoke_follow.title}}" onclick="addToModal('{{$contact_actions.revoke_follow.url}}');">{{$contact_actions.revoke_follow.label}}</button></li>{{/if}}
                                                </ul>
                                        </li>
                                </ul>
index 3a1b4e6e1d1e75fd51c5cbd2417e2eda16839c76..f8b3e85321e7bd6b7291b5c887092990551b71e2 100644 (file)
@@ -28,7 +28,7 @@
                                                        {{if $finish}} - <span class="event-end dtend" title="{{$dtend_title}}">{{if $same_date}}{{$end_time}}{{else}}{{$end_short}}{{/if}}</span>{{/if}}
                                                </span>
                                                {{if $location.name}}
-                                               <span role="presentation" aria-hidden="true"> · </span>
+                                               <span aria-hidden="true"> · </span>
                                                <span class="event-location event-card-location">{{$location.name}}</span>
                                                {{/if}}
                                        </div>
index 750e4cedc2f749c8f5e9f2c206fb8d1bcd573cda..b0168ffd1000ecdc18c69a458a78d85d4efc7296 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="{{if $item.selected}}selected{{/if}}"><a href="{{$item.url}}" {{if $item.accesskey}}accesskey="{{$item.accesskey}}"{{/if}}>{{$item.label}}</a></li>
+                       <li class="{{if $item.selected}}selected{{/if}}"><a href="{{$item.url}}" {{if $item.accesskey}}accesskey="{{$item.accesskey}}"{{/if}}>{{$item.label}}</a></li>
                {{/foreach}}
        </ul>
 
-</div>
+</nav>
index e49e55ad07941e59fb3a8de22322439fadbc62a0..b2ef49ba91caccff1355536bc182a07dd763be5e 100644 (file)
                        <ul class="nav nav-tabs hidden-xs jot-nav" role="tablist" data-tabs="tabs">
                                {{* Mark the first list entry as active because it is the first which is active after opening
                                        the modal. Changing of the activity status is done by js in jot.tpl-header *}}
-                               <li class="active" role="presentation">
+                               <li class="active">
                                        <a href="#profile-jot-wrapper" class="jot-text-lnk jot-nav-lnk" id="jot-text-lnk" role="tab" aria-controls="profile-jot-wrapper">
                                                <i class="fa fa-file-text-o" aria-hidden="true"></i>
                                                {{$message}}
                                        </a>
                                </li>
                                {{if $acl}}
-                               <li role="presentation">
+                               <li>
                                        <a href="#profile-jot-acl-wrapper" class="jot-perms-lnk jot-nav-lnk" id="jot-perms-lnk" role="tab" aria-controls="profile-jot-acl-wrapper">
                                                <i class="fa fa-shield" aria-hidden="true"></i>
                                                {{$shortpermset}}
                                </li>
                                {{/if}}
                                {{if $preview}}
-                               <li role="presentation">
+                               <li>
                                        <a href="#jot-preview-content" class="jot-preview-lnk jot-nav-lnk" id="jot-preview-lnk" role="tab" aria-controls="jot-preview-content">
                                                <i class="fa fa-eye" aria-hidden="true"></i>
                                                {{$preview}}
                                        </a>
                                </li>
                                {{/if}}
-                               <li role="presentation">
+                               <li>
                                        <a href="#jot-fbrowser-wrapper" class="jot-browser-lnk jot-nav-lnk" id="jot-browser-link" role="tab" aria-controls="jot-fbrowser-wrapper">
                                                <i class="fa fa-picture-o" aria-hidden="true"></i>
                                                {{$browser}}
                                <ul class="dropdown-menu nav nav-pills" aria-label="submenu">
                                        {{* mark the first list entry as active because it is the first which is active after opening
                                        the modal. Changing of the activity status is done by js in jot.tpl-header *}}
-                                       <li role="presentation" style="display: none;">
+                                       <li style="display: none;">
                                                <button class="jot-text-lnk btn-link jot-nav-lnk jot-nav-lnk-mobile" id="jot-text-lnk-mobile" aria-controls="profile-jot-wrapper" role="menuitem">{{$message}}</button>
                                        </li>
                                        {{if $acl}}
-                                       <li role="presentation">
+                                       <li>
                                                <button class="jot-perms-lnk btn-link jot-nav-lnk jot-nav-lnk-mobile" id="jot-perms-lnk-mobile" aria-controls="profile-jot-acl-wrapper" role="menuitem">{{$shortpermset}}</button>
                                        </li>
                                        {{/if}}
                                        {{if $preview}}
-                                       <li role="presentation">
+                                       <li>
                                                <button class="jot-preview-lnk btn-link jot-nav-lnk jot-nav-lnk-mobile" id="jot-preview-lnk-mobile" aria-controls="jot-preview-content" role="menuitem">{{$preview}}</button>
                                        </li>
                                        {{/if}}
-                                       <li role="presentation">
+                                       <li>
                                                <button class="jot-browser-lnk-mobile btn-link jot-nav-lnk jot-nav-lnk-mobile" id="jot-browser-lnk-mobile" aria-controls="jot-fbrowser-wrapper" role="menuitem">{{$browser}}</button>
                                        </li>
                                </ul>
                                        </div>
 
                                        <ul id="profile-jot-submit-wrapper" class="jothidden nav nav-pills">
-                                               <li role="presentation"><button type="button" class="hidden-xs btn-link icon underline" style="cursor: pointer;" aria-label="{{$eduline}}" title="{{$eduline}}" onclick="insertFormattingToPost('u');"><i class="fa fa-underline"></i></button></li>
-                                               <li role="presentation"><button type="button" class="hidden-xs btn-link icon italic" style="cursor: pointer;" aria-label="{{$editalic}}" title="{{$editalic}}" onclick="insertFormattingToPost('i');"><i class="fa fa-italic"></i></button></li>
-                                               <li role="presentation"><button type="button" class="hidden-xs btn-link icon bold" style="cursor: pointer;" aria-label="{{$edbold}}" title="{{$edbold}}" onclick="insertFormattingToPost('b');"><i class="fa fa-bold"></i></button></li>
-                                               <li role="presentation"><button type="button" class="hidden-xs btn-link icon quote" style="cursor: pointer;" aria-label="{{$edquote}}" title="{{$edquote}}" onclick="insertFormattingToPost('quote');"><i class="fa fa-quote-left"></i></button></li>
-                                               <li role="presentation"><button type="button" class="hidden-xs btn-link icon emojis" style="cursor: pointer;" aria-label="{{$edemojis}}" title="{{$edemojis}}"><i class="fa fa-smile-o"></i></button></li>
-                                               <li role="presentation"><button type="button" class="btn-link icon" style="cursor: pointer;" aria-label="{{$edurl}}" title="{{$edurl}}" onclick="insertFormattingToPost('url');"><i class="fa fa-link"></i></button></li>
-                                               <li role="presentation"><button type="button" class="btn-link" id="profile-attach"  ondragenter="return linkDropper(event);" ondragover="return linkDropper(event);" ondrop="linkDrop(event);" onclick="jotGetLink();" title="{{$edattach}}"><i class="fa fa-paperclip"></i></button></li>
-                                               <li role="presentation"><button type="button" class="btn-link" id="profile-location" onclick="jotGetLocation();" title="{{$setloc}}"><i class="fa fa-map-marker" aria-hidden="true"></i></button></li>
-                                               <li role="presentation"><button type="button" class="hidden-xs btn-link icon underline" style="cursor: pointer;" aria-label="{{$contentwarn}}" title="{{$contentwarn}}" onclick="insertFormattingToPost('abstract');"><i class="fa fa-eye"></i></button></li>
+                                               <li><button type="button" class="hidden-xs btn-link icon underline" style="cursor: pointer;" aria-label="{{$eduline}}" title="{{$eduline}}" onclick="insertFormattingToPost('u');"><i class="fa fa-underline"></i></button></li>
+                                               <li><button type="button" class="hidden-xs btn-link icon italic" style="cursor: pointer;" aria-label="{{$editalic}}" title="{{$editalic}}" onclick="insertFormattingToPost('i');"><i class="fa fa-italic"></i></button></li>
+                                               <li><button type="button" class="hidden-xs btn-link icon bold" style="cursor: pointer;" aria-label="{{$edbold}}" title="{{$edbold}}" onclick="insertFormattingToPost('b');"><i class="fa fa-bold"></i></button></li>
+                                               <li><button type="button" class="hidden-xs btn-link icon quote" style="cursor: pointer;" aria-label="{{$edquote}}" title="{{$edquote}}" onclick="insertFormattingToPost('quote');"><i class="fa fa-quote-left"></i></button></li>
+                                               <li><button type="button" class="hidden-xs btn-link icon emojis" style="cursor: pointer;" aria-label="{{$edemojis}}" title="{{$edemojis}}"><i class="fa fa-smile-o"></i></button></li>
+                                               <li><button type="button" class="btn-link icon" style="cursor: pointer;" aria-label="{{$edurl}}" title="{{$edurl}}" onclick="insertFormattingToPost('url');"><i class="fa fa-link"></i></button></li>
+                                               <li><button type="button" class="btn-link" id="profile-attach"  ondragenter="return linkDropper(event);" ondragover="return linkDropper(event);" ondrop="linkDrop(event);" onclick="jotGetLink();" title="{{$edattach}}"><i class="fa fa-paperclip"></i></button></li>
+                                               <li><button type="button" class="btn-link" id="profile-location" onclick="jotGetLocation();" title="{{$setloc}}"><i class="fa fa-map-marker" aria-hidden="true"></i></button></li>
+                                               <li><button type="button" class="hidden-xs btn-link icon underline" style="cursor: pointer;" aria-label="{{$contentwarn}}" title="{{$contentwarn}}" onclick="insertFormattingToPost('abstract');"><i class="fa fa-eye"></i></button></li>
                                                <!-- TODO: waiting for a better placement
                                                <li><button type="button" class="btn-link" id="profile-nolocation" onclick="jotClearLocation();" title="{{$noloc}}">{{$shortnoloc}}</button></li>
                                                -->
 
-                                               <li role="presentation" class="pull-right">
+                                               <li class="pull-right">
                                                        <button class="btn btn-primary" type="submit" id="profile-jot-submit" name="submit" data-loading-text="{{$loading}}">
                                                                <i class="fa fa-paper-plane fa-fw" aria-hidden="true"></i> {{$share}}
                                                        </button>
                                                </li>
                                                <li id="character-counter" class="grey jothidden text-info pull-right"></li>
-                                               <li role="presentation" id="profile-rotator-wrapper" class="pull-right" style="display: {{$visitor}};">
-                                                       <img role="presentation" id="profile-rotator" src="images/rotator.gif" alt="{{$wait}}" title="{{$wait}}" style="display: none;" />
+                                               <li id="profile-rotator-wrapper" class="pull-right" style="display: {{$visitor}};">
+                                                       <img id="profile-rotator" src="images/rotator.gif" alt="{{$wait}}" title="{{$wait}}" style="display: none;" />
                                                </li>
-                                               <li role="presentation" id="profile-jot-plugin-wrapper">
+                                               <li id="profile-jot-plugin-wrapper">
                                                        {{$jotplugins nofilter}}
                                                </li>
                                        </ul>
 
                                <div id="jot-preview-share" class="minimize" aria-labelledby="jot-preview-lnk" role="tabpanel" aria-hidden="true">
                                        <ul id="profile-jot-preview-submit-wrapper" class="jothidden nav nav-pills">
-                                               <li role="presentation" class="pull-right">
+                                               <li class="pull-right">
                                                        <button class="btn btn-primary" type="submit" id="profile-jot-preview-submit" name="submit" data-loading-text="{{$loading}}">
                                                                <i class="fa fa-paper-plane fa-fw" aria-hidden="true"></i> {{$share}}
                                                        </button>
index 8ddc9bb6bc873119f145fcc45be8c05a4d4bfc04..366bbc894490d938ba48b020b174b5b77214b53c 100644 (file)
@@ -16,7 +16,7 @@
                {{* The breadcrumb navigation *}}
                <ol class="path breadcrumb" aria-label="Breadcrumb" role="menu">
                {{foreach $path as $folder => $name}}
-                       <li role="presentation">
+                       <li>
                                <button type="button" class="btn btn-link" data-folder="{{$folder}}" role="menuitem">{{$name}}</button>
                        </li>
                {{/foreach}}
 
                        {{* List of photo albums *}}
                        {{if $folders }}
-                       <div class="folders media-left" role="navigation" aria-label="Album Navigation">
+                       <nav class="folders media-left" aria-label="Album Navigation">
                                <ul role="menu">
                                        {{foreach $folders as $folder}}
-                                       <li role="presentation">
-                                               <button class="btn btn-default" type="button" data-folder="{{$folder}}" role="menuitem">{{$folder}}</button>
+                                       <li>
+                                               <button type="button" data-folder="{{$folder}}" role="menuitem">{{$folder}}</button>
                                        </li>
                                        {{/foreach}}
                                </ul>
-                       </div>
+                       </nav>
                        {{/if}}
 
                        {{* The main content (images or files) *}}
index 2569e95be343e308dbc283bf8b1b5e25a0e9139f..e9825ceb885ba5934e6d01661446a457459e9a65 100644 (file)
@@ -9,29 +9,29 @@
        <header>
                {{* {{$langselector}} *}}
 
-               <div id="site-location">{{$sitelocation}}</div>
+               <div id="site-location" aria-hidden="true">{{$sitelocation}}</div>
                <div id="banner" class="hidden-sm hidden-xs">
                        {{* show on remote/visitor connections another logo which symbols that fact*}}
                        {{if $nav.remote}}
-                               <a href="{{$baseurl}}">
+                               <a href="{{$baseurl}}" aria-hidden="true">
                                        <div id="remote-logo-img" aria-label="{{$home}}"></div>
                                </a>
                        {{else}}
                                {{* #logo-img is the placeholder to insert a mask (friendica logo) into this div
                                For Firefox we have to call the paths of the mask (look at the bottom of this file).
                                Because for FF we need relative paths we apply them with js after the page is loaded (look at theme.js *}}
-                               <a href="{{$baseurl}}">
+                               <a href="{{$baseurl}}" aria-hidden="true">
                                        <div id="logo-img" aria-label="{{$home}}"></div>
                                </a>
                        {{/if}}
                </div>
        </header>
-       <nav id="topbar-first" class="topbar">
+       <nav id="topbar-first" class="topbar" role="menubar">
                <div class="container">
                        <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 -->
-                               <div class="topbar-nav" role="navigation">
+                               <nav class="topbar-nav">
 
                                        {{* Buttons for the mobile view *}}
                                        <button type="button" class="navbar-toggle offcanvas-right-toggle pull-right"
                                        </button>
 
                                        {{* Left section of the NavBar with navigation shortcuts/icons *}}
-                                       <ul class="nav navbar-left" role="menubar">
+                                       <ul class="nav navbar-left">
+                                               <li class="sr-only">
+                                                       <a class="sr-only" href="{{$baseurl}}">{{$home}}</a>
+                                               </li>
                                                {{if $nav.network}}
                                                        <li class="nav-segment">
                                                                <a accesskey="n" class="nav-menu {{$sel.network}}" href="{{$nav.network.0}}"
 
                                                {{* The notifications dropdown *}}
                                                {{if $nav.notifications}}
-                                                       <li id="nav-notification" class="nav-segment dropdown" role="presentation">
+                                                       <li id="nav-notification" class="nav-segment dropdown">
                                                                <button id="nav-notifications-menu-btn" class="btn-link dropdown-toggle" data-toggle="dropdown"
                                                                        type="button" aria-haspopup="true" aria-expanded="false"
                                                                        aria-controls="nav-notifications-menu">
                                                                <ul id="nav-notifications-menu" class="dropdown-menu menu-popup" role="menu"
                                                                        aria-labelledby="nav-notifications-menu-btn">
                                                                        {{* the following list entry must have the id "nav-notifications-mark-all". Without it this isn't visible. ....strange behavior :-/ *}}
-                                                                       <li role="presentation" id="nav-notifications-mark-all" class="dropdown-header">
+                                                                       <li id="nav-notifications-mark-all" class="dropdown-header">
                                                                                <div class="arrow"></div>
                                                                                {{$nav.notifications.1}}
                                                                                <div class="dropdown-header-link">
 
                                                                        </li>
 
-                                                                       <li role="presentation">
+                                                                       <li>
                                                                                <p role="menuitem" class="text-muted"><i>{{$emptynotifications}}</i></p>
                                                                        </li>
                                                                </ul>
                                                {{/if}}
 
                                        </ul>
-                               </div>
+                               </nav>
 
                                {{* This is the right part of the NavBar. It includes the search and the user menu *}}
                                <div class="topbar-actions pull-right">
                                                                        {{if $nav.remote}}
                                                                                {{if $nav.sitename}}
                                                                                        <li id="nav-sitename" role="menuitem">{{$nav.sitename}}</li>
-                                                                                       <li role="presentation" class="divider"></li>
+                                                                                       <li class="divider"><hr></li>
                                                                                {{/if}}
                                                                        {{/if}}
                                                                        {{foreach $nav.usermenu as $usermenu}}
-                                                                               <li role="presentation">
+                                                                               <li>
                                                                                        <a role="menuitem" class="{{$usermenu.2}}" href="{{$usermenu.0}}"
                                                                                                title="{{$usermenu.3}}">
                                                                                                {{$usermenu.1}}
                                                                                        </a>
                                                                                </li>
                                                                        {{/foreach}}
-                                                                       <li role="presentation" class="divider"></li>
+                                                                       <li class="divider"><hr></li>
                                                                        {{if $nav.notifications}}
-                                                                               <li role="presentation">
+                                                                               <li>
                                                                                        <a role="menuitem" href="{{$nav.notifications.all.0}}" title="{{$nav.notifications.1}}">
                                                                                                <i class="fa fa-bell fa-fw" aria-hidden="true"></i>
                                                                                                {{$nav.notifications.1}}
                                                                                </li>
                                                                        {{/if}}
                                                                        {{if $nav.messages}}
-                                                                               <li role="presentation">
+                                                                               <li>
                                                                                        <a role="menuitem"
                                                                                                class="nav-commlink {{$nav.messages.2}} {{$sel.messages}}"
                                                                                                href="{{$nav.messages.0}}" title="{{$nav.messages.3}}">
                                                                                        </a>
                                                                                </li>
                                                                        {{/if}}
-                                                                       <li role="presentation" class="divider"></li>
+                                                                       <li class="divider"><hr></li>
                                                                        {{if $nav.contacts}}
-                                                                               <li role="presentation">
+                                                                               <li>
                                                                                        <a role="menuitem" id="nav-menu-contacts-link"
                                                                                                class="nav-link {{$nav.contacts.2}}" href="{{$nav.contacts.0}}"
                                                                                                title="{{$nav.contacts.3}}">
                                                                                </li>
                                                                        {{/if}}
                                                                        {{if $nav.delegation}}
-                                                                               <li role="presentation">
+                                                                               <li>
                                                                                        <a role="menuitem" id="nav-delegation-link"
                                                                                                class="nav-commlink {{$nav.delegation.2}} {{$sel.delegation}}"
                                                                                                href="{{$nav.delegation.0}}" title="{{$nav.delegation.3}}">
                                                                                        </a>
                                                                                </li>
                                                                        {{/if}}
-                                                                       <li role="presentation">
+                                                                       <li>
                                                                                <a role="menuitem" id="nav-directory-link" class="nav-link {{$nav.directory.2}}"
                                                                                        href="{{$nav.directory.0}}" title="{{$nav.directory.3}}">
                                                                                        <i class="fa fa-sitemap fa-fw" aria-hidden="true"></i>{{$nav.directory.1}}
                                                                                </a>
                                                                        </li>
-                                                                       <li role="presentation" class="divider"></li>
+                                                                       <li class="divider"><hr></li>
                                                                        {{if $nav.apps}}
-                                                                               <li role="presentation">
+                                                                               <li>
                                                                                        <a role="menuitem" id="nav-apps-link" class="nav-link {{$nav.apps.2}}"
                                                                                                href="{{$nav.apps.0}}" title="{{$nav.apps.3}}">
                                                                                                <i class="fa fa-puzzle-piece fa-fw" aria-hidden="true"></i> {{$nav.apps.1}}
                                                                                        </a>
                                                                                </li>
-                                                                               <li role="presentation" class="divider"></li>
+                                                                               <li class="divider"><hr></li>
                                                                        {{/if}}
                                                                        {{if $nav.help}}
-                                                                               <li role="presentation">
+                                                                               <li>
                                                                                        <a role="menuitem" id="nav-help-link" class="nav-link {{$nav.help.2}}"
                                                                                                href="{{$nav.help.0}}" title="{{$nav.help.3}}">
                                                                                                <i class="fa fa-question-circle fa-fw" aria-hidden="true"></i> {{$nav.help.1}}
                                                                                </li>
                                                                        {{/if}}
                                                                        {{if $nav.settings}}
-                                                                               <li role="presentation">
+                                                                               <li>
                                                                                        <a role="menuitem" id="nav-settings-link" class="nav-link {{$nav.settings.2}}"
                                                                                                href="{{$nav.settings.0}}" title="{{$nav.settings.3}}">
                                                                                                <i class="fa fa-cog fa-fw" aria-hidden="true"></i> {{$nav.settings.1}}
                                                                                </li>
                                                                        {{/if}}
                                                                        {{if $nav.admin}}
-                                                                               <li role="presentation">
+                                                                               <li>
                                                                                        <a accesskey="a" role="menuitem" id="nav-admin-link"
                                                                                                class="nav-link {{$nav.admin.2}}" href="{{$nav.admin.0}}"
                                                                                                title="{{$nav.admin.3}}"><i class="fa fa-user-secret fa-fw" aria-hidden="true"></i>
                                                                                </li>
                                                                        {{/if}}
                                                                        {{if $nav.moderation}}
-                                                                               <li role="presentation">
+                                                                               <li>
                                                                                        <a accesskey="m" role="menuitem" id="nav-moderation-link"
                                                                                                class="nav-link {{$nav.moderation.2}}" href="{{$nav.moderation.0}}"
                                                                                                title="{{$nav.moderation.3}}"><i class="fa fa-gavel fa-fw" aria-hidden="true"></i>
                                                                                        </a>
                                                                                </li>
                                                                        {{/if}}
-                                                                       <li role="presentation" class="divider"></li>
-                                                                       <li role="presentation">
+                                                                       <li class="divider"><hr></li>
+                                                                       <li>
                                                                                <a role="menuitem" id="nav-about-link" class="nav-link {{$nav.about.2}}"
                                                                                        href="{{$nav.about.0}}" title="{{$nav.about.3}}">
                                                                                        <i class="fa fa-info fa-fw" aria-hidden="true"></i> {{$nav.about.1}}
                                                                                </a>
                                                                        </li>
                                                                        {{if $nav.tos}}
-                                                                               <li role="presentation">
+                                                                               <li>
                                                                                        <a role="menuitem" id="nav-tos-link" class="nav-link {{$nav.tos.2}}"
                                                                                                href="{{$nav.tos.0}}" title="{{$nav.tos.3}}"><i class="fa fa-file-text"
                                                                                                        aria-hidden="true"></i> {{$nav.tos.1}}
                                                                                        </a>
                                                                                </li>
                                                                        {{/if}}
-                                                                       <li role="presentation" class="divider"></li>
+                                                                       <li class="divider"><hr></li>
                                                                        {{if $nav.logout}}
-                                                                               <li role="presentation">
+                                                                               <li>
                                                                                        <a role="menuitem" id="nav-logout-link"
                                                                                                class="nav-link {{$nav.logout.2}}" href="{{$nav.logout.0}}"
                                                                                                title="{{$nav.logout.3}}"><i class="fa fa fa-sign-out fa-fw" aria-hidden="true"></i>
                                                                                        </a>
                                                                                </li>
                                                                        {{else}}
-                                                                               <li role="presentation">
+                                                                               <li>
                                                                                        <a role="menuitem" id="nav-login-link"
                                                                                                class="nav-login-link {{$nav.login.2}}" href="{{$nav.login.0}}"
                                                                                                title="{{$nav.login.3}}"><i class="fa fa-power-off fa-fw" aria-hidden="true"></i>
                                                                        <li role="menuitem" class="nav-sitename list-group-item">{{$nav.sitename}}</li>
                                                                {{/if}}
                                                        {{/if}}
-                                                       <li role="presentation" class="list-group-item">
+                                                       <li class="list-group-item">
                                                                <img src="{{$userinfo.icon}}" alt="{{$userinfo.name}}"
                                                                        style="max-width:15px; max-height:15px; min-width:15px; min-height:15px; width:15px; height:15px;">
                                                                {{$userinfo.name}}{{if $nav.remote}} ({{$nav.remote}}){{/if}}
                                                        </li>
                                                        {{foreach $nav.usermenu as $usermenu}}
-                                                               <li role="presentation" class="list-group-item">
+                                                               <li class="list-group-item">
                                                                        <a role="menuitem" class="{{$usermenu.2}}"
                                                                                href="{{$usermenu.0}}" title="{{$usermenu.3}}">{{$usermenu.1}}
                                                                        </a>
                                                                </li>
                                                        {{/foreach}}
                                                        {{if $nav.notifications || $nav.contacts || $nav.messages || $nav.delegation}}
-                                                               <li role="presentation" class="divider"></li>
+                                                               <li class="divider"><hr></li>
                                                        {{/if}}
                                                        {{if $nav.notifications}}
-                                                               <li role="presentation" class="list-group-item">
+                                                               <li class="list-group-item">
                                                                        <a role="menuitem"
                                                                                href="{{$nav.notifications.all.0}}" title="{{$nav.notifications.1}}"><i
                                                                                        class="fa fa-bell fa-fw" aria-hidden="true"></i> {{$nav.notifications.1}}
                                                                </li>
                                                        {{/if}}
                                                        {{if $nav.contacts}}
-                                                               <li role="presentation" class="list-group-item">
+                                                               <li class="list-group-item">
                                                                        <a role="menuitem"
                                                                                class="nav-link {{$nav.contacts.2}}" href="{{$nav.contacts.0}}"
                                                                                title="{{$nav.contacts.3}}"><i class="fa fa-users fa-fw" aria-hidden="true"></i>
                                                                </li>
                                                        {{/if}}
                                                        {{if $nav.messages}}
-                                                               <li role="presentation" class="list-group-item">
+                                                               <li class="list-group-item">
                                                                        <a role="menuitem"
                                                                                class="nav-link {{$nav.messages.2}} {{$sel.messages}}" href="{{$nav.messages.0}}"
                                                                                title="{{$nav.messages.3}}"><i class="fa fa-envelope fa-fw" aria-hidden="true"></i>
                                                                </li>
                                                        {{/if}}
                                                        {{if $nav.delegation}}
-                                                               <li role="presentation" class="list-group-item">
+                                                               <li class="list-group-item">
                                                                        <a role="menuitem"
                                                                                class="nav-commlink {{$nav.delegation.2}} {{$sel.delegation}}"
                                                                                href="{{$nav.delegation.0}}" title="{{$nav.delegation.3}}"><i class="fa fa-flag fa-fw"
                                                                </li>
                                                        {{/if}}
                                                        {{if $nav.settings || $nav.admin || $nav.logout}}
-                                                               <li role="presentation" class="divider"></li>
+                                                               <li class="divider"><hr></li>
                                                        {{/if}}
                                                        {{if $nav.settings}}
-                                                               <li role="presentation" class="list-group-item">
+                                                               <li class="list-group-item">
                                                                        <a role="menuitem" class="nav-link {{$nav.settings.2}}" href="{{$nav.settings.0}}"
                                                                                title="{{$nav.settings.3}}"><i class="fa fa-cog fa-fw" aria-hidden="true"></i>
                                                                                {{$nav.settings.1}}
                                                                </li>
                                                        {{/if}}
                                                        {{if $nav.admin}}
-                                                               <li role="presentation" class="list-group-item">
+                                                               <li class="list-group-item">
                                                                        <a role="menuitem"
                                                                                class="nav-link {{$nav.admin.2}}" href="{{$nav.admin.0}}" title="{{$nav.admin.3}}"><i
                                                                                        class="fa fa-user-secret fa-fw" aria-hidden="true"></i>
                                                                </li>
                                                        {{/if}}
                                                        {{if $nav.moderation}}
-                                                               <li role="presentation" class="list-group-item">
+                                                               <li class="list-group-item">
                                                                        <a role="menuitem"
                                                                                class="nav-link {{$nav.moderation.2}}" href="{{$nav.moderation.0}}" title="{{$nav.moderation.3}}"><i
                                                                                        class="fa fa-gavel fa-fw" aria-hidden="true"></i>
                                                                        </a>
                                                                </li>
                                                        {{/if}}
-                                                       <li role="presentation" class="divider"></li>
-                                                       <li role="presentation" class="list-group-item">
+                                                       <li class="divider"><hr></li>
+                                                       <li class="list-group-item">
                                                                <a role="menuitem" class="nav-link {{$nav.about.2}}"
                                                                   href="{{$nav.about.0}}" title="{{$nav.about.3}}">
                                                                        <i class="fa fa-info fa-fw" aria-hidden="true"></i> {{$nav.about.1}}
                                                                </a>
                                                        </li>
-                                                       <li role="presentation" class="divider"></li>
+                                                       <li class="divider"><hr></li>
                                                        {{if $nav.logout}}
-                                                               <li role="presentation" class="list-group-item">
+                                                               <li class="list-group-item">
                                                                        <a role="menuitem"
                                                                                class="nav-link {{$nav.logout.2}}" href="{{$nav.logout.0}}" title="{{$nav.logout.3}}"><i
                                                                                        class="fa fa fa-sign-out fa-fw" aria-hidden="true"></i>
                                                                        </a>
                                                                </li>
                                                        {{else}}
-                                                               <li role="presentation" class="list-group-item">
+                                                               <li class="list-group-item">
                                                                        <a role="menuitem"
                                                                                class="nav-login-link {{$nav.login.2}}" href="{{$nav.login.0}}"
                                                                                title="{{$nav.login.3}}"><i class="fa fa-power-off fa-fw" aria-hidden="true"></i>
                        </div>
                        <div class="pull-right">
                                <ul class="nav navbar-nav navbar-right">
-                                       <li role="presentation">
+                                       <li>
                                                <a href="login?mode=none" id="nav-login" data-toggle="tooltip" aria-label="{{$nav.login.3}}"
                                                        title="{{$nav.login.3}}">
                                                        <i class="fa fa-sign-in fa-fw" aria-hidden="true"></i>
                                                </a>
                                        </li>
-                                       <li role="presentation">
+                                       <li>
                                                <a href="{{$nav.about.0}}" id="nav-about" data-toggle="tooltip" aria-label="{{$nav.about.3}}"
                                                        title="{{$nav.about.3}}">
                                                        <i class="fa fa-info fa-fw" aria-hidden="true"></i>
index 9045a4bbbd953fdeb7c0bf87edd272bc94ae3699..3417229c8cbf106c67b8fea7b48d15ec2b05cb52 100644 (file)
@@ -6,7 +6,7 @@
   *}}
 <ul class="nav nav-tabs">
 {{foreach $tabs as $tab}}
-       <li id="{{$tab.id}}" role="presentation"{{if $tab.sel}} class="{{$tab.sel}}"{{/if}}>
+       <li id="{{$tab.id}}"{{if $tab.sel}} class="{{$tab.sel}}"{{/if}}>
                <a role="menuitem" href="{{$tab.url}}"{{if $tab.accesskey}} accesskey="{{$tab.accesskey}}"{{/if}}{{if $tab.title}} title="{{$tab.title}}"{{/if}}>{{$tab.label}}</a>
        </li>
 {{/foreach}}
index 38a856cbfce7370662957a3b22c8486cabea9788..389f66eaf1085ca3e5ee3f6e98b92d70c591cfc0 100644 (file)
        <div class="media-body">
 
                {{* the header with the comment author name *}}
-               <div role="heading " class="contact-info-comment">
+               <div class="contact-info-comment">
                        <h5 class="media-heading">
                                <a href="{{$profile_url}}" title="View {{$name}}'s profile" class="wall-item-name-link userinfo hover-card"><span class="btn-link">{{$name}}</span></a>
                        </h5>
                </div>
 
                {{* comment content *}}
-               <div class="wall-item-content" id="wall-item-content-{{$id}}">
+               <article class="wall-item-content" id="wall-item-content-{{$id}}">
                        {{if $title}}
                        <div class="wall-item-title" id="wall-item-title-{{$id}}">{{$title}}</div>
                        {{/if}}
 
                        <div class="wall-item-body {{if !$title}}p-name{{/if}}" id="wall-item-body-{{$id}}" dir="auto">{{$body}}</div>
-               </div>
+               </article>
 
                <div class="wall-item-wrapper-end clear"></div>
                <div class="wall-item-comment-separator"></div>
index dbf8bf159d78c7834f4c5317b344f600311b38a9..45321a9e495b864a63c415428c215f574fdd1e26 100644 (file)
                        <hr />
 
                        {{* item content *}}
-                       <div class="wall-item-content {{$item.type}}" id="wall-item-content-{{$item.id}}">
+                       <article class="wall-item-content {{$item.type}}" id="wall-item-content-{{$item.id}}" lang="{{$item.lang}}" aria-posinset="{{$item.id}}" aria-setsize="-1">
                                {{if $item.title}}
-                               <span class="wall-item-title" id="wall-item-title-{{$item.id}}"><h2 class="media-heading" dir="auto"><a href="{{$item.plink.href}}" class="{{$item.sparkle}}">{{$item.title}}</a></h2><br /></span>
+                               <span class="wall-item-title" id="wall-item-title-{{$item.id}}"><h3 class="media-heading" dir="auto"><a href="{{$item.plink.href}}" class="{{$item.sparkle}}">{{$item.title}}</a></h3><br /></span>
                                {{/if}}
 
                                <div class="wall-item-body" id="wall-item-body-{{$item.id}}" dir="auto">{{$item.body_html nofilter}}</div>
-                       </div>
+                       </article>
 
                        <!-- TODO -->
                        <div class="wall-item-bottom">
                                        <button type="button" class="btn btn-defaultbutton-likes{{if $item.responses.like.self}} active" aria-pressed="true{{/if}}" id="like-{{$item.id}}" title="{{$item.vote.like.0}}" onclick="doActivityItemAction({{$item.id}}, 'like'{{if $item.responses.like.self}}, true{{/if}});"></button>
                                                {{/if}}
                                                {{if $item.vote.like AND $item.vote.dislike}}
-                                       <span role="presentation" class="separator">•</span>
+                                       <span class="separator"aria-hidden="true">•</span>
                                                {{/if}}
 
                                                {{if $item.vote.dislike}}
                                        <button type="button" class="btn btn-defaultbutton-likes{{if $item.responses.like.self}} active" aria-pressed="true{{/if}}" id="dislike-{{$item.id}}" title="{{$item.vote.dislike.0}}" onclick="doActivityItemAction({{$item.id}}, 'dislike'{{if $item.responses.dislike.self}}, true{{/if}});"></button>
                                                {{/if}}
                                                {{if ($item.vote.like OR $item.vote.dislike) AND $item.comment_html}}
-                                       <span role="presentation" class="separator">•</span>
+                                       <span class="separator"aria-hidden="true">•</span>
                                                {{/if}}
                                        {{/if}}
 
                                        {{if $item.vote}}
                                                {{if $item.vote.share}}
                                                        {{if $item.vote.like OR $item.vote.dislike OR $item.comment_html}}
-                                       <span role="presentation" class="separator">•</span>
+                                       <span class="separator"aria-hidden="true">•</span>
                                                        {{/if}}
                                        <button type="button" class="btn btn-default" id="share-{{$item.id}}" title="{{$item.vote.share.0}}" onclick="jotShare({{$item.id}});"><i class="fa fa-retweet" aria-hidden="true"></i></button>
                                                {{/if}}
 
                                {{* Put additional actions in a dropdown menu *}}
                                {{if $item.menu && ($item.edpost || $item.tagger || $item.filer || $item.pin || $item.star || $item.follow_thread || $item.ignore || $item.drop.dropping || $item.browsershare)}}
-                                       <span role="presentation" class="separator"></span>
+                                       <span class="separator"></span>
                                        <span class="more-links btn-group{{if $item.thread_level> 1}} dropup{{/if}}">
                                                <button type="button" class="btn-link dropdown-toggle" data-toggle="dropdown" id="dropdownMenuOptions-{{$item.id}}" aria-haspopup="true" aria-expanded="false" title="{{$item.menu}}"><i class="fa fa-ellipsis-h" aria-hidden="true"></i>&nbsp;{{$item.menu}}</button>
                                                <ul class="dropdown-menu dropdown-menu-right" role="menu" aria-labelledby="dropdownMenuOptions-{{$item.id}}">
                                                {{/if}}
 
                                                {{if ($item.edpost || $item.tagger || $item.filer || $item.pin || $item.star || $item.follow_thread) && ($item.ignore || $item.drop.dropping)}}
-                                                       <li role="separator" class="divider"></li>
+                                                       <li class="divider"><hr></li>
                                                {{/if}}
 
                                                {{if $item.ignore}}
index 5c60d4d8970cbfcecdecf89cc342e1271f4c658c..41ce15a1fffdd5c2e622a5b5e4548ea3d91e7859 100644 (file)
                                        <i class="fa fa-angle-down" aria-hidden="true"></i>&nbsp;{{$l10n.profile_action}}
                                </button>
                                <ul class="dropdown-menu pull-right" role="menu" aria-labelledby="profile-edit-links-dropdown">
-                                       <li role="presentation"><a role="menuitem" href="{{$profpiclink}}" id="profile-photo_upload-link"><i class="fa fa-user" aria-hidden="true"></i>&nbsp;{{$l10n.profpic}}</a></li>
-                                       <li role="presentation"><button role="menuitem" type="button" class="btn-link" id="profile-photo_upload-link-new" onclick="openClose('profile-photo-upload-section');"><i class="fa fa-user" aria-hidden="true"></i>&nbsp;{{$l10n.profile_photo}}</button></li>
-                                       <li role="presentation" class="divider"></li>
-                                       <li role="presentation"><a role="menuitem" href="profile/{{$nickname}}/profile" id="profile-edit-view-link">{{$l10n.viewprof}}</a></li>
+                                       <li><a role="menuitem" href="{{$profpiclink}}" id="profile-photo_upload-link"><i class="fa fa-user" aria-hidden="true"></i>&nbsp;{{$l10n.profpic}}</a></li>
+                                       <li><button role="menuitem" type="button" class="btn-link" id="profile-photo_upload-link-new" onclick="openClose('profile-photo-upload-section');"><i class="fa fa-user" aria-hidden="true"></i>&nbsp;{{$l10n.profile_photo}}</button></li>
+                                       <li class="divider"></li>
+                                       <li><a role="menuitem" href="profile/{{$nickname}}/profile" id="profile-edit-view-link">{{$l10n.viewprof}}</a></li>
                                </ul>
                        </li>
                </ul>
index 274de77dfa760e33760ca86a6441793960905aa0..6daa19a1ecdbac4d99b9cb0a62e8dd35437a75ca 100644 (file)
@@ -8,7 +8,6 @@
 {{if $mode == display}}<script type="text/javascript" src="view/theme/frio/js/mod_display.js?v={{$VERSION}}"></script>{{/if}}
 {{$live_update nofilter}}
 {{foreach $threads as $thread}}
-<hr class="sr-only" />
 <div id="tread-wrapper-{{$thread.uriid}}" class="tread-wrapper {{if $thread.threaded}}threaded{{/if}} {{$thread.toplevel}} {{$thread.network}} {{if $thread.thread_level==1}}panel-default panel{{/if}} {{if $thread.thread_level!=1}}comment-wrapper{{/if}}" style="{{if $item.thread_level>2}}margin-left: -15px; margin-right:-16px; margin-bottom:-16px;{{/if}}"><!-- panel -->
 
                {{* {{if $thread.type == tag}}
index 2c04ccde17e12af9cbc48ca701ec13d68d484e5d..8513a3a3b3b78fd946b302cc308ad74ab4cfe792 100644 (file)
@@ -59,17 +59,17 @@ as the value of $top_child_total (this is done at the end of this file)
 <span class="created" style="display: none;">{{$item.created_date}}</span>
 <span class="uriid" style="display: none;">{{$item.uriid}}</span>
 {{/if}}
-       <div class="media {{$item.shiny}}">
+       <article class="media {{$item.shiny}}" aria-posinset="{{$item.id}}" aria-setsize="-1">
        {{if $item.parentguid}}
                <span class="visible-sm-inline visible-xs wall-item-responses time">
                        <i class="fa fa-reply" aria-hidden="true"></i> <a id="btn-{{$item.id}}" class="" href="javascript:;" onclick="scrollToItem('item-' + '{{$item.parentguid}}');">{{$item.inreplyto}}</a>
-                       {{if $item.reshared}}<i class="hidden-xs">&#x2022;</i>{{/if}}
+                       {{if $item.reshared}}<i class="hidden-xs "aria-hidden="true">&#x2022;</i>{{/if}}
                </span>
        {{else}}
                {{if $item.thread_level!=1 && $item.isunknown}}
                <span class="visible-sm-inline visible-xs wall-item-responses time">
                        <i title="{{$item.isunknown_label}}" aria-label="{{$item.isunknown_label}}">{{$item.isunknown}}</i>
-                       {{if $item.reshared}}<i class="hidden-xs">&#x2022;</i>{{/if}}
+                       {{if $item.reshared}}<i class="hidden-xs" aria-hidden="true">&#x2022;</i>{{/if}}
                </span>
                {{/if}}
        {{/if}}
@@ -80,14 +80,14 @@ as the value of $top_child_total (this is done at the end of this file)
                {{* The avatar picture and the photo-menu *}}
                <div class="dropdown pull-left"><!-- Dropdown -->
                        {{if $item.thread_level==1}}
-                       <div class="hidden-sm hidden-xs contact-photo-wrapper mframe{{if $item.owner_url}} wwfrom{{/if}} p-author h-card">
+                       <div class="hidden-sm hidden-xs contact-photo-wrapper mframe{{if $item.owner_url}} wwfrom{{/if}} p-author h-card" aria-hidden="true">
                                <a class="userinfo click-card u-url" id="wall-item-photo-menu-{{$item.id}}" href="{{$item.profile_url}}">
                                        <div class="contact-photo-image-wrapper">
                                                <img src="{{$item.thumb}}" class="contact-photo media-object {{$item.sparkle}} p-name u-photo" id="wall-item-photo-{{$item.id}}" alt="{{$item.name}}"  loading="lazy"/>
                                        </div>
                                </a>
                        </div>
-                       <div class="hidden-lg hidden-md contact-photo-wrapper mframe{{if $item.owner_url}} wwfrom{{/if}}">
+                       <div class="hidden-lg hidden-md contact-photo-wrapper mframe{{if $item.owner_url}} wwfrom{{/if}}" aria-hidden="true">
                                <a class="userinfo click-card u-url" id="wall-item-photo-menu-xs-{{$item.id}}" href="{{$item.profile_url}}">
                                        <div class="contact-photo-image-wrapper">
                                                <img src="{{$item.thumb}}" class="contact-photo-xs media-object {{$item.sparkle}}" id="wall-item-photo-xs-{{$item.id}}" alt="{{$item.name}}"  loading="lazy"/>
@@ -108,7 +108,7 @@ as the value of $top_child_total (this is done at the end of this file)
 
                        {{* The avatar picture for comments *}}
                        {{if $item.thread_level!=1}}
-                       <div class="contact-photo-wrapper mframe{{if $item.owner_url}} wwfrom{{/if}} p-author h-card">
+                       <div class="contact-photo-wrapper mframe{{if $item.owner_url}} wwfrom{{/if}} p-author h-card" aria-hidden="true">
                                <a class="userinfo click-card u-url" id="wall-item-photo-menu-{{$item.id}}" href="{{$item.profile_url}}">
                                        <div class="contact-photo-image-wrapper">
                                                <img src="{{$item.thumb}}" class="contact-photo-xs media-object {{$item.sparkle}} p-name u-photo" id="wall-item-photo-comment-{{$item.id}}" alt="{{$item.name}}" loading="lazy"/>
@@ -227,13 +227,13 @@ as the value of $top_child_total (this is done at the end of this file)
                                        {{if $item.parentguid}}
                                                <span class="hidden-xs hidden-sm">
                                                        <a id="btn-{{$item.id}}" class="time" href="javascript:;" onclick="scrollToItem('item-' + '{{$item.parentguid}}');"><i class="fa fa-reply" aria-hidden="true"></i> {{$item.inreplyto}}</a>
-                                                       <i class="hidden-xs">&#x2022;</i>
+                                                       <i class="hidden-xs" aria-hidden="true">&#x2022;</i>
                                                </span>
                                        {{else}}
                                                {{if $item.isunknown}}
                                                        <span class="hidden-xs hidden-sm time">
                                                                <i title="{{$item.isunknown_label}}" aria-label="{{$item.isunknown_label}}">{{$item.isunknown}}</i>
-                                                               <i class="hidden-xs">&#x2022;</i>
+                                                               <i class="hidden-xs" aria-hidden="true">&#x2022;</i>
                                                        </span>
                                                {{/if}}
                                        {{/if}}
@@ -268,20 +268,20 @@ as the value of $top_child_total (this is done at the end of this file)
                {{if $item.thread_level==1}}<span aria-hidden="true"><hr /></span>{{/if}}
 
                {{* item content *}}
-               <div class="wall-item-content {{$item.type}}" id="wall-item-content-{{$item.id}}">
+               <div class="wall-item-content {{$item.type}}" id="wall-item-content-{{$item.id}}" lang="{{$item.lang}}">
                        {{if $item.title}}
                        <span class="wall-item-title" id="wall-item-title-{{$item.id}}"><h3 class="media-heading" dir="auto"><a href="{{$item.plink.href}}" class="{{$item.sparkle}} p-name" target="_blank">{{$item.title}}</a></h3><br /></span>
                        {{/if}}
                        {{if $item.summary}}
                        <summary class="wall-item-summary" id="wall-item-summary-{{$item.id}}">{{$item.summary}}</summary>
                        {{/if}}
-                       <div class="wall-item-body e-content {{if !$item.title}}p-name{{/if}}" id="wall-item-body-{{$item.id}}" dir="auto" lang="{{$item.lang}}">{{$item.body_html nofilter}}</div>
+                       <div class="wall-item-body e-content {{if !$item.title}}p-name{{/if}}" id="wall-item-body-{{$item.id}}" dir="auto">{{$item.body_html nofilter}}</div>
                </div>
 
                <!-- TODO -->
                <div class="wall-item-bottom">
                        <div class="wall-item-links"></div>
-                       <div class="wall-item-tags">
+                       <div class="wall-item-tags" lang="{{$item.lang}}">
                {{if !$item.suppress_tags}}
                        {{foreach $item.hashtags as $tag}}
                                <span class="tag label btn-info sm">{{$tag nofilter}} <i class="fa fa-bolt" aria-hidden="true"></i></span>
@@ -456,7 +456,7 @@ as the value of $top_child_total (this is done at the end of this file)
                                {{/if}}
 
                                {{if ($item.edpost || $item.tagger || $item.filer || $item.pin || $item.star || $item.follow_thread) && ($item.ignore || ($item.drop && $item.drop.dropping))}}
-                               <li role="separator" class="divider"></li>
+                               <li class="divider"><hr></li>
                                {{/if}}
 
                                {{if $item.ignore}}
@@ -637,7 +637,7 @@ as the value of $top_child_total (this is done at the end of this file)
                                                        </li>
 
                                                        {{if ($item.edpost || $item.tagger || $item.filer || $item.pin || $item.star || $item.follow_thread) && ($item.ignore || ($item.drop && $item.drop.dropping))}}
-                                                               <li role="separator" class="divider"></li>
+                                                               <li class="divider"><hr></li>
                                                        {{/if}}
 
                                                        {{if $item.ignore}}
@@ -716,7 +716,7 @@ as the value of $top_child_total (this is done at the end of this file)
                {{if $item.thread_level!=1}}
                </div><!--./media-body from for comments-->
                {{/if}}
-       </div>
+       </article>
        {{foreach $item.children as $child}}
                {{include file="{{$item.template}}" item=$child}}
        {{/foreach}}