From 03d8f6738950b57600eef8406b70eb98cb6cf744 Mon Sep 17 00:00:00 2001 From: David Taylor Date: Tue, 28 Apr 2015 01:27:47 +0100 Subject: [PATCH 1/6] Swapped email/web with phone --- RIGS/templates/RIGS/event_print.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/RIGS/templates/RIGS/event_print.xml b/RIGS/templates/RIGS/event_print.xml index 8afdf11e..03790b13 100644 --- a/RIGS/templates/RIGS/event_print.xml +++ b/RIGS/templates/RIGS/event_print.xml @@ -84,9 +84,9 @@ Portland Building, University Park, Nottingham, NG7 2RD - Phone: (0115) 846 8720 - www.nottinghamtec.co.uk - info@nottinghamtec.co.uk + www.nottinghamtec.co.uk + info@nottinghamtec.co.uk + Phone: (0115) 846 8720 From 5c7d016dda60323b76dba4b1f96646445fb5715a Mon Sep 17 00:00:00 2001 From: David Taylor Date: Tue, 28 Apr 2015 01:29:32 +0100 Subject: [PATCH 2/6] Removed VAT statement --- RIGS/templates/RIGS/event_print_page.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/RIGS/templates/RIGS/event_print_page.xml b/RIGS/templates/RIGS/event_print_page.xml index c5a9486b..7529b113 100644 --- a/RIGS/templates/RIGS/event_print_page.xml +++ b/RIGS/templates/RIGS/event_print_page.xml @@ -128,7 +128,7 @@ - VAT may be charged at the current rate date of event ({{ object.vat_rate.as_percent|floatformat:2 }}%) + Total (ex. VAT) £ {{ object.sum_total|floatformat:2 }} From bd50e65e5b3b3e79ed48dfa29cd3db8b359ec5a3 Mon Sep 17 00:00:00 2001 From: David Taylor Date: Tue, 28 Apr 2015 01:39:50 +0100 Subject: [PATCH 3/6] Fix for edit item table issue on small screens --- RIGS/templates/RIGS/item_table.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/RIGS/templates/RIGS/item_table.html b/RIGS/templates/RIGS/item_table.html index e5b93d91..71e20a5a 100644 --- a/RIGS/templates/RIGS/item_table.html +++ b/RIGS/templates/RIGS/item_table.html @@ -1,4 +1,4 @@ -
+
From 31357c667430524d30212719605516f112561fcb Mon Sep 17 00:00:00 2001 From: Tom Price Date: Thu, 30 Apr 2015 22:52:30 +0100 Subject: [PATCH 4/6] Move to using enviromental variables for important settings. This makes it more difficult to fuck up. --- PyRIGS/settings.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/PyRIGS/settings.py b/PyRIGS/settings.py index 9f78c9cf..8345160c 100644 --- a/PyRIGS/settings.py +++ b/PyRIGS/settings.py @@ -18,10 +18,10 @@ SECURE_PROXY_SSL_HEADER = ('HTTP_X_FORWARDED_PROTO', 'https') # See https://docs.djangoproject.com/en/1.7/howto/deployment/checklist/ # SECURITY WARNING: keep the secret key used in production secret! -SECRET_KEY = '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 = False +DEBUG = bool(int(os.environ.get('DEBUG'))) if os.environ.get('DEBUG') else True TEMPLATE_DEBUG = True From 4169e20c4605819c172933d0fbca22d16545c4d3 Mon Sep 17 00:00:00 2001 From: David Taylor Date: Thu, 30 Apr 2015 22:54:04 +0100 Subject: [PATCH 5/6] Fixed #58 --- RIGS/static/js/autocompleter.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/RIGS/static/js/autocompleter.js b/RIGS/static/js/autocompleter.js index 5e6c5653..3f0a8ef1 100644 --- a/RIGS/static/js/autocompleter.js +++ b/RIGS/static/js/autocompleter.js @@ -25,7 +25,7 @@ function refreshUpdateHref(obj) { // console.log('Trying to disable'); targetObject.attr('disabled', true); } else { - // targetObject.attr('href', update_url); + targetObject.attr('href', update_url); targetObject.attr('disabled', false); } } From f19995bae7b17b9b02a8263df1019a0605bc668a Mon Sep 17 00:00:00 2001 From: David Taylor Date: Thu, 30 Apr 2015 22:59:51 +0100 Subject: [PATCH 6/6] Added save button to bottom of rig edit. Issue #95 --- RIGS/templates/RIGS/event_form.html | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/RIGS/templates/RIGS/event_form.html b/RIGS/templates/RIGS/event_form.html index 132148c8..df975867 100644 --- a/RIGS/templates/RIGS/event_form.html +++ b/RIGS/templates/RIGS/event_form.html @@ -424,6 +424,13 @@ {% include "RIGS/item_table.html" %} +
+
+ +
+