Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(a11y): DES-2482 cms icons, role as none (only i.fa) #1052

Merged
merged 14 commits into from
Oct 25, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@ jQuery(function($) {
updateNewInstitutionFieldStatus();

$('#id_institutionId').children().last().wrap('<optgroup label="Not Listed"></optgroup>');
$('#id_institutionId').parent().after('<p><a tabindex="-1" href="#" id="id_institutionNotListed"><i class="fa fa-question-circle"></i> My Institution is not listed</a></p>')
$('#id_institutionId').parent().after('<p><a tabindex="-1" href="#" id="id_institutionNotListed"><i role="none" class="fa fa-question-circle"></i> My Institution is not listed</a></p>')

$('#id_institutionNotListed').on('click', function(e) {
e.preventDefault();
$('#id_institutionId').val(-1).trigger('change');
});

});
});
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ <h2>Software Licenses</h2>
<h3>
{{license.license_type}}
{% if license.current_user_license %}
<span class="label label-success"><i class="fa fa-check-circle"></i> ACTIVE </span>
<span class="label label-success"><i role="none" class="fa fa-check-circle"></i> ACTIVE </span>
{% else %}
<span class="label label-danger"> NOT ACTIVE </span>
{% endif %}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ <h4>Coming soon!</h4>

{% else %}
<div class="jumbotron text-center">
<i class="fa fa-bell fa-2x text-muted"></i>
<i role="none" class="fa fa-bell fa-2x text-muted"></i>
<h2>No unread notifications.</h2>
<p>
You have no unread notifications.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ <h3>Research Interests</h3>

<hr>

<a href="{% url 'designsafe_accounts:profile_edit' %}" class="btn btn-default"><i class="fa fa-edit"></i> Edit profile
<a href="{% url 'designsafe_accounts:profile_edit' %}" class="btn btn-default"><i role="none" class="fa fa-edit"></i> Edit profile
</a>

</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
{% if image_preview %}
<div class="text-center">
<img src="{{ image_preview }}" id="preview" style="max-width:100%;">
<!-- <div><i class="fa fa-spinner fa-spin" style="font-size: 150px" id="loading_ind"></i></div> -->
<!-- <div><i role="none" class="fa fa-spinner fa-spin" style="font-size: 150px" id="loading_ind"></i></div> -->
</div>
<!-- {% addtoblock 'js' %}
<script type="text/javascript">
Expand All @@ -46,15 +46,15 @@
{% elif text_preview %}
<div class="embed-responsive embed-responsive-4by3">
<pre class="embed-responsive-item">{{ text_preview }}</pre>
<!-- <div><i class="fa fa-spinner fa-spin" style="font-size: 150px" id="loading_ind"></i></div> -->
<!-- <div><i role="none" class="fa fa-spinner fa-spin" style="font-size: 150px" id="loading_ind"></i></div> -->
</div>
{% elif object_preview %}
<!--
<div class="embed-responsive embed-responsive-4by3">
<object data="{{ object_preview }}" width="100%" height="100%"></object>
</div>
-->
<!-- <div><i class="fa fa-spinner fa-spin" style="font-size: 150px" id="loading_ind"></i></div> -->
<!-- <div><i role="none" class="fa fa-spinner fa-spin" style="font-size: 150px" id="loading_ind"></i></div> -->
<iframe class="embed-responsive-item"
src="https://docs.google.com/gview?url={{object_preview}}&embedded=true"
frameborder="0"
Expand All @@ -69,7 +69,7 @@
})(jQuery);
</script>
{% elif iframe_preview %}
<!-- <div><i class="fa fa-spinner fa-spin" style="font-size: 150px" id="loading_ind"></i></div> -->
<!-- <div><i role="none" class="fa fa-spinner fa-spin" style="font-size: 150px" id="loading_ind"></i></div> -->
<iframe class="embed-responsive-item"
src="{{iframe_preview}}"
frameborder="0"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
{% if image_preview %}
<div class="text-center">
<img src="{{ image_preview }}" id="preview" style="max-width:100%;">
<div><i class="fa fa-spinner fa-spin" style="font-size: 150px" id="loading_ind"></i></div>
<div><i role="none" class="fa fa-spinner fa-spin" style="font-size: 150px" id="loading_ind"></i></div>
</div>
{% addtoblock 'js' %}
<script type="text/javascript">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<div class="row">
<div class="col-sm-12">
<h1 class="headline headline-research">
<i class="fa fa-dashboard"></i>
<i role="none" class="fa fa-dashboard"></i>
My Dashboard
</h1>
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@
<div class="container">
<h2>Attachment : {{ title }} </h2>
<pre>{{ attachment }}</pre>
<a href="{% url 'djangoRT:ticketdetail' ticketId %}"><i class="fa fa-reply"></i> Back to ticket</a>
<a href="{% url 'djangoRT:ticketdetail' ticketId %}"><i role="none" class="fa fa-reply"></i> Back to ticket</a>
</div>
{% endblock %}
4 changes: 2 additions & 2 deletions designsafe/apps/djangoRT/templates/djangoRT/navigation.html
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<a class="btn btn-default btn-sm" href="{% url 'djangoRT:mytickets' %}">
<i class="fa fa-long-arrow-left"></i> Back to ticket listing
<i role="none" class="fa fa-long-arrow-left"></i> Back to ticket listing
</a>

