altf4arnold/datatracker
1
0
Fork 0
Code Issues Pull requests Actions 3 Packages Projects Releases Wiki Activity

Replace glyphicons with bootstrap-icons.

Browse source 
- Legacy-Id: 19607
This commit is contained in:
Lars Eggert 2021-11-10 08:08:02 +00:00
parent 94b12af9da
commit 1d559374ec
16 changed files with 35 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
ietf/static/css/ietf.scss
View file

@ -53,13 +53,9 @@ $enable-negative-margins: true;
@import "~/node_modules/bootstrap/scss/utilities/api";
// Make the bootstrap icons available.
// FIXME: This requires cp -r node_modules/bootstrap-icons/font/fonts static/src/css/
// to be run manually due to parcel limitations.
// @import "../../../node_modules/bootstrap-icons/font/bootstrap-icons";
// For now, let's stick with font-awesome v4:
$fa-font-path: "~/node_modules/font-awesome/fonts";
@import "~/node_modules/font-awesome/scss/font-awesome";
$bootstrap-icons-font-src: url("~node_modules/bootstrap-icons/font/fonts/bootstrap-icons.woff2?a97b3594ad416896e15824f6787370e0") format("woff2"),
url("~node_modules/bootstrap-icons/font/fonts/bootstrap-icons.woff?a97b3594ad416896e15824f6787370e0") format("woff") !default;
@import "../../../node_modules/bootstrap-icons/font/bootstrap-icons";
// Install the datatables.net bootstrap5 styles.
// FIXME: Including this with ~ fails for some odd reason?

2
ietf/static/ietf/js/liaisons.js
View file

@ -59,7 +59,7 @@ var attachmentWidget = {
html += '</span>';
container.hide();
});
//html += ' <a href="" class="removeAttach glyphicon glyphicon-remove text-danger"></a>';
//html += ' <a href="" class="removeAttach bi bi-x text-danger"></a>';
html += ' <a href="" class="removeAttach btn btn-default btn-xs">Delete</a>';
html += '</div>';
attachmentWidget.config.showOnDisplay.html(html);

4
ietf/templates/community/list_menu.html
View file

@ -9,7 +9,7 @@
{% if clist.pk != None %}
<li><a class="btn btn-primary" href="{% if clist.group %}{% url "ietf.community.views.subscription" acronym=clist.group.acronym %}{% else %}{% url "ietf.community.views.subscription" username=clist.user.username %}{% endif %}">
<i class="glyphicon glyphicon-envelope"></i>
<i class="bi bi-envelope"></i>
{% if subscribed %}
Change subscription
{% else %}
@ -18,5 +18,5 @@
</a></li>
{% endif %}
<li><a class="btn btn-primary" href="{% if clist.group %}{% url "ietf.community.views.export_to_csv" acronym=clist.group.acronym %}{% else %}{% url "ietf.community.views.export_to_csv" username=clist.user.username %}{% endif %}"><i class="glyphicon glyphicon-list"></i> Export as CSV</a></li>
<li><a class="btn btn-primary" href="{% if clist.group %}{% url "ietf.community.views.export_to_csv" acronym=clist.group.acronym %}{% else %}{% url "ietf.community.views.export_to_csv" username=clist.user.username %}{% endif %}"><i class="bi bi-file-ruled"></i> Export as CSV</a></li>
</ul>

2
ietf/templates/community/view_list.html
View file

@ -13,7 +13,7 @@
{% if can_manage_list %}
<a class="btn btn-primary" href="{% url "ietf.community.views.manage_list" username=clist.user.username %}">
<i class="glyphicon glyphicon-cog"></i>
<i class="bi bi-gear"></i>
Manage list
</a>
{% endif %}

2
ietf/templates/ipr/details_edit.html
View file

@ -161,7 +161,7 @@
<div class="form-group">
<label class="col-md-2 control-label"></label>
<div class="col-md-10"><a class="draft-add-row btn btn-primary"><span class="glyphicon glyphicon-plus" aria-hidden="true"></span> Add more</a></div>
<div class="col-md-10"><a class="draft-add-row btn btn-primary"><span class="bi bi-plus" aria-hidden="true"></span> Add more</a></div>
</div>
{% bootstrap_field form.other_designations layout='horizontal' %}

2
ietf/templates/ipr/details_history.html
View file

@ -39,7 +39,7 @@
<td class="text-nowrap">{{ e.time|date:"Y-m-d" }}</td>
<td>{{ e.type }}
{% if e.response_due and e.response_past_due %}
<span class="glyphicon glyphicon-exclamation-sign" title="Response overdue"></span>
<span class="bi bi-exclamation-circle" title="Response overdue"></span>
{% endif %}
</td>
<td>{{ e.by }}</td>

4
ietf/templates/ipr/details_view.html
View file

