From: Michael <heluecht@pirati.ca>
Date: Thu, 17 Oct 2019 22:08:05 +0000 (+0000)
Subject: Merge remote-tracking branch 'upstream/develop' into aria
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=1de3960e267a8d298348fbca18cf1be1f6a20f7a;p=friendica.git

Merge remote-tracking branch 'upstream/develop' into aria
---

1de3960e267a8d298348fbca18cf1be1f6a20f7a
diff --cc view/theme/frio/templates/field_checkbox.tpl
index e993e5adb7,5dc8916666..2391506b1b
--- a/view/theme/frio/templates/field_checkbox.tpl
+++ b/view/theme/frio/templates/field_checkbox.tpl
@@@ -1,9 -1,11 +1,11 @@@
  
  	<div class="field checkbox" id="div_id_{{$field.0}}">
  			<input type="hidden" name="{{$field.0}}" value="0">
 -			<input type="checkbox" name="{{$field.0}}" id="id_{{$field.0}}" value="1" {{if $field.2}}checked="checked"{{/if}} aria-checked="{{if $field.2}}true{{else}}false{{/if}}" aria-describedby="{{$field.0}}_tip" {{if $field.4}}{{$field.4}}{{/if}}>
 +			<input type="checkbox" name="{{$field.0}}" id="id_{{$field.0}}" value="1" {{if $field.2}}checked="checked"{{/if}} aria-checked="{{if $field.2}}true{{else}}false{{/if}}" {{if $field.4}}aria-describedby="{{$field.0}}_tip"{{/if}} {{if $field.4}}{{$field.4}}{{/if}}>
  			<label for="id_{{$field.0}}">
  				{{$field.1}}
- 				<span class="help-block" id="{{$field.0}}_tip" role="tooltip">{{$field.3}}</span>
+ 				{{if $field.3}}
+ 				<span class="help-block" id="{{$field.0}}_tip" role="tooltip">{{$field.3 nofilter}}</span>
+ 				{{/if}}
  			</label>
  	</div>
diff --cc view/theme/frio/templates/nav.tpl
index 87b0d10155,06b43f6b15..b495fdae4e
--- a/view/theme/frio/templates/nav.tpl
+++ b/view/theme/frio/templates/nav.tpl
@@@ -69,9 -69,9 +69,9 @@@
  
  					{{* The notifications dropdown *}}
  					{{if $nav.notifications}}
- 						<li id="nav-notification" class="nav-segment hidden-xs" role="presentation">
- 							<a href="{{$nav.notifications.0}}" rel="#nav-notifications-menu" aria-label="{{$nav.notifications.1}}" title="{{$nav.notifications.1}}" role="button" id="dropdownMenu1" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" aria-controls="nav-notifications-menu">
- 								<i class="fa fa-exclamation-circle fa-lg" aria-hidden="true"></i>
+ 						<li id="nav-notification" class="nav-segment" role="presentation">
 -							<a href="{{$nav.notifications.0}}" rel="#nav-notifications-menu" data-toggle="tooltip" aria-label="{{$nav.notifications.1}}" title="{{$nav.notifications.1}}" role="button" id="dropdownMenu1" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
++								<a href="{{$nav.notifications.0}}" rel="#nav-notifications-menu" data-toggle="tooltip" aria-label="{{$nav.notifications.1}}" title="{{$nav.notifications.1}}" role="button" id="dropdownMenu1" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" aria-controls="nav-notifications-menu">
+ 								<i class="fa fa-bell fa-lg" aria-hidden="true"></i>
  								<span role="menuitem" class="sr-only">{{$nav.notifications.1}}</span>
  								<span id="notify-update" class="nav-notify-badge badge nav-notify dropdown" data-toggle="dropdown"></span>
  							</a>