{% if ticket_id %}
<a class="btn btn-default btn-sm" href="{% url 'djangoRT:ticketdetail' ticket_id %}">
<i class="fa fa-long-arrow-left"></i> Back to ticket
<i role="none" class="fa fa-long-arrow-left"></i> Back to ticket
</a>
{% endif %}
6 changes: 3 additions & 3 deletions designsafe/apps/djangoRT/templates/djangoRT/reply.html
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<a class="btn btn-default btn-sm" href="{% url 'djangoRT:ticketreply' ticket.id %}">
<i class="fa fa-reply"></i>
<i role="none" class="fa fa-reply"></i>
{% if ticket.Status == 'resolved' or ticket.Status == 'closed' %}
Reopen this ticket
{% else %}
Expand All @@ -8,11 +8,11 @@
</a>
{% if ticket.Status != 'resolved' and ticket.Status != 'closed' %}
<a class="btn btn-default btn-sm" href="{% url 'djangoRT:ticketclose' ticket.id %}">
<i class="fa fa-times"></i>
<i role="none" class="fa fa-times"></i>
Close this ticket
</a>
{% endif %}
<a class="btn btn-default btn-sm" href="{% url 'djangoRT:mytickets' %}">
<i class="fa fa-home"></i>
<i role="none" class="fa fa-home"></i>
Return to ticket listing
</a>
4 changes: 2 additions & 2 deletions designsafe/apps/djangoRT/templates/djangoRT/ticket.html
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<a class="btn btn-info"
title="{% if ticket.Status == 'resolved' or ticket.Status == 'closed' %}Reopen this ticket{% else %}Reply to this ticket{% endif %}"
href="{% url 'djangoRT:ticketreply' ticket.id %}">
<i class="fa fa-reply"></i>
<i role="none" class="fa fa-reply"></i>
<span class="sr-only">
{% if ticket.Status == 'resolved' or ticket.Status == 'closed' %}Reopen this ticket{% else %}Reply to this ticket{% endif %}
</span>
Expand All @@ -24,7 +24,7 @@
<a class="btn btn-danger"
title="Close this ticket"
href="{% url 'djangoRT:ticketclose' ticket.id %}">
<i class="fa fa-times"></i>
<i role="none" class="fa fa-times"></i>
<span class="sr-only">Close this ticket</span>
</a>
{% endif %}
Expand Down
12 changes: 6 additions & 6 deletions designsafe/apps/djangoRT/templates/djangoRT/ticketDetail.html
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,12 @@ <h1>{{ ticket.Subject }}<br><small>Ticket #{{ ticket_id }}</small></h1>
<div>
<b>Actions:</b>
<a class="btn btn-info" href="{% url 'djangoRT:ticketreply' ticket.id %}">
<i class="fa fa-reply"></i>
<i role="none" class="fa fa-reply"></i>
{% if ticket.Status == 'resolved' or ticket.Status == 'closed' %}Reopen this ticket{% else %}Reply to this ticket{% endif %}
</a>
{% if ticket.Status != 'resolved' and ticket.Status != 'closed' %}
<a class="btn btn-danger" href="{% url 'djangoRT:ticketclose' ticket.id %}">
<i class="fa fa-times"></i> Close this ticket
<i role="none" class="fa fa-times"></i> Close this ticket
</a>
{% endif %}
</div>
Expand All @@ -36,7 +36,7 @@ <h1>{{ ticket.Subject }}<br><small>Ticket #{{ ticket_id }}</small></h1>
{% if history.Type == "Correspond" or history.Type == "Create" %}
<div class="history-item history-item-{{history.Type|lower}}">
<h4>
<i class="fa fa-{% if history.Type == "Correspond" %}comment{% elif history.Type == 'Create' %}plus-circle{% endif %}"></i>
<i role="none" class="fa fa-{% if history.Type == "Correspond" %}comment{% elif history.Type == 'Create' %}plus-circle{% endif %}"></i>
{% localtime off %}
{{history.Created|date:"M j Y P"}}
{% endlocaltime %}
Expand All @@ -55,7 +55,7 @@ <h5>Attachments:</h5>
{% elif history.Type == "Status" %}
<div class="history-item history-item-{{history.Type|lower}}">
<blockquote>
<i class="fa fa-bell"></i>
<i role="none" class="fa fa-bell"></i>
{{history.Description }}<br>
{% localtime off %}
{{history.Created|date:"M j Y P"}}
Expand All @@ -70,12 +70,12 @@ <h5>Attachments:</h5>
<div>
<b>Actions:</b>
<a class="btn btn-info" href="{% url 'djangoRT:ticketreply' ticket.id %}">
<i class="fa fa-reply"></i>
<i role="none" class="fa fa-reply"></i>
{% if ticket.Status == 'resolved' or ticket.Status == 'closed' %}Reopen this ticket{% else %}Reply to this ticket{% endif %}
</a>
{% if ticket.Status != 'resolved' and ticket.Status != 'closed' %}
<a class="btn btn-danger" href="{% url 'djangoRT:ticketclose' ticket.id %}">
<i class="fa fa-times"></i> Close this ticket
<i role="none" class="fa fa-times"></i> Close this ticket
</a>
{% endif %}
</div>
Expand Down
4 changes: 2 additions & 2 deletions designsafe/apps/djangoRT/templates/djangoRT/ticketList.html
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<h1>My Tickets</h1>

