diff --git a/infoscreen/admin.py b/infoscreen/admin.py index c3b7409..19d3413 100644 --- a/infoscreen/admin.py +++ b/infoscreen/admin.py @@ -1,5 +1,6 @@ from django.contrib import admin from infoscreen.models import Rotation, InfoItem, InfoInstance, ImageInfoItem, ExternalImageInfoItem, ABBInfoItem +from infoscreen.models import CoffeeInfoItem # Register your models here. admin.site.register(Rotation) @@ -8,3 +9,4 @@ admin.site.register(ImageInfoItem) admin.site.register(ExternalImageInfoItem) admin.site.register(ABBInfoItem) admin.site.register(InfoInstance) +admin.site.register(CoffeeInfoItem) \ No newline at end of file diff --git a/infoscreen/models.py b/infoscreen/models.py index 8a9d236..25c1b25 100644 --- a/infoscreen/models.py +++ b/infoscreen/models.py @@ -75,7 +75,14 @@ class ABBInfoItem(InfoItem): @staticmethod def get_create_template_url(): return "/static/html/abb_create.html" + +class CoffeeInfoItem(InfoItem): + def get_template_url(self): + return "/static/html/coffee.html" + @staticmethod + def get_create_template_url(): + return "/static/html/coffee_create.html" class SossoInfoItem(InfoItem): def get_template_url(self): diff --git a/infoscreen/static/css/coffee.css b/infoscreen/static/css/coffee.css new file mode 100644 index 0000000..b98414f --- /dev/null +++ b/infoscreen/static/css/coffee.css @@ -0,0 +1,10 @@ +body{ + margin: 0; +} +iframe { + display: block; + background: #000; + border: none; + height: 100vh; + width: 100vw; +} \ No newline at end of file diff --git a/infoscreen/static/html/coffee.html b/infoscreen/static/html/coffee.html new file mode 100644 index 0000000..8119306 --- /dev/null +++ b/infoscreen/static/html/coffee.html @@ -0,0 +1,4 @@ + + \ No newline at end of file diff --git a/infoscreen/static/html/coffee_create.html b/infoscreen/static/html/coffee_create.html new file mode 100644 index 0000000..02fb704 --- /dev/null +++ b/infoscreen/static/html/coffee_create.html @@ -0,0 +1,10 @@ +
+
+ Create new item to show coffee website. Name is used only as identifier +
+
+ + +
+ +
diff --git a/infoscreen/static/js/infoadmin_controllers.js b/infoscreen/static/js/infoadmin_controllers.js index b659334..ff4be8d 100644 --- a/infoscreen/static/js/infoadmin_controllers.js +++ b/infoscreen/static/js/infoadmin_controllers.js @@ -140,6 +140,12 @@ app.controller('infoadmin_hslitem_create', function($scope, $http,ItemList){ $http.post("/infoscreen/create_hslitem", $scope.item).then(ItemList.loadItems) } }); +app.controller('infoadmin_coffeeitem_create', function($scope, $http,ItemList){ + $scope.item = {} + $scope.send = function(){ + $http.post("/infoscreen/create_coffeeitem", $scope.item).then(ItemList.loadItems) + } +}); app.controller('infoadmin_image_create', ['$scope', 'Upload', '$timeout',"ItemList", function ($scope, Upload, $timeout,ItemList) { $scope.send = function(file) { diff --git a/infoscreen/views.py b/infoscreen/views.py index 9f8aad6..a1daf11 100644 --- a/infoscreen/views.py +++ b/infoscreen/views.py @@ -7,6 +7,7 @@ from django.contrib.auth.decorators import permission_required from infoscreen.models import Rotation, InfoItem, InfoInstance from infoscreen.models import ABBInfoItem, ExternalImageInfoItem, ImageInfoItem, SossoInfoItem, HslInfoItem +from infoscreen.models import CoffeeInfoItem from infoscreen.models import ImageUploadForm from infoscreen.models import HSLDataModel from infoscreen.hsl_fetcher import HSLFetcher @@ -211,3 +212,4 @@ createABBItem = create_item_generator(ABBInfoItem) createSossoItem = create_item_generator(SossoInfoItem) createHslItem = create_item_generator(HslInfoItem) createExternalImageInfoItem = create_item_generator(ExternalImageInfoItem) +createCoffeeItem = create_item_generator(CoffeeInfoItem) diff --git a/sikweb/urls.py b/sikweb/urls.py index b5b47f8..a63cf05 100644 --- a/sikweb/urls.py +++ b/sikweb/urls.py @@ -46,6 +46,7 @@ from infoscreen.views import create_image_item from infoscreen.views import createABBItem from infoscreen.views import createSossoItem from infoscreen.views import createHslItem +from infoscreen.views import createCoffeeItem from infoscreen.views import create_rotation from infoscreen.views import delete_rotation from infoscreen.views import CurrentHSLView @@ -90,6 +91,7 @@ urlpatterns = [ url(r'^infoscreen/create_abbitem$', createABBItem), url(r'^infoscreen/create_sossoitem$', createSossoItem), url(r'^infoscreen/create_hslitem$', createHslItem), + url(r'^infoscreen/create_coffeeitem$', createCoffeeItem), url(r'^infoscreen/admin$', infoscreen_admin), url(r'^infoscreen/create_rotation$', create_rotation), url(r'^infoscreen/delete_rotation/(?P\d+)$', delete_rotation),