Merge pull request #27 from wez3/develop

Develop to Master

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

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'])

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();
 						}
 					});
 				}