Merge branch 'master' of github.com:volkszaehler/volkszaehler.org

htdocs/frontend/javascripts/flot/jquery.flot.js

@@ -1238,6 +1238,8 @@
                 };
 
                 formatter = function (v, axis) {
+                    if (opts.useLocalTime)
+                        v -= new Date(v).getTimezoneOffset()*60000;
                     var d = new Date(v);
 
                     // first check global format

htdocs/frontend/javascripts/options.js

@@ -53,14 +53,10 @@ vz.options.plot = {
 	legend: { show: false },
 	xaxis: {
 		mode: 'time',
+		useLocalTime: true,
 		max: new Date().getTime(), // timeinterval to request
 		min: new Date().getTime() - vz.options.defaultInterval,
-		timeformat: '%d. %b %h:%M',
 		monthNames: ['Jan', 'Feb', 'Mär', 'Apr', 'Mai', 'Jun', 'Jul', 'Aug', 'Sep', 'Okt', 'Nov', 'Dez'],
-		tickFormatter: function(val, axis) {
-			var date = new Date(val + vz.options.timezoneOffset); /* add timezone offset */
-			return $.plot.formatDate(date, this.timeformat, this.monthNames);			
-		}
 	},
 	yaxis: {
 		min: 0,