diff --git a/infoscreen/static/css/infoscreen.css b/infoscreen/static/css/infoscreen.css
new file mode 100644
index 0000000..1df6617
--- /dev/null
+++ b/infoscreen/static/css/infoscreen.css
@@ -0,0 +1,21 @@
+#infocontent {
+ width: 100%;
+ height: 100%;
+ position: fixed;
+ left: 0px;
+ top: 0px;
+ z-index: -1; /* Ensure div tag stays behind content; -999 might work, too. */
+}
+
+.stretch {
+ width:100%;
+ height:100%;
+}
+
+.fit {
+ width: auto;
+ min-height: 100%;
+ display: block;
+ margin-left: auto;
+ margin-right: auto;
+}
\ No newline at end of file
diff --git a/infoscreen/static/html/test1.html b/infoscreen/static/html/test1.html
index 1682f05..8f0ce55 100644
--- a/infoscreen/static/html/test1.html
+++ b/infoscreen/static/html/test1.html
@@ -1 +1 @@
-
testi1 {{ testparam }}
+
\ No newline at end of file
diff --git a/infoscreen/static/img/teekkaribileet.jpg b/infoscreen/static/img/teekkaribileet.jpg
new file mode 100644
index 0000000..9d0c472
Binary files /dev/null and b/infoscreen/static/img/teekkaribileet.jpg differ
diff --git a/infoscreen/static/js/infoscreen_controllers.js b/infoscreen/static/js/infoscreen_controllers.js
index efe85f0..10ad32b 100644
--- a/infoscreen/static/js/infoscreen_controllers.js
+++ b/infoscreen/static/js/infoscreen_controllers.js
@@ -1,16 +1,18 @@
var app = angular.module('infoApp', []);
+
+
app.controller('infoscreen_main', function($scope, $http,$timeout){
var index = -1;
var templates = [
{
template: "/static/html/test1.html",
- onload: function(){$scope.testparam = "foo";}
+ onload: function(){$scope.imagepath = "/static/img/siklogo.jpg";}
},{
template: "/static/html/test2.html"
},{
template: "/static/html/test1.html",
- onload: function(){$scope.testparam = "bar";}
+ onload: function(){$scope.imagepath = "/static/img/teekkaribileet.jpg";}
},{
template: "/static/html/test3.html"
},
diff --git a/infoscreen/templates/infoscreen_index.html b/infoscreen/templates/infoscreen_index.html
index 9ea4aad..11c529f 100644
--- a/infoscreen/templates/infoscreen_index.html
+++ b/infoscreen/templates/infoscreen_index.html
@@ -11,11 +11,24 @@
-
+
+
-