Fix some async issues running tests.

These were probably caused by the minor version change to jQuery.
Test logic remains unchanged as the underlying application still worked fine.

.gitignore

@@ -25,6 +25,7 @@ var/
 *.egg-info/
 .installed.cfg
 *.egg
+node_modules/
 
 # Continer extras
 .vagrant
@@ -53,7 +54,6 @@ coverage.xml
 
 # Django stuff:
 *.log
-db.sqlite3
 
 # Sphinx documentation
 docs/_build/

.travis.yml

@@ -1,32 +1,25 @@
-language: python
+language: node_js
+node_js:
+  "6"
 python:
-  "3.6"
-cache: pip
+  "2.7"
 
-addons:
-  chrome: stable
+before_install:
+  - "export DISPLAY=:99.0"
+  - "/sbin/start-stop-daemon --start --quiet --pidfile /tmp/custom_xvfb_99.pid --make-pidfile --background --exec /usr/bin/Xvfb -- :99 -ac -screen 0 1280x1024x16"
 
 install:
-  - wget https://chromedriver.storage.googleapis.com/2.36/chromedriver_linux64.zip
-  - unzip chromedriver_linux64.zip
-  - export PATH=$PATH:$(pwd)
-  - chmod +x chromedriver
-  - pip install -r requirements.txt
-  - pip install coveralls codeclimate-test-reporter pep8
+  - pip install --user -r requirements.txt
+  - pip install --user coveralls codeclimate-test-reporter
+  - npm install
+  - npm run build
 
 before_script:
-  - export PATH=$PATH:/usr/lib/chromium-browser/
   - python manage.py collectstatic --noinput
 
 script:
-  - pep8 . --exclude=migrations,importer*
-  - python manage.py check
-  - python manage.py makemigrations --check --dry-run
-  - coverage run manage.py test --verbosity=2
+  - coverage run manage.py test RIGS
 
 after_success:
   - coveralls
   - codeclimate-test-reporter
-
-notifications:
-  webhooks: https://fathomless-fjord-24024.herokuapp.com/notify

PyRIGS/decorators.py

@@ -1,7 +1,8 @@
 from django.contrib.auth import REDIRECT_FIELD_NAME
-from django.shortcuts import render
+from django.shortcuts import render_to_response
+from django.template import RequestContext
 from django.http import HttpResponseRedirect
-from django.urls import reverse
+from django.core.urlresolvers import reverse
 
 from RIGS import models
 
@@ -23,17 +24,17 @@ def user_passes_test_with_403(test_func, login_url=None, oembed_view=None):
         def _checklogin(request, *args, **kwargs):
             if test_func(request.user):
                 return view_func(request, *args, **kwargs)
-            elif not request.user.is_authenticated:
+            elif not request.user.is_authenticated():
                 if oembed_view is not None:
-                    context = {}
-                    context['oembed_url'] = "{0}://{1}{2}".format(request.scheme, request.META['HTTP_HOST'], reverse(oembed_view, kwargs=kwargs))
-                    context['login_url'] = "{0}?{1}={2}".format(login_url, REDIRECT_FIELD_NAME, request.get_full_path())
-                    resp = render(request, 'login_redirect.html', context=context)
+                    extra_context = {}
+                    extra_context['oembed_url'] = "{0}://{1}{2}".format(request.scheme, request.META['HTTP_HOST'], reverse(oembed_view, kwargs=kwargs))
+                    extra_context['login_url'] = "{0}?{1}={2}".format(login_url, REDIRECT_FIELD_NAME, request.get_full_path())
+                    resp = render_to_response('login_redirect.html', extra_context, context_instance=RequestContext(request))
                     return resp
                 else:
                     return HttpResponseRedirect('%s?%s=%s' % (login_url, REDIRECT_FIELD_NAME, request.get_full_path()))
             else:
-                resp = render(request, '403.html')
+                resp = render_to_response('403.html', context_instance=RequestContext(request))
                 resp.status_code = 403
                 return resp
         _checklogin.__doc__ = view_func.__doc__
@@ -61,7 +62,7 @@ def api_key_required(function):
         userid = kwargs.get('api_pk')
         key = kwargs.get('api_key')
 
-        error_resp = render(request, '403.html')
+        error_resp = render_to_response('403.html', context_instance=RequestContext(request))
         error_resp.status_code = 403
 
         if key is None:
@@ -78,17 +79,3 @@ def api_key_required(function):
             return error_resp
         return function(request, *args, **kwargs)
     return wrap
-
-
-def nottinghamtec_address_required(function):
-    """
-    Checks that the current user has an email address ending @nottinghamtec.co.uk
-    """
-    def wrap(request, *args, **kwargs):
-        # Fail if current user's email address isn't @nottinghamtec.co.uk
-        if not request.user.email.endswith('@nottinghamtec.co.uk'):
-            error_resp = render(request, 'RIGS/eventauthorisation_request_error.html')
-            return error_resp
-
-        return function(request, *args, **kwargs)
-    return wrap

PyRIGS/formats/en/formats.py

@@ -1,5 +1,5 @@
-
+from __future__ import unicode_literals
 
 DATETIME_FORMAT = ('d/m/Y H:i')
 DATE_FORMAT = ('d/m/Y')
-TIME_FORMAT = ('H:i')
+TIME_FORMAT = ('H:i')

PyRIGS/settings.py

@@ -10,35 +10,29 @@ https://docs.djangoproject.com/en/1.7/ref/settings/
 
 # Build paths inside the project like this: os.path.join(BASE_DIR, ...)
 import os
-import raven
-
 BASE_DIR = os.path.dirname(os.path.dirname(__file__))
 
 # Quick-start development settings - unsuitable for production
 # See https://docs.djangoproject.com/en/1.7/howto/deployment/checklist/
 
 # SECURITY WARNING: keep the secret key used in production secret!
-SECRET_KEY = os.environ.get('SECRET_KEY') if os.environ.get(
-    'SECRET_KEY') else 'gxhy(a#5mhp289_=6xx$7jh=eh$ymxg^ymc+di*0c*geiu3p_e'
+SECRET_KEY = os.environ.get('SECRET_KEY') if os.environ.get('SECRET_KEY') else 'gxhy(a#5mhp289_=6xx$7jh=eh$ymxg^ymc+di*0c*geiu3p_e'
 
 # SECURITY WARNING: don't run with debug turned on in production!
 DEBUG = bool(int(os.environ.get('DEBUG'))) if os.environ.get('DEBUG') else True
 
-
 STAGING = bool(int(os.environ.get('STAGING'))) if os.environ.get('STAGING') else False
 
+TEMPLATE_DEBUG = True
+
 ALLOWED_HOSTS = ['pyrigs.nottinghamtec.co.uk', 'rigs.nottinghamtec.co.uk', 'pyrigs.herokuapp.com']
 
 if STAGING:
     ALLOWED_HOSTS.append('.herokuapp.com')
 
-if DEBUG:
-    ALLOWED_HOSTS.append('localhost')
-    ALLOWED_HOSTS.append('example.com')
-
 SECURE_PROXY_SSL_HEADER = ('HTTP_X_FORWARDED_PROTO', 'https')
 if not DEBUG:
-    SECURE_SSL_REDIRECT = True  # Redirect all http requests to https
+    SECURE_SSL_REDIRECT = True # Redirect all http requests to https
 
 INTERNAL_IPS = ['127.0.0.1']
 
@@ -46,6 +40,7 @@ ADMINS = (
     ('Tom Price', 'tomtom5152@gmail.com')
 )
 
