Refactor buildsystem to NPM/Gulp, port to BS4 & rewrite RIGS tests accordingly... (#412)

* Start to seperate versioning into its own app * Start reworking invoice things * Reduced overall font size a touch * Improvements to generic lists * Tweak some colours to be a bit less OTT I need to work out if I can seperate background and primary colours like BS3 did * Improvements to event table mobile * First pass at mobile-ising the generic list * Item table fixes * Fixed fullcalendar print css not included * Asset list table improvements * Tweak asset list to be more in line with other lists * Versioning template improvements //TODO Rather than have seperate asset templates, convert 'id' into a template variable * Tweak versioning templates to allow ID overrides Asset specific templates begone. Still need to bring back the ID formatting for the Rigboard. * Asset form fixes * Use the right autocompleter.js... * Breakout (most) user stuff to separate module The model remains in RIGS for now, as it's pretty painful to move... * Python Format/import opt * Test Refactor Part 1 - Shuffle things around * Fix migrations TODO - need to ensure moved models are *moved* rather than deleted and recreated! * Start on new tests * Initial work on event create test reimpl * Init other tests, more rigs test faffery * Desaturate theme colors even more Much closer to BS3 * Fix event item adding Bit too heavy handed with the deduplication there Arona * Initial refactor of event item testing * Upgrade bootstrap-select * Updated bootstrap-select for BS4 * Initial port of duplicate testing Needs the latter half rewriting once we have an EventDetail POM * Refactor date validation test So close to killing test_functional.EventTest! * Deduplication of testing code * pep8 * Fix some tests And some things that were actually borked * FIX: Prevent setting access time after start time Cherry pick of d274ea4606. Will close #405. * Refactor calendar tests * FIX: Don't show asset buttons/history for basic users * Really ought to get a pre-commit hook for pep8... * Fully replace test_functional * Dedupe generic search logic * Fix the remaining tests * Ensure submit button is scrolled to in tests * Fix asset creation test + actually verify its results * Make CI use latest (stable) chromedriver rather than some ancient one Since Travis uses the latest stable chrome, should always match. Bash oneliner \o/ * Of course | is part of YAML syntax, of course... Maybe this works. * Update python version Trying to get CI to match my local environment as much as possible... * Minor test futzing * Well that wasn't clever of me * That was even less clever of me * Revert to old submit wait behaviour * What about if I did this * Try disabling chrome cache * Added screenshot recording of test failures * Fixed RIGS tests not being run * Fixed Pep8 - I promise I'll make a pre-commit hook sometime! * Very initial work at togglable darktheme. Dammit @alexdaniel654 just when I had my scope creep kinda under control. It'll be v. nice to have though...! * More dark theme wangling * Fix some asset template things * FIX: CI Locale Issues * Fix sample command * Initial work at integrating the risk assessment #136. No clever database structure as yet... * FIX: Don't set every boolean input to radios * Different approach to RA linking * Move text definitions to somewhere more authoratitive * FIX: Undo breakage causing autopep8 o.O * Expand detail template * Use correct view for RA history * Initial work at coercing activity feed into showing RAs Also shows Asset/Supplier on the homepage feed. * Refactor activity feed template logic Yay for removing arbitrary if/else chains! * Initial work on caching activity feed Server side that is. Ref #162. * Start RA list template * Refactor RA creation stuff, again * Add H&S Details to Event Detail View * Display venue notes in event detail Notes are no use if nobody reads them. Not sure on this one. * Add ability to filter event archive by status Closes #168. * Fix lingering naive time * Use locmem cache in sqlite environments Otherwise the tests just lock up totally. Should close #162 * Update dependencies Mirrors/supersedes 0e67da82e2 * Add global ctrl/meta-enter shortcut for form submission Wants rewriting for better efficiency, but hey, it works! * Update dependencies * Fix for a situation that should be impossible * Fix navbar alignment * FEAT: Improve 'omni'search - Partialised template - Added to assets header - Added ability to search assets/suppliers - Improved selection logic - Have it display current query * Move closemodal into PyRIGS * Fix tests for search improvements * Dark mode colour improvements * Fix table colors for dry hires * further darktheme fixes * Remove the dark header from light theme * Fix reload loops when CSS/JS is changed * Move dark theme SCSS to separate file, fix inactive pagination styling * Genercise detail pages * Testing something re notes I wonder if I can make that global, rather than per-template... * Dark theme palette shenanigans I just can't decide * Match darktheme palette to forum darktheme palette Why reinvent the wheel. * Make supplier detail use the generic template * Disable mobile event table PoC for now * Remove the defaults from the RA fields + make them required * More RA fixes * Fixes to revisions for RAs * Add bootstrap 4 test page * Bunch of dark mode fixes from test page * Do not use Django 'required' for radio selects As this requires them to be True, whereas we just need to require that an option be entered. * Properly fixed popover darktheme * Fixed search for events * Style fixes to asset list * Start RA 'mark review' feature * Add reviewing to revision history, fix RA editing not working Also actually commit all the files, that helps * Fix Power MIC being lost on RA edit Why it is subtly different to the Event Update behaviour? Who knows * Invalidate RA review if it is edited after review * Start work on event checklist * Add a button for creating and instantly voiding invoices Handy dandy for when you have loads of cancelled events, like say, a pandemic * Mooooore status chips, mooore * Initial shenanigans on storing my overly fancy EC form * Proof of concept for JSON parsing/storage \o/ * Add new line functionality for vehicles/drivers Might it have been easier to create 'dummy' models like with EventItems? Probably... * Alter rig_count to not include un-checked-in dry hires * Insert a divider between still-out dry hires and actually upcoming events on rigboard * Initial work on new checklist handling. No more JSON! * Versioning module now does magic Automatic creation of views/urls for anything registered with reversion, with a small amount of hackage to preserve legacy stuff. (and the DAMNED asset IDs!) I would never get distracted... * Cleanup * Event checklist crew works Mostly - its not happy with timezones * Medium event power stuff done, barring worst case stuff * Misc fixes * Validation of power reqs * Worst case points on checklist * Templating improvements to RA/EC stuff * Do event table color logic at python level * Audit template fixes * Restrict versioning to one level of depth for speed Also fixed the template for nested changes * Event properties internal/authorised always return a explicit boolean rather than sometimes None * Use template filter for notes * Fix list templates TODO: Sensible place to define the 'expected answer' stuff. * Fix cable table template * Rethink rigboard color logic again Also revert some broken stuff * Test fixes * Modify auth test so it doesn't try and test for external authorisations Cause that's not a thing * Why does this work Bloody overzealous autoformatter... * Formatting... * Initial work on RA tests * Pages/start of tests for EventChecklists * Much better coverage of H&S things * Cleanup & Squash migrations * Fix wrong variable name in settings.py * Fix broken invoice list template * Add revision history to invoices/payments. Also patches previously introduced reversion permissions hole. Supersedes and closes #337. * Various misc fixes * Fix for my fix * Curse youuuuu pep8 * Invoice template improvements * Minor fixes * More tweaks * More fixes * Major improvements/fixes to authorisation templates * Add ability to mark event checklists as Large Event This just disables the checks to allow the rest of it to be filled out for large events, though I expect paper forms may still be used... * Remove database ID from generic list * Put power threshold values in a collapse * Use template filter for consistent removal of 'None links' Plus cleaner template markup! More HTML-in-Python tho, which always feels a bit CSS-in-JS * Tweak asset list markup * Begin to change add buttons success -> primary Also change search primary -> info to avoid clash * Begin to improve event checklist on mobile * Asset detail template improvements * Fix #326 (again) * Fix errors being squashed * Fix rigboard validation tests * Initial work on BS4 button templatetag Newfeatureitis strikes again * Allow multiple event checklists per event TODO: Status chip now needs rethinking * Minor event detail fixes * Fix tests * Rework button tag * Mobile fixes for search * Fix event checklist on mobile * Redo light theme palette * Switch rigboard new button to primary * Kill off excess whitespace on rigboard * Rigboard Timing display tweaks * Fix tests * Properly handle eventauthorisations in new versioning It's not great, not terrible... * Prevent creating duplicate revisions on event Potential fix for #322 - I couldn't reproduce even before this change... * Template improvements * Minor test fixes * Revert "Prevent creating duplicate revisions on event" Apparently it was too strong at preventing dupes... This reverts commit cce0ad0f9f. # Conflicts: # RIGS/models.py * Better approach to generic list templates + other deduplication * Also apply better approach to generic detail pages * One of these days I'll remember to test BEFORE pushing... * And now the same for generic forms * Display tick/cross rather than true/false in boolean version diffs * Upgrade dependencies * Fixes fixes fixes * Fix dependency hell Probably * Correct handling of spaces in paperwork filenames Also normalises display of Invoice IDs. Partial fix for #391. * Buggerit millennium hand and shrimp Knew I was gonna forget to fix the tests * FIX: Set duplicated event status to provisional Closes #398. Flip flop. Flip flop. * Update polyfill for datetime-local Bloody Firefox. We love to hate you. Proper CSS of the fill to come, SoonTM. Closes #391 * Curses! * Minor typo fixes * Initial pass at soop-consult confirmation screen for RAs * Fix migration * Make venue/date editable on EC For multi venue, multi day events Defaults to date and venue set on the event. Also made power MIC default to that set in RA * Clearer logic for RA inverted fields * (probably) fix tests * Give keyholders supplier edit perm * Generic list only displays edit button if user has perm * Same perm check for generic details * H&S Details takes up free space on non-internal events * Remove flash of content when loading new rig page * First pass at clearer display of asset list filters * Fix tests / default to headless tests (fingers crossed) * Fix autocompleter.js to properly disable edit links again * Move status color logic back to template Cause that somehow makes it work better?? * Display note icon on event detail page * Fix caching * Put rounded corners back where they belong * Remove lingering use of 'page-header' BS removed that style * More search and replace for BS changes Thought I'd got them all. Clearly not! * Remove enforced linebreak on status chips * Fix horizontal-ness on some forms * Remove animation on prefers-reduced-motion/low referesh rate devices Also normalises handling of asset list cable table & improves its use of space on large devices * Make version changes badges more readable * First pass at making the calendar less crap * Fix event table success logic Yay for copy paste fails >.> * Use borders rather than block colors for coloured tables under darktheme * First pass at porting calendar from FC V3 to V5 Two major versions and all they did was rename a bunch of names...TWICE. * Rework version name method to avoid blank names on eventchecklist vehicles/crew * Fix cable test * Made radio button focus much more obvious on dark theme * Implement Jerb's wording changes * Fix one test, break another... * Fix recent change stream list mutation issue * FIX: Do not naively cache event table Not that easy, it turns out. Duh. * FEAT: Implement #413 show associated assets on cable type detail pg Closes #413 * Allow H&S for non-events * Update emergency contact number * Improvements to profile detail page * Implement some of Jonny's suggested changes TODO: - Define event size at RA time, pass through to EC - Have later power questions be context dependent * Test fixes * Add space for power/rigging plans to be linked to RAs * Start move of event size logic to RA from Ec * Javascript required shenanigans for RA power * More moving of event size logic * Fixing tests for new logic etc * Why does this work Indeed, it may not * FIX: Stupid typo in versioning.py * Further minor fixes to versioning * Add icons to H&S menu items * Should fix calendar breaking in production * Small alignment fix in asset list * Squash migrations Co-authored-by: Matthew Smith <psyms13@nottingham.ac.uk>
2026-03-03 10:38:23 +00:00 · 2021-01-23 22:22:37 +00:00
parent 099a184f2e
commit 3414204209
336 changed files with 59425 additions and 33101 deletions
--- a/assets/admin.py
+++ b/assets/admin.py
@@ -1,4 +1,5 @@
 from django.contrib import admin
+from reversion.admin import VersionAdmin
 from assets import models as assets


@@ -15,13 +16,13 @@ class AssetStatusAdmin(admin.ModelAdmin):


@admin.register(assets.Supplier)
-class SupplierAdmin(admin.ModelAdmin):
+class SupplierAdmin(VersionAdmin):
    list_display = ['id', 'name']
    ordering = ['id']


@admin.register(assets.Asset)
-class AssetAdmin(admin.ModelAdmin):
+class AssetAdmin(VersionAdmin):
    list_display = ['id', 'asset_id', 'description', 'category', 'status']
    list_filter = ['is_cable', 'category', 'status']
    search_fields = ['id', 'asset_id', 'description']
--- a/assets/forms.py
+++ b/assets/forms.py
@@ -29,7 +29,7 @@ class AssetAuditForm(AssetForm):


 class AssetSearchForm(forms.Form):
-    query = forms.CharField(required=False)
+    q = forms.CharField(required=False)
    category = forms.ModelMultipleChoiceField(models.AssetCategory.objects.all(), required=False)
    status = forms.ModelMultipleChoiceField(models.AssetStatus.objects.all(), required=False)

@@ -40,10 +40,6 @@ class SupplierForm(forms.ModelForm):
        fields = '__all__'


-class SupplierSearchForm(forms.Form):
-    query = forms.CharField(required=False)
-
-
 class CableTypeForm(forms.ModelForm):
    class Meta:
        model = models.CableType
--- a/assets/migrations/0018_auto_20200415_1940.py
+++ b/assets/migrations/0018_auto_20200415_1940.py
@@ -0,0 +1,33 @@
+# Generated by Django 3.0.3 on 2020-04-15 18:40
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('assets', '0017_add_audit'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='supplier',
+            name='address',
+            field=models.TextField(blank=True, null=True),
+        ),
+        migrations.AddField(
+            model_name='supplier',
+            name='email',
+            field=models.EmailField(blank=True, max_length=254, null=True),
+        ),
+        migrations.AddField(
+            model_name='supplier',
+            name='notes',
+            field=models.TextField(blank=True, null=True),
+        ),
+        migrations.AddField(
+            model_name='supplier',
+            name='phone',
+            field=models.CharField(blank=True, max_length=15, null=True),
+        ),
+    ]
--- a/assets/models.py
+++ b/assets/models.py
@@ -45,6 +45,11 @@ class Supplier(models.Model, RevisionMixin):
        ordering = ['name']

    name = models.CharField(max_length=80)
