arona/PyRIGS
1
0
Fork 0
mirror of https://github.com/nottinghamtec/PyRIGS.git synced 2026-01-17 05:22:16 +00:00
Code Issues Projects Releases Wiki Activity

Port from glyphicons to Font Awesome

Browse Source 
Mmmm pretty
This commit is contained in:
FreneticScribbler
2020-03-09 23:18:56 +00:00
parent 320c43e472
commit b57716f7fc
26 changed files with 89 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
RIGS/templates/calendar.html
View File

@@ -208,8 +208,8 @@
</div>
<div class="btn-group">
<button type="button" class="btn btn-default" id="prev-button"><span class="glyphicon glyphicon-chevron-left"></span></button>
<button type="button" class="btn btn-default" id="next-button"><span class="glyphicon glyphicon-chevron-right"></span></button>
<button type="button" class="btn btn-default" id="prev-button"><span class="fas fa-chevron-left"></span></button>
<button type="button" class="btn btn-default" id="next-button"><span class="fas fa-chevron-right"></span></button>
</div>
<div class="btn-group">

2
RIGS/templates/event_detail.html
View File

@@ -267,7 +267,7 @@
{% endif %}
<div class="pull-right">
<a href="{% url 'event_detail' object.pk %}" class="btn btn-primary">Open Event Page <span
class="glyphicon glyphicon-eye"></span></a>
class="fas fa-eye"></span></a>
</div>
</div>
</div>

12
RIGS/templates/event_detail_buttons.html
View File

@@ -1,6 +1,6 @@
<div class="btn-group btn-page">
<a href="{% url 'event_update' event.pk %}" class="btn btn-default"><span
class="glyphicon glyphicon-edit"></span> <span
class="fas fa-edit"></span> <span
class="hidden-xs">Edit</span></a>
{% if event.is_rig %}
{% if not event.dry_hire %}
@@ -11,15 +11,15 @@
btn-warning
{% endif %}
"><span
class="glyphicon glyphicon-paperclip"></span> <span
class="fas fa-paperclip"></span> <span
class="hidden-xs">RA</span></a>
{% endif %}
<a href="{% url 'event_print' event.pk %}" target="_blank" class="btn btn-default"><span
class="glyphicon glyphicon-print"></span> <span
class="fas fa-print"></span> <span
class="hidden-xs">Print</span></a>
{% endif %}
<a href="{% url 'event_duplicate' event.pk %}" class="btn btn-default" title="Duplicate Rig"><span
class="glyphicon glyphicon-duplicate"></span> <span
class="fas fa-duplicate"></span> <span
class="hidden-xs">Duplicate</span></a>
{% if event.is_rig %}
{% if event.internal %}
@@ -33,7 +33,7 @@
{% endif %}
"
href="{% url 'event_authorise_request' object.pk %}">
<span class="glyphicon glyphicon-send"></span>
<span class="fas fa-send"></span>
<span class="hidden-xs">
{% if event.authorised %}
Authorised
@@ -58,7 +58,7 @@
btn-danger
{% endif %}
" title="Invoice Rig"><span
class="glyphicon glyphicon-gbp"></span>
class="fas fa-gbp"></span>
<span class="hidden-xs">Invoice</span></a>
{% endif %}
{% endif %}

2
RIGS/templates/event_embed.html
View File

@@ -16,7 +16,7 @@
<img src="{{ object.mic.profile_picture }}" class="event-mic-photo img-rounded"/>
</div>
{% elif object.is_rig %}
<span class="glyphicon glyphicon-exclamation-sign"></span>
<span class="fas fa-exclamation-sign"></span>
{% endif %}
</span>

18
RIGS/templates/event_form.html
View File