+
 # Application definition
 
 INSTALLED_APPS = (
@@ -65,15 +60,15 @@ INSTALLED_APPS = (
     'raven.contrib.django.raven_compat',
 )
 
-MIDDLEWARE = (
+MIDDLEWARE_CLASSES = (
     'raven.contrib.django.raven_compat.middleware.SentryResponseErrorIdMiddleware',
     'django.middleware.security.SecurityMiddleware',
-    'debug_toolbar.middleware.DebugToolbarMiddleware',
     'reversion.middleware.RevisionMiddleware',
     'django.contrib.sessions.middleware.SessionMiddleware',
     'django.middleware.common.CommonMiddleware',
     'django.middleware.csrf.CsrfViewMiddleware',
     'django.contrib.auth.middleware.AuthenticationMiddleware',
+    'django.contrib.auth.middleware.SessionAuthenticationMiddleware',
     'django.contrib.messages.middleware.MessageMiddleware',
     'django.middleware.clickjacking.XFrameOptionsMiddleware',
 )
@@ -82,6 +77,7 @@ ROOT_URLCONF = 'PyRIGS.urls'
 
 WSGI_APPLICATION = 'PyRIGS.wsgi.application'
 
+
 # Database
 # https://docs.djangoproject.com/en/1.7/ref/settings/#databases
 DATABASES = {
@@ -93,10 +89,9 @@ DATABASES = {
 
 if not DEBUG:
     import dj_database_url
-
     DATABASES['default'] = dj_database_url.config()
 
-# Logging
+# Logging 
 LOGGING = {
     'version': 1,
     'disable_existing_loggers': False,
@@ -124,12 +119,12 @@ LOGGING = {
         'mail_admins': {
             'class': 'django.utils.log.AdminEmailHandler',
             'level': 'ERROR',
-            # But the emails are plain text by default - HTML is nicer
+             # But the emails are plain text by default - HTML is nicer
             'include_html': True,
         },
     },
     'loggers': {
-        # Again, default Django configuration to email unhandled exceptions
+         # Again, default Django configuration to email unhandled exceptions
         'django.request': {
             'handlers': ['mail_admins'],
             'level': 'ERROR',
@@ -144,6 +139,8 @@ LOGGING = {
     }
 }
 
+import raven
+
 RAVEN_CONFIG = {
     'dsn': os.environ.get('RAVEN_DSN'),
     # If you are using git, you can also automatically configure the
@@ -155,14 +152,14 @@ RAVEN_CONFIG = {
 AUTH_USER_MODEL = 'RIGS.Profile'
 
 LOGIN_REDIRECT_URL = '/'
-LOGIN_URL = '/user/login/'
-LOGOUT_URL = '/user/logout/'
+LOGIN_URL = '/user/login'
+LOGOUT_URL = '/user/logout'
 
 ACCOUNT_ACTIVATION_DAYS = 7
 
 # reCAPTCHA settings
-RECAPTCHA_PUBLIC_KEY = os.environ.get('RECAPTCHA_PUBLIC_KEY', "6LeIxAcTAAAAAJcZVRqyHh71UMIEGNQ_MXjiZKhI")  # If not set, use development key
-RECAPTCHA_PRIVATE_KEY = os.environ.get('RECAPTCHA_PRIVATE_KEY', "6LeIxAcTAAAAAGG-vFI1TnRWxMZNFuojJ4WifJWe")  # If not set, use development key
+RECAPTCHA_PUBLIC_KEY = os.environ.get('RECAPTCHA_PUBLIC_KEY', None)
+RECAPTCHA_PRIVATE_KEY = os.environ.get('RECAPTCHA_PRIVATE_KEY', None)
 NOCAPTCHA = True
 
 # Email
@@ -170,7 +167,7 @@ EMAILER_TEST = False
 if not DEBUG or EMAILER_TEST:
     EMAIL_BACKEND = 'django.core.mail.backends.smtp.EmailBackend'
     EMAIL_HOST = os.environ.get('EMAIL_HOST')
-    EMAIL_PORT = int(os.environ.get('EMAIL_PORT', 25))
+    EMAIL_PORT = int(os.environ.get('EMAIL_PORT'))
     EMAIL_HOST_USER = os.environ.get('EMAIL_HOST_USER')
     EMAIL_HOST_PASSWORD = os.environ.get('EMAIL_HOST_PASSWORD')
     EMAIL_USE_TLS = bool(int(os.environ.get('EMAIL_USE_TLS', 0)))
@@ -194,41 +191,33 @@ USE_L10N = True
 
 USE_TZ = True
 
-DATETIME_INPUT_FORMATS = ('%Y-%m-%dT%H:%M', '%Y-%m-%dT%H:%M:%S')
+DATETIME_INPUT_FORMATS = ('%Y-%m-%dT%H:%M','%Y-%m-%dT%H:%M:%S')
+
+TEMPLATE_CONTEXT_PROCESSORS = (
+    "django.contrib.auth.context_processors.auth",
+    "django.core.context_processors.debug",
+    "django.core.context_processors.i18n",
+    "django.core.context_processors.media",
+    "django.core.context_processors.static",
+    "django.core.context_processors.tz",
+    "django.core.context_processors.request",
+    "django.contrib.messages.context_processors.messages",
+)
+
 
 # Static files (CSS, JavaScript, Images)
 # https://docs.djangoproject.com/en/1.7/howto/static-files/
 STATICFILES_STORAGE = 'django.contrib.staticfiles.storage.ManifestStaticFilesStorage'
 STATIC_URL = '/static/'
 STATIC_ROOT = os.path.join(BASE_DIR, 'static/')
-STATIC_DIRS = (
-    os.path.join(BASE_DIR, 'static/')
+STATICFILES_DIRS = (
+    os.path.join(BASE_DIR, 'dist/'),
 )
 
-TEMPLATES = [
-    {
-        'BACKEND': 'django.template.backends.django.DjangoTemplates',
-        'DIRS': [
-            os.path.join(BASE_DIR, 'templates'),
-        ],
-        'APP_DIRS': True,
-        'OPTIONS': {
-            'context_processors': [
-                "django.contrib.auth.context_processors.auth",
-                "django.template.context_processors.debug",
-                "django.template.context_processors.i18n",
-                "django.template.context_processors.media",
-                "django.template.context_processors.static",
-                "django.template.context_processors.tz",
-                "django.template.context_processors.request",
-                "django.contrib.messages.context_processors.messages",
-            ],
-            'debug': DEBUG
-        },
-    },
-]
+TEMPLATE_DIRS = (
+    os.path.join(BASE_DIR,  'templates'),
+)
 
-USE_GRAVATAR = True
+USE_GRAVATAR=True
 
 TERMS_OF_HIRE_URL = "http://www.nottinghamtec.co.uk/terms.pdf"
-AUTHORISATION_NOTIFICATION_ADDRESS = 'productions@nottinghamtec.co.uk'

PyRIGS/urls.py

@@ -1,4 +1,4 @@
-from django.conf.urls import include, url
+from django.conf.urls import patterns, include, url
 from django.contrib import admin
 from django.contrib.staticfiles.urls import staticfiles_urlpatterns
 from django.conf import settings
@@ -6,24 +6,19 @@ from registration.backends.default.views import RegistrationView
 import RIGS
 from RIGS import regbackend
 
-urlpatterns = [
+urlpatterns = patterns('',
     # Examples:
     # url(r'^$', 'PyRIGS.views.home', name='home'),
     # url(r'^blog/', include('blog.urls')),
 
     url(r'^', include('RIGS.urls')),
-    url('^user/register/$', RegistrationView.as_view(form_class=RIGS.forms.ProfileRegistrationFormUniqueEmail),
+    url('^user/register/$', RegistrationView.as_view(form_class=RIGS.forms.ProfileRegistrationFormUniqueEmail), 
         name="registration_register"),
     url('^user/', include('django.contrib.auth.urls')),
     url('^user/', include('registration.backends.default.urls')),
 
-    url(r'^admin/', admin.site.urls),
-]
+    url(r'^admin/', include(admin.site.urls)),
+)
 
 if settings.DEBUG:
-    urlpatterns += staticfiles_urlpatterns()
-
-    import debug_toolbar
-    urlpatterns = [
-        url(r'^__debug__/', include(debug_toolbar.urls)),
-    ] + urlpatterns
+    urlpatterns += staticfiles_urlpatterns()

PyRIGS/wsgi.py

@@ -9,7 +9,7 @@ https://docs.djangoproject.com/en/1.7/howto/deployment/wsgi/
 import os
 os.environ.setdefault("DJANGO_SETTINGS_MODULE", "PyRIGS.settings")
 
-from django.core.wsgi import get_wsgi_application  # noqa
-from dj_static import Cling  # noqa
+from django.core.wsgi import get_wsgi_application
+from dj_static import Cling
 
 application = Cling(get_wsgi_application())

README.md

@@ -1,8 +1,6 @@
 # TEC PA & Lighting - PyRIGS #
 [![Build Status](https://travis-ci.org/nottinghamtec/PyRIGS.svg?branch=develop)](https://travis-ci.org/nottinghamtec/PyRIGS)
 [![Coverage Status](https://coveralls.io/repos/github/nottinghamtec/PyRIGS/badge.svg?branch=develop)](https://coveralls.io/github/nottinghamtec/PyRIGS?branch=develop)
-[![Dependency Status](https://gemnasium.com/badges/github.com/nottinghamtec/PyRIGS.svg)](https://gemnasium.com/github.com/nottinghamtec/PyRIGS)
-
 
 Welcome to TEC PA & Lightings PyRIGS program. This is a reimplementation of the existing Rig Information Gathering System (RIGS) that was developed using Ruby on Rails.
 
@@ -95,18 +93,5 @@ python manage.py generateSampleData
 |keyholder|keyholder|
 |basic    |basic    |
 
-### Testing ###
-Tests are contained in 3 files. `RIGS/test_models.py` contains tests for logic within the data models. `RIGS/test_unit.py` contains "Live server" tests, using raw web requests. `RIGS/test_integration.py` contains user interface tests which take control of a web browser. For automated Travis tests, we use [Sauce Labs](https://saucelabs.com). When debugging locally, ensure that you have the latest version of Google Chrome installed, then install [chromedriver](https://sites.google.com/a/chromium.org/chromedriver/) and ensure it is on the `PATH`.
-
-You can run the entire test suite, or you can run specific sections individually. For example, in order of specificity:
-
-```
-python manage.py test
-python manage.py test RIGS.test_models
-python manage.py test RIGS.test_models.EventTestCase
-python manage.py test RIGS.test_models.EventTestCase.test_current_events
-
-```
-
 ### Committing, pushing and testing ###
 Feel free to commit as you wish, on your own branch. On my branch (master for development) do not commit code that you either know doesn't work or don't know works. If you must commit this code, please make sure you say in the commit message that it isn't working, and if you can why it isn't working. If and only if you absolutely must push, then please don't leave it as the HEAD for too long, it's not much to ask but when you are done just make sure you haven't broken the HEAD for the next person.

RIGS/__init__.py

@@ -1 +0,0 @@
-default_app_config = 'RIGS.apps.RIGSAppConfig'

RIGS/admin.py

@@ -2,7 +2,7 @@ from django.contrib import admin
 from RIGS import models, forms
 from django.contrib.auth.admin import UserAdmin
 from django.utils.translation import ugettext_lazy as _
-from reversion.admin import VersionAdmin
+import reversion
 
 from django.contrib.admin import helpers
 from django.template.response import TemplateResponse
@@ -12,12 +12,10 @@ from django.core.exceptions import ObjectDoesNotExist
 from django.db.models import Count
 from django.forms import ModelForm
 
-from reversion import revisions as reversion
-
 # Register your models here.
-admin.site.register(models.VatRate, VersionAdmin)
-admin.site.register(models.Event, VersionAdmin)
-admin.site.register(models.EventItem, VersionAdmin)
+admin.site.register(models.VatRate, reversion.VersionAdmin)
+admin.site.register(models.Event, reversion.VersionAdmin)
+admin.site.register(models.EventItem, reversion.VersionAdmin)
 admin.site.register(models.Invoice)
 admin.site.register(models.Payment)
 
@@ -43,7 +41,7 @@ class ProfileAdmin(UserAdmin):
     add_form = forms.ProfileCreationForm
 
 
-class AssociateAdmin(VersionAdmin):
+class AssociateAdmin(reversion.VersionAdmin):
     list_display = ('id', 'name', 'number_of_events')
     search_fields = ['id', 'name']
     list_display_links = ['id', 'name']
@@ -95,7 +93,8 @@ class AssociateAdmin(VersionAdmin):
                 'action_checkbox_name': helpers.ACTION_CHECKBOX_NAME,
                 'forms': forms
             }
-            return TemplateResponse(request, 'RIGS/admin_associate_merge.html', context)
+            return TemplateResponse(request, 'RIGS/admin_associate_merge.html', context,
+                                    current_app=self.admin_site.name)
 
 
 @admin.register(models.Person)

RIGS/apps.py

@@ -1,8 +0,0 @@
-from django.apps import AppConfig
-
-
-class RIGSAppConfig(AppConfig):
-    name = 'RIGS'
-
-    def ready(self):
-        import RIGS.signals

RIGS/finance.py

@@ -1,8 +1,9 @@
+import cStringIO as StringIO
 import datetime
 import re
 
 from django.contrib import messages
-from django.urls import reverse_lazy
+from django.core.urlresolvers import reverse_lazy
 from django.http import Http404, HttpResponseRedirect
 from django.http import HttpResponse
 from django.shortcuts import get_object_or_404
@@ -14,9 +15,6 @@ from z3c.rml import rml2pdf
 
 from RIGS import models
 
-from django import forms
-forms.DateField.widget = forms.DateInput(attrs={'type': 'date'})
-
 
 class InvoiceIndex(generic.ListView):
     model = models.Invoice
@@ -57,8 +55,8 @@ class InvoicePrint(generic.View):
         invoice = get_object_or_404(models.Invoice, pk=pk)
         object = invoice.event
         template = get_template('RIGS/event_print.xml')
-
-        context = {
+        copies = ('TEC', 'Client')
+        context = RequestContext(request, {
             'object': object,
             'fonts': {
                 'opensans': {
@@ -68,9 +66,10 @@ class InvoicePrint(generic.View):
             },
             'invoice': invoice,
             'current_user': request.user,
-        }
+        })
 
         rml = template.render(context)
+        buffer = StringIO.StringIO()
 
         buffer = rml2pdf.parseString(rml)
 
@@ -95,7 +94,6 @@ class InvoiceVoid(generic.View):
             return HttpResponseRedirect(reverse_lazy('invoice_list'))
         return HttpResponseRedirect(reverse_lazy('invoice_detail', kwargs={'pk': object.pk}))
 
-
 class InvoiceDelete(generic.DeleteView):
     model = models.Invoice
 
@@ -116,7 +114,6 @@ class InvoiceDelete(generic.DeleteView):
     def get_success_url(self):
         return self.request.POST.get('next')
 
-
 class InvoiceArchive(generic.ListView):
     model = models.Invoice
     template_name = 'RIGS/invoice_list_archive.html'
@@ -145,11 +142,11 @@ class InvoiceWaiting(generic.ListView):
         events = self.model.objects.filter(
             (
                 Q(start_date__lte=datetime.date.today(), end_date__isnull=True) |  # Starts before with no end
-                Q(end_date__lte=datetime.date.today())  # Has end date, finishes before
-            ) & Q(invoice__isnull=True) &  # Has not already been invoiced
-            Q(is_rig=True)  # Is a rig (not non-rig)
-
-        ).order_by('start_date') \
+                Q(end_date__lte=datetime.date.today()) # Has end date, finishes before
+            ) & Q(invoice__isnull=True) # Has not already been invoiced
+            & Q(is_rig=True) # Is a rig (not non-rig)
+            
+            ).order_by('start_date') \
             .select_related('person',
                             'organisation',
                             'venue', 'mic') \
@@ -178,7 +175,7 @@ class PaymentCreate(generic.CreateView):
     def get_initial(self):
         initial = super(generic.CreateView, self).get_initial()
         invoicepk = self.request.GET.get('invoice', self.request.POST.get('invoice', None))
-        if invoicepk is None:
+        if invoicepk == None:
             raise Http404()
         invoice = get_object_or_404(models.Invoice, pk=invoicepk)
         initial.update({'invoice': invoice})

RIGS/forms.py

@@ -1,3 +1,4 @@
+__author__ = 'Ghost'
 from django import forms
 from django.utils import formats
 from django.conf import settings
@@ -9,14 +10,8 @@ import simplejson
 
 from RIGS import models
 
-# Override the django form defaults to use the HTML date/time/datetime UI elements
-forms.DateField.widget = forms.DateInput(attrs={'type': 'date'})
-forms.TimeField.widget = forms.TextInput(attrs={'type': 'time'})
-forms.DateTimeField.widget = forms.DateTimeInput(attrs={'type': 'datetime-local'})
 
 # Registration
-
-
 class ProfileRegistrationFormUniqueEmail(RegistrationFormUniqueEmail):
     captcha = ReCaptchaField()
 
@@ -50,7 +45,7 @@ class ProfileChangeForm(UserChangeForm):
 
 # Events Shit
 class EventForm(forms.ModelForm):
-    datetime_input_formats = formats.get_format_lazy("DATETIME_INPUT_FORMATS") + list(settings.DATETIME_INPUT_FORMATS)
+    datetime_input_formats = formats.get_format_lazy("DATETIME_INPUT_FORMATS") + settings.DATETIME_INPUT_FORMATS
     meet_at = forms.DateTimeField(input_formats=datetime_input_formats, required=False)
     access_at = forms.DateTimeField(input_formats=datetime_input_formats, required=False)
 
@@ -145,32 +140,4 @@ class EventForm(forms.ModelForm):
         fields = ['is_rig', 'name', 'venue', 'start_time', 'end_date', 'start_date',
                   'end_time', 'meet_at', 'access_at', 'description', 'notes', 'mic',
                   'person', 'organisation', 'dry_hire', 'checked_in_by', 'status',
-                  'purchase_order', 'collector']
-
-
-class BaseClientEventAuthorisationForm(forms.ModelForm):
-    tos = forms.BooleanField(required=True, label="Terms of hire")
-    name = forms.CharField(label="Your Name")
-
-    def clean(self):
-        if self.cleaned_data.get('amount') != self.instance.event.total:
-            self.add_error('amount', 'The amount authorised must equal the total for the event (inc VAT).')
-        return super(BaseClientEventAuthorisationForm, self).clean()
-
-    class Meta:
-        abstract = True
-
-
-class InternalClientEventAuthorisationForm(BaseClientEventAuthorisationForm):
-    def __init__(self, **kwargs):
-        super(InternalClientEventAuthorisationForm, self).__init__(**kwargs)
-        self.fields['uni_id'].required = True
-        self.fields['account_code'].required = True
-
-    class Meta:
-        model = models.EventAuthorisation
-        fields = ('tos', 'name', 'amount', 'uni_id', 'account_code')
-
-
-class EventAuthorisationRequestForm(forms.Form):
-    email = forms.EmailField(required=True, label='Authoriser Email')
+                  'collector', 'purchase_order']

RIGS/ical.py

@@ -1,19 +1,17 @@
 from RIGS import models, forms
 from django_ical.views import ICalFeed
 from django.db.models import Q
-from django.urls import reverse_lazy, reverse, NoReverseMatch
+from django.core.urlresolvers import reverse_lazy, reverse, NoReverseMatch
 from django.utils import timezone
 from django.conf import settings
 
-import datetime
-import pytz
-
+import datetime, pytz
 
 class CalendarICS(ICalFeed):
     """
     A simple event calender
     """
-    # Metadata which is passed on to clients
+    #Metadata which is passed on to clients
     product_id = 'RIGS'
     title = 'RIGS Calendar'
     timezone = settings.TIME_ZONE
@@ -29,39 +27,39 @@ class CalendarICS(ICalFeed):
     def get_object(self, request, *args, **kwargs):
         params = {}
 
-        params['dry-hire'] = request.GET.get('dry-hire', 'true') == 'true'
-        params['non-rig'] = request.GET.get('non-rig', 'true') == 'true'
-        params['rig'] = request.GET.get('rig', 'true') == 'true'
+        params['dry-hire'] = request.GET.get('dry-hire','true') == 'true'
+        params['non-rig'] = request.GET.get('non-rig','true') == 'true'
+        params['rig'] = request.GET.get('rig','true') == 'true'
 
-        params['cancelled'] = request.GET.get('cancelled', 'false') == 'true'
-        params['provisional'] = request.GET.get('provisional', 'true') == 'true'
-        params['confirmed'] = request.GET.get('confirmed', 'true') == 'true'
+        params['cancelled'] = request.GET.get('cancelled','false') == 'true'
+        params['provisional'] = request.GET.get('provisional','true') == 'true'
+        params['confirmed'] = request.GET.get('confirmed','true') == 'true'
 
         return params
 
-    def description(self, params):
+    def description(self,params):
         desc = "Calendar generated by RIGS system. This includes event types: " + ('Rig, ' if params['rig'] else '') + ('Non-rig, ' if params['non-rig'] else '') + ('Dry Hire ' if params['dry-hire'] else '') + '\n'
         desc = desc + "Includes events with status: " + ('Cancelled, ' if params['cancelled'] else '') + ('Provisional, ' if params['provisional'] else '') + ('Confirmed/Booked, ' if params['confirmed'] else '')
 
         return desc
 
     def items(self, params):
-        # include events from up to 1 year ago
+        #include events from up to 1 year ago
         start = datetime.datetime.now() - datetime.timedelta(days=365)
         filter = Q(start_date__gte=start)
 
-        typeFilters = Q(pk=None)  # Need something that is false for every entry
+        typeFilters = Q(pk=None) #Need something that is false for every entry
 
         if params['dry-hire']:
             typeFilters = typeFilters | Q(dry_hire=True, is_rig=True)
 
         if params['non-rig']:
             typeFilters = typeFilters | Q(is_rig=False)
-
+        
         if params['rig']:
             typeFilters = typeFilters | Q(is_rig=True, dry_hire=False)
-
-        statusFilters = Q(pk=None)  # Need something that is false for every entry
+        
+        statusFilters = Q(pk=None) #Need something that is false for every entry
 
         if params['cancelled']:
             statusFilters = statusFilters | Q(status=models.Event.CANCELLED)
@@ -89,9 +87,9 @@ class CalendarICS(ICalFeed):
 
         # Add the rig name
         title += item.name
-
+        
         # Add the status
-        title += ' (' + str(item.get_status_display()) + ')'
+        title += ' ('+str(item.get_status_display())+')'
 
         return title
 
@@ -99,12 +97,12 @@ class CalendarICS(ICalFeed):
         return item.earliest_time
 
     def item_end_datetime(self, item):
-        if type(item.latest_time) == datetime.date:  # Ical end_datetime is non-inclusive, so add a day
+        if type(item.latest_time) is datetime.date: # Ical end_datetime is non-inclusive, so add a day
             return item.latest_time + datetime.timedelta(days=1)
 
         return item.latest_time
 
-    def item_location(self, item):
+    def item_location(self,item):
         return item.venue
 
     def item_description(self, item):
@@ -113,33 +111,34 @@ class CalendarICS(ICalFeed):
 
         tz = pytz.timezone(self.timezone)
 
-        desc = 'Rig ID = ' + str(item.pk) + '\n'
+        desc = 'Rig ID = '+str(item.pk)+'\n'
         desc += 'Event = ' + item.name + '\n'
         desc += 'Venue = ' + (item.venue.name if item.venue else '---') + '\n'
         if item.is_rig and item.person:
-            desc += 'Client = ' + item.person.name + ((' for ' + item.organisation.name) if item.organisation else '') + '\n'
+            desc += 'Client = ' + item.person.name + ( (' for '+item.organisation.name) if item.organisation else '') + '\n'
         desc += 'Status = ' + str(item.get_status_display()) + '\n'
         desc += 'MIC = ' + (item.mic.name if item.mic else '---') + '\n'
-
+        
+        
         desc += '\n'
         if item.meet_at:
             desc += 'Crew Meet = ' + (item.meet_at.astimezone(tz).strftime('%Y-%m-%d %H:%M') if item.meet_at else '---') + '\n'
         if item.access_at:
             desc += 'Access At = ' + (item.access_at.astimezone(tz).strftime('%Y-%m-%d %H:%M') if item.access_at else '---') + '\n'
         if item.start_date:
-            desc += 'Event Start = ' + item.start_date.strftime('%Y-%m-%d') + ((' ' + item.start_time.strftime('%H:%M')) if item.has_start_time else '') + '\n'
+            desc += 'Event Start = ' + item.start_date.strftime('%Y-%m-%d') + ((' '+item.start_time.strftime('%H:%M')) if item.has_start_time else '') + '\n'
         if item.end_date:
-            desc += 'Event End = ' + item.end_date.strftime('%Y-%m-%d') + ((' ' + item.end_time.strftime('%H:%M')) if item.has_end_time else '') + '\n'
+            desc += 'Event End = ' + item.end_date.strftime('%Y-%m-%d') + ((' '+item.end_time.strftime('%H:%M')) if item.has_end_time else '') + '\n'
 
         desc += '\n'
         if item.description:
-            desc += 'Event Description:\n' + item.description + '\n\n'
+            desc += 'Event Description:\n'+item.description+'\n\n'
         # if item.notes:  // Need to add proper keyholder checks before this gets put back
-        #     desc += 'Notes:\n'+item.notes+'\n\n'
-
-        base_url = "https://rigs.nottinghamtec.co.uk"
-        desc += 'URL = ' + base_url + str(item.get_absolute_url())
+        #     desc += 'Notes:\n'+item.notes+'\n\n'  
 
+        base_url = "http://rigs.nottinghamtec.co.uk"
+        desc += 'URL = '+base_url+str(item.get_absolute_url())
+        
         return desc
 
     def item_link(self, item):
@@ -150,8 +149,8 @@ class CalendarICS(ICalFeed):
     # def item_created(self, item):  #TODO - Implement created date-time (using django-reversion?) - not really necessary though
     #     return ''
 
-    def item_updated(self, item):  # some ical clients will display this
+    def item_updated(self, item): # some ical clients will display this
         return item.last_edited_at
 
-    def item_guid(self, item):  # use the rig-id as the ical unique event identifier
-        return item.pk
+    def item_guid(self, item): # use the rig-id as the ical unique event identifier
+        return item.pk

RIGS/management/commands/generateSampleData.py

@@ -1,14 +1,12 @@
 from django.core.management.base import BaseCommand, CommandError
 from django.contrib.auth.models import Group, Permission
 from django.db import transaction
-from reversion import revisions as reversion
+import reversion
 
 import datetime
 import random
 
 from RIGS import models
-
-
 class Command(BaseCommand):
     help = 'Adds sample data to use for testing'
     can_import_settings = True
@@ -21,32 +19,32 @@ class Command(BaseCommand):
     keyholder_group = None
     finance_group = None
 
+
     def handle(self, *args, **options):
         from django.conf import settings
 
         if not (settings.DEBUG or settings.STAGING):
             raise CommandError('You cannot run this command in production')
 
-        random.seed('Some object to seed the random number generator')  # otherwise it is done by time, which could lead to inconsistant tests
+        random.seed('Some object to seed the random number generator') # otherwise it is done by time, which could lead to inconsistant tests
 
         with transaction.atomic():
-            models.VatRate.objects.create(start_at='2014-03-05', rate=0.20, comment='test1')
+            models.VatRate.objects.create(start_at='2014-03-05',rate=0.20,comment='test1')
 
             self.setupGenericProfiles()
 
             self.setupPeople()
             self.setupOrganisations()
             self.setupVenues()
-
+            
             self.setupGroups()
-
+            
             self.setupEvents()
 
             self.setupUsefulProfiles()
 
     def setupPeople(self):
-        names = ["Regulus Black", "Sirius Black", "Lavender Brown", "Cho Chang", "Vincent Crabbe", "Vincent Crabbe", "Bartemius Crouch", "Fleur Delacour", "Cedric Diggory", "Alberforth Dumbledore", "Albus Dumbledore", "Dudley Dursley", "Petunia Dursley", "Vernon Dursley", "Argus Filch", "Seamus Finnigan", "Nicolas Flamel", "Cornelius Fudge", "Goyle", "Gregory Goyle", "Hermione Granger", "Rubeus Hagrid", "Igor Karkaroff", "Viktor Krum", "Bellatrix Lestrange", "Alice Longbottom", "Frank Longbottom", "Neville Longbottom", "Luna Lovegood", "Xenophilius Lovegood",  # noqa
-                 "Remus Lupin", "Draco Malfoy", "Lucius Malfoy", "Narcissa Malfoy", "Olympe Maxime", "Minerva McGonagall", "Mad-Eye Moody", "Peter Pettigrew", "Harry Potter", "James Potter", "Lily Potter", "Quirinus Quirrell", "Tom Riddle", "Mary Riddle", "Lord Voldemort", "Rita Skeeter", "Severus Snape", "Nymphadora Tonks", "Dolores Janes Umbridge", "Arthur Weasley", "Bill Weasley", "Charlie Weasley", "Fred Weasley", "George Weasley", "Ginny Weasley", "Molly Weasley", "Percy Weasley", "Ron Weasley", "Dobby", "Fluffy", "Hedwig", "Moaning Myrtle", "Aragog", "Grawp"]  # noqa
+        names = ["Regulus Black","Sirius Black","Lavender Brown","Cho Chang","Vincent Crabbe","Vincent Crabbe","Bartemius Crouch","Fleur Delacour","Cedric Diggory","Alberforth Dumbledore","Albus Dumbledore","Dudley Dursley","Petunia Dursley","Vernon Dursley","Argus Filch","Seamus Finnigan","Nicolas Flamel","Cornelius Fudge","Goyle","Gregory Goyle","Hermione Granger","Rubeus Hagrid","Igor Karkaroff","Viktor Krum","Bellatrix Lestrange","Alice Longbottom","Frank Longbottom","Neville Longbottom","Luna Lovegood","Xenophilius Lovegood","Remus Lupin","Draco Malfoy","Lucius Malfoy","Narcissa Malfoy","Olympe Maxime","Minerva McGonagall","Mad-Eye Moody","Peter Pettigrew","Harry Potter","James Potter","Lily Potter","Quirinus Quirrell","Tom Riddle","Mary Riddle","Lord Voldemort","Rita Skeeter","Severus Snape","Nymphadora Tonks","Dolores Janes Umbridge","Arthur Weasley","Bill Weasley","Charlie Weasley","Fred Weasley","George Weasley","Ginny Weasley","Molly Weasley","Percy Weasley","Ron Weasley","Dobby","Fluffy","Hedwig","Moaning Myrtle","Aragog","Grawp"]
         for i, name in enumerate(names):
             with reversion.create_revision():
                 reversion.set_user(random.choice(self.profiles))
@@ -68,8 +66,7 @@ class Command(BaseCommand):
                 self.people.append(newPerson)
 
     def setupOrganisations(self):
-        names = ["Acme, inc.", "Widget Corp", "123 Warehousing", "Demo Company", "Smith and Co.", "Foo Bars", "ABC Telecom", "Fake Brothers", "QWERTY Logistics", "Demo, inc.", "Sample Company", "Sample, inc", "Acme Corp", "Allied Biscuit", "Ankh-Sto Associates", "Extensive Enterprise", "Galaxy Corp", "Globo-Chem", "Mr. Sparkle", "Globex Corporation", "LexCorp", "LuthorCorp", "North Central Positronics", "Omni Consimer Products", "Praxis Corporation", "Sombra Corporation", "Sto Plains Holdings", "Tessier-Ashpool", "Wayne Enterprises", "Wentworth Industries", "ZiffCorp", "Bluth Company", "Strickland Propane", "Thatherton Fuels", "Three Waters", "Water and Power", "Western Gas & Electric", "Mammoth Pictures", "Mooby Corp", "Gringotts", "Thrift Bank", "Flowers By Irene", "The Legitimate Businessmens Club", "Osato Chemicals", "Transworld Consortium", "Universal Export", "United Fried Chicken", "Virtucon", "Kumatsu Motors", "Keedsler Motors", "Powell Motors", "Industrial Automation", "Sirius Cybernetics Corporation", "U.S. Robotics and Mechanical Men", "Colonial Movers", "Corellian Engineering Corporation", "Incom Corporation", "General Products", "Leeding Engines Ltd.", "Blammo",  # noqa
-                 "Input, Inc.", "Mainway Toys", "Videlectrix", "Zevo Toys", "Ajax", "Axis Chemical Co.", "Barrytron", "Carrys Candles", "Cogswell Cogs", "Spacely Sprockets", "General Forge and Foundry", "Duff Brewing Company", "Dunder Mifflin", "General Services Corporation", "Monarch Playing Card Co.", "Krustyco", "Initech", "Roboto Industries", "Primatech", "Sonky Rubber Goods", "St. Anky Beer", "Stay Puft Corporation", "Vandelay Industries", "Wernham Hogg", "Gadgetron", "Burleigh and Stronginthearm", "BLAND Corporation", "Nordyne Defense Dynamics", "Petrox Oil Company", "Roxxon", "McMahon and Tate", "Sixty Second Avenue", "Charles Townsend Agency", "Spade and Archer", "Megadodo Publications", "Rouster and Sideways", "C.H. Lavatory and Sons", "Globo Gym American Corp", "The New Firm", "SpringShield", "Compuglobalhypermeganet", "Data Systems", "Gizmonic Institute", "Initrode", "Taggart Transcontinental", "Atlantic Northern", "Niagular", "Plow King", "Big Kahuna Burger", "Big T Burgers and Fries", "Chez Quis", "Chotchkies", "The Frying Dutchman", "Klimpys", "The Krusty Krab", "Monks Diner", "Milliways", "Minuteman Cafe", "Taco Grande", "Tip Top Cafe", "Moes Tavern", "Central Perk", "Chasers"]  # noqa
+        names = ["Acme, inc.","Widget Corp","123 Warehousing","Demo Company","Smith and Co.","Foo Bars","ABC Telecom","Fake Brothers","QWERTY Logistics","Demo, inc.","Sample Company","Sample, inc","Acme Corp","Allied Biscuit","Ankh-Sto Associates","Extensive Enterprise","Galaxy Corp","Globo-Chem","Mr. Sparkle","Globex Corporation","LexCorp","LuthorCorp","North Central Positronics","Omni Consimer Products","Praxis Corporation","Sombra Corporation","Sto Plains Holdings","Tessier-Ashpool","Wayne Enterprises","Wentworth Industries","ZiffCorp","Bluth Company","Strickland Propane","Thatherton Fuels","Three Waters","Water and Power","Western Gas & Electric","Mammoth Pictures","Mooby Corp","Gringotts","Thrift Bank","Flowers By Irene","The Legitimate Businessmens Club","Osato Chemicals","Transworld Consortium","Universal Export","United Fried Chicken","Virtucon","Kumatsu Motors","Keedsler Motors","Powell Motors","Industrial Automation","Sirius Cybernetics Corporation","U.S. Robotics and Mechanical Men","Colonial Movers","Corellian Engineering Corporation","Incom Corporation","General Products","Leeding Engines Ltd.","Blammo","Input, Inc.","Mainway Toys","Videlectrix","Zevo Toys","Ajax","Axis Chemical Co.","Barrytron","Carrys Candles","Cogswell Cogs","Spacely Sprockets","General Forge and Foundry","Duff Brewing Company","Dunder Mifflin","General Services Corporation","Monarch Playing Card Co.","Krustyco","Initech","Roboto Industries","Primatech","Sonky Rubber Goods","St. Anky Beer","Stay Puft Corporation","Vandelay Industries","Wernham Hogg","Gadgetron","Burleigh and Stronginthearm","BLAND Corporation","Nordyne Defense Dynamics","Petrox Oil Company","Roxxon","McMahon and Tate","Sixty Second Avenue","Charles Townsend Agency","Spade and Archer","Megadodo Publications","Rouster and Sideways","C.H. Lavatory and Sons","Globo Gym American Corp","The New Firm","SpringShield","Compuglobalhypermeganet","Data Systems","Gizmonic Institute","Initrode","Taggart Transcontinental","Atlantic Northern","Niagular","Plow King","Big Kahuna Burger","Big T Burgers and Fries","Chez Quis","Chotchkies","The Frying Dutchman","Klimpys","The Krusty Krab","Monks Diner","Milliways","Minuteman Cafe","Taco Grande","Tip Top Cafe","Moes Tavern","Central Perk","Chasers"]
         for i, name in enumerate(names):
             with reversion.create_revision():
                 reversion.set_user(random.choice(self.profiles))
@@ -93,8 +90,7 @@ class Command(BaseCommand):
                 self.organisations.append(newOrganisation)
 
     def setupVenues(self):
-        names = ["Bear Island", "Crossroads Inn", "Deepwood Motte", "The Dreadfort", "The Eyrie", "Greywater Watch", "The Iron Islands", "Karhold", "Moat Cailin", "Oldstones", "Raventree Hall", "Riverlands", "The Ruby Ford", "Saltpans", "Seagard", "Torrhen's Square", "The Trident", "The Twins", "The Vale of Arryn", "The Whispering Wood", "White Harbor", "Winterfell", "The Arbor", "Ashemark", "Brightwater Keep", "Casterly Rock", "Clegane's Keep", "Dragonstone", "Dorne", "God's Eye", "The Golden Tooth",  # noqa
-                 "Harrenhal", "Highgarden", "Horn Hill", "Fingers", "King's Landing", "Lannisport", "Oldtown", "Rainswood", "Storm's End", "Summerhall", "Sunspear", "Tarth", "Castle Black", "Craster's Keep", "Fist of the First Men", "The Frostfangs", "The Gift", "The Skirling Pass", "The Wall", "Asshai", "Astapor", "Braavos", "The Dothraki Sea", "Lys", "Meereen", "Myr", "Norvos", "Pentos", "Qarth", "Qohor", "The Red Waste", "Tyrosh", "Vaes Dothrak", "Valyria", "Village of the Lhazareen", "Volantis", "Yunkai"]  # noqa
+        names = ["Bear Island","Crossroads Inn","Deepwood Motte","The Dreadfort","The Eyrie","Greywater Watch","The Iron Islands","Karhold","Moat Cailin","Oldstones","Raventree Hall","Riverlands","The Ruby Ford","Saltpans","Seagard","Torrhen's Square","The Trident","The Twins","The Vale of Arryn","The Whispering Wood","White Harbor","Winterfell","The Arbor","Ashemark","Brightwater Keep","Casterly Rock","Clegane's Keep","Dragonstone","Dorne","God's Eye","The Golden Tooth","Harrenhal","Highgarden","Horn Hill","Fingers","King's Landing","Lannisport","Oldtown","Rainswood","Storm's End","Summerhall","Sunspear","Tarth","Castle Black","Craster's Keep","Fist of the First Men","The Frostfangs","The Gift","The Skirling Pass","The Wall","Asshai","Astapor","Braavos","The Dothraki Sea","Lys","Meereen","Myr","Norvos","Pentos","Qarth","Qohor","The Red Waste","Tyrosh","Vaes Dothrak","Valyria","Village of the Lhazareen","Volantis","Yunkai"]
         for i, name in enumerate(names):
             with reversion.create_revision():
                 reversion.set_user(random.choice(self.profiles))
@@ -121,8 +117,8 @@ class Command(BaseCommand):
         self.keyholder_group = Group.objects.create(name='Keyholders')
         self.finance_group = Group.objects.create(name='Finance')
 
-        keyholderPerms = ["add_event", "change_event", "view_event", "add_eventitem", "change_eventitem", "delete_eventitem", "add_organisation", "change_organisation", "view_organisation", "add_person", "change_person", "view_person", "view_profile", "add_venue", "change_venue", "view_venue"]
-        financePerms = ["change_event", "view_event", "add_eventitem", "change_eventitem", "add_invoice", "change_invoice", "view_invoice", "add_organisation", "change_organisation", "view_organisation", "add_payment", "change_payment", "delete_payment", "add_person", "change_person", "view_person"]
+        keyholderPerms = ["add_event","change_event","view_event","add_eventitem","change_eventitem","delete_eventitem","add_organisation","change_organisation","view_organisation","add_person","change_person","view_person","view_profile","add_venue","change_venue","view_venue"]
+        financePerms = ["change_event","view_event","add_eventitem","change_eventitem","add_invoice","change_invoice","view_invoice","add_organisation","change_organisation","view_organisation","add_payment","change_payment","delete_payment","add_person","change_person","view_person"]
 
         for permId in keyholderPerms:
             self.keyholder_group.permissions.add(Permission.objects.get(codename=permId))
@@ -131,11 +127,11 @@ class Command(BaseCommand):
             self.finance_group.permissions.add(Permission.objects.get(codename=permId))
 
     def setupGenericProfiles(self):
-        names = ["Clara Oswin Oswald", "Rory Williams", "Amy Pond", "River Song", "Martha Jones", "Donna Noble", "Jack Harkness", "Mickey Smith", "Rose Tyler"]
+        names = ["Clara Oswin Oswald","Rory Williams","Amy Pond","River Song","Martha Jones","Donna Noble","Jack Harkness","Mickey Smith","Rose Tyler"]
         for i, name in enumerate(names):
-            newProfile = models.Profile.objects.create(username=name.replace(" ", ""), first_name=name.split(" ")[0], last_name=name.split(" ")[-1],
-                                                       email=name.replace(" ", "") + "@example.com",
-                                                       initials="".join([j[0].upper() for j in name.split()]))
+            newProfile = models.Profile.objects.create(username=name.replace(" ",""), first_name=name.split(" ")[0], last_name=name.split(" ")[-1],
+                                                         email=name.replace(" ","")+"@example.com",
+                                                        initials="".join([ j[0].upper() for j in name.split() ]))
             if i % 2 == 0:
                 newProfile.phone = "01234 567894"
 
@@ -143,110 +139,110 @@ class Command(BaseCommand):
             self.profiles.append(newProfile)
 
     def setupUsefulProfiles(self):
-        superUser = models.Profile.objects.create(username="superuser", first_name="Super", last_name="User", initials="SU",
-                                                  email="superuser@example.com", is_superuser=True, is_active=True, is_staff=True)
+        superUser = models.Profile.objects.create(username="superuser", first_name="Super", last_name="User", initials="SU", 
+                                                email="superuser@example.com", is_superuser=True, is_active=True, is_staff=True)
         superUser.set_password('superuser')
         superUser.save()
 
-        financeUser = models.Profile.objects.create(username="finance", first_name="Finance", last_name="User", initials="FU",
-                                                    email="financeuser@example.com", is_active=True)
+        financeUser = models.Profile.objects.create(username="finance", first_name="Finance", last_name="User", initials="FU", 
+                                                email="financeuser@example.com", is_active=True)
         financeUser.groups.add(self.finance_group)
         financeUser.groups.add(self.keyholder_group)
         financeUser.set_password('finance')
         financeUser.save()
 
-        keyholderUser = models.Profile.objects.create(username="keyholder", first_name="Keyholder", last_name="User", initials="KU",
-                                                      email="keyholderuser@example.com", is_active=True)
+        keyholderUser = models.Profile.objects.create(username="keyholder", first_name="Keyholder", last_name="User", initials="KU", 
+                                                email="keyholderuser@example.com", is_active=True)
         keyholderUser.groups.add(self.keyholder_group)
         keyholderUser.set_password('keyholder')
         keyholderUser.save()
 
-        basicUser = models.Profile.objects.create(username="basic", first_name="Basic", last_name="User", initials="BU",
-                                                  email="basicuser@example.com", is_active=True)
+        basicUser = models.Profile.objects.create(username="basic", first_name="Basic", last_name="User", initials="BU", 
+                                                email="basicuser@example.com", is_active=True)
         basicUser.set_password('basic')
         basicUser.save()
 
     def setupEvents(self):
-        names = ["Outdoor Concert", "Hall Open Mic Night", "Festival", "Weekend Event", "Magic Show", "Society Ball", "Evening Show", "Talent Show", "Acoustic Evening", "Hire of Things", "SU Event",
-                 "End of Term Show", "Theatre Show", "Outdoor Fun Day", "Summer Carnival", "Open Days", "Magic Show", "Awards Ceremony", "Debating Event", "Club Night", "DJ Evening", "Building Projection", "Choir Concert"]
-        descriptions = ["A brief desciption of the event", "This event is boring", "Probably wont happen", "Warning: this has lots of kit"]
-        notes = ["The client came into the office at some point", "Who knows if this will happen", "Probably should check this event", "Maybe not happening", "Run away!"]
+        names = ["Outdoor Concert","Hall Open Mic Night","Festival","Weekend Event","Magic Show","Society Ball","Evening Show","Talent Show","Acoustic Evening","Hire of Things","SU Event","End of Term Show","Theatre Show","Outdoor Fun Day","Summer Carnival","Open Days","Magic Show","Awards Ceremony","Debating Event","Club Night","DJ Evening","Building Projection","Choir Concert"]
+        descriptions = ["A brief desciption of the event","This event is boring","Probably wont happen","Warning: this has lots of kit"]
+        notes = ["The client came into the office at some point","Who knows if this will happen", "Probably should check this event", "Maybe not happening", "Run away!"]
 
         itemOptions = [{'name': 'Speakers', 'description': 'Some really really big speakers \n these are very loud', 'quantity': 2, 'cost': 200.00},
-                       {'name': 'Projector', 'description': 'Some kind of video thinamejig, probably with unnecessary processing for free', 'quantity': 1, 'cost': 500.00},
-                       {'name': 'Lighting Desk', 'description': 'Cannot provide guarentee that it will work', 'quantity': 1, 'cost': 200.52},
-                       {'name': 'Moving lights', 'description': 'Flashy lights, with the copper', 'quantity': 8, 'cost': 50.00},
-                       {'name': 'Microphones', 'description': 'Make loud noise \n you will want speakers with this', 'quantity': 5, 'cost': 0.50},
-                       {'name': 'Sound Mixer Thing', 'description': 'Might be analogue, might be digital', 'quantity': 1, 'cost': 100.00},
-                       {'name': 'Electricity', 'description': 'You need this', 'quantity': 1, 'cost': 200.00},
-                       {'name': 'Crew', 'description': 'Costs nothing, because reasons', 'quantity': 1, 'cost': 0.00},
-                       {'name': 'Loyalty Discount', 'description': 'Have some negative moneys', 'quantity': 1, 'cost': -50.00}]
+                        {'name': 'Projector', 'description': 'Some kind of video thinamejig, probably with unnecessary processing for free', 'quantity': 1, 'cost': 500.00},
+                        {'name': 'Lighting Desk', 'description': 'Cannot provide guarentee that it will work', 'quantity': 1, 'cost': 200.52},
+                        {'name': 'Moving lights', 'description': 'Flashy lights, with the copper', 'quantity': 8, 'cost': 50.00},
+                        {'name': 'Microphones', 'description': 'Make loud noise \n you will want speakers with this', 'quantity': 5, 'cost': 0.50},
+                        {'name': 'Sound Mixer Thing', 'description': 'Might be analogue, might be digital', 'quantity': 1, 'cost': 100.00},
+                        {'name': 'Electricity', 'description': 'You need this', 'quantity': 1, 'cost': 200.00},
+                        {'name': 'Crew', 'description': 'Costs nothing, because reasons', 'quantity': 1, 'cost': 0.00},
+                        {'name': 'Loyalty Discount', 'description': 'Have some negative moneys', 'quantity': 1, 'cost': -50.00}]
 
-        dayDelta = -120  # start adding events from 4 months ago
+        dayDelta = -120 # start adding events from 4 months ago
 
-        for i in range(150):  # Let's add 100 events
+        for i in range(150): # Let's add 100 events
             with reversion.create_revision():
                 reversion.set_user(random.choice(self.profiles))
 
-                name = names[i % len(names)]
+                name = names[i%len(names)]
 
                 startDate = datetime.date.today() + datetime.timedelta(days=dayDelta)
-                dayDelta = dayDelta + random.randint(0, 3)
+                dayDelta = dayDelta + random.randint(0,3)
 
                 newEvent = models.Event.objects.create(name=name, start_date=startDate)
 
-                if random.randint(0, 2) > 1:  # 1 in 3 have a start time
-                    newEvent.start_time = datetime.time(random.randint(15, 20))
-                    if random.randint(0, 2) > 1:  # of those, 1 in 3 have an end time on the same day
-                        newEvent.end_time = datetime.time(random.randint(21, 23))
-                    elif random.randint(0, 1) > 0:  # half of the others finish early the next day
+                if random.randint(0,2) > 1: # 1 in 3 have a start time
+                    newEvent.start_time = datetime.time(random.randint(15,20))
+                    if random.randint(0,2) > 1: # of those, 1 in 3 have an end time on the same day
+                        newEvent.end_time = datetime.time(random.randint(21,23))
+                    elif random.randint(0,1)>0: # half of the others finish early the next day
                         newEvent.end_date = newEvent.start_date + datetime.timedelta(days=1)
-                        newEvent.end_time = datetime.time(random.randint(0, 5))
-                elif random.randint(0, 2) > 1:  # 1 in 3 of the others finish a few days ahead
-                    newEvent.end_date = newEvent.start_date + datetime.timedelta(days=random.randint(1, 4))
+                        newEvent.end_time = datetime.time(random.randint(0,5))
+                elif random.randint(0,2)>1: # 1 in 3 of the others finish a few days ahead
+                    newEvent.end_date = newEvent.start_date + datetime.timedelta(days=random.randint(1,4))
 
-                if random.randint(0, 6) > 0:  # 5 in 6 have MIC
+
+                if random.randint(0,6) > 0: # 5 in 6 have MIC
                     newEvent.mic = random.choice(self.profiles)
 
-                if random.randint(0, 6) > 0:  # 5 in 6 have organisation
+                if random.randint(0,6) > 0: # 5 in 6 have organisation
                     newEvent.organisation = random.choice(self.organisations)
 
-                if random.randint(0, 6) > 0:  # 5 in 6 have person
+                if random.randint(0,6) > 0: # 5 in 6 have person
                     newEvent.person = random.choice(self.people)
 
-                if random.randint(0, 6) > 0:  # 5 in 6 have venue
+                if random.randint(0,6) > 0: # 5 in 6 have venue
                     newEvent.venue = random.choice(self.venues)
 
                 # Could have any status, equally weighted
-                newEvent.status = random.choice([models.Event.BOOKED, models.Event.CONFIRMED, models.Event.PROVISIONAL, models.Event.CANCELLED])
+                newEvent.status = random.choice([models.Event.BOOKED,models.Event.CONFIRMED,models.Event.PROVISIONAL, models.Event.CANCELLED])
 
-                newEvent.dry_hire = (random.randint(0, 7) == 0)  # 1 in 7 are dry hire
+                newEvent.dry_hire = (random.randint(0,7)==0) # 1 in 7 are dry hire
 
-                if random.randint(0, 1) > 0:  # 1 in 2 have description
+                if random.randint(0,1) > 0: # 1 in 2 have description
                     newEvent.description = random.choice(descriptions)
 
-                if random.randint(0, 1) > 0:  # 1 in 2 have notes
+                if random.randint(0,1) > 0: # 1 in 2 have notes
                     newEvent.notes = random.choice(notes)
 
                 newEvent.save()
 
                 # Now add some items
-                for j in range(random.randint(1, 5)):
-                    itemData = itemOptions[random.randint(0, len(itemOptions) - 1)]
+                for j in range(random.randint(1,5)):
+                    itemData = itemOptions[random.randint(0,len(itemOptions)-1)]
                     newItem = models.EventItem.objects.create(event=newEvent, order=j, **itemData)
                     newItem.save()
 
                 while newEvent.sum_total < 0:
-                    itemData = itemOptions[random.randint(0, len(itemOptions) - 1)]
+                    itemData = itemOptions[random.randint(0,len(itemOptions)-1)]
                     newItem = models.EventItem.objects.create(event=newEvent, order=j, **itemData)
                     newItem.save()
 
             with reversion.create_revision():
                 reversion.set_user(random.choice(self.profiles))
-                if newEvent.start_date < datetime.date.today():  # think about adding an invoice
-                    if random.randint(0, 2) > 0:  # 2 in 3 have had paperwork sent to treasury
+                if newEvent.start_date < datetime.date.today(): # think about adding an invoice
+                    if random.randint(0,2) > 0: # 2 in 3 have had paperwork sent to treasury
                         newInvoice = models.Invoice.objects.create(event=newEvent)
-                        if newEvent.status is models.Event.CANCELLED:  # void cancelled events
+                        if newEvent.status is models.Event.CANCELLED: # void cancelled events
                             newInvoice.void = True
-                        elif random.randint(0, 2) > 1:  # 1 in 3 have been paid
+                        elif random.randint(0,2)>1: # 1 in 3 have been paid
                             models.Payment.objects.create(invoice=newInvoice, amount=newInvoice.balance, date=datetime.date.today())

RIGS/migrations/0001_initial.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-
+from __future__ import unicode_literals
 
 from django.db import models, migrations
 import django.core.validators

RIGS/migrations/0002_modelcomment_person.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-
+from __future__ import unicode_literals
 
 from django.db import models, migrations
 from django.conf import settings
@@ -18,7 +18,7 @@ class Migration(migrations.Migration):
                 ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
                 ('postedAt', models.DateTimeField(auto_now=True)),
                 ('message', models.TextField()),
-                ('user', models.ForeignKey(to=settings.AUTH_USER_MODEL, on_delete=models.CASCADE)),
+                ('user', models.ForeignKey(to=settings.AUTH_USER_MODEL)),
             ],
             options={
             },

RIGS/migrations/0003_auto_20141031_0219.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-
+from __future__ import unicode_literals
 
 from django.db import models, migrations
 

RIGS/migrations/0004_organisation.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-
+from __future__ import unicode_literals
 
 from django.db import models, migrations
 import RIGS.models

RIGS/migrations/0005_auto_20141104_1619.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-
+from __future__ import unicode_literals
 
 from django.db import models, migrations
 

RIGS/migrations/0006_auto_20141105_1553.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-
+from __future__ import unicode_literals
 
 from django.db import models, migrations
 

RIGS/migrations/0007_vatrate.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-
+from __future__ import unicode_literals
 
 from django.db import models, migrations
 import RIGS.models

RIGS/migrations/0008_auto_20141105_1908.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-
+from __future__ import unicode_literals
 
 from django.db import models, migrations
 from django.conf import settings
@@ -33,11 +33,11 @@ class Migration(migrations.Migration):
                 ('payment_method', models.CharField(blank=True, null=True, max_length=255)),
                 ('payment_received', models.CharField(blank=True, null=True, max_length=255)),
                 ('purchase_order', models.CharField(blank=True, null=True, max_length=255)),
-                ('based_on', models.ForeignKey(to='RIGS.Event', related_name='future_events', on_delete=models.CASCADE)),
-                ('checked_in_by', models.ForeignKey(to=settings.AUTH_USER_MODEL, related_name='event_checked_in', on_delete=models.CASCADE)),
-                ('mic', models.ForeignKey(to=settings.AUTH_USER_MODEL, related_name='event_mic', on_delete=models.CASCADE)),
-                ('organisation', models.ForeignKey(to='RIGS.Organisation', on_delete=models.CASCADE)),
-                ('person', models.ForeignKey(to='RIGS.Person', on_delete=models.CASCADE)),
+                ('based_on', models.ForeignKey(to='RIGS.Event', related_name='future_events')),
+                ('checked_in_by', models.ForeignKey(to=settings.AUTH_USER_MODEL, related_name='event_checked_in')),
+                ('mic', models.ForeignKey(to=settings.AUTH_USER_MODEL, related_name='event_mic')),
+                ('organisation', models.ForeignKey(to='RIGS.Organisation')),
+                ('person', models.ForeignKey(to='RIGS.Person')),
             ],
             options={
             },
@@ -52,7 +52,7 @@ class Migration(migrations.Migration):
                 ('quantity', models.IntegerField()),
                 ('cost', models.DecimalField(max_digits=10, decimal_places=2)),
                 ('order', models.IntegerField()),
-                ('event', models.ForeignKey(to='RIGS.Event', related_name='item', on_delete=models.CASCADE)),
+                ('event', models.ForeignKey(to='RIGS.Event', related_name='item')),
             ],
             options={
             },
@@ -75,7 +75,7 @@ class Migration(migrations.Migration):
         migrations.AddField(
             model_name='event',
             name='venue',
-            field=models.ForeignKey(to='RIGS.Venue', on_delete=models.CASCADE),
+            field=models.ForeignKey(to='RIGS.Venue'),
             preserve_default=True,
         ),
     ]

RIGS/migrations/0009_auto_20141105_1916.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-
+from __future__ import unicode_literals
 
 from django.db import models, migrations
 from django.conf import settings
@@ -14,26 +14,26 @@ class Migration(migrations.Migration):
         migrations.AlterField(
             model_name='event',
             name='based_on',
-            field=models.ForeignKey(to='RIGS.Event', related_name='future_events', blank=True, null=True, on_delete=models.CASCADE),
+            field=models.ForeignKey(to='RIGS.Event', related_name='future_events', blank=True, null=True),
             preserve_default=True,
         ),
         migrations.AlterField(
             model_name='event',
             name='checked_in_by',
             field=models.ForeignKey(to=settings.AUTH_USER_MODEL, related_name='event_checked_in', blank=True,
-                                    null=True, on_delete=models.CASCADE),
+                                    null=True),
             preserve_default=True,
         ),
         migrations.AlterField(
             model_name='event',
             name='mic',
-            field=models.ForeignKey(to=settings.AUTH_USER_MODEL, related_name='event_mic', blank=True, null=True, on_delete=models.CASCADE),
+            field=models.ForeignKey(to=settings.AUTH_USER_MODEL, related_name='event_mic', blank=True, null=True),
             preserve_default=True,
         ),
         migrations.AlterField(
             model_name='event',
             name='organisation',
-            field=models.ForeignKey(to='RIGS.Organisation', blank=True, null=True, on_delete=models.CASCADE),
+            field=models.ForeignKey(to='RIGS.Organisation', blank=True, null=True),
             preserve_default=True,
         ),
         migrations.AlterField(

RIGS/migrations/0010_auto_20141105_2219.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-
+from __future__ import unicode_literals
 
 from django.db import models, migrations
 from django.conf import settings
@@ -19,8 +19,8 @@ class Migration(migrations.Migration):
                 ('run', models.BooleanField(default=False)),
                 ('derig', models.BooleanField(default=False)),
                 ('notes', models.TextField(blank=True, null=True)),
-                ('event', models.ForeignKey(related_name='crew', to='RIGS.Event', on_delete=models.CASCADE)),
-                ('user', models.ForeignKey(to=settings.AUTH_USER_MODEL, on_delete=models.CASCADE)),
+                ('event', models.ForeignKey(related_name='crew', to='RIGS.Event')),
+                ('user', models.ForeignKey(to=settings.AUTH_USER_MODEL)),
             ],
             options={
             },
@@ -35,7 +35,7 @@ class Migration(migrations.Migration):
         migrations.AlterField(
             model_name='eventitem',
             name='event',
-            field=models.ForeignKey(related_name='items', to='RIGS.Event', on_delete=models.CASCADE),
+            field=models.ForeignKey(related_name='items', to='RIGS.Event'),
             preserve_default=True,
         ),
     ]

RIGS/migrations/0011_venue_address.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-
+from __future__ import unicode_literals
 
 from django.db import models, migrations
 

RIGS/migrations/0012_auto_20141106_0253.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-
+from __future__ import unicode_literals
 
 from django.db import models, migrations
 

RIGS/migrations/0013_auto_20141202_0041.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-
+from __future__ import unicode_literals
 
 from django.db import models, migrations
 
@@ -14,7 +14,7 @@ class Migration(migrations.Migration):
         migrations.AlterField(
             model_name='event',
             name='person',
-            field=models.ForeignKey(blank=True, null=True, to='RIGS.Person', on_delete=models.CASCADE),
+            field=models.ForeignKey(blank=True, null=True, to='RIGS.Person'),
             preserve_default=True,
         ),
     ]

RIGS/migrations/0014_auto_20141208_0220.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-
+from __future__ import unicode_literals
 
 from django.db import models, migrations
 
@@ -14,13 +14,13 @@ class Migration(migrations.Migration):
         migrations.AlterField(
             model_name='event',
             name='venue',
-            field=models.ForeignKey(blank=True, to='RIGS.Venue', null=True, on_delete=models.CASCADE),
+            field=models.ForeignKey(blank=True, to='RIGS.Venue', null=True),
             preserve_default=True,
         ),
         migrations.AlterField(
             model_name='eventitem',
             name='event',
-            field=models.ForeignKey(related_name='items', blank=True, to='RIGS.Event', on_delete=models.CASCADE),
+            field=models.ForeignKey(related_name='items', blank=True, to='RIGS.Event'),
             preserve_default=True,
         ),
     ]

RIGS/migrations/0015_auto_20141208_0233.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-
+from __future__ import unicode_literals
 
 from django.db import models, migrations
 

RIGS/migrations/0016_auto_20150127_1905.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-
+from __future__ import unicode_literals
 
 from django.db import models, migrations
 from django.conf import settings
@@ -18,7 +18,7 @@ class Migration(migrations.Migration):
                 ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
                 ('invoice_date', models.DateField(auto_now_add=True)),
                 ('void', models.BooleanField()),
-                ('event', models.OneToOneField(to='RIGS.Event', on_delete=models.CASCADE)),
+                ('event', models.OneToOneField(to='RIGS.Event')),
             ],
             options={
             },
@@ -31,7 +31,7 @@ class Migration(migrations.Migration):
                 ('date', models.DateField()),
                 ('amount', models.DecimalField(help_text=b'Please use ex. VAT', max_digits=10, decimal_places=2)),
                 ('method', models.CharField(max_length=2, choices=[(b'C', b'Cash'), (b'I', b'Internal'), (b'E', b'External'), (b'SU', b'SU Core'), (b'M', b'Members')])),
-                ('invoice', models.ForeignKey(to='RIGS.Invoice', on_delete=models.CASCADE)),
+                ('invoice', models.ForeignKey(to='RIGS.Invoice')),
             ],
             options={
             },
@@ -40,7 +40,7 @@ class Migration(migrations.Migration):
         migrations.AlterField(
             model_name='event',
             name='mic',
-            field=models.ForeignKey(related_name='event_mic', verbose_name=b'MIC', blank=True, to=settings.AUTH_USER_MODEL, null=True, on_delete=models.CASCADE),
+            field=models.ForeignKey(related_name='event_mic', verbose_name=b'MIC', blank=True, to=settings.AUTH_USER_MODEL, null=True),
             preserve_default=True,
         ),
     ]

RIGS/migrations/0017_auto_20150129_2041.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-
+from __future__ import unicode_literals
 
 from django.db import models, migrations
 

RIGS/migrations/0018_auto_20150130_0016.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-
+from __future__ import unicode_literals
 
 from django.db import models, migrations
 

RIGS/migrations/0019_auto_20150131_1919.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-
+from __future__ import unicode_literals
 
 from django.db import models, migrations
 

RIGS/migrations/0020_auto_20150303_0243.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-
+from __future__ import unicode_literals
 
 from django.db import models, migrations
 

RIGS/migrations/0021_auto_20150420_1155.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-
+from __future__ import unicode_literals
 
 from django.db import models, migrations
 

RIGS/migrations/0022_auto_20150424_2104.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-
+from __future__ import unicode_literals
 
 from django.db import models, migrations
 

RIGS/migrations/0023_auto_20150529_0048.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-
+from __future__ import unicode_literals
 
 from django.db import models, migrations
 import django.core.validators

RIGS/migrations/0024_auto_20160229_2042.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-
+from __future__ import unicode_literals
 
 from django.db import models, migrations
 import django.db.models.deletion

RIGS/migrations/0025_auto_20160331_1302.py

@@ -1,26 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.9.4 on 2016-03-31 12:02
-
-
-import django.core.validators
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('RIGS', '0024_auto_20160229_2042'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='profile',
-            name='username',
-            field=models.CharField(error_messages={'unique': 'A user with that username already exists.'}, help_text='Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only.', max_length=30, unique=True, validators=[django.core.validators.RegexValidator('^[\\w.@+-]+$', 'Enter a valid username. This value may contain only letters, numbers and @/./+/-/_ characters.')], verbose_name='username'),
-        ),
-        migrations.AlterField(
-            model_name='vatrate',
-            name='start_at',
-            field=models.DateField(),
-        ),
-    ]

RIGS/migrations/0025_eventauthorisation.py

@@ -1,27 +0,0 @@
-# -*- coding: utf-8 -*-
-
-
-from django.db import models, migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('RIGS', '0024_auto_20160229_2042'),
-    ]
-
-    operations = [
-        migrations.CreateModel(
-            name='EventAuthorisation',
-            fields=[
-                ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
-                ('email', models.EmailField(max_length=254)),
-                ('name', models.CharField(max_length=255)),
-                ('uni_id', models.CharField(max_length=10, null=True, verbose_name=b'University ID', blank=True)),
-                ('account_code', models.CharField(max_length=50, null=True, blank=True)),
-                ('amount', models.DecimalField(verbose_name=b'authorisation amount', max_digits=10, decimal_places=2)),
-                ('created_at', models.DateTimeField(auto_now_add=True)),
-                ('event', models.ForeignKey(related_name='authroisations', to='RIGS.Event', on_delete=models.CASCADE)),
-            ],
-        ),
-    ]

RIGS/migrations/0026_auto_20170510_1846.py

@@ -1,21 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.1 on 2017-05-10 17:46
-
-
-import django.contrib.auth.validators
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('RIGS', '0025_auto_20160331_1302'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='profile',
-            name='username',
-            field=models.CharField(error_messages={'unique': 'A user with that username already exists.'}, help_text='Required. 150 characters or fewer. Letters, digits and @/./+/-/_ only.', max_length=150, unique=True, validators=[django.contrib.auth.validators.ASCIIUsernameValidator()], verbose_name='username'),
-        ),
-    ]

RIGS/migrations/0026_remove_eventauthorisation_created_at.py

@@ -1,18 +0,0 @@
-# -*- coding: utf-8 -*-
-
-
-from django.db import models, migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('RIGS', '0025_eventauthorisation'),
-    ]
-
-    operations = [
-        migrations.RemoveField(
-            model_name='eventauthorisation',
-            name='created_at',
-        ),
-    ]

RIGS/migrations/0027_eventauthorisation_event_singular.py

@@ -1,19 +0,0 @@
-# -*- coding: utf-8 -*-
-
-
-from django.db import models, migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('RIGS', '0026_remove_eventauthorisation_created_at'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='eventauthorisation',
-            name='event',
-            field=models.OneToOneField(related_name='authorisation', to='RIGS.Event', on_delete=models.CASCADE),
-        ),
-    ]

RIGS/migrations/0029_eventauthorisation_sent_by.py

@@ -1,21 +0,0 @@
-# -*- coding: utf-8 -*-
-
-
-from django.db import models, migrations
-from django.conf import settings
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('RIGS', '0027_eventauthorisation_event_singular'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='eventauthorisation',
-            name='sent_by',
-            field=models.ForeignKey(default=1, to=settings.AUTH_USER_MODEL, on_delete=models.CASCADE),
-            preserve_default=False,
-        ),
-    ]

RIGS/migrations/0030_auth_request_sending.py

@@ -1,30 +0,0 @@
-# -*- coding: utf-8 -*-
-
-
-from django.db import models, migrations
-from django.conf import settings
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('RIGS', '0029_eventauthorisation_sent_by'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='event',
-            name='auth_request_at',
-            field=models.DateTimeField(null=True, blank=True),
-        ),
-        migrations.AddField(
-            model_name='event',
-            name='auth_request_by',
-            field=models.ForeignKey(blank=True, to=settings.AUTH_USER_MODEL, null=True, on_delete=models.CASCADE),
-        ),
-        migrations.AddField(
-            model_name='event',
-            name='auth_request_to',
-            field=models.EmailField(max_length=254, null=True, blank=True),
-        ),
-    ]

RIGS/migrations/0031_merge_20170512_2102.py

