bitPickups/friendica_2020-09-1_sharedHosting
1
0
Fork 0
Code Pull requests Activity

Merge pull request #10982 from MrPetovan/task/10973-check-role-presentation

Browse source 
[frio] Check for role="presentation" uses throughout the templates
This commit is contained in:
Michael Vogel 2021-11-16 07:54:54 +01:00 committed by GitHub
commit 3c4287294b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 74 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
view/theme/frio/js/filebrowser.js
View file

@ -96,7 +96,7 @@ var FileBrowser = {
}); });
// Click on album link // Click on album link
$(".fbrowser").on("click", ".folders a, .path a", function (e) { $(".fbrowser").on("click", ".folders button, .path button", function (e) {
e.preventDefault(); e.preventDefault();
var url = var url =
baseurl + baseurl +

8
view/theme/frio/templates/filebrowser.tpl
View file

@ -8,9 +8,11 @@
</div> </div>
{{* The breadcrumb navigation *}} {{* The breadcrumb navigation *}}
<ol class="path breadcrumb" aria-label="Breadcrumb" role="navigation"> <ol class="path breadcrumb" aria-label="Breadcrumb" role="menu">
{{foreach $path as $folder => $name}} {{foreach $path as $folder => $name}}
<li role="presentation"><a href="#" data-folder="{{$folder}}">{{$name}}</a></li> <li role="presentation">
<button type="button" class="btn btn-link" data-folder="{{$folder}}" role="menuitem">{{$name}}</button>
</li>
{{/foreach}} {{/foreach}}
{{* Switch between image and file mode *}} {{* Switch between image and file mode *}}
@ -28,7 +30,7 @@
<ul role="menu"> <ul role="menu">
{{foreach $folders as $folder}} {{foreach $folders as $folder}}
<li role="presentation"> <li role="presentation">
<a href="#" data-folder="{{$folder}}" role="menuitem">{{$folder}}</a> <button type="button" data-folder="{{$folder}}" role="menuitem">{{$folder}}</button>
</li> </li>
{{/foreach}} {{/foreach}}
</ul> </ul>

2
view/theme/frio/templates/jot.tpl
View file

@ -120,7 +120,7 @@
<i class="fa fa-paper-plane fa-fw" aria-hidden="true"></i> {{$share}} <i class="fa fa-paper-plane fa-fw" aria-hidden="true"></i> {{$share}}
</button> </button>
</li> </li>
<li role="presentation" id="character-counter" class="grey jothidden text-info pull-right"></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}};"> <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;" /> <img role="presentation" id="profile-rotator" src="images/rotator.gif" alt="{{$wait}}" title="{{$wait}}" style="display: none;" />
</li> </li>

95
view/theme/frio/templates/nav.tpl
View file

@ -110,7 +110,7 @@
{{* The notifications dropdown menu. There are two parts of menu. The second is at the bottom of this file. It is loaded via js. Look at nav-notifications-template *}} {{* The notifications dropdown menu. There are two parts of menu. The second is at the bottom of this file. It is loaded via js. Look at nav-notifications-template *}}
<ul id="nav-notifications-menu" class="dropdown-menu menu-popup" role="menu" <ul id="nav-notifications-menu" class="dropdown-menu menu-popup" role="menu"
aria-labelledby="nav-notifications-menu-btn"> aria-labelledby="nav-notifications-menu-btn">
{{* the following list entry must have the id "nav-notificaionts-mark-all". Without it this isn't visable. ....strange behavior :-/ *}} {{* 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 role="presentation" id="nav-notifications-mark-all" class="dropdown-header">
<div class="arrow"></div> <div class="arrow"></div>
{{$nav.notifications.1}} {{$nav.notifications.1}}
@ -194,7 +194,8 @@
</li> </li>
{{/if}} {{/if}}
{{if $nav.messages}} {{if $nav.messages}}
<li role="presentation"><a role="menuitem" <li role="presentation">
<a role="menuitem"
class="nav-commlink {{$nav.messages.2}} {{$sel.messages}}" class="nav-commlink {{$nav.messages.2}} {{$sel.messages}}"
href="{{$nav.messages.0}}" title="{{$nav.messages.3}}"> href="{{$nav.messages.0}}" title="{{$nav.messages.3}}">
<i class="fa fa-envelope fa-fw" aria-hidden="true"></i> <i class="fa fa-envelope fa-fw" aria-hidden="true"></i>
@ -205,7 +206,8 @@
{{/if}} {{/if}}
<li role="presentation" class="divider"></li> <li role="presentation" class="divider"></li>
{{if $nav.contacts}} {{if $nav.contacts}}
<li role="presentation"><a role="menuitem" id="nav-menu-contacts-link" <li role="presentation">
<a role="menuitem" id="nav-menu-contacts-link"
class="nav-link {{$nav.contacts.2}}" href="{{$nav.contacts.0}}" class="nav-link {{$nav.contacts.2}}" href="{{$nav.contacts.0}}"
title="{{$nav.contacts.3}}"> title="{{$nav.contacts.3}}">
<i class="fa fa-users fa-fw" aria-hidden="true"></i> <i class="fa fa-users fa-fw" aria-hidden="true"></i>
@ -235,6 +237,7 @@
href="{{$nav.apps.0}}" title="{{$nav.apps.3}}"> href="{{$nav.apps.0}}" title="{{$nav.apps.3}}">
<i class="fa fa-puzzle-piece fa-fw" aria-hidden="true"></i> {{$nav.apps.1}} <i class="fa fa-puzzle-piece fa-fw" aria-hidden="true"></i> {{$nav.apps.1}}
</a> </a>
</li>
<li role="presentation" class="divider"></li> <li role="presentation" class="divider"></li>
{{/if}} {{/if}}
{{if $nav.help}} {{if $nav.help}}
@ -254,28 +257,40 @@
</li> </li>
{{/if}} {{/if}}
{{if $nav.admin}} {{if $nav.admin}}
<li role="presentation"><a accesskey="a" role="menuitem" id="nav-admin-link" <li role="presentation">
<a accesskey="a" role="menuitem" id="nav-admin-link"
class="nav-link {{$nav.admin.2}}" href="{{$nav.admin.0}}" 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> title="{{$nav.admin.3}}"><i class="fa fa-user-secret fa-fw" aria-hidden="true"></i>
{{$nav.admin.1}}</a></li> {{$nav.admin.1}}
</a>
</li>
{{/if}} {{/if}}
{{if $nav.tos}} {{if $nav.tos}}
<li role="presentation" class="divider"></li> <li role="presentation" class="divider"></li>
<li role="presentation"><a role="menuitem" id="nav-tos-link" class="nav-link {{$nav.tos.2}}" <li role="presentation">
<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" href="{{$nav.tos.0}}" title="{{$nav.tos.3}}"><i class="fa fa-file-text"
aria-hidden="true"></i> {{$nav.tos.1}}</a></li> aria-hidden="true"></i> {{$nav.tos.1}}
</a>
</li>
{{/if}} {{/if}}
<li role="presentation" class="divider"></li> <li role="presentation" class="divider"></li>
{{if $nav.logout}} {{if $nav.logout}}
<li role="presentation"><a role="menuitem" id="nav-logout-link" <li role="presentation">
<a role="menuitem" id="nav-logout-link"
class="nav-link {{$nav.logout.2}}" href="{{$nav.logout.0}}" 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> title="{{$nav.logout.3}}"><i class="fa fa fa-sign-out fa-fw" aria-hidden="true"></i>
{{$nav.logout.1}}</a></li> {{$nav.logout.1}}
</a>
</li>
{{else}} {{else}}
<li role="presentation"><a role="menuitem" id="nav-login-link" <li role="presentation">
<a role="menuitem" id="nav-login-link"
class="nav-login-link {{$nav.login.2}}" href="{{$nav.login.0}}" 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> title="{{$nav.login.3}}"><i class="fa fa-power-off fa-fw" aria-hidden="true"></i>
{{$nav.login.1}}</a></li> {{$nav.login.1}}
</a>
</li>
{{/if}} {{/if}}
</ul> </ul>
</li>{{* End of userinfo dropdown menu *}} </li>{{* End of userinfo dropdown menu *}}
@ -304,35 +319,49 @@
{{$userinfo.name}}{{if $nav.remote}} ({{$nav.remote}}){{/if}} {{$userinfo.name}}{{if $nav.remote}} ({{$nav.remote}}){{/if}}
</li> </li>
{{foreach $nav.usermenu as $usermenu}} {{foreach $nav.usermenu as $usermenu}}
<li role="menuitem" class="list-group-item"><a role="menuitem" class="{{$usermenu.2}}" <li role="presentation" class="list-group-item">
href="{{$usermenu.0}}" title="{{$usermenu.3}}">{{$usermenu.1}}</a></li> <a role="menuitem" class="{{$usermenu.2}}"
href="{{$usermenu.0}}" title="{{$usermenu.3}}">{{$usermenu.1}}
</a>
</li>
{{/foreach}} {{/foreach}}
{{if $nav.notifications || $nav.contacts || $nav.messages || $nav.delegation}} {{if $nav.notifications || $nav.contacts || $nav.messages || $nav.delegation}}
<li role="presentation" class="divider"></li> <li role="presentation" class="divider"></li>
{{/if}} {{/if}}
{{if $nav.notifications}} {{if $nav.notifications}}
<li role="presentation" class="list-group-item"><a role="menuitem" <li role="presentation" class="list-group-item">
<a role="menuitem"
href="{{$nav.notifications.all.0}}" title="{{$nav.notifications.1}}"><i href="{{$nav.notifications.all.0}}" title="{{$nav.notifications.1}}"><i
class="fa fa-bell fa-fw" aria-hidden="true"></i> {{$nav.notifications.1}}</a> class="fa fa-bell fa-fw" aria-hidden="true"></i> {{$nav.notifications.1}}
</a>
</li> </li>
{{/if}} {{/if}}
{{if $nav.contacts}} {{if $nav.contacts}}
<li role="presentation" class="list-group-item"><a role="menuitem" <li role="presentation" class="list-group-item">
<a role="menuitem"
class="nav-link {{$nav.contacts.2}}" href="{{$nav.contacts.0}}" 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> title="{{$nav.contacts.3}}"><i class="fa fa-users fa-fw" aria-hidden="true"></i>
{{$nav.contacts.1}}</a></li> {{$nav.contacts.1}}
</a>
</li>
{{/if}} {{/if}}
{{if $nav.messages}} {{if $nav.messages}}
<li role="presentation" class="list-group-item"><a role="menuitem" <li role="presentation" class="list-group-item">
<a role="menuitem"
class="nav-link {{$nav.messages.2}} {{$sel.messages}}" href="{{$nav.messages.0}}" 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> title="{{$nav.messages.3}}"><i class="fa fa-envelope fa-fw" aria-hidden="true"></i>
{{$nav.messages.1}}</a></li> {{$nav.messages.1}}
</a>
</li>
{{/if}} {{/if}}
{{if $nav.delegation}} {{if $nav.delegation}}
<li role="presentation" class="list-group-item"><a role="menuitem" <li role="presentation" class="list-group-item">
<a role="menuitem"
class="nav-commlink {{$nav.delegation.2}} {{$sel.delegation}}" class="nav-commlink {{$nav.delegation.2}} {{$sel.delegation}}"
href="{{$nav.delegation.0}}" title="{{$nav.delegation.3}}"><i class="fa fa-flag fa-fw" href="{{$nav.delegation.0}}" title="{{$nav.delegation.3}}"><i class="fa fa-flag fa-fw"
aria-hidden="true"></i> {{$nav.delegation.1}}</a></li> aria-hidden="true"></i> {{$nav.delegation.1}}
</a>
</li>
{{/if}} {{/if}}
{{if $nav.settings || $nav.admin || $nav.logout}} {{if $nav.settings || $nav.admin || $nav.logout}}
<li role="presentation" class="divider"></li> <li role="presentation" class="divider"></li>
@ -341,25 +370,35 @@
<li role="presentation" class="list-group-item"> <li role="presentation" class="list-group-item">
<a role="menuitem" class="nav-link {{$nav.settings.2}}" href="{{$nav.settings.0}}" <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> title="{{$nav.settings.3}}"><i class="fa fa-cog fa-fw" aria-hidden="true"></i>
{{$nav.settings.1}}</a> {{$nav.settings.1}}
</a>
</li> </li>
{{/if}} {{/if}}
{{if $nav.admin}} {{if $nav.admin}}
<li role="presentation" class="list-group-item"><a role="menuitem" <li role="presentation" class="list-group-item">
<a role="menuitem"
class="nav-link {{$nav.admin.2}}" href="{{$nav.admin.0}}" title="{{$nav.admin.3}}"><i 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> class="fa fa-user-secret fa-fw" aria-hidden="true"></i>
{{$nav.admin.1}}</a></li> {{$nav.admin.1}}
</a>
</li>
{{/if}} {{/if}}
{{if $nav.logout}} {{if $nav.logout}}
<li role="presentation" class="list-group-item"><a role="menuitem" <li role="presentation" class="list-group-item">
<a role="menuitem"
class="nav-link {{$nav.logout.2}}" href="{{$nav.logout.0}}" title="{{$nav.logout.3}}"><i 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> class="fa fa fa-sign-out fa-fw" aria-hidden="true"></i>
{{$nav.logout.1}}</a></li> {{$nav.logout.1}}
</a>
</li>
{{else}} {{else}}
<li role="presentation" class="list-group-item"><a role="menuitem" <li role="presentation" class="list-group-item">
<a role="menuitem"
class="nav-login-link {{$nav.login.2}}" href="{{$nav.login.0}}" 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> title="{{$nav.login.3}}"><i class="fa fa-power-off fa-fw" aria-hidden="true"></i>
{{$nav.login.1}}</a></li> {{$nav.login.1}}
</a>
</li>
{{/if}} {{/if}}
</ul> </ul>
</div> </div>