TTMK/web2.0-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

created skeleton for infoscreen

Browse Source
This commit is contained in:
okalintu
2016-08-29 19:32:58 +03:00
parent 48caf88f64
commit e3949e70e1
8 changed files with 23 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
infoscreen/static/html/templatedefault.html
-2
View File
@@ -1,2 +0,0 @@
<iframe scrolling='no' style='margin:0;padding:0;border:none;border-radius:15px;overflow:hidden;width:1920px;height:1080px' src='https://hsl.trapeze.fi/omatpysakit/web?command=embedded&c=20&o=1&t=s&id=2222235'></iframe>
infoscreen/static/html/test1.html
+1
View File
@@ -0,0 +1 @@
<h1>testi1</h1>
infoscreen/static/html/test2.html
+1
View File
@@ -0,0 +1 @@
<h1>testi2</h1>
infoscreen/static/html/test3.html
+1
View File
@@ -0,0 +1 @@
<h1>testi3</h1>
infoscreen/static/js/controllers.js
-3
View File
@@ -1,3 +0,0 @@
app.controller('templateDefault', function($scope){
});
infoscreen/static/js/infoscreen_controllers.js
+16
View File
@@ -0,0 +1,16 @@
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",
];
$scope.next = function(){
index = (index + 1) % templates.length;
$scope.active = templates[index];
$timeout($scope.next,5000);
}
$scope.next()
});
infoscreen/static/js/routes.js
-13
View File
@@ -1,13 +0,0 @@
var app = angular.module('infoscreen', ['ngRoute']);
app.config(['$routeProvider', function($routeProvider){
$routeProvider
.when('/',{
templateUrl:"/static/html/templatedefault.html",
controller:'templateDefault',
})
.otherwise({
'redirectTo':"/"
})
}]);
infoscreen/templates/infoscreen_index.html
+4 -4
View File
@@ -1,5 +1,5 @@
<!DOCTYPE html>
<html ng-app="infoscreen">
<html ng-app="infoApp">
<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1">
@@ -11,11 +11,11 @@
<script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/underscore.js/1.8.3/underscore-min.js"></script>
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css"></link>
<script src="/static/js/routes.js"></script>
<script src="/static/js/controllers.js"></script>
<script src="/static/js/infoscreen_controllers.js"></script>
</head>
<body>
<div class="jumbotron" ng-view>
<div class="jumbotron" ng-controller="infoscreen_main">
<div id="infocontent" ng-include="active"></div>
</div>
</body>
</html>