@@ -1,16 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.1 on 2017-05-12 20:02
-
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('RIGS', '0030_auth_request_sending'),
-        ('RIGS', '0026_auto_20170510_1846'),
-    ]
-
-    operations = [
-    ]

RIGS/migrations/0032_auto_20170904_2355.py

@@ -1,69 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.4 on 2017-09-04 22:55
-from __future__ import unicode_literals
-
-from django.conf import settings
-import django.contrib.auth.validators
-from django.db import migrations, models
-import django.db.models.deletion
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('reversion', '0001_squashed_0004_auto_20160611_1202'),
-        ('RIGS', '0031_merge_20170512_2102'),
-    ]
-
-    operations = [
-        migrations.CreateModel(
-            name='RIGSVersion',
-            fields=[
-            ],
-            options={
-                'indexes': [],
-                'proxy': True,
-            },
-            bases=('reversion.version',),
-        ),
-        migrations.AlterField(
-            model_name='event',
-            name='collector',
-            field=models.CharField(blank=True, max_length=255, null=True, verbose_name='collected by'),
-        ),
-        migrations.AlterField(
-            model_name='event',
-            name='mic',
-            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='event_mic', to=settings.AUTH_USER_MODEL, verbose_name='MIC'),
-        ),
-        migrations.AlterField(
-            model_name='event',
-            name='purchase_order',
-            field=models.CharField(blank=True, max_length=255, null=True, verbose_name='PO'),
-        ),
-        migrations.AlterField(
-            model_name='eventauthorisation',
-            name='amount',
-            field=models.DecimalField(decimal_places=2, max_digits=10, verbose_name='authorisation amount'),
-        ),
-        migrations.AlterField(
-            model_name='eventauthorisation',
-            name='uni_id',
-            field=models.CharField(blank=True, max_length=10, null=True, verbose_name='University ID'),
-        ),
-        migrations.AlterField(
-            model_name='payment',
-            name='amount',
-            field=models.DecimalField(decimal_places=2, help_text='Please use ex. VAT', max_digits=10),
-        ),
-        migrations.AlterField(
-            model_name='payment',
-            name='method',
-            field=models.CharField(blank=True, choices=[('C', 'Cash'), ('I', 'Internal'), ('E', 'External'), ('SU', 'SU Core'), ('T', 'TEC Adjustment')], max_length=2, null=True),
-        ),
-        migrations.AlterField(
-            model_name='profile',
-            name='username',
-            field=models.CharField(error_messages={'unique': 'A user with that username already exists.'}, help_text='Required. 150 characters or fewer. Letters, digits and @/./+/-/_ only.', max_length=150, unique=True, validators=[django.contrib.auth.validators.UnicodeUsernameValidator()], verbose_name='username'),
-        ),
-    ]

RIGS/migrations/0033_auto_20180325_0016.py

@@ -1,18 +0,0 @@
-# Generated by Django 2.0.3 on 2018-03-25 00:16
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('RIGS', '0032_auto_20170904_2355'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='profile',
-            name='last_name',
-            field=models.CharField(blank=True, max_length=150, verbose_name='last name'),
-        ),
-    ]

RIGS/models.py

@@ -1,24 +1,19 @@
 import datetime
 import hashlib
-import datetime
 import pytz
-
-from django.db import models
-from django.contrib.auth.models import AbstractUser
-from django.conf import settings
-from django.utils import timezone
-from django.utils.functional import cached_property
-from django.utils.encoding import python_2_unicode_compatible
-from reversion import revisions as reversion
-from reversion.models import Version
-import string
-
 import random
+import string
 from collections import Counter
 from decimal import Decimal
 
+import reversion
+from django.conf import settings
+from django.contrib.auth.models import AbstractUser
 from django.core.exceptions import ValidationError
-from django.urls import reverse_lazy
+from django.core.urlresolvers import reverse_lazy
+from django.db import models
+from django.utils.encoding import python_2_unicode_compatible
+from django.utils.functional import cached_property
 
 
 # Create your models here.
@@ -33,13 +28,13 @@ class Profile(AbstractUser):
         size = 20
         chars = string.ascii_letters + string.digits
         new_api_key = ''.join(random.choice(chars) for x in range(size))
-        return new_api_key
+        return new_api_key;
 
     @property
     def profile_picture(self):
         url = ""
         if settings.USE_GRAVATAR or settings.USE_GRAVATAR is None:
-            url = "https://www.gravatar.com/avatar/" + hashlib.md5(self.email.encode('utf-8')).hexdigest() + "?d=wavatar&s=500"
+            url = "https://www.gravatar.com/avatar/" + hashlib.md5(self.email).hexdigest() + "?d=wavatar&s=500"
         return url
 
     @property
@@ -63,31 +58,32 @@ class Profile(AbstractUser):
 
 
 class RevisionMixin(object):
-    @property
-    def current_version(self):
-        version = Version.objects.get_for_object(self).select_related('revision').first()
-        return version
-
     @property
     def last_edited_at(self):
-        version = self.current_version
-        if version is None:
+        versions = reversion.get_for_object(self)
+        if versions:
+            version = reversion.get_for_object(self)[0]
+            return version.revision.date_created
+        else:
             return None
-        return version.revision.date_created
 
     @property
     def last_edited_by(self):
-        version = self.current_version
-        if version is None:
+        versions = reversion.get_for_object(self)
+        if versions:
+            version = reversion.get_for_object(self)[0]
+            return version.revision.user
+        else:
             return None
-        return version.revision.user
 
     @property
     def current_version_id(self):
-        version = self.current_version
-        if version is None:
+        versions = reversion.get_for_object(self)
+        if versions:
+            version = reversion.get_for_object(self)[0]
+            return "V{0} | R{1}".format(version.pk, version.revision.pk)
+        else:
             return None
-        return "V{0} | R{1}".format(version.pk, version.revision.pk)
 
 
 @reversion.register
@@ -179,7 +175,7 @@ class Organisation(models.Model, RevisionMixin):
 
 class VatManager(models.Manager):
     def current_rate(self):
-        return self.find_rate(timezone.now())
+        return self.find_rate(datetime.datetime.now())
 
     def find_rate(self, date):
         # return self.filter(startAt__lte=date).latest()
@@ -194,7 +190,7 @@ class VatManager(models.Manager):
 @reversion.register
 @python_2_unicode_compatible
 class VatRate(models.Model, RevisionMixin):
-    start_at = models.DateField()
+    start_at = models.DateTimeField()
     rate = models.DecimalField(max_digits=6, decimal_places=6)
     comment = models.CharField(max_length=255)
 
@@ -245,12 +241,18 @@ class Venue(models.Model, RevisionMixin):
 class EventManager(models.Manager):
     def current_events(self):
         events = self.filter(
-            (models.Q(start_date__gte=timezone.now().date(), end_date__isnull=True, dry_hire=False) & ~models.Q(status=Event.CANCELLED)) |  # Starts after with no end
-            (models.Q(end_date__gte=timezone.now().date(), dry_hire=False) & ~models.Q(status=Event.CANCELLED)) |  # Ends after
-            (models.Q(dry_hire=True, start_date__gte=timezone.now().date()) & ~models.Q(status=Event.CANCELLED)) |  # Active dry hire
-            (models.Q(dry_hire=True, checked_in_by__isnull=True) & (models.Q(status=Event.BOOKED) | models.Q(status=Event.CONFIRMED))) |  # Active dry hire GT
-            models.Q(status=Event.CANCELLED, start_date__gte=timezone.now().date())  # Canceled but not started
-        ).order_by('start_date', 'end_date', 'start_time', 'end_time', 'meet_at').select_related('person', 'organisation', 'venue', 'mic')
+            (models.Q(start_date__gte=datetime.date.today(), end_date__isnull=True, dry_hire=False) & ~models.Q(
+                status=Event.CANCELLED)) |  # Starts after with no end
+            (models.Q(end_date__gte=datetime.date.today(), dry_hire=False) & ~models.Q(
+                status=Event.CANCELLED)) |  # Ends after
+            (models.Q(dry_hire=True, start_date__gte=datetime.date.today()) & ~models.Q(
+                status=Event.CANCELLED)) |  # Active dry hire
+            (models.Q(dry_hire=True, checked_in_by__isnull=True) & (
+                models.Q(status=Event.BOOKED) | models.Q(status=Event.CONFIRMED))) |  # Active dry hire GT
+            models.Q(status=Event.CANCELLED, start_date__gte=datetime.date.today())  # Canceled but not started
+        ).order_by('start_date', 'end_date', 'start_time', 'end_time', 'meet_at').select_related('person',
+                                                                                                 'organisation',
+                                                                                                 'venue', 'mic')
         return events
 
     def events_in_bounds(self, start, end):