@@ -136,7 +136,7 @@
<div class="col-sm-4 text-right">
<div class="btn-group btn-page">
<button type="submit" class="btn btn-default" title="Save"><span
class="glyphicon glyphicon-floppy-disk"></span></button>
class="fas fa-floppy-disk"></span></button>
</div>
</div>
</div>
@@ -186,10 +186,10 @@
<div class="btn-group">
<a href="{% url 'person_create' %}" class="btn btn-default modal-href"
data-target="#{{ form.person.id_for_label }}">
<span class="glyphicon glyphicon-plus"></span>
<span class="fas fa-plus"></span>
</a>
<a href="{% if form.person.value %}{% url 'person_update' form.person.value %}{% endif %}" class="btn btn-default modal-href" id="{{ form.person.id_for_label }}-update" data-target="#{{ form.person.id_for_label }}">
<span class="glyphicon glyphicon-pencil"></span>
<span class="fas fa-pencil"></span>
</a>
</div>
</div>
@@ -213,10 +213,10 @@
<div class="btn-group">
<a href="{% url 'organisation_create' %}" class="btn btn-default modal-href"
data-target="#{{ form.organisation.id_for_label }}">
<span class="glyphicon glyphicon-plus"></span>
<span class="fas fa-plus"></span>
</a>
<a href="{% if form.organisation.value %}{% url 'organisation_update' form.organisation.value %}{% endif %}" class="btn btn-default modal-href" id="{{ form.organisation.id_for_label }}-update" data-target="#{{ form.organisation.id_for_label }}">
<span class="glyphicon glyphicon-pencil"></span>
<span class="fas fa-pencil"></span>
</a>
</div>
</div>
@@ -272,10 +272,10 @@
<div class="btn-group">
<a href="{% url 'venue_create' %}" class="btn btn-default modal-href"
data-target="#{{ form.venue.id_for_label }}">
<span class="glyphicon glyphicon-plus"></span>
<span class="fas fa-plus"></span>
</a>
<a href="{% if object.venue %}{% url 'venue_update' object.venue.pk %}{% endif %}" class="btn btn-default modal-href" id="{{ form.venue.id_for_label }}-update" data-target="#{{ form.venue.id_for_label }}">
<span class="glyphicon glyphicon-pencil"></span>
<span class="fas fa-pencil"></span>
</a>
</div>
</div>
@@ -416,7 +416,7 @@
<div class="col-sm-12 text-right">
<div class="btn-group btn-page">
<button type="submit" class="btn btn-default" title="Save"><span
class="glyphicon glyphicon-floppy-disk"></span>
class="fas fa-floppy-disk"></span>
</button>
</div>
</div>
@@ -439,7 +439,7 @@
<div class="col-sm-12 text-right form-hws form-is_rig {% if object.pk and not object.is_rig %}hidden{% endif %}">
<div class="btn-group btn-page">
<button type="submit" class="btn btn-default" title="Save"><span
class="glyphicon glyphicon-floppy-disk"></span>
class="fas fa-floppy-disk"></span>
</button>
</div>
</div>

6
RIGS/templates/event_invoice.html
View File

@@ -57,7 +57,7 @@
<td>
{{ object.name }}
{% if object.is_rig and perms.RIGS.view_event and object.authorised %}
<span class="glyphicon glyphicon-check"></span>
<span class="fas fa-check"></span>
{% endif %}
</td>
<td>
@@ -75,7 +75,7 @@
{{ object.mic.initials }}<br>
<img src="{{ object.mic.profile_picture }}" class="event-mic-photo"/>
{% else %}
<span class="glyphicon glyphicon-exclamation-sign"></span>
<span class="fas fa-exclamation-sign"></span>
{% endif %}
</td>
<td class="text-right">
@@ -83,7 +83,7 @@
class="btn btn-default"
data-toggle="tooltip"
title="'Invoice' this event - click this when paperwork has been sent to treasury">
<span class="glyphicon glyphicon-gbp"></span>
<span class="fas fa-gbp"></span>
</a>
</td>
</tr>

4
RIGS/templates/event_table.html
View File

