Skip to content
This repository was archived by the owner on Jan 13, 2019. It is now read-only.

event calendar #60

Open
mikemurph wants to merge 1 commit into
base: master
Choose a base branch
from
Open

event calendar #60

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 38 additions & 0 deletions website/templates/website/event_calendar.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
{% extends "website/header_footer.html" %}
{% load staticfiles %}
{% load filters %}
{% block javascript %}

<link rel="shortcut icon" href="{% static "website/favicon.ico" %}" type="image/x-icon">
<link rel=icon href="{% static "website/favicon.ico" %}" type="image/x-icon">
<link rel="stylesheet" href="{% static "website/css/temp-interview.css" %}" type="text/css" media="screen" />
<link rel="stylesheet" href="{% static "website/css/interview.css" %}" type="text/css" media="screen" />

<script src="{% static "website/js/jquery_1.11.0.min.js" %}"></script>
<script src="{% static "website/js/modernizr_custom_79639.js" %}"></script>
<script src="{% static "website/js/ba_cond.min.js" %}"></script>
<script src="{% static "website/js/landingpage_banner_custom.js" %}"></script>
<script src="{% static "website/js/landingpage_main_custom.js" %}"></script>
<script src="{% static "website/js/isotope.min.js" %}"></script>
{% endblock %}
{% block content %}
<!-- MAIN -->
<div id="main-wrapper">
<div id="main-inner-wrapper">
<div class="oh-wrapper">
<header class="oh-title">Events Calendar</header>
<div class="interview-faq">
<p>Make sure to be logged into your berkeley email otherwise nothing will show up on this page.</p>
</div>
<div class="main-content-wrapper">

<iframe src="https://calendar.google.com/calendar/embed?title=UPE%20Events%20Calendar&amp;height=600&amp;wkst=1&amp;bgcolor=%23ffffff&amp;src=ll32ib6oleqdfh228sdejng8ak%40group.calendar.google.com&amp;color=%232952A3&amp;ctz=America%2FLos_Angeles" style="border: 10; width: 95%; height: 700px; margin: 30px auto 0; padding: 0% 2.5%;" frameborder="" scrolling="no"
></iframe>
</div>

</div>
</div>
</div>
<!-- ENDS MAIN -->

{% endblock %}
4 changes: 4 additions & 0 deletions website/templates/website/header_footer.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,10 @@
</ul>

</li>
<li class="header-section">
<a href="/event_calendar">Events Calendar</a>

</li>
</ul>
</div>
<!-- MENU -->
Expand Down
1 change: 1 addition & 0 deletions website/urls.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@

url(r'^$', 'website.views.index', name='index'),
url(r'^oh/$', 'website.views.oh', name='oh'),
url(r'^event_calendar/$', 'website.views.event_calendar', name='event_calendar'),
url(r'^ir/$', 'website.views.ir', name= 'ir'),
url(r'^bookinterview/(?P<slot_id>[a-z]+[0-9]+)/$', 'website.views.book_interview', name='book_interview'),
url(r'^interview/$', 'website.views.interview', name='interview'),
Expand Down
3 changes: 3 additions & 0 deletions website/views.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,9 @@ def oh(request):

def ir(request):
return render(request, 'website/ir.html', {})

def event_calendar(request):
return render(request, 'website/event_calendar.html', {})
"""
def interview(request):
time_dict = {9: "9:00am - 10:00am", 10: "10:00am - 11:00am", 11: "11:00am - 12:00pm", 12: "12:00pm - 1:00pm", 13: "1:00pm - 2:00pm",
Expand Down