Skip to content

Loading…

Issue #5: Add a basic calendar to a new page under /events/ #28

Merged
merged 1 commit into from

1 participant

@rogerskw

No description provided.

@rogerskw rogerskw merged commit 60d0ddb into master
@rogerskw rogerskw deleted the iss5 branch
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Showing with 21 additions and 1 deletion.
  1. +1 −1 ThetaTauMiami/urls.py
  2. +14 −0 marketing/templates/calendar.html
  3. +6 −0 marketing/views.py
View
2 ThetaTauMiami/urls.py
@@ -11,7 +11,7 @@
url(r'^default/$', 'marketing.views.index'),
url(r'^contact/$', 'marketing.views.contact'),
url(r'^tools/$', 'marketing.views.upcoming_page'),
- url(r'^events/$', 'marketing.views.upcoming_page'),
+ url(r'^events/$', 'marketing.views.calendar'),
url(r'^info/', include('info.urls')),
url(r'^articles/', include('articles.urls')),
url(r'^admin/', include(admin.site.urls)),
View
14 marketing/templates/calendar.html
@@ -0,0 +1,14 @@
+{% extends "base.html" %}
+
+{% block title %} ΘΤ | Calendar{% endblock %}
+
+{% block content %}
+
+ <div class="container">
+
+ <iframe src="https://www.google.com/calendar/embed?showTitle=0&amp;showNav=0&amp;showPrint=0&amp;showTabs=0&amp;showCalendars=0&amp;showTz=0&amp;height=600&amp;wkst=1&amp;bgcolor=%23FFFFFF&amp;src=thetatau%40miamioh.edu&amp;color=%236B3304&amp;ctz=America%2FNew_York" style=" border-width:0 " width="800" height="600" frameborder="0" scrolling="no
+
+ </div><!-- /.container -->
+
+{% endblock %}
+
View
6 marketing/views.py
@@ -37,4 +37,10 @@ def splash(request):
def greetings(request):
return HttpResponseRedirect('/default/')
+
+def calendar(request):
+ t = loader.get_template('calendar.html')
+ c = Context({})
+ return HttpResponse(t.render(c))
+
Something went wrong with that request. Please try again.