@@ -273,12 +275,12 @@ class EventManager(models.Manager):
 
     def rig_count(self):
         event_count = self.filter(
-            (models.Q(start_date__gte=timezone.now().date(), end_date__isnull=True, dry_hire=False,
+            (models.Q(start_date__gte=datetime.date.today(), end_date__isnull=True, dry_hire=False,
                       is_rig=True) & ~models.Q(
                 status=Event.CANCELLED)) |  # Starts after with no end
-            (models.Q(end_date__gte=timezone.now().date(), dry_hire=False, is_rig=True) & ~models.Q(
+            (models.Q(end_date__gte=datetime.date.today(), dry_hire=False, is_rig=True) & ~models.Q(
                 status=Event.CANCELLED)) |  # Ends after
-            (models.Q(dry_hire=True, start_date__gte=timezone.now().date(), is_rig=True) & ~models.Q(
+            (models.Q(dry_hire=True, start_date__gte=datetime.date.today(), is_rig=True) & ~models.Q(
                 status=Event.CANCELLED)) |  # Active dry hire
             (models.Q(dry_hire=True, checked_in_by__isnull=True, is_rig=True) & (
                 models.Q(status=Event.BOOKED) | models.Q(status=Event.CONFIRMED)))  # Active dry hire GT
@@ -302,9 +304,9 @@ class Event(models.Model, RevisionMixin):
     )
 
     name = models.CharField(max_length=255)
-    person = models.ForeignKey('Person', null=True, blank=True, on_delete=models.CASCADE)
-    organisation = models.ForeignKey('Organisation', blank=True, null=True, on_delete=models.CASCADE)
-    venue = models.ForeignKey('Venue', blank=True, null=True, on_delete=models.CASCADE)
+    person = models.ForeignKey('Person', null=True, blank=True)
+    organisation = models.ForeignKey('Organisation', blank=True, null=True)
+    venue = models.ForeignKey('Venue', blank=True, null=True)
     description = models.TextField(blank=True, null=True)
     notes = models.TextField(blank=True, null=True)
     status = models.IntegerField(choices=EVENT_STATUS_CHOICES, default=PROVISIONAL)
@@ -323,9 +325,9 @@ class Event(models.Model, RevisionMixin):
     meet_info = models.CharField(max_length=255, blank=True, null=True)
 
     # Crew management
-    checked_in_by = models.ForeignKey(settings.AUTH_USER_MODEL, related_name='event_checked_in', blank=True, null=True, on_delete=models.CASCADE)
+    checked_in_by = models.ForeignKey(settings.AUTH_USER_MODEL, related_name='event_checked_in', blank=True, null=True)
     mic = models.ForeignKey(settings.AUTH_USER_MODEL, related_name='event_mic', blank=True, null=True,
-                            verbose_name="MIC", on_delete=models.CASCADE)
+                            verbose_name="MIC")
 
     # Monies
     payment_method = models.CharField(max_length=255, blank=True, null=True)
@@ -333,11 +335,6 @@ class Event(models.Model, RevisionMixin):
     purchase_order = models.CharField(max_length=255, blank=True, null=True, verbose_name='PO')
     collector = models.CharField(max_length=255, blank=True, null=True, verbose_name='collected by')
 
-    # Authorisation request details
-    auth_request_by = models.ForeignKey('Profile', null=True, blank=True, on_delete=models.CASCADE)
-    auth_request_at = models.DateTimeField(null=True, blank=True)
-    auth_request_to = models.EmailField(null=True, blank=True)
-
     # Calculated values
     """
     EX Vat
@@ -370,7 +367,7 @@ class Event(models.Model, RevisionMixin):
 
     @property
     def vat(self):
-        return Decimal(self.sum_total * self.vat_rate.rate).quantize(Decimal('.01'))
+        return self.sum_total * self.vat_rate.rate
 
     """
     Inc VAT
@@ -378,7 +375,7 @@ class Event(models.Model, RevisionMixin):
 
     @property
     def total(self):
-        return Decimal(self.sum_total + self.vat).quantize(Decimal('.01'))
+        return self.sum_total + self.vat
 
     @property
     def cancelled(self):
@@ -388,10 +385,6 @@ class Event(models.Model, RevisionMixin):
     def confirmed(self):
         return (self.status == self.BOOKED or self.status == self.CONFIRMED)
 
-    @property
-    def authorised(self):
-        return not self.internal and self.purchase_order or self.authorisation.amount == self.total
-
     @property
     def has_start_time(self):
         return self.start_time is not None
@@ -452,17 +445,13 @@ class Event(models.Model, RevisionMixin):
         else:
             return endDate
 
-    @property
-    def internal(self):
-        return self.organisation and self.organisation.union_account
-
     objects = EventManager()
 
     def get_absolute_url(self):
         return reverse_lazy('event_detail', kwargs={'pk': self.pk})
 
     def __str__(self):
-        return str(self.pk) + ": " + self.name
+        return unicode(self.pk) + ": " + self.name
 
     def clean(self):
         if self.end_date and self.start_date > self.end_date:
@@ -485,7 +474,7 @@ class Event(models.Model, RevisionMixin):
 
 
 class EventItem(models.Model):
-    event = models.ForeignKey('Event', related_name='items', blank=True, on_delete=models.CASCADE)
+    event = models.ForeignKey('Event', related_name='items', blank=True)
     name = models.CharField(max_length=255)
     description = models.TextField(blank=True, null=True)
     quantity = models.IntegerField()
@@ -504,35 +493,17 @@ class EventItem(models.Model):
 
 
 class EventCrew(models.Model):
-    event = models.ForeignKey('Event', related_name='crew', on_delete=models.CASCADE)
-    user = models.ForeignKey(settings.AUTH_USER_MODEL, on_delete=models.CASCADE)
+    event = models.ForeignKey('Event', related_name='crew')
+    user = models.ForeignKey(settings.AUTH_USER_MODEL)
     rig = models.BooleanField(default=False)
     run = models.BooleanField(default=False)
     derig = models.BooleanField(default=False)
     notes = models.TextField(blank=True, null=True)
 
 
-@reversion.register
-class EventAuthorisation(models.Model, RevisionMixin):
-    event = models.OneToOneField('Event', related_name='authorisation', on_delete=models.CASCADE)
-    email = models.EmailField()
-    name = models.CharField(max_length=255)
-    uni_id = models.CharField(max_length=10, blank=True, null=True, verbose_name="University ID")
-    account_code = models.CharField(max_length=50, blank=True, null=True)
-    amount = models.DecimalField(max_digits=10, decimal_places=2, verbose_name="authorisation amount")
-    sent_by = models.ForeignKey('RIGS.Profile', on_delete=models.CASCADE)
-
-    def get_absolute_url(self):
-        return reverse_lazy('event_detail', kwargs={'pk': self.event.pk})
-
-    @property
-    def activity_feed_string(self):
-        return str("N%05d" % self.event.pk + ' (requested by ' + self.sent_by.initials + ')')
-
-
 @python_2_unicode_compatible
 class Invoice(models.Model):
-    event = models.OneToOneField('Event', on_delete=models.CASCADE)
+    event = models.OneToOneField('Event')
     invoice_date = models.DateField(auto_now_add=True)
     void = models.BooleanField(default=False)
 
@@ -584,7 +555,7 @@ class Payment(models.Model):
         (ADJUSTMENT, 'TEC Adjustment'),
     )
 
-    invoice = models.ForeignKey('Invoice', on_delete=models.CASCADE)
+    invoice = models.ForeignKey('Invoice')
     date = models.DateField()
     amount = models.DecimalField(max_digits=10, decimal_places=2, help_text='Please use ex. VAT')
     method = models.CharField(max_length=2, choices=METHODS, null=True, blank=True)

RIGS/regbackend.py

@@ -1,15 +1,13 @@
 from RIGS.models import Profile
 from RIGS.forms import ProfileRegistrationFormUniqueEmail
-from registration.signals import user_registered
-
 
 def user_created(sender, user, request, **kwargs):
-    form = ProfileRegistrationFormUniqueEmail(request.POST)
-    user.first_name = form.data['first_name']
-    user.last_name = form.data['last_name']
-    user.initials = form.data['initials']
-    user.phone = form.data['phone']
-    user.save()
+	form = ProfileRegistrationFormUniqueEmail(request.POST)
+	user.first_name = form.data['first_name']
+	user.last_name = form.data['last_name']
+	user.initials = form.data['initials']
+	user.phone = form.data['phone']
+	user.save()
 
-
-user_registered.connect(user_created)
+from registration.signals import user_registered
+user_registered.connect(user_created)

RIGS/rigboard.py

@@ -1,30 +1,23 @@
+import os
+import cStringIO as StringIO
 from io import BytesIO
-import urllib.request
-import urllib.error
-import urllib.parse
+import urllib2
 
-from django.contrib.staticfiles.storage import staticfiles_storage
-from django.core.mail import EmailMessage, EmailMultiAlternatives
 from django.views import generic
-from django.urls import reverse_lazy
+from django.core.urlresolvers import reverse_lazy
 from django.shortcuts import get_object_or_404
 from django.template import RequestContext
 from django.template.loader import get_template
 from django.conf import settings
-from django.urls import reverse
-from django.core import signing
+from django.core.urlresolvers import reverse
 from django.http import HttpResponse
-from django.core.exceptions import SuspiciousOperation
 from django.db.models import Q
 from django.contrib import messages
-from django.utils.decorators import method_decorator
 from z3c.rml import rml2pdf
 from PyPDF2 import PdfFileMerger, PdfFileReader
 import simplejson
-import premailer
 
 from RIGS import models, forms
-from PyRIGS import decorators
 import datetime
 import re
 import copy
@@ -43,17 +36,15 @@ class RigboardIndex(generic.TemplateView):
         context['events'] = models.Event.objects.current_events()
         return context
 
-
 class WebCalendar(generic.TemplateView):
     template_name = 'RIGS/calendar.html'
 
     def get_context_data(self, **kwargs):
         context = super(WebCalendar, self).get_context_data(**kwargs)
-        context['view'] = kwargs.get('view', '')
-        context['date'] = kwargs.get('date', '')
+        context['view'] = kwargs.get('view','')
+        context['date'] = kwargs.get('date','')
         return context
 
-
 class EventDetail(generic.DetailView):
     model = models.Event
 
@@ -62,6 +53,7 @@ class EventOembed(generic.View):
     model = models.Event
 
     def get(self, request, pk=None):
+
         embed_url = reverse('event_embed', args=[pk])
         full_url = "{0}://{1}{2}".format(request.scheme, request.META['HTTP_HOST'], embed_url)
 
@@ -93,8 +85,9 @@ class EventCreate(generic.CreateView):
         if re.search('"-\d+"', form['items_json'].value()):
             messages.info(self.request, "Your item changes have been saved. Please fix the errors and save the event.")
 
+
         # Get some other objects to include in the form. Used when there are errors but also nice and quick.
-        for field, model in form.related_models.items():
+        for field, model in form.related_models.iteritems():
             value = form[field].value()
             if value is not None and value != '':
                 context[field] = model.objects.get(pk=value)
@@ -115,39 +108,24 @@ class EventUpdate(generic.UpdateView):
         form = context['form']
 
         # Get some other objects to include in the form. Used when there are errors but also nice and quick.
-        for field, model in form.related_models.items():
+        for field, model in form.related_models.iteritems():
             value = form[field].value()
             if value is not None and value != '':
                 context[field] = model.objects.get(pk=value)
-
-        # If this event has already been emailed to a client, show a warning
-        if self.object.auth_request_at is not None:
-            messages.info(self.request, 'This event has already been sent to the client for authorisation, any changes you make will be visible to them immediately.')
-
-        if hasattr(self.object, 'authorised'):
-            messages.warning(self.request, 'This event has already been authorised by client, any changes to price will require reauthorisation.')
-
         return context
 
     def get_success_url(self):
         return reverse_lazy('event_detail', kwargs={'pk': self.object.pk})
 
-
 class EventDuplicate(EventUpdate):
     def get_object(self, queryset=None):
-        old = super(EventDuplicate, self).get_object(queryset)  # Get the object (the event you're duplicating)
-        new = copy.copy(old)  # Make a copy of the object in memory
-        new.based_on = old  # Make the new event based on the old event
+        old = super(EventDuplicate, self).get_object(queryset) # Get the object (the event you're duplicating)
+        new = copy.copy(old) # Make a copy of the object in memory
+        new.based_on = old # Make the new event based on the old event
         new.purchase_order = None
 
-        # Remove all the authorisation information from the new event
-        new.auth_request_to = None
-        new.auth_request_by = None
-        new.auth_request_at = None
-
-        if self.request.method in (
-                'POST', 'PUT'):  # This only happens on save (otherwise items won't display in editor)
-            new.pk = None  # This means a new event will be created on save, and all items will be re-created
+        if self.request.method in ('POST', 'PUT'): # This only happens on save (otherwise items won't display in editor)
+            new.pk = None # This means a new event will be created on save, and all items will be re-created
         else:
             messages.info(self.request, 'Event data duplicated but not yet saved. Click save to complete operation.')
 
@@ -158,34 +136,41 @@ class EventDuplicate(EventUpdate):
         context["duplicate"] = True
         return context
 
-
 class EventPrint(generic.View):
     def get(self, request, pk):
         object = get_object_or_404(models.Event, pk=pk)
         template = get_template('RIGS/event_print.xml')
+        copies = ('TEC', 'Client')
 
         merger = PdfFileMerger()
 
-        context = {
-            'object': object,
-            'fonts': {
-                'opensans': {
-                    'regular': 'RIGS/static/fonts/OPENSANS-REGULAR.TTF',
-                    'bold': 'RIGS/static/fonts/OPENSANS-BOLD.TTF',
-                }
-            },
-            'quote': True,
-            'current_user': request.user,
-        }
+        for copy in copies:
 
-        rml = template.render(context)
+            context = RequestContext(request, { # this should be outside the loop, but bug in 1.8.2 prevents this
+                'object': object,
+                'fonts': {
+                    'opensans': {
+                        'regular': 'RIGS/static/fonts/OPENSANS-REGULAR.TTF',
+                        'bold': 'RIGS/static/fonts/OPENSANS-BOLD.TTF',
+                    }
+                },
+                'copy':copy,
+                'current_user':request.user,
+            })
 
-        buffer = rml2pdf.parseString(rml)
-        merger.append(PdfFileReader(buffer))
-        buffer.close()
+            # context['copy'] = copy # this is the way to do it once we upgrade to Django 1.8.3
 
-        terms = urllib.request.urlopen(settings.TERMS_OF_HIRE_URL)
-        merger.append(BytesIO(terms.read()))
+            rml = template.render(context)
+            buffer = StringIO.StringIO()
+
+            buffer = rml2pdf.parseString(rml)
+
+            merger.append(PdfFileReader(buffer))
+
+            buffer.close()
+
+        terms = urllib2.urlopen(settings.TERMS_OF_HIRE_URL)
+        merger.append(StringIO.StringIO(terms.read()))
 
         merged = BytesIO()
         merger.write(merged)
@@ -198,7 +183,6 @@ class EventPrint(generic.View):
         response.write(merged.getvalue())
         return response
 
-
 class EventArchive(generic.ArchiveIndexView):
     model = models.Event
     date_field = "start_date"
@@ -235,148 +219,3 @@ class EventArchive(generic.ArchiveIndexView):
             messages.add_message(self.request, messages.WARNING, "No events have been found matching those criteria.")
 
         return qs
-
-
-class EventAuthorise(generic.UpdateView):
-    template_name = 'RIGS/eventauthorisation_form.html'
-    success_template = 'RIGS/eventauthorisation_success.html'
-
-    def form_valid(self, form):
-        self.object = form.save()
-
-        self.template_name = self.success_template
-        messages.add_message(self.request, messages.SUCCESS,
-                             'Success! Your event has been authorised. ' +
-                             'You will also receive email confirmation to %s.' % (self.object.email))
-        return self.render_to_response(self.get_context_data())
-
-    @property
-    def event(self):
-        return models.Event.objects.select_related('organisation', 'person', 'venue').get(pk=self.kwargs['pk'])
-
-    def get_object(self, queryset=None):
-        return getattr(self.event, 'authorisation', None)
-
-    def get_form_class(self):
-        return forms.InternalClientEventAuthorisationForm
-
-    def get_context_data(self, **kwargs):
-        context = super(EventAuthorise, self).get_context_data(**kwargs)
-        context['event'] = self.event
-
-        context['tos_url'] = settings.TERMS_OF_HIRE_URL
-        return context
-
-    def get(self, request, *args, **kwargs):
-        if self.get_object() is not None and self.get_object().pk is not None:
-            if self.event.authorised:
-                messages.add_message(self.request, messages.WARNING,
-                                     "This event has already been authorised. "
-                                     "Reauthorising is not necessary at this time.")
-            else:
-                messages.add_message(self.request, messages.WARNING,
-                                     "This event has already been authorised, but the amount has changed. " +
-                                     "Please check the amount and reauthorise.")
-        return super(EventAuthorise, self).get(request, *args, **kwargs)
-
-    def get_form(self, **kwargs):
-        form = super(EventAuthorise, self).get_form(**kwargs)
-        form.instance.event = self.event
-        form.instance.email = self.request.email
-        form.instance.sent_by = self.request.sent_by
-        return form
-
-    def dispatch(self, request, *args, **kwargs):
-        # Verify our signature matches up and all is well with the integrity of the URL
-        try:
-            data = signing.loads(kwargs.get('hmac'))
-            assert int(kwargs.get('pk')) == int(data.get('pk'))
-            request.email = data['email']
-            request.sent_by = models.Profile.objects.get(pk=data['sent_by'])
-        except (signing.BadSignature, AssertionError, KeyError, models.Profile.DoesNotExist):
-            raise SuspiciousOperation(
-                "This URL is invalid. Please ask your TEC contact for a new URL")
-        return super(EventAuthorise, self).dispatch(request, *args, **kwargs)
-
-
-class EventAuthorisationRequest(generic.FormView, generic.detail.SingleObjectMixin):
-    model = models.Event
-    form_class = forms.EventAuthorisationRequestForm
-    template_name = 'RIGS/eventauthorisation_request.html'
-
-    @method_decorator(decorators.nottinghamtec_address_required)
-    def dispatch(self, *args, **kwargs):
-        return super(EventAuthorisationRequest, self).dispatch(*args, **kwargs)
-
-    @property
-    def object(self):
-        return self.get_object()
-
-    def get_success_url(self):
-        if self.request.is_ajax():
-            url = reverse_lazy('closemodal')
-            messages.info(self.request, "location.reload()")
-        else:
-            url = reverse_lazy('event_detail', kwargs={
-                'pk': self.object.pk,
-            })
-            messages.add_message(self.request, messages.SUCCESS, "Authorisation request successfully sent.")
-        return url
-
-    def form_valid(self, form):
-        email = form.cleaned_data['email']
-        event = self.object
-        event.auth_request_by = self.request.user
-        event.auth_request_at = datetime.datetime.now()
-        event.auth_request_to = email
-        event.save()
-
-        context = {
-            'object': self.object,
-            'request': self.request,
-            'hmac': signing.dumps({
-                'pk': self.object.pk,
-                'email': email,
-                'sent_by': self.request.user.pk,
-            }),
-        }
-        if email == event.person.email:
-            context['to_name'] = event.person.name
-
-        msg = EmailMultiAlternatives(
-            "N%05d | %s - Event Authorisation Request" % (self.object.pk, self.object.name),
-            get_template("RIGS/eventauthorisation_client_request.txt").render(context),
-            to=[email],
-            reply_to=[self.request.user.email],
-        )
-        css = staticfiles_storage.path('css/email.css')
-        html = premailer.Premailer(get_template("RIGS/eventauthorisation_client_request.html").render(context),
-                                   external_styles=css).transform()
-        msg.attach_alternative(html, 'text/html')
-
-        msg.send()
-
-        return super(EventAuthorisationRequest, self).form_valid(form)
-
-
-class EventAuthoriseRequestEmailPreview(generic.DetailView):
-    template_name = "RIGS/eventauthorisation_client_request.html"
-    model = models.Event
-
-    def render_to_response(self, context, **response_kwargs):
-        from django.contrib.staticfiles.storage import staticfiles_storage
-        css = staticfiles_storage.path('css/email.css')
-        response = super(EventAuthoriseRequestEmailPreview, self).render_to_response(context, **response_kwargs)
-        assert isinstance(response, HttpResponse)
-        response.content = premailer.Premailer(response.rendered_content, external_styles=css).transform()
-        return response
-
-    def get_context_data(self, **kwargs):
-        context = super(EventAuthoriseRequestEmailPreview, self).get_context_data(**kwargs)
-        context['hmac'] = signing.dumps({
-            'pk': self.object.pk,
-            'email': self.request.GET.get('email', 'hello@world.test'),
-            'sent_by': self.request.user.pk,
-        })
-        context['to_name'] = self.request.GET.get('to_name', None)
-        return context

RIGS/signals.py

@@ -1,98 +0,0 @@
-import re
-import urllib.request
-import urllib.error
-import urllib.parse
-from io import BytesIO
-
-from django.db.models.signals import post_save
-from PyPDF2 import PdfFileReader, PdfFileMerger
-from django.conf import settings
-from django.contrib.staticfiles.storage import staticfiles_storage
-from django.core.mail import EmailMessage, EmailMultiAlternatives
-from django.template.loader import get_template
-from premailer import Premailer
-from z3c.rml import rml2pdf
-
-from RIGS import models
-
-
-def send_eventauthorisation_success_email(instance):
-    # Generate PDF first to prevent context conflicts
-    context = {
-        'object': instance.event,
-        'fonts': {
-            'opensans': {
-                'regular': 'RIGS/static/fonts/OPENSANS-REGULAR.TTF',
-                'bold': 'RIGS/static/fonts/OPENSANS-BOLD.TTF',
-            }
-        },
-        'receipt': True,
-        'current_user': False,
-    }
-
-    template = get_template('RIGS/event_print.xml')
-    merger = PdfFileMerger()
-
-    rml = template.render(context)
-
-    buffer = rml2pdf.parseString(rml)
-    merger.append(PdfFileReader(buffer))
-    buffer.close()
-
-    terms = urllib.request.urlopen(settings.TERMS_OF_HIRE_URL)
-    merger.append(BytesIO(terms.read()))
-
-    merged = BytesIO()
-    merger.write(merged)
-
-    # Produce email content
-    context = {
-        'object': instance,
-    }
-
-    if instance.email == instance.event.person.email:
-        context['to_name'] = instance.event.person.name
-
-    subject = "N%05d | %s - Event Authorised" % (instance.event.pk, instance.event.name)
-
-    client_email = EmailMultiAlternatives(
-        subject,
-        get_template("RIGS/eventauthorisation_client_success.txt").render(context),
-        to=[instance.email],
-        reply_to=[settings.AUTHORISATION_NOTIFICATION_ADDRESS],
-    )
-
-    css = staticfiles_storage.path('css/email.css')
-    html = Premailer(get_template("RIGS/eventauthorisation_client_success.html").render(context),
-                     external_styles=css).transform()
-    client_email.attach_alternative(html, 'text/html')
-
-    escapedEventName = re.sub('[^a-zA-Z0-9 \n\.]', '', instance.event.name)
-
-    client_email.attach('N%05d - %s - CONFIRMATION.pdf' % (instance.event.pk, escapedEventName),
-                        merged.getvalue(),
-                        'application/pdf'
-                        )
-
-    if instance.event.mic:
-        mic_email_address = instance.event.mic.email
-    else:
-        mic_email_address = settings.AUTHORISATION_NOTIFICATION_ADDRESS
-
-    mic_email = EmailMessage(
-        subject,
-        get_template("RIGS/eventauthorisation_mic_success.txt").render(context),
-        to=[mic_email_address]
-    )
-
-    # Now we have both emails successfully generated, send them out
-    client_email.send(fail_silently=True)
-    mic_email.send(fail_silently=True)
-
-
-def on_revision_commit(sender, instance, created, **kwargs):
-    if created:
-        send_eventauthorisation_success_email(instance)
-
-
-post_save.connect(on_revision_commit, sender=models.EventAuthorisation)

RIGS/static/css/email.css

@@ -1 +0,0 @@
-body{margin:0px}.main-table{width:100%;border-collapse:collapse}.client-header{background-image:url("https://www.nottinghamtec.co.uk/imgs/wof2014-1.jpg");background-color:#222;background-repeat:no-repeat;background-position:center;width:100%;margin-bottom:28px}.client-header .logos{width:100%;max-width:640px}.client-header img{height:110px}.content-container{width:100%}.content-container .content{font-family:"Open Sans", "Helvetica Neue", Helvetica, Arial, sans-serif;width:100%;max-width:600px;padding:10px;text-align:left}.content-container .content .button-container{width:100%}.content-container .content .button-container .button{padding:6px 12px;background-color:#357ebf;border-radius:4px}.content-container .content .button-container .button a{color:#fff;text-decoration:none}

RIGS/static/js/affix.js

@@ -1,162 +0,0 @@
-/* ========================================================================
- * Bootstrap: affix.js v3.3.7
- * http://getbootstrap.com/javascript/#affix
- * ========================================================================
- * Copyright 2011-2016 Twitter, Inc.
- * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
- * ======================================================================== */
-
-
-+function ($) {
-  'use strict';
-
-  // AFFIX CLASS DEFINITION
-  // ======================
-
-  var Affix = function (element, options) {
-    this.options = $.extend({}, Affix.DEFAULTS, options)
-
-    this.$target = $(this.options.target)
-      .on('scroll.bs.affix.data-api', $.proxy(this.checkPosition, this))
-      .on('click.bs.affix.data-api',  $.proxy(this.checkPositionWithEventLoop, this))
-
-    this.$element     = $(element)
-    this.affixed      = null
-    this.unpin        = null
-    this.pinnedOffset = null
-
-    this.checkPosition()
-  }
-
-  Affix.VERSION  = '3.3.7'
-
-  Affix.RESET    = 'affix affix-top affix-bottom'
-
-  Affix.DEFAULTS = {
-    offset: 0,
-    target: window
-  }
-
-  Affix.prototype.getState = function (scrollHeight, height, offsetTop, offsetBottom) {
-    var scrollTop    = this.$target.scrollTop()
-    var position     = this.$element.offset()
-    var targetHeight = this.$target.height()
-
-    if (offsetTop != null && this.affixed == 'top') return scrollTop < offsetTop ? 'top' : false
-
-    if (this.affixed == 'bottom') {
-      if (offsetTop != null) return (scrollTop + this.unpin <= position.top) ? false : 'bottom'
-      return (scrollTop + targetHeight <= scrollHeight - offsetBottom) ? false : 'bottom'
-    }
-
-    var initializing   = this.affixed == null
-    var colliderTop    = initializing ? scrollTop : position.top
-    var colliderHeight = initializing ? targetHeight : height
-
-    if (offsetTop != null && scrollTop <= offsetTop) return 'top'
-    if (offsetBottom != null && (colliderTop + colliderHeight >= scrollHeight - offsetBottom)) return 'bottom'
-
-    return false
-  }
-
-  Affix.prototype.getPinnedOffset = function () {
-    if (this.pinnedOffset) return this.pinnedOffset
-    this.$element.removeClass(Affix.RESET).addClass('affix')
-    var scrollTop = this.$target.scrollTop()
-    var position  = this.$element.offset()
-    return (this.pinnedOffset = position.top - scrollTop)
-  }
-
-  Affix.prototype.checkPositionWithEventLoop = function () {
-    setTimeout($.proxy(this.checkPosition, this), 1)
-  }
-
-  Affix.prototype.checkPosition = function () {
-    if (!this.$element.is(':visible')) return
-
-    var height       = this.$element.height()
-    var offset       = this.options.offset
-    var offsetTop    = offset.top
-    var offsetBottom = offset.bottom
-    var scrollHeight = Math.max($(document).height(), $(document.body).height())
-
-    if (typeof offset != 'object')         offsetBottom = offsetTop = offset
-    if (typeof offsetTop == 'function')    offsetTop    = offset.top(this.$element)
-    if (typeof offsetBottom == 'function') offsetBottom = offset.bottom(this.$element)
-
-    var affix = this.getState(scrollHeight, height, offsetTop, offsetBottom)
-
-    if (this.affixed != affix) {
-      if (this.unpin != null) this.$element.css('top', '')
-
-      var affixType = 'affix' + (affix ? '-' + affix : '')
-      var e         = $.Event(affixType + '.bs.affix')
-
-      this.$element.trigger(e)
-
-      if (e.isDefaultPrevented()) return
-
-      this.affixed = affix
-      this.unpin = affix == 'bottom' ? this.getPinnedOffset() : null
-
-      this.$element
-        .removeClass(Affix.RESET)
-        .addClass(affixType)
-        .trigger(affixType.replace('affix', 'affixed') + '.bs.affix')
-    }
-
-    if (affix == 'bottom') {
-      this.$element.offset({
-        top: scrollHeight - height - offsetBottom
-      })
-    }
-  }
-
-
-  // AFFIX PLUGIN DEFINITION
-  // =======================
-
-  function Plugin(option) {
-    return this.each(function () {
-      var $this   = $(this)
-      var data    = $this.data('bs.affix')
-      var options = typeof option == 'object' && option
-
-      if (!data) $this.data('bs.affix', (data = new Affix(this, options)))
-      if (typeof option == 'string') data[option]()
-    })
-  }
-
-  var old = $.fn.affix
-
-  $.fn.affix             = Plugin
-  $.fn.affix.Constructor = Affix
-
-
-  // AFFIX NO CONFLICT
-  // =================
-
-  $.fn.affix.noConflict = function () {
-    $.fn.affix = old
-    return this
-  }
-
-
-  // AFFIX DATA-API
-  // ==============
-
-  $(window).on('load', function () {
-    $('[data-spy="affix"]').each(function () {
-      var $spy = $(this)
-      var data = $spy.data()
-
-      data.offset = data.offset || {}
-
-      if (data.offsetBottom != null) data.offset.bottom = data.offsetBottom
-      if (data.offsetTop    != null) data.offset.top    = data.offsetTop
-
-      Plugin.call($spy, data)
-    })
-  })
-
-}(jQuery);

RIGS/static/js/ajax-bootstrap-select.js

@@ -3,16 +3,16 @@
  *
  * Extends existing [Bootstrap Select] implementations by adding the ability to search via AJAX requests as you type. Originally for CROSCON.
  *
- * @version 1.4.1
+ * @version 1.3.1
  * @author Adam Heim - https://github.com/truckingsim
  * @link https://github.com/truckingsim/Ajax-Bootstrap-Select
- * @copyright 2017 Adam Heim
+ * @copyright 2015 Adam Heim
  * @license Released under the MIT license.
  *
  * Contributors:
  *   Mark Carver - https://github.com/markcarver
  *
- * Last build: 2017-07-21 1:08:54 PM GMT-0400
+ * Last build: 2015-01-06 8:43:11 PM EST
  */
 !(function ($, window) {
 
@@ -186,25 +186,10 @@ var AjaxBootstrapSelect = function (element, options) {
     if (dataKeys.length) {
         // Object containing the data attribute options.
         var dataOptions = {};
-        var flattenedOptions = ['locale'];
         for (i = 0, l = dataKeys.length; i < l; i++) {
             var name = dataKeys[i].replace(/^abs([A-Z])/, matchToLowerCase).replace(/([A-Z])/g, '-$1').toLowerCase();
-            var keys = name.split('-');
-
-            // Certain options should be flattened to a single object
-            // and not fully expanded (such as Locale).
-            if (keys[0] && keys.length > 1 && flattenedOptions.indexOf(keys[0]) !== -1) {
-                var newKeys = [keys.shift()];
-                var property = '';
-                // Combine the remaining keys as a single property.
-                for (var ii = 0; ii < keys.length; ii++) {
-                    property += (ii === 0 ? keys[ii] : keys[ii].charAt(0).toUpperCase() + keys[ii].slice(1));
-                }
-                newKeys.push(property);
-                keys = newKeys;
-            }
             this.log(this.LOG_DEBUG, 'Processing data attribute "data-abs-' + name + '":', data[dataKeys[i]]);
-            expandObject(keys, data[dataKeys[i]], dataOptions);
+            expandObject(name.split('-'), data[dataKeys[i]], dataOptions);
         }
         this.options = $.extend(true, {}, this.options, dataOptions);
         this.log(this.LOG_DEBUG, 'Merged in the data attribute options: ', dataOptions, this.options);
@@ -330,12 +315,6 @@ AjaxBootstrapSelect.prototype.init = function () {
             plugin.log(plugin.LOG_DEBUG, 'Key ignored.');
             return;
         }
-		
-        // Don't process if below minimum query length
-        if (query.length < plugin.options.minLength) {
-            plugin.list.setStatus(plugin.t('statusTooShort'));
-            return;
-        }
 
         // Clear out any existing timer.
         clearTimeout(requestDelayTimer);
@@ -594,25 +573,8 @@ var AjaxBootstrapSelectList = function (plugin) {
     this.title = null;
     this.selectedTextFormat = plugin.selectpicker.options.selectedTextFormat;
 
-    // Save initial options
-    var initial_options = [];
-    plugin.$element.find('option').each(function() {
-        var $option = $(this);
-        var value = $option.attr('value');
-        initial_options.push({
-            value: value,
-            text: $option.text(),
-            'class': $option.attr('class') || '',
-            data: $option.data() || {},
-            preserved: plugin.options.preserveSelected,
-            selected: !!$option.attr('selected')
-        });
-    });
-    this.cacheSet(/*query=*/'', initial_options);
-
     // Preserve selected options.
     if (plugin.options.preserveSelected) {
-        that.selected = initial_options;
         plugin.$element.on('change.abs.preserveSelected', function (e) {
             var $selected = plugin.$element.find(':selected');
             that.selected = [];
@@ -682,7 +644,7 @@ AjaxBootstrapSelectList.prototype.build = function (data) {
         }
 
         // Set various properties.
-        $option.val(item.value).text(item.text).attr('title', item.text);
+        $option.val(item.value).text(item.text);
         if (item['class'].length) {
             $option.attr('class', item['class']);
         }
@@ -770,13 +732,7 @@ AjaxBootstrapSelectList.prototype.refresh = function (triggerChange) {
     if (!this.plugin.$element.find('option').length && emptyTitle && emptyTitle.length) {
         this.setTitle(emptyTitle);
     }
-    else if (
-        this.title ||
-        (
-            this.selectedTextFormat !== 'static' && 
-            this.selectedTextFormat !== this.plugin.selectpicker.options.selectedTextFormat
-        )
-    ) {
+    else if (this.title) {
         this.restoreTitle();
     }
     this.plugin.selectpicker.refresh();
@@ -1268,14 +1224,6 @@ $.fn.ajaxSelectPicker.defaults = {
         }
     },
 
-	/**
- 	 * @member $.fn.ajaxSelectPicker.defaults
-	 * @cfg {Number} minLength = 0
-	 * @markdown
-	 * Invoke a request for empty search values.
-	 */
-    minLength: 0,
-
     /**
      * @member $.fn.ajaxSelectPicker.defaults
      * @cfg {String} ajaxSearchUrl
@@ -1348,7 +1296,8 @@ $.fn.ajaxSelectPicker.defaults = {
      *     39: "right",
      *     38: "up",
      *     40: "down",
-     *     91: "meta"
+     *     91: "meta",
+     *     229: "unknown"
      * }
      * ```
      */
@@ -1362,7 +1311,8 @@ $.fn.ajaxSelectPicker.defaults = {
         39: "right",
         38: "up",
         40: "down",
-        91: "meta"
+        91: "meta",
+        229: "unknown"
     },
 
     /**
@@ -1456,7 +1406,7 @@ $.fn.ajaxSelectPicker.defaults = {
      * }
      * ```
      */
-    preprocessData: function () { },
+    preprocessData: function(){},
 
     /**
      * @member $.fn.ajaxSelectPicker.defaults
@@ -1484,7 +1434,7 @@ $.fn.ajaxSelectPicker.defaults = {
      * @markdown
      * Process the data returned after this plugin, but before the list is built.
      */
-    processData: function () { },
+    processData: function(){},
 
     /**
      * @member $.fn.ajaxSelectPicker.defaults
@@ -1597,15 +1547,7 @@ $.fn.ajaxSelectPicker.locale['en-US'] = {
      * @markdown
      * The text to use in the status container when a request is being initiated.
      */
-    statusSearching: 'Searching...',
-
-	/**
-     * @member $.fn.ajaxSelectPicker.locale
-     * @cfg {String} statusToShort = 'Please enter more characters'
-     * @markdown
-     * The text used in the status container when the request returns no results.
-     */
-    statusTooShort: 'Please enter more characters'
+    statusSearching: 'Searching...'
 };
 $.fn.ajaxSelectPicker.locale.en = $.fn.ajaxSelectPicker.locale['en-US'];
 

RIGS/static/js/alert.js

@@ -1,94 +0,0 @@
-/* ========================================================================
- * Bootstrap: alert.js v3.3.7
- * http://getbootstrap.com/javascript/#alerts
- * ========================================================================
- * Copyright 2011-2016 Twitter, Inc.
- * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
- * ======================================================================== */
-
-
-+function ($) {
-  'use strict';
-
-  // ALERT CLASS DEFINITION
-  // ======================
-
-  var dismiss = '[data-dismiss="alert"]'
-  var Alert   = function (el) {
-    $(el).on('click', dismiss, this.close)
-  }
-
-  Alert.VERSION = '3.3.7'
-
-  Alert.TRANSITION_DURATION = 150
-
-  Alert.prototype.close = function (e) {
-    var $this    = $(this)
-    var selector = $this.attr('data-target')
-
-    if (!selector) {
-      selector = $this.attr('href')
-      selector = selector && selector.replace(/.*(?=#[^\s]*$)/, '') // strip for ie7
-    }
-
-    var $parent = $(selector === '#' ? [] : selector)
-
-    if (e) e.preventDefault()
-
-    if (!$parent.length) {
-      $parent = $this.closest('.alert')
-    }
-
-    $parent.trigger(e = $.Event('close.bs.alert'))
-
-    if (e.isDefaultPrevented()) return
-
-    $parent.removeClass('in')
-
-    function removeElement() {
-      // detach from parent, fire event then clean up data
-      $parent.detach().trigger('closed.bs.alert').remove()
-    }
-
-    $.support.transition && $parent.hasClass('fade') ?
-      $parent
-        .one('bsTransitionEnd', removeElement)
-        .emulateTransitionEnd(Alert.TRANSITION_DURATION) :
-      removeElement()
-  }
-
-
-  // ALERT PLUGIN DEFINITION
-  // =======================
-
-  function Plugin(option) {
-    return this.each(function () {
-      var $this = $(this)
-      var data  = $this.data('bs.alert')
-
-      if (!data) $this.data('bs.alert', (data = new Alert(this)))
-      if (typeof option == 'string') data[option].call($this)
-    })
-  }
-
-  var old = $.fn.alert
-
-  $.fn.alert             = Plugin
-  $.fn.alert.Constructor = Alert
-
-
-  // ALERT NO CONFLICT
-  // =================
-
-  $.fn.alert.noConflict = function () {
-    $.fn.alert = old
-    return this
-  }
-
-
-  // ALERT DATA-API
-  // ==============
-
-  $(document).on('click.bs.alert.data-api', dismiss, Alert.prototype.close)
-
-}(jQuery);

RIGS/static/js/button.js

@@ -1,125 +0,0 @@
-/* ========================================================================
- * Bootstrap: button.js v3.3.7
- * http://getbootstrap.com/javascript/#buttons
- * ========================================================================
- * Copyright 2011-2016 Twitter, Inc.
- * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
- * ======================================================================== */
-
-
-+function ($) {
-  'use strict';
-
-  // BUTTON PUBLIC CLASS DEFINITION
-  // ==============================
-
-  var Button = function (element, options) {
-    this.$element  = $(element)
-    this.options   = $.extend({}, Button.DEFAULTS, options)
-    this.isLoading = false
-  }
-
-  Button.VERSION  = '3.3.7'
-
-  Button.DEFAULTS = {
-    loadingText: 'loading...'
-  }
-
-  Button.prototype.setState = function (state) {
-    var d    = 'disabled'
-    var $el  = this.$element
-    var val  = $el.is('input') ? 'val' : 'html'
-    var data = $el.data()
-
-    state += 'Text'
-
-    if (data.resetText == null) $el.data('resetText', $el[val]())
-
-    // push to event loop to allow forms to submit
-    setTimeout($.proxy(function () {
-      $el[val](data[state] == null ? this.options[state] : data[state])
-
-      if (state == 'loadingText') {
-        this.isLoading = true
-        $el.addClass(d).attr(d, d).prop(d, true)
-      } else if (this.isLoading) {
-        this.isLoading = false
-        $el.removeClass(d).removeAttr(d).prop(d, false)
-      }
-    }, this), 0)
-  }
-
-  Button.prototype.toggle = function () {
-    var changed = true
-    var $parent = this.$element.closest('[data-toggle="buttons"]')
-
-    if ($parent.length) {
-      var $input = this.$element.find('input')
-      if ($input.prop('type') == 'radio') {
-        if ($input.prop('checked')) changed = false
-        $parent.find('.active').removeClass('active')
-        this.$element.addClass('active')
-      } else if ($input.prop('type') == 'checkbox') {
-        if (($input.prop('checked')) !== this.$element.hasClass('active')) changed = false
-        this.$element.toggleClass('active')
-      }
-      $input.prop('checked', this.$element.hasClass('active'))
-      if (changed) $input.trigger('change')
-    } else {
-      this.$element.attr('aria-pressed', !this.$element.hasClass('active'))
-      this.$element.toggleClass('active')
-    }
-  }
-
-
-  // BUTTON PLUGIN DEFINITION
-  // ========================
-
-  function Plugin(option) {
-    return this.each(function () {
-      var $this   = $(this)
-      var data    = $this.data('bs.button')
-      var options = typeof option == 'object' && option
-
-      if (!data) $this.data('bs.button', (data = new Button(this, options)))
-
-      if (option == 'toggle') data.toggle()
-      else if (option) data.setState(option)
-    })
-  }
-
-  var old = $.fn.button
-
-  $.fn.button             = Plugin
-  $.fn.button.Constructor = Button
-
-
-  // BUTTON NO CONFLICT
-  // ==================
-
-  $.fn.button.noConflict = function () {
-    $.fn.button = old
-    return this
-  }
-
-
-  // BUTTON DATA-API
-  // ===============
-
-  $(document)
-    .on('click.bs.button.data-api', '[data-toggle^="button"]', function (e) {
-      var $btn = $(e.target).closest('.btn')
-      Plugin.call($btn, 'toggle')
-      if (!($(e.target).is('input[type="radio"], input[type="checkbox"]'))) {
-        // Prevent double click on radios, and the double selections (so cancellation) on checkboxes
-        e.preventDefault()
-        // The target component still receive the focus
-        if ($btn.is('input,button')) $btn.trigger('focus')
-        else $btn.find('input:visible,button:visible').first().trigger('focus')
-      }
-    })
-    .on('focus.bs.button.data-api blur.bs.button.data-api', '[data-toggle^="button"]', function (e) {
-      $(e.target).closest('.btn').toggleClass('focus', /^focus(in)?$/.test(e.type))
-    })
-
-}(jQuery);

RIGS/static/js/carousel.js

@@ -1,237 +0,0 @@
-/* ========================================================================
- * Bootstrap: carousel.js v3.3.7
- * http://getbootstrap.com/javascript/#carousel
- * ========================================================================
- * Copyright 2011-2016 Twitter, Inc.
- * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
- * ======================================================================== */
-
-
-+function ($) {
-  'use strict';
-
-  // CAROUSEL CLASS DEFINITION
-  // =========================
-
-  var Carousel = function (element, options) {
-    this.$element    = $(element)
-    this.$indicators = this.$element.find('.carousel-indicators')
-    this.options     = options
-    this.paused      = null
-    this.sliding     = null
-    this.interval    = null
-    this.$active     = null
-    this.$items      = null
-
-    this.options.keyboard && this.$element.on('keydown.bs.carousel', $.proxy(this.keydown, this))
-
-    this.options.pause == 'hover' && !('ontouchstart' in document.documentElement) && this.$element
-      .on('mouseenter.bs.carousel', $.proxy(this.pause, this))
-      .on('mouseleave.bs.carousel', $.proxy(this.cycle, this))
-  }
-
-  Carousel.VERSION  = '3.3.7'
-
-  Carousel.TRANSITION_DURATION = 600
-
-  Carousel.DEFAULTS = {
-    interval: 5000,
-    pause: 'hover',
-    wrap: true,
-    keyboard: true
-  }
-
-  Carousel.prototype.keydown = function (e) {
-    if (/input|textarea/i.test(e.target.tagName)) return
-    switch (e.which) {
-      case 37: this.prev(); break
-      case 39: this.next(); break
-      default: return
-    }
-
-    e.preventDefault()
-  }
-
-  Carousel.prototype.cycle = function (e) {
-    e || (this.paused = false)
-
-    this.interval && clearInterval(this.interval)
-
-    this.options.interval
-      && !this.paused
-      && (this.interval = setInterval($.proxy(this.next, this), this.options.interval))
-
-    return this
-  }
-
-  Carousel.prototype.getItemIndex = function (item) {
-    this.$items = item.parent().children('.item')
-    return this.$items.index(item || this.$active)
-  }
-
-  Carousel.prototype.getItemForDirection = function (direction, active) {
-    var activeIndex = this.getItemIndex(active)
-    var willWrap = (direction == 'prev' && activeIndex === 0)
-                || (direction == 'next' && activeIndex == (this.$items.length - 1))
-    if (willWrap && !this.options.wrap) return active
-    var delta = direction == 'prev' ? -1 : 1
-    var itemIndex = (activeIndex + delta) % this.$items.length
-    return this.$items.eq(itemIndex)
-  }
-
-  Carousel.prototype.to = function (pos) {
-    var that        = this
-    var activeIndex = this.getItemIndex(this.$active = this.$element.find('.item.active'))
-
-    if (pos > (this.$items.length - 1) || pos < 0) return
-
-    if (this.sliding)       return this.$element.one('slid.bs.carousel', function () { that.to(pos) }) // yes, "slid"
-    if (activeIndex == pos) return this.pause().cycle()
-
-    return this.slide(pos > activeIndex ? 'next' : 'prev', this.$items.eq(pos))
-  }
-
-  Carousel.prototype.pause = function (e) {
-    e || (this.paused = true)
-
-    if (this.$element.find('.next, .prev').length && $.support.transition) {
-      this.$element.trigger($.support.transition.end)
-      this.cycle(true)
-    }
-
-    this.interval = clearInterval(this.interval)
-
-    return this
-  }
-
-  Carousel.prototype.next = function () {
-    if (this.sliding) return
-    return this.slide('next')
-  }
-
-  Carousel.prototype.prev = function () {
-    if (this.sliding) return
-    return this.slide('prev')
-  }
-
-  Carousel.prototype.slide = function (type, next) {
-    var $active   = this.$element.find('.item.active')
-    var $next     = next || this.getItemForDirection(type, $active)
-    var isCycling = this.interval
-    var direction = type == 'next' ? 'left' : 'right'
-    var that      = this
-
-    if ($next.hasClass('active')) return (this.sliding = false)
-
-    var relatedTarget = $next[0]
-    var slideEvent = $.Event('slide.bs.carousel', {
-      relatedTarget: relatedTarget,
-      direction: direction
-    })
-    this.$element.trigger(slideEvent)
-    if (slideEvent.isDefaultPrevented()) return
-
-    this.sliding = true
-
-    isCycling && this.pause()
-
-    if (this.$indicators.length) {
-      this.$indicators.find('.active').removeClass('active')
-      var $nextIndicator = $(this.$indicators.children()[this.getItemIndex($next)])
-      $nextIndicator && $nextIndicator.addClass('active')
-    }
-
-    var slidEvent = $.Event('slid.bs.carousel', { relatedTarget: relatedTarget, direction: direction }) // yes, "slid"
-    if ($.support.transition && this.$element.hasClass('slide')) {
-      $next.addClass(type)
-      $next[0].offsetWidth // force reflow
-      $active.addClass(direction)
-      $next.addClass(direction)
-      $active
-        .one('bsTransitionEnd', function () {
-          $next.removeClass([type, direction].join(' ')).addClass('active')
-          $active.removeClass(['active', direction].join(' '))
-          that.sliding = false
-          setTimeout(function () {
-            that.$element.trigger(slidEvent)
-          }, 0)
-        })
-        .emulateTransitionEnd(Carousel.TRANSITION_DURATION)
-    } else {
-      $active.removeClass('active')
-      $next.addClass('active')
-      this.sliding = false
-      this.$element.trigger(slidEvent)
-    }
-
-    isCycling && this.cycle()
-
-    return this
-  }
-
-
-  // CAROUSEL PLUGIN DEFINITION
-  // ==========================
-
-  function Plugin(option) {
-    return this.each(function () {
-      var $this   = $(this)
-      var data    = $this.data('bs.carousel')
-      var options = $.extend({}, Carousel.DEFAULTS, $this.data(), typeof option == 'object' && option)
-      var action  = typeof option == 'string' ? option : options.slide
-
-      if (!data) $this.data('bs.carousel', (data = new Carousel(this, options)))
-      if (typeof option == 'number') data.to(option)
-      else if (action) data[action]()
-      else if (options.interval) data.pause().cycle()
-    })
-  }
-
-  var old = $.fn.carousel
-
-  $.fn.carousel             = Plugin
-  $.fn.carousel.Constructor = Carousel
-
-
-  // CAROUSEL NO CONFLICT
-  // ====================
-
-  $.fn.carousel.noConflict = function () {
-    $.fn.carousel = old
-    return this
-  }
-
-
-  // CAROUSEL DATA-API
-  // =================
-
-  var clickHandler = function (e) {
-    var href
-    var $this   = $(this)
-    var $target = $($this.attr('data-target') || (href = $this.attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '')) // strip for ie7
-    if (!$target.hasClass('carousel')) return
-    var options = $.extend({}, $target.data(), $this.data())
-    var slideIndex = $this.attr('data-slide-to')
-    if (slideIndex) options.interval = false
-
-    Plugin.call($target, options)
-
-    if (slideIndex) {
-      $target.data('bs.carousel').to(slideIndex)
-    }
-
-    e.preventDefault()
-  }
-
-  $(document)
-    .on('click.bs.carousel.data-api', '[data-slide]', clickHandler)
-    .on('click.bs.carousel.data-api', '[data-slide-to]', clickHandler)
-
-  $(window).on('load', function () {
-    $('[data-ride="carousel"]').each(function () {
-      var $carousel = $(this)
-      Plugin.call($carousel, $carousel.data())
-    })
-  })
-
-}(jQuery);

RIGS/static/js/collapse.js

@@ -1,212 +0,0 @@
-/* ========================================================================
- * Bootstrap: collapse.js v3.3.7
- * http://getbootstrap.com/javascript/#collapse
- * ========================================================================
- * Copyright 2011-2016 Twitter, Inc.
- * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
- * ======================================================================== */
-
-/* jshint latedef: false */
-
-+function ($) {
-  'use strict';
-
-  // COLLAPSE PUBLIC CLASS DEFINITION
-  // ================================
-
-  var Collapse = function (element, options) {
-    this.$element      = $(element)
-    this.options       = $.extend({}, Collapse.DEFAULTS, options)
-    this.$trigger      = $('[data-toggle="collapse"][href="#' + element.id + '"],' +
-                           '[data-toggle="collapse"][data-target="#' + element.id + '"]')
-    this.transitioning = null
-
-    if (this.options.parent) {
-      this.$parent = this.getParent()
-    } else {
-      this.addAriaAndCollapsedClass(this.$element, this.$trigger)
-    }
-
-    if (this.options.toggle) this.toggle()
-  }
-
-  Collapse.VERSION  = '3.3.7'
-
-  Collapse.TRANSITION_DURATION = 350
-
-  Collapse.DEFAULTS = {
-    toggle: true
-  }
-
-  Collapse.prototype.dimension = function () {
-    var hasWidth = this.$element.hasClass('width')
-    return hasWidth ? 'width' : 'height'
-  }
-
-  Collapse.prototype.show = function () {
-    if (this.transitioning || this.$element.hasClass('in')) return
-
-    var activesData
-    var actives = this.$parent && this.$parent.children('.panel').children('.in, .collapsing')
-
-    if (actives && actives.length) {
-      activesData = actives.data('bs.collapse')
-      if (activesData && activesData.transitioning) return
-    }
-
-    var startEvent = $.Event('show.bs.collapse')
-    this.$element.trigger(startEvent)
-    if (startEvent.isDefaultPrevented()) return
-
-    if (actives && actives.length) {
-      Plugin.call(actives, 'hide')
-      activesData || actives.data('bs.collapse', null)
-    }
-
-    var dimension = this.dimension()
-
-    this.$element
-      .removeClass('collapse')
-      .addClass('collapsing')[dimension](0)
-      .attr('aria-expanded', true)
-
-    this.$trigger
-      .removeClass('collapsed')
-      .attr('aria-expanded', true)
-
-    this.transitioning = 1
-
-    var complete = function () {
-      this.$element
-        .removeClass('collapsing')
-        .addClass('collapse in')[dimension]('')
-      this.transitioning = 0
-      this.$element
-        .trigger('shown.bs.collapse')
-    }
-
-    if (!$.support.transition) return complete.call(this)
-
-    var scrollSize = $.camelCase(['scroll', dimension].join('-'))
-
-    this.$element
-      .one('bsTransitionEnd', $.proxy(complete, this))
-      .emulateTransitionEnd(Collapse.TRANSITION_DURATION)[dimension](this.$element[0][scrollSize])
-  }
-
-  Collapse.prototype.hide = function () {
-    if (this.transitioning || !this.$element.hasClass('in')) return
-
-    var startEvent = $.Event('hide.bs.collapse')
-    this.$element.trigger(startEvent)
-    if (startEvent.isDefaultPrevented()) return
-
-    var dimension = this.dimension()
-
-    this.$element[dimension](this.$element[dimension]())[0].offsetHeight
-
-    this.$element
-      .addClass('collapsing')
-      .removeClass('collapse in')
-      .attr('aria-expanded', false)
-
-    this.$trigger
-      .addClass('collapsed')
-      .attr('aria-expanded', false)
-
-    this.transitioning = 1
-
-    var complete = function () {
-      this.transitioning = 0
-      this.$element
-        .removeClass('collapsing')
-        .addClass('collapse')
-        .trigger('hidden.bs.collapse')
-    }
-
-    if (!$.support.transition) return complete.call(this)
-
-    this.$element
-      [dimension](0)
-      .one('bsTransitionEnd', $.proxy(complete, this))
-      .emulateTransitionEnd(Collapse.TRANSITION_DURATION)
-  }
-
-  Collapse.prototype.toggle = function () {
-    this[this.$element.hasClass('in') ? 'hide' : 'show']()
-  }
-
-  Collapse.prototype.getParent = function () {
-    return $(this.options.parent)
-      .find('[data-toggle="collapse"][data-parent="' + this.options.parent + '"]')
-      .each($.proxy(function (i, element) {
-        var $element = $(element)
-        this.addAriaAndCollapsedClass(getTargetFromTrigger($element), $element)
-      }, this))
-      .end()
-  }
-
-  Collapse.prototype.addAriaAndCollapsedClass = function ($element, $trigger) {
-    var isOpen = $element.hasClass('in')
-
-    $element.attr('aria-expanded', isOpen)
-    $trigger
-      .toggleClass('collapsed', !isOpen)
-      .attr('aria-expanded', isOpen)
-  }
-
-  function getTargetFromTrigger($trigger) {
-    var href
-    var target = $trigger.attr('data-target')
-      || (href = $trigger.attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '') // strip for ie7
-
-    return $(target)
-  }
-
-
-  // COLLAPSE PLUGIN DEFINITION
-  // ==========================
-
-  function Plugin(option) {
-    return this.each(function () {
-      var $this   = $(this)
-      var data    = $this.data('bs.collapse')
-      var options = $.extend({}, Collapse.DEFAULTS, $this.data(), typeof option == 'object' && option)
-
-      if (!data && options.toggle && /show|hide/.test(option)) options.toggle = false
-      if (!data) $this.data('bs.collapse', (data = new Collapse(this, options)))
-      if (typeof option == 'string') data[option]()
-    })
-  }
-
-  var old = $.fn.collapse
-
-  $.fn.collapse             = Plugin
-  $.fn.collapse.Constructor = Collapse
-
-
-  // COLLAPSE NO CONFLICT
-  // ====================
-
-  $.fn.collapse.noConflict = function () {
-    $.fn.collapse = old
-    return this
-  }
-
-
-  // COLLAPSE DATA-API
-  // =================
-
-  $(document).on('click.bs.collapse.data-api', '[data-toggle="collapse"]', function (e) {
-    var $this   = $(this)
-
-    if (!$this.attr('data-target')) e.preventDefault()
-
-    var $target = getTargetFromTrigger($this)
-    var data    = $target.data('bs.collapse')
-    var option  = data ? 'toggle' : $this.data()
-
-    Plugin.call($target, option)
-  })
-
-}(jQuery);

RIGS/static/js/dropdown.js

@@ -1,165 +0,0 @@
-/* ========================================================================
- * Bootstrap: dropdown.js v3.3.7
- * http://getbootstrap.com/javascript/#dropdowns
- * ========================================================================
- * Copyright 2011-2016 Twitter, Inc.
- * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
- * ======================================================================== */
-
-
-+function ($) {
-  'use strict';
-
-  // DROPDOWN CLASS DEFINITION
-  // =========================
-
-  var backdrop = '.dropdown-backdrop'
-  var toggle   = '[data-toggle="dropdown"]'
-  var Dropdown = function (element) {
-    $(element).on('click.bs.dropdown', this.toggle)
-  }
-
-  Dropdown.VERSION = '3.3.7'
-
-  function getParent($this) {
-    var selector = $this.attr('data-target')
-
-    if (!selector) {
-      selector = $this.attr('href')
-      selector = selector && /#[A-Za-z]/.test(selector) && selector.replace(/.*(?=#[^\s]*$)/, '') // strip for ie7
-    }
-
-    var $parent = selector && $(selector)
-
-    return $parent && $parent.length ? $parent : $this.parent()
-  }
-
-  function clearMenus(e) {
-    if (e && e.which === 3) return
-    $(backdrop).remove()
-    $(toggle).each(function () {
-      var $this         = $(this)
-      var $parent       = getParent($this)
-      var relatedTarget = { relatedTarget: this }
-
-      if (!$parent.hasClass('open')) return
-
-      if (e && e.type == 'click' && /input|textarea/i.test(e.target.tagName) && $.contains($parent[0], e.target)) return
-
-      $parent.trigger(e = $.Event('hide.bs.dropdown', relatedTarget))
-
-      if (e.isDefaultPrevented()) return
-
-      $this.attr('aria-expanded', 'false')
-      $parent.removeClass('open').trigger($.Event('hidden.bs.dropdown', relatedTarget))
-    })
-  }
-
-  Dropdown.prototype.toggle = function (e) {
-    var $this = $(this)
-
-    if ($this.is('.disabled, :disabled')) return
-
-    var $parent  = getParent($this)
-    var isActive = $parent.hasClass('open')
-
-    clearMenus()
-
-    if (!isActive) {
-      if ('ontouchstart' in document.documentElement && !$parent.closest('.navbar-nav').length) {
-        // if mobile we use a backdrop because click events don't delegate
-        $(document.createElement('div'))
-          .addClass('dropdown-backdrop')
-          .insertAfter($(this))
-          .on('click', clearMenus)
-      }
-
-      var relatedTarget = { relatedTarget: this }
-      $parent.trigger(e = $.Event('show.bs.dropdown', relatedTarget))
-
-      if (e.isDefaultPrevented()) return
-
-      $this
-        .trigger('focus')
-        .attr('aria-expanded', 'true')
-
-      $parent
-        .toggleClass('open')
-        .trigger($.Event('shown.bs.dropdown', relatedTarget))
-    }
-
-    return false
-  }
-
-  Dropdown.prototype.keydown = function (e) {
-    if (!/(38|40|27|32)/.test(e.which) || /input|textarea/i.test(e.target.tagName)) return
-
-    var $this = $(this)
-
-    e.preventDefault()
-    e.stopPropagation()
-
-    if ($this.is('.disabled, :disabled')) return
-
-    var $parent  = getParent($this)
-    var isActive = $parent.hasClass('open')
-
-    if (!isActive && e.which != 27 || isActive && e.which == 27) {
-      if (e.which == 27) $parent.find(toggle).trigger('focus')
-      return $this.trigger('click')
-    }
-
-    var desc = ' li:not(.disabled):visible a'
-    var $items = $parent.find('.dropdown-menu' + desc)
-
-    if (!$items.length) return
-
-    var index = $items.index(e.target)
-
-    if (e.which == 38 && index > 0)                 index--         // up
-    if (e.which == 40 && index < $items.length - 1) index++         // down
-    if (!~index)                                    index = 0
-
-    $items.eq(index).trigger('focus')
-  }
-
-
-  // DROPDOWN PLUGIN DEFINITION
-  // ==========================
-
-  function Plugin(option) {
-    return this.each(function () {
-      var $this = $(this)
-      var data  = $this.data('bs.dropdown')
-
-      if (!data) $this.data('bs.dropdown', (data = new Dropdown(this)))
-      if (typeof option == 'string') data[option].call($this)
-    })
-  }
-
-  var old = $.fn.dropdown
-
-  $.fn.dropdown             = Plugin
-  $.fn.dropdown.Constructor = Dropdown
-
-
-  // DROPDOWN NO CONFLICT
-  // ====================
-
-  $.fn.dropdown.noConflict = function () {
-    $.fn.dropdown = old
-    return this
-  }
-
-
-  // APPLY TO STANDARD DROPDOWN ELEMENTS
-  // ===================================
-
-  $(document)
-    .on('click.bs.dropdown.data-api', clearMenus)
-    .on('click.bs.dropdown.data-api', '.dropdown form', function (e) { e.stopPropagation() })
-    .on('click.bs.dropdown.data-api', toggle, Dropdown.prototype.toggle)
-    .on('keydown.bs.dropdown.data-api', toggle, Dropdown.prototype.keydown)
-    .on('keydown.bs.dropdown.data-api', '.dropdown-menu', Dropdown.prototype.keydown)
-
-}(jQuery);

RIGS/static/js/interaction.js

@@ -47,7 +47,7 @@ $('#item-table').on('click', '.item-add', function () {
     $('#item_quantity').val('');
     $('#item_cost').val('');
 
-    $($(this).data('target')).modal('show');
+    $($(this).data('target'));
 });
 
 $('#item-table').on('click', '.item-edit', function () {
@@ -62,7 +62,7 @@ $('#item-table').on('click', '.item-edit', function () {
     $('#item_quantity').val(fields.quantity);
     $('#item_cost').val(fields.cost);
 
-    $($(this).data('target')).modal('show');
+    $($(this).data('target'));
 });
 
 $('body').on('submit', '#item-form', function (e) {
@@ -136,4 +136,4 @@ $("#item-table tbody").sortable({
         });
 
     }
-});
+});

RIGS/static/js/modal.js

@@ -1,339 +0,0 @@
-/* ========================================================================
- * Bootstrap: modal.js v3.3.7
- * http://getbootstrap.com/javascript/#modals
- * ========================================================================
- * Copyright 2011-2016 Twitter, Inc.
- * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
- * ======================================================================== */
-
-
-+function ($) {
-  'use strict';
-
-  // MODAL CLASS DEFINITION
-  // ======================
-
-  var Modal = function (element, options) {
-    this.options             = options
-    this.$body               = $(document.body)
-    this.$element            = $(element)
-    this.$dialog             = this.$element.find('.modal-dialog')
-    this.$backdrop           = null
-    this.isShown             = null
-    this.originalBodyPad     = null
-    this.scrollbarWidth      = 0
-    this.ignoreBackdropClick = false
-
-    if (this.options.remote) {
-      this.$element
-        .find('.modal-content')
-        .load(this.options.remote, $.proxy(function () {
-          this.$element.trigger('loaded.bs.modal')
-        }, this))
-    }
-  }
-
-  Modal.VERSION  = '3.3.7'
-
-  Modal.TRANSITION_DURATION = 300
-  Modal.BACKDROP_TRANSITION_DURATION = 150
-
-  Modal.DEFAULTS = {
-    backdrop: true,
-    keyboard: true,
-    show: true
-  }
-
-  Modal.prototype.toggle = function (_relatedTarget) {
-    return this.isShown ? this.hide() : this.show(_relatedTarget)
-  }
-
-  Modal.prototype.show = function (_relatedTarget) {
-    var that = this
-    var e    = $.Event('show.bs.modal', { relatedTarget: _relatedTarget })
-
-    this.$element.trigger(e)
-
-    if (this.isShown || e.isDefaultPrevented()) return
-
-    this.isShown = true
-
-    this.checkScrollbar()
-    this.setScrollbar()
-    this.$body.addClass('modal-open')
-
-    this.escape()
-    this.resize()
-
-    this.$element.on('click.dismiss.bs.modal', '[data-dismiss="modal"]', $.proxy(this.hide, this))
-
-    this.$dialog.on('mousedown.dismiss.bs.modal', function () {
-      that.$element.one('mouseup.dismiss.bs.modal', function (e) {
-        if ($(e.target).is(that.$element)) that.ignoreBackdropClick = true
-      })
-    })
-
-    this.backdrop(function () {
-      var transition = $.support.transition && that.$element.hasClass('fade')
-
-      if (!that.$element.parent().length) {
-        that.$element.appendTo(that.$body) // don't move modals dom position
-      }
-
-      that.$element
-        .show()
-        .scrollTop(0)
-
-      that.adjustDialog()
-
-      if (transition) {
-        that.$element[0].offsetWidth // force reflow
-      }
-
-      that.$element.addClass('in')
-
-      that.enforceFocus()
-
-      var e = $.Event('shown.bs.modal', { relatedTarget: _relatedTarget })
-
-      transition ?
-        that.$dialog // wait for modal to slide in
-          .one('bsTransitionEnd', function () {
-            that.$element.trigger('focus').trigger(e)
-          })
-          .emulateTransitionEnd(Modal.TRANSITION_DURATION) :
-        that.$element.trigger('focus').trigger(e)
-    })
-  }
-
-  Modal.prototype.hide = function (e) {
-    if (e) e.preventDefault()
-
-    e = $.Event('hide.bs.modal')
-
-    this.$element.trigger(e)
-
-    if (!this.isShown || e.isDefaultPrevented()) return
-
-    this.isShown = false
-
-    this.escape()
-    this.resize()
-
-    $(document).off('focusin.bs.modal')
-
-    this.$element
-      .removeClass('in')
-      .off('click.dismiss.bs.modal')
-      .off('mouseup.dismiss.bs.modal')
-
-    this.$dialog.off('mousedown.dismiss.bs.modal')
-
-    $.support.transition && this.$element.hasClass('fade') ?
-      this.$element
-        .one('bsTransitionEnd', $.proxy(this.hideModal, this))
-        .emulateTransitionEnd(Modal.TRANSITION_DURATION) :
-      this.hideModal()
-  }
-
-  Modal.prototype.enforceFocus = function () {
-    $(document)
-      .off('focusin.bs.modal') // guard against infinite focus loop
-      .on('focusin.bs.modal', $.proxy(function (e) {
-        if (document !== e.target &&
-            this.$element[0] !== e.target &&
-            !this.$element.has(e.target).length) {
-          this.$element.trigger('focus')
-        }
-      }, this))
-  }
-
-  Modal.prototype.escape = function () {
-    if (this.isShown && this.options.keyboard) {
-      this.$element.on('keydown.dismiss.bs.modal', $.proxy(function (e) {
-        e.which == 27 && this.hide()
-      }, this))
-    } else if (!this.isShown) {
-      this.$element.off('keydown.dismiss.bs.modal')
-    }
-  }
-
-  Modal.prototype.resize = function () {
-    if (this.isShown) {
-      $(window).on('resize.bs.modal', $.proxy(this.handleUpdate, this))
-    } else {
-      $(window).off('resize.bs.modal')
-    }
-  }
-
-  Modal.prototype.hideModal = function () {
-    var that = this
-    this.$element.hide()
-    this.backdrop(function () {
-      that.$body.removeClass('modal-open')
-      that.resetAdjustments()
-      that.resetScrollbar()
-      that.$element.trigger('hidden.bs.modal')
-    })
-  }
-
-  Modal.prototype.removeBackdrop = function () {
-    this.$backdrop && this.$backdrop.remove()
-    this.$backdrop = null
-  }
-
-  Modal.prototype.backdrop = function (callback) {
-    var that = this
-    var animate = this.$element.hasClass('fade') ? 'fade' : ''
-
-    if (this.isShown && this.options.backdrop) {
-      var doAnimate = $.support.transition && animate
-
-      this.$backdrop = $(document.createElement('div'))
-        .addClass('modal-backdrop ' + animate)
-        .appendTo(this.$body)
-
-      this.$element.on('click.dismiss.bs.modal', $.proxy(function (e) {
-        if (this.ignoreBackdropClick) {
-          this.ignoreBackdropClick = false
-          return
-        }
-        if (e.target !== e.currentTarget) return
-        this.options.backdrop == 'static'
-          ? this.$element[0].focus()
-          : this.hide()
-      }, this))
-
-      if (doAnimate) this.$backdrop[0].offsetWidth // force reflow
-
-      this.$backdrop.addClass('in')
-
-      if (!callback) return
-
-      doAnimate ?
-        this.$backdrop
-          .one('bsTransitionEnd', callback)
-          .emulateTransitionEnd(Modal.BACKDROP_TRANSITION_DURATION) :
-        callback()
-
-    } else if (!this.isShown && this.$backdrop) {
-      this.$backdrop.removeClass('in')
-
-      var callbackRemove = function () {
-        that.removeBackdrop()
-        callback && callback()
-      }
-      $.support.transition && this.$element.hasClass('fade') ?
-        this.$backdrop
-          .one('bsTransitionEnd', callbackRemove)
-          .emulateTransitionEnd(Modal.BACKDROP_TRANSITION_DURATION) :
-        callbackRemove()
-
-    } else if (callback) {
-      callback()
-    }
-  }
-
-  // these following methods are used to handle overflowing modals
-
-  Modal.prototype.handleUpdate = function () {
-    this.adjustDialog()
-  }
-
-  Modal.prototype.adjustDialog = function () {
-    var modalIsOverflowing = this.$element[0].scrollHeight > document.documentElement.clientHeight
-
-    this.$element.css({
-      paddingLeft:  !this.bodyIsOverflowing && modalIsOverflowing ? this.scrollbarWidth : '',
-      paddingRight: this.bodyIsOverflowing && !modalIsOverflowing ? this.scrollbarWidth : ''
-    })
-  }
-
-  Modal.prototype.resetAdjustments = function () {
-    this.$element.css({
-      paddingLeft: '',
-      paddingRight: ''
-    })
-  }
-
-  Modal.prototype.checkScrollbar = function () {
-    var fullWindowWidth = window.innerWidth
-    if (!fullWindowWidth) { // workaround for missing window.innerWidth in IE8
-      var documentElementRect = document.documentElement.getBoundingClientRect()
-      fullWindowWidth = documentElementRect.right - Math.abs(documentElementRect.left)
-    }
-    this.bodyIsOverflowing = document.body.clientWidth < fullWindowWidth
-    this.scrollbarWidth = this.measureScrollbar()
-  }
-
-  Modal.prototype.setScrollbar = function () {
-    var bodyPad = parseInt((this.$body.css('padding-right') || 0), 10)
-    this.originalBodyPad = document.body.style.paddingRight || ''
-    if (this.bodyIsOverflowing) this.$body.css('padding-right', bodyPad + this.scrollbarWidth)
-  }
-
-  Modal.prototype.resetScrollbar = function () {
-    this.$body.css('padding-right', this.originalBodyPad)
-  }
-
-  Modal.prototype.measureScrollbar = function () { // thx walsh
-    var scrollDiv = document.createElement('div')
-    scrollDiv.className = 'modal-scrollbar-measure'
-    this.$body.append(scrollDiv)
-    var scrollbarWidth = scrollDiv.offsetWidth - scrollDiv.clientWidth
-    this.$body[0].removeChild(scrollDiv)
-    return scrollbarWidth
-  }
-
-
-  // MODAL PLUGIN DEFINITION
-  // =======================
-
-  function Plugin(option, _relatedTarget) {
-    return this.each(function () {
-      var $this   = $(this)
-      var data    = $this.data('bs.modal')
-      var options = $.extend({}, Modal.DEFAULTS, $this.data(), typeof option == 'object' && option)
-
-      if (!data) $this.data('bs.modal', (data = new Modal(this, options)))
-      if (typeof option == 'string') data[option](_relatedTarget)
-      else if (options.show) data.show(_relatedTarget)
-    })
-  }
-
-  var old = $.fn.modal
-
-  $.fn.modal             = Plugin
-  $.fn.modal.Constructor = Modal
-
-
-  // MODAL NO CONFLICT
-  // =================
-
-  $.fn.modal.noConflict = function () {
-    $.fn.modal = old
-    return this
-  }
-
-
-  // MODAL DATA-API
-  // ==============
-
-  $(document).on('click.bs.modal.data-api', '[data-toggle="modal"]', function (e) {
-    var $this   = $(this)
-    var href    = $this.attr('href')
-    var $target = $($this.attr('data-target') || (href && href.replace(/.*(?=#[^\s]+$)/, ''))) // strip for ie7
-    var option  = $target.data('bs.modal') ? 'toggle' : $.extend({ remote: !/#/.test(href) && href }, $target.data(), $this.data())
-
-    if ($this.is('a')) e.preventDefault()
-
-    $target.one('show.bs.modal', function (showEvent) {
-      if (showEvent.isDefaultPrevented()) return // only register focus restorer if modal will actually get shown
-      $target.one('hidden.bs.modal', function () {
-        $this.is(':visible') && $this.trigger('focus')
-      })
-    })
-    Plugin.call($target, option, this)
-  })
-
-}(jQuery);

RIGS/static/js/popover.js

@@ -1,108 +0,0 @@
-/* ========================================================================
- * Bootstrap: popover.js v3.3.7
- * http://getbootstrap.com/javascript/#popovers
- * ========================================================================
- * Copyright 2011-2016 Twitter, Inc.
- * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
- * ======================================================================== */
-
-
-+function ($) {
-  'use strict';
-
-  // POPOVER PUBLIC CLASS DEFINITION
-  // ===============================
-
-  var Popover = function (element, options) {
-    this.init('popover', element, options)
-  }
-
-  if (!$.fn.tooltip) throw new Error('Popover requires tooltip.js')
-
-  Popover.VERSION  = '3.3.7'
-
-  Popover.DEFAULTS = $.extend({}, $.fn.tooltip.Constructor.DEFAULTS, {
-    placement: 'right',
-    trigger: 'click',
-    content: '',
-    template: '<div class="popover" role="tooltip"><div class="arrow"></div><h3 class="popover-title"></h3><div class="popover-content"></div></div>'
-  })
-
-
-  // NOTE: POPOVER EXTENDS tooltip.js
-  // ================================
-
-  Popover.prototype = $.extend({}, $.fn.tooltip.Constructor.prototype)
-
-  Popover.prototype.constructor = Popover
-
-  Popover.prototype.getDefaults = function () {
-    return Popover.DEFAULTS
-  }
-
-  Popover.prototype.setContent = function () {
-    var $tip    = this.tip()
-    var title   = this.getTitle()
-    var content = this.getContent()
-
-    $tip.find('.popover-title')[this.options.html ? 'html' : 'text'](title)
-    $tip.find('.popover-content').children().detach().end()[ // we use append for html objects to maintain js events
-      this.options.html ? (typeof content == 'string' ? 'html' : 'append') : 'text'
-    ](content)
-
-    $tip.removeClass('fade top bottom left right in')
-
-    // IE8 doesn't accept hiding via the `:empty` pseudo selector, we have to do
-    // this manually by checking the contents.
-    if (!$tip.find('.popover-title').html()) $tip.find('.popover-title').hide()
-  }
-
-  Popover.prototype.hasContent = function () {
-    return this.getTitle() || this.getContent()
-  }
-
-  Popover.prototype.getContent = function () {
-    var $e = this.$element
-    var o  = this.options
-
-    return $e.attr('data-content')
-      || (typeof o.content == 'function' ?
-            o.content.call($e[0]) :
-            o.content)
-  }
-
-  Popover.prototype.arrow = function () {
-    return (this.$arrow = this.$arrow || this.tip().find('.arrow'))
-  }
-
-
-  // POPOVER PLUGIN DEFINITION
-  // =========================
-
-  function Plugin(option) {
-    return this.each(function () {
-      var $this   = $(this)
-      var data    = $this.data('bs.popover')
-      var options = typeof option == 'object' && option
-
-      if (!data && /destroy|hide/.test(option)) return
-      if (!data) $this.data('bs.popover', (data = new Popover(this, options)))
-      if (typeof option == 'string') data[option]()
-    })
-  }
-
-  var old = $.fn.popover
-
-  $.fn.popover             = Plugin
-  $.fn.popover.Constructor = Popover
-
-
-  // POPOVER NO CONFLICT
-  // ===================
-
-  $.fn.popover.noConflict = function () {
-    $.fn.popover = old
-    return this
-  }
-
-}(jQuery);

RIGS/static/js/scrollspy.js

@@ -1,172 +0,0 @@
-/* ========================================================================
- * Bootstrap: scrollspy.js v3.3.7
- * http://getbootstrap.com/javascript/#scrollspy
- * ========================================================================
- * Copyright 2011-2016 Twitter, Inc.
- * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
- * ======================================================================== */
-
-
-+function ($) {
-  'use strict';
-
-  // SCROLLSPY CLASS DEFINITION
-  // ==========================
-
-  function ScrollSpy(element, options) {
-    this.$body          = $(document.body)
-    this.$scrollElement = $(element).is(document.body) ? $(window) : $(element)
-    this.options        = $.extend({}, ScrollSpy.DEFAULTS, options)
-    this.selector       = (this.options.target || '') + ' .nav li > a'
-    this.offsets        = []
-    this.targets        = []
-    this.activeTarget   = null
-    this.scrollHeight   = 0
-
-    this.$scrollElement.on('scroll.bs.scrollspy', $.proxy(this.process, this))
-    this.refresh()
-    this.process()
-  }
-
-  ScrollSpy.VERSION  = '3.3.7'
-
-  ScrollSpy.DEFAULTS = {
-    offset: 10
-  }
-
-  ScrollSpy.prototype.getScrollHeight = function () {
-    return this.$scrollElement[0].scrollHeight || Math.max(this.$body[0].scrollHeight, document.documentElement.scrollHeight)
-  }
-
-  ScrollSpy.prototype.refresh = function () {
-    var that          = this
-    var offsetMethod  = 'offset'
-    var offsetBase    = 0
-
-    this.offsets      = []
-    this.targets      = []
-    this.scrollHeight = this.getScrollHeight()
-
-    if (!$.isWindow(this.$scrollElement[0])) {
-      offsetMethod = 'position'
-      offsetBase   = this.$scrollElement.scrollTop()
-    }
-
-    this.$body
-      .find(this.selector)
-      .map(function () {
-        var $el   = $(this)
-        var href  = $el.data('target') || $el.attr('href')
-        var $href = /^#./.test(href) && $(href)
-
-        return ($href
-          && $href.length
-          && $href.is(':visible')
-          && [[$href[offsetMethod]().top + offsetBase, href]]) || null
-      })
-      .sort(function (a, b) { return a[0] - b[0] })
-      .each(function () {
-        that.offsets.push(this[0])
-        that.targets.push(this[1])
-      })
-  }
-
-  ScrollSpy.prototype.process = function () {
-    var scrollTop    = this.$scrollElement.scrollTop() + this.options.offset
-    var scrollHeight = this.getScrollHeight()
-    var maxScroll    = this.options.offset + scrollHeight - this.$scrollElement.height()
-    var offsets      = this.offsets
-    var targets      = this.targets
-    var activeTarget = this.activeTarget
-    var i
-
-    if (this.scrollHeight != scrollHeight) {
-      this.refresh()
-    }
-
-    if (scrollTop >= maxScroll) {
-      return activeTarget != (i = targets[targets.length - 1]) && this.activate(i)
-    }
-
-    if (activeTarget && scrollTop < offsets[0]) {
-      this.activeTarget = null
-      return this.clear()
-    }
-
-    for (i = offsets.length; i--;) {
-      activeTarget != targets[i]
-        && scrollTop >= offsets[i]
-        && (offsets[i + 1] === undefined || scrollTop < offsets[i + 1])
-        && this.activate(targets[i])
-    }
-  }
-
-  ScrollSpy.prototype.activate = function (target) {
-    this.activeTarget = target
-
-    this.clear()
-
-    var selector = this.selector +
-      '[data-target="' + target + '"],' +
-      this.selector + '[href="' + target + '"]'
-
-    var active = $(selector)
-      .parents('li')
-      .addClass('active')
-
-    if (active.parent('.dropdown-menu').length) {
-      active = active
-        .closest('li.dropdown')
-        .addClass('active')
-    }
-
-    active.trigger('activate.bs.scrollspy')
-  }
-
-  ScrollSpy.prototype.clear = function () {
-    $(this.selector)
-      .parentsUntil(this.options.target, '.active')
-      .removeClass('active')
-  }
-
-
-  // SCROLLSPY PLUGIN DEFINITION
-  // ===========================
-
-  function Plugin(option) {
-    return this.each(function () {
-      var $this   = $(this)
-      var data    = $this.data('bs.scrollspy')
-      var options = typeof option == 'object' && option
-
-      if (!data) $this.data('bs.scrollspy', (data = new ScrollSpy(this, options)))
-      if (typeof option == 'string') data[option]()
-    })
-  }
-
-  var old = $.fn.scrollspy
-
-  $.fn.scrollspy             = Plugin
-  $.fn.scrollspy.Constructor = ScrollSpy
-
-
-  // SCROLLSPY NO CONFLICT
-  // =====================
-
-  $.fn.scrollspy.noConflict = function () {
-    $.fn.scrollspy = old
-    return this
-  }
-
-
-  // SCROLLSPY DATA-API
-  // ==================
-
-  $(window).on('load.bs.scrollspy.data-api', function () {
-    $('[data-spy="scroll"]').each(function () {
-      var $spy = $(this)
-      Plugin.call($spy, $spy.data())
-    })
-  })
-
-}(jQuery);

RIGS/static/js/tab.js

@@ -1,155 +0,0 @@
-/* ========================================================================
- * Bootstrap: tab.js v3.3.7
- * http://getbootstrap.com/javascript/#tabs
- * ========================================================================
- * Copyright 2011-2016 Twitter, Inc.
- * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
- * ======================================================================== */
-
-
-+function ($) {
-  'use strict';
-
-  // TAB CLASS DEFINITION
-  // ====================
-
-  var Tab = function (element) {
-    // jscs:disable requireDollarBeforejQueryAssignment
-    this.element = $(element)
-    // jscs:enable requireDollarBeforejQueryAssignment
-  }
-
-  Tab.VERSION = '3.3.7'
-
-  Tab.TRANSITION_DURATION = 150
-
-  Tab.prototype.show = function () {
-    var $this    = this.element
-    var $ul      = $this.closest('ul:not(.dropdown-menu)')
-    var selector = $this.data('target')
-
-    if (!selector) {
-      selector = $this.attr('href')
-      selector = selector && selector.replace(/.*(?=#[^\s]*$)/, '') // strip for ie7
-    }
-
-    if ($this.parent('li').hasClass('active')) return
-
-    var $previous = $ul.find('.active:last a')
-    var hideEvent = $.Event('hide.bs.tab', {
-      relatedTarget: $this[0]
-    })
-    var showEvent = $.Event('show.bs.tab', {
-      relatedTarget: $previous[0]
-    })
-
-    $previous.trigger(hideEvent)
-    $this.trigger(showEvent)
-
-    if (showEvent.isDefaultPrevented() || hideEvent.isDefaultPrevented()) return
-
-    var $target = $(selector)
-
-    this.activate($this.closest('li'), $ul)
-    this.activate($target, $target.parent(), function () {
-      $previous.trigger({
-        type: 'hidden.bs.tab',
-        relatedTarget: $this[0]
-      })
-      $this.trigger({
-        type: 'shown.bs.tab',
-        relatedTarget: $previous[0]
-      })
-    })
-  }
-
-  Tab.prototype.activate = function (element, container, callback) {
-    var $active    = container.find('> .active')
-    var transition = callback
-      && $.support.transition
-      && ($active.length && $active.hasClass('fade') || !!container.find('> .fade').length)
-
-    function next() {
-      $active
-        .removeClass('active')
-        .find('> .dropdown-menu > .active')
-          .removeClass('active')
-        .end()
-        .find('[data-toggle="tab"]')
-          .attr('aria-expanded', false)
-
-      element
-        .addClass('active')
-        .find('[data-toggle="tab"]')
-          .attr('aria-expanded', true)
-
-      if (transition) {
-        element[0].offsetWidth // reflow for transition
-        element.addClass('in')
-      } else {
-        element.removeClass('fade')
-      }
-
-      if (element.parent('.dropdown-menu').length) {
-        element
-          .closest('li.dropdown')
-            .addClass('active')
-          .end()
-          .find('[data-toggle="tab"]')
-            .attr('aria-expanded', true)
-      }
-
-      callback && callback()
-    }
-
-    $active.length && transition ?
-      $active
-        .one('bsTransitionEnd', next)
-        .emulateTransitionEnd(Tab.TRANSITION_DURATION) :
-      next()
-
-    $active.removeClass('in')
-  }
-
-
-  // TAB PLUGIN DEFINITION
-  // =====================
-
-  function Plugin(option) {
-    return this.each(function () {
-      var $this = $(this)
-      var data  = $this.data('bs.tab')
-
-      if (!data) $this.data('bs.tab', (data = new Tab(this)))
-      if (typeof option == 'string') data[option]()
-    })
-  }
-
-  var old = $.fn.tab
-
-  $.fn.tab             = Plugin
-  $.fn.tab.Constructor = Tab
-
-
-  // TAB NO CONFLICT
-  // ===============
-
-  $.fn.tab.noConflict = function () {
-    $.fn.tab = old
-    return this
-  }
-
-
-  // TAB DATA-API
-  // ============
-
-  var clickHandler = function (e) {
-    e.preventDefault()
-    Plugin.call($(this), 'show')
-  }
-
-  $(document)
-    .on('click.bs.tab.data-api', '[data-toggle="tab"]', clickHandler)
-    .on('click.bs.tab.data-api', '[data-toggle="pill"]', clickHandler)
-
-}(jQuery);

RIGS/static/js/tests/index.html

@@ -1,52 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-<head>
-  <title>Bootstrap Plugin Test Suite</title>
-
-  <!-- jquery -->
-  <!--<script src="http://code.jquery.com/jquery-1.7.min.js"></script>-->
-  <script src="vendor/jquery.js"></script>
-
-  <!-- qunit -->
-  <link rel="stylesheet" href="vendor/qunit.css" media="screen">
-  <script src="vendor/qunit.js"></script>
-
-  <!--  plugin sources -->
-  <script src="../transition.js"></script>
-  <script src="../alert.js"></script>
-  <script src="../button.js"></script>
-  <script src="../carousel.js"></script>
-  <script src="../collapse.js"></script>
-  <script src="../dropdown.js"></script>
-  <script src="../modal.js"></script>
-  <script src="../scrollspy.js"></script>
-  <script src="../tab.js"></script>
-  <script src="../tooltip.js"></script>
-  <script src="../popover.js"></script>
-  <script src="../affix.js"></script>
-
-  <!-- unit tests -->
-  <script src="unit/transition.js"></script>
-  <script src="unit/alert.js"></script>
-  <script src="unit/button.js"></script>
-  <script src="unit/carousel.js"></script>
-  <script src="unit/collapse.js"></script>
-  <script src="unit/dropdown.js"></script>
-  <script src="unit/modal.js"></script>
-  <script src="unit/scrollspy.js"></script>
-  <script src="unit/tab.js"></script>
-  <script src="unit/tooltip.js"></script>
-  <script src="unit/popover.js"></script>
-  <script src="unit/affix.js"></script>
-
-</head>
-<body>
-  <div>
-    <h1 id="qunit-header">Bootstrap Plugin Test Suite</h1>
-    <h2 id="qunit-banner"></h2>
-    <h2 id="qunit-userAgent"></h2>
-    <ol id="qunit-tests"></ol>
-    <div id="qunit-fixture"></div>
-  </div>
-</body>
-</html>

RIGS/static/js/tests/unit/affix.js

@@ -1,25 +0,0 @@
-$(function () {
-
-    module("affix")
-
-      test("should provide no conflict", function () {
-        var affix = $.fn.affix.noConflict()
-        ok(!$.fn.affix, 'affix was set back to undefined (org value)')
-        $.fn.affix = affix
-      })
-
-      test("should be defined on jquery object", function () {
-        ok($(document.body).affix, 'affix method is defined')
-      })
-
-      test("should return element", function () {
-        ok($(document.body).affix()[0] == document.body, 'document.body returned')
-      })
-
-      test("should exit early if element is not visible", function () {
-        var $affix = $('<div style="display: none"></div>').affix()
-        $affix.data('bs.affix').checkPosition()
-        ok(!$affix.hasClass('affix'), 'affix class was not added')
-      })
-
-})

RIGS/static/js/tests/unit/alert.js

@@ -1,62 +0,0 @@
-$(function () {
-
-    module("alert")
-
-      test("should provide no conflict", function () {
-        var alert = $.fn.alert.noConflict()
-        ok(!$.fn.alert, 'alert was set back to undefined (org value)')
-        $.fn.alert = alert
-      })
-
-      test("should be defined on jquery object", function () {
-        ok($(document.body).alert, 'alert method is defined')
-      })
-
-      test("should return element", function () {
-        ok($(document.body).alert()[0] == document.body, 'document.body returned')
-      })
-
-      test("should fade element out on clicking .close", function () {
-        var alertHTML = '<div class="alert-message warning fade in">'
-          + '<a class="close" href="#" data-dismiss="alert">×</a>'
-          + '<p><strong>Holy guacamole!</strong> Best check yo self, you\'re not looking too good.</p>'
-          + '</div>'
-          , alert = $(alertHTML).alert()
-
-        alert.find('.close').click()
-
-        ok(!alert.hasClass('in'), 'remove .in class on .close click')
-      })
-
-      test("should remove element when clicking .close", function () {
-        $.support.transition = false
-
-        var alertHTML = '<div class="alert-message warning fade in">'
-          + '<a class="close" href="#" data-dismiss="alert">×</a>'
-          + '<p><strong>Holy guacamole!</strong> Best check yo self, you\'re not looking too good.</p>'
-          + '</div>'
-          , alert = $(alertHTML).appendTo('#qunit-fixture').alert()
-
-        ok($('#qunit-fixture').find('.alert-message').length, 'element added to dom')
-
-        alert.find('.close').click()
-
-        ok(!$('#qunit-fixture').find('.alert-message').length, 'element removed from dom')
-      })
-
-      test("should not fire closed when close is prevented", function () {
-        $.support.transition = false
-        stop();
-        $('<div class="alert"/>')
-          .on('close.bs.alert', function (e) {
-            e.preventDefault();
-            ok(true);
-            start();
-          })
-          .on('closed.bs.alert', function () {
-            ok(false);
-          })
-          .alert('close')
-      })
-
-})

RIGS/static/js/tests/unit/button.js

@@ -1,116 +0,0 @@
-$(function () {
-
-    module("button")
-
-      test("should provide no conflict", function () {
-        var button = $.fn.button.noConflict()
-        ok(!$.fn.button, 'button was set back to undefined (org value)')
-        $.fn.button = button
-      })
-
-      test("should be defined on jquery object", function () {
-        ok($(document.body).button, 'button method is defined')
-      })
-
-      test("should return element", function () {
-        ok($(document.body).button()[0] == document.body, 'document.body returned')
-      })
-
-      test("should return set state to loading", function () {
-        var btn = $('<button class="btn" data-loading-text="fat">mdo</button>')
-        equal(btn.html(), 'mdo', 'btn text equals mdo')
-        btn.button('loading')
-        equal(btn.html(), 'fat', 'btn text equals fat')
-        stop()
-        setTimeout(function () {
-          ok(btn.attr('disabled'), 'btn is disabled')
-          ok(btn.hasClass('disabled'), 'btn has disabled class')
-          start()
-        }, 0)
-      })
-
-      test("should return reset state", function () {
-        var btn = $('<button class="btn" data-loading-text="fat">mdo</button>')
-        equal(btn.html(), 'mdo', 'btn text equals mdo')
-        btn.button('loading')
-        equal(btn.html(), 'fat', 'btn text equals fat')
-        stop()
-        setTimeout(function () {
-          ok(btn.attr('disabled'), 'btn is disabled')
-          ok(btn.hasClass('disabled'), 'btn has disabled class')
-          start()
-          stop()
-          btn.button('reset')
-          equal(btn.html(), 'mdo', 'btn text equals mdo')
-          setTimeout(function () {
-            ok(!btn.attr('disabled'), 'btn is not disabled')
-            ok(!btn.hasClass('disabled'), 'btn does not have disabled class')
-            start()
-          }, 0)
-        }, 0)
-
-      })
-
-      test("should toggle active", function () {
-        var btn = $('<button class="btn">mdo</button>')
-        ok(!btn.hasClass('active'), 'btn does not have active class')
-        btn.button('toggle')
-        ok(btn.hasClass('active'), 'btn has class active')
-      })
-
-      test("should toggle active when btn children are clicked", function () {
-        var btn = $('<button class="btn" data-toggle="button">mdo</button>')
-          , inner = $('<i></i>')
-        btn
-          .append(inner)
-          .appendTo($('#qunit-fixture'))
-        ok(!btn.hasClass('active'), 'btn does not have active class')
-        inner.click()
-        ok(btn.hasClass('active'), 'btn has class active')
-      })
-
-      test("should toggle active when btn children are clicked within btn-group", function () {
-        var btngroup = $('<div class="btn-group" data-toggle="buttons"></div>')
-          , btn = $('<button class="btn">fat</button>')
-          , inner = $('<i></i>')
-        btngroup
-          .append(btn.append(inner))
-          .appendTo($('#qunit-fixture'))
-        ok(!btn.hasClass('active'), 'btn does not have active class')
-        inner.click()
-        ok(btn.hasClass('active'), 'btn has class active')
-      })
-
-      test("should check for closest matching toggle", function () {
-        var group = '<div class="btn-group" data-toggle="buttons">' +
-          '<label class="btn btn-primary active">' +
-            '<input type="radio" name="options" id="option1" checked="true"> Option 1' +
-          '</label>' +
-          '<label class="btn btn-primary">' +
-            '<input type="radio" name="options" id="option2"> Option 2' +
-          '</label>' +
-          '<label class="btn btn-primary">' +
-            '<input type="radio" name="options" id="option3"> Option 3' +
-          '</label>' +
-        '</div>'
-
-        group = $(group)
-
-        var btn1 = $(group.children()[0])
-        var btn2 = $(group.children()[1])
-        var btn3 = $(group.children()[2])
-
-        group.appendTo($('#qunit-fixture'))
-
-        ok(btn1.hasClass('active'), 'btn1 has active class')
-        ok(btn1.find('input').prop('checked'), 'btn1 is checked')
-        ok(!btn2.hasClass('active'), 'btn2 does not have active class')
-        ok(!btn2.find('input').prop('checked'), 'btn2 is not checked')
-        btn2.find('input').click()
-        ok(!btn1.hasClass('active'), 'btn1 does not have active class')
-        ok(!btn1.find('input').prop('checked'), 'btn1 is checked')
-        ok(btn2.hasClass('active'), 'btn2 has active class')
-        ok(btn2.find('input').prop('checked'), 'btn2 is checked')
-      })
-
-})

RIGS/static/js/tests/unit/carousel.js

@@ -1,87 +0,0 @@
-$(function () {
-
-    module("carousel")
-
-      test("should provide no conflict", function () {
-        var carousel = $.fn.carousel.noConflict()
-        ok(!$.fn.carousel, 'carousel was set back to undefined (org value)')
-        $.fn.carousel = carousel
-      })
-
-      test("should be defined on jquery object", function () {
-        ok($(document.body).carousel, 'carousel method is defined')
-      })
-
-      test("should return element", function () {
-        ok($(document.body).carousel()[0] == document.body, 'document.body returned')
-      })
-
-      test("should not fire sliden when slide is prevented", function () {
-        $.support.transition = false
-        stop()
-        $('<div class="carousel"/>')
-          .on('slide.bs.carousel', function (e) {
-            e.preventDefault();
-            ok(true);
-            start();
-          })
-          .on('slid.bs.carousel', function () {
-            ok(false);
-          })
-          .carousel('next')
-      })
-
-      test("should fire slide event with direction", function () {
-        var template = '<div id="myCarousel" class="carousel slide"><div class="carousel-inner"><div class="item active"><img alt=""><div class="carousel-caption"><h4>{{_i}}First Thumbnail label{{/i}}</h4><p>Cras justo odio, dapibus ac facilisis in, egestas eget quam. Donec id elit non mi porta gravida at eget metus. Nullam id dolor id nibh ultricies vehicula ut id elit.</p></div></div><div class="item"><img alt=""><div class="carousel-caption"><h4>{{_i}}Second Thumbnail label{{/i}}</h4><p>Cras justo odio, dapibus ac facilisis in, egestas eget quam. Donec id elit non mi porta gravida at eget metus. Nullam id dolor id nibh ultricies vehicula ut id elit.</p></div></div><div class="item"><img alt=""><div class="carousel-caption"><h4>{{_i}}Third Thumbnail label{{/i}}</h4><p>Cras justo odio, dapibus ac facilisis in, egestas eget quam. Donec id elit non mi porta gravida at eget metus. Nullam id dolor id nibh ultricies vehicula ut id elit.</p></div></div></div><a class="left carousel-control" href="#myCarousel" data-slide="prev">&lsaquo;</a><a class="right carousel-control" href="#myCarousel" data-slide="next">&rsaquo;</a></div>'
-        $.support.transition = false
-        stop()
-        $(template).on('slide.bs.carousel', function (e) {
-          e.preventDefault()
-          ok(e.direction)
-          ok(e.direction === 'right' || e.direction === 'left')
-          start()
-        }).carousel('next')
-      })
-
-      test("should fire slide event with relatedTarget", function () {
-        var template = '<div id="myCarousel" class="carousel slide"><div class="carousel-inner"><div class="item active"><img alt=""><div class="carousel-caption"><h4>{{_i}}First Thumbnail label{{/i}}</h4><p>Cras justo odio, dapibus ac facilisis in, egestas eget quam. Donec id elit non mi porta gravida at eget metus. Nullam id dolor id nibh ultricies vehicula ut id elit.</p></div></div><div class="item"><img alt=""><div class="carousel-caption"><h4>{{_i}}Second Thumbnail label{{/i}}</h4><p>Cras justo odio, dapibus ac facilisis in, egestas eget quam. Donec id elit non mi porta gravida at eget metus. Nullam id dolor id nibh ultricies vehicula ut id elit.</p></div></div><div class="item"><img alt=""><div class="carousel-caption"><h4>{{_i}}Third Thumbnail label{{/i}}</h4><p>Cras justo odio, dapibus ac facilisis in, egestas eget quam. Donec id elit non mi porta gravida at eget metus. Nullam id dolor id nibh ultricies vehicula ut id elit.</p></div></div></div><a class="left carousel-control" href="#myCarousel" data-slide="prev">&lsaquo;</a><a class="right carousel-control" href="#myCarousel" data-slide="next">&rsaquo;</a></div>'
-        $.support.transition = false
-        stop()
-        $(template)
-          .on('slide.bs.carousel', function (e) {
-            e.preventDefault();
-            ok(e.relatedTarget);
-            ok($(e.relatedTarget).hasClass('item'));
-            start();
-          })
-          .carousel('next')
-      })
-
-      test("should set interval from data attribute", 4, function () {
-        var template = $('<div id="myCarousel" class="carousel slide"> <div class="carousel-inner"> <div class="item active"> <img alt=""> <div class="carousel-caption"> <h4>{{_i}}First Thumbnail label{{/i}}</h4> <p>Cras justo odio, dapibus ac facilisis in, egestas eget quam. Donec id elit non mi porta gravida at eget metus. Nullam id dolor id nibh ultricies vehicula ut id elit.</p> </div> </div> <div class="item"> <img alt=""> <div class="carousel-caption"> <h4>{{_i}}Second Thumbnail label{{/i}}</h4> <p>Cras justo odio, dapibus ac facilisis in, egestas eget quam. Donec id elit non mi porta gravida at eget metus. Nullam id dolor id nibh ultricies vehicula ut id elit.</p> </div> </div> <div class="item"> <img alt=""> <div class="carousel-caption"> <h4>{{_i}}Third Thumbnail label{{/i}}</h4> <p>Cras justo odio, dapibus ac facilisis in, egestas eget quam. Donec id elit non mi porta gravida at eget metus. Nullam id dolor id nibh ultricies vehicula ut id elit.</p> </div> </div> </div> <a class="left carousel-control" href="#myCarousel" data-slide="prev">&lsaquo;</a> <a class="right carousel-control" href="#myCarousel" data-slide="next">&rsaquo;</a> </div>');
-        template.attr("data-interval", 1814);
-
-        template.appendTo("body");
-        $('[data-slide]').first().click();
-        ok($('#myCarousel').data('bs.carousel').options.interval == 1814);
-        $('#myCarousel').remove();
-
-        template.appendTo("body").attr("data-modal", "foobar");
-        $('[data-slide]').first().click();
-        ok($('#myCarousel').data('bs.carousel').options.interval == 1814, "even if there is an data-modal attribute set");
-        $('#myCarousel').remove();
-
-        template.appendTo("body");
-        $('[data-slide]').first().click();
-        $('#myCarousel').attr('data-interval', 1860);
-        $('[data-slide]').first().click();
-        ok($('#myCarousel').data('bs.carousel').options.interval == 1814, "attributes should be read only on intitialization");
-        $('#myCarousel').remove();
-
-        template.attr("data-interval", false);
-        template.appendTo("body");
-        $('#myCarousel').carousel(1);
-        ok($('#myCarousel').data('bs.carousel').options.interval === false, "data attribute has higher priority than default options");
-        $('#myCarousel').remove();
-      })
-})

RIGS/static/js/tests/unit/collapse.js

@@ -1,164 +0,0 @@
-$(function () {
-
-    module("collapse")
-
-      test("should provide no conflict", function () {
-        var collapse = $.fn.collapse.noConflict()
-        ok(!$.fn.collapse, 'collapse was set back to undefined (org value)')
-        $.fn.collapse = collapse
-      })
-
-      test("should be defined on jquery object", function () {
-        ok($(document.body).collapse, 'collapse method is defined')
-      })
-
-      test("should return element", function () {
-        ok($(document.body).collapse()[0] == document.body, 'document.body returned')
-      })
-
-      test("should show a collapsed element", function () {
-        var el = $('<div class="collapse"></div>').collapse('show')
-        ok(el.hasClass('in'), 'has class in')
-        ok(/height/.test(el.attr('style')), 'has height set')
-      })
-
-      test("should hide a collapsed element", function () {
-        var el = $('<div class="collapse"></div>').collapse('hide')
-        ok(!el.hasClass('in'), 'does not have class in')
-        ok(/height/.test(el.attr('style')), 'has height set')
-      })
-
-      test("should not fire shown when show is prevented", function () {
-        $.support.transition = false
-        stop()
-        $('<div class="collapse"/>')
-          .on('show.bs.collapse', function (e) {
-            e.preventDefault();
-            ok(true);
-            start();
-          })
-          .on('shown.bs.collapse', function () {
-            ok(false);
-          })
-          .collapse('show')
-      })
-
-      test("should reset style to auto after finishing opening collapse", function () {
-        $.support.transition = false
-        stop()
-        $('<div class="collapse" style="height: 0px"/>')
-          .on('show.bs.collapse', function () {
-            ok(this.style.height == '0px')
-          })
-          .on('shown.bs.collapse', function () {
-            ok(this.style.height == 'auto')
-            start()
-          })
-          .collapse('show')
-      })
-
-      test("should add active class to target when collapse shown", function () {
-        $.support.transition = false
-        stop()
-
-        var target = $('<a data-toggle="collapse" href="#test1"></a>')
-          .appendTo($('#qunit-fixture'))
-
-        var collapsible = $('<div id="test1"></div>')
-          .appendTo($('#qunit-fixture'))
-          .on('show.bs.collapse', function () {
-            ok(!target.hasClass('collapsed'))
-            start()
-          })
-
-        target.click()
-      })
-
-      test("should remove active class to target when collapse hidden", function () {
-        $.support.transition = false
-        stop()
-
-        var target = $('<a data-toggle="collapse" href="#test1"></a>')
-          .appendTo($('#qunit-fixture'))
-
-        var collapsible = $('<div id="test1" class="in"></div>')
-          .appendTo($('#qunit-fixture'))
-          .on('hide.bs.collapse', function () {
-            ok(target.hasClass('collapsed'))
-            start()
-          })
-
-        target.click()
-      })
-
-      test("should remove active class from inactive accordion targets", function () {
-        $.support.transition = false
-        stop()
-
-        var accordion = $('<div id="accordion"><div class="accordion-group"></div><div class="accordion-group"></div><div class="accordion-group"></div></div>')
-          .appendTo($('#qunit-fixture'))
-
-        var target1 = $('<a data-toggle="collapse" href="#body1" data-parent="#accordion"></a>')
-          .appendTo(accordion.find('.accordion-group').eq(0))
-
-        var collapsible1 = $('<div id="body1" class="in"></div>')
-          .appendTo(accordion.find('.accordion-group').eq(0))
-
-        var target2 = $('<a class="collapsed" data-toggle="collapse" href="#body2" data-parent="#accordion"></a>')
-          .appendTo(accordion.find('.accordion-group').eq(1))
-
-        var collapsible2 = $('<div id="body2"></div>')
-          .appendTo(accordion.find('.accordion-group').eq(1))
-
-        var target3 = $('<a class="collapsed" data-toggle="collapse" href="#body3" data-parent="#accordion"></a>')
-          .appendTo(accordion.find('.accordion-group').eq(2))
-
-        var collapsible3 = $('<div id="body3"></div>')
-          .appendTo(accordion.find('.accordion-group').eq(2))
-          .on('show.bs.collapse', function () {
-            ok(target1.hasClass('collapsed'))
-            ok(target2.hasClass('collapsed'))
-            ok(!target3.hasClass('collapsed'))
-
-            start()
-          })
-
-        target3.click()
-      })
-
-      test("should allow dots in data-parent", function () {
-        $.support.transition = false
-        stop()
-
-        var accordion = $('<div class="accordion"><div class="accordion-group"></div><div class="accordion-group"></div><div class="accordion-group"></div></div>')
-          .appendTo($('#qunit-fixture'))
-
-        var target1 = $('<a data-toggle="collapse" href="#body1" data-parent=".accordion"></a>')
-          .appendTo(accordion.find('.accordion-group').eq(0))
-
-        var collapsible1 = $('<div id="body1" class="in"></div>')
-          .appendTo(accordion.find('.accordion-group').eq(0))
-
-        var target2 = $('<a class="collapsed" data-toggle="collapse" href="#body2" data-parent=".accordion"></a>')
-          .appendTo(accordion.find('.accordion-group').eq(1))
-
-        var collapsible2 = $('<div id="body2"></div>')
-          .appendTo(accordion.find('.accordion-group').eq(1))
-
-        var target3 = $('<a class="collapsed" data-toggle="collapse" href="#body3" data-parent=".accordion"></a>')
-          .appendTo(accordion.find('.accordion-group').eq(2))
-
-        var collapsible3 = $('<div id="body3"></div>')
-          .appendTo(accordion.find('.accordion-group').eq(2))
-          .on('show.bs.collapse', function () {
-            ok(target1.hasClass('collapsed'))
-            ok(target2.hasClass('collapsed'))
-            ok(!target3.hasClass('collapsed'))
-
-            start()
-          })
-
-        target3.click()
-      })
-
-})

RIGS/static/js/tests/unit/dropdown.js

@@ -1,219 +0,0 @@
-$(function () {
-
-    module("dropdowns")
-
-      test("should provide no conflict", function () {
-        var dropdown = $.fn.dropdown.noConflict()
-        ok(!$.fn.dropdown, 'dropdown was set back to undefined (org value)')
-        $.fn.dropdown = dropdown
-      })
-
-      test("should be defined on jquery object", function () {
-        ok($(document.body).dropdown, 'dropdown method is defined')
-      })
-
-      test("should return element", function () {
-        var el = $("<div />")
-        ok(el.dropdown()[0] === el[0], 'same element returned')
-      })
-
-      test("should not open dropdown if target is disabled", function () {
-        var dropdownHTML = '<ul class="tabs">'
-          + '<li class="dropdown">'
-          + '<button disabled href="#" class="btn dropdown-toggle" data-toggle="dropdown">Dropdown</button>'
-          + '<ul class="dropdown-menu">'
-          + '<li><a href="#">Secondary link</a></li>'
-          + '<li><a href="#">Something else here</a></li>'
-          + '<li class="divider"></li>'
-          + '<li><a href="#">Another link</a></li>'
-          + '</ul>'
-          + '</li>'
-          + '</ul>'
-          , dropdown = $(dropdownHTML).find('[data-toggle="dropdown"]').dropdown().click()
-
-        ok(!dropdown.parent('.dropdown').hasClass('open'), 'open class added on click')
-      })
-
-      test("should not open dropdown if target is disabled", function () {
-        var dropdownHTML = '<ul class="tabs">'
-          + '<li class="dropdown">'
-          + '<button href="#" class="btn dropdown-toggle disabled" data-toggle="dropdown">Dropdown</button>'
-          + '<ul class="dropdown-menu">'
-          + '<li><a href="#">Secondary link</a></li>'
-          + '<li><a href="#">Something else here</a></li>'
-          + '<li class="divider"></li>'
-          + '<li><a href="#">Another link</a></li>'
-          + '</ul>'
-          + '</li>'
-          + '</ul>'
-          , dropdown = $(dropdownHTML).find('[data-toggle="dropdown"]').dropdown().click()
-
-        ok(!dropdown.parent('.dropdown').hasClass('open'), 'open class added on click')
-      })
-
-      test("should add class open to menu if clicked", function () {
-        var dropdownHTML = '<ul class="tabs">'
-          + '<li class="dropdown">'
-          + '<a href="#" class="dropdown-toggle" data-toggle="dropdown">Dropdown</a>'
-          + '<ul class="dropdown-menu">'
-          + '<li><a href="#">Secondary link</a></li>'
-          + '<li><a href="#">Something else here</a></li>'
-          + '<li class="divider"></li>'
-          + '<li><a href="#">Another link</a></li>'
-          + '</ul>'
-          + '</li>'
-          + '</ul>'
-          , dropdown = $(dropdownHTML).find('[data-toggle="dropdown"]').dropdown().click()
-
-        ok(dropdown.parent('.dropdown').hasClass('open'), 'open class added on click')
-      })
-
-      test("should test if element has a # before assuming it's a selector", function () {
-        var dropdownHTML = '<ul class="tabs">'
-          + '<li class="dropdown">'
-          + '<a href="/foo/" class="dropdown-toggle" data-toggle="dropdown">Dropdown</a>'
-          + '<ul class="dropdown-menu">'
-          + '<li><a href="#">Secondary link</a></li>'
-          + '<li><a href="#">Something else here</a></li>'
-          + '<li class="divider"></li>'
-          + '<li><a href="#">Another link</a></li>'
-          + '</ul>'
-          + '</li>'
-          + '</ul>'
-          , dropdown = $(dropdownHTML).find('[data-toggle="dropdown"]').dropdown().click()
-
-        ok(dropdown.parent('.dropdown').hasClass('open'), 'open class added on click')
-      })
-
-
-      test("should remove open class if body clicked", function () {
-        var dropdownHTML = '<ul class="tabs">'
-          + '<li class="dropdown">'
-          + '<a href="#" class="dropdown-toggle" data-toggle="dropdown">Dropdown</a>'
-          + '<ul class="dropdown-menu">'
-          + '<li><a href="#">Secondary link</a></li>'
-          + '<li><a href="#">Something else here</a></li>'
-          + '<li class="divider"></li>'
-          + '<li><a href="#">Another link</a></li>'
-          + '</ul>'
-          + '</li>'
-          + '</ul>'
-          , dropdown = $(dropdownHTML)
-            .appendTo('#qunit-fixture')
-            .find('[data-toggle="dropdown"]')
-            .dropdown()
-            .click()
-
-        ok(dropdown.parent('.dropdown').hasClass('open'), 'open class added on click')
-        $('body').click()
-        ok(!dropdown.parent('.dropdown').hasClass('open'), 'open class removed')
-        dropdown.remove()
-      })
-
-      test("should remove open class if body clicked, with multiple drop downs", function () {
-          var dropdownHTML =
-            '<ul class="nav">'
-            + '    <li><a href="#menu1">Menu 1</a></li>'
-            + '    <li class="dropdown" id="testmenu">'
-            + '      <a class="dropdown-toggle" data-toggle="dropdown" href="#testmenu">Test menu <b class="caret"></b></a>'
-            + '      <ul class="dropdown-menu" role="menu">'
-            + '        <li><a href="#sub1">Submenu 1</a></li>'
-            + '      </ul>'
-            + '    </li>'
-            + '</ul>'
-            + '<div class="btn-group">'
-            + '    <button class="btn">Actions</button>'
-            + '    <button class="btn dropdown-toggle" data-toggle="dropdown"><span class="caret"></span></button>'
-            + '    <ul class="dropdown-menu">'
-            + '        <li><a href="#">Action 1</a></li>'
-            + '    </ul>'
-            + '</div>'
-          , dropdowns = $(dropdownHTML).appendTo('#qunit-fixture').find('[data-toggle="dropdown"]')
-          , first = dropdowns.first()
-          , last = dropdowns.last()
-
-        ok(dropdowns.length == 2, "Should be two dropdowns")
-
-        first.click()
-        ok(first.parents('.open').length == 1, 'open class added on click')
-        ok($('#qunit-fixture .open').length == 1, 'only one object is open')
-        $('body').click()
-        ok($("#qunit-fixture .open").length === 0, 'open class removed')
-
-        last.click()
-        ok(last.parent('.open').length == 1, 'open class added on click')
-        ok($('#qunit-fixture .open').length == 1, 'only one object is open')
-        $('body').click()
-        ok($("#qunit-fixture .open").length === 0, 'open class removed')
-
-        $("#qunit-fixture").html("")
-      })
-
-      test("should fire show and hide event", function () {
-        var dropdownHTML = '<ul class="tabs">'
-          + '<li class="dropdown">'
-          + '<a href="#" class="dropdown-toggle" data-toggle="dropdown">Dropdown</a>'
-          + '<ul class="dropdown-menu">'
-          + '<li><a href="#">Secondary link</a></li>'
-          + '<li><a href="#">Something else here</a></li>'
-          + '<li class="divider"></li>'
-          + '<li><a href="#">Another link</a></li>'
-          + '</ul>'
-          + '</li>'
-          + '</ul>'
-          , dropdown = $(dropdownHTML)
-            .appendTo('#qunit-fixture')
-            .find('[data-toggle="dropdown"]')
-            .dropdown()
-
-        stop()
-
-        dropdown
-          .parent('.dropdown')
-          .bind('show.bs.dropdown', function () {
-            ok(true, 'show was called')
-          })
-          .bind('hide.bs.dropdown', function () {
-            ok(true, 'hide was called')
-            start()
-          })
-
-        dropdown.click()
-        $(document.body).click()
-      })
-
-
-      test("should fire shown and hiden event", function () {
-        var dropdownHTML = '<ul class="tabs">'
-          + '<li class="dropdown">'
-          + '<a href="#" class="dropdown-toggle" data-toggle="dropdown">Dropdown</a>'
-          + '<ul class="dropdown-menu">'
-          + '<li><a href="#">Secondary link</a></li>'
-          + '<li><a href="#">Something else here</a></li>'
-          + '<li class="divider"></li>'
-          + '<li><a href="#">Another link</a></li>'
-          + '</ul>'
-          + '</li>'
-          + '</ul>'
-          , dropdown = $(dropdownHTML)
-            .appendTo('#qunit-fixture')
-            .find('[data-toggle="dropdown"]')
-            .dropdown()
-
-        stop()
-
-        dropdown
-          .parent('.dropdown')
-          .bind('shown.bs.dropdown', function () {
-            ok(true, 'show was called')
-          })
-          .bind('hidden.bs.dropdown', function () {
-            ok(true, 'hide was called')
-            start()
-          })
-
-        dropdown.click()
-        $(document.body).click()
-      })
-
-})

RIGS/static/js/tests/unit/modal.js

@@ -1,196 +0,0 @@
-$(function () {
-
-  module("modal")
-
-    test("should provide no conflict", function () {
-      var modal = $.fn.modal.noConflict()
-      ok(!$.fn.modal, 'modal was set back to undefined (org value)')
-      $.fn.modal = modal
-    })
-
-    test("should be defined on jquery object", function () {
-      var div = $("<div id='modal-test'></div>")
-      ok(div.modal, 'modal method is defined')
-    })
-
-    test("should return element", function () {
-      var div = $("<div id='modal-test'></div>")
-      ok(div.modal() == div, 'document.body returned')
-      $('#modal-test').remove()
-    })
-
-    test("should expose defaults var for settings", function () {
-      ok($.fn.modal.Constructor.DEFAULTS, 'default object exposed')
-    })
-
-    test("should insert into dom when show method is called", function () {
-      stop()
-      $.support.transition = false
-      $("<div id='modal-test'></div>")
-        .on("shown.bs.modal", function () {
-          ok($('#modal-test').length, 'modal inserted into dom')
-          $(this).remove()
-          start()
-        })
-        .modal("show")
-    })
-
-    test("should fire show event", function () {
-      stop()
-      $.support.transition = false
-      $("<div id='modal-test'></div>")
-        .on("show.bs.modal", function () {
-          ok(true, "show was called")
-        })
-        .on("shown.bs.modal", function () {
-          $(this).remove()
-          start()
-        })
-        .modal("show")
-    })
-
-    test("should not fire shown when default prevented", function () {
-      stop()
-      $.support.transition = false
-      $("<div id='modal-test'></div>")
-        .on("show.bs.modal", function (e) {
-          e.preventDefault()
-          ok(true, "show was called")
-          start()
-        })
-        .on("shown.bs.modal", function () {
-          ok(false, "shown was called")
-        })
-        .modal("show")
-    })
-
-    test("should hide modal when hide is called", function () {
-      stop()
-      $.support.transition = false
-
-      $("<div id='modal-test'></div>")
-        .on("shown.bs.modal", function () {
-          ok($('#modal-test').is(":visible"), 'modal visible')
-          ok($('#modal-test').length, 'modal inserted into dom')
-          $(this).modal("hide")
-        })
-        .on("hidden.bs.modal", function() {
-          ok(!$('#modal-test').is(":visible"), 'modal hidden')
-          $('#modal-test').remove()
-          start()
-        })
-        .modal("show")
-    })
-
-    test("should toggle when toggle is called", function () {
-      stop()
-      $.support.transition = false
-      var div = $("<div id='modal-test'></div>")
-      div
-        .on("shown.bs.modal", function () {
-          ok($('#modal-test').is(":visible"), 'modal visible')
-          ok($('#modal-test').length, 'modal inserted into dom')
-          div.modal("toggle")
-        })
-        .on("hidden.bs.modal", function() {
-          ok(!$('#modal-test').is(":visible"), 'modal hidden')
-          div.remove()
-          start()
-        })
-        .modal("toggle")
-    })
-
-    test("should remove from dom when click [data-dismiss=modal]", function () {
-      stop()
-      $.support.transition = false
-      var div = $("<div id='modal-test'><span class='close' data-dismiss='modal'></span></div>")
-      div
-        .on("shown.bs.modal", function () {
-          ok($('#modal-test').is(":visible"), 'modal visible')
-          ok($('#modal-test').length, 'modal inserted into dom')
-          div.find('.close').click()
-        })
-        .on("hidden.bs.modal", function() {
-          ok(!$('#modal-test').is(":visible"), 'modal hidden')
-          div.remove()
-          start()
-        })
-        .modal("toggle")
-    })
-
-    test("should allow modal close with 'backdrop:false'", function () {
-      stop()
-      $.support.transition = false
-      var div = $("<div>", { id: 'modal-test', "data-backdrop": false })
-      div
-        .on("shown.bs.modal", function () {
-          ok($('#modal-test').is(":visible"), 'modal visible')
-          div.modal("hide")
-        })
-        .on("hidden.bs.modal", function() {
-          ok(!$('#modal-test').is(":visible"), 'modal hidden')
-          div.remove()
-          start()
-        })
-        .modal("show")
-    })
-
-    test("should close modal when clicking outside of modal-content", function () {
-      stop()
-      $.support.transition = false
-      var div = $("<div id='modal-test'><div class='contents'></div></div>")
-      div
-        .bind("shown.bs.modal", function () {
-          ok($('#modal-test').length, 'modal insterted into dom')
-          $('.contents').click()
-          ok($('#modal-test').is(":visible"), 'modal visible')
-          $('#modal-test').click()
-        })
-        .bind("hidden.bs.modal", function() {
-          ok(!$('#modal-test').is(":visible"), 'modal hidden')
-          div.remove()
-          start()
-        })
-        .modal("show")
-    })
-
-    test("should trigger hide event once when clicking outside of modal-content", function () {
-      stop()
-      $.support.transition = false
-      var div = $("<div id='modal-test'><div class='contents'></div></div>")
-      var triggered
-      div
-        .bind("shown.bs.modal", function () {
-          triggered = 0
-          $('#modal-test').click()
-        })
-        .one("hidden.bs.modal", function() {
-          div.modal("show")
-        })
-        .bind("hide.bs.modal", function () {
-          triggered += 1
-          ok(triggered === 1, 'modal hide triggered once')
-          start()
-        })
-        .modal("show")
-    })
-
-    test("should close reopened modal with [data-dismiss=modal] click", function () {
-      stop()
-      $.support.transition = false
-      var div = $("<div id='modal-test'><div class='contents'><div id='close' data-dismiss='modal'></div></div></div>")
-      div
-        .bind("shown.bs.modal", function () {
-          $('#close').click()
-          ok(!$('#modal-test').is(":visible"), 'modal hidden')
-        })
-        .one("hidden.bs.modal", function() {
-          div.one('hidden.bs.modal', function () {
-            start()
-          }).modal("show")
-        })
-        .modal("show")
-
-      div.remove()
-    })
-})

RIGS/static/js/tests/unit/phantom.js

@@ -1,69 +0,0 @@
-/*
- * grunt-contrib-qunit
- * http://gruntjs.com/
- *
- * Copyright (c) 2013 "Cowboy" Ben Alman, contributors
- * Licensed under the MIT license.
- */
-
-/*global QUnit:true, alert:true*/
-(function () {
-  'use strict';
-
-  // Don't re-order tests.
-  QUnit.config.reorder = false
-  // Run tests serially, not in parallel.
-  QUnit.config.autorun = false
-
-  // Send messages to the parent PhantomJS process via alert! Good times!!
-  function sendMessage() {
-    var args = [].slice.call(arguments)
-    alert(JSON.stringify(args))
-  }
-
-  // These methods connect QUnit to PhantomJS.
-  QUnit.log = function(obj) {
-    // What is this I don’t even
-    if (obj.message === '[object Object], undefined:undefined') { return }
-    // Parse some stuff before sending it.
-    var actual = QUnit.jsDump.parse(obj.actual)
-    var expected = QUnit.jsDump.parse(obj.expected)
-    // Send it.
-    sendMessage('qunit.log', obj.result, actual, expected, obj.message, obj.source)
-  }
-
-  QUnit.testStart = function(obj) {
-    sendMessage('qunit.testStart', obj.name)
-  }
-
-  QUnit.testDone = function(obj) {
-    sendMessage('qunit.testDone', obj.name, obj.failed, obj.passed, obj.total)
-  }
-
-  QUnit.moduleStart = function(obj) {
-    sendMessage('qunit.moduleStart', obj.name)
-  }
-
-  QUnit.begin = function () {
-    sendMessage('qunit.begin')
-    console.log("Starting test suite")
-    console.log("================================================\n")
-  }
-
-  QUnit.moduleDone = function (opts) {
-    if (opts.failed === 0) {
-      console.log("\r\u2714 All tests passed in '" + opts.name + "' module")
-    } else {
-      console.log("\u2716 " + opts.failed + " tests failed in '" + opts.name + "' module")
-    }
-    sendMessage('qunit.moduleDone', opts.name, opts.failed, opts.passed, opts.total)
-  }
-
-  QUnit.done = function (opts) {
-    console.log("\n================================================")
-    console.log("Tests completed in " + opts.runtime + " milliseconds")
-    console.log(opts.passed + " tests of " + opts.total + " passed, " + opts.failed + " failed.")
-    sendMessage('qunit.done', opts.failed, opts.passed, opts.total, opts.runtime)
-  }
-
-}())

RIGS/static/js/tests/unit/popover.js

@@ -1,133 +0,0 @@
-$(function () {
-
-    module("popover")
-
-      test("should provide no conflict", function () {
-        var popover = $.fn.popover.noConflict()
-        ok(!$.fn.popover, 'popover was set back to undefined (org value)')
-        $.fn.popover = popover
-      })
-
-      test("should be defined on jquery object", function () {
-        var div = $('<div></div>')
-        ok(div.popover, 'popover method is defined')
-      })
-
-      test("should return element", function () {
-        var div = $('<div></div>')
-        ok(div.popover() == div, 'document.body returned')
-      })
-
-      test("should render popover element", function () {
-        $.support.transition = false
-        var popover = $('<a href="#" title="mdo" data-content="http://twitter.com/mdo">@mdo</a>')
-          .appendTo('#qunit-fixture')
-          .popover('show')
-
-        ok($('.popover').length, 'popover was inserted')
-        popover.popover('hide')
-        ok(!$(".popover").length, 'popover removed')
-      })
-
-      test("should store popover instance in popover data object", function () {
-        $.support.transition = false
-        var popover = $('<a href="#" title="mdo" data-content="http://twitter.com/mdo">@mdo</a>')
-          .popover()
-
-        ok(!!popover.data('bs.popover'), 'popover instance exists')
-      })
-
-      test("should get title and content from options", function () {
-        $.support.transition = false
-        var popover = $('<a href="#">@fat</a>')
-          .appendTo('#qunit-fixture')
-          .popover({
-            title: function () {
-              return '@fat'
-            }
-          , content: function () {
-              return 'loves writing tests （╯°□°）╯︵ ┻━┻'
-            }
-          })
-
-        popover.popover('show')
-
-        ok($('.popover').length, 'popover was inserted')
-        equal($('.popover .popover-title').text(), '@fat', 'title correctly inserted')
-        equal($('.popover .popover-content').text(), 'loves writing tests （╯°□°）╯︵ ┻━┻', 'content correctly inserted')
-
-        popover.popover('hide')
-        ok(!$('.popover').length, 'popover was removed')
-        $('#qunit-fixture').empty()
-      })
-
-      test("should get title and content from attributes", function () {
-        $.support.transition = false
-        var popover = $('<a href="#" title="@mdo" data-content="loves data attributes (づ｡◕‿‿◕｡)づ ︵ ┻━┻" >@mdo</a>')
-          .appendTo('#qunit-fixture')
-          .popover()
-          .popover('show')
-
-        ok($('.popover').length, 'popover was inserted')
-        equal($('.popover .popover-title').text(), '@mdo', 'title correctly inserted')
-        equal($('.popover .popover-content').text(), "loves data attributes (づ｡◕‿‿◕｡)づ ︵ ┻━┻", 'content correctly inserted')
-
-        popover.popover('hide')
-        ok(!$('.popover').length, 'popover was removed')
-        $('#qunit-fixture').empty()
-      })
-
-
-      test("should get title and content from attributes #2", function () {
-        $.support.transition = false
-        var popover = $('<a href="#" title="@mdo" data-content="loves data attributes (づ｡◕‿‿◕｡)づ ︵ ┻━┻" >@mdo</a>')
-          .appendTo('#qunit-fixture')
-          .popover({
-              title: 'ignored title option',
-              content: 'ignored content option'
-          })
-          .popover('show')
-
-        ok($('.popover').length, 'popover was inserted')
-        equal($('.popover .popover-title').text(), '@mdo', 'title correctly inserted')
-        equal($('.popover .popover-content').text(), "loves data attributes (づ｡◕‿‿◕｡)づ ︵ ┻━┻", 'content correctly inserted')
-
-        popover.popover('hide')
-        ok(!$('.popover').length, 'popover was removed')
-        $('#qunit-fixture').empty()
-      })
-
-      test("should respect custom classes", function() {
-        $.support.transition = false
-        var popover = $('<a href="#">@fat</a>')
-          .appendTo('#qunit-fixture')
-          .popover({
-            title: 'Test'
-          , content: 'Test'
-          , template: '<div class="popover foobar"><div class="arrow"></div><div class="inner"><h3 class="title"></h3><div class="content"><p></p></div></div></div>'
-          })
-
-        popover.popover('show')
-
-        ok($('.popover').length, 'popover was inserted')
-        ok($('.popover').hasClass('foobar'), 'custom class is present')
-
-        popover.popover('hide')
-        ok(!$('.popover').length, 'popover was removed')
-        $('#qunit-fixture').empty()
-      })
-
-      test("should destroy popover", function () {
-        var popover = $('<div/>').popover({trigger: 'hover'}).on('click.foo', function(){})
-        ok(popover.data('bs.popover'), 'popover has data')
-        ok($._data(popover[0], 'events').mouseover && $._data(popover[0], 'events').mouseout, 'popover has hover event')
-        ok($._data(popover[0], 'events').click[0].namespace == 'foo', 'popover has extra click.foo event')
-        popover.popover('show')
-        popover.popover('destroy')
-        ok(!popover.hasClass('in'), 'popover is hidden')
-        ok(!popover.data('popover'), 'popover does not have data')
-        ok($._data(popover[0],'events').click[0].namespace == 'foo', 'popover still has click.foo')
-        ok(!$._data(popover[0], 'events').mouseover && !$._data(popover[0], 'events').mouseout, 'popover does not have any events')
-      })
-
-})

RIGS/static/js/tests/unit/scrollspy.js

@@ -1,37 +0,0 @@
-$(function () {
-
-    module("scrollspy")
-
-      test("should provide no conflict", function () {
-        var scrollspy = $.fn.scrollspy.noConflict()
-        ok(!$.fn.scrollspy, 'scrollspy was set back to undefined (org value)')
-        $.fn.scrollspy = scrollspy
-      })
-
-      test("should be defined on jquery object", function () {
-        ok($(document.body).scrollspy, 'scrollspy method is defined')
-      })
-
-      test("should return element", function () {
-        ok($(document.body).scrollspy()[0] == document.body, 'document.body returned')
-      })
-
-      test("should switch active class on scroll", function () {
-        var sectionHTML = '<div id="masthead"></div>'
-          , $section = $(sectionHTML).append('#qunit-fixture')
-          , topbarHTML ='<div class="topbar">'
-          + '<div class="topbar-inner">'
-          + '<div class="container">'
-          + '<h3><a href="#">Bootstrap</a></h3>'
-          + '<ul class="nav">'
-          + '<li><a href="#masthead">Overview</a></li>'
-          + '</ul>'
-          + '</div>'
-          + '</div>'
-          + '</div>'
-          , $topbar = $(topbarHTML).scrollspy()
-
-        ok($topbar.find('.active', true))
-      })
-
-})

RIGS/static/js/tests/unit/tab.js

@@ -1,86 +0,0 @@
-$(function () {
-
-    module("tabs")
-
-      test("should provide no conflict", function () {
-        var tab = $.fn.tab.noConflict()
-        ok(!$.fn.tab, 'tab was set back to undefined (org value)')
-        $.fn.tab = tab
-      })
-
-      test("should be defined on jquery object", function () {
-        ok($(document.body).tab, 'tabs method is defined')
-      })
-
-      test("should return element", function () {
-        ok($(document.body).tab()[0] == document.body, 'document.body returned')
-      })
-
-      test("should activate element by tab id", function () {
-        var tabsHTML =
-            '<ul class="tabs">'
-          + '<li><a href="#home">Home</a></li>'
-          + '<li><a href="#profile">Profile</a></li>'
-          + '</ul>'
-
-        $('<ul><li id="home"></li><li id="profile"></li></ul>').appendTo("#qunit-fixture")
-
-        $(tabsHTML).find('li:last a').tab('show')
-        equal($("#qunit-fixture").find('.active').attr('id'), "profile")
-
-        $(tabsHTML).find('li:first a').tab('show')
-        equal($("#qunit-fixture").find('.active').attr('id'), "home")
-      })
-
-      test("should activate element by tab id", function () {
-        var pillsHTML =
-            '<ul class="pills">'
-          + '<li><a href="#home">Home</a></li>'
-          + '<li><a href="#profile">Profile</a></li>'
-          + '</ul>'
-
-        $('<ul><li id="home"></li><li id="profile"></li></ul>').appendTo("#qunit-fixture")
-
-        $(pillsHTML).find('li:last a').tab('show')
-        equal($("#qunit-fixture").find('.active').attr('id'), "profile")
-
-        $(pillsHTML).find('li:first a').tab('show')
-        equal($("#qunit-fixture").find('.active').attr('id'), "home")
-      })
-
-
-      test("should not fire closed when close is prevented", function () {
-        $.support.transition = false
-        stop();
-        $('<div class="tab"/>')
-          .on('show.bs.tab', function (e) {
-            e.preventDefault();
-            ok(true);
-            start();
-          })
-          .on('shown.bs.tab', function () {
-            ok(false);
-          })
-          .tab('show')
-      })
-
-      test("show and shown events should reference correct relatedTarget", function () {
-        var dropHTML =
-            '<ul class="drop">'
-          + '<li class="dropdown"><a data-toggle="dropdown" href="#">1</a>'
-          + '<ul class="dropdown-menu">'
-          + '<li><a href="#1-1" data-toggle="tab">1-1</a></li>'
-          + '<li><a href="#1-2" data-toggle="tab">1-2</a></li>'
-          + '</ul>'
-          + '</li>'
-          + '</ul>'
-
-        $(dropHTML).find('ul>li:first a').tab('show').end()
-          .find('ul>li:last a').on('show', function(event){
-            equal(event.relatedTarget.hash, "#1-1")
-          }).on('shown', function(event){
-            equal(event.relatedTarget.hash, "#1-1")
-          }).tab('show')
-      })
-
-})

RIGS/static/js/tests/unit/tooltip.js

@@ -1,437 +0,0 @@
-$(function () {
-
-    module("tooltip")
-
-      test("should provide no conflict", function () {
-        var tooltip = $.fn.tooltip.noConflict()
-        ok(!$.fn.tooltip, 'tooltip was set back to undefined (org value)')
-        $.fn.tooltip = tooltip
-      })
-
-      test("should be defined on jquery object", function () {
-        var div = $("<div></div>")
-        ok(div.tooltip, 'popover method is defined')
-      })
-
-      test("should return element", function () {
-        var div = $("<div></div>")
-        ok(div.tooltip() == div, 'document.body returned')
-      })
-
-      test("should expose default settings", function () {
-        ok(!!$.fn.tooltip.Constructor.DEFAULTS, 'defaults is defined')
-      })
-
-      test("should empty title attribute", function () {
-        var tooltip = $('<a href="#" rel="tooltip" title="Another tooltip"></a>').tooltip()
-        ok(tooltip.attr('title') === '', 'title attribute was emptied')
-      })
-
-      test("should add data attribute for referencing original title", function () {
-        var tooltip = $('<a href="#" rel="tooltip" title="Another tooltip"></a>').tooltip()
-        equal(tooltip.attr('data-original-title'), 'Another tooltip', 'original title preserved in data attribute')
-      })
-
-      test("should place tooltips relative to placement option", function () {
-        $.support.transition = false
-        var tooltip = $('<a href="#" rel="tooltip" title="Another tooltip"></a>')
-          .appendTo('#qunit-fixture')
-          .tooltip({placement: 'bottom'})
-          .tooltip('show')
-
-        ok($(".tooltip").is('.fade.bottom.in'), 'has correct classes applied')
-        tooltip.tooltip('hide')
-      })
-
-      test("should allow html entities", function () {
-        $.support.transition = false
-        var tooltip = $('<a href="#" rel="tooltip" title="<b>@fat</b>"></a>')
-          .appendTo('#qunit-fixture')
-          .tooltip({html: true})
-          .tooltip('show')
-
-        ok($('.tooltip b').length, 'b tag was inserted')
-        tooltip.tooltip('hide')
-        ok(!$(".tooltip").length, 'tooltip removed')
-      })
-
-      test("should respect custom classes", function () {
-        var tooltip = $('<a href="#" rel="tooltip" title="Another tooltip"></a>')
-          .appendTo('#qunit-fixture')
-          .tooltip({ template: '<div class="tooltip some-class"><div class="tooltip-arrow"/><div class="tooltip-inner"/></div>'})
-          .tooltip('show')
-
-        ok($('.tooltip').hasClass('some-class'), 'custom class is present')
-        tooltip.tooltip('hide')
-        ok(!$(".tooltip").length, 'tooltip removed')
-      })
-
-      test("should fire show event", function () {
-        stop()
-        var tooltip = $('<div title="tooltip title"></div>')
-          .on("show.bs.tooltip", function() {
-            ok(true, "show was called")
-            start()
-          })
-          .tooltip('show')
-      })
-
-      test("should fire shown event", function () {
-        stop()
-        var tooltip = $('<div title="tooltip title"></div>')
-          .on("shown.bs.tooltip", function() {
-            ok(true, "shown was called")
-            start()
-          })
-          .tooltip('show')
-      })
-
-      test("should not fire shown event when default prevented", function () {
-        stop()
-        var tooltip = $('<div title="tooltip title"></div>')
-          .on("show.bs.tooltip", function(e) {
-            e.preventDefault()
-            ok(true, "show was called")
-            start()
-          })
-          .on("shown.bs.tooltip", function() {
-            ok(false, "shown was called")
-          })
-          .tooltip('show')
-      })
-
-      test("should fire hide event", function () {
-        stop()
-        var tooltip = $('<div title="tooltip title"></div>')
-          .on("shown.bs.tooltip", function() {
-            $(this).tooltip('hide')
-          })
-          .on("hide.bs.tooltip", function() {
-            ok(true, "hide was called")
-            start()
-          })
-          .tooltip('show')
-      })
-
-      test("should fire hidden event", function () {
-        stop()
-        var tooltip = $('<div title="tooltip title"></div>')
-          .on("shown.bs.tooltip", function() {
-            $(this).tooltip('hide')
-          })
-          .on("hidden.bs.tooltip", function() {
-            ok(true, "hidden was called")
-            start()
-          })
-          .tooltip('show')
-      })
-
-      test("should not fire hidden event when default prevented", function () {
-        stop()
-        var tooltip = $('<div title="tooltip title"></div>')
-          .on("shown.bs.tooltip", function() {
-            $(this).tooltip('hide')
-          })
-          .on("hide.bs.tooltip", function(e) {
-            e.preventDefault()
-            ok(true, "hide was called")
-            start()
-          })
-          .on("hidden.bs.tooltip", function() {
-            ok(false, "hidden was called")
-          })
-          .tooltip('show')
-      })
-
-      test("should not show tooltip if leave event occurs before delay expires", function () {
-        var tooltip = $('<a href="#" rel="tooltip" title="Another tooltip"></a>')
-          .appendTo('#qunit-fixture')
-          .tooltip({ delay: 200 })
-
-        stop()
-
-        tooltip.trigger('mouseenter')
-
-        setTimeout(function () {
-          ok(!$(".tooltip").is('.fade.in'), 'tooltip is not faded in')
-          tooltip.trigger('mouseout')
-          setTimeout(function () {
-            ok(!$(".tooltip").is('.fade.in'), 'tooltip is not faded in')
-            start()
-          }, 200)
-        }, 100)
-      })
-
-      test("should not show tooltip if leave event occurs before delay expires, even if hide delay is 0", function () {
-        var tooltip = $('<a href="#" rel="tooltip" title="Another tooltip"></a>')
-          .appendTo('#qunit-fixture')
-          .tooltip({ delay: { show: 200, hide: 0} })
-
-        stop()
-
-        tooltip.trigger('mouseenter')
-
-        setTimeout(function () {
-          ok(!$(".tooltip").is('.fade.in'), 'tooltip is not faded in')
-          tooltip.trigger('mouseout')
-          setTimeout(function () {
-            ok(!$(".tooltip").is('.fade.in'), 'tooltip is not faded in')
-            start()
-          }, 200)
-        }, 100)
-      })
-
-      test("should wait 200 ms before hiding the tooltip", 3, function () {
-        var tooltip = $('<a href="#" rel="tooltip" title="Another tooltip"></a>')
-          .appendTo('#qunit-fixture')
-          .tooltip({ delay: { show: 0, hide: 200} })
-
-        stop()
-
-        tooltip.trigger('mouseenter')
-
-        setTimeout(function () {
-          ok($(".tooltip").is('.fade.in'), 'tooltip is faded in')
-          tooltip.trigger('mouseout')
-          setTimeout(function () {
-            ok($(".tooltip").is('.fade.in'), '100ms:tooltip is still faded in')
-            setTimeout(function () {
-              ok(!$(".tooltip").is('.in'), 'tooltip removed')
-              start()
-            }, 150)
-          }, 100)
-        }, 1)
-      })
-
-      test("should not hide tooltip if leave event occurs, then tooltip is show immediately again", function () {
-        var tooltip = $('<a href="#" rel="tooltip" title="Another tooltip"></a>')
-          .appendTo('#qunit-fixture')
-          .tooltip({ delay: { show: 0, hide: 200} })
-
-        stop()
-
-        tooltip.trigger('mouseenter')
-
-        setTimeout(function () {
-          ok($(".tooltip").is('.fade.in'), 'tooltip is faded in')
-          tooltip.trigger('mouseout')
-          setTimeout(function () {
-            ok($(".tooltip").is('.fade.in'), '100ms:tooltip is still faded in')
-            tooltip.trigger('mouseenter')
-            setTimeout(function () {
-              ok($(".tooltip").is('.in'), 'tooltip removed')
-              start()
-            }, 150)
-          }, 100)
-        }, 1)
-      })
-
-      test("should not show tooltip if leave event occurs before delay expires", function () {
-        var tooltip = $('<a href="#" rel="tooltip" title="Another tooltip"></a>')
-          .appendTo('#qunit-fixture')
-          .tooltip({ delay: 100 })
-        stop()
-        tooltip.trigger('mouseenter')
-        setTimeout(function () {
-          ok(!$(".tooltip").is('.fade.in'), 'tooltip is not faded in')
-          tooltip.trigger('mouseout')
-          setTimeout(function () {
-            ok(!$(".tooltip").is('.fade.in'), 'tooltip is not faded in')
-            start()
-          }, 100)
-        }, 50)
-      })
-
-      test("should show tooltip if leave event hasn't occured before delay expires", function () {
-        var tooltip = $('<a href="#" rel="tooltip" title="Another tooltip"></a>')
-          .appendTo('#qunit-fixture')
-          .tooltip({ delay: 150 })
-        stop()
-        tooltip.trigger('mouseenter')
-        setTimeout(function () {
-          ok(!$(".tooltip").is('.fade.in'), 'tooltip is not faded in')
-        }, 100)
-        setTimeout(function () {
-          ok($(".tooltip").is('.fade.in'), 'tooltip has faded in')
-          start()
-        }, 200)
-      })
-
-      test("should destroy tooltip", function () {
-        var tooltip = $('<div/>').tooltip().on('click.foo', function(){})
-        ok(tooltip.data('bs.tooltip'), 'tooltip has data')
-        ok($._data(tooltip[0], 'events').mouseover && $._data(tooltip[0], 'events').mouseout, 'tooltip has hover event')
-        ok($._data(tooltip[0], 'events').click[0].namespace == 'foo', 'tooltip has extra click.foo event')
-        tooltip.tooltip('show')
-        tooltip.tooltip('destroy')
-        ok(!tooltip.hasClass('in'), 'tooltip is hidden')
-        ok(!$._data(tooltip[0], 'bs.tooltip'), 'tooltip does not have data')
-        ok($._data(tooltip[0], 'events').click[0].namespace == 'foo', 'tooltip still has click.foo')
-        ok(!$._data(tooltip[0], 'events').mouseover && !$._data(tooltip[0], 'events').mouseout, 'tooltip does not have any events')
-      })
-
-      test("should show tooltip with delegate selector on click", function () {
-        var div = $('<div><a href="#" rel="tooltip" title="Another tooltip"></a></div>')
-        var tooltip = div.appendTo('#qunit-fixture')
-                         .tooltip({ selector: 'a[rel=tooltip]',
-                                    trigger: 'click' })
-        div.find('a').trigger('click')
-        ok($(".tooltip").is('.fade.in'), 'tooltip is faded in')
-      })
-
-      test("should show tooltip when toggle is called", function () {
-        var tooltip = $('<a href="#" rel="tooltip" title="tooltip on toggle"></a>')
-          .appendTo('#qunit-fixture')
-          .tooltip({trigger: 'manual'})
-          .tooltip('toggle')
-        ok($(".tooltip").is('.fade.in'), 'tooltip should be toggled in')
-      })
-
-      test("should place tooltips inside the body", function () {
-        var tooltip = $('<a href="#" rel="tooltip" title="Another tooltip"></a>')
-          .appendTo('#qunit-fixture')
-          .tooltip({container:'body'})
-          .tooltip('show')
-        ok($("body > .tooltip").length, 'inside the body')
-        ok(!$("#qunit-fixture > .tooltip").length, 'not found in parent')
-        tooltip.tooltip('hide')
-      })
-
-      test("should place tooltip inside window", function(){
-        var container = $("<div />").appendTo("body")
-            .css({position: "absolute", width: 200, height: 200, bottom: 0, left: 0})
-          , tooltip = $("<a href='#' title='Very very very very very very very very long tooltip'>Hover me</a>")
-          .css({position: "absolute", top:0, left: 0})
-          .appendTo(container)
-          .tooltip({placement: "top", animate: false})
-          .tooltip("show")
-
-        stop()
-
-        setTimeout(function(){
-          ok($(".tooltip").offset().left >= 0)
-
-          start()
-          container.remove()
-        }, 100)
-      })
-
-      test("should place tooltip on top of element", function(){
-        var container = $("<div />").appendTo("body")
-              .css({position: "absolute", bottom: 0, left: 0, textAlign: "right", width: 300, height: 300})
-            , p = $("<p style='margin-top:200px' />").appendTo(container)
-            , tooltiped = $("<a href='#' title='very very very very very very very long tooltip'>Hover me</a>")
-              .css({marginTop: 200})
-              .appendTo(p)
-              .tooltip({placement: "top", animate: false})
-              .tooltip("show")
-
-        stop()
-
-        setTimeout(function(){
-          var tooltip = container.find(".tooltip")
-
-          start()
-          ok(tooltip.offset().top + tooltip.outerHeight() <= tooltiped.offset().top)
-          container.remove()
-        }, 100)
-      })
-
-      test("should add position class before positioning so that position-specific styles are taken into account", function(){
-        $("head").append('<style> .tooltip.right { white-space: nowrap; } .tooltip.right .tooltip-inner { max-width: none; } </style>')
-
-        var container = $("<div />").appendTo("body")
-          , target = $('<a href="#" rel="tooltip" title="very very very very very very very very long tooltip in one line"></a>')
-              .appendTo(container)
-              .tooltip({placement: 'right'})
-              .tooltip('show')
-          , tooltip = container.find(".tooltip")
-
-        ok( Math.round(target.offset().top + target[0].offsetHeight/2 - tooltip[0].offsetHeight/2) === Math.round(tooltip.offset().top) )
-        target.tooltip('hide')
-      })
-
-      test("tooltip title test #1", function () {
-        var tooltip = $('<a href="#" rel="tooltip" title="Simple tooltip" style="display: inline-block; position: absolute; top: 0; left: 0;"></a>')
-          .appendTo('#qunit-fixture')
-          .tooltip({
-          })
-          .tooltip('show')
-        equal($('.tooltip').children('.tooltip-inner').text(), 'Simple tooltip', 'title from title attribute is set')
-        tooltip.tooltip('hide')
-        ok(!$(".tooltip").length, 'tooltip removed')
-      })
-
-      test("tooltip title test #2", function () {
-        var tooltip = $('<a href="#" rel="tooltip" title="Simple tooltip" style="display: inline-block; position: absolute; top: 0; left: 0;"></a>')
-          .appendTo('#qunit-fixture')
-          .tooltip({
-            title: 'This is a tooltip with some content'
-          })
-          .tooltip('show')
-        equal($('.tooltip').children('.tooltip-inner').text(), 'Simple tooltip', 'title is set from title attribute while prefered over title option')
-        tooltip.tooltip('hide')
-        ok(!$(".tooltip").length, 'tooltip removed')
-      })
-
-      test("tooltip title test #3", function () {
-        var tooltip = $('<a href="#" rel="tooltip" style="display: inline-block; position: absolute; top: 0; left: 0;"></a>')
-          .appendTo('#qunit-fixture')
-          .tooltip({
-            title: 'This is a tooltip with some content'
-          })
-          .tooltip('show')
-        equal($('.tooltip').children('.tooltip-inner').text(), 'This is a tooltip with some content', 'title from title option is set')
-        tooltip.tooltip('hide')
-        ok(!$(".tooltip").length, 'tooltip removed')
-      })
-
-      test("tooltips should be placed dynamically, with the dynamic placement option", function () {
-        $.support.transition = false
-        var ttContainer = $('<div id="dynamic-tt-test"/>').css({
-          'height' : 400
-          , 'overflow' : 'hidden'
-          , 'position' : 'absolute'
-          , 'top' : 0
-          , 'left' : 0
-          , 'width' : 600})
-          .appendTo('body')
-
-        var topTooltip = $('<div style="display: inline-block; position: absolute; left: 0; top: 0;" rel="tooltip" title="Top tooltip">Top Dynamic Tooltip</div>')
-          .appendTo('#dynamic-tt-test')
-          .tooltip({placement: 'auto'})
-          .tooltip('show')
-
-
-        ok($(".tooltip").is('.bottom'),  'top positioned tooltip is dynamically positioned bottom')
-
-        topTooltip.tooltip('hide')
-
-        var rightTooltip = $('<div style="display: inline-block; position: absolute; right: 0;" rel="tooltip" title="Right tooltip">Right Dynamic Tooltip</div>')
-          .appendTo('#dynamic-tt-test')
-          .tooltip({placement: 'right auto'})
-          .tooltip('show')
-
-        ok($(".tooltip").is('.left'),  'right positioned tooltip is dynamically positioned left')
-        rightTooltip.tooltip('hide')
-
-        var bottomTooltip = $('<div style="display: inline-block; position: absolute; bottom: 0;" rel="tooltip" title="Bottom tooltip">Bottom Dynamic Tooltip</div>')
-          .appendTo('#dynamic-tt-test')
-          .tooltip({placement: 'auto bottom'})
-          .tooltip('show')
-
-        ok($(".tooltip").is('.top'),  'bottom positioned tooltip is dynamically positioned top')
-        bottomTooltip.tooltip('hide')
-
-        var leftTooltip = $('<div style="display: inline-block; position: absolute; left: 0;" rel="tooltip" title="Left tooltip">Left Dynamic Tooltip</div>')
-          .appendTo('#dynamic-tt-test')
-          .tooltip({placement: 'auto left'})
-          .tooltip('show')
-
-        ok($(".tooltip").is('.right'),  'left positioned tooltip is dynamically positioned right')
-        leftTooltip.tooltip('hide')
-
-        ttContainer.remove()
-      })
-
-})

RIGS/static/js/tests/unit/transition.js

@@ -1,13 +0,0 @@
-$(function () {
-
-    module("transition")
-
-      test("should be defined on jquery support object", function () {
-        ok($.support.transition !== undefined, 'transition object is defined')
-      })
-
-      test("should provide an end object", function () {
-        ok($.support.transition ? $.support.transition.end : true, 'end string is defined')
-      })
-
-})

RIGS/static/js/tests/vendor/qunit.css

@@ -1,232 +0,0 @@
-/**
- * QUnit - A JavaScript Unit Testing Framework
- *
- * http://docs.jquery.com/QUnit
- *
- * Copyright (c) 2012 John Resig, Jörn Zaefferer
- * Dual licensed under the MIT (MIT-LICENSE.txt)
- * or GPL (GPL-LICENSE.txt) licenses.
- */
-
-/** Font Family and Sizes */
-
-#qunit-tests, #qunit-header, #qunit-banner, #qunit-testrunner-toolbar, #qunit-userAgent, #qunit-testresult {
-	font-family: "Helvetica Neue Light", "HelveticaNeue-Light", "Helvetica Neue", Calibri, Helvetica, Arial, sans-serif;
-}
-
-#qunit-testrunner-toolbar, #qunit-userAgent, #qunit-testresult, #qunit-tests li { font-size: small; }
-#qunit-tests { font-size: smaller; }
-
-
-/** Resets */
-
-#qunit-tests, #qunit-tests ol, #qunit-header, #qunit-banner, #qunit-userAgent, #qunit-testresult {
-	margin: 0;
-	padding: 0;
-}
-
-
-/** Header */
-
-#qunit-header {
-	padding: 0.5em 0 0.5em 1em;
-
-	color: #8699a4;
-	background-color: #0d3349;
-
-	font-size: 1.5em;
-	line-height: 1em;
-	font-weight: normal;
-
-	border-radius: 15px 15px 0 0;
-	-moz-border-radius: 15px 15px 0 0;
-	-webkit-border-top-right-radius: 15px;
-	-webkit-border-top-left-radius: 15px;
-}
-
-#qunit-header a {
-	text-decoration: none;
-	color: #c2ccd1;
-}
-
-#qunit-header a:hover,
-#qunit-header a:focus {
-	color: #fff;
-}
-
-#qunit-banner {
-	height: 5px;
-}
-
-#qunit-testrunner-toolbar {
-	padding: 0.5em 0 0.5em 2em;
-	color: #5E740B;
-	background-color: #eee;
-}
-
-#qunit-userAgent {
-	padding: 0.5em 0 0.5em 2.5em;
-	background-color: #2b81af;
-	color: #fff;
-	text-shadow: rgba(0, 0, 0, 0.5) 2px 2px 1px;
-}
-
-
-/** Tests: Pass/Fail */
-
-#qunit-tests {
-	list-style-position: inside;
-}
-
-#qunit-tests li {
-	padding: 0.4em 0.5em 0.4em 2.5em;
-	border-bottom: 1px solid #fff;
-	list-style-position: inside;
-}
-
-#qunit-tests.hidepass li.pass, #qunit-tests.hidepass li.running  {
-	display: none;
-}
-
-#qunit-tests li strong {
-	cursor: pointer;
-}
-
-#qunit-tests li a {
-	padding: 0.5em;
-	color: #c2ccd1;
-	text-decoration: none;
-}
-#qunit-tests li a:hover,
-#qunit-tests li a:focus {
-	color: #000;
-}
-
-#qunit-tests ol {
-	margin-top: 0.5em;
-	padding: 0.5em;
-
-	background-color: #fff;
-
-	border-radius: 15px;
-	-moz-border-radius: 15px;
-	-webkit-border-radius: 15px;
-
-	box-shadow: inset 0px 2px 13px #999;
-	-moz-box-shadow: inset 0px 2px 13px #999;
-	-webkit-box-shadow: inset 0px 2px 13px #999;
-}
-
-#qunit-tests table {
-	border-collapse: collapse;
-	margin-top: .2em;
-}
-
-#qunit-tests th {
-	text-align: right;
-	vertical-align: top;
-	padding: 0 .5em 0 0;
-}
-
-#qunit-tests td {
-	vertical-align: top;
-}
-
-#qunit-tests pre {
-	margin: 0;
-	white-space: pre-wrap;
-	word-wrap: break-word;
-}
-
-#qunit-tests del {
-	background-color: #e0f2be;
-	color: #374e0c;
-	text-decoration: none;
-}
-
-#qunit-tests ins {
-	background-color: #ffcaca;
-	color: #500;
-	text-decoration: none;
-}
-
-/*** Test Counts */
-
-#qunit-tests b.counts                       { color: black; }
-#qunit-tests b.passed                       { color: #5E740B; }
-#qunit-tests b.failed                       { color: #710909; }
-
-#qunit-tests li li {
-	margin: 0.5em;
-	padding: 0.4em 0.5em 0.4em 0.5em;
-	background-color: #fff;
-	border-bottom: none;
-	list-style-position: inside;
-}
-
-/*** Passing Styles */
-
-#qunit-tests li li.pass {
-	color: #5E740B;
-	background-color: #fff;
-	border-left: 26px solid #C6E746;
-}
-
-#qunit-tests .pass                          { color: #528CE0; background-color: #D2E0E6; }
-#qunit-tests .pass .test-name               { color: #366097; }
-
-#qunit-tests .pass .test-actual,
-#qunit-tests .pass .test-expected           { color: #999999; }
-
-#qunit-banner.qunit-pass                    { background-color: #C6E746; }
-
-/*** Failing Styles */
-
-#qunit-tests li li.fail {
-	color: #710909;
-	background-color: #fff;
-	border-left: 26px solid #EE5757;
-	white-space: pre;
-}
-
-#qunit-tests > li:last-child {
-	border-radius: 0 0 15px 15px;
-	-moz-border-radius: 0 0 15px 15px;
-	-webkit-border-bottom-right-radius: 15px;
-	-webkit-border-bottom-left-radius: 15px;
-}
-
-#qunit-tests .fail                          { color: #000000; background-color: #EE5757; }
-#qunit-tests .fail .test-name,
-#qunit-tests .fail .module-name             { color: #000000; }
-
-#qunit-tests .fail .test-actual             { color: #EE5757; }
-#qunit-tests .fail .test-expected           { color: green;   }
-
-#qunit-banner.qunit-fail                    { background-color: #EE5757; }
-
-
-/** Result */
-
-#qunit-testresult {
-	padding: 0.5em 0.5em 0.5em 2.5em;
-
-	color: #2b81af;
-	background-color: #D2E0E6;
-
-	border-bottom: 1px solid white;
-}
-
-/** Fixture */
-
-#qunit-fixture {
-	position: absolute;
-	top: -10000px;
-	left: -10000px;
-}
-
-/** Runoff */
-
-#qunit-fixture {
-  display:none;
-}