@ -30,10 +30,10 @@
{% endif %}
{% if ipr.updates and ipr.state_id == 'pending' and ipr.update_notified_date or not ipr.updates and ipr.state_id == 'pending' %}
<a class="btn btn-primary" href="{% url 'ietf.ipr.views.post' id=ipr.id %}"><span class="glyphicon glyphicon-ok" aria-hidden="true"></span> Post</a>
<a class="btn btn-primary" href="{% url 'ietf.ipr.views.post' id=ipr.id %}"><span class="bi bi-check" aria-hidden="true"></span> Post</a>
{% endif %}
<a class="btn btn-primary" href="{% url 'ietf.ipr.views.email' id=ipr.id %}" title="Email submitter of this disclsoure"><span class="glyphicon glyphicon-envelope" aria-hidden="true"></span> Email</a>
<a class="btn btn-primary" href="{% url 'ietf.ipr.views.email' id=ipr.id %}" title="Email submitter of this disclsoure"><span class="bi bi-envelope" aria-hidden="true"></span> Email</a>
<a class="btn btn-primary" href="{% url 'ietf.ipr.views.edit' id=ipr.id %}">Edit</a>
<a class="btn btn-primary" href="{% url 'ietf.ipr.views.state' id=ipr.id %}">Change State</a>
{% endif %}

2
ietf/templates/ipr/ipr_table.html
View file

@ -47,7 +47,7 @@
{% if latest_msgout and latest_msgout.response_due %}
{{ latest_msgout.response_due|date:"Y-m-d" }}
{% if latest_msgout.response_past_due %}
<span class="glyphicon glyphicon-exclamation-sign" title="Response overdue"></span>
<span class="bi bi-exclamation-circle" title="Response overdue"></span>
{% endif %}
{% endif %}
</td>

2
ietf/templates/liaisons/detail_history.html
View file

@ -35,7 +35,7 @@
<td class="text-nowrap">{{ e.time|date:"Y-m-d" }}</td>
<td>{{ e.type }}
{% if e.response_due and e.response_past_due %}
<span class="glyphicon glyphicon-exclamation-sign" title="Response overdue"></span>
<span class="bi bi-exclamation-circle" title="Response overdue"></span>
{% endif %}
</td>
<td>{{ e.by }}</td>

2
ietf/templates/meeting/interim_request.html
View file

@ -148,7 +148,7 @@
<div class="form-group">
<div class="col-md-12">
<button id="add_session" type="button" class="btn btn-primary" style="display: none;"><span class="glyphicon glyphicon-plus" aria-hidden="true"></span>Add Session</button>
<button id="add_session" type="button" class="btn btn-primary" style="display: none;"><span class="bi bi-plus" aria-hidden="true"></span>Add Session</button>
</div>
</div>

2
ietf/templates/meeting/interim_request_edit.html
View file

@ -95,7 +95,7 @@
<div class="form-group">
<div class="col-md-12">
<button id="add_session" type="button" class="btn btn-primary"><span class="glyphicon glyphicon-plus" aria-hidden="true"></span>Add Session</button>
<button id="add_session" type="button" class="btn btn-primary"><span class="bi bi-plus" aria-hidden="true"></span>Add Session</button>
</div>
</div>

2
ietf/templates/meeting/session_buttons_include.html
View file

@ -44,7 +44,7 @@
{% if timeslot.location.audio_stream_url %}
<a class=""
href="{{timeslot.location.audio_stream_url|format:session }}"
title="Audio stream"><span class="glyphicon glyphicon-headphones"></span>
title="Audio stream"><span class="bi bi-headphones"></span>
</a>
{% endif %}
<!-- Remote call-in -->

2
ietf/templates/submit/submission_email.html
View file

@ -49,7 +49,7 @@
{% if user|has_role:"Secretariat" %}
<tr>
<td><a id="reply{{ submission.pk }}" class="btn btn-primary" href="{% url "ietf.submit.views.send_submission_email" submission_id=submission.pk message_id=message.pk %}" title="Reply"><span class="glyphicon glyphicon-envelope" aria-hidden="true"></span> Reply</a></td>
<td><a id="reply{{ submission.pk }}" class="btn btn-primary" href="{% url "ietf.submit.views.send_submission_email" submission_id=submission.pk message_id=message.pk %}" title="Reply"><span class="bi bi-envelope" aria-hidden="true"></span> Reply</a></td>
</tr>
{% endif %}
</table>

4
ietf/templates/submit/submission_status.html
View file

