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

Made pretty, and made embedding accessible to non-keyholders

Browse Source
This commit is contained in:
David Taylor
2016-10-08 21:38:12 +01:00
parent b93a716a3b
commit 0e72c3f896
5 changed files with 75 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
PyRIGS/decorators.py
View File

@@ -27,7 +27,7 @@ def user_passes_test_with_403(test_func, login_url=None, oembed_view=None):
elif not request.user.is_authenticated(): elif not request.user.is_authenticated():
if oembed_view is not None: if oembed_view is not None:
extra_context = {} extra_context = {}
extra_context['oembed_url'] = request.scheme + '://' + request.META['HTTP_HOST'] + reverse(oembed_view, kwargs=kwargs) extra_context['oembed_url'] = "{0}://{1}{2}".format(request.scheme, request.META['HTTP_HOST'], reverse(oembed_view, kwargs=kwargs))
extra_context['login_url'] = "{0}?{1}={2}".format(login_url, REDIRECT_FIELD_NAME, request.get_full_path()) extra_context['login_url'] = "{0}?{1}={2}".format(login_url, REDIRECT_FIELD_NAME, request.get_full_path())
resp = render_to_response('login_redirect.html', extra_context, context_instance=RequestContext(request)) resp = render_to_response('login_redirect.html', extra_context, context_instance=RequestContext(request))
return resp return resp

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

File diff suppressed because one or more lines are too long

11
RIGS/static/scss/screen.scss
View File

@@ -168,4 +168,15 @@ html.embedded{
padding-left: 20px; padding-left: 20px;
} }
h3{
margin-top:10px;
margin-bottom:10px;
}
p{
margin:2px 0;
}
.event-mic-photo{
max-width: 3em;
}
} }

97
RIGS/templates/RIGS/event_embed.html
View File

@@ -30,69 +30,72 @@
</h3> </h3>
<p> <p>
<strong>{{ object.start_date|date:"D d/m/Y" }}</strong> {{ object.start_date|date:"D d/m/Y" }}
{% if object.end_date and object.end_date != object.start_date %} {% if object.has_start_time %}
&ndash; <strong>{{ object.end_date|date:"D d/m/Y" }}</strong> {{ object.start_time|date:"H:i" }}
{% endif %}
{% if object.end_date or object.has_end_time %}
&ndash;
{% endif %}
{% if object.end_date and object.end_date != object.start_date %}
{{ object.end_date|date:"D d/m/Y" }}
{% endif %}
{% if object.has_end_time %}
{{ object.end_time|date:"H:i" }}
{% endif %} {% endif %}
<span class="text-muted">({{ object.get_status_display }})</span>
</p> </p>
<div class="row">
<div class="col-sm-6">
<p>
<strong>Status:</strong>
{{ object.get_status_display }}
</p>
<p>
{% if object.is_rig %} {% if object.is_rig %}
<h5> <strong>Client:</strong> {{ object.person.name }}
{{ object.person.name }}
{% if object.organisation %} {% if object.organisation %}
for {{ object.organisation.name }} for {{ object.organisation.name }}
{% endif %} {% endif %}
{% if object.dry_hire %}</a><span class="badge">Dry Hire</span>{% endif %} {% if object.dry_hire %}</a><span class="badge">Dry Hire</span>{% endif %}
</h5> {% else %}
<strong>Non-Rig</strong>
{% endif %} {% endif %}
</p>
<p>
<table class="table"> <strong>MIC:</strong>
{% if object.mic %} {% if object.mic %}
<tr> {{object.mic.name}}
<th>MIC</th> {% else %}
<td>{{object.mic.name}}</td> None
</tr>
{% endif %}
{% if object.description %}
<tr>
<th>Description</th>
<td>{{ object.description|linebreaksbr }}</td>
</tr>
{% endif %} {% endif %}
</p>
</div>
<div class="col-sm-6">
{% if object.meet_at %} {% if object.meet_at %}
<tr> <p>
<th>Crew meet</th> <strong>Crew meet:</strong>
<td>{{ object.meet_at|date:"H:i" }} {{ object.meet_at|date:"(Y-m-d)" }}</td> {{ object.meet_at|date:"H:i" }} {{ object.meet_at|date:"(Y-m-d)" }}
</tr> </p>
{% endif %} {% endif %}
{% if object.access_at %} {% if object.access_at %}
<tr> <p>
<th>Access at</th> <strong>Access at:</strong>
<td>{{ object.access_at|date:"H:i" }} {{ object.access_at|date:"(Y-m-d)" }}</td> {{ object.access_at|date:"H:i" }} {{ object.access_at|date:"(Y-m-d)" }}
</tr> </p>
{% 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>
{{ object.end_time|date:"H:i" }}
{{ object.end_date|date:"(Y-m-d)" }}
</td>
</tr>
{% endif %} {% endif %}
<p>
<strong>Last updated:</strong>
{{ object.last_edited_at }} by "{{ object.last_edited_by.initials }}"
</p>
</div>
</div>
{% if object.description %}
<strong>Description: </strong>
{{ object.description|linebreaksbr }}
{% endif %} {% endif %}
</table> </table>
</div> </div>
</div> </div>

2
RIGS/urls.py
View File

@@ -85,7 +85,7 @@ urlpatterns = patterns('',
permission_required_with_403('RIGS.view_event', oembed_view="event_oembed")(rigboard.EventDetail.as_view()), permission_required_with_403('RIGS.view_event', oembed_view="event_oembed")(rigboard.EventDetail.as_view()),
name='event_detail'), name='event_detail'),
url(r'^event/(?P<pk>\d+)/embed/$', url(r'^event/(?P<pk>\d+)/embed/$',
xframe_options_exempt(permission_required_with_403('RIGS.view_event', login_url='/user/login/embed/')(rigboard.EventEmbed.as_view())), xframe_options_exempt(login_required(login_url='/user/login/embed/')(rigboard.EventEmbed.as_view())),
name='event_embed'), name='event_embed'),
url(r'^event/(?P<pk>\d+)/oembed_json/$', url(r'^event/(?P<pk>\d+)/oembed_json/$',
rigboard.EventOembed.as_view(), rigboard.EventOembed.as_view(),