RIGS/static/js/tooltip.js

@@ -1,520 +0,0 @@
-/* ========================================================================
- * Bootstrap: tooltip.js v3.3.7
- * http://getbootstrap.com/javascript/#tooltip
- * Inspired by the original jQuery.tipsy by Jason Frame
- * ========================================================================
- * Copyright 2011-2016 Twitter, Inc.
- * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
- * ======================================================================== */
-
-
-+function ($) {
-  'use strict';
-
-  // TOOLTIP PUBLIC CLASS DEFINITION
-  // ===============================
-
-  var Tooltip = function (element, options) {
-    this.type       = null
-    this.options    = null
-    this.enabled    = null
-    this.timeout    = null
-    this.hoverState = null
-    this.$element   = null
-    this.inState    = null
-
-    this.init('tooltip', element, options)
-  }
-
-  Tooltip.VERSION  = '3.3.7'
-
-  Tooltip.TRANSITION_DURATION = 150
-
-  Tooltip.DEFAULTS = {
-    animation: true,
-    placement: 'top',
-    selector: false,
-    template: '<div class="tooltip" role="tooltip"><div class="tooltip-arrow"></div><div class="tooltip-inner"></div></div>',
-    trigger: 'hover focus',
-    title: '',
-    delay: 0,
-    html: false,
-    container: false,
-    viewport: {
-      selector: 'body',
-      padding: 0
-    }
-  }
-
-  Tooltip.prototype.init = function (type, element, options) {
-    this.enabled   = true
-    this.type      = type
-    this.$element  = $(element)
-    this.options   = this.getOptions(options)
-    this.$viewport = this.options.viewport && $($.isFunction(this.options.viewport) ? this.options.viewport.call(this, this.$element) : (this.options.viewport.selector || this.options.viewport))
-    this.inState   = { click: false, hover: false, focus: false }
-
-    if (this.$element[0] instanceof document.constructor && !this.options.selector) {
-      throw new Error('`selector` option must be specified when initializing ' + this.type + ' on the window.document object!')
-    }
-
-    var triggers = this.options.trigger.split(' ')
-
-    for (var i = triggers.length; i--;) {
-      var trigger = triggers[i]
-
-      if (trigger == 'click') {
-        this.$element.on('click.' + this.type, this.options.selector, $.proxy(this.toggle, this))
-      } else if (trigger != 'manual') {
-        var eventIn  = trigger == 'hover' ? 'mouseenter' : 'focusin'
-        var eventOut = trigger == 'hover' ? 'mouseleave' : 'focusout'
-
-        this.$element.on(eventIn  + '.' + this.type, this.options.selector, $.proxy(this.enter, this))
-        this.$element.on(eventOut + '.' + this.type, this.options.selector, $.proxy(this.leave, this))
-      }
-    }
-
-    this.options.selector ?
-      (this._options = $.extend({}, this.options, { trigger: 'manual', selector: '' })) :
-      this.fixTitle()
-  }
-
-  Tooltip.prototype.getDefaults = function () {
-    return Tooltip.DEFAULTS
-  }
-
-  Tooltip.prototype.getOptions = function (options) {
-    options = $.extend({}, this.getDefaults(), this.$element.data(), options)
-
-    if (options.delay && typeof options.delay == 'number') {
-      options.delay = {
-        show: options.delay,
-        hide: options.delay
-      }
-    }
-
-    return options
-  }
-
-  Tooltip.prototype.getDelegateOptions = function () {
-    var options  = {}
-    var defaults = this.getDefaults()
-
-    this._options && $.each(this._options, function (key, value) {
-      if (defaults[key] != value) options[key] = value
-    })
-
-    return options
-  }
-
-  Tooltip.prototype.enter = function (obj) {
-    var self = obj instanceof this.constructor ?
-      obj : $(obj.currentTarget).data('bs.' + this.type)
-
-    if (!self) {
-      self = new this.constructor(obj.currentTarget, this.getDelegateOptions())
-      $(obj.currentTarget).data('bs.' + this.type, self)
-    }
-
-    if (obj instanceof $.Event) {
-      self.inState[obj.type == 'focusin' ? 'focus' : 'hover'] = true
-    }
-
-    if (self.tip().hasClass('in') || self.hoverState == 'in') {
-      self.hoverState = 'in'
-      return
-    }
-
-    clearTimeout(self.timeout)
-
-    self.hoverState = 'in'
-
-    if (!self.options.delay || !self.options.delay.show) return self.show()
-
-    self.timeout = setTimeout(function () {
-      if (self.hoverState == 'in') self.show()
-    }, self.options.delay.show)
-  }
-
-  Tooltip.prototype.isInStateTrue = function () {
-    for (var key in this.inState) {
-      if (this.inState[key]) return true
-    }
-
-    return false
-  }
-
-  Tooltip.prototype.leave = function (obj) {
-    var self = obj instanceof this.constructor ?
-      obj : $(obj.currentTarget).data('bs.' + this.type)
-
-    if (!self) {
-      self = new this.constructor(obj.currentTarget, this.getDelegateOptions())
-      $(obj.currentTarget).data('bs.' + this.type, self)
-    }
-
-    if (obj instanceof $.Event) {
-      self.inState[obj.type == 'focusout' ? 'focus' : 'hover'] = false
-    }
-
-    if (self.isInStateTrue()) return
-
-    clearTimeout(self.timeout)
-
-    self.hoverState = 'out'
-
-    if (!self.options.delay || !self.options.delay.hide) return self.hide()
-
-    self.timeout = setTimeout(function () {
-      if (self.hoverState == 'out') self.hide()
-    }, self.options.delay.hide)
-  }
-
-  Tooltip.prototype.show = function () {
-    var e = $.Event('show.bs.' + this.type)
-
-    if (this.hasContent() && this.enabled) {
-      this.$element.trigger(e)
-
-      var inDom = $.contains(this.$element[0].ownerDocument.documentElement, this.$element[0])
-      if (e.isDefaultPrevented() || !inDom) return
-      var that = this
-
-      var $tip = this.tip()
-
-      var tipId = this.getUID(this.type)
-
-      this.setContent()
-      $tip.attr('id', tipId)
-      this.$element.attr('aria-describedby', tipId)
-
-      if (this.options.animation) $tip.addClass('fade')
-
-      var placement = typeof this.options.placement == 'function' ?
-        this.options.placement.call(this, $tip[0], this.$element[0]) :
-        this.options.placement
-
-      var autoToken = /\s?auto?\s?/i
-      var autoPlace = autoToken.test(placement)
-      if (autoPlace) placement = placement.replace(autoToken, '') || 'top'
-
-      $tip
-        .detach()
-        .css({ top: 0, left: 0, display: 'block' })
-        .addClass(placement)
-        .data('bs.' + this.type, this)
-
-      this.options.container ? $tip.appendTo(this.options.container) : $tip.insertAfter(this.$element)
-      this.$element.trigger('inserted.bs.' + this.type)
-
-      var pos          = this.getPosition()
-      var actualWidth  = $tip[0].offsetWidth
-      var actualHeight = $tip[0].offsetHeight
-
-      if (autoPlace) {
-        var orgPlacement = placement
-        var viewportDim = this.getPosition(this.$viewport)
-
-        placement = placement == 'bottom' && pos.bottom + actualHeight > viewportDim.bottom ? 'top'    :
-                    placement == 'top'    && pos.top    - actualHeight < viewportDim.top    ? 'bottom' :
-                    placement == 'right'  && pos.right  + actualWidth  > viewportDim.width  ? 'left'   :
-                    placement == 'left'   && pos.left   - actualWidth  < viewportDim.left   ? 'right'  :
-                    placement
-
-        $tip
-          .removeClass(orgPlacement)
-          .addClass(placement)
-      }
-
-      var calculatedOffset = this.getCalculatedOffset(placement, pos, actualWidth, actualHeight)
-
-      this.applyPlacement(calculatedOffset, placement)
-
-      var complete = function () {
-        var prevHoverState = that.hoverState
-        that.$element.trigger('shown.bs.' + that.type)
-        that.hoverState = null
-
-        if (prevHoverState == 'out') that.leave(that)
-      }
-
-      $.support.transition && this.$tip.hasClass('fade') ?
-        $tip
-          .one('bsTransitionEnd', complete)
-          .emulateTransitionEnd(Tooltip.TRANSITION_DURATION) :
-        complete()
-    }
-  }
-
-  Tooltip.prototype.applyPlacement = function (offset, placement) {
-    var $tip   = this.tip()
-    var width  = $tip[0].offsetWidth
-    var height = $tip[0].offsetHeight
-
-    // manually read margins because getBoundingClientRect includes difference
-    var marginTop = parseInt($tip.css('margin-top'), 10)
-    var marginLeft = parseInt($tip.css('margin-left'), 10)
-
-    // we must check for NaN for ie 8/9
-    if (isNaN(marginTop))  marginTop  = 0
-    if (isNaN(marginLeft)) marginLeft = 0
-
-    offset.top  += marginTop
-    offset.left += marginLeft
-
-    // $.fn.offset doesn't round pixel values
-    // so we use setOffset directly with our own function B-0
-    $.offset.setOffset($tip[0], $.extend({
-      using: function (props) {
-        $tip.css({
-          top: Math.round(props.top),
-          left: Math.round(props.left)
-        })
-      }
-    }, offset), 0)
-
-    $tip.addClass('in')
-
-    // check to see if placing tip in new offset caused the tip to resize itself
-    var actualWidth  = $tip[0].offsetWidth
-    var actualHeight = $tip[0].offsetHeight
-
-    if (placement == 'top' && actualHeight != height) {
-      offset.top = offset.top + height - actualHeight
-    }
-
-    var delta = this.getViewportAdjustedDelta(placement, offset, actualWidth, actualHeight)
-
-    if (delta.left) offset.left += delta.left
-    else offset.top += delta.top
-
-    var isVertical          = /top|bottom/.test(placement)
-    var arrowDelta          = isVertical ? delta.left * 2 - width + actualWidth : delta.top * 2 - height + actualHeight
-    var arrowOffsetPosition = isVertical ? 'offsetWidth' : 'offsetHeight'
-
-    $tip.offset(offset)
-    this.replaceArrow(arrowDelta, $tip[0][arrowOffsetPosition], isVertical)
-  }
-
-  Tooltip.prototype.replaceArrow = function (delta, dimension, isVertical) {
-    this.arrow()
-      .css(isVertical ? 'left' : 'top', 50 * (1 - delta / dimension) + '%')
-      .css(isVertical ? 'top' : 'left', '')
-  }
-
-  Tooltip.prototype.setContent = function () {
-    var $tip  = this.tip()
-    var title = this.getTitle()
-
-    $tip.find('.tooltip-inner')[this.options.html ? 'html' : 'text'](title)
-    $tip.removeClass('fade in top bottom left right')
-  }
-
-  Tooltip.prototype.hide = function (callback) {
-    var that = this
-    var $tip = $(this.$tip)
-    var e    = $.Event('hide.bs.' + this.type)
-
-    function complete() {
-      if (that.hoverState != 'in') $tip.detach()
-      if (that.$element) { // TODO: Check whether guarding this code with this `if` is really necessary.
-        that.$element
-          .removeAttr('aria-describedby')
-          .trigger('hidden.bs.' + that.type)
-      }
-      callback && callback()
-    }
-
-    this.$element.trigger(e)
-
-    if (e.isDefaultPrevented()) return
-
-    $tip.removeClass('in')
-
-    $.support.transition && $tip.hasClass('fade') ?
-      $tip
-        .one('bsTransitionEnd', complete)
-        .emulateTransitionEnd(Tooltip.TRANSITION_DURATION) :
-      complete()
-
-    this.hoverState = null
-
-    return this
-  }
-
-  Tooltip.prototype.fixTitle = function () {
-    var $e = this.$element
-    if ($e.attr('title') || typeof $e.attr('data-original-title') != 'string') {
-      $e.attr('data-original-title', $e.attr('title') || '').attr('title', '')
-    }
-  }
-
-  Tooltip.prototype.hasContent = function () {
-    return this.getTitle()
-  }
-
-  Tooltip.prototype.getPosition = function ($element) {
-    $element   = $element || this.$element
-
-    var el     = $element[0]
-    var isBody = el.tagName == 'BODY'
-
-    var elRect    = el.getBoundingClientRect()
-    if (elRect.width == null) {
-      // width and height are missing in IE8, so compute them manually; see https://github.com/twbs/bootstrap/issues/14093
-      elRect = $.extend({}, elRect, { width: elRect.right - elRect.left, height: elRect.bottom - elRect.top })
-    }
-    var isSvg = window.SVGElement && el instanceof window.SVGElement
-    // Avoid using $.offset() on SVGs since it gives incorrect results in jQuery 3.
-    // See https://github.com/twbs/bootstrap/issues/20280
-    var elOffset  = isBody ? { top: 0, left: 0 } : (isSvg ? null : $element.offset())
-    var scroll    = { scroll: isBody ? document.documentElement.scrollTop || document.body.scrollTop : $element.scrollTop() }
-    var outerDims = isBody ? { width: $(window).width(), height: $(window).height() } : null
-
-    return $.extend({}, elRect, scroll, outerDims, elOffset)
-  }
-
-  Tooltip.prototype.getCalculatedOffset = function (placement, pos, actualWidth, actualHeight) {
-    return placement == 'bottom' ? { top: pos.top + pos.height,   left: pos.left + pos.width / 2 - actualWidth / 2 } :
-           placement == 'top'    ? { top: pos.top - actualHeight, left: pos.left + pos.width / 2 - actualWidth / 2 } :
-           placement == 'left'   ? { top: pos.top + pos.height / 2 - actualHeight / 2, left: pos.left - actualWidth } :
-        /* placement == 'right' */ { top: pos.top + pos.height / 2 - actualHeight / 2, left: pos.left + pos.width }
-
-  }
-
-  Tooltip.prototype.getViewportAdjustedDelta = function (placement, pos, actualWidth, actualHeight) {
-    var delta = { top: 0, left: 0 }
-    if (!this.$viewport) return delta
-
-    var viewportPadding = this.options.viewport && this.options.viewport.padding || 0
-    var viewportDimensions = this.getPosition(this.$viewport)
-
-    if (/right|left/.test(placement)) {
-      var topEdgeOffset    = pos.top - viewportPadding - viewportDimensions.scroll
-      var bottomEdgeOffset = pos.top + viewportPadding - viewportDimensions.scroll + actualHeight
-      if (topEdgeOffset < viewportDimensions.top) { // top overflow
-        delta.top = viewportDimensions.top - topEdgeOffset
-      } else if (bottomEdgeOffset > viewportDimensions.top + viewportDimensions.height) { // bottom overflow
-        delta.top = viewportDimensions.top + viewportDimensions.height - bottomEdgeOffset
-      }
-    } else {
-      var leftEdgeOffset  = pos.left - viewportPadding
-      var rightEdgeOffset = pos.left + viewportPadding + actualWidth
-      if (leftEdgeOffset < viewportDimensions.left) { // left overflow
-        delta.left = viewportDimensions.left - leftEdgeOffset
-      } else if (rightEdgeOffset > viewportDimensions.right) { // right overflow
-        delta.left = viewportDimensions.left + viewportDimensions.width - rightEdgeOffset
-      }
-    }
-
-    return delta
-  }
-
-  Tooltip.prototype.getTitle = function () {
-    var title
-    var $e = this.$element
-    var o  = this.options
-
-    title = $e.attr('data-original-title')
-      || (typeof o.title == 'function' ? o.title.call($e[0]) :  o.title)
-
-    return title
-  }
-
-  Tooltip.prototype.getUID = function (prefix) {
-    do prefix += ~~(Math.random() * 1000000)
-    while (document.getElementById(prefix))
-    return prefix
-  }
-
-  Tooltip.prototype.tip = function () {
-    if (!this.$tip) {
-      this.$tip = $(this.options.template)
-      if (this.$tip.length != 1) {
-        throw new Error(this.type + ' `template` option must consist of exactly 1 top-level element!')
-      }
-    }
-    return this.$tip
-  }
-
-  Tooltip.prototype.arrow = function () {
-    return (this.$arrow = this.$arrow || this.tip().find('.tooltip-arrow'))
-  }
-
-  Tooltip.prototype.enable = function () {
-    this.enabled = true
-  }
-
-  Tooltip.prototype.disable = function () {
-    this.enabled = false
-  }
-
-  Tooltip.prototype.toggleEnabled = function () {
-    this.enabled = !this.enabled
-  }
-
-  Tooltip.prototype.toggle = function (e) {
-    var self = this
-    if (e) {
-      self = $(e.currentTarget).data('bs.' + this.type)
-      if (!self) {
-        self = new this.constructor(e.currentTarget, this.getDelegateOptions())
-        $(e.currentTarget).data('bs.' + this.type, self)
-      }
-    }
-
-    if (e) {
-      self.inState.click = !self.inState.click
-      if (self.isInStateTrue()) self.enter(self)
-      else self.leave(self)
-    } else {
-      self.tip().hasClass('in') ? self.leave(self) : self.enter(self)
-    }
-  }
-
-  Tooltip.prototype.destroy = function () {
-    var that = this
-    clearTimeout(this.timeout)
-    this.hide(function () {
-      that.$element.off('.' + that.type).removeData('bs.' + that.type)
-      if (that.$tip) {
-        that.$tip.detach()
-      }
-      that.$tip = null
-      that.$arrow = null
-      that.$viewport = null
-      that.$element = null
-    })
-  }
-
-
-  // TOOLTIP PLUGIN DEFINITION
-  // =========================
-
-  function Plugin(option) {
-    return this.each(function () {
-      var $this   = $(this)
-      var data    = $this.data('bs.tooltip')
-      var options = typeof option == 'object' && option
-
-      if (!data && /destroy|hide/.test(option)) return
-      if (!data) $this.data('bs.tooltip', (data = new Tooltip(this, options)))
-      if (typeof option == 'string') data[option]()
-    })
-  }
-
-  var old = $.fn.tooltip
-
-  $.fn.tooltip             = Plugin
-  $.fn.tooltip.Constructor = Tooltip
-
-
-  // TOOLTIP NO CONFLICT
-  // ===================
-
-  $.fn.tooltip.noConflict = function () {
-    $.fn.tooltip = old
-    return this
-  }
-
-}(jQuery);

