Skip to content

Commit c1e8ff1

Browse files
author
Ken Johnson
authored
Merge pull request #406 from tdtds/improve_a11y
improve accessibility
2 parents fe7d6d7 + 27f02c2 commit c1e8ff1

File tree

6 files changed

+17
-17
lines changed

6 files changed

+17
-17
lines changed

app/assets/javascripts/bootstrap-timepicker.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -745,14 +745,14 @@
745745
case 'modal':
746746
template = '<div class="bootstrap-timepicker modal hide fade in" style="top: 30%; margin-top: 0; width: 200px; margin-left: -100px;" data-backdrop="'+ (this.modalBackdrop ? 'true' : 'false') +'">'+
747747
'<div class="modal-header">'+
748-
'<a href="#" class="close" data-dismiss="modal">×</a>'+
748+
'<a href="#" class="close" aria-label="dismiss" data-dismiss="modal">×</a>'+
749749
'<h4>Pick a Time</h4>'+
750750
'</div>'+
751751
'<div class="modal-content">'+
752752
templateContent +
753753
'</div>'+
754754
'<div class="modal-footer">'+
755-
'<a href="#" class="btn btn-primary" data-dismiss="modal">Ok</a>'+
755+
'<a href="#" class="btn btn-primary" aria-label=dismiss" data-dismiss="modal">Ok</a>'+
756756
'</div>'+
757757
'</div>';
758758

app/views/admin/get_all_users.html.erb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
<%= u.email%>
2727
</td>
2828
<td>
29-
<%= u.admin ? %{<span class="fs1" aria-hidden="true" data-icon="&#xe0fe;"}.html_safe : nil %>
29+
<%= u.admin ? %{<span class="fs1" aria-label="check" data-icon="&#xe0fe;"}.html_safe : nil %>
3030
</td>
3131
<td>
3232
<%= link_to "Edit", "#", {:onClick => "javascript:openEditModal(#{u.id});", :role => "button", :style => "width:70px", :class => "btn btn-inverse", "data-toggle" => "modal"}%>

app/views/admin/get_user.html.erb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<!-- Begin Modal -->
22
<div class="modal-header">
3-
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">
3+
<button type="button" class="close" data-dismiss="modal" aria-label="dismiss">
44
×
55
</button>
66
<h4 id="myModalLabel1">

app/views/dashboard/home.html.erb

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,12 @@
1010
<!-- Begin Title Buttons-->
1111
<div class="tools pull-right">
1212
<div class="btn-group">
13-
<a id="change_to_bar_graph" class="btn btn-small">
14-
<span data-icon="&#xe14b;"></span>
15-
</a>
16-
<a id="change_to_pie_charts" class="btn btn-small">
17-
<span data-icon="&#xe096;"></span>
18-
</a>
13+
<button id="change_to_bar_graph" class="btn btn-small">
14+
<span aria-label="change to bar graph" data-icon="&#xe14b;"></span>
15+
</button>
16+
<button id="change_to_pie_charts" class="btn btn-small">
17+
<span aria-label="change to pie charts" data-icon="&#xe096;"></span>
18+
</button>
1919
</div>
2020
</div>
2121
<!-- End Title Buttons-->

app/views/layouts/shared/_header.html.erb

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@
33

44
<span style="color:#eee;margin-left:10px;">
55
Font Size:
6-
<a data-no-turbolink='true' href="/dashboard/home?font=8pt" style="font-size:10pt;color:#eee;">A</a>
7-
<a data-no-turbolink='true' href="/dashboard/home?font=200%25" style="font-size:18pt;color:#eee;">A</a>
6+
<a data-no-turbolink='true' href="/dashboard/home?font=8pt" style="font-size:10pt;color:#eee" aria-label="small font">A</a>
7+
<a data-no-turbolink='true' href="/dashboard/home?font=200%25" style="font-size:18pt;color:#eee;" aria-label="large font">A</a>
88
</span>
99

1010
<div class="user-profile">
11-
<a data-toggle="dropdown" class="dropdown-toggle">
11+
<button data-toggle="dropdown" class="dropdown-toggle">
1212
<img src=" <%= image_path('profile_color.jpg')%>" alt="profile">
13-
</a>
13+
</button>
1414
<span class="caret"></span>
1515
<ul class="dropdown-menu pull-right">
1616
<li>

app/views/layouts/shared/_messages.html.erb

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,17 @@
22
<% name = name.to_sym %>
33
<% if name == :error %>
44
<div class="alert alert-error">
5-
<a class="close" data-dismiss="alert" href="#">×</a>
5+
<a class="close" aria-label="dismiss" data-dismiss="alert" href="#">×</a>
66
<%= content_tag :div, msg, :id => "flash_notice" %>
77
</div>
88
<% elsif name == :success %>
99
<div class="alert alert-success">
10-
<a class="close" data-dismiss="alert" href="#">×</a>
10+
<a class="close" aria-label="dismiss" data-dismiss="alert" href="#">×</a>
1111
<%= content_tag :div, msg, :id => "flash_notice" %>
1212
</div>
1313
<% elsif name == :info %>
1414
<div class="alert alert-info">
15-
<a class="close" data-dismiss="alert" href="#">×</a>
15+
<a class="close" aria-label="dismiss" data-dismiss="alert" href="#">×</a>
1616
<%= content_tag :div, msg, :id => "flash_notice" %>
1717
</div>
1818
<% end %>

0 commit comments

Comments
 (0)