From 7da88d65da3ba02ccf44c596ea6bc33e1b8cd8e5 Mon Sep 17 00:00:00 2001 From: wez3 Date: Fri, 30 Dec 2016 14:23:15 +0100 Subject: [PATCH 1/3] Update README.md Add camera to the README.md file. --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 991cfee..12779e6 100644 --- a/README.md +++ b/README.md @@ -31,6 +31,7 @@ Just one config is used to configure Domoboard. A example can be found the appli - dimmer - rgb - setpoint +- camera - weather - news - map From d70256b52064f96ed105a378e0e337d7948c1000 Mon Sep 17 00:00:00 2001 From: wez3 Date: Fri, 30 Dec 2016 16:46:04 +0100 Subject: [PATCH 2/3] Fix for issue #25 --- server.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server.py b/server.py index f29d171..c3178c9 100755 --- a/server.py +++ b/server.py @@ -159,7 +159,7 @@ if __name__ == '__main__': app.secret_key = config["general_settings"]["server"]["secret_key"] app.add_url_rule('/', 'index', index) for k, v in config["navbar"]["menu"].iteritems(): - app.add_url_rule('/' + k.lower(), k.lower(), generatePage, methods=['GET']) + app.add_url_rule('/' + v.lower(), v.lower(), generatePage, methods=['GET']) app.add_url_rule('/settings', 'settings', generatePage, methods=['GET']) app.add_url_rule('/log', 'log', generatePage, methods=['GET']) app.add_url_rule('/logout/', 'logout', logout_view, methods=['GET']) From 04232dafec6bec6e38aba62ac8d703034c9e5066 Mon Sep 17 00:00:00 2001 From: squandor Date: Fri, 30 Dec 2016 17:16:26 +0100 Subject: [PATCH 3/3] Fix for issue #26 --- static/js/domoticz.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/static/js/domoticz.js b/static/js/domoticz.js index 605fc6a..b4f9cf1 100644 --- a/static/js/domoticz.js +++ b/static/js/domoticz.js @@ -75,8 +75,8 @@ function ShowSmartLog(contentdiv, id, name, switchtype, period) { var actYear = d.getYear() + 1900; if (period == "day") { - var DayChart = $('#' + contentdiv); - DayChart.highcharts({ + $.DayChart = $('#' + contentdiv); + $.DayChart.highcharts({ chart: { type: 'spline', zoomType: 'x', @@ -92,8 +92,8 @@ if (period == "day") { function (data) { data = JSON.parse(data); if (typeof data.result != 'undefined') { - AddDataToUtilityChart(data, DayChart, switchtype); - DayChart.highcharts().redraw(); + AddDataToUtilityChart(data, $.DayChart, switchtype); + $.DayChart.highcharts().redraw(); } }); }