RIGS/static/js/transition.js

@@ -1,59 +0,0 @@
-/* ========================================================================
- * Bootstrap: transition.js v3.3.7
- * http://getbootstrap.com/javascript/#transitions
- * ========================================================================
- * Copyright 2011-2016 Twitter, Inc.
- * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
- * ======================================================================== */
-
-
-+function ($) {
-  'use strict';
-
-  // CSS TRANSITION SUPPORT (Shoutout: http://www.modernizr.com/)
-  // ============================================================
-
-  function transitionEnd() {
-    var el = document.createElement('bootstrap')
-
-    var transEndEventNames = {
-      WebkitTransition : 'webkitTransitionEnd',
-      MozTransition    : 'transitionend',
-      OTransition      : 'oTransitionEnd otransitionend',
-      transition       : 'transitionend'
-    }
-
-    for (var name in transEndEventNames) {
-      if (el.style[name] !== undefined) {
-        return { end: transEndEventNames[name] }
-      }
-    }
-
-    return false // explicit for ie8 (  ._.)
-  }
-
-  // http://blog.alexmaccaw.com/css-transitions
-  $.fn.emulateTransitionEnd = function (duration) {
-    var called = false
-    var $el = this
-    $(this).one('bsTransitionEnd', function () { called = true })
-    var callback = function () { if (!called) $($el).trigger($.support.transition.end) }
-    setTimeout(callback, duration)
-    return this
-  }
-
-  $(function () {
-    $.support.transition = transitionEnd()
-
-    if (!$.support.transition) return
-
-    $.event.special.bsTransitionEnd = {
-      bindType: $.support.transition.end,
-      delegateType: $.support.transition.end,
-      handle: function (e) {
-        if ($(e.target).is(this)) return e.handleObj.handler.apply(this, arguments)
-      }
-    }
-  })
-
-}(jQuery);

