pingu_98/MrDraw
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Added QR code with API key on Settings dialog

Browse source
This commit is contained in:
Jarek Szczepanski 2014-11-05 12:24:51 +01:00
parent eacfcab187
commit 25cfed949d
4 changed files with 20 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/octoprint/static/js/app/viewmodels/settings.js
View file

@ -290,6 +290,8 @@ function SettingsViewModel(loginStateViewModel, usersViewModel) {
self.system_actions(response.system.actions);
self.terminalFilters(response.terminalFilters);
self.makeCode();
};
self.saveData = function() {
@ -380,4 +382,13 @@ function SettingsViewModel(loginStateViewModel, usersViewModel) {
});
};
self.qrcode = new QRCode("qrcode");
self.makeCode = function() {
var api_key = $("#settings-apikey").val();
self.qrcode.makeCode(api_key);
return true;
};
}

1
src/octoprint/static/js/lib/qrcode.min.js vendored Normal file
View file

File diff suppressed because one or more lines are too long

1
src/octoprint/templates/index.jinja2
View file

@ -671,6 +671,7 @@
<script type="text/javascript" src="{{ url_for('static', filename='js/lib/detectmobilebrowser.js') }}"></script>
<script type="text/javascript" src="{{ url_for('static', filename='js/lib/md5.min.js') }}"></script>
<script type="text/javascript" src="{{ url_for('static', filename='js/lib/pnotify.min.js') }}"></script>
<script type="text/javascript" src="{{ url_for('static', filename='js/lib/qrcode.min.js') }}"></script>
<!-- Include OctoPrint files -->
<!-- TODO: merge/minimize in the future -->

9
src/octoprint/templates/settings.jinja2
View file

@ -422,7 +422,7 @@
</form>
</div>
<div class="tab-pane" id="settings_api">
<form class="form-horizontal">
<form class="form-horizontal" onsubmit="return false;">
<div class="control-group">
<div class="controls">
<label class="checkbox">
@ -440,7 +440,12 @@
<div class="control-group">
<label class="control-label" for="settings-apiKey">{{ _('API Key') }}</label>
<div class="controls">
<input type="text" class="input-block-level" data-bind="value: api_key" id="settings-apikey">
<input type="text" class="input-block-level" data-bind="value: api_key, event: {keyup: makeCode, blur: makeCode}" id="settings-apikey">
</div>
</div>
<div class="control-group">
<div class="controls">
<div id="qrcode" style="width:250px; height:250px; margin-top:10px;"></div>
</div>
</div>
</form>