Merge branch 'master' of github.com:volkszaehler/volkszaehler.org
This commit is contained in:
commit
3ebb21e0f0
2 changed files with 18 additions and 18 deletions
|
@ -126,29 +126,29 @@
|
|||
<!-- dialogs -->
|
||||
<div id="entity-add" class="dialog">
|
||||
<div class="tabs">
|
||||
<ul>
|
||||
<li><a href="#entity-subscribe">Kanal abonnieren</a></li>
|
||||
<li><a href="#entity-create">Kanal erstellen</a></li>
|
||||
<li><a href="#public-entities">öffentliche Kanäle</a></li>
|
||||
</ul>
|
||||
<!--<ul>-->
|
||||
<!-- <li><a href="#entity-subscribe">Kanal abonnieren</a></li> -->
|
||||
<!-- <li><a href="#entity-create">Kanal erstellen</a></li> -->
|
||||
<!-- <li><a href="#public-entities">öffentliche Kanäle</a></li> -->
|
||||
<!--</ul>-->
|
||||
<div id="entity-subscribe">
|
||||
<p>Hier können Sie einen existierenden Kanal über seine UUID hinzufügen</p>
|
||||
<table>
|
||||
<tr><td><label for="uuid">UUID:</label></td><td><input id="uuid" type="text" size="36" maxlength="36" /></td></tr>
|
||||
<tr><td><label for="remember">Cookie:</label></td><td><input id="remember" type="checkbox" /></td></tr>
|
||||
<!--<tr><td><label for="remember">Cookie:</label></td><td><input id="remember" type="checkbox" /></td></tr>-->
|
||||
</table>
|
||||
<input type="button" value="abonnieren" />
|
||||
</div>
|
||||
<div id="entity-create">
|
||||
<p>Hier können Sie einen neuen Kanal erstellen</p>
|
||||
<p><label for="type">Typ: </label><select id="type" size="1"><option>Strom (das funktioniert noch nicht)</option></select></p>
|
||||
<input type="button" value="erstellen" />
|
||||
</div>
|
||||
<div id="public-entities">
|
||||
<p>Hier können Sie demnächst öffentliche Kanäle abonnieren.</p>
|
||||
<p><label for="uuid">Kanal: </label><select id="public-uuids" size="1"><option>Demo (das funktioniert noch nicht)</option></select></p>
|
||||
<input type="button" value="abonnieren" />
|
||||
</div>
|
||||
<!--div id="entity-create"> -->
|
||||
<!-- <p>Hier können Sie einen neuen Kanal erstellen</p> -->
|
||||
<!-- <p><label for="type">Typ: </label><select id="type" size="1"><option>Strom (das funktioniert noch nicht)</option></select></p> -->
|
||||
<!-- <input type="button" value="erstellen" /> -->
|
||||
<!--</div> -->
|
||||
<!--<div id="public-entities"> -->
|
||||
<!-- <p>Hier können Sie demnächst öffentliche Kanäle abonnieren.</p> -->
|
||||
<!-- <p><label for="uuid">Kanal: </label><select id="public-uuids" size="1"><option>Demo (das funktioniert noch nicht)</option></select></p> -->
|
||||
<!-- <input type="button" value="abonnieren" /> -->
|
||||
<!--</div> -->
|
||||
</div>
|
||||
</div>
|
||||
</body>
|
||||
|
|
|
@ -138,7 +138,7 @@ vz.wui.initEvents = function() {
|
|||
.bind("plotselected", function (event, ranges) {
|
||||
vz.options.plot.xaxis.min = ranges.xaxis.from;
|
||||
vz.options.plot.xaxis.max = ranges.xaxis.to;
|
||||
vz.options.plot.yaxis.min = 0;
|
||||
vz.options.plot.yaxis.min = null; // autoscaling for neg. values as well
|
||||
vz.options.plot.yaxis.max = null; // autoscaling
|
||||
vz.entities.loadData();
|
||||
})
|
||||
|
@ -235,7 +235,7 @@ vz.wui.handleControls = function () {
|
|||
}
|
||||
|
||||
// reenable autoscaling for yaxis
|
||||
vz.options.plot.yaxis.min = 0;
|
||||
vz.options.plot.yaxis.min = null;
|
||||
vz.options.plot.yaxis.max = null;
|
||||
|
||||
// we dont want to zoom/pan into the future
|
||||
|
|
Loading…
Add table
Reference in a new issue