Large diffs are not rendered by default.

Large diffs are not rendered by default.

@@ -0,0 +1,114 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">

<head>
<title>GUIA</title>
<meta http-equiv="content-type"
content="text/html;charset=utf-8" />

<!-- Include stylesheets -->
<link href="/css/bootstrap.css" type="text/css" rel="stylesheet" />
<link href="/css/lionbars.css" type="text/css" rel="stylesheet" />
<link href="/css/jquery.fancybox.css" type="text/css" rel="stylesheet" />
<link href="/css/guia.css" type="text/css" rel="stylesheet" />
<style type="text/css">
/* Override some defaults */
html, body {
background-color: #eee;
}

body {
padding-top: 40px;
}

.container > footer p {
margin-top: 10px;
text-align: center; /* center align it with the container */
}

/* The white background content wrapper */
.content {
background-color: #fff;
padding: 20px;
margin: 0 -20px; /* negative indent the amount of the padding to maintain the grid system */
-webkit-border-radius: 0 0 6px 6px;
-moz-border-radius: 0 0 6px 6px;
border-radius: 0 0 6px 6px;
-webkit-box-shadow: 0 1px 2px rgba(0,0,0,.15);
-moz-box-shadow: 0 1px 2px rgba(0,0,0,.15);
box-shadow: 0 1px 2px rgba(0,0,0,.15);
}

/* Give a quick and non-cross-browser friendly divider */
.content .span4 {
margin-left: 0;
padding-left: 19px;
border-left: 1px solid #eee;
}

.span-one-third {
width: 260px;
}

</style>

<script type="text/javascript" src="http://api.flattr.com/js/0.6/load.js?mode=auto"></script>
</head>

<body>
<div class="navbar navbar-fixed-top">
<div class="navbar-inner">
<div class="container">
<a style="cursor: pointer;" class="brand" data-view="Welcome">GUIA</a>

<ul class="nav" style="display: none;">
</ul>

<div id="clock" class="nav secondary-nav" style="margin-right: -20px; font-size: 20px; font-weight: 200; line-height: 1; color: white; display: block; padding: 8px 20px 12px; float: right;"></div>
</div>
</div>
</div>

<div class="container" id="content">
<div class="content" id="body" style="">

</div>

<footer id="footer">
<p>&copy; <a href="http://github.com/kersten">Kersten Burkhardt</a> &amp; <a href="http://github.com/volkerrichert">Volker Richert</a> 2011/2012 - <a href="/!/About">About</a></p>
<div style="float: right; margin-top: -30px;"><div id="flattr"></div></div>
</footer>
</div>

<!-- Start application -->
<script type="text/javascript">
$(document).ready(function () {
var options = {
ns: { namespaces: ['ns.common', 'ns.app'], defaultNs: 'ns.app'},
useLocalStorage: false,
resGetPath: '/locales/resources.json?lng=__lng__&ns=__ns__',
resPostPath: '/locales/add/__lng__/__ns__',
dynamicLoad: true,
sendMissing: true
};

$.i18n.init(options, function() {
console.log($.t('attr.username'));

var app = GUIA;

app.initialize();

FlattrLoader.render({
uid: 'GOTTMODUS',
url: location.href,
title: 'VDR GUIA',
description: 'Webinterface for controlling the vdr',
button: 'compact'
}, 'flattr', 'replace');
});
});
</script>
</body>
</html>
@@ -0,0 +1,140 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">

<head>
<title>GUIA</title>
<meta http-equiv="content-type"
content="text/html;charset=utf-8" />

<!-- Include stylesheets -->
<link href="/css/bootstrap.css" type="text/css" rel="stylesheet" />
<style type="text/css">
/* Override some defaults */
html, body {
background-color: #eee;
}

body {
padding-top: 40px;
}

.container > footer p {
margin-top: 10px;
text-align: center; /* center align it with the container */
}

/* The white background content wrapper */
.content {
background-color: #fff;
padding: 20px;
margin: 0 -20px; /* negative indent the amount of the padding to maintain the grid system */
-webkit-border-radius: 0 0 6px 6px;
-moz-border-radius: 0 0 6px 6px;
border-radius: 0 0 6px 6px;
-webkit-box-shadow: 0 1px 2px rgba(0,0,0,.15);
-moz-box-shadow: 0 1px 2px rgba(0,0,0,.15);
box-shadow: 0 1px 2px rgba(0,0,0,.15);
}

/* Give a quick and non-cross-browser friendly divider */
.content .span4 {
margin-left: 0;
padding-left: 19px;
border-left: 1px solid #eee;
}

.span-one-third {
width: 260px;
}

</style>

<!-- Include jquery, backbone and underscore -->
<script type="text/javascript" src="/js/jquery/jquery-1.7.js"></script>
<script type="text/javascript" src="/js/backbone/underscore.js"></script>
<script type="text/javascript" src="/js/backbone/backbone.js"></script>

<!-- Include utitlities -->
<script type="text/javascript" src="/socket.io/socket.io.js"></script>
<script type="text/javascript" src="/js/utils/sha512.js"></script>
<script type="text/javascript" src="/js/utils/xdate.js"></script>
<script type="text/javascript" src="/js/bootstrap.js"></script>

<!-- Bootstrap application frontend -->
<script type="text/javascript" src="/js/bootstrap.js"></script>

<!-- Load plugins -->
<script type="text/javascript" src="/js/jquery-plugins/bootstrap.min.js"></script>
<script type="text/javascript" src="/js/jquery-plugins/spin.min.js"></script>


<!-- Load views -->
<script type="text/javascript" src="/js/views/InstallView.js"></script>
<script type="text/javascript" src="/js/views/Install/SocializeView.js"></script>
<script type="text/javascript" src="/js/views/Install/StepOneView.js"></script>
<script type="text/javascript" src="/js/views/Install/StepTwoView.js"></script>
<script type="text/javascript" src="/js/views/Install/SelectChannelView.js"></script>
<script type="text/javascript" src="/js/views/Install/StepThreeView.js"></script>

<script type="text/javascript" src="/js/models/ConfigurationModel.js"></script>
<script type="text/javascript" src="/js/models/ChannelModel.js"></script>
<script type="text/javascript" src="/js/collections/ChannelCollection.js"></script>

<!-- Include templates -->
<script type="text/template" id="InstallTemplate">
<%- partial('templates/Install/InstallView') %>
</script>

<script type="text/template" id="InstallSocializeTemplate">
<%- partial('templates/Install/Socialize') %>
</script>

<script type="text/template" id="InstallStepOneTemplate">
<%- partial('templates/Install/StepOne') %>
</script>

<script type="text/template" id="InstallStepTwoTemplate">
<%- partial('templates/Install/StepTwo') %>
</script>

<script type="text/template" id="InstallSelectChannelsTemplate">
<%- partial('templates/Install/SelectChannels') %>
</script>

<script type="text/template" id="InstallStepThreeTemplate">
<%- partial('templates/Install/StepThree') %>
</script>

<!-- Start installation -->
<script type="text/javascript">
var socializeKey = '<%= socializeKey %>';

$(document).ready(function () {
var config = new ConfigurationModel();

var installView = new InstallView({model: config});
$('#body').html(installView.render().el);
});
</script>
</head>

<body>
<div class="navbar navbar-fixed-top">
<div class="navbar-inner">
<div class="container">
<a href="#" class="brand">GUIA</a>
</div>
</div>
</div>

<div class="container">
<div class="content" id="body">

</div>
<footer>
<p>&copy; <a href="http://github.com/kersten">Kersten Burkhardt</a> 2011</p>
</footer>
</div>
</body>
</html>
File renamed without changes.
@@ -2,6 +2,7 @@
"name": "Highlights",
"version": "0.1",
"mainMenu": {
"order": 1,
"title": "Highlights",
"icon": "heart",
"view": "Highlights"
File renamed without changes.
@@ -2,26 +2,27 @@
"name": "Me",
"version": "0.1",
"mainMenu": {
"title": "Me",
"order": 5,
"title": "navigation.me",
"icon": "user",
"items": [{
"title": "navigation.profile",
"title": "navigation.me.profile",
"icon": "user",
"view": "Me"
}, {
"title": "navigation.help",
"title": "navigation.me.help",
"icon": "question-sign",
"view": "Help"
}, {
"title": "navigation.shortcuts",
"title": "navigation.me.shortcuts",
"icon": "cog",
"view": "Shortcuts"
}, {
"title": "navigation.settings",
"title": "navigation.me.settings",
"icon": "edit",
"view": "Settings"
}, {
"title": "navigation.logout",
"title": "navigation.me.logout",
"icon": "off",
"link": "logout",
"id": "logoutBtn"
File renamed without changes.
@@ -2,6 +2,7 @@
"name": "Program",
"version": "0.1",
"mainMenu": {
"order": 3,
"title": "Program",
"icon": "edit",
"view": "book"
File renamed without changes.
@@ -2,6 +2,7 @@
"name": "Recordings",
"version": "0.1",
"mainMenu": {
"order": 4,
"title": "Recordings",
"icon": "facetime-video",
"view": "Recordings"
File renamed without changes.
@@ -1,7 +1,9 @@
{
"name": "TvGuide",
"version": "0.1",
"active": true,
"mainMenu": {
"order": 2,
"title": "TvGuide",
"icon": "list",
"view": "TvGuide"
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
@@ -1,8 +1,10 @@
{
"name": "yaVDR",
"version": "0.1",
"active": true,
"needslogin": true,
"mainMenu": {
"order": 6,
"title": "yaVDR",
"icon": "edit",
"view": "yaVDR"
@@ -0,0 +1,7 @@
/**
* Created by JetBrains WebStorm.
* User: kersten
* Date: 14.03.12
* Time: 00:16
* To change this template use File | Settings | File Templates.
*/
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
@@ -17,6 +17,7 @@ config.vdr.mac = process.env.VDR_MAC || '00:01:2e:31:66:da'

config.redis.secret = 'zy8qSFwF2OpIChvxZFz0TVUU7DLhQnEYsEB7nD1fP3SLkGVMlmC1i0fQscbky5w';

config.web.port = process.env.WEB_PORT || 8007;
config.web.port = process.env.WEB_PORT || 80;
config.web.ssl = process.env.SSL_PORT || 443;

module.exports = config;
@@ -5,7 +5,9 @@ function Navigation () {
}

Navigation.prototype.addItem = function (item, needsLogin) {
this.menu.push(item);
if (item.order && this.menu[item.order] === undefined) {
this.menu[item.order] = item;
}
};

Navigation.prototype.getMenu = function (loggedIn) {
@@ -7,7 +7,14 @@ var certificate = fs.readFileSync(__dirname + '/etc/cert/server.crt').toString()
var config = require('./etc/config');

var app = express.createServer({key: privateKey, cert: certificate});
app.listen(config.web.port);
app.listen(config.web.ssl);

var appHttp = express.createServer();
appHttp.listen(config.web.port);

appHttp.all('*', function (req, res) {
res.redirect('https://' + req.headers["host"] + req.url);
});

var Bootstrap = require('./Bootstrap');