+    phone = models.CharField(max_length=15, blank=True, null=True)
+    email = models.EmailField(blank=True, null=True)
+    address = models.TextField(blank=True, null=True)
+
+    notes = models.TextField(blank=True, null=True)

    def get_absolute_url(self):
        return reverse('supplier_list')
@@ -121,6 +126,8 @@ class Asset(models.Model, RevisionMixin):
    asset_id_prefix = models.CharField(max_length=8, default="")
    asset_id_number = models.IntegerField(default=1)

+    reversion_perm = 'assets.asset_finance'
+
    def get_available_asset_id(wanted_prefix=""):
        sql = """
        SELECT a.asset_id_number+1
@@ -143,7 +150,7 @@ class Asset(models.Model, RevisionMixin):

    def __str__(self):
        out = str(self.asset_id) + ' - ' + self.description
-        if self.is_cable:
+        if self.is_cable and self.cable_type is not None:
            out += '{} - {}m - {}'.format(self.cable_type.plug, self.length, self.cable_type.socket)
        return out

@@ -171,18 +178,18 @@ class Asset(models.Model, RevisionMixin):
                errdict["csa"] = ["The CSA of a cable must be more than 0"]
            if not self.cable_type:
                errdict["cable_type"] = ["A cable must have a type"]
-            # if not self.circuits or self.circuits <= 0:
-            #     errdict["circuits"] = ["There must be at least one circuit in a cable"]
-            # if not self.cores or self.cores <= 0:
-            #    errdict["cores"] = ["There must be at least one core in a cable"]
-            # if self.socket is None:
-            #     errdict["socket"] = ["A cable must have a socket"]
-            # if self.plug is None:
-            #    errdict["plug"] = ["A cable must have a plug"]

        if errdict != {}:  # If there was an error when validation
            raise ValidationError(errdict)

+    @property
+    def activity_feed_string(self):
+        return str(self)
+
+    @property
+    def display_id(self):
+        return str(self.asset_id)
+

@receiver(pre_save, sender=Asset)
 def pre_save_asset(sender, instance, **kwargs):
--- a/assets/static/js/csrf.js
+++ b/assets/static/js/csrf.js
@@ -1,23 +0,0 @@
-$.ajaxSetup({
-     beforeSend: function(xhr, settings) {
-         function getCookie(name) {
-             var cookieValue = null;
-             if (document.cookie && document.cookie != '') {
-                 var cookies = document.cookie.split(';');
-                 for (var i = 0; i < cookies.length; i++) {
-                     var cookie = jQuery.trim(cookies[i]);
-                     // Does this cookie string begin with the name we want?
-                     if (cookie.substring(0, name.length + 1) == (name + '=')) {
-                         cookieValue = decodeURIComponent(cookie.substring(name.length + 1));
-                         break;
-                     }
-                 }
-             }
-             return cookieValue;
-         }
-         if (!(/^http:.*/.test(settings.url) || /^https:.*/.test(settings.url))) {
-             // Only send the token to relative URLs i.e. locally.
-             xhr.setRequestHeader("X-CSRFToken", getCookie('csrftoken'));
-         }
-     }
-});
--- a/assets/templates/asset_activity_table.html
+++ b/assets/templates/asset_activity_table.html
@@ -1,92 +0,0 @@
-{% extends request.is_ajax|yesno:"base_ajax.html,base_assets.html" %}
-{% load static %}
-{% load paginator from filters %}
-{% load to_class_name from filters %}
-
-{% block title %}Asset Activity Stream{% endblock %}
-
-{# TODO: Find a way to reduce code duplication...can't just include the content because of the IDs... #}
-
-{% block js %}
-    <script src="{% static "js/tooltip.js" %}"></script>
-    <script src="{% static "js/popover.js" %}"></script>
-    <script src="{% static "js/moment.min.js" %}"></script>
-    <script>
-    	$(function () {
-		  $('[data-toggle="popover"]').popover().click(function(){
-        if($(this).attr('href')){
-          window.location.href = $(this).attr('href');
-        }
-      });
-
-          // This keeps timeago values correct, but uses an insane amount of resources
-          // $(function () {
-          //     setInterval(function() {
-          //         $('.date').each(function (index, dateElem) {
-          //           var $dateElem = $(dateElem);
-          //           var formatted = moment($dateElem.attr('data-date')).fromNow();
-          //           $dateElem.text(formatted);
-          //          })
-          //        });
-          //     }, 10000);
-
-
-            $('.date').each(function (index, dateElem) {
-                var $dateElem = $(dateElem);
-                var formatted = moment($dateElem.attr('data-date')).fromNow();
-                $dateElem.text(formatted);
-               });
-
-
-		})
-
-    </script>
-{% endblock %}
-
-{% block content %}
-<div class="col-sm-12">
-        <div class="row">
-            <div class="col-sm-12">
-                <h3>Asset Activity Stream</h3>
-            </div>
-            <div class="text-right col-sm-12">{% paginator %}</div>
-        </div>
-        <div class="table-responsive">
-
-        	<table class="table table-striped">
-                <thead>
-                <tr>
-                    <td>Date</td>
-                    <td>Object</td>
-                    <td>Version ID</td>
-                    <td>User</td>
-                    <td>Changes</td>
-                    <td>Comment</td>
-                </tr>
-                </thead>
-                <tbody>
-                	{% for version in object_list %}
-
-                            <tr>
-                                <td>{{ version.revision.date_created }}</td>
-                                <td><a href="{{ version.changes.new.get_absolute_url }}">{{version.changes.new|to_class_name}} {{ version.changes.new.asset_id|default:version.changes.new.pk }}</a></td>
-                           		<td>{{ version.pk }}|{{ version.revision.pk }}</td>
-                                <td>{{ version.revision.user.name }}</td>
-                                <td>
-                                  {% if version.changes.old == None %}
-                                    {{version.changes.new|to_class_name}} Created
-                                  {% else %}
-                                    {% include 'RIGS/version_changes.html' %}
-                                  {% endif %}                        </td>
-                                  <td>{{ version.changes.revision.comment }}</td>
-                            </tr>
-
-        			{% endfor %}
-
-                </tbody>
-            </table>
-
-        </div>
-        <div class="align-right">{% paginator %}</div>
-    </div>
-{% endblock %}
--- a/assets/templates/asset_audit.html
+++ b/assets/templates/asset_audit.html
@@ -11,11 +11,8 @@
        }
        $('#id_date_acquired').val([date.getFullYear(), ('0' + (date.getMonth()+1)).slice(-2), ('0' + date.getDate()).slice(-2)].join('-'));
  }
-  function setLength(length) {
-      $('#id_length').val(length);
-  }
-  function setCSA(CSA) {
-      $('#id_csa').val(CSA);
+  function setFieldValue(ID, CSA) {
+      $('#' + String(ID)).val(CSA);
  }
  function checkIfCableHidden() {
    if (document.getElementById("id_is_cable").checked) {
@@ -26,109 +23,67 @@
  }
  checkIfCableHidden();
 </script>
-<form class="form-horizontal" method="POST" id="asset_audit_form" action="{{ form.action|default:request.path }}">
+<form method="POST" id="asset_audit_form" action="{{ form.action|default:request.path }}">
  {% include 'form_errors.html' %}
  {% csrf_token %}
  <input type="hidden" name="id" value="{{ object.id|default:0 }}" hidden=true>
-  <div class="form-group">
-    <label for="{{ form.asset_id.id_for_label }}" class="col-sm-2 control-label">Asset ID</label>
-    <div class="col-sm-10">
-      {% render_field form.asset_id|add_class:'form-control' value=object.asset_idz %}
-    </div>
+  <div class="form-group form-row">
+    {% include 'partials/form_field.html' with field=form.asset_id col="col-6" %}
  </div>
-  <div class="form-group">
-    <label for="{{ form.description.id_for_label }}" class="col-sm-2 control-label">Description</label>
-    <div class="col-sm-10">
-      {% render_field form.description|add_class:'form-control' value=object.description %}
-    </div>
+  <div class="form-group form-row">
+    {% include 'partials/form_field.html' with field=form.description col="col-6" %}
  </div>
-  <div class="form-group">
-    <label for="{{ form.category.id_for_label }}" class="col-sm-2 control-label">Category</label>
-    <div class="col-sm-10">
-      {% render_field form.category|add_class:'form-control'%}
-    </div>
+  <div class="form-group form-row">
+    {% include 'partials/form_field.html' with field=form.category col="col-6" %}
  </div>
-  <div class="form-group">
-    <label for="{{ form.status.id_for_label }}" class="col-sm-2 control-label">Status</label>
-    <div class="col-sm-10">
-      {% render_field form.status|add_class:'form-control'%}
-    </div>
+  <div class="form-group form-row">
+    {% include 'partials/form_field.html' with field=form.status col="col-6" %}
  </div>
-  <div class="form-group">
-    <label for="{{ form.serial_number.id_for_label }}" class="col-sm-2 control-label">Serial Number</label>
-    <div class="col-sm-10">
-      {% render_field form.serial_number|add_class:'form-control' value=object.serial_number %}
-    </div>
+  <div class="form-group form-row">
+    {% include 'partials/form_field.html' with field=form.serial_number col="col-6" %}
  </div>
-  <div class="form-group">
-    <label for="{{ form.date_acquired.id_for_label }}" class="col-sm-2 control-label">Date Acquired</label>
-    <div class="col-sm-6">
-      {% render_field form.date_acquired|add_class:'form-control' value=object.date_acquired %}
-    </div>
+  <div class="form-group form-row">
+    {% include 'partials/form_field.html' with field=form.date_acquired col="col-6" %}
    <div class="col-sm-4">
-        <btn class="btn btn-default" onclick="setAcquired(true);" tabindex="-1">Today</btn>
-        <btn class="btn btn-default" onclick="setAcquired(false);" tabindex="-1">Unknown</btn>
+        <btn class="btn btn-info" onclick="setAcquired(true);" tabindex="-1">Today</btn>
+        <btn class="btn btn-warning" onclick="setAcquired(false);" tabindex="-1">Unknown</btn>
    </div>
  </div>
-  <div class="form-group">
-    <label for="{{ form.date_sold.id_for_label }}" class="col-sm-2 control-label">Date Sold</label>
-    <div class="col-sm-6">
-      {% render_field form.date_sold|add_class:'form-control' value=object.date_sold %}
-    </div>
+  <div class="form-group form-row">
+    {% include 'partials/form_field.html' with field=form.date_sold col="col-6" %}
  </div>
-  <div class="form-group">
-      <label for="{{ form.salvage_value.id_for_label }}" class="col-sm-2 control-label">Salvage Value</label>
-      <div class="col-sm-10">
-          <div class="input-group">
-            <span class="input-group-addon">£</span>
-            {% render_field form.salvage_value|add_class:'form-control' value=object.salvage_value %}
-          </div>
-      </div>
+  <div class="form-group form-row">
+      {% include 'partials/form_field.html' with field=form.salvage_value col="col-6" prepend="£" %}
  </div>
  <hr>
-  <div class="form-group">
-    <label for="{{ form.is_cable.id_for_label }}" class="col-sm-2 control-label">Cable?</label>
-    <div class="col-sm-10">
+  <div class="form-group form-row">
+    <label for="{{ form.is_cable.id_for_label }}" class="col-2">Cable?</label>
+    <div class="col-6">
      {% render_field form.is_cable|attr:'onchange=checkIfCableHidden()' %}
    </div>
  </div>
  <div id="cable-table">
-    <div class="form-group">
-      <label for="{{ form.cable_type.id_for_label }}" class="col-sm-2 control-label">Cable Type</label>
-      <div class="col-sm-10">
-        {% render_field form.cable_type|add_class:'form-control' %}
+    <div class="form-group form-row">
+      {% include 'partials/form_field.html' with field=form.cable_type col="col-6" %}
+    </div>
+    <div class="form-group form-row">
+      {% include 'partials/form_field.html' with field=form.length append=form.length.help_text col="col-6" %}
+      <div class="col-4">
+        <btn class="btn btn-danger" onclick="setFieldValue('{{ form.length.id_for_label }}','5');" tabindex="-1">5{{ form.length.help_text }}</btn>
+        <btn class="btn btn-success" onclick="setFieldValue('{{ form.length.id_for_label }}','10');" tabindex="-1">10{{ form.length.help_text }}</btn>
+        <btn class="btn btn-info" onclick="setFieldValue('{{ form.length.id_for_label }}','20');" tabindex="-1">20{{ form.length.help_text }}</btn>
      </div>
    </div>
-    <div class="form-group">
-      <label for="{{ form.length.id_for_label }}" class="col-sm-2 control-label">Length</label>
-      <div class="col-sm-6">
-        <div class="input-group">
-          {% render_field form.length|add_class:'form-control' %}
-          <span class="input-group-addon">{{ form.length.help_text }}</span>
-        </div>
-      </div>
-      <div class="col-sm-4">
-        <btn class="btn btn-danger" onclick="setLength('5');" tabindex="-1">5{{ form.length.help_text }}</btn>
-        <btn class="btn btn-success" onclick="setLength('10');" tabindex="-1">10{{ form.length.help_text }}</btn>
-        <btn class="btn btn-info" onclick="setLength('20');" tabindex="-1">20{{ form.length.help_text }}</btn>
-      </div>
-    </div>
-    <div class="form-group">
-      <label for="{{ form.csa.id_for_label }}" class="col-sm-2 control-label">Cross Sectional Area</label>
-      <div class="col-sm-6">
-        <div class="input-group">
-          {% render_field form.csa|add_class:'form-control' value=object.csa %}
-          <span class="input-group-addon">{{ form.csa.help_text }}</span>
-        </div>
-      </div>
-      <div class="col-sm-4">
-        <btn class="btn btn-default" onclick="setCSA('1.5');" tabindex="-1">1.5{{ form.csa.help_text }}</btn>
-        <btn class="btn btn-default" onclick="setCSA('2.5');" tabindex="-1">2.5{{ form.csa.help_text }}</btn>
+    <div class="form-group form-row">
+      {% include 'partials/form_field.html' with field=form.csa append=form.csa.help_text title='CSA' col="col-6" %}
+      <div class="col-4">
+        <btn class="btn btn-secondary" onclick="setFieldValue('{{ form.csa.id_for_label }}', '1.5');" tabindex="-1">1.5{{ form.csa.help_text }}</btn>
+        <btn class="btn btn-secondary" onclick="setFieldValue('{{ form.csa.id_for_label }}', '2.5');" tabindex="-1">2.5{{ form.csa.help_text }}</btn>
      </div>
    </div>
  </div>
  {% if not request.is_ajax %}
-    <div class="form-group pull-right">
+    <div class="form-group form-row pull-right">
        <button class="btn btn-success" type="submit" form="asset_audit_form" id="id_mark_audited">Mark Audited</button>
    </div>
  {% endif %}
@@ -136,7 +91,7 @@
 {% endblock %}

 {% block footer %}
-<div class="form-group">
+<div class="form-group form-row">
  <button class="btn btn-success pull-right" type="submit" form="asset_audit_form" onclick="onAuditClick({{form.asset_id.value}});" id="id_mark_audited">Mark Audited</button>
 </div>
 {% endblock %}
--- a/assets/templates/asset_audit_list.html
+++ b/assets/templates/asset_audit_list.html
@@ -1,5 +1,4 @@
 {% extends 'base_assets.html' %}
-{% block title %}Asset Audit List{% endblock %}
 {% load static %}
 {% load paginator from filters %}
 {% load widget_tweaks %}
@@ -17,7 +16,7 @@
        $('#searchButton').click(function (e) {
             e.preventDefault();
             var url = "{% url 'asset_audit' None %}";
-             var id = $("#{{form.query.id_for_label}}").val();
+             var id = $("#{{form.q.id_for_label}}").val();
             url = url.replace('None', id);
             $.ajax({
                url: url,
@@ -45,39 +44,26 @@
 {% endblock %}

 {% block content %}
-<div class="page-header">
-  <h1 class="text-center">Asset Audit List</h1>
-</div>
-
 <div id="error404" class="alert alert-danger alert-dismissable" hidden=true>
 	<button type="button" class="close" data-dismiss="alert" aria-hidden="true">&times;</button>
 	<span>Asset with that ID does not exist!</span>
 </div>

-<h3>Audit Asset:</h3>
-<form id="asset-search-form" class="form-horizontal" method="POST">
-  <div class="input-group input-group-lg" style="width: auto;">
-    {% render_field form.query|add_class:'form-control' placeholder='Enter Asset ID' autofocus="true" %}
-    <label for="query" class="sr-only">Asset ID:</label>
-    <span class="input-group-btn"><a id="searchButton" class="btn btn-default" class="submit" type="submit">Search</a></span>
+<form id="asset-search-form" class="mb-3" method="POST">
+  <div class="form-group form-row">
+      <h3>Audit Asset:</h3>
+      <div class="input-group input-group-lg">
+        {% render_field form.q|add_class:'form-control' placeholder='Enter Asset ID' autofocus="true" %}
+        <div class="input-group-append">
+            <label for="q" class="sr-only">Asset ID:</label>
+            <a id="searchButton" class="btn btn-primary" class="submit" type="submit">Search</a>
+        </div>
+      </div>
  </div>
 </form>

 <h3>Assets Requiring Audit:</h3>
-<table class="table">
-  <thead>
-    <tr>
-      <th>Asset ID</th>
-      <th>Description</th>
-      <th>Category</th>
-      <th>Status</th>
-      <th class="hidden-xs"></th>
-    </tr>
-  </thead>
-  <tbody id="asset_table_body">
-    {% include 'partials/asset_list_table_body.html' with audit="true" %}
-  </tbody>
-</table>
+{% include 'partials/asset_list_table.html' with audit="true" %}

 {% if is_paginated %}
 <div class="text-center">
--- a/assets/templates/asset_create.html
+++ b/assets/templates/asset_create.html
@@ -1,60 +0,0 @@
-{% extends 'base_assets.html' %}
-{% load widget_tweaks %}
-{% block title %}Asset {{ object.asset_id }}{% endblock %}
-
-{% block content %}
-
-<div class="page-header">
-  <h1>
-      {% if duplicate %}
-          Duplication of Asset: {{ previous_asset_id }}
-      {% else %}
-          Create Asset
-      {% endif %}
-  </h1>
-</div>
-{% if duplicate %}
-<form method="post" id="asset_update_form" action="{% url 'asset_duplicate' pk=previous_asset_id%}">
-  {% else %}
-  <form method="post" id="asset_update_form" action="{% url 'asset_create'%}">
-    {% endif %}
-    {% include 'form_errors.html' %}
-    {% csrf_token %}
-    <input type="hidden" name="id" value="{{ object.id|default:0 }}" hidden=true>
-    <div class="row">
-      <div class="col-sm-12">
-        {% include 'partials/asset_form.html' %}
-      </div>
-    </div>
-    <div class="row">
-      <div class="col-md-6">
-        {% include 'partials/purchasedetails_form.html' %}
-      </div>
-      <div class="col-md-6" hidden="true" id="cable-table">
-        {% include 'partials/cable_form.html' %}
-      </div>
-      <div class="col-md-4">
-        {% include 'partials/parent_form.html' %}
-      </div>
-    </div>
-    <div class="row">
-      <div class="col-md-12">
-        {% include 'partials/asset_buttons.html' %}
-      </div>
-    </div>
-  </form>
-
-  {% endblock %}
-
-  {% block js%}
-  <script>
-    function checkIfCableHidden() {
-      if (document.getElementById("id_is_cable").checked) {
-        document.getElementById("cable-table").hidden = false;
-      } else {
-        document.getElementById("cable-table").hidden = true;
-      }
-    }
-    checkIfCableHidden();
-  </script>
-  {%endblock%}
--- a/assets/templates/asset_detail.html
+++ b/assets/templates/asset_detail.html
@@ -0,0 +1,32 @@
+{% extends 'base_assets.html' %}
+{% load widget_tweaks %}
+
+{% block content %}
+<div class="row">
+    <div class="col-md-6 mb-3">
+    {% include 'partials/asset_detail_form.html' %}
+    </div>
+    {% if perms.assets.asset_finance %}
+    <div class="col-md-6 mb-3">
+      {% include 'partials/purchasedetails_form.html' %}
+    </div>
+    {% endif %}
+    <div class="col-md-4 mb-3" {% if not object.is_cable %}hidden="true"{% endif %} id="cable-table">
+      {% include 'partials/cable_form.html' %}
+    </div>
+    <div class="col-md-4 mb-3">
+      {% include 'partials/parent_form.html' %}
+    </div>
+    <div class="col-md-4 mb-3">
+      {% include 'partials/audit_details.html' %}
+    </div>
+</div>
+{% if perms.assets.view_asset %}
+<div class="row justify-content-end">
+{% include 'partials/asset_buttons.html' %}
+</div>
+<div class="row justify-content-end">
+{% include 'partials/last_edited.html' with target="asset_history" id=object.asset_id %}
+</div>
+{% endif %}
+{% endblock %}
--- a/assets/templates/asset_embed.html
+++ b/assets/templates/asset_embed.html
@@ -22,6 +22,7 @@
            {{ object.status }}
        </span>
        </h4>
+        <dl>
        {% if object.serial_number %}
            <dt>Serial Number: </dt>
            <dd>{{ object.serial_number }}</dd>
@@ -30,7 +31,7 @@
            <dt>Comments: </dt>
            <dd class="dont-break-out">{{ object.comments|linebreaksbr }}<dd>
        {% endif %}
-
+        </dl>
        </table>
    </div>
 </div>
--- a/assets/templates/asset_form.html
+++ b/assets/templates/asset_form.html
@@ -0,0 +1,106 @@
+{% extends 'base_assets.html' %}
+{% load widget_tweaks %}
+{% load static %}
+
+{% block css %}
+    <link rel="stylesheet" href="{% static 'css/bootstrap-select.css' %}"/>
+    <link rel="stylesheet" href="{% static 'css/ajax-bootstrap-select.css' %}"/>
+{% endblock %}
+
+{% block js %}
+    <script src="{% static 'js/bootstrap-select.js' %}"></script>
+    <script src="{% static 'js/ajax-bootstrap-select.js' %}"></script>
+    <script src="{% static 'js/autocompleter.js' %}"></script>
+    <script>
+        const matches = window.matchMedia("(prefers-reduced-motion: reduce)").matches || window.matchMedia("(update: slow)").matches;
+        dur = matches ? 0 : 500;
+        function checkIfCableHidden() {
+          if ($("#id_is_cable").prop('checked')) {
+            $("#cable-table").slideDown(dur);
+          } else {
+            $("#cable-table").slideUp(dur);
+          }
+        }
+        checkIfCableHidden();
+    </script>
+    <script>
+    $('#parent_id')
+        .selectpicker({
+            liveSearch: true
+        })
+        .ajaxSelectPicker({
+            ajax: {
+                url: '{% url 'asset_search_json' %}',
+                type: "GET",
+                data: function () {
+                    var params = {
+                        {% verbatim %}query: '{{{q}}}'{% endverbatim  %}
+                    };
+                    return params;
+                }
+            },
+            locale: {
+                emptyTitle: 'Search for item...'
+            },
+            preprocessData: function(data){
+                var assets = [];
+                if(data.length){
+                    var len = data.length;
+                    for(var i = 0; i < len; i++){
+                        var curr = data[i];
+                        assets.push(
+                            {
+                                'value': curr.id,
+                                'text': curr.label,
+                                'disabled': false
+                            }
+                        );
+                    }
+                    assets.push(
+                    {
+                        'value': null,
+                        'text': "No parent"
+                    });
+                }
+
+                return assets;
+            },
+            preserveSelected: false
+        });
+    </script>
+{% endblock %}
+
+{% block content %}
+{% if duplicate %}
+    <form method="POST" id="asset_update_form" action="{% url 'asset_duplicate' pk=previous_asset_id %}">
+{% elif edit %}
+    <form method="POST" id="asset_update_form" action="{% url 'asset_update' pk=object.asset_id %}">
+{% else %}
+    <form method="POST" id="asset_update_form" action="{% url 'asset_create' %}">
+{% endif %}
+        {% include 'form_errors.html' %}
+        {% csrf_token %}
+        <input type="hidden" name="id" value="{{ object.id|default:0 }}" hidden=true>
+        <div class="row pt-2">
+          <div class="col-sm-12">
+            {% include 'partials/asset_detail_form.html' %}
+          </div>
+        </div>
+        <div class="row pt-2">
+          <div class="col-12 col-sm">
+            {% include 'partials/purchasedetails_form.html' %}
+          </div>
+          <div class="col-12 col-sm-6 col-md-4" id="cable-table">
+            {% include 'partials/cable_form.html' %}
+          </div>
+          <div class="col-12 col-md-4">
+            {% include 'partials/parent_form.html' %}
+          </div>
+        </div>
+        <div class="row">
+          <div class="col-12">
+            {% include 'partials/asset_buttons.html' %}
+          </div>
+        </div>
+    </form>
+{% endblock %}
--- a/assets/templates/asset_list.html
+++ b/assets/templates/asset_list.html
@@ -1,65 +1,101 @@
 {% extends 'base_assets.html' %}
-{% block title %}Asset List{% endblock %}
 {% load paginator from filters %}
+{% load button from filters %}
 {% load widget_tweaks %}
-
-{% block content %}
-
-<div class="page-header">
-  <h1 class="text-center">Asset List</h1>
-</div>
-
-<form id="asset-search-form" method="get" class="form-inline pull-right">
-  <div class="input-group pull-right" style="width: auto;">
-    {% render_field form.query|add_class:'form-control' placeholder='Search by Asset ID/Desc/Serial' style="width: 250px"%}
-    <label for="query" class="sr-only">Asset ID/Description/Serial Number:</label>
-    <span class="input-group-btn"><button type="submit" class="btn btn-default">Search</button></span>
-  </div>
-  <br>
-  <div style="margin-top: 1em;" class="pull-right">
-      <div id="category-group" class="form-group">
-        <label for="category" class="sr-only">Category</label>
-        {% render_field form.category|attr:'multiple'|add_class:'form-control selectpicker' data-none-selected-text="Categories" data-header="Categories" data-actions-box="true" %}
-      </div>
-      <div id="status-group" class="form-group">
-        <label for="status" class="sr-only">Status</label>
-        {% render_field form.status|attr:'multiple'|add_class:'form-control selectpicker' data-none-selected-text="Statuses" data-header="Statuses" data-actions-box="true" %}
-      </div>
-      <!---TODO: Auto filter whenever an option is selected, instead of using a button -->
-      <button id="filter-submit" type="submit" class="btn btn-default">Filter</button>
-    </div>
-</form>
-
-<table class="table">
-  <thead>
-    <tr>
-      <th>Asset ID</th>
-      <th>Description</th>
-      <th>Category</th>
-      <th>Status</th>
-      <th class="hidden-xs">Quick Links</th>
-    </tr>
-  </thead>
-  <tbody id="asset_table_body">
-    {% include 'partials/asset_list_table_body.html' %}
-  </tbody>
-</table>
-
-{% if is_paginated %}
-<div class="text-center">
-  {% paginator %}
-</div>
-{% endif %}
-
-{% endblock %}
-
 {% load static %}
+
 {% block css %}
-    <link rel="stylesheet" href="{% static "css/bootstrap-select.min.css" %}"/>
-    <link rel="stylesheet" href="{% static "css/ajax-bootstrap-select.css" %}"/>
+    <link rel="stylesheet" href="{% static 'css/bootstrap-select.css' %}"/>
+    <link rel="stylesheet" href="{% static 'css/ajax-bootstrap-select.css' %}"/>
 {% endblock %}

 {% block preload_js %}
-    <script src="{% static "js/bootstrap-select.js" %}"></script>
-    <script src="{% static "js/ajax-bootstrap-select.js" %}"></script>
+    <script src="{% static 'js/bootstrap-select.js' %}"></script>
+    <script src="{% static 'js/ajax-bootstrap-select.js' %}"></script>
+{% endblock %}
+
+{% block js %}
+    <script>
+        //Get querystring value
+        function getParameterByName(name) {
+            name = name.replace(/[\[]/, "\\[").replace(/[\]]/, "\\]");
+            var regex = new RegExp("[\\?&]" + name + "=([^&#]*)"),
+            results = regex.exec(location.search);
+            return results === null ? "" : decodeURIComponent(results[1].replace(/\+/g, " "));
+        }
+        //Function used to remove querystring
+        function removeQString(key) {
+	        var urlValue=document.location.href;
+
+	        //Get query string value
+	        var searchUrl=location.search;
+
+	        if(key!="") {
+		        oldValue = getParameterByName(key);
+		        removeVal=key+"="+oldValue;
+		        if(searchUrl.indexOf('?'+removeVal+'&')!= "-1") {
+			        urlValue=urlValue.replace('?'+removeVal+'&','?');
+		        }
+		        else if(searchUrl.indexOf('&'+removeVal+'&')!= "-1") {
+			        urlValue=urlValue.replace('&'+removeVal+'&','&');
+		        }
+		        else if(searchUrl.indexOf('?'+removeVal)!= "-1") {
+			        urlValue=urlValue.replace('?'+removeVal,'');
+		        }
+		        else if(searchUrl.indexOf('&'+removeVal)!= "-1") {
+			        urlValue=urlValue.replace('&'+removeVal,'');
+		        }
+	        }
+	        else {
+		        var searchUrl=location.search;
+		        urlValue=urlValue.replace(searchUrl,'');
+	        }
+	        history.pushState({state:1, rand: Math.random()}, '', urlValue);
+            window.location.reload(true);
+        }
+    </script>
+{% endblock %}
+
+{% block content %}
+<div class="row">
+    <div class="col px-0">
+        <form id="asset-search-form" method="GET" class="form-inline justify-content-end">
+              <div class="input-group px-1 mb-2 mb-sm-0 flex-nowrap">
+                {% render_field form.q|add_class:'form-control' placeholder='Enter Asset ID/Desc/Serial' %}
+                <label for="q" class="sr-only">Asset ID/Description/Serial Number:</label>
+                <span class="input-group-append">{% button 'search' id="id_search" %}</span>
+              </div>
+              <div id="category-group" class="form-group px-1" style="margin-bottom: 0;">
+                <label for="category" class="sr-only">Category</label>
+                {% render_field form.category|attr:'multiple'|add_class:'form-control custom-select selectpicker col-sm' data-none-selected-text="Categories" data-header="Categories" data-actions-box="true" %}
+              </div>
+              <div id="status-group" class="form-group px-1" style="margin-bottom: 0;">
+                <label for="status" class="sr-only">Status</label>
+                {% render_field form.status|attr:'multiple'|add_class:'form-control custom-select selectpicker col-sm' data-none-selected-text="Statuses" data-header="Statuses" data-actions-box="true" %}
+              </div>
+              <button id="filter-submit" type="submit" class="btn btn-secondary" style="width: 6em">Filter</button>
+        </form>
+    </div>
+</div>
+<div class="row my-2">
+    <div class="col text-right px-0">
+    {% button 'new' 'asset_create' style="width: 6em" %}
+    </div>
+</div>
+<div class="row my-2">
+    <div class="col bg-dark text-white rounded pt-3">
+        {# TODO Gotta be a cleaner way to do this... #}
+        <p><span class="ml-2">Active Filters: </span> {% for filter in category_filters %}<span class="badge badge-info mx-1 ">{{filter}}<button type="button" class="btn btn-link p-0 ml-1 align-baseline">
+  <span aria-hidden="true" class="fas fa-times" onclick="removeQString('category', '{{filter.id}}')"></span>
+</button></span>{%endfor%}{% for filter in status_filters %}<span class="badge badge-info mx-1 ">{{filter}}<button type="button" class="btn btn-link p-0 ml-1 align-baseline">
+  <span aria-hidden="true" class="fas fa-times" onclick="removeQString('status', '{{filter.id}}')"></span>
+</button></span>{%endfor%}</p>
+    </div>
+</div>
+<div class="row">
+    <div class="col px-0">
+    {% include 'partials/asset_list_table.html' %}
+    </div>
+</div>
+{% paginator %}
 {% endblock %}
--- a/assets/templates/asset_update.html
+++ b/assets/templates/asset_update.html
@@ -1,75 +0,0 @@
-{% extends request.is_ajax|yesno:'base_ajax.html,base_assets.html' %}
-{% load widget_tweaks %}
-{% block title %}Asset {{ object.asset_id }}{% endblock %}
-
-{% block content %}
-
-<div class="page-header">
-  <h1>
-      {% if edit and object %}
-          Edit Asset: {{ object.asset_id }}
-      {% else %}
-          Asset: {{ object.asset_id }}
-      {% endif %}
-  </h1>
-</div>
-<form method="post" id="asset_update_form" action="{% url 'asset_update' pk=object.asset_id%}">
-  {% include 'form_errors.html' %}
-  {% csrf_token %}
-  <input type="hidden" name="id" value="{{ object.id|default:0 }}" hidden=true>
-  <div class="row">
-    <div class="col-sm-12">
-      {% include 'partials/asset_form.html' %}
-    </div>
-  </div>
-  <div class="row">
-    <div class="col-md-4"
-    {% if not object.is_cable %} hidden="true" {% endif %} id="cable-table">
-      {% include 'partials/cable_form.html' %}
-    </div>
-    {% if perms.assets.asset_finance %}
-    <div class="col-md-4">
-      {% include 'partials/purchasedetails_form.html' %}
-    </div>
-    {%endif%}
-    <div class="col-md-4">
-      {% include 'partials/parent_form.html' %}
-    </div>
-    {% if not edit %}
-    <div class="col-md-4">
-      {% include 'partials/audit_details.html' %}
-    </div>
-    {% endif %}
-  </div>
-  <div class="row">
-    <div class="col-md-12">
-      {% include 'partials/asset_buttons.html' %}
-  </div>
-</form>
-
-{% if not edit and perms.assets.view_asset %}
-<div class="col-sm-12 text-right">
-    <div>
-        <a href="{% url 'asset_history' object.asset_id %}" title="View Revision History">
-            Last edited at {{ object.last_edited_at|default:'never' }} by {{ object.last_edited_by.name|default:'nobody' }}
-        </a>
-    </div>
-</div>
-{% endif %}
-
-{% endblock %}
-
-{% block js%}
-{% if edit %}
-<script>
-  function checkIfCableHidden() {
-    if (document.getElementById("id_is_cable").checked) {
-      document.getElementById("cable-table").hidden = false;
-    } else {
-      document.getElementById("cable-table").hidden = true;
-    }
-  }
-  checkIfCableHidden();
-</script>
-{% endif %}
-{% endblock %}
--- a/assets/templates/asset_version_history.html
+++ b/assets/templates/asset_version_history.html
@@ -1,68 +0,0 @@
-{% extends request.is_ajax|yesno:"base_ajax.html,base_assets.html" %}
-{% load to_class_name from filters %}
-{% load paginator from filters %}
-{% load static %}
-
-{% block title %}{{object|to_class_name}} {{ object.asset_id }} - Revision History{% endblock %}
-
-{% block js %}
-    <script src="{% static "js/tooltip.js" %}"></script>
-    <script src="{% static "js/popover.js" %}"></script>
-    <script>
-    	$(function () {
-            $('[data-toggle="popover"]').popover().click(function(){
-                    if($(this).attr('href')){
-                      window.location.href = $(this).attr('href');
-                    }
-                  });
-        })
-    </script>
-{% endblock %}
-
-{% block content %}
-<div class="col-sm-12">
-        <div class="row">
-            <div class="col-sm-12">
-                <h3><a href="{{ object.get_absolute_url }}">{{object|to_class_name}} {{ object.asset_id|default:object.pk }}</a> - Revision History</h3>
-            </div>
-            <div class="text-right col-sm-12">{% paginator %}</div>
-        </div>
-        <div class="table-responsive">
-        	<table class="table table-striped">
-                <thead>
-                <tr>
-                    <td>Date</td>
-                    <td>Version ID</td>
-                    <td>User</td>
-                    <td>Changes</td>
-                    <td>Comment</td>
-                </tr>
-                </thead>
-                <tbody>
-                	{% for version in object_list %}
-
-                            <tr>
-                           		<td>{{ version.revision.date_created }}</td>
-                                <td>{{ version.pk }}|{{ version.revision.pk }}</td>
-                                <td>{{ version.revision.user.name }}</td>
-                                <td>
-                                    {% if version.changes.old is None %}
-                                        {{object|to_class_name}} Created
-                                    {% else %}
-                                        {% include 'RIGS/version_changes.html' %}
-                                    {% endif %}
-                                </td>
-                                <td>
-                                    {{ version.revision.comment }}
-                                </td>
-                            </tr>
-
-
-        			{% endfor %}
-
-                </tbody>
-            </table>
-         </div>
-    <div class="align-right">{% paginator %}</div>
-</div>
-{% endblock %}
--- a/assets/templates/base_assets.html
+++ b/assets/templates/base_assets.html
@@ -0,0 +1,45 @@
+{% extends 'base.html' %}
+
+{% block extrahead %}
+    <meta name="google" content="notranslate">
+{% endblock %}
+
+{% block titleheader %}
+    <a class="nav navbar-brand" href="{% url 'asset_index' %}">Assets</a>
+{% endblock %}
+
+{% block titleelements %}
+<li class="nav-item"><a class="nav-link" href="/">Home</a></li>
+<li class="nav-item dropdown">
+    <a class="nav-link dropdown-toggle" href="#" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">Assets</a>
+    <div class="dropdown-menu">
+        <a class="dropdown-item" href="{% url 'asset_list' %}"><span class="fas fa-list"></span> List Assets</a>
+        {% if perms.assets.add_asset %}
+            <a class="dropdown-item" href="{% url 'asset_create' %}"><span class="fas fa-plus"></span> Create Asset</a>
+        {% endif %}
+        <div class="dropdown-divider"></div>
+        <a class="dropdown-item" href="{% url 'cable_type_list' %}"><span class="fas fa-list"></span> List Cable Types</a>
+        {% if perms.assets.add_cabletype %}
+        <a class="dropdown-item" href="{% url 'cable_type_create' %}"><span class="fas fa-plus"></span> Create Cable Type</a>
+        {% endif %}
+    </div>
+</li>
+<div class="nav-item dropdown">
+    <a class="nav-link dropdown-toggle" href="#" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> Suppliers</a>
+    <ul class="dropdown-menu">
+        <a class="dropdown-item" href="{% url 'supplier_list' %}"><span class="fas fa-list"></span> List Suppliers</a>
+        {% if perms.assets.add_supplier %}
+            <a class="dropdown-item" href="{% url 'supplier_create' %}"><span class="fas fa-plus"></span> Create Supplier</a>
+        {% endif %}
+    </ul>
+</div>
+{% if perms.assets.view_asset %}
+    <li class="nav-item"><a class="nav-link" href="{% url 'assets_activity_table' %}">Recent Changes</a></li>
+    <li class="nav-item"><a class="nav-link" href="{% url 'asset_audit_list' %}">Audit</a></li>
+{% endif %}
+{% endblock %}
+
+{% block titleelements_right %}
+{% include 'partials/search.html' %}
+{% include 'partials/navbar_user.html' %}
+{% endblock %}
--- a/assets/templates/cable_type_form.html
+++ b/assets/templates/cable_type_form.html
@@ -1,13 +1,9 @@
 {% extends 'base_assets.html' %}
 {% load widget_tweaks %}
-{% block title %}Cable Type{% endblock %}
+{% load button from filters %}
+{% load cache %}

 {% block content %}
-<div class="page-header">
-  <h1>
-      {% if create %}Create{% elif edit %}Edit{% endif %} Cable Type
-  </h1>
-</div>
 {% if create %}
 <form method="POST" action="{% url 'cable_type_create'%}">
 {% elif edit %}
@@ -19,41 +15,45 @@
 <div class="row">
  <div class="col-sm-12">
    {% if create or edit %}
+    {% for field in form %}
    <div class="form-group">
-      <label for="{{ form.plug.id_for_label }}">Plug</label>
-      {% render_field form.plug|add_class:'form-control'%}
+      {% include 'partials/form_field.html' with field=field %}
    </div>
-    <div class="form-group">
-      <label for="{{ form.socket.id_for_label }}">Socket</label>
-      {% render_field form.socket|add_class:'form-control'%}
-    </div>
-    <div class="form-group">
-      <label for="{{ form.circuits.id_for_label }}">Circuits</label>
-      {% render_field form.circuits|add_class:'form-control' value=object.circuits %}
-    </div>
-    <div class="form-group">
-      <label for="{{ form.cores.id_for_label }}">Cores</label>
-      {% render_field form.cores|add_class:'form-control' value=object.cores %}
-    </div>
-    <div class="pull-left">
-        <button type="submit" class="btn btn-success"><i class="glyphicon glyphicon-floppy-disk"></i> Save</button>
-        <br>
-        <button type="reset" class="btn btn-link">Cancel</button>
+    {% endfor %}
+    <div class="text-right">
+        {% button 'submit' %}
    </div>
    {% else %}
-    <dl>
-      <dt>Socket</dt>
-      <dd>{{ object.socket|default_if_none:'-' }}</dd>
+    <div class="col">
+        <div class="card">
+            <dl class="card-body row">
+              <dt class="col-6">Socket</dt>
+              <dd>{{ object.socket|default_if_none:'-' }}</dd>

-      <dt>Plug</dt>
-      <dd>{{ object.plug|default_if_none:'-' }}</dd>
+              <dt class="col-6">Plug</dt>
+              <dd>{{ object.plug|default_if_none:'-' }}</dd>

-      <dt>Circuits</dt>
-      <dd>{{ object.circuits|default_if_none:'-' }}</dd>
+              <dt class="col-6">Circuits</dt>
+              <dd>{{ object.circuits|default_if_none:'-' }}</dd>

-      <dt>Cores</dt>
-      <dd>{{ object.cores|default_if_none:'-' }}</dd>
-    </dl>
+              <dt class="col-6">Cores</dt>
+              <dd>{{ object.cores|default_if_none:'-' }}</dd>
+            </dl>
+        </div>
+    </div>
+    <div class="col mt-2 text-right">
+    {% button 'edit' url='cable_type_update' pk=object.id %}
+    </div>
+    {% cache None cable_type_assets object %}
+    <div class="col mt-2">
+      <div class="card">
+      <div class="card-header">Associated Assets</div>
+        {% with object.asset_set.all as object_list %}
+            {% include 'partials/asset_list_table.html' %}
+        {% endwith %}
+      </div>
+    </div>
+    {% endcache %}
    {% endif %}
  </div>
 </div>
--- a/assets/templates/cable_type_list.html
+++ b/assets/templates/cable_type_list.html
@@ -1,41 +1,44 @@
 {% extends 'base_assets.html' %}
-{% block title %}Supplier List{% endblock %}
 {% load paginator from filters %}
+{% load button from filters %}
 {% load widget_tweaks %}

 {% block content %}
-<div class="page-header">
-    <h1>Cable Type List</h1>
+<div class="row my-2">
+    <div class="col text-right pr-0">
+    {% button 'new' 'cable_type_create' %}
+    </div>
 </div>
-
+<div class="row">
 <table class="table table-striped">
  <thead>
    <tr>
-      <th>Cable Type</th>
-      <th>Circuits</th>
-      <th>Cores</th>
-      <th>Quick Links</th>
+      <th scope="col">Cable Type</th>
+      <th scope="col">Circuits</th>
+      <th scope="col">Cores</th>
+      <th scope="col">Quick Links</th>
    </tr>
  </thead>
  <tbody>
    {% for item in object_list %}
    <tr>
-      <td>{{ item }}</td>
+      <th scope="row">{{ item }}</th>
      <td>{{ item.circuits }}</td>
      <td>{{ item.cores }}</td>
      <td>
-        <a href="{% url 'cable_type_detail' item.pk %}" class="btn btn-default"><i class="glyphicon glyphicon-eye-open"></i> View</a>
-        <a href="{% url 'cable_type_update' item.pk %}" class="btn btn-default"><i class="glyphicon glyphicon-edit"></i> Edit</a>
+        <a href="{% url 'cable_type_detail' item.pk %}" class="btn btn-primary"><span class="fas fa-eye"></span> View</a>
+        <a href="{% url 'cable_type_update' item.pk %}" class="btn btn-warning"><span class="fas fa-edit"></span> Edit</a>
      </td>
    </tr>
    {% endfor %}
  </tbody>
 </table>
-
+</div>
+<div class="row">
 {% if is_paginated %}
 <div class="text-center">
  {% paginator %}
 </div>
 {% endif %}
-
+</div>
 {% endblock %}
--- a/assets/templates/partials/asset_buttons.html
+++ b/assets/templates/partials/asset_buttons.html
@@ -1,28 +1,26 @@
-{% if perms.assets.change_asset %}
-    {% if edit and object %}
+{% load button from filters %}
+<div class="text-right py-2">
+    {% if create or edit and object %}
    <!--edit-->
-    <button type="submit" class="btn btn-success"><i class="glyphicon glyphicon-floppy-disk"></i> Save</button>
-    <a class="btn btn-default" href="{% url 'asset_duplicate' object.pk %}"><i class="glyphicon glyphicon-duplicate"></i> Duplicate</a>
+    {% button 'submit' %}
    {% elif duplicate %}
    <!--duplicate-->
-    <button type="submit" class="btn btn-success"><i class="glyphicon glyphicon-ok-sign"></i> Create Duplicate</button>
-    {% elif create %}
-    <!--create-->
-    <button type="submit" class="btn btn-success"><i class="glyphicon glyphicon-floppy-disk"></i> Save</button>
+    <button type="submit" class="btn btn-success"><i class="fas fa-tick"></i> Create Duplicate</button>
    {% else %}
    <!--detail view-->
    <div class="btn-group">
-        <a href="{% url 'asset_update' object.asset_id %}" class="btn btn-default"><i class="glyphicon glyphicon-edit"></i> Edit</a>
-        <a class="btn btn-default" href="{% url 'asset_duplicate' object.asset_id %}"><i class="glyphicon glyphicon-duplicate"></i> Duplicate</a>
-        <a type="button" class="btn btn-info" href="{% url 'asset_audit' object.asset_id %}"><i class="glyphicon glyphicon-object-align-left"></i> Audit</a>
+        {% button 'edit' url='asset_update' pk=object.asset_id %}
+        {% button 'duplicate' url='asset_duplicate' pk=object.asset_id %}
+        <a type="button" class="btn btn-info" href="{% url 'asset_audit' object.asset_id %}"><i class="fas fa-certificate"></i> Audit</a>
    </div>
    {% endif %}
    {% if create or edit or duplicate %}
    <br>
    <button type="reset" class="btn btn-link" onclick="
-    {%if duplicate%}
-    {% url 'asset_detail' previous_asset_id %}
-    {%else%}
-    history.back(){%endif%}">Cancel</button>
+    {% if duplicate %}
+        {% url 'asset_detail' previous_asset_id %}
+    {% else %}
+        history.back()
+    {% endif %}">Cancel</button>
    {% endif %}
-{% endif %}
+</div>
--- a/assets/templates/partials/asset_detail_form.html
+++ b/assets/templates/partials/asset_detail_form.html
@@ -1,9 +1,9 @@
 {% load widget_tweaks %}
-<div class="panel panel-default">
-  <div class="panel-heading">
+<div class="card">
+  <div class="card-header">
    Asset Details
  </div>
-  <div class="panel-body">
+  <div class="card-body">
    {% if create or edit or duplicate %}
    <div class="form-group">
        <label for="{{ form.asset_id.id_for_label }}">Asset ID</label>
--- a/assets/templates/partials/asset_list_table.html
+++ b/assets/templates/partials/asset_list_table.html
@@ -0,0 +1,41 @@
+{% load button from filters %}
+<div class="table-responsive">
+    <table class="table">
+      <thead class="thead-dark">
+        <tr>
+          <th scope="col">Asset ID</th>
+          <th scope="col">Description</th>
+          <th scope="col">Category</th>
+          <th scope="col">Status</th>
+          <th scope="col" class="d-none d-sm-table-cell">Quick Links</th>
+        </tr>
+      </thead>
+      <tbody id="asset_table_body">
+        {% for item in object_list %}
+            <tr class="table-{{ item.status.display_class|default:'' }} assetRow">
+                <th scope="row" class="align-middle"><a class="assetID" href="{% url 'asset_detail' item.asset_id %}">{{ item.asset_id }}</a></th>
+                <td class="assetDesc"><span class="text-truncate d-inline-block align-middle">{{ item.description }}</span></td>
+                <td class="assetCategory align-middle">{{ item.category }}</td>
+                <td class="assetStatus align-middle">{{ item.status }}</td>
+                <td class="d-none d-sm-table-cell">
+                    {% if audit %}
+                    <a type="button" class="btn btn-info btn-sm modal-href" href="{% url 'asset_audit' item.asset_id %}"><i class="fas fa-certificate"></i> Audit</a>
+                    {% else %}
+                    <div class="btn-group" role="group">
+                        {% button 'view' url='asset_detail' pk=item.asset_id clazz="btn-sm" %}
+                        {% if perms.assets.change_asset %}
+                            {% button 'edit' url='asset_update' pk=item.asset_id clazz="btn-sm" %}
+                            {% button 'duplicate' url='asset_duplicate' pk=item.asset_id clazz="btn-sm" %}
+                        {% endif %}
+                    </div>
+                    {% endif %}
+                </td>
+            </tr>
+            {% empty %}
+            <tr>
+                <td colspan="6">Nothing found</td>
+            </tr>
+        {% endfor %}
+        </tbody>
+    </table>
+</div>
--- a/assets/templates/partials/asset_list_table_body.html
+++ b/assets/templates/partials/asset_list_table_body.html
@@ -1,21 +0,0 @@
-{% for item in object_list %}
-    <tr class="{{ item.status.display_class|default:'' }} assetRow" id="{{item.asset_id}}">
-        <td style="vertical-align: middle;"><a class="assetID" href="{% url 'asset_detail' item.asset_id %}">{{ item.asset_id }}</a></td>
-        <td class="assetDesc" style="vertical-align: middle; text-overflow: ellipsis; white-space: nowrap; overflow: hidden; max-width: 25vw">{{ item.description }}</td>
-        <td class="assetCategory" style="vertical-align: middle;">{{ item.category }}</td>
-        <td class="assetStatus" style="vertical-align: middle;">{{ item.status }}</td>
-        <td class="hidden-xs">
-            <div class="btn-group" role="group">
-            {% if audit %}
-                <a type="button" class="btn btn-info modal-href" href="{% url 'asset_audit' item.asset_id %}"><i class="glyphicon glyphicon-object-align-left"></i> Audit</a>
-            {% else %}
-                <a type="button" class="btn btn-default btn-sm" href="{% url 'asset_detail' item.asset_id %}"><i class="glyphicon glyphicon-eye-open"></i> View</a>
-                {% if perms.assets.change_asset %}
-                <a type="button" class="btn btn-default btn-sm" href="{% url 'asset_update' item.asset_id %}"><i class="glyphicon glyphicon-edit"></i> Edit</a>
-                <a type="button" class="btn btn-default btn-sm" href="{% url 'asset_duplicate' item.asset_id %}"><i class="glyphicon glyphicon-duplicate"></i> Duplicate</a>
-                {% endif %}
-            </div>
-            {% endif %}
-        </td>
-    </tr>
-{% endfor %}
--- a/assets/templates/partials/asset_picker.html
+++ b/assets/templates/partials/asset_picker.html
@@ -1,65 +0,0 @@
-<select name="parent" id="parent_id" class="selectpicker">
-    {% if object.parent%}
-    <option value="{{object.parent.pk}}" selected>{{object.parent.description}}</option>
-    {% endif %}
-</select>
-
-{% load static %}
-{% block css %}
-    <link rel="stylesheet" href="{% static "css/bootstrap-select.min.css" %}"/>
-    <link rel="stylesheet" href="{% static "css/ajax-bootstrap-select.css" %}"/>
-{% endblock %}
-
-{% block preload_js %}
-    <script src="{% static "js/bootstrap-select.js" %}"></script>
-    <script src="{% static "js/ajax-bootstrap-select.js" %}"></script>
-{% endblock %}
-
-{% block js %}
-{{ js.super }}
-<script>
-$('#parent_id')
-    .selectpicker({
-        liveSearch: true
-    })
-    .ajaxSelectPicker({
-        ajax: {
-            url: '{% url 'asset_search_json'%}',
-            type: "get",
-            data: function () {
-                var params = {
-                    {% verbatim %}query: '{{{q}}}'{% endverbatim  %}
-                };
-                return params;
-            }
-        },
-        locale: {
-            emptyTitle: 'Search for item...'
-        },
-        preprocessData: function(data){
-            var assets = [];
-            if(data.length){
-                var len = data.length;
-                for(var i = 0; i < len; i++){
-                    var curr = data[i];
-                    assets.push(
-                        {
-                            'value': curr.id,
-                            'text': curr.label,
-                            'disabled': false
-                        }
-                    );
-                }
-                assets.push(
-                {
-                    'value': null,
-                    'text': "No parent"
-                });
-            }
-            
-            return assets;
-        },
-        preserveSelected: false
-    });
-</script>
-{% endblock js %}
--- a/assets/templates/partials/associated_assets.html
+++ b/assets/templates/partials/associated_assets.html
@@ -0,0 +1,8 @@
+<div class="col-12 pt-2">
+  <div class="card">
+      <div class="card-header">Associated Assets</div>
+      {% with object.assets.all as object_list %}
+          {% include 'partials/asset_list_table.html' %}
+      {% endwith %}
+  </div>
+</div>
--- a/assets/templates/partials/audit_details.html
+++ b/assets/templates/partials/audit_details.html
@@ -1,8 +1,8 @@
-<div class="panel {% if object.last_audited_at is not None %} panel-success {% else %} panel-warning {% endif %}">
-  <div class="panel-heading">
+<div class="card {% if object.last_audited_at is not None %}border-success{% else %}border-warning{% endif %}">
+  <div class="card-header">
    Audit Details
  </div>
-  <div class="panel-body">
-        <p>Audited at <span class="label label-default">{{ object.last_audited_at|default_if_none:'-' }}</span> by <span class="label label-info">{{ object.last_audited_by|default_if_none:'-' }}</span></p>
+  <div class="card-body">
+        <p>Audited at <span class="badge badge-secondary">{{ object.last_audited_at|default_if_none:'-' }}</span> by <span class="badge badge-info">{{ object.last_audited_by|default_if_none:'-' }}</span></p>
  </div>
 </div>
--- a/assets/templates/partials/cable_form.html
+++ b/assets/templates/partials/cable_form.html
@@ -1,29 +1,18 @@
 {% load widget_tweaks %}
-<div class="panel panel-default">
-  <div class="panel-heading">
+<div class="card mb-2">
+  <div class="card-header">
    Cable Details
  </div>
-  <div class="panel-body">
+  <div class="card-body">
    {% if create or edit or duplicate %}
    <div class="form-group">
-      <label for="{{ form.cable_type.id_for_label }}">Cable Type</label>
-      <div class="input-group">
-        {% render_field form.cable_type|add_class:'form-control' %}
-      </div>
+      {% include 'partials/form_field.html' with field=form.cable_type %}
    </div>
    <div class="form-group">
-      <label for="{{ form.length.id_for_label }}">Length</label>
-      <div class="input-group">
-        {% render_field form.length|add_class:'form-control' %}
-        <span class="input-group-addon">{{ form.length.help_text }}</span>
-      </div>
+      {% include 'partials/form_field.html' with field=form.length append=form.length.help_text %}
    </div>
    <div class="form-group">
-      <label for="{{ form.csa.id_for_label }}">Cross Sectional Area</label>
-      <div class="input-group">
-        {% render_field form.csa|add_class:'form-control' value=object.csa %}
-        <span class="input-group-addon">{{ form.csa.help_text }}</span>
-      </div>
+      {% include 'partials/form_field.html' with field=form.csa append=form.csa.help_text %}
    </div>
    {% else %}
    <dl>
--- a/assets/templates/partials/form_field.html
+++ b/assets/templates/partials/form_field.html
@@ -0,0 +1,22 @@
+{% load widget_tweaks %}
+{% load title_spaced from filters %}
+{% spaceless %}
+<label for="{{ field.id_for_label }}" {% if col %}class="col-2 col-form-label"{% endif %}>{% if title %}{{ title }}{%else%}{{field.name|title_spaced}}{%endif%}</label>
+{% if append or prepend %}
+<div class="input-group {{col}}">
+  {% if prepend %}
+  <div class="input-group-prepend">
+    <span class="input-group-text">{{ prepend }}</span>
+  </div>
+  {% endif %}
+  {% render_field field|add_class:'form-control' %}
+  {% if append %}
+  <div class="input-group-append">
+    <span class="input-group-text">{{ append }}</span>
+  </div>
+  {% endif %}
+</div>
+{% else %}
+{% render_field field|add_class:'form-control' class+=col %}
+{% endif %}
+{% endspaceless %}
--- a/assets/templates/partials/parent_form.html
+++ b/assets/templates/partials/parent_form.html
@@ -1,13 +1,17 @@
 {% load widget_tweaks %}
-<div class="panel panel-default">
-  <div class="panel-heading">
+<div class="card mb-2">
+  <div class="card-header">
    Collection Details
  </div>
-  <div class="panel-body">
+  <div class="card-body">
    {% if create or edit or duplicate %}
    <div class="form-group" id="parent-group">
      <label for="selectpicker">Set Parent</label>
-      {% include 'partials/asset_picker.html' %}
+      <select name="parent" id="parent_id" class="form-control selectpicker" data-live-search="true">
+        {% if object.parent %}
+        <option value="{{object.parent.pk}}" selected>{{object.parent.description}}</option>
+        {% endif %}
+      </select>
    </div>
    {% else %}
    <dl>
--- a/assets/templates/partials/purchasedetails_form.html
+++ b/assets/templates/partials/purchasedetails_form.html
@@ -1,32 +1,15 @@
 {% load widget_tweaks %}
-{% load static %}
-
-
-{% block css %}
-    <link rel="stylesheet" href="{% static "css/bootstrap-select.min.css" %}"/>
-    <link rel="stylesheet" href="{% static "css/ajax-bootstrap-select.css" %}"/>
-{% endblock %}
-
-{% block preload_js %}
-    <script src="{% static "js/bootstrap-select.js" %}"></script>
-    <script src="{% static "js/ajax-bootstrap-select.js" %}"></script>
-{% endblock %}
-
-{% block js %}
-    <script src="{% static "js/autocompleter.js" %}"></script>
-{% endblock %}
-
-<div class="panel panel-default">
-  <div class="panel-heading">
+<div class="card mb-2">
+  <div class="card-header">
    Purchase Details
  </div>
-  <div class="panel-body">
+  <div class="card-body">
    {% if create or edit or duplicate %}
    <div class="form-group" id="purchased-from-group">
      <label for="{{ form.purchased_from.id_for_label }}">Supplier</label>
      <select id="{{ form.purchased_from.id_for_label }}" name="{{ form.purchased_from.name }}" class="form-control selectpicker" data-live-search="true" data-sourceurl="{% url 'api_secure' model='supplier' %}">
        {% if object.purchased_from %}
-            <option value="{{form.purchased_from.value}}" selected="selected" data-update_url="{% url 'supplier_update' form.purchased_from.value %}">{{ object.purchased_from }}</option>
+        <option value="{{form.purchased_from.value}}" selected="selected" data-update_url="{% url 'supplier_update' form.purchased_from.value %}">{{ object.purchased_from }}</option>
        {% endif %}
      </select>
    </div>
@@ -34,7 +17,7 @@
    <div class="form-group">
      <label for="{{ form.purchase_price.id_for_label }}">Purchase Price</label>
      <div class="input-group">
-        <span class="input-group-addon">£</span>
+        <div class="input-group-prepend"><span class="input-group-text">£</span></div>
        {% render_field form.purchase_price|add_class:'form-control' value=object.purchase_price %}
      </div>
    </div>
@@ -42,7 +25,7 @@
    <div class="form-group">
      <label for="{{ form.salvage_value.id_for_label }}">Salvage Value</label>
      <div class="input-group">
-        <span class="input-group-addon">£</span>
+        <div class="input-group-prepend"><span class="input-group-text">£</span></div>
        {% render_field form.salvage_value|add_class:'form-control' value=object.salvage_value %}
      </div>
    </div>
@@ -54,7 +37,7 @@
      {% render_field form.date_acquired|add_class:'form-control'|attr:'type="date"' value=date_acq %}
      {% endwith %}
      {% else %}
-      <input type="date" name="date_acquired" value="{% now "Y-m-d" %}"
+      <input type="date" name="date_acquired" value="{% now 'Y-m-d' %}"
                    class="form-control" id="id_date_acquired">
                {% endif %}
              </div>
--- a/assets/templates/partials/render_field.html
+++ b/assets/templates/partials/render_field.html
@@ -1,16 +0,0 @@
-{% load widget_tweaks %}
-
-  <!---TODO: Assign form-control class in here--->
-<div class="form-group">
-    <label for="{{ field.id_for_label }}">{{ label|default:field.label }}</label>
-    {% if css %}
-    {% render_field  field|add_class:css %}
-    {% elif disable_if_filled and field.value %}
-    {% render_field  field|attr:'disabled' %}
-    {% elif css and disable_if_filled %}
-    {% render_field  field|add_class:css|attr:'disabled' %}
-    {% else %}
-    {{ field }}
-    {% endif %}
-    <span class="helper-text" data-error="{{ field.errors.text }}"></span>
-</div>
--- a/assets/templates/supplier_detail.html
+++ b/assets/templates/supplier_detail.html
@@ -1,73 +0,0 @@
-{% extends 'base_assets.html' %}
-{% block title %}Supplier | {{ object.name }}{% endblock %}
-
-{% block content %}
-<div class="row">
-        {% if not request.is_ajax %}
-            <div class="col-sm-12">
-                <h1>Supplier | {{ object.name }}</h1>
-            </div>
-
-            <div class="col-sm-12 text-right">
-                <div class="btn-group btn-page">
-                    <a href="{% url 'supplier_update' object.pk %}" class="btn btn-default"><span
-                        class="glyphicon glyphicon-pencil"></span> Edit</a>
-                </div>
-            </div>
-        {% endif %}
-        <div class="col-sm-6">
-            <div class="panel panel-info">
-                <div class="panel-heading">Supplier Details</div>
-                <div class="panel-body">
-                    <dl class="dl-horizontal">
-                        <dt>Name</dt>
-                        <dd>{{ object.name }}</dd>
-                    </dl>                        
-                </div>
-            </div>
-        </div>
-    </div>
-
-    <div class="row">
-        <div class="col-sm-12">
-            <div class="panel panel-default">
-                <div class="panel-heading">Associated Assets</div>
-                <div class="panel-body">
-                      <table class="table">
-                          <thead>
-                            <tr>
-                              <th>Asset ID</th>
-                              <th>Description</th>
-                              <th>Category</th>
-                              <th>Status</th>
-                              <th class="hidden-xs">Quick Links</th>
-                            </tr>
-                          </thead>
-                          <tbody id="asset_table_body">
-                            {% with object.assets.all as object_list %}
-                                {% include 'partials/asset_list_table_body.html' %}
-                            {% endwith %}
-                          </tbody>
-                       </table>
-                </div>
-            </div>
-        </div>
-    </div>
-
-
-    {% if not request.is_ajax %}
-        <div class="row">
-            <div class="col-sm-12 text-right">
-                <div class="btn-group btn-page">
-                    <a href="{% url 'supplier_update' object.pk %}" class="btn btn-default"><span
-                        class="glyphicon glyphicon-pencil"></span> Edit</a>
-                </div>
-                <div>
-                    <a href="{% url 'supplier_update' object.pk %}" title="View Revision History">
-                        Last edited {{ object.last_edited_at }} by {{ object.last_edited_by.name }}
-                    </a>
-                </div>
-            </div>
-        </div>
-    {% endif %}
-{% endblock %}
--- a/assets/templates/supplier_list.html
+++ b/assets/templates/supplier_list.html
@@ -1,47 +0,0 @@
-{% extends 'base_assets.html' %}
-{% block title %}Supplier List{% endblock %}
-{% load paginator from filters %}
-{% load widget_tweaks %}
-
-{% block content %}
-
-<div class="page-header">
-    <h1>Supplier List</h1>
-</div>
-
-<form id="supplier-search-form" method="get" class="form-inline pull-right">
-    {% csrf_token %}
-    <div class="input-group pull-right" style="width: auto;">
-        {% render_field form.query|add_class:'form-control' placeholder='Search by Name' style="width: 250px"%}
-        <label for="query" class="sr-only">Name:</label>
-        <span class="input-group-btn"><button type="submit" class="btn btn-default" id="id_search">Search</button></span>
-    </div>
-</form>
-
-<table class="table table-striped">
-  <thead>
-    <tr>
-      <th>Supplier</th>
-      <th>Quick Links</th>
-    </tr>
-  </thead>
-  <tbody id="asset_table_body">
-    {% for item in object_list %}
-    <tr class="supplierRow">
-      <td class="supplierName">{{ item.name }}</td>
-      <td>
-        <a href="{% url 'supplier_detail' item.pk %}" class="btn btn-default"><i class="glyphicon glyphicon-eye-open"></i> View</a>
-        <a href="{% url 'supplier_update' item.pk %}" class="btn btn-default"><i class="glyphicon glyphicon-edit"></i> Edit</a>
-      </td>
-    </tr>
-    {% endfor %}
-  </tbody>
-</table>
-
-{% if is_paginated %}
-<div class="text-center">
-  {% paginator %}
-</div>
-{% endif %}
-
-{% endblock %}
--- a/assets/templates/supplier_update.html
+++ b/assets/templates/supplier_update.html
@@ -1,20 +0,0 @@
-{% extends 'base_assets.html' %}
-{% block title %}Edit{% endblock %}
-
-{% block content %}
-
-    <div class="page-header">
-        <h1>Supplier
-        {% if object %}
-           Edit: {{ object.name }}
-        {% else %}
-            Create
-        {% endif %}</h1>
-    </div>
-    <form method="post">
-        {% csrf_token %}
-        {% include 'form_errors.html' %}
-        {{ form }}
-        <input type="submit" value="Save" class="btn btn-success">
-    </form>
-{% endblock %}
--- a/assets/tests/pages.py
+++ b/assets/tests/pages.py
@@ -13,10 +13,10 @@ class AssetList(BasePage):
    URL_TEMPLATE = '/assets/asset/list'

    _asset_item_locator = (By.CLASS_NAME, 'assetRow')
-    _search_text_locator = (By.ID, 'id_query')
+    _search_text_locator = (By.ID, 'id_q')
    _status_select_locator = (By.CSS_SELECTOR, 'div#status-group>div.bootstrap-select')
    _category_select_locator = (By.CSS_SELECTOR, 'div#category-group>div.bootstrap-select')
-    _go_button_locator = (By.ID, 'filter-submit')
+    _go_button_locator = (By.ID, 'id_search')

    class AssetListRow(Region):
        _asset_id_locator = (By.CLASS_NAME, "assetID")
@@ -68,7 +68,6 @@ class AssetList(BasePage):
 class AssetForm(FormPage):
    _purchased_from_select_locator = (By.CSS_SELECTOR, 'div#purchased-from-group>div.bootstrap-select')
    _parent_select_locator = (By.CSS_SELECTOR, 'div#parent-group>div.bootstrap-select')
-    _submit_locator = (By.CLASS_NAME, 'btn-success')
    form_items = {
        'asset_id': (regions.TextBox, (By.ID, 'id_asset_id')),
        'description': (regions.TextBox, (By.ID, 'id_description')),
@@ -114,6 +113,7 @@ class AssetCreate(AssetForm):

 class AssetDuplicate(AssetForm):
    URL_TEMPLATE = '/assets/asset/id/{asset_id}/duplicate'
+    _submit_locator = (By.XPATH, "//button[@type='submit' and contains(., 'Duplicate')]")

    @property
    def success(self):
@@ -123,12 +123,12 @@ class AssetDuplicate(AssetForm):
 class SupplierList(BasePage):
    URL_TEMPLATE = reverse('supplier_list')

-    _supplier_item_locator = (By.CLASS_NAME, 'supplierRow')
-    _search_text_locator = (By.ID, 'id_query')
+    _supplier_item_locator = (By.ID, 'row_item')
+    _search_text_locator = (By.ID, 'id_search_text')
    _go_button_locator = (By.ID, 'id_search')

    class SupplierListRow(Region):
-        _name_locator = (By.CLASS_NAME, "supplierName")
+        _name_locator = (By.ID, "cell_name")

        @property
        def name(self):
@@ -152,7 +152,6 @@ class SupplierList(BasePage):


 class SupplierForm(FormPage):
-    _submit_locator = (By.CLASS_NAME, 'btn-success')
    form_items = {
        'name': (regions.TextBox, (By.ID, 'id_name')),
    }
@@ -178,7 +177,7 @@ class SupplierEdit(SupplierForm):
 class AssetAuditList(AssetList):
    URL_TEMPLATE = reverse('asset_audit_list')

-    _search_text_locator = (By.ID, 'id_query')
+    _search_text_locator = (By.ID, 'id_q')
    _go_button_locator = (By.ID, 'searchButton')
    _modal_locator = (By.ID, 'modal')
    _errors_selector = (By.CLASS_NAME, "alert-danger")
--- a/assets/tests/test_assets.py
+++ b/assets/tests/test_assets.py
@@ -6,18 +6,21 @@ from django.test.utils import override_settings
 from django.urls import reverse
 from urllib.parse import urlparse
 from RIGS import models as rigsmodels
-from PyRIGS.tests.base import BaseTest, AutoLoginTest
+from PyRIGS.tests.base import BaseTest, AutoLoginTest, screenshot_failure_cls
 from assets import models, urls
 from reversion import revisions as reversion
 from selenium.webdriver.support import expected_conditions as EC
 from selenium.webdriver.common.by import By
 from selenium.webdriver.common.keys import Keys
 from selenium.webdriver.support.ui import WebDriverWait
-from RIGS.test_functional import animation_is_finished
+from PyRIGS.tests.base import animation_is_finished
 import datetime
 from django.utils import timezone
+from selenium.webdriver.common.action_chains import ActionChains
+from django.test import tag


+@screenshot_failure_cls
 class TestAssetList(AutoLoginTest):
    def setUp(self):
        super().setUp()
@@ -95,6 +98,7 @@ class TestAssetList(AutoLoginTest):
        self.assertEqual("10", assetIDs[1])


+@screenshot_failure_cls
 class TestAssetForm(AutoLoginTest):
    def setUp(self):
        super().setUp()
@@ -104,6 +108,7 @@ class TestAssetForm(AutoLoginTest):
        self.parent = models.Asset.objects.create(asset_id="9000", description="Shelf", status=self.status, category=self.category, date_acquired=datetime.date(2000, 1, 1))
        self.connector = models.Connector.objects.create(description="IEC", current_rating=10, voltage_rating=240, num_pins=3)
        self.cable_type = models.CableType.objects.create(plug=self.connector, socket=self.connector, circuits=1, cores=3)
+        self.wait = WebDriverWait(self.driver, 5)
        self.page = pages.AssetCreate(self.driver, self.live_server_url).open()

    def test_asset_create(self):
@@ -119,37 +124,43 @@ class TestAssetForm(AutoLoginTest):

        self.page.open()

-        self.page.description = "Bodge Lead"
-        self.page.category = "Health & Safety"
-        self.page.status = "O.K."
-        self.page.serial_number = "0124567890-SAUSAGE"
-        self.page.comments = "This is actually a sledgehammer, not a cable..."
+        self.page.description = desc = "Bodge Lead"
+        self.page.category = cat = "Health & Safety"
+        self.page.status = status = "O.K."
+        self.page.serial_number = sn = "0124567890-SAUSAGE"
+        self.page.comments = comments = "This is actually a sledgehammer, not a cable..."

        self.page.purchased_from_selector.toggle()
        self.assertTrue(self.page.purchased_from_selector.is_open)
        self.page.purchased_from_selector.search(self.supplier.name[:-8])
        self.page.purchased_from_selector.set_option(self.supplier.name, True)
-        self.assertFalse(self.page.purchased_from_selector.is_open)
        self.page.purchase_price = "12.99"
        self.page.salvage_value = "99.12"
-        self.date_acquired = "05022020"
+        self.page.date_acquired = acquired = datetime.date(2020, 5, 20)

        self.page.parent_selector.toggle()
        self.assertTrue(self.page.parent_selector.is_open)
-        # Searching it by ID autoselects it
        self.page.parent_selector.search(self.parent.asset_id)
        # Needed here but not earlier for whatever reason
        self.driver.implicitly_wait(1)
-        # self.page.parent_selector.set_option(self.parent.asset_id + " | " + self.parent.description, True)
-        # Need to explicitly close as we haven't selected anything to trigger the auto close
-        self.page.parent_selector.search(Keys.ESCAPE)
-        self.assertFalse(self.page.parent_selector.is_open)
+        self.page.parent_selector.set_option(self.parent.asset_id + " | " + self.parent.description, True)
        self.assertTrue(self.page.parent_selector.options[0].selected)
+        self.page.parent_selector.toggle()

        self.assertFalse(self.driver.find_element_by_id('cable-table').is_displayed())

        self.page.submit()
+        self.wait.until(animation_is_finished())
        self.assertTrue(self.page.success)
+        # Check that data is right
+        asset = models.Asset.objects.get(asset_id="9001")
+        self.assertEqual(asset.description, desc)
+        self.assertEqual(asset.category.name, cat)
+        self.assertEqual(asset.status.name, status)
+        self.assertEqual(asset.serial_number, sn)
+        self.assertEqual(asset.comments, comments)
+        # This one is important as it defaults to today's date
+        self.assertEqual(asset.date_acquired, acquired)

    def test_cable_create(self):
        self.page.description = "IEC -> IEC"
@@ -160,6 +171,7 @@ class TestAssetForm(AutoLoginTest):
        self.page.is_cable = True

        self.assertTrue(self.driver.find_element_by_id('cable-table').is_displayed())
+        self.wait.until(animation_is_finished())
        self.page.cable_type = "IEC → IEC"
        self.page.socket = "IEC"
        self.page.length = 10
@@ -195,6 +207,7 @@ class TestAssetForm(AutoLoginTest):
        self.assertEqual(models.Asset.objects.last().description, self.parent.description)


+@screenshot_failure_cls
 class TestSupplierList(AutoLoginTest):
    def setUp(self):
        super().setUp()
@@ -221,6 +234,7 @@ class TestSupplierList(AutoLoginTest):
    def test_search(self):
        self.page.set_query("TEC")
        self.page.search()
+
        self.assertTrue(len(self.page.suppliers) == 1)
        self.assertEqual("TEC PA & Lighting", self.page.suppliers[0].name)

@@ -233,6 +247,7 @@ class TestSupplierList(AutoLoginTest):
        self.assertTrue(len(self.page.suppliers) == 0)


+@screenshot_failure_cls
 class TestSupplierCreateAndEdit(AutoLoginTest):
    def setUp(self):
        super().setUp()
@@ -260,6 +275,7 @@ class TestSupplierCreateAndEdit(AutoLoginTest):
        self.assertTrue(self.page.success)


+@screenshot_failure_cls
 class TestAssetAudit(AutoLoginTest):
    def setUp(self):
        super().setUp()
@@ -292,7 +308,7 @@ class TestAssetAudit(AutoLoginTest):
        new_desc = "A BIG hammer"
        mdl.description = new_desc
        mdl.submit()
-        self.wait.until(animation_is_finished())
+        self.wait.until(EC.invisibility_of_element_located((By.ID, 'modal')))
        self.assertFalse(self.driver.find_element_by_id('modal').is_displayed())

        # Check data is correct
@@ -309,17 +325,17 @@ class TestAssetAudit(AutoLoginTest):
    def test_audit_list(self):
        self.assertEqual(len(models.Asset.objects.filter(last_audited_at=None)), len(self.page.assets))

-        assetRow = self.page.assets[0]
-        assetRow.find_element(By.CSS_SELECTOR, "td:nth-child(5) > div:nth-child(1) > a:nth-child(1)").click()
+        asset_row = self.page.assets[0]
+        self.driver.find_element(By.XPATH, "//*[@id='asset_table_body']/tr[1]/td[4]/a").click()
        self.wait.until(EC.visibility_of_element_located((By.ID, 'modal')))
-        self.assertEqual(self.page.modal.asset_id, assetRow.id)
+        self.assertEqual(self.page.modal.asset_id, asset_row.id)

        # First close button is for the not found error
-        self.page.find_element(By.XPATH, '(//button[@class="close"])[2]').click()
-        self.wait.until(animation_is_finished())
+        self.page.find_element(By.XPATH, '//*[@id="modal"]/div/div/div[1]/button').click()
+        self.wait.until(EC.invisibility_of_element_located((By.ID, 'modal')))
        self.assertFalse(self.driver.find_element_by_id('modal').is_displayed())
        # Make sure audit log was NOT filled out
-        audited = models.Asset.objects.get(asset_id=assetRow.id)
+        audited = models.Asset.objects.get(asset_id=asset_row.id)
        self.assertEqual(None, audited.last_audited_by)

        # Check that a failed search works
@@ -370,7 +386,6 @@ class Test404(TestCase):
            self.assertEqual(response.status_code, 404)


-# @tag('slow') TODO: req. Django 3.0
 class TestAccessLevels(TestCase):
    @override_settings(DEBUG=True)
    def setUp(self):
@@ -533,49 +548,6 @@ class TestSampleDataGenerator(TestCase):
        self.assertRaisesRegex(CommandError, ".*production", call_command, 'deleteSampleData')


-class TestVersioningViews(TestCase):
-    @classmethod
-    def setUpTestData(cls):
-        cls.profile = rigsmodels.Profile.objects.create(username="VersionTest", email="version@test.com", is_superuser=True, is_active=True, is_staff=True)
-
-        working = models.AssetStatus.objects.create(name="Working", should_show=True)
-        broken = models.AssetStatus.objects.create(name="Broken", should_show=False)
-        general = models.AssetCategory.objects.create(name="General")
-        lighting = models.AssetCategory.objects.create(name="Lighting")
-
-        cls.assets = {}
-
-        with reversion.create_revision():
-            reversion.set_user(cls.profile)
-            cls.assets[1] = models.Asset.objects.create(asset_id="1991", description="Spaceflower", status=broken, category=lighting, date_acquired=datetime.date(1991, 12, 26))
-
-        with reversion.create_revision():
-            reversion.set_user(cls.profile)
-            cls.assets[2] = models.Asset.objects.create(asset_id="0001", description="Virgil", status=working, category=lighting, date_acquired=datetime.date(2015, 1, 1))
-
-        with reversion.create_revision():
-            reversion.set_user(cls.profile)
-            cls.assets[1].status = working
-            cls.assets[1].save()
-
-    def setUp(self):
-        self.profile.set_password('testuser')
-        self.profile.save()
-        self.assertTrue(self.client.login(username=self.profile.username, password='testuser'))
-
-    def test_history_loads_successfully(self):
-        request_url = reverse('asset_history', kwargs={'pk': self.assets[1].asset_id})
-
-        response = self.client.get(request_url, follow=True)
-        self.assertEqual(response.status_code, 200)
-
-    def test_activity_table_loads_successfully(self):
-        request_url = reverse('asset_activity_table')
-
-        response = self.client.get(request_url, follow=True)
-        self.assertEqual(response.status_code, 200)
-
-
 class TestEmbeddedViews(TestCase):
    @classmethod
    def setUpTestData(cls):
--- a/assets/urls.py
+++ b/assets/urls.py
@@ -1,7 +1,7 @@
 from django.conf.urls import url
 from django.urls import path
 from assets import views, models
-from RIGS import versioning
+from versioning import versioning

 from django.contrib.auth.decorators import login_required
 from django.views.decorators.clickjacking import xframe_options_exempt
@@ -17,20 +17,16 @@ urlpatterns = [
         (views.AssetEdit.as_view()), name='asset_update'),
    path('asset/id/<str:pk>/duplicate/', permission_required_with_403('assets.add_asset')
         (views.AssetDuplicate.as_view()), name='asset_duplicate'),
-    path('asset/id/<str:pk>/history/', permission_required_with_403('assets.view_asset')(views.AssetVersionHistory.as_view()),
-         name='asset_history', kwargs={'model': models.Asset}),
-    path('activity', permission_required_with_403('assets.view_asset')
-         (views.ActivityTable.as_view()), name='asset_activity_table'),

-    path('cabletype/list/', permission_required_with_403('assets.view_cable_type')(views.CableTypeList.as_view()), name='cable_type_list'),
+    path('cabletype/list/', views.CableTypeList.as_view(), name='cable_type_list'),
    path('cabletype/create/', permission_required_with_403('assets.add_cable_type')(views.CableTypeCreate.as_view()), name='cable_type_create'),
    path('cabletype/<int:pk>/update/', permission_required_with_403('assets.change_cable_type')(views.CableTypeUpdate.as_view()), name='cable_type_update'),
-    path('cabletype/<int:pk>/detail/', permission_required_with_403('assets.view_cable_type')(views.CableTypeDetail.as_view()), name='cable_type_detail'),
+    path('cabletype/<int:pk>/detail/', views.CableTypeDetail.as_view(), name='cable_type_detail'),

    path('asset/search/', views.AssetSearch.as_view(), name='asset_search_json'),
    path('asset/id/<str:pk>/embed/',
         xframe_options_exempt(
-                               login_required(login_url='/user/login/embed/')(views.AssetEmbed.as_view())),
+             login_required(login_url='/user/login/embed/')(views.AssetEmbed.as_view())),
         name='asset_embed'),
    path('asset/id/<str:pk>/oembed_json/',
         views.AssetOembed.as_view(),
@@ -39,14 +35,12 @@ urlpatterns = [
    path('asset/audit/', permission_required_with_403('assets.change_asset')(views.AssetAuditList.as_view()), name='asset_audit_list'),
    path('asset/id/<str:pk>/audit/', permission_required_with_403('assets.change_asset')(views.AssetAudit.as_view()), name='asset_audit'),

-    path('supplier/list', views.SupplierList.as_view(), name='supplier_list'),
-    path('supplier/<int:pk>', views.SupplierDetail.as_view(), name='supplier_detail'),
-    path('supplier/create', permission_required_with_403('assets.add_supplier')
+    path('supplier/list/', views.SupplierList.as_view(), name='supplier_list'),
+    path('supplier/<int:pk>/', views.SupplierDetail.as_view(), name='supplier_detail'),
+    path('supplier/create/', permission_required_with_403('assets.add_supplier')
         (views.SupplierCreate.as_view()), name='supplier_create'),
-    path('supplier/<int:pk>/edit', permission_required_with_403('assets.change_supplier')
+    path('supplier/<int:pk>/edit/', permission_required_with_403('assets.change_supplier')
         (views.SupplierUpdate.as_view()), name='supplier_update'),
-    path('supplier/<int:pk>/history/', views.SupplierVersionHistory.as_view(),
-         name='supplier_history', kwargs={'model': models.Supplier}),

    path('supplier/search/', views.SupplierSearch.as_view(), name='supplier_search_json'),
 ]
--- a/assets/views.py
+++ b/assets/views.py
@@ -1,20 +1,21 @@
-from django.contrib.auth.mixins import LoginRequiredMixin
-from django.http import JsonResponse
-from django.http import HttpResponse, Http404
-from django.views import generic
-from django.views.decorators.csrf import csrf_exempt
-from django.utils.decorators import method_decorator
-from django.urls import reverse_lazy, reverse
-from django.db.models import Q
-from django.shortcuts import get_object_or_404
-from django.core import serializers
-from django.contrib import messages
-from assets import models, forms
-from RIGS import versioning
+import datetime

 import simplejson
-import datetime
+from assets import forms, models
+from django.contrib import messages
+from django.contrib.auth.mixins import LoginRequiredMixin
+from django.core import serializers
+from django.db.models import Q
+from django.http import Http404, HttpResponse, JsonResponse
+from django.shortcuts import get_object_or_404
+from django.urls import reverse, reverse_lazy
 from django.utils import timezone
+from django.utils.decorators import method_decorator
+from django.views import generic
+from django.views.decorators.csrf import csrf_exempt
+from versioning import versioning
+from PyRIGS.views import GenericListView, GenericDetailView, GenericUpdateView, GenericCreateView, ModalURLMixin
+from itertools import chain


@method_decorator(csrf_exempt, name='dispatch')
@@ -41,7 +42,7 @@ class AssetList(LoginRequiredMixin, generic.ListView):
            return self.model.objects.none()

        # TODO Feedback to user when search fails
-        query_string = form.cleaned_data['query'] or ""
+        query_string = form.cleaned_data['q'] or ""
        if len(query_string) == 0:
            queryset = self.model.objects.all()
        elif len(query_string) >= 3:
@@ -64,10 +65,12 @@ class AssetList(LoginRequiredMixin, generic.ListView):
    def get_context_data(self, **kwargs):
        context = super(AssetList, self).get_context_data(**kwargs)
        context["form"] = self.form
-
+        if hasattr(self.form, 'cleaned_data'):
+            context["category_filters"] = self.form.cleaned_data.get('category')
+            context["status_filters"] = self.form.cleaned_data.get('status')
        context["categories"] = models.AssetCategory.objects.all()
-
        context["statuses"] = models.AssetStatus.objects.all()
+        context["page_title"] = "Asset List"
        return context


@@ -97,19 +100,24 @@ class AssetIDUrlMixin:

 class AssetDetail(LoginRequiredMixin, AssetIDUrlMixin, generic.DetailView):
    model = models.Asset
-    template_name = 'asset_update.html'
+    template_name = 'asset_detail.html'
+
+    def get_context_data(self, **kwargs):
+        context = super().get_context_data(**kwargs)
+        context["page_title"] = "Asset {}".format(self.object.display_id)
+        return context


 class AssetEdit(LoginRequiredMixin, AssetIDUrlMixin, generic.UpdateView):
-    template_name = 'asset_update.html'
+    template_name = 'asset_form.html'
    model = models.Asset
    form_class = forms.AssetForm

    def get_context_data(self, **kwargs):
        context = super().get_context_data(**kwargs)
-        context['edit'] = True
+        context["edit"] = True
        context["connectors"] = models.Connector.objects.all()
-
+        context["page_title"] = "Edit Asset: {}".format(self.object.display_id)
        return context

    def get_success_url(self):
@@ -124,7 +132,7 @@ class AssetEdit(LoginRequiredMixin, AssetIDUrlMixin, generic.UpdateView):


 class AssetCreate(LoginRequiredMixin, generic.CreateView):
-    template_name = 'asset_create.html'
+    template_name = 'asset_form.html'
    model = models.Asset
    form_class = forms.AssetForm

@@ -132,7 +140,7 @@ class AssetCreate(LoginRequiredMixin, generic.CreateView):
        context = super(AssetCreate, self).get_context_data(**kwargs)
        context["create"] = True
        context["connectors"] = models.Connector.objects.all()
-
+        context["page_title"] = "Create Asset"
        return context

    def get_initial(self, *args, **kwargs):
@@ -152,13 +160,12 @@ class DuplicateMixin:


 class AssetDuplicate(DuplicateMixin, AssetIDUrlMixin, AssetCreate):
-    model = models.Asset
-
    def get_context_data(self, **kwargs):
        context = super().get_context_data(**kwargs)
        context["create"] = None
        context["duplicate"] = True
        context['previous_asset_id'] = self.get_object().asset_id
+        context["page_title"] = "Duplication of Asset: {}".format(context['previous_asset_id'])
        return context


@@ -194,6 +201,11 @@ class AssetAuditList(AssetList):
        self.form = forms.AssetSearchForm(data={})
        return self.model.objects.filter(Q(last_audited_at__isnull=True))

+    def get_context_data(self, **kwargs):
+        context = super(AssetAuditList, self).get_context_data(**kwargs)
+        context['page_title'] = "Asset Audit List"
+        return context
+

 class AssetAudit(AssetEdit):
    template_name = 'asset_audit.html'
@@ -208,34 +220,20 @@ class AssetAudit(AssetEdit):
        return super().get_success_url()


-class SupplierList(generic.ListView):
+class SupplierList(GenericListView):
    model = models.Supplier
-    template_name = 'supplier_list.html'
-    paginate_by = 40
    ordering = ['name']

-    def get_queryset(self):
-        if self.request.method == 'POST':
-            self.form = forms.SupplierSearchForm(data=self.request.POST)
-        elif self.request.method == 'GET':
-            self.form = forms.SupplierSearchForm(data=self.request.GET)
-        else:
-            self.form = forms.SupplierSearchForm(data={})
-        form = self.form
-        if not form.is_valid():
-            return self.model.objects.none()
-
-        query_string = form.cleaned_data['query'] or ""
-        if len(query_string) == 0:
-            queryset = self.model.objects.all()
-        else:
-            queryset = self.model.objects.filter(Q(name__icontains=query_string))
-
-        return queryset
-
    def get_context_data(self, **kwargs):
        context = super(SupplierList, self).get_context_data(**kwargs)
-        context["form"] = self.form
+        context['create'] = 'supplier_create'
+        context['edit'] = 'supplier_update'
+        context['can_edit'] = self.request.user.has_perm('assets.change_supplier')
+        context['detail'] = 'supplier_detail'
+        if self.request.is_ajax():
+            context['override'] = "base_ajax.html"
+        else:
+            context['override'] = 'base_assets.html'
        return context


@@ -250,43 +248,54 @@ class SupplierSearch(SupplierList):
        return JsonResponse(result, safe=False)


-class SupplierDetail(generic.DetailView):
+class SupplierDetail(GenericDetailView):
    model = models.Supplier
-    template_name = 'supplier_detail.html'
+
+    def get_context_data(self, **kwargs):
+        context = super(SupplierDetail, self).get_context_data(**kwargs)
+        context['history_link'] = 'supplier_history'
+        context['update_link'] = 'supplier_update'
+        context['detail_link'] = 'supplier_detail'
+        context['associated'] = 'partials/associated_assets.html'
+        context['associated2'] = ''
+        if self.request.is_ajax():
+            context['override'] = "base_ajax.html"
+        else:
+            context['override'] = 'base_assets.html'
+        context['can_edit'] = self.request.user.has_perm('assets.change_supplier')
+        return context


-class SupplierCreate(generic.CreateView):
+class SupplierCreate(GenericCreateView, ModalURLMixin):
    model = models.Supplier
    form_class = forms.SupplierForm
-    template_name = 'supplier_update.html'
+
+    def get_context_data(self, **kwargs):
+        context = super(SupplierCreate, self).get_context_data(**kwargs)
+        if self.request.is_ajax():
+            context['override'] = "base_ajax.html"
+        else:
+            context['override'] = 'base_assets.html'
+        return context
+
+    def get_success_url(self):
+        return self.get_close_url('supplier_update', 'supplier_detail')


-class SupplierUpdate(generic.UpdateView):
+class SupplierUpdate(GenericUpdateView, ModalURLMixin):
    model = models.Supplier
    form_class = forms.SupplierForm
-    template_name = 'supplier_update.html'

+    def get_context_data(self, **kwargs):
+        context = super(SupplierUpdate, self).get_context_data(**kwargs)
+        if self.request.is_ajax():
+            context['override'] = "base_ajax.html"
+        else:
+            context['override'] = 'base_assets.html'
+        return context

-class SupplierVersionHistory(versioning.VersionHistory):
-    template_name = "asset_version_history.html"
-
-
-class AssetVersionHistory(versioning.VersionHistory):
-    template_name = "asset_version_history.html"
-
-    def get_object(self, **kwargs):
-        return get_object_or_404(models.Asset, asset_id=self.kwargs['pk'])
-
-
-class ActivityTable(versioning.ActivityTable):
-    model = versioning.RIGSVersion
-    template_name = "asset_activity_table.html"
-    paginate_by = 25
-
-    def get_queryset(self):
-        versions = versioning.RIGSVersion.objects.get_for_multiple_models(
-            [models.Asset, models.Supplier])
-        return versions
+    def get_success_url(self):
+        return self.get_close_url('supplier_update', 'supplier_detail')


 class CableTypeList(generic.ListView):
@@ -295,11 +304,21 @@ class CableTypeList(generic.ListView):
    paginate_by = 40
    # ordering = ['__str__']

+    def get_context_data(self, **kwargs):
+        context = super().get_context_data(**kwargs)
+        context["page_title"] = "Cable Type List"
+        return context
+

 class CableTypeDetail(generic.DetailView):
    model = models.CableType
    template_name = 'cable_type_form.html'

+    def get_context_data(self, **kwargs):
+        context = super(CableTypeDetail, self).get_context_data(**kwargs)
+        context["page_title"] = "Cable Type {}".format(str(self.object))
+        return context
+

 class CableTypeCreate(generic.CreateView):
    model = models.CableType
@@ -309,6 +328,7 @@ class CableTypeCreate(generic.CreateView):
    def get_context_data(self, **kwargs):
        context = super(CableTypeCreate, self).get_context_data(**kwargs)
        context["create"] = True
+        context["page_title"] = "Create Cable Type"

        return context

@@ -324,6 +344,7 @@ class CableTypeUpdate(generic.UpdateView):
    def get_context_data(self, **kwargs):
        context = super(CableTypeUpdate, self).get_context_data(**kwargs)
        context["edit"] = True
+        context["page_title"] = "Edit Cable Type"

        return context