@ -385,7 +385,7 @@
{% if user|has_role:"Secretariat" %}
<p></p>
<a id="send{{ submission.pk }}" class="btn btn-primary" href="{% url "ietf.submit.views.send_submission_email" submission_id=submission.pk %}" title="Email submitter"><span class="glyphicon glyphicon-envelope" aria-hidden="true"></span> Send Email</a>
<a id="send{{ submission.pk }}" class="btn btn-primary" href="{% url "ietf.submit.views.send_submission_email" submission_id=submission.pk %}" title="Email submitter"><span class="bi bi-envelope" aria-hidden="true"></span> Send Email</a>
{% endif %}
{% if show_send_full_url %}
@ -426,7 +426,7 @@
{% if user.is_authenticated %}
<td>
{% if e.desc|startswith:"Received message" and user|has_role:"Secretariat" %}
<a id="reply{{ submission.pk }}" class="btn btn-primary btn-xs" href="{% url "ietf.submit.views.send_submission_email" submission_id=submission.pk message_id=e.submissionemailevent.pk %}" title="Reply"><span class="glyphicon glyphicon-envelope" aria-hidden="true"></span> Reply</a>
<a id="reply{{ submission.pk }}" class="btn btn-primary btn-xs" href="{% url "ietf.submit.views.send_submission_email" submission_id=submission.pk message_id=e.submissionemailevent.pk %}" title="Reply"><span class="bi bi-envelope" aria-hidden="true"></span> Reply</a>
{% endif %}
Email: <a id="aw{{ submission.pk }}-{{ m.pk }}" href="{% url "ietf.submit.views.show_submission_email_message" submission_id=submission.pk message_id=e.submissionemailevent.pk access_token=submission.access_token %}">{{ e.desc }}</a></td>
{% else %}

28
package-lock.json generated
View file

@ -7,10 +7,10 @@
"dependencies": {
"@popperjs/core": "^2.10.2",
"bootstrap": "^5.1.3",
"bootstrap-icons": "^1.7.0",
"d3": "^3.5.17",
"datatables.net": "^1.11.3",
"datatables.net-bs5": "^1.11.3",
"font-awesome": "^4.7.0",
"jquery": "^3.6.0"
},
"devDependencies": {
@ -2173,6 +2173,14 @@
"@popperjs/core": "^2.10.2"
}
},
"node_modules/bootstrap-icons": {
"version": "1.7.0",
"resolved": "https://registry.npmjs.org/bootstrap-icons/-/bootstrap-icons-1.7.0.tgz",
"integrity": "sha512-x2ORQ3lv1QdSnIzzQdU8mf83fbCq4FIaUinrAWw+a/d186vO3Ph7qUfqzvQDBA41AD6IoxdRHD6zUt9IXC1J6A==",
"engines": {
"node": ">=10"
}
},
"node_modules/brace-expansion": {
"version": "1.1.11",
"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
@ -3768,14 +3776,6 @@
}
}
},
"node_modules/font-awesome": {
"version": "4.7.0",
"resolved": "https://registry.npmjs.org/font-awesome/-/font-awesome-4.7.0.tgz",
"integrity": "sha1-j6jPBBGhoxr9B7BtKQK7n8gVoTM=",
"engines": {
"node": ">=0.10.3"
}
},
"node_modules/foreach": {
"version": "2.0.5",
"resolved": "https://registry.npmjs.org/foreach/-/foreach-2.0.5.tgz",
@ -9755,6 +9755,11 @@
"integrity": "sha512-fcQztozJ8jToQWXxVuEyXWW+dSo8AiXWKwiSSrKWsRB/Qt+Ewwza+JWoLKiTuQLaEPhdNAJ7+Dosc9DOIqNy7Q==",
"requires": {}
},
"bootstrap-icons": {
"version": "1.7.0",
"resolved": "https://registry.npmjs.org/bootstrap-icons/-/bootstrap-icons-1.7.0.tgz",
"integrity": "sha512-x2ORQ3lv1QdSnIzzQdU8mf83fbCq4FIaUinrAWw+a/d186vO3Ph7qUfqzvQDBA41AD6IoxdRHD6zUt9IXC1J6A=="
},
"brace-expansion": {
"version": "1.1.11",
"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
@ -11040,11 +11045,6 @@
"integrity": "sha512-wtphSXy7d4/OR+MvIFbCVBDzZ5520qV8XfPklSN5QtxuMUJZ+b0Wnst1e1lCDocfzuCkHqj8k0FpZqO+UIaKNA==",
"dev": true
},
"font-awesome": {
"version": "4.7.0",
"resolved": "https://registry.npmjs.org/font-awesome/-/font-awesome-4.7.0.tgz",
"integrity": "sha1-j6jPBBGhoxr9B7BtKQK7n8gVoTM="
},
"foreach": {
"version": "2.0.5",
"resolved": "https://registry.npmjs.org/foreach/-/foreach-2.0.5.tgz",

4
package.json
View file

@ -2,10 +2,10 @@
"dependencies": {
"@popperjs/core": "^2.10.2",
"bootstrap": "^5.1.3",
"bootstrap-icons": "^1.7.0",
"d3": "^3.5.17",
"datatables.net": "^1.11.3",
"datatables.net-bs5": "^1.11.3",
"font-awesome": "^4.7.0",
"jquery": "^3.6.0"
},
"devDependencies": {
@ -30,4 +30,4 @@
"distDir": "ietf/static/dist/ietf"
}
}
}
}