Merge branch 'develop' of sika:vtmk/web2.0 into develop

sikweb/urls.py

@@ -34,6 +34,17 @@ from infoscreen.views import index as infoindex
 from infoscreen.views import default as infodefault
 from infoscreen.views import abb_job_list
 from infoscreen.views import rotation
+from infoscreen.views import rotations
+from infoscreen.views import infoItems
+from infoscreen.views import infoTypes
+from infoscreen.views import deleteInfoItem
+from infoscreen.views import createInstance as createInfoInstance
+from infoscreen.views import deleteInstance as deleteInfoInstance
+from infoscreen.views import createExternalImageInfoItem
+from infoscreen.views import createImageItem
+from infoscreen.views import createABBItem
+from infoscreen.views import createSossoItem
+from infoscreen.views import admin as infoscreen_admin
 #application
 from members.views import applicationindex
 
@@ -58,7 +69,18 @@ urlpatterns = [
     url(r'^infoscreen/$', infodefault),
     url(r'^infoscreen/(?P<idx>\d+)$', infoindex),
     url(r'^infoscreen/abbjobs$', abb_job_list),
-	url(r'^infoscreen/rotation/(?P<idx>\d+)$', rotation),
-	#application
-	url(r'^application/$', applicationindex),
+    url(r'^infoscreen/items$', infoItems),
+    url(r'^infoscreen/rotation/(?P<idx>\d+)$', rotation),
+    url(r'^infoscreen/rotations$', rotations),
+    url(r'^infoscreen/instance$', createInfoInstance),
+    url(r'^infoscreen/instance/(?P<idx>\d+)$', deleteInfoInstance),
+    url(r'^infoscreen/types$', infoTypes),
+    url(r'^infoscreen/delete_item/(?P<type_id>\d+)/(?P<idx>\d+)$', deleteInfoItem),
+    url(r'^infoscreen/create_external_image$', createExternalImageInfoItem),
+    url(r'^infoscreen/create_image$', createImageItem),
+    url(r'^infoscreen/create_abbitem$', createABBItem),
+    url(r'^infoscreen/create_sossoitem$', createSossoItem),
+    url(r'^infoscreen/admin$', infoscreen_admin),
+    #application
+    url(r'^application/$', applicationindex),
 ]