RIGS/static/scss/email.scss

@@ -1,64 +0,0 @@
-$button_color: #357ebf;
-
-body{
-  margin: 0px;
-}
-
-.main-table{
-  width: 100%;
-  border-collapse: collapse;
-  
-}
-
-.client-header {
-  background-image: url("https://www.nottinghamtec.co.uk/imgs/wof2014-1.jpg");
-  background-color: #222;
-  background-repeat: no-repeat;
-  background-position: center;
-  
-  width: 100%;
-
-  margin-bottom: 28px;
-
-  .logos{
-    width: 100%;
-    max-width: 640px;
-  }
-
-  img {
-    height: 110px;
-  }
-}
-
-.content-container{
-  width: 100%;
-
-  .content {
-    font-family: "Open Sans", "Helvetica Neue", Helvetica, Arial, sans-serif;
-    
-    width: 100%;
-    max-width: 600px;
-    padding: 10px;
-    text-align: left;
-
-    .button-container{
-      width: 100%;
-
-      .button {
-        padding: 6px 12px;
-        background-color: $button_color;
-        border-radius: 4px;
-
-        a {
-          color: #fff;
-          text-decoration: none;
-        }
-        
-      }
-
-    }
-
-  }
-}
-
-

RIGS/templates/RIGS/activity_feed.html