@@ -43,7 +43,7 @@
<span class="label label-default">Dry Hire</span>
{% endif %}
{% if event.is_rig and perms.RIGS.view_event and event.authorised %}
<span class="glyphicon glyphicon-check"></span>
<span class="fas fa-check"></span>
{% endif %}
</h4>
{% if event.is_rig and not event.cancelled %}
@@ -97,7 +97,7 @@
{% endif %}
</div>
{% elif event.is_rig %}
<span class="glyphicon glyphicon-exclamation-sign"></span>
<span class="fas fa-exclamation-sign"></span>
{% endif %}
</td>
</tr>

2
RIGS/templates/eventauthorisation_request.html
View File

@@ -41,7 +41,7 @@
<div class="text-right col-sm-3 col-sm-offset-9">
<div class="form-group">
<button type="submit" class="form-control btn btn-primary">
<span class="glyphicon glyphicon-send"></span>
<span class="fas fa-send"></span>
Send
</button>
</div>

22
RIGS/templates/index.html
View File

@@ -25,19 +25,19 @@
<h4 class="list-group-item-heading">Quick Links</h4>
</div>
<div class="list-group">
<a class="list-group-item" href="{% url 'rigboard' %}"><span class="glyphicon glyphicon-list"></span> Rigboard</a>
<a class="list-group-item" href="{% url 'web_calendar' %}"><span class="glyphicon glyphicon-calendar"></span> Calendar</a>
{% if perms.RIGS.add_event %}<a class="list-group-item" href="{% url 'event_create' %}"><span class="glyphicon glyphicon-plus"></span> New Event</a>{% endif %}
<a class="list-group-item" href="{% url 'asset_index' %}"><span class="glyphicon glyphicon-tag"></span> Asset Database </a>
<a class="list-group-item" href="{% url 'rigboard' %}"><span class="fas fa-list"></span> Rigboard</a>
<a class="list-group-item" href="{% url 'web_calendar' %}"><span class="fas fa-calendar"></span> Calendar</a>
{% if perms.RIGS.add_event %}<a class="list-group-item" href="{% url 'event_create' %}"><span class="fas fa-plus"></span> New Event</a>{% endif %}
<a class="list-group-item" href="{% url 'asset_index' %}"><span class="fas fa-tag"></span> Asset Database </a>
<div class="list-group-item default"></div>
<a class="list-group-item" href="https://forum.nottinghamtec.co.uk" target="_blank"><span class="glyphicon glyphicon-link"></span> TEC Forum</a>
<a class="list-group-item" href="//members.nottinghamtec.co.uk/wiki" target="_blank"><span class="glyphicon glyphicon-link"></span> TEC Wiki</a>
<a class="list-group-item" href="https://forum.nottinghamtec.co.uk" target="_blank"><span class="fas fa-link"></span> TEC Forum</a>
<a class="list-group-item" href="//members.nottinghamtec.co.uk/wiki" target="_blank"><span class="fas fa-link"></span> TEC Wiki</a>
{% if perms.RIGS.view_event %}
<a class="list-group-item" href="http://members.nottinghamtec.co.uk/wiki/images/2/22/Event_Risk_Assesment.pdf" target="_blank"><span class="glyphicon glyphicon-link"></span> Pre-Event Risk Assessment</a>
<a class="list-group-item" href="//members.nottinghamtec.co.uk/price" target="_blank"><span class="glyphicon glyphicon-link"></span> Price List</a>
<a class="list-group-item" href="https://goo.gl/forms/jdPWov8PCNPoXtbn2" target="_blank"><span class="glyphicon glyphicon-link"></span> Subhire Insurance Form</a>
<a class="list-group-item" href="http://members.nottinghamtec.co.uk/wiki/images/2/22/Event_Risk_Assesment.pdf" target="_blank"><span class="fas fa-link"></span> Pre-Event Risk Assessment</a>
<a class="list-group-item" href="//members.nottinghamtec.co.uk/price" target="_blank"><span class="fas fa-link"></span> Price List</a>
<a class="list-group-item" href="https://goo.gl/forms/jdPWov8PCNPoXtbn2" target="_blank"><span class="fas fa-link"></span> Subhire Insurance Form</a>
{% endif %}
</div>
</div>
@@ -45,7 +45,7 @@
<div class="card card-default">
<div class="card-heading">
<h4 class="card-title">Search Rigboard
<a href="{% url 'search_help' %}" class="pull-right modal-href"><span class="glyphicon glyphicon-question-sign"</span></a></h4>
<a href="{% url 'search_help' %}" class="pull-right modal-href"><span class="fas fa-question-sign"</span></a></h4>
</div>
<script>
$(document).ready(function(){
@@ -68,7 +68,7 @@
<input id="id_search_input" type="search" name="q" class="form-control" placeholder="Search..." />
<span class="input-group-btn">
<div class="btn-group" role="group">
<button class="btn btn-default dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"><span class="glyphicon glyphicon-search"></span> Search <span class="caret"></span></button>
<button class="btn btn-default dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"><span class="fas fa-search"></span> Search <span class="caret"></span></button>
<ul id="search-options" class="dropdown-menu">
<li><a data-action="{% url 'event_archive' %}" href="#">Events</a></li>
<li><a data-action="{% url 'person_list' %}" href="#">People</a></li>

10
RIGS/templates/invoice_detail.html
View File

@@ -12,15 +12,15 @@
<div class="col-sm-4 text-right">
<div class="btn-group btn-page">
<a href="{% url 'invoice_delete' object.pk %}" class="btn btn-default" title="Delete Invoice">
<span class="glyphicon glyphicon-remove"></span> <span
<span class="fas fa-remove"></span> <span
class="hidden-xs">Delete</span>
</a>
<a href="{% url 'invoice_void' object.pk %}" class="btn btn-default" title="Void Invoice">
<span class="glyphicon glyphicon-ban-circle"></span> <span
<span class="fas fa-ban-circle"></span> <span
class="hidden-xs">Void</span>
</a>
<a href="{% url 'invoice_print' object.pk %}" target="_blank" title="Print Invoice" class="btn btn-default"><span
class="glyphicon glyphicon-print"></span> <span
class="fas fa-print"></span> <span
class="hidden-xs">Print</span></a>
</div>
</div>
@@ -127,7 +127,7 @@
<a href="{% url 'payment_create' %}?invoice={{ object.pk }}"
class="btn btn-default modal-href"
data-target="#{{ form.person.id_for_label }}">
<span class="glyphicon glyphicon-plus"></span> Add
<span class="fas fa-plus"></span> Add
</a>
</div>
<table class="table table-hover">
@@ -147,7 +147,7 @@
<td>{{ payment.get_method_display }}</td>
<td>
<a href="{% url 'payment_delete' payment.pk %}"
class="btn btn-small btn-danger"><span class="glyphicon glyphicon-remove"</a>
class="btn btn-small btn-danger"><span class="fas fa-remove"</a>
</td>
</tr>
{% endfor %}

2
RIGS/templates/invoice_list.html
View File

@@ -67,7 +67,7 @@
</td>
<td class="text-right">
<a href="{% url 'invoice_detail' object.pk %}" class="btn btn-default">
<span class="glyphicon glyphicon-pencil"></span>
<span class="fas fa-pencil"></span>
</a>
</td>
</tr>

4
RIGS/templates/item_row.html
View File

@@ -18,11 +18,11 @@
<button type="button" class="item-edit btn btn-xs btn-default"
data-pk="{{item.pk}}"
data-toggle="modal" data-target="#itemModal">
<span class="glyphicon glyphicon-edit"></span>
<span class="fas fa-edit"></span>
</button>
<button type="button" class="item-delete btn btn-xs btn-danger"
data-pk="{{item.pk}}">
<span class="glyphicon glyphicon-remove"></span>
<span class="fas fa-remove"></span>
</button>
</td>
{% endif %}

6
RIGS/templates/item_table.html
View File

@@ -15,7 +15,7 @@
<button type="button" class="btn btn-default btn-xs item-add"
data-toggle="modal"
data-target="#itemModal">
<span class="glyphicon glyphicon-plus"></span>
<span class="fas fa-plus"></span>
</button>
</td>
{% endif %}
@@ -66,10 +66,10 @@
<td class="vert-align text-right">
<button type="button" class="item-edit btn btn-xs btn-default"
data-toggle="modal" data-target="#itemModal">
<span class="glyphicon glyphicon-edit"></span>
<span class="fas fa-edit"></span>
</button>
<button type="button" class="item-delete btn btn-xs btn-danger">
<span class="glyphicon glyphicon-remove"></span>
<span class="fas fa-remove"></span>
</button>
</td>
{% endif %}

8
RIGS/templates/organisation_detail.html
View File

@@ -13,7 +13,7 @@
<div class="col-sm-12 text-right">
<div class="btn-group btn-page">
<a href="{% url 'organisation_update' object.pk %}" class="btn btn-default"><span
class="glyphicon glyphicon-pencil"></span> Edit</a>
class="fas fa-pencil"></span> Edit</a>
</div>
</div>
{% endif %}
@@ -77,7 +77,7 @@
<div class="col-sm-12 text-right">
<div class="btn-group btn-page">
<a href="{% url 'organisation_update' object.pk %}" class="btn btn-default"><span
class="glyphicon glyphicon-pencil"></span> Edit</a>
class="fas fa-pencil"></span> Edit</a>
</div>
<div>
<a href="{% url 'organisation_history' object.pk %}" title="View Revision History">
@@ -96,9 +96,9 @@
<div class="col-sm-12 text-right">
<div class="btn-group btn-page">
<a href="{% url 'organisation_detail' object.pk %}" class="btn btn-default"><span
class="glyphicon glyphicon-eye-open"></span> Open Page</a>
class="fas fa-eye-open"></span> Open Page</a>
<a href="{% url 'organisation_update' object.pk %}" class="btn btn-default"><span
class="glyphicon glyphicon-pencil"></span> Edit</a>
class="fas fa-pencil"></span> Edit</a>
</div>
<div>
<a href="{% url 'organisation_history' object.pk %}" title="View Revision History">

6
RIGS/templates/organisation_list.html
View File

@@ -14,7 +14,7 @@
</div>
<div class="col-sm-2">
<a href="{% url 'organisation_create' %}" class="btn btn-default pull-right">New <span
class="glyphicon glyphicon-plus"></span></a>
class="fas fa-plus"></span></a>
</div>
<div class="col-sm-3 col-sm-offset-9">
<form class="form form-horizontal col-sm-12">
@@ -50,10 +50,10 @@
<td>{{ object.union_account|yesno|capfirst }}</td>
<td>
<a href="{% url 'organisation_detail' object.pk %}" class="btn btn-default modal-href">
<span class="glyphicon glyphicon-eye-open"></span>
<span class="fas fa-eye-open"></span>
</a>
<a href="{% url 'organisation_update' object.pk %}" class="btn btn-default"><span
class="glyphicon glyphicon-pencil"></span></a>
class="fas fa-pencil"></span></a>
</td>
</tr>
{% empty %}

8
RIGS/templates/person_detail.html
View File

@@ -13,7 +13,7 @@
<div class="col-sm-12 text-right">
<div class="btn-group btn-page">
<a href="{% url 'person_update' object.pk %}" class="btn btn-default"><span
class="glyphicon glyphicon-pencil"></span> Edit</a>
class="fas fa-pencil"></span> Edit</a>
</div>
</div>
{% endif %}
@@ -74,7 +74,7 @@
<div class="col-sm-12 text-right">
<div class="btn-group btn-page">
<a href="{% url 'person_update' object.pk %}" class="btn btn-default"><span
class="glyphicon glyphicon-pencil"></span> Edit</a>
class="fas fa-pencil"></span> Edit</a>
</div>
<div>
<a href="{% url 'person_history' object.pk %}" title="View Revision History">
@@ -93,9 +93,9 @@
<div class="col-sm-12 text-right">
<div class="btn-group btn-page">
<a href="{% url 'person_detail' object.pk %}" class="btn btn-default"><span
class="glyphicon glyphicon-eye-open"></span> Open Page</a>
class="fas fa-eye-open"></span> Open Page</a>
<a href="{% url 'person_update' object.pk %}" class="btn btn-default"><span
class="glyphicon glyphicon-pencil"></span> Edit</a>
class="fas fa-pencil"></span> Edit</a>
</div>
<div>
<a href="{% url 'person_history' object.pk %}" title="View Revision History">

6
RIGS/templates/person_list.html
View File

@@ -14,7 +14,7 @@
</div>
<div class="col-sm-2">
<a href="{% url 'person_create' %}" class="btn btn-default pull-right">New <span
class="glyphicon glyphicon-plus"></span></a>
class="fas fa-plus"></span></a>
</div>
<div class="col-sm-3 col-sm-offset-9">
<form class="form form-horizontal col-sm-12">
@@ -48,10 +48,10 @@
<td>{{ person.notes|yesno|capfirst }}</td>
<td>
<a href="{% url 'person_detail' person.pk %}" class="btn btn-default modal-href">
<span class="glyphicon glyphicon-eye-open"></span>
<span class="fas fa-eye-open"></span>
</a>
<a href="{% url 'person_update' person.pk %}" class="btn btn-default"><span
class="glyphicon glyphicon-pencil"></span></a>
class="fas fa-pencil"></span></a>
</td>
</tr>
{% empty %}

6
RIGS/templates/profile_detail.html
View File

@@ -41,10 +41,10 @@
<div class="col-sm-6 text-right">
<div class="btn-group btn-page">
<a href="{% url 'profile_update_self' %}" class="btn btn-default">
Edit Profile <span class="glyphicon glyphicon-pencil"></span>
Edit Profile <span class="fas fa-pencil"></span>
</a>
<a href="{% url 'password_change' %}" class="btn btn-default">
Change Password <span class="glyphicon glyphicon-lock"></span>
Change Password <span class="fas fa-lock"></span>
</a>
</div>
</div>
@@ -79,7 +79,7 @@
<div class="pull-right">
<a href="{% url 'reset_api_key' %}" class="btn btn-default">
{% if user.api_key %}Reset API Key{% else %}Generate API Key{% endif %}
<span class="glyphicon glyphicon-repeat"></span>
<span class="fas fa-repeat"></span>
</a>
</div>

2
RIGS/templates/rigboard.html
View File

@@ -6,7 +6,7 @@
<div>
<h1 class="bd-title" id="content">Rigboard</h1>
{% if perms.RIGS.add_event %}
<a href="{% url 'event_create' %}" class="btn btn-lg btn-outline-primary float-right">New <span class="glyphicon glyphicon-plus"></span></a>
<a href="{% url 'event_create' %}" class="btn btn-lg btn-outline-primary float-right">New <span class="fas fa-plus"></span></a>
{% endif %}
</div>
{% include 'event_table.html' %}

8
RIGS/templates/venue_detail.html
View File

@@ -13,7 +13,7 @@
<div class="col-sm-12 text-right">
<div class="btn-group btn-page">
<a href="{% url 'venue_update' object.pk %}" class="btn btn-default"><span
class="glyphicon glyphicon-pencil"></span> Edit</a>
class="fas fa-pencil"></span> Edit</a>
</div>
</div>
{% endif %}
@@ -63,7 +63,7 @@
<div class="col-sm-12 text-right">
<div class="btn-group btn-page">
<a href="{% url 'venue_update' object.pk %}" class="btn btn-default"><span
class="glyphicon glyphicon-pencil"></span> Edit</a>
class="fas fa-pencil"></span> Edit</a>
</div>
<div>
<a href="{% url 'venue_history' object.pk %}" title="View Revision History">
@@ -83,9 +83,9 @@
<div class="col-sm-12 text-right">
<div class="btn-group btn-page">
<a href="{% url 'venue_detail' object.pk %}" class="btn btn-default"><span
class="glyphicon glyphicon-eye-open"></span> Open Page</a>
class="fas fa-eye-open"></span> Open Page</a>
<a href="{% url 'venue_update' object.pk %}" class="btn btn-default"><span
class="glyphicon glyphicon-pencil"></span> Edit</a>
class="fas fa-pencil"></span> Edit</a>
</div>
<div>
<a href="{% url 'venue_history' object.pk %}" title="View Revision History">

6
RIGS/templates/venue_list.html
View File

@@ -14,7 +14,7 @@
</div>
<div class="col-sm-2">
<a href="{% url 'venue_create' %}" class="btn btn-default pull-right">New <span
class="glyphicon glyphicon-plus"></span></a>
class="fas fa-plus"></span></a>
</div>
<div class="col-sm-3 col-sm-offset-9">
<form class="form form-horizontal col-sm-12">
@@ -49,10 +49,10 @@
<td>{{ object.notes|yesno|capfirst }}</td>
<td>
<a href="{% url 'venue_detail' object.pk %}" class="btn btn-default modal-href">
<span class="glyphicon glyphicon-eye-open"></span>
<span class="fas fa-eye-open"></span>
</a>
<a href="{% url 'venue_update' object.pk %}" class="btn btn-default"><span
class="glyphicon glyphicon-pencil"></span></a>
class="fas fa-pencil"></span></a>
</td>
</tr>
{% empty %}

2
gulpfile.js
View File

@@ -20,7 +20,7 @@ gulp.task('sass', function () {
});
gulp.task('scripts', function() {
return gulp.src(['web_assets/js/**/*.js', 'node_modules/bootstrap/**/bootstrap.min.js', 'node_modules/popper\.js/**/popper.js', 'node_modules/moment/**/moment.js'])
return gulp.src(['web_assets/js/**/*.js', 'node_modules/bootstrap/**/bootstrap.min.js', 'node_modules/popper\.js/**/popper.js', 'node_modules/moment/**/moment.js', 'node_modules/@fortawesome/fontawesome-free/js/all.js'])
.pipe(flatten())
.pipe(terser())
.pipe(gulp.dest('RIGS/static/js'));

2
package.json
View File

@@ -5,9 +5,9 @@
"author": "Tom Price",
"license": "MIT",
"dependencies": {
"@fortawesome/fontawesome-free": "^5.12.1",
"animation": "^0.1.3",
"bootstrap": "^4.4.1",
"fontawesome": "^5.6.3",
"fullcalendar": "^3.10.1",
"gulp-flatten": "^0.4.0",
"jquery": "^3.4.1",

3
templates/base.html
View File

@@ -44,7 +44,7 @@
<li class="nav-item dropdown align-self-end" id="user">
{% if user.is_authenticated %}
<a class="nav-link dropdown-toggle" href="#" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
<span class="glyphicon glyphicon-user"></span>
<span class="fas fa-user"></span>
Hi {{ user.first_name }}
</a>
<div class="dropdown-menu" id="userdropdown">
@@ -89,6 +89,7 @@
<script src="{% static 'js/popper.js' %}"></script>
<script src="{% static 'js/bootstrap.min.js' %}"></script>
<script src="{% static 'js/moment.js' %}"></script>
<script src="{% static 'js/fontawesome.min.js' %}"></script>
<script>
Date.prototype.getISOString = function () {
var yyyy = this.getFullYear().toString();

10
templates/base_assets.html
View File

@@ -5,7 +5,7 @@
{% endblock %}
{% block titleheader %}
<a class="nav navbar-brand navbar-left" href="/"><i class="glyphicon glyphicon-circle-arrow-left" style="vertical-align: middle !important;"></i> RIGS</a>
<a class="nav navbar-brand navbar-left" href="/"><i class="fas fa-circle-arrow-left" style="vertical-align: middle !important;"></i> RIGS</a>
<a class="nav navbar-brand" href="{% url 'asset_index' %}">Assets</a>
{% endblock %}
@@ -14,9 +14,9 @@
<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown">Assets<b class="caret"></b></a>
<ul class="dropdown-menu">
<li><a href="{% url 'asset_list' %}"><span class="glyphicon glyphicon-list"></span> List Assets</a></li>
<li><a href="{% url 'asset_list' %}"><span class="fas fa-list"></span> List Assets</a></li>
{% if perms.assets.add_asset %}
<li><a href="{% url 'asset_create' %}"><span class="glyphicon glyphicon-plus"></span> Create Asset</a></li>
<li><a href="{% url 'asset_create' %}"><span class="fas fa-plus"></span> Create Asset</a></li>
{% endif %}
</ul>
</li>
@@ -25,10 +25,10 @@
<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown"> Suppliers<b class="caret"></b></a>
<ul class="dropdown-menu">
<li><a href="{% url 'supplier_list' %}"><span class="glyphicon glyphicon-list"></span>
<li><a href="{% url 'supplier_list' %}"><span class="fas fa-list"></span>
List Suppliers</a></li>
{% if perms.assets.add_supplier %}
<li><a href="{% url 'supplier_create' %}"><span class="glyphicon glyphicon-plus"></span> Create Supplier</a></li>
<li><a href="{% url 'supplier_create' %}"><span class="fas fa-plus"></span> Create Supplier</a></li>
{% endif %}
</ul>
</li>

16
templates/base_rigs.html
View File

@@ -11,18 +11,18 @@
Rigboard
</a>
<div class="dropdown-menu" aria-labelledby="navbarDropdownRigboard">
<a class="dropdown-item" href="{% url 'rigboard' %}"><span class="glyphicon glyphicon-list"></span>
<a class="dropdown-item" href="{% url 'rigboard' %}"><span class="fas fa-list"></span>
Rigboard</a>
<a class="dropdown-item" href="{% url 'event_archive' %}"><span class="glyphicon glyphicon-book"></span>
<a class="dropdown-item" href="{% url 'event_archive' %}"><span class="fas fa-book"></span>
Archive</a>
<a class="dropdown-item" href="{% url 'web_calendar' %}"><span class="glyphicon glyphicon-calendar"></span>
<a class="dropdown-item" href="{% url 'web_calendar' %}"><span class="fas fa-calendar"></span>
Calendar</a>
{% if perms.RIGS.view_event %}
<a class="dropdown-item" href="{% url 'activity_table' %}"><span
class="glyphicon glyphicon-random"></span> Recent Changes</a>
class="fas fa-random"></span> Recent Changes</a>
{% endif %}
{% if perms.RIGS.add_event %}
<a class="dropdown-item" href="{% url 'event_create' %}"><span class="glyphicon glyphicon-plus"></span>
<a class="dropdown-item" href="{% url 'event_create' %}"><span class="fas fa-plus"></span>
New Event</a>
{% endif %}
</div>
@@ -35,10 +35,10 @@
</a>
<div class="dropdown-menu" aria-labelledby="navbarDropdownInvoices">
{% if perms.RIGS.add_invoice %}
<a class="dropdown-item" href="{% url 'invoice_waiting' %}"><span class="glyphicon glyphicon-briefcase text-danger"></span> Waiting</a>
<a class="dropdown-item" href="{% url 'invoice_waiting' %}"><span class="fas fa-briefcase text-danger"></span> Waiting</a>
{% endif %}
<a class="dropdown-item" href="{% url 'invoice_list' %}"><span class="glyphicon glyphicon-gbp text-warning"></span> Outstanding</a>
<a class="dropdown-item" href="{% url 'invoice_archive' %}"><span class="glyphicon glyphicon-book"></span> Archive</a>
<a class="dropdown-item" href="{% url 'invoice_list' %}"><span class="fas fa-gbp text-warning"></span> Outstanding</a>
<a class="dropdown-item" href="{% url 'invoice_archive' %}"><span class="fas fa-book"></span> Archive</a>
</div>
</li>
{% endif %}