From e14e1a99635225ebe38a114808f2d55d374005b8 Mon Sep 17 00:00:00 2001 From: Henrik Levkowetz Date: Tue, 19 Jul 2016 16:50:53 +0000 Subject: [PATCH] Merged in [11712] from rjsparks@nostrum.com: Additional tweaks related to #1984. - Legacy-Id: 11718 Note: SVN reference [11712] has been migrated to Git commit 4226ee4980e8ca66d4a4cefacf63d1f0b58b7b40 --- ietf/meeting/urls.py | 28 +++++++++++++-------------- ietf/templates/meeting/week-view.html | 4 ++-- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/ietf/meeting/urls.py b/ietf/meeting/urls.py index dc227ddf8..5cee0de7b 100644 --- a/ietf/meeting/urls.py +++ b/ietf/meeting/urls.py @@ -7,7 +7,7 @@ from ietf.meeting import views from ietf.meeting import ajax safe_for_all_meeting_types = [ - url(r'^session/(?P[-a-z0-9]+)/$', views.session_details), + url(r'^session/(?P[-a-z0-9]+)/?$', views.session_details), url(r'^session/(?P\d+)/drafts$', views.add_session_drafts), ] @@ -64,25 +64,25 @@ type_ietf_only_patterns_id_optional = [ url(r'^floor-plan/?$', views.floor_plan), url(r'^floor-plan/(?P[-a-z0-9_]+)/?$', views.floor_plan), url(r'^week-view(?:.html)?/?$', views.week_view), - url(r'^room-view(?:.html)?/$', views.room_view), - url(r'^materials(?:.html)?/$', views.materials), - url(r'^proceedings(?:.html)?/$', views.proceedings), + url(r'^room-view(?:.html)?/?$', views.room_view), + url(r'^materials(?:.html)?/?$', views.materials), + url(r'^proceedings(?:.html)?/?$', views.proceedings), ] urlpatterns = [ # First patterns which start with unique strings url(r'^$', views.current_materials), - url(r'^ajax/get-utc/$', views.ajax_get_utc), - url(r'^interim/announce/$', views.interim_announce), - url(r'^interim/announce/(?P[A-Za-z0-9._+-]+)/$', views.interim_send_announcement), - url(r'^interim/request/$', views.interim_request), - url(r'^interim/request/(?P[A-Za-z0-9._+-]+)/$', views.interim_request_details), - url(r'^interim/request/(?P[A-Za-z0-9._+-]+)/edit/$', views.interim_request_edit), - url(r'^interim/request/(?P[A-Za-z0-9._+-]+)/cancel/$', views.interim_request_cancel), - url(r'^interim/pending/$', views.interim_pending), + url(r'^ajax/get-utc/?$', views.ajax_get_utc), + url(r'^interim/announce/?$', views.interim_announce), + url(r'^interim/announce/(?P[A-Za-z0-9._+-]+)/?$', views.interim_send_announcement), + url(r'^interim/request/?$', views.interim_request), + url(r'^interim/request/(?P[A-Za-z0-9._+-]+)/?$', views.interim_request_details), + url(r'^interim/request/(?P[A-Za-z0-9._+-]+)/edit/?$', views.interim_request_edit), + url(r'^interim/request/(?P[A-Za-z0-9._+-]+)/cancel/?$', views.interim_request_cancel), + url(r'^interim/pending/?$', views.interim_pending), url(r'^requests.html$', RedirectView.as_view(url='/meeting/requests', permanent=True)), - url(r'^upcoming/$', views.upcoming), - url(r'^upcoming.ics/$', views.upcoming_ical), + url(r'^upcoming/?$', views.upcoming), + url(r'^upcoming.ics/?$', views.upcoming_ical), # Then patterns from more specific to less url(r'^(?Pinterim-[a-z0-9-]+)/', include(type_ietf_only_patterns)), url(r'^(?P\d+)/requests.html$', RedirectView.as_view(url='/meeting/%(num)s/requests', permanent=True)), diff --git a/ietf/templates/meeting/week-view.html b/ietf/templates/meeting/week-view.html index 1485dccac..e107e08a5 100644 --- a/ietf/templates/meeting/week-view.html +++ b/ietf/templates/meeting/week-view.html @@ -138,7 +138,7 @@ var include = Array(); - setInterval("animate()",50); + setInterval(animate,50); function is_visible(item) { @@ -172,7 +172,7 @@ function draw_calendar() { - window.setTimeout("draw_calendar()",1000); + window.setTimeout(draw_calendar,1000); var width = document.body.clientWidth; var height = document.body.clientHeight;