@@ -1,53 +1,5 @@
 {% load static %}
 
-{% 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 src="{% static "js/moment-twitter.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);
-        moment().twitter();
-
-})
-  $(document).ready(function() {
-    $(function () {
-        $( "#activity" ).hide();
-        $( "#activity" ).load( "{% url 'activity_feed' %}", function() {
-          $('#activity_loading').slideUp('slow',function(){
-              $('#activity').slideDown('slow');
-          });
-
-          $('#activity [data-toggle="popover"]').popover();
-
-          $('.date').each(function (index, dateElem) {
-            var $dateElem = $(dateElem);
-            var formatted = moment($dateElem.attr('data-date')).twitterLong();
-            $dateElem.text(formatted);
-          });
-
-        });
-    });
-  });
-</script>
-{% endblock %}
-
     <div class="panel panel-default">
       <div class="panel-heading">
         <h4 class="panel-title">Recent Changes</h4>

RIGS/templates/RIGS/activity_feed_data.html

@@ -33,13 +33,13 @@
                 {% endif %}
                       <p>
                       <small>
-                        {% if version.changes.old == None %}
+                        {% if version.old == None %}
                           Created
                         {% else %}
                           Changed {% include 'RIGS/version_changes.html' %} in
                         {% endif %}
                           
-                        {% include 'RIGS/object_button.html' with object=version.changes.new %}
+                        {% include 'RIGS/object_button.html' with object=version.new %}
                         {% if version.revision.comment %}
                           ({{ version.revision.comment }})
                         {% endif %}

RIGS/templates/RIGS/activity_table.html

@@ -67,16 +67,16 @@
                         
                             <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.pk|stringformat:"05d" }}</a></td>
-                           		<td>{{ version.pk }}|{{ version.revision.pk }}</td>
+                                <td><a href="{{ version.new.get_absolute_url }}">{{version.new|to_class_name}} {{ version.new.pk|stringformat:"05d" }}</a></td>
+                           		<td>{{ version.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
+                                  {% if version.old == None %}
+                                    {{version.new|to_class_name}} Created
                                   {% else %}
                                     {% include 'RIGS/version_changes.html' %}
                                   {% endif %}                        </td>
-                                  <td>{{ version.changes.revision.comment }}</td>
+                                  <td>{{ version.revision.comment }}</td>
                             </tr>
                         
         			{% endfor %}

RIGS/templates/RIGS/client_eventdetails.html

@@ -1,78 +0,0 @@
-<div class="row">
-    <div class="col-sm-12 col-md-6 col-lg-5">
-        <div class="panel panel-default">
-            <div class="panel-heading">Contact Details</div>
-            <div class="panel-body">
-                <dl class="dl-horizontal">
-                    <dt>Person</dt>
-                    <dd>
-                        {% if event.person %}
-                            {{ event.person.name }}
-                        {% endif %}
-                    </dd>
-
-                    <dt>Email</dt>
-                    <dd>
-                        <span class="overflow-ellipsis">{{ event.person.email }}</span>
-                    </dd>
-
-                    <dt>Phone Number</dt>
-                    <dd>{{ event.person.phone }}</dd>
-                </dl>
-            </div>
-        </div>
-        {% if event.organisation %}
-            <div class="panel panel-default">
-                <div class="panel-heading">Organisation</div>
-                <div class="panel-body">
-                    <dl class="dl-horizontal">
-                        <dt>Organisation</dt>
-                        <dd>
-                            {{ event.organisation.name }}
-                        </dd>
-
-                        <dt>Phone Number</dt>
-                        <dd>{{ object.organisation.phone }}</dd>
-                    </dl>
-                </div>
-            </div>
-        {% endif %}
-    </div>
-
-    <div class="col-sm-12 col-md-6 col-lg-7">
-        <div class="panel panel-info">
-            <div class="panel-heading">Event Info</div>
-            <div class="panel-body">
-                <dl class="dl-horizontal">
-                    <dt>Event Venue</dt>
-                    <dd>
-                        {% if object.venue %}
-                            <a href="{% url 'venue_detail' object.venue.pk %}" class="modal-href">
-                                {{ object.venue }}
-                            </a>
-                        {% endif %}
-                    </dd>
-
-                    <dt>Status</dt>
-                    <dd>{{ event.get_status_display }}</dd>
-
-                    <dd>&nbsp;</dd>
-
-                    <dt>Access From</dt>
-                    <dd>{{ event.access_at|date:"D d M Y H:i"|default:"" }}</dd>
-
-                    <dt>Event Starts</dt>
-                    <dd>{{ event.start_date|date:"D d M Y" }} {{ event.start_time|date:"H:i" }}</dd>
-
-                    <dt>Event Ends</dt>
-                    <dd>{{ event.end_date|date:"D d M Y" }} {{ event.end_time|date:"H:i" }}</dd>
-
-                    <dd>&nbsp;</dd>
-
-                    <dt>Event Description</dt>
-                    <dd>{{ event.description|linebreaksbr }}</dd>
-                </dl>
-            </div>
-        </div>
-    </div>
-</div>

RIGS/templates/RIGS/event_detail.html

@@ -11,9 +11,36 @@
             </h1>
     </div>
         <div class="col-sm-12 text-right">
-            {% include 'RIGS/event_detail_buttons.html' %}
+            <div class="btn-group btn-page">
+                <a href="{% url 'event_update' event.pk %}" class="btn btn-default"><span
+                        class="glyphicon glyphicon-edit"></span> <span
+                            class="hidden-xs">Edit</span></a>
+                {% if event.is_rig %}
+                    <a href="{% url 'event_print' event.pk %}" target="_blank" class="btn btn-default"><span
+                            class="glyphicon glyphicon-print"></span> <span
+                            class="hidden-xs">Print</span></a>
+                {% endif %}
+                <a href="{% url 'event_duplicate' event.pk %}" class="btn btn-default" title="Duplicate Rig"><span
+                        class="glyphicon glyphicon-duplicate"></span> <span
+                            class="hidden-xs">Duplicate</span></a>
+                {% if event.is_rig %}
+                    {% if perms.RIGS.add_invoice %}
+                        <a id="invoiceDropdownLabel" href="{% url 'invoice_event' event.pk %}" class="btn
+                        {% if event.invoice and event.invoice.is_closed %}
+                            btn-success
+                        {% elif event.invoice %}
+                            btn-warning
+                        {% else %}
+                            btn-danger
+                        {% endif %}
+                        " title="Invoice Rig"><span
+                                class="glyphicon glyphicon-gbp"></span> 
+                                <span class="hidden-xs">Invoice</span></a>
+                    {% endif %}
+                {% endif %}
+            </div>
         </div>
-
+    
     {% endif %}
     {% if object.is_rig %}
         {# only need contact details for a rig #}
@@ -70,39 +97,6 @@
                     </div>
                 </div>
             {% endif %}
-
-            {% if event.is_rig and event.internal %}
-                <div class="panel panel-default">
-                    <div class="panel-heading">Client Authorisation</div>
-                    <div class="panel-body">
-                        <dl class="dl-horizontal">
-                            <dt>Authorised</dt>
-                            <dd>{{ object.authorised|yesno:"Yes,No" }}</dd>
-
-                            <dt>Authorised by</dt>
-                            <dd>
-                                {%  if object.authorisation %}
-                                    {{ object.authorisation.name }}
-                                    (<a href="mailto:{{ object.authorisation.email }}">{{ object.authorisation.email }}</a>)
-                                {% endif %}
-                            </dd>
-
-                            <dt>Authorised at</dt>
-                            <dd>{{ object.authorisation.last_edited_at }}</dd>
-
-                            <dt>Authorised amount</dt>
-                            <dd>
-                                {% if object.authorisation %}
-                                    £ {{ object.authorisation.amount|floatformat:"2" }}
-                                {% endif %}
-                            </dd>
-
-                            <dt>Requested by</dt>
-                            <dd>{{ object.authorisation.sent_by }}</dd>
-                        </dl>
-                    </div>
-                </div>
-            {% endif %}
         </div>
     {% endif %}
     <div class="col-sm-12 {% if event.is_rig %}col-md-6 col-lg-7{% endif %}">
@@ -181,25 +175,8 @@
                     {% endif %}
 
                     {% if event.is_rig %}
-                        <dd>&nbsp;</dd>
-
-                        {% if object.internal %}
-                            <dt>Authorisation Request</dt>
-                            <dd>{{ object.auth_request_to|yesno:"Yes,No" }}</dd>
-
-                            <dt>By</dt>
-                            <dd>{{ object.auth_request_by }}</dd>
-
-                            <dt>At</dt>
-                            <dd>{{ object.auth_request_at|date:"D d M Y H:i"|default:"" }}</dd>
-
-                            <dt>To</dt>
-                            <dd>{{ object.auth_request_to }}</dd>
-
-                        {% else %}
-                            <dt>PO</dt>
-                            <dd>{{ object.purchase_order }}</dd>
-                        {% endif %}
+                        <dt>PO</dt>
+                        <dd>{{ object.purchase_order }}</dd>
                     {% endif %}
                 </dl>
             </div>
@@ -207,7 +184,34 @@
     </div>
     {% if not request.is_ajax %}
     <div class="col-sm-12 text-right">
-        {% include 'RIGS/event_detail_buttons.html' %}
+        <div class="btn-group btn-page">
+            <a href="{% url 'event_update' event.pk %}" class="btn btn-default"><span
+                    class="glyphicon glyphicon-edit"></span> <span
+                        class="hidden-xs">Edit</span></a>
+            {% if event.is_rig %}
+                <a href="{% url 'event_print' event.pk %}" target="_blank" class="btn btn-default"><span
+                        class="glyphicon glyphicon-print"></span> <span
+                        class="hidden-xs">Print</span></a>
+            {% endif %}
+            <a href="{% url 'event_duplicate' event.pk %}" class="btn btn-default" title="Duplicate Rig"><span
+                    class="glyphicon glyphicon-duplicate"></span> <span
+                        class="hidden-xs">Duplicate</span></a>
+            {% if event.is_rig %}
+                {% if perms.RIGS.add_invoice %}
+                    <a id="invoiceDropdownLabel" href="{% url 'invoice_event' event.pk %}" class="btn
+                    {% if event.invoice and event.invoice.is_closed %}
+                        btn-success
+                    {% elif event.invoice %}
+                        btn-warning
+                    {% else %}
+                        btn-danger
+                    {% endif %}
+                    " title="Invoice Rig"><span
+                            class="glyphicon glyphicon-gbp"></span> 
+                            <span class="hidden-xs">Invoice</span></a>
+                {% endif %}
+            {% endif %}
+        </div>
     </div>
     {% endif %}
     {% if event.is_rig %}
@@ -225,7 +229,34 @@
         </div>
         {% if not request.is_ajax %}
         <div class="col-sm-12 text-right">
-            {% include 'RIGS/event_detail_buttons.html' %}
+            <div class="btn-group btn-page">
+                <a href="{% url 'event_update' event.pk %}" class="btn btn-default"><span
+                        class="glyphicon glyphicon-edit"></span> <span
+                            class="hidden-xs">Edit</span></a>
+                {% if event.is_rig %}
+                    <a href="{% url 'event_print' event.pk %}" target="_blank" class="btn btn-default"><span
+                            class="glyphicon glyphicon-print"></span> <span
+                            class="hidden-xs">Print</span></a>
+                {% endif %}
+                <a href="{% url 'event_duplicate' event.pk %}" class="btn btn-default" title="Duplicate Rig"><span
+                        class="glyphicon glyphicon-duplicate"></span> <span
+                            class="hidden-xs">Duplicate</span></a>
+                {% if event.is_rig %}
+                    {% if perms.RIGS.add_invoice %}
+                        <a id="invoiceDropdownLabel" href="{% url 'invoice_event' event.pk %}" class="btn
+                        {% if event.invoice and event.invoice.is_closed %}
+                            btn-success
+                        {% elif event.invoice %}
+                            btn-warning
+                        {% else %}
+                            btn-danger
+                        {% endif %}
+                        " title="Invoice Rig"><span
+                                class="glyphicon glyphicon-gbp"></span> 
+                                <span class="hidden-xs">Invoice</span></a>
+                    {% endif %}
+                {% endif %}
+            </div>
         </div>
         {% endif %}
     {% endif %}

RIGS/templates/RIGS/event_detail_buttons.html

@@ -1,54 +0,0 @@
-<div class="btn-group btn-page">
-    <a href="{% url 'event_update' event.pk %}" class="btn btn-default"><span
-            class="glyphicon glyphicon-edit"></span> <span
-            class="hidden-xs">Edit</span></a>
-    {% if event.is_rig %}
-        <a href="{% url 'event_print' event.pk %}" target="_blank" class="btn btn-default"><span
-                class="glyphicon glyphicon-print"></span> <span
-                class="hidden-xs">Print</span></a>
-    {% endif %}
-    <a href="{% url 'event_duplicate' event.pk %}" class="btn btn-default" title="Duplicate Rig"><span
-            class="glyphicon glyphicon-duplicate"></span> <span
-            class="hidden-xs">Duplicate</span></a>
-    {% if event.is_rig %}
-        {% if event.internal %}
-            <a class="btn btn-default item-add modal-href event-authorise-request
-                    {% if event.authorised %}
-                        btn-success
-                    {% elif event.authorisation and event.authorisation.amount != event.total and event.authorisation.last_edited_at > event.auth_request_at %}
-                        btn-warning
-                    {% elif event.auth_request_to %}
-                        btn-info
-                    {% endif %}
-                    "
-               href="{% url 'event_authorise_request' object.pk %}">
-                <span class="glyphicon glyphicon-send"></span>
-                <span class="hidden-xs">
-                    {% if event.authorised %}
-                        Authorised
-                    {% elif event.authorisation and event.authorisation.amount != event.total and event.authorisation.last_edited_at > event.auth_request_at %}
-                        Authorisation Issue
-                    {% elif event.auth_request_to %}
-                        Awaiting Authorisation
-                    {% else %}
-                        Request Authorisation
-                    {% endif %}
-                </span>
-            </a>
-        {% endif %}
-
-        {% if perms.RIGS.add_invoice %}
-            <a id="invoiceDropdownLabel" href="{% url 'invoice_event' event.pk %}" class="btn
-                        {% if event.invoice and event.invoice.is_closed %}
-                            btn-success
-                        {% elif event.invoice %}
-                            btn-warning
-                        {% else %}
-                            btn-danger
-                        {% endif %}
-                        " title="Invoice Rig"><span
-                    class="glyphicon glyphicon-gbp"></span>
-                <span class="hidden-xs">Invoice</span></a>
-        {% endif %}
-    {% endif %}
-</div>

RIGS/templates/RIGS/event_form.html

@@ -10,16 +10,12 @@
     <link rel="stylesheet" href="{% static "css/ajax-bootstrap-select.css" %}"/>
 {% endblock %}
 
-{% block preload_js %}
+{% block js %}
     <script src="{% static "js/bootstrap-select.js" %}"></script>
     <script src="{% static "js/ajax-bootstrap-select.js" %}"></script>
-{% endblock %}
 
-{% block js %}
     <script src="//code.jquery.com/ui/1.10.4/jquery-ui.js"></script>
     <script src="{% static "js/interaction.js" %}"></script>
-    <script src="{% static "js/modal.js" %}"></script>
-    <script src="{% static "js/tooltip.js" %}"></script>
 
     <script src="{% static "js/autocompleter.js" %}"></script>
 
@@ -289,10 +285,10 @@
                         <div class="col-sm-8">
                             <div class="row">
                                 <div class="col-sm-12 col-md-7" data-toggle="tooltip" title="Start date for event, required">
-                                    {% render_field form.start_date class+="form-control" %}
+                                    {% render_field form.start_date type="date" class+="form-control" %}
                                 </div>
                                 <div class="col-sm-12 col-md-5" data-toggle="tooltip" title="Start time of event, can be left blank">
-                                    {% render_field form.start_time class+="form-control" %}
+                                    {% render_field form.start_time type="time" class+="form-control" %}
                                 </div>
                             </div>
                         </div>
@@ -304,10 +300,10 @@
                         <div class="col-sm-8">
                             <div class="row">
                                 <div class="col-sm-12 col-md-7" data-toggle="tooltip" title="End date of event, leave blank if unknown or same as start date">
-                                    {% render_field form.end_date class+="form-control" %}
+                                    {% render_field form.end_date type="date" class+="form-control" %}
                                 </div>
                                 <div class="col-sm-12 col-md-5" data-toggle="tooltip" title="End time of event, leave blank if unknown">
-                                    {% render_field form.end_time class+="form-control" %}
+                                    {% render_field form.end_time type="time" class+="form-control" %}
                                 </div>
                             </div>
 
@@ -329,7 +325,7 @@
                                    class="col-sm-4 control-label">{{ form.access_at.label }}</label>
 
                             <div class="col-sm-8">
-                                {% render_field form.access_at class+="form-control" %}
+                                {% render_field form.access_at type="datetime-local" class+="form-control" %}
                             </div>
                         </div>
                         <div class="form-group" data-toggle="tooltip" title="The date/time at which crew should meet for this event">
@@ -337,7 +333,7 @@
                                    class="col-sm-4 control-label">{{ form.meet_at.label }}</label>
 
                             <div class="col-sm-8">
-                                {% render_field form.meet_at class+="form-control" %}
+                                {% render_field form.meet_at type="datetime-local" class+="form-control" %}
                             </div>
                         </div>
                         <div class="form-group">
@@ -398,7 +394,6 @@
                                 {% render_field form.collector class+="form-control" %}
                             </div>
                         </div>
-
                         <div class="form-group" data-toggle="tooltip" title="The purchase order number (for external clients)">
                             <label for="{{ form.purchase_order.id_for_label }}"
                                    class="col-sm-4 control-label">{{ form.purchase_order.label }}</label>

RIGS/templates/RIGS/event_invoice.html

@@ -54,22 +54,20 @@
                         <td><a href="{% url 'event_detail' object.pk %}">N{{ object.pk|stringformat:"05d" }}</a><br>
                             <span class="text-muted">{{ object.get_status_display }}</span></td>
                         <td>{{ object.start_date }}</td>
+                        <td>{{ object.name }}</td>
                         <td>
-                            {{ object.name }}
-                            {% if object.is_rig and perms.RIGS.view_event and object.authorised %}
-                                <span class="glyphicon glyphicon-check"></span>
+                            {% if object.organisation %}
+                                {{ object.organisation.name }}
+                                <br>
+                                <span class="text-muted">{{ object.organisation.union_account|yesno:'Internal,External' }}</span>
+                            {% else %}
+                                {{ object.person.name }}
+                                <br>
+                                <span class="text-muted">External</span>
                             {% endif %}
+
                         </td>
-                        <td>
-                            {{ object.organisation.name }}
-                            <br>
-                            <span class="text-muted">{{ object.internal|yesno:'Internal,External' }}</span>
-                        </td>
-                        <td>
-                            {{ object.sum_total|floatformat:2 }}
-                            <br />
-                            <span class="text-muted">{% if not object.internal %}{{ object.purchase_order }}{% endif %}</span>
-                        </td>
+                        <td>{{ object.sum_total|floatformat:2 }}</td>
                         <td class="text-center">
                             {% if object.mic %}
                                 {{ object.mic.initials }}<br>
@@ -79,10 +77,7 @@
                             {% endif %}
                         </td>
                         <td class="text-right">
-                            <a href="{% url 'invoice_event' object.pk %}"
-                               class="btn btn-default"
-                               data-toggle="tooltip"
-                               title="'Invoice' this event - click this when paperwork has been sent to treasury">
+                            <a href="{% url 'invoice_event' object.pk %}" class="btn btn-default" data-toggle="tooltip" title="'Invoice' this event - click this when paperwork has been sent to treasury">
                                 <span class="glyphicon glyphicon-gbp"></span>
                             </a>
                         </td>
@@ -97,4 +92,4 @@
             </div>
         {% endif %}
     </div>
-{% endblock %}
+{% endblock %}

RIGS/templates/RIGS/event_print.xml

@@ -22,21 +22,21 @@
         <paraStyle name="style.Heading2" fontName="OpenSans-Bold" fontSize="10" spaceAfter="2"/>
         <paraStyle name="style.Heading3" fontName="OpenSans" fontSize="10" spaceAfter="0"/>
         <paraStyle name="center" alignment="center"/>
-        <paraStyle name="page-head" alignment="center" fontName="OpenSans-Bold" fontSize="16" leading="18" spaceAfter="0"/>
+        <paraStyle name="invoice-head" alignment="center" fontName="OpenSans-Bold" fontSize="16" leading="18" spaceAfter="0"/>
 
         <paraStyle name="style.event_description" fontName="OpenSans" textColor="DarkGray" />
         <paraStyle name="style.item_description" fontName="OpenSans" textColor="DarkGray" leftIndent="10" />
         <paraStyle name="style.specific_description" fontName="OpenSans" textColor="DarkGray" fontSize="10" />
         <paraStyle name="style.times" fontName="OpenSans"  fontSize="10" />
-        <paraStyle name="style.head_titles" fontName="OpenSans-Bold" fontSize="10" />
-        <paraStyle name="style.head_numbers" fontName="OpenSans"  fontSize="10" />
+        <paraStyle name="style.invoice_titles" fontName="OpenSans-Bold" fontSize="10" />
+        <paraStyle name="style.invoice_numbers" fontName="OpenSans"  fontSize="10" />
 
         <blockTableStyle id="eventSpecifics">
             <blockValign value="top"/>
              <lineStyle kind="LINEAFTER" colorName="LightGrey" start="0,0" stop="1,0" thickness="1"/> 
         </blockTableStyle>
 
-        <blockTableStyle id="headLayout">
+        <blockTableStyle id="invoiceLayout">
             <blockValign value="top"/>
              
         </blockTableStyle>
@@ -100,11 +100,10 @@
                     
 
                     <setFont name="OpenSans" size="10" />
+                    {% if not invoice %}<drawCenteredString x="302.5" y="50">[{{ copy }} Copy]</drawCenteredString>{% endif %}
                     <drawCenteredString x="302.5" y="38">[Page <pageNumber/> of <getName id="lastPage" default="0" />]</drawCenteredString>
                     <setFont name="OpenSans" size="7" />
-                    <drawCenteredString x="302.5" y="26">
-                        [Paperwork generated{% if current_user %} by {{current_user.name}} |{% endif %} {% now "d/m/Y H:i" %} | {{object.current_version_id}}]
-                    </drawCenteredString>
+                    <drawCenteredString x="302.5" y="26">[Paperwork generated by {{current_user.name}} | {% now "d/m/Y H:i" %} | {{object.current_version_id}}]</drawCenteredString>
                 </pageGraphics>
                 
                 <frame id="main" x1="50" y1="65" width="495" height="645"/>
@@ -116,11 +115,10 @@
                     <image file="RIGS/static/imgs/paperwork/corner-bl.jpg" x="0" y="0" height="200" width="200"/>
                     
                     <setFont name="OpenSans" size="10"/>
+                     {% if not invoice %}<drawCenteredString x="302.5" y="50">[{{ copy }} Copy]</drawCenteredString>{% endif %}
                     <drawCenteredString x="302.5" y="38">[Page <pageNumber/> of <getName id="lastPage" default="0" />]</drawCenteredString>
                     <setFont name="OpenSans" size="7" />
-                    <drawCenteredString x="302.5" y="26">
-                        [Paperwork generated{% if current_user %} by {{current_user.name}} |{% endif %} {% now "d/m/Y H:i" %} | {{object.current_version_id}}]
-                    </drawCenteredString>
+                    <drawCenteredString x="302.5" y="26">[Paperwork generated by {{current_user.name}} | {% now "d/m/Y H:i" %} | {{object.current_version_id}}]</drawCenteredString>
                 </pageGraphics>
                 <frame id="main" x1="50" y1="65" width="495" height="727"/>
             </pageTemplate>
@@ -130,4 +128,4 @@
             {% include "RIGS/event_print_page.xml" %}
     </story>
 
-</document>
+</document>

RIGS/templates/RIGS/event_print_page.xml

@@ -1,70 +1,59 @@
 <setNextFrame name="main"/>
 <nextFrame/>
 
+{% if invoice %}
 
-<blockTable style="headLayout" colWidths="330,165">
+<blockTable style="invoiceLayout" colWidths="330,165">
 <tr>
     <td>
-        <h1><b>N{{ object.pk|stringformat:"05d" }}:</b> '{{ object.name }}'<small></small></h1>
+        {% endif %}
 
-        <para style="style.event_description">
-        <b>{{object.start_date|date:"D jS N Y"}}</b>
+<h1><b>N{{ object.pk|stringformat:"05d" }}:</b> '{{ object.name }}'<small></small></h1>
+
+<para style="style.event_description">
+<b>{{object.start_date|date:"D jS N Y"}}</b>
+</para>
+
+<keepInFrame>
+    <para style="style.event_description">
+    {{ object.description|default_if_none:""|linebreaksbr }}
         </para>
+</keepInFrame>
+
+{% if invoice %}
 
-        <keepInFrame>
-            <para style="style.event_description">
-            {{ object.description|default_if_none:""|linebreaksbr }}
-                </para>
-        </keepInFrame>
     </td>
     <td>
-        {% if invoice %}
-            <para style="page-head">INVOICE</para>
-            <spacer length="10"/>
-            <blockTable style="eventDetails" colWidths="100,175">
-                <tr>
-                    <td><para style="head_titles">Invoice Number</para></td>
-                    <td>
-                        <para style="head_numbers">{{ invoice.pk|stringformat:"05d" }}</para>
-                    </td>
-                </tr>
-                <tr>
-                    <td><para style="head_titles">Invoice Date</para></td>
-                    <td>
-                        <para style="head_numbers">{{ invoice.invoice_date|date:"d/m/Y" }}</para>
-                    </td>
-                </tr>
+        <para style="invoice-head">INVOICE</para>
+        <spacer length="10"/>
+        <blockTable style="eventDetails" colWidths="100,175">
+            <tr>
+                <td><para style="invoice_titles">Invoice Number</para></td>
+                <td>
+                    <para style="invoice_numbers">{{ invoice.pk|stringformat:"05d" }}</para>
+                </td>
+            </tr>
+            <tr>
+                <td><para style="invoice_titles">Invoice Date</para></td>
+                <td>
+                    <para style="invoice_numbers">{{ invoice.invoice_date|date:"d/m/Y" }}</para>
+                </td>
+            </tr>
+            <tr>
+                <td><para style="invoice_titles">PO Number</para></td>
+                <td>
+                    <para style="invoice_numbers">{{ object.purchase_order|default_if_none:"" }}</para>
+                </td>
+            </tr>
 
-            {% if not object.internal %}
-                <tr>
-                    <td><para style="head_titles">PO</para></td>
-                    <td><para style="head_numbers">{{ object.purchase_order }}</para></td>
-                </tr>
-            {% endif %}
-            </blockTable>
-
-        {% elif quote %}
-
-            <para style="page-head">QUOTE</para>
-            <spacer length="10"/>
-            <blockTable style="eventDetails" colWidths="100,175">
-                <tr>
-                    <td><para style="head_titles">Quote Date</para></td>
-                    <td>
-                        <para style="head_numbers">{% now "d/m/Y" %}</para>
-                    </td>
-                </tr>
-            </blockTable>
-
-        {% elif receipt %}
-
-            <para style="page-head">CONFIRMATION</para>
-
-        {% endif %}
+        </blockTable>
     </td>
 </tr>
 </blockTable>
 
+
+{% endif %}
+
 <spacer length="15"/>
 <blockTable style="eventSpecifics" colWidths="165,165,165">
     <tr>
@@ -200,16 +189,16 @@
 <keepTogether>
     <blockTable style="totalTable" colWidths="300,115,80">
     <tr>
-        <td>{% if quote %}VAT Registration Number: 170734807{% endif %}</td>
+        <td>{% if not invoice %}VAT Registration Number: 170734807{% endif %}</td>
         <td>Total (ex. VAT)</td>
         <td>£ {{ object.sum_total|floatformat:2 }}</td>
     </tr>
     <tr>
         <td>
-            {% if quote %}
-                <para>
-                    This quote is valid for 30 days unless otherwise arranged.
-                </para>
+            {% if not invoice %}
+            <para>
+                <b>The full hire fee is payable at least 10 days before the event.</b>
+            </para>
             {% endif %}
         </td>
         <td>VAT @ {{ object.vat_rate.as_percent|floatformat:2 }}%</td>
@@ -217,140 +206,113 @@
     </tr>
     <tr>
         <td>
-            {% if quote %}
-                <para>
-                    <b>The full hire fee is payable at least 10 days before the event.</b>
-                </para>
-            {% endif %}
+             
+            <para>
+                {% if invoice %}
+                    VAT Registration Number: 170734807
+                {% else %}
+                    <b>This contract is not an invoice.</b>
+                {% endif %}
+            </para>
+            
+        </td>
+        <td>
+            <para>
+                <b>Total</b>
+            </para>
+        </td>
+        <td>
+            <para>
+                <b>£ {{ object.total|floatformat:2 }}</b>
+            </para>
         </td>
-        {% if invoice %}
-            <td>Total</td>
-            <td>£ {{ object.total|floatformat:2 }}</td>
-        {% else %}
-            <td>
-                <para>
-                    <b>Total</b>
-                </para>
-            </td>
-            <td>
-                <para>
-                    <b>£ {{ object.total|floatformat:2 }}</b>
-                </para>
-            </td>
-        {% endif %}
     </tr>
     </blockTable>
 </keepTogether>
-
-{% if invoice %}
-    <spacer length="15"/>
+{% if not invoice %}
     <keepTogether>
-    <h2>Payments</h2>
-    <blockTable style="itemTable" colWidths="300,115,80">
-        <tr>
-            <td>
-                <para>
-                    <b>Method</b>
-                </para>
-            </td>
-            <td>
-                <para>
-                    <b>Date</b>
-                </para>
-            </td>
-            <td>
-                <para>
-                    <b>Amount</b>
-                </para>
-            </td>
-        </tr>
-        {% for payment in object.invoice.payment_set.all %}
-            <tr>
-                <td>{{ payment.get_method_display }}</td>
-                <td>{{ payment.date }}</td>
-                <td>£ {{ payment.amount|floatformat:2 }}</td>
-            </tr>
-        {% endfor %}
-    </blockTable>
-    <blockTable style="totalTable" colWidths="300,115,80">
-        <tr>
-            <td></td>
-            <td>Payment Total</td>
-            <td>£ {{ object.invoice.payment_total|floatformat:2 }}</td>
-        </tr>
-        <tr>
-            <td></td>
-            <td>
-                <para>
-                    <b>Balance</b> (ex. VAT)
-                </para>
-            </td>
-            <td>
-                <para>
-                    <b>£ {{ object.invoice.balance|floatformat:2 }}</b>
-                </para>
-            </td>
-        </tr>
-    </blockTable>
-    </keepTogether>
-{% endif %}
-
-<keepTogether>
-    <blockTable style="infoTable">>
-    {% if quote %}
-        <tr><td><spacer length="15" /></td></tr>
-        <tr>
-            <td>
-                {% if object.internal %}
-                    <para>Bookings will
-                        <b>not</b>
-                        be confirmed until the event is authorised online.
-                    </para>
-                {% else %}
-                    <para>Bookings will
-                        <b>not</b>
-                        be confirmed until we have received written confirmation and a Purchase Order.
-                    </para>
-                {% endif %}
-            </td>
-        </tr>
-        <tr>
-            <td>24 Hour Emergency Contacts: 07825 065681 and 07825 065678</td>
-        </tr>
-    {% else %}
-        <tr>
-        <td>
-            <para>VAT Registration Number: 170734807</para>
-        </td>
-        </tr>
-    {% endif %}
-
-    <tr><td><spacer length="15" /></td></tr>
-
+    <blockTable style="infoTable">
     <tr>
         <td>
-            {% if object.internal and object.authorised %}
-                <para>
-                    Event authorised online by {{ object.authorisation.name }} ({{ object.authorisation.email }}) at
-                    {{ object.authorisation.last_edited_at }}.
-                </para>
-
-                <blockTable colWidths="165,165,165">
-                    <tr>
-                        <td><para><b>University ID</b></para></td>
-                        <td><para><b>Account Code</b></para></td>
-                        <td><para><b>Authorised Amount</b></para></td>
-                    </tr>
-                    <tr>
-                        <td>{{ object.authorisation.uni_id }}</td>
-                        <td>{{ object.authorisation.account_code }}</td>
-                        <td>£ {{ object.authorisation.amount|floatformat:2 }}</td>
-                    </tr>
-                </blockTable>
-            {% endif %}
+            <para>Bookings will
+                <b>not</b>
+                be confirmed until payment is received and the contract is signed.
+            </para>
         </td>
     </tr>
+    <tr>
+        <td>24 Hour Emergency Contacts: 07825 065681 and 07825 065678</td>
+    </tr>
     </blockTable>
-</keepTogether>
+    </keepTogether>
+    <spacer length="15"/>
+    <keepTogether>
 
-<namedString id="lastPage"><pageNumber/></namedString>
+    <para style="blockPara">
+    <b>To be signed on booking:</b>
+    </para>
+    {% if object.organisation.union_account %}
+        <para style="blockPara">
+        <i>
+            I agree that am authorised to sign this invoice. I agree that I am the President/Treasurer of the hirer, or
+            that I have provided written permission from either the President or Treasurer of the hirer stating that I can
+            sign for this invoice.
+        </i>
+        </para>
+        <para style="blockPara">
+        <i>
+            I have read, understood and fully accepted the current conditions of hire. I agree to return any dry hire
+            items to TEC PA &amp; Lighting in the same condition at the end of the hire period.
+        </i>
+        </para>
+
+        <para style="blockPara">
+        <b>
+            Conditions of hire attached and available on the TEC PA &amp; Lighting website. E&amp;OE
+        </b>
+        </para>
+
+        <para style="blockPara">
+        Please return this form directly to TEC PA &amp; Lighting and not the Students' Union Finance Department.
+        </para>
+
+        <blockTable style="signatureTable" colWidths="70,100,325">
+        <tr>
+            <td>Account Code</td>
+            <td></td>
+            <td></td>
+        </tr>
+        </blockTable>
+
+    {% else %}
+        <para style="blockPara">
+        <i>
+            I, the hirer, have read, understand and fully accept the current conditions of hire. This document forms a
+            binding contract between TEC PA &amp; Lighting and the hirer, the aforementioned conditions of hire forming
+            an integral part of it.
+        </i>
+        </para>
+
+        <para style="blockPara">
+        <b>
+            Conditions of hire attached and available on the TEC PA &amp; Lighting website. E&amp;OE
+        </b>
+        </para>
+
+        {% include "RIGS/event_print_signature.xml" %}
+        <spacer length="10"/>
+        <para style="blockPara">
+        <b>To be signed on the day of the event/hire:</b>
+        </para>
+        <para style="blockPara">
+        <i>
+            I, the hirer, have received the goods/services as requested and in good order. I agree to return any dry hire
+            items to TEC PA &amp; Lighting in a similar condition at the end of the hire period.
+        </i>
+        </para>
+    {% endif %}
+
+    {% include "RIGS/event_print_signature.xml" %}
+    </keepTogether>
+    {% endif %}
+<namedString id="lastPage"><pageNumber/></namedString>

RIGS/templates/RIGS/event_table.html

@@ -33,18 +33,13 @@
                 </td>
                 <td>
                     <h4>
-                        <a {% if perms.RIGS.view_event %}href="{% url 'event_detail' event.pk %}" {% endif %}>
-                            {{ event.name }}
-                        </a>
+                        <a {% if perms.RIGS.view_event %}href="{% url 'event_detail' event.pk %}" {% endif %}>{{ event.name }}</a>
                         {% if event.venue %}
                             <small>at {{ event.venue }}</small>
                         {% endif %}
                         {% if event.dry_hire %}
                             <span class="label label-default">Dry Hire</span>
                         {% endif %}
-                        {% if event.is_rig and perms.RIGS.view_event and event.authorised %}
-                            <span class="glyphicon glyphicon-check"></span>
-                        {% endif %}
                     </h4>
                     {% if event.is_rig and not event.cancelled %}
                         <h5>
@@ -104,4 +99,4 @@
         {% endfor %}
         </tbody>
     </table>
-</div>
+</div>

RIGS/templates/RIGS/eventauthorisation_client_request.html

@@ -1,41 +0,0 @@
-{% extends 'base_client_email.html' %}
-
-{% block content %}
-    
-    <p>Hi {{ to_name|default:"there" }},</p>
-
-    <p><b>{{ request.user.get_full_name }}</b> has requested that you authorise <b>N{{ object.pk|stringformat:"05d" }}
-        | {{ object.name }}</b>{% if not to_name %} on behalf of <b>{{ object.person.name }}</b>{% endif %}.</p>
-
-    <p>
-        Please find the link below to complete the event booking process.
-        {% if object.event.organisation and object.event.organisation.union_account %}{# internal #}
-            Remember that only Presidents or Treasurers are allowed to sign off payments. You may need to forward
-            this
-            email on.
-        {% endif %}
-    </p>
-
-
-    <table class="button-container" width="100%" border="0" cellspacing="0" cellpadding="0">
-        <tr>
-          <td align="center">
-            <table border="0" cellspacing="0" cellpadding="0">
-              <tr>
-                <td class="button" align="center">
-                  <a href="{{ request.scheme }}://{{ request.get_host }}{% url 'event_authorise' object.pk hmac %}">
-                      Complete Authorisation Form
-                  </a>
-                </td>
-              </tr>
-            </table>
-          </td>
-        </tr>
-      </table>
-
-
-    <p>Your event will not be booked until you complete this form.</p>
-
-    <p>TEC PA &amp; Lighting<br/>
-
-{% endblock %}