Skip to content

Commit e436235

Browse files
Content updates for panaroma and circumat
1 parent 76b875c commit e436235

20 files changed

+8327
-7
lines changed

circumat/urls.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
urlpatterns = [
66
url(r'^$', views.home_page, name='home-page'),
77
url(r'^edu/$', views.edu_page, name='educational-materials'),
8+
url(r'^match-making/$', views.matchmaking_page, name='match-making'),
89
url(r'^online-tools/$', views.online_tools, name='onlineTools'),
910
url(r'^online-databases/$', views.online_databases, name='onlineDatabases'),
1011
url(r'^project-summary/$', views.project_summary, name='projectSummary'),

circumat/views.py

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,11 @@ def edu_page(request):
1616
return render(request, 'circumat/educational-materials.html', context_dict)
1717

1818

19+
def matchmaking_page(request):
20+
context_dict = {}
21+
return render(request, 'circumat/matchmaking-tool.html', context_dict)
22+
23+
1924
def online_tools(request):
2025
context_dict = {}
2126
return render(request, 'circumat/online-tools.html', context_dict)

panorama/urls.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,5 @@
77
url(r'^contact/$', views.contact, name='panorama_contact'),
88
url(r'^methods/$', views.methods, name='panorama_methods'),
99
url(r'^edu/mfa/$', views.mfa, name='panorama_mfa'),
10+
url(r'^edu/ss/$', views.school, name='panorama_ss'),
1011
]

panorama/views.py

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,4 +22,8 @@ def methods(request):
2222

2323

2424
def mfa(request):
25-
return render(request, 'panorama/mfa.html')
25+
return render(request, 'panorama/mfa.html')
26+
27+
28+
def school(request):
29+
return render(request, 'panorama/summerschool.html')
6.6 MB
Binary file not shown.
Binary file not shown.
Binary file not shown.

static_assets/img/circumat_matchmaking.svg

Lines changed: 7947 additions & 0 deletions
Loading
Binary file not shown.

0 commit comments

Comments
 (0)