Merge backend and frontend for apy

Merge branch 'feature-apyscreen' of sika.sahkoinsinoorikilta.fi:vtmk/web2.0 into feature-apyscreen
This commit is contained in:
Joel Lavikainen
2017-03-29 17:46:27 +03:00
3 changed files with 13 additions and 0 deletions
+10
View File
@@ -80,6 +80,16 @@ class ABBInfoItem(InfoItem):
def get_create_template_url():
return "/static/html/abb_create.html"
class ApyItem(InfoItem):
display_name = _("APY Item")
def get_template_url(self):
return "/static/html/apy.html"
@staticmethod
def get_create_template_url():
return "/static/html/apy_create.html"
class ExternalWebsiteInfoItem(InfoItem):
display_name = _("External website")
+1
View File
@@ -221,3 +221,4 @@ createHslItem = create_item_generator(HslInfoItem)
createExternalImageInfoItem = create_item_generator(ExternalImageInfoItem)
createExternalWebsiteItem = create_item_generator(ExternalWebsiteInfoItem)
createEventItem = create_item_generator(EventInfoItem)
createEventItem = create_item_generator(ApyInfoItem)
+2
View File
@@ -67,6 +67,7 @@ from infoscreen.views import createExternalWebsiteItem
from infoscreen.views import create_rotation
from infoscreen.views import delete_rotation
from infoscreen.views import CurrentHSLView
from infoscreen.views import createApyItem
from infoscreen.views import admin as infoscreen_admin
from infoscreen.views import hsl_timetable_settings
from infoscreen.views import get_apy_json
@@ -125,6 +126,7 @@ urlpatterns = [
url(r'^infoscreen/create_sossoitem$', createSossoItem),
url(r'^infoscreen/create_eventitem$', createEventItem),
url(r'^infoscreen/create_hslitem$', createHslItem),
url(r'^infoscreen/create_apyitem$', createApyItem),
url(r'^infoscreen/create_websiteitem$', createExternalWebsiteItem),
url(r'^infoscreen/admin$', infoscreen_admin),
url(r'^infoscreen/create_rotation$', create_rotation),