arona/PyRIGS
1
0
Fork 0
mirror of https://github.com/nottinghamtec/PyRIGS.git synced 2026-02-10 08:39:41 +00:00
Code Issues Projects Releases Wiki Activity

Kill off excess whitespace on rigboard

Browse Source
This commit is contained in:
FreneticScribbler
2020-10-06 16:34:36 +01:00
parent 2f8e09906b
commit 350a301b36
5 changed files with 163 additions and 201 deletions
Download Patch File Download Diff File Expand all files Collapse all files

92
RIGS/static/css/dark_screen.css
View File

File diff suppressed because one or more lines are too long

182
RIGS/static/css/screen.css
View File

File diff suppressed because one or more lines are too long

2
RIGS/static/scss/_custom-variables.scss
View File

@@ -1,6 +1,6 @@
$font-family-sans-serif: "Open Sans", sans-serif; $font-family-sans-serif: "Open Sans", sans-serif;
//Make it look less primary school //Make it look less primary school
$font-size-base: 0.8rem; $font-size-base: 0.85rem;
$theme-colors: ( $theme-colors: (
"success": #5cb85c, "success": #5cb85c,
"warning": #f0ad4e, "warning": #f0ad4e,

47
RIGS/templates/event_table.html
View File

@@ -4,7 +4,7 @@
<thead> <thead>
<tr> <tr>
<th scope="col">#</th> <th scope="col">#</th>
<th scope="col">Event Date</th> <th scope="col">Dates & Times</th>
<th scope="col">Event Details</th> <th scope="col">Event Details</th>
<th scope="col">MIC</th> <th scope="col">MIC</th>
</tr> </tr>
@@ -15,25 +15,32 @@
<!---Number--> <!---Number-->
<th scope="row" id="event_number">{{ event.display_id }}</th> <th scope="row" id="event_number">{{ event.display_id }}</th>
<!--Dates & Times--> <!--Dates & Times-->
<td id="event_dates"> <td id="event_dates" class="text-nowrap">
<div><strong>{{ event.start_date|date:"D d/m/Y" }}</strong></div> <div>Start: <strong>{{ event.start_date|date:"D d/m/Y" }}</strong>
{% if event.has_start_time %} {% if event.has_start_time %}
<p>Start Time: {{ event.start_time|date:"H:i" }}</p> {{ event.start_time|date:"H:i" }}</div>
{% else %}
</div>
{% endif %} {% endif %}
{% if event.end_date and event.end_date != event.start_date %} {% if event.end_date and event.end_date != event.start_date %}
<div><strong>{{ event.end_date|date:"D d/m/Y" }}</strong></div> <div>End: <strong>{{ event.end_date|date:"D d/m/Y" }}</strong>
{% if event.has_end_time%} {% if event.has_end_time %}
<p>End Time: {{ event.end_time|date:"H:i" }}</p> {{ event.end_time|date:"H:i" }}</div>
{% else %}
</div>
{% endif %} {% endif %}
{% endif %} {% endif %}
{% if not event.cancelled %} {% if not event.cancelled %}
{% if event.meet_at %} {% if event.meet_at %}
<p>Crew meet: {{ event.meet_at|date:"H:i" }} {{ event.meet_at|date:"(Y-m-d)" }}</p> <div>Crew meet: {{ event.meet_at|date:"H:i" }} {{ event.meet_at|date:"(d/m/Y)" }}</div>
{% endif %}
{% if event.access_at %}
<div>Access at: {{ event.access_at|date:"H:i" }} {{ event.access_at|date:"(d/m/Y)" }}</div>
{% endif %} {% endif %}
{% endif %} {% endif %}
</td> </td>
<!---Details--> <!---Details-->
<td id="event_details"> <td id="event_details" class="w-100">
<h4> <h4>
<a href="{% url 'event_detail' event.pk %}"> <a href="{% url 'event_detail' event.pk %}">
{{ event.name }} {{ event.name }}
@@ -59,20 +66,16 @@
{% include 'partials/event_status.html' %} {% include 'partials/event_status.html' %}
</td> </td>
<!---MIC--> <!---MIC-->
<td id="event_mic"> <td id="event_mic" class="text-nowrap">
{% if event.mic %} {% if event.mic %}
<div class="media"> {% if perms.RIGS.view_profile %}
{% if perms.RIGS.view_profile %} <a href="{% url 'profile_detail' event.mic.pk %}" class="modal-href">
<a href="{% url 'profile_detail' event.mic.pk %}" class="modal-href"> {% endif %}
{% endif %} <img src="{{ event.mic.profile_picture }}" class="event-mic-photo"/>
<img src="{{ event.mic.profile_picture }}" class="event-mic-photo mr-3"/> {{ event.mic }}
{% if perms.RIGS.view_profile %} {% if perms.RIGS.view_profile %}
</a> </a>
{% endif %} {% endif %}
<div class="media-body">
<p>{{ event.mic.initials }}</p>
</div>
</div>
{% elif event.is_rig %} {% elif event.is_rig %}
<span class="fas fa-exclamation"></span> <span class="fas fa-exclamation"></span>
{% endif %} {% endif %}

41
RIGS/templates/event_table_mobile.html
View File

@@ -1,41 +0,0 @@
<div class="card">
{% for event in events %}
<div class="card-header {% if event.cancelled %}
text-muted bg-secondary
{% elif event.authorised and event.risk_assessment_edit_url and event.mic %}
bg-success
{% elif not event.is_rig %}
bg-info
{% else %}
bg-warning
{% endif %}
">
<a href="{% url 'event_detail' event.pk %}">{{ event.pk }} | {{ event.name }}</a>
{% if event.dry_hire %}
<span class="badge badge-pill badge-secondary">Dry Hire</span>
{% endif %}
</div>
<div class="card-body">
{% include 'partials/event_status.html' %}
<h6 class="pt-2"><strong>{{ event.start_date|date:"D d/m/Y" }}</strong>
{% if event.end_date and event.end_date != event.start_date %}
<strong>⁠– {{ event.end_date|date:"D d/m/Y" }}</strong></h4>
{% else %}
</h6>
{% endif %}
<ul class="list-group list-group-flush pb-3">
<li class="list-group-item">Venue: {{ event.venue }}</li>
<li class="list-group-item">Client: {{ event.person }}</li>
<li class="list-group-item">Organisation: {{ event.organisation }}</li>
</ul>
{% if not event.cancelled and event.description %}
<p>{{ event.description|linebreaksbr }}</p>
{% endif %}
</div>
<div class="card-footer">MIC: {% if event.mic %}<p>{{ event.mic.initials }}</p>{% elif event.is_rig %}<i class="fas fa-exclamation"></i>{% endif %}</div>
{% empty %}
<div class="card-body bg-warning">
<p>No events found</p>
</div>
{% endfor %}
</div>