diff --git a/RIGS/rigboard.py b/RIGS/rigboard.py index a6ccde09..d1b17a89 100644 --- a/RIGS/rigboard.py +++ b/RIGS/rigboard.py @@ -14,6 +14,7 @@ from django.db.models import Q from django.contrib import messages from z3c.rml import rml2pdf from PyPDF2 import PdfFileMerger, PdfFileReader +import simplejson from RIGS import models, forms import datetime @@ -46,6 +47,20 @@ class WebCalendar(generic.TemplateView): class EventDetail(generic.DetailView): model = models.Event +class EventOembed(generic.View): + model = models.Event + + def get(self, request, pk=None): + + object = get_object_or_404(self.model, pk=pk) + data = { + 'html': 'this is some html', + 'version': '1.0', + 'type': 'rich', + } + json = simplejson.dumps(data) + return HttpResponse(json, content_type="application/json") + class EventCreate(generic.CreateView): model = models.Event diff --git a/RIGS/urls.py b/RIGS/urls.py index ee949ff8..53bba8da 100644 --- a/RIGS/urls.py +++ b/RIGS/urls.py @@ -82,6 +82,9 @@ urlpatterns = patterns('', url(r'^event/(?P\d+)/$', permission_required_with_403('RIGS.view_event')(rigboard.EventDetail.as_view()), name='event_detail'), + url(r'^event/(?P\d+)/oembed/$', + rigboard.EventOembed.as_view(), + name='event_oembed'), url(r'^event/(?P\d+)/print/$', permission_required_with_403('RIGS.view_event')(rigboard.EventPrint.as_view()), name='event_print'), diff --git a/templates/registration/login.html b/templates/registration/login.html index ace80d16..2b1f1a72 100644 --- a/templates/registration/login.html +++ b/templates/registration/login.html @@ -2,6 +2,14 @@ {% block title %}Login{% endblock %} +{% block extra-head %} + {% if next %} + + {% endif %} +{% endblock %} + {% block content %} {% include 'registration/loginform.html' %} {% endblock %} \ No newline at end of file