summaryrefslogtreecommitdiff
path: root/workshop_portal
diff options
context:
space:
mode:
authorAkshen Doke2017-03-30 10:54:05 +0530
committerAkshen2017-05-19 15:30:31 +0530
commit55585b6864e128dfd4fae5ae391373abf96c5ce5 (patch)
tree4fe8d974fd3ffd35246c1c16a192eb6b82db5d23 /workshop_portal
parentf751cd3c07619d8ee1e5b96c23b19cfae2005c0f (diff)
downloadworkshop_booking-55585b6864e128dfd4fae5ae391373abf96c5ce5.tar.gz
workshop_booking-55585b6864e128dfd4fae5ae391373abf96c5ce5.tar.bz2
workshop_booking-55585b6864e128dfd4fae5ae391373abf96c5ce5.zip
Recurrence done
Booking ToDo
Diffstat (limited to 'workshop_portal')
-rw-r--r--workshop_portal/settings.py3
-rw-r--r--workshop_portal/urls.py9
2 files changed, 11 insertions, 1 deletions
diff --git a/workshop_portal/settings.py b/workshop_portal/settings.py
index 8622731..1ba7997 100644
--- a/workshop_portal/settings.py
+++ b/workshop_portal/settings.py
@@ -44,6 +44,7 @@ INSTALLED_APPS = [
'django.contrib.messages',
'django.contrib.staticfiles',
'workshop_app',
+ 'recurrence',
]
@@ -128,6 +129,8 @@ USE_TZ = True
STATIC_URL = '/static/'
+STATIC_ROOT = os.path.join(BASE_DIR, "static/")
+
LOGIN_URL = '/login/'
#Email Connection Settings
diff --git a/workshop_portal/urls.py b/workshop_portal/urls.py
index 45f4f0f..9612014 100644
--- a/workshop_portal/urls.py
+++ b/workshop_portal/urls.py
@@ -16,6 +16,12 @@ Including another URLconf
from django.conf.urls import url
from django.contrib import admin
from workshop_app import views
+import django
+
+js_info_dict = {
+ 'packages': ('recurrence', ),
+}
+
urlpatterns = [
url(r'^$', views.index, name='index'),
@@ -29,6 +35,7 @@ urlpatterns = [
url(r'^manage/$', views.manage),
url(r'^view_course_list/$', views.view_course_list),
url(r'^view_course_details/$', views.view_course_details),
- url(r'^create_workshop/$', views.create_workshop)
+ url(r'^create_workshop/$', views.create_workshop),
+ url(r'^jsi18n/$', django.views.i18n.javascript_catalog, js_info_dict),
]