<a class="btn btn-primary" href="{% url 'djangoRT:ticketcreate' %}">
<i class="fa fa-plus-circle"></i>
<i role="none" class="fa fa-plus-circle"></i>
Create a new ticket
</a>

Expand All @@ -43,7 +43,7 @@ <h3>
<form action="">
<div class="form-group">
<div class="input-group">
<span class="input-group-addon"><i class="fa fa-filter"></i></span>
<span class="input-group-addon"><i role="none" class="fa fa-filter"></i></span>
<input class="form-control search" type="text" id="search" placeholder="Filter tickets">
</div>
</div>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<p>
Access to <a href="http://www.lstc.com/products/ls-dyna" target="_blank" aria-describedby="msg-open-ext-site-new-window">LS-DYNA <i class="fa fa-external-link"></i></a> requires
Access to <a href="http://www.lstc.com/products/ls-dyna" target="_blank" aria-describedby="msg-open-ext-site-new-window">LS-DYNA <i role="none" class="fa fa-external-link"></i></a> requires
that we verify with LSTC that you have a valid Academic Department License. You can acquire such a license from
<a href="http://www.lstc.com/sales" target="_blank" aria-describedby="msg-open-ext-site-new-window">LSTC Sales</a>.
</p>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<p>
<a href="http://www.mathworks.com/" target="_blank" aria-describedby="msg-open-ext-site-new-window">Mathworks' MATLAB <i class="fa fa-external-link"></i></a>
<a href="http://www.mathworks.com/" target="_blank" aria-describedby="msg-open-ext-site-new-window">Mathworks' MATLAB <i role="none" class="fa fa-external-link"></i></a>
is available to Academic users in Tools & Applications but requires activation.
</p>
<p>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ NHERI Facilities Scheduling Dashbaord
<!-- SCHEDULER VIEW -->
<nco-scheduler>
<div class="bg-info text-info" data-ng-if="!$ctrl.initialized">
<i class="fa fa-spinner fa-spin">&nbsp;</i> Loading...
<i role="none" class="fa fa-spinner fa-spin">&nbsp;</i> Loading...
</div>
</nco-scheduler>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ NHERI Facilities Scheduling Dashbaord
<!-- Grants VIEW -->
<nco-ttc-grants>
<div class="bg-info text-info" data-ng-if="!$ctrl.initialized">
<i class="fa fa-spinner fa-spin">&nbsp;</i> Loading...
<i role="none" class="fa fa-spinner fa-spin">&nbsp;</i> Loading...
</div>
</nco-ttc-grants>
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<div class="col-md-12">
<h1> Recon Admin </h1>
<a class="btn btn-success" href="{% url 'designsafe_rapid:admin_create_event' %}" target="_self">
<i class="fa fa-plus"> Create New Recon Event </i>
<i role="none" class="fa fa-plus"> Create New Recon Event </i>
</a>
<a class="btn btn-default pull-right" href="{% url 'designsafe_rapid:admin_users' %}" target="_self"> Recon User Admin </a>
<hr>
Expand Down Expand Up @@ -37,18 +37,18 @@ <h1> Recon Admin </h1>
<td> {{event.created_date}} </td>
<td>
<a href="{% url 'designsafe_rapid:admin_edit_event' event.meta|private:'id' %}" class="btn btn-sm btn-info" target="_self">
<i class="fa fa-file"> </i> Edit
<i role="none" class="fa fa-file"> </i> Edit
</a>
</td>
<td>
<a href="{% url 'designsafe_rapid:admin_event_datasets' event.meta|private:'id' %}" class="btn btn-sm btn-info" target="_self">
<i class="fa fa-database"> </i> Datasets
<i role="none" class="fa fa-database"> </i> Datasets
</a>
</td>
<td>
<form action="{% url 'designsafe_rapid:admin_delete_event' event.meta|private:'id' %}" method="POST">
{% csrf_token %}
<button class="btn btn-sm btn-danger"> <i class="fa fa-trash"> </i> Delete Event </button>
<button class="btn btn-sm btn-danger"> <i role="none" class="fa fa-trash"> </i> Delete Event </button>
</td>

</tr>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ <h2> Create a Recon Natural Hazard Event </h2>
{% csrf_token %}
{% bootstrap_form form %}
<div class="form-group">
<button type="submit" class="btn btn-success"> <i class="fa fa-file"></i> Save</button>
<button type="submit" class="btn btn-success"> <i role="none" class="fa fa-file"></i> Save</button>
</div>
</form>
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ <h2> Edit Natural Hazard Event </h2>
</div>
{% endif %}
<div class="form-group">
<button type="submit" class="btn btn-success"> <i class="fa fa-file"></i> Save</button>
<button type="submit" class="btn btn-success"> <i role="none" class="fa fa-file"></i> Save</button>
</div>
</form>
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ <h2> Add dataset to event: {{event.title}}</h2>
{% csrf_token %}
{% bootstrap_form form %}
<div class="form-group">
<button type="submit" class="btn btn-success"> <i class="fa fa-file"></i> Save</button>
<button type="submit" class="btn btn-success"> <i role="none" class="fa fa-file"></i> Save</button>
</div>
</form>
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<div class="col-md-12">
<h2> Datasets for event: "{{event.title}}" </h2>
<a class="btn btn-success" href="{% url 'designsafe_rapid:admin_event_add_dataset' event.meta|private:'id' %}" target="_self">
<i class="fa fa-plus"> Create New Dataset </i>
<i role="none" class="fa fa-plus"> Create New Dataset </i>
</a>
</div>
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ <h2> Modify dataset to Recon Hazard Event </h2>
{% csrf_token %}
{% bootstrap_form form %}
<div class="form-group">
<button type="submit" class="btn btn-success"> <i class="fa fa-file"></i> Save</button>
<button type="submit" class="btn btn-success"> <i role="none" class="fa fa-file"></i> Save</button>
</div>
</form>
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<span class="hl hl-research">Tools & Applications</span>
</h1>
<div>
<a href="{% url 'pages-details-by-slug' slug='rw/user-guide/workspace' %}"><i class="fa fa-question-circle"></i> Learn About <b>Tools & Applications.</b></a>
<a href="{% url 'pages-details-by-slug' slug='rw/user-guide/workspace' %}"><i role="none" class="fa fa-question-circle"></i> Learn About <b>Tools & Applications.</b></a>
</div>
</div>

Expand Down
Loading
Loading