Lots of tidying up, moved inline CSS into SCSS

This commit is contained in:
David Taylor
2016-10-08 19:32:45 +01:00
parent ac7e85c24a
commit 008edd8bee
7 changed files with 116 additions and 122 deletions

File diff suppressed because one or more lines are too long

View File

@@ -147,3 +147,25 @@ ins {
};
}
}
html.embedded{
min-height:100%;
body{
min-height:100%;
padding:0;
}
.embed_container{
border:5px solid #e9e9e9;
padding-top:12px;
min-height:100%;
width:100%;
}
.source{
background: url('/static/imgs/pyrigs-avatar.png') no-repeat;
background-size: 16px 16px;
padding-left: 20px;
}
}

View File

@@ -3,100 +3,87 @@
{% block content %}
<style>
.source{
background: url({% static "imgs/pyrigs-avatar.png" %}) no-repeat;
background-size: 16px 16px;
padding-left: 20px;
}
<div class="row">
<div class="col-sm-12">
<span class="source"> R<small>ig</small> I<small>nformation</small> G<small>athering</small> S<small>ystem</small></span>
</div>
</style>
<div class="row">
<div class="col-sm-12">
<span class="source"> R<small>ig</small> I<small>nformation</small> G<small>athering</small> S<small>ystem</small></span>
</div>
<div class="col-sm-12">
<span class="pull-right">
{% if object.mic %}
<div class="text-center">
{{ object.mic.initials }}<br/>
<img src="{{ object.mic.profile_picture }}" class="event-mic-photo"/>
</div>
{% elif object.is_rig %}
<span class="glyphicon glyphicon-exclamation-sign"></span>
<div class="col-sm-12">
<span class="pull-right">
{% if object.mic %}
<div class="text-center">
{{ object.mic.initials }}<br/>
<img src="{{ object.mic.profile_picture }}" class="event-mic-photo"/>
</div>
{% elif object.is_rig %}
<span class="glyphicon glyphicon-exclamation-sign"></span>
{% endif %}
</span>
<h3>
<a {% if perms.RIGS.view_event %}href="{% url 'event_detail' object.pk %}" target="_top"{% endif %}>
{% if object.is_rig %}N{{ object.pk|stringformat:"05d" }}{% else %}{{ object.pk }}{% endif %}
| {{ object.name }} </a>
{% if object.venue %}
<small>at {{ object.venue }}</small>
{% endif %}
</span>
<h3>
<a {% if perms.RIGS.view_event %}href="{% url 'event_detail' object.pk %}" target="_top"{% endif %}>
{% if object.is_rig %}N{{ object.pk|stringformat:"05d" }}{% else %}{{ object.pk }}{% endif %}
| {{ object.name }} </a>
{% if object.venue %}
<small>at {{ object.venue }}</small>
{% endif %}
</h3>
<p>
<strong>{{ object.start_date|date:"D d/m/Y" }}</strong>
{% if object.end_date and object.end_date != object.start_date %}
&ndash; <strong>{{ object.end_date|date:"D d/m/Y" }}</strong>
{% endif %}
<span class="text-muted">({{ object.get_status_display }})</span>
</p>
</h3>
<p>
<strong>{{ object.start_date|date:"D d/m/Y" }}</strong>
{% if object.end_date and object.end_date != object.start_date %}
&ndash; <strong>{{ object.end_date|date:"D d/m/Y" }}</strong>
{% endif %}
<span class="text-muted">({{ object.get_status_display }})</span>
</p>
{% if object.is_rig %}
<h5>
{{ object.person.name }}
{% if object.organisation %}
for {{ object.organisation.name }}
{% endif %}
{% if object.dry_hire %}</a><span class="badge">Dry Hire</span>{% endif %}
</h5>
{% if object.is_rig %}
<h5>
{{ object.person.name }}
{% if object.organisation %}
for {{ object.organisation.name }}
{% endif %}
{% if object.dry_hire %}</a><span class="badge">Dry Hire</span>{% endif %}
</h5>
{% endif %}
<table class="table">
{% if object.mic %}
<tr>
<th>MIC</th>
<td>{{object.mic.name}}</td>
</tr>
{% endif %}
{% if object.description %}
<tr>
<th>Description</th>
<td>{{ object.description|linebreaksbr }}</td>
</tr>
{% endif %}
{% if object.meet_at %}
<tr>
<th>Crew meet</th>
<td>{{ object.meet_at|date:"H:i" }} {{ object.meet_at|date:"(Y-m-d)" }}</td>
</tr>
{% endif %}
{% if object.access_at %}
<tr>
<th>Access at</th>
<td>{{ object.access_at|date:"H:i" }} {{ object.access_at|date:"(Y-m-d)" }}</td>
</tr>
{% endif %}
{% if object.has_start_time %}
<tr>
<th>Event starts</th>
<td>
{{ object.start_time|date:"H:i" }}
{{ object.start_date|date:"(Y-m-d)" }}<br/>
</td>
</tr>
{% endif %}
{% if object.has_end_time%}{% if object.start_date != object.end_date or object.start_time != object.end_time %}
<table class="table">
{% if object.mic %}
<tr>
<th>MIC</th>
<td>{{object.mic.name}}</td>
</tr>
{% endif %}
{% if object.description %}
<tr>
<th>Description</th>
<td>{{ object.description|linebreaksbr }}</td>
</tr>
{% endif %}
{% if object.meet_at %}
<tr>
<th>Crew meet</th>
<td>{{ object.meet_at|date:"H:i" }} {{ object.meet_at|date:"(Y-m-d)" }}</td>
</tr>
{% endif %}
{% if object.access_at %}
<tr>
<th>Access at</th>
<td>{{ object.access_at|date:"H:i" }} {{ object.access_at|date:"(Y-m-d)" }}</td>
</tr>
{% endif %}
{% if object.has_start_time %}
<tr>
<th>Event starts</th>
<td>
{{ object.start_time|date:"H:i" }}
{{ object.start_date|date:"(Y-m-d)" }}<br/>
</td>
</tr>
{% endif %}
{% if object.has_end_time%}
{% if object.start_date != object.end_date or object.start_time != object.end_time %}
<tr>
<th>Event ends</th>
<td>
@@ -104,10 +91,11 @@
{{ object.end_date|date:"(Y-m-d)" }}
</td>
</tr>
{% endif %}{% endif %}
</table>
</div>
</div>
{% endif %}
{% endif %}
</table>
</div>
</div>
{% endblock %}