simon
/
domoboard
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #27 from wez3/develop 

Develop to Master
This commit is contained in:
wez3 2016-12-30 17:22:39 +01:00 committed by GitHub
parent 80ba6fd049 04232dafec
commit 45a5536824
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
README.md
View File

@ -31,6 +31,7 @@ Just one config is used to configure Domoboard. A example can be found the appli
- dimmer - dimmer
- rgb - rgb
- setpoint - setpoint
- camera
- weather - weather
- news - news
- map - map

2
server.py
View File

@ -159,7 +159,7 @@ if __name__ == '__main__':
app.secret_key = config["general_settings"]["server"]["secret_key"] app.secret_key = config["general_settings"]["server"]["secret_key"]
app.add_url_rule('/', 'index', index) app.add_url_rule('/', 'index', index)
for k, v in config["navbar"]["menu"].iteritems(): 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('/settings', 'settings', generatePage, methods=['GET'])
app.add_url_rule('/log', 'log', generatePage, methods=['GET']) app.add_url_rule('/log', 'log', generatePage, methods=['GET'])
app.add_url_rule('/logout/', 'logout', logout_view, methods=['GET']) app.add_url_rule('/logout/', 'logout', logout_view, methods=['GET'])

8
static/js/domoticz.js
View File

@ -75,8 +75,8 @@ function ShowSmartLog(contentdiv, id, name, switchtype, period) {
var actYear = d.getYear() + 1900; var actYear = d.getYear() + 1900;
if (period == "day") { if (period == "day") {
var DayChart = $('#' + contentdiv); $.DayChart = $('#' + contentdiv);
DayChart.highcharts({ $.DayChart.highcharts({
chart: { chart: {
type: 'spline', type: 'spline',
zoomType: 'x', zoomType: 'x',
@ -92,8 +92,8 @@ if (period == "day") {
function (data) { function (data) {
data = JSON.parse(data); data = JSON.parse(data);
if (typeof data.result != 'undefined') { if (typeof data.result != 'undefined') {
AddDataToUtilityChart(data, DayChart, switchtype); AddDataToUtilityChart(data, $.DayChart, switchtype);
DayChart.highcharts().redraw(); $.DayChart.highcharts().redraw();
} }
}); });
} }