diff --git a/PyRIGS/settings.py b/PyRIGS/settings.py index 54a3d228..20d1ac1f 100644 --- a/PyRIGS/settings.py +++ b/PyRIGS/settings.py @@ -35,6 +35,8 @@ if DEBUG: ALLOWED_HOSTS.append('localhost') ALLOWED_HOSTS.append('example.com') ALLOWED_HOSTS.append('127.0.0.1') + ALLOWED_HOSTS.append('.app.github.dev') + CSRF_TRUSTED_ORIGINS = ALLOWED_HOSTS SECURE_PROXY_SSL_HEADER = ('HTTP_X_FORWARDED_PROTO', 'https') if not DEBUG: diff --git a/RIGS/templates/partials/event_status.html b/RIGS/templates/partials/event_status.html index 7c521de1..55c9192a 100644 --- a/RIGS/templates/partials/event_status.html +++ b/RIGS/templates/partials/event_status.html @@ -1,4 +1,4 @@ -
+
Status: {{ event.get_status_display }} {% if event.is_rig %} {% if event.sum_total > 0 %} diff --git a/RIGS/templates/partials/event_table.html b/RIGS/templates/partials/event_table.html index 4262b58b..ab7c941a 100644 --- a/RIGS/templates/partials/event_table.html +++ b/RIGS/templates/partials/event_table.html @@ -1,105 +1,183 @@ {% load namewithnotes from filters %} {% load markdown_tags %} -
- - - - - - - - - - - {% for event in events %} - - - - - - - - - - - {% empty %} - - - - {% endfor %} - -
#Dates & TimesEvent DetailsMIC
{{ event.display_id }} - {% if not event.cancelled %} - {% if event.meet_at %} - Meet: {{ event.meet_at|date:"D d/m/Y H:i" }} - {% endif %} - {% if event.access_at %} -
Access: {{ event.access_at|date:"D d/m/Y H:i" }} - {% endif %} - {% endif %} - Start: {{ event.start_date|date:"D d/m/Y" }} - {% if event.has_start_time %} - {{ event.start_time|date:"H:i" }} - {% endif %} - - {% if event.end_date %} -
- End: {% if event.end_date != event.start_date %}{{ event.end_date|date:"D d/m/Y" }}{% endif %} - {% if event.has_end_time %} - {{ event.end_time|date:"H:i" }} - {% endif %} - - {% endif %} - 		-

- - {{ event.name }} - - {% if event.venue %} - at {{ event.venue|namewithnotes:'venue_detail' }} - {% endif %} - {% if event.dry_hire %} - Dry Hire - {% endif %} -

- {% if event.is_rig and not event.cancelled %} -
- {{ event.person.name }} - {% if event.organisation %} - for {{ event.organisation.name }} - {% endif %} -
- {% endif %} - {% if not event.cancelled and event.description %} -

{{ event.description|markdown }}

- {% endif %} - {% include 'partials/event_status.html' %} - 		- {% if event.mic %} - {% if perms.RIGS.view_profile %} - - {% endif %} - - {{ event.mic }} - {% if perms.RIGS.view_profile %} - - {% endif %} - {% elif event.is_rig %} - - {% endif %} -
No events found
+ +
+
+
#
+
Dates & Times
+
Event Details
+
MIC
+
+ {% for event in events %} +
+ +
{{ event.display_id }}
+ +
+
+ {% if not event.cancelled %} + {% if event.meet_at %} +
Meet:
+
{{ event.meet_at|date:"D d/m/Y H:i" }}
+ {% endif %} + {% if event.access_at %} +
Access:
+
{{ event.access_at|date:"D d/m/Y H:i" }}
+ {% endif %} + {% endif %} +
Start:
+
{{ event.start_date|date:"D d/m/Y" }} + {% if event.has_start_time %} + {{ event.start_time|date:"H:i" }} + {% endif %} +
+ {% if event.end_date %} +
End:
+
{{ event.end_date|date:"D d/m/Y" }} + {% if event.has_end_time %} + {{ event.end_time|date:"H:i" }} + {% endif %} +
+ {% endif %} +
+
+ +
+

+ + {{ event }}{{ event.name }} + + {% if event.dry_hire %} + Dry Hire + {% endif %} +
+ {% if event.venue %} + at {{ event.venue|namewithnotes:'venue_detail' }} + {% endif %} +

+ {% if event.is_rig and not event.cancelled %} +
+ {{ event.person.name }} + {% if event.organisation %} + for {{ event.organisation.name }} + {% endif %} +
+ {% endif %} + {% if not event.cancelled and event.description %} +

{{ event.description|markdown }}

+ {% endif %} +
+ {% include 'partials/event_status.html' %} + +
+ MIC: + {% if event.mic %} + {% if perms.RIGS.view_profile %} + + {% endif %} + + {{ event.mic }} + {% if perms.RIGS.view_profile %} + + {% endif %} + {% elif event.is_rig %} + + {% endif %} +
+
+{% endfor %}
diff --git a/RIGS/templates/rigboard.html b/RIGS/templates/rigboard.html index 0a894389..979d8e34 100644 --- a/RIGS/templates/rigboard.html +++ b/RIGS/templates/rigboard.html @@ -3,8 +3,8 @@ {% block content %}
-
- Key: ReadyAction RequiredNeeds MICCancelledNon-Rig +
+ Key: ReadyAction RequiredNeeds MICCancelledNon-Rig
{% if perms.RIGS.add_event %}
diff --git a/app.json b/app.json index 500721ae..47bfc025 100644 --- a/app.json +++ b/app.json @@ -4,7 +4,7 @@ "scripts": { "postdeploy": "python manage.py migrate && python manage.py generateSampleData" }, - "stack": "heroku-20", + "stack": "heroku-22", "env": { "DEBUG": { "required": true @@ -51,7 +51,7 @@ "url": "heroku/nodejs" }, { - "url": "https://github.com/nottinghamtec/heroku-buildpack-python" + "url": "heroku/python" } ] } diff --git a/gulpfile.js b/gulpfile.js index 9d770813..9c273f17 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -79,7 +79,7 @@ function browserSync(done) { spawn('python', ['manage.py', 'runserver'], {stdio: 'inherit'}); // TODO Wait for Django server to come up before browsersync, it seems inconsistent browsersync.init({ - notify: false, + notify: true, open: false, port: 8001, proxy: '127.0.0.1:8000' diff --git a/pipeline/source_assets/scss/dark_screen.scss b/pipeline/source_assets/scss/dark_screen.scss index 0b276bf6..8cf1f7e7 100644 --- a/pipeline/source_assets/scss/dark_screen.scss +++ b/pipeline/source_assets/scss/dark_screen.scss @@ -77,17 +77,8 @@ border-collapse: separate !important; border-spacing: 0; } - #event_table tr th { - border-right: 0 !important; - } - #event_table tr td { - border-left: 0 !important; - } - #event_table tr td:not(:last-child) { - border-right: 0 !important; - } @each $color, $value in $theme-colors { - .table-#{$color} { + table.table-#{$color} { > td,th { border: 0.3em solid theme-color-level($color, -6) !important; } @@ -96,6 +87,11 @@ background-color: #222 !important; } } + #event_row.table-#{$color} { + border: 0.3em solid theme-color-level($color, -6) !important; + background-color: #222 !important; + color: white !important; + } } del { color: black; @@ -156,4 +152,7 @@ .modal { overflow-y: auto !important; //Bootstrap Dark Theme overrides this to none for some insane reason so we need to change it back } + .text-muted { + color: #c9c9c9 !important; + } }