diff --git a/infoscreen/static/html/test1.html b/infoscreen/static/html/test1.html index 1f62c8b..1682f05 100644 --- a/infoscreen/static/html/test1.html +++ b/infoscreen/static/html/test1.html @@ -1 +1 @@ -

testi1

+

testi1 {{ testparam }}

diff --git a/infoscreen/static/js/infoscreen_controllers.js b/infoscreen/static/js/infoscreen_controllers.js index cf6c098..efe85f0 100644 --- a/infoscreen/static/js/infoscreen_controllers.js +++ b/infoscreen/static/js/infoscreen_controllers.js @@ -3,9 +3,17 @@ var app = angular.module('infoApp', []); app.controller('infoscreen_main', function($scope, $http,$timeout){ var index = -1; var templates = [ - "/static/html/test1.html", - "/static/html/test2.html", - "/static/html/test3.html", + { + template: "/static/html/test1.html", + onload: function(){$scope.testparam = "foo";} + },{ + template: "/static/html/test2.html" + },{ + template: "/static/html/test1.html", + onload: function(){$scope.testparam = "bar";} + },{ + template: "/static/html/test3.html" + }, ]; $scope.next = function(){ index = (index + 1) % templates.length; diff --git a/infoscreen/templates/infoscreen_index.html b/infoscreen/templates/infoscreen_index.html index 942025f..9ea4aad 100644 --- a/infoscreen/templates/infoscreen_index.html +++ b/infoscreen/templates/infoscreen_index.html @@ -15,7 +15,7 @@
-
+