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

Merge branch 'master' into timezone-fixes

Browse Source
This commit is contained in:
Tom Price
2015-05-18 14:22:15 +01:00
parent 61b2a9e7ad c940b4276e
commit a02c4034f8
6 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
PyRIGS/settings.py
View File

@@ -18,10 +18,10 @@ SECURE_PROXY_SSL_HEADER = ('HTTP_X_FORWARDED_PROTO', 'https')
# See https://docs.djangoproject.com/en/1.7/howto/deployment/checklist/ # See https://docs.djangoproject.com/en/1.7/howto/deployment/checklist/
# SECURITY WARNING: keep the secret key used in production secret! # 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! # 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 TEMPLATE_DEBUG = True

2
RIGS/static/js/autocompleter.js
View File

@@ -25,7 +25,7 @@ function refreshUpdateHref(obj) {
// console.log('Trying to disable'); // console.log('Trying to disable');
targetObject.attr('disabled', true); targetObject.attr('disabled', true);
} else { } else {
// targetObject.attr('href', update_url); targetObject.attr('href', update_url);
targetObject.attr('disabled', false); targetObject.attr('disabled', false);
} }
} }

7
RIGS/templates/RIGS/event_form.html
View File

@@ -424,6 +424,13 @@
{% include "RIGS/item_table.html" %} {% include "RIGS/item_table.html" %}
</div> </div>
</div> </div>
<div class="col-sm-12 text-right">
<div class="btn-group btn-page">
<button type="submit" class="btn btn-default" title="Save"><span
class="glyphicon glyphicon-floppy-disk"></span>
</button>
</div>
</div>
</div> </div>
</form> </form>

6
RIGS/templates/RIGS/event_print.xml
View File

@@ -84,9 +84,9 @@
<setFont name="OpenSans" size="9"/> <setFont name="OpenSans" size="9"/>
<drawString x="137" y="760">Portland Building, University Park, Nottingham, NG7 2RD</drawString> <drawString x="137" y="760">Portland Building, University Park, Nottingham, NG7 2RD</drawString>
<drawString x="137" y="746">Phone: (0115) 846 8720</drawString> <drawString x="137" y="746">www.nottinghamtec.co.uk</drawString>
<drawString x="137" y="732">www.nottinghamtec.co.uk</drawString> <drawString x="265" y="746">info@nottinghamtec.co.uk</drawString>
<drawString x="265" y="732">info@nottinghamtec.co.uk</drawString> <drawString x="137" y="732">Phone: (0115) 846 8720</drawString>

2
RIGS/templates/RIGS/event_print_page.xml
View File

@@ -128,7 +128,7 @@
<keepTogether> <keepTogether>
<blockTable style="totalTable" colWidths="300,115,80"> <blockTable style="totalTable" colWidths="300,115,80">
<tr> <tr>
<td>VAT may be charged at the current rate date of event ({{ object.vat_rate.as_percent|floatformat:2 }}%)</td> <td></td>
<td>Total (ex. VAT)</td> <td>Total (ex. VAT)</td>
<td>£ {{ object.sum_total|floatformat:2 }}</td> <td>£ {{ object.sum_total|floatformat:2 }}</td>
</tr> </tr>

2
RIGS/templates/RIGS/item_table.html
View File

@@ -1,4 +1,4 @@
<div class="panel"> <div class="panel table-responsive">
<table class="table table-hover" id="item-table" {% if edit %}data-orderurl="{#% url 'item_order' %#}"{% endif %}> <table class="table table-hover" id="item-table" {% if edit %}data-orderurl="{#% url 'item_order' %#}"{% endif %}>
<thead> <thead>
<tr> <tr>