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

Added "About" link to settings dialog

Browse source
This commit is contained in:
Gina Häußge 2016-05-03 10:21:59 +02:00
parent 7c6b9eac48
commit 5091099f83
4 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/octoprint/static/css/octoprint.css
View file

File diff suppressed because one or more lines are too long

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

@ -5,6 +5,7 @@ $(function() {
self.loginState = parameters[0];
self.users = parameters[1];
self.printerProfiles = parameters[2];
self.about = parameters[3];
self.receiving = ko.observable(false);
self.sending = ko.observable(false);
@ -635,7 +636,7 @@ $(function() {
OCTOPRINT_VIEWMODELS.push([
SettingsViewModel,
["loginStateViewModel", "usersViewModel", "printerProfilesViewModel"],
["loginStateViewModel", "usersViewModel", "printerProfilesViewModel", "aboutViewModel"],
["#settings_dialog", "#navbar_settings"]
]);
});

4
src/octoprint/static/less/octoprint.less
View file

@ -711,6 +711,10 @@ ul.dropdown-menu li a {
margin-left: 0;
}
}
.aboutlink {
float: left;
}
}

1
src/octoprint/templates/dialogs/settings.jinja2
View file

@ -48,6 +48,7 @@
</div>
</div>
<div class="modal-footer">
<button class="btn aboutlink" data-bind="click: about.show"><i class="icon-info-sign"></i> {{ _('About OctoPrint') }}</button>
<button class="btn" data-dismiss="modal" aria-hidden="true">{{ _('Cancel') }}</button>
<button class="btn btn-primary" data-bind="click: function() { saveData(undefined, $root.hide) }, enable: !exchanging(), css: {disabled: exchanging()}"><i class="icon-spinner icon-spin" data-bind="visible: sending"></i> {{ _('Save') }}</button>
</div>