Merge branch 'maintenance' of github.com:foosel/OctoPrint into maintenance

CONTRIBUTING.md

@@ -30,8 +30,12 @@ nothing but ticket management.
 - If you want to report a **bug**, [read "How to file a bug report" below](#how-to-file-a-bug-report)
   and *[use the provided template](#what-should-i-include-in-a-ticket)*.
   You do not need to do anything else with your ticket.
-- If you want to post a **request** of any kind (feature request, documentation
-  request, ...), add `[Request]` to your issue's title (e.g. `[Request] Awesome new feature`).
+- If you want to post a **feature request** or a **documentation request**, add `[Request]`
+  to your issue's title (e.g. `[Request] Awesome new feature`). A question on how to run/change/setup
+  something is **not** what qualifies as a request here, use the
+  [Mailinglist](https://groups.google.com/group/octoprint) or the
+  [Google+ Community](https://plus.google.com/communities/102771308349328485741) for
+  such support issues.
 - If you are a **developer** that wants to brainstorm a pull request or possible
   changes to the plugin system, add [Brainstorming] to your issue's title (e.g.
   `[Brainstorming] New plugin hook for doing some cool stuff`).

src/octoprint/static/js/app/viewmodels/settings.js

@@ -8,6 +8,9 @@ $(function() {
 
         self.receiving = ko.observable(false);
         self.sending = ko.observable(false);
+        self.exchanging = ko.computed(function() {
+            return self.receiving() || self.sending();
+        });
         self.callbacks = [];
 
         self.api_enabled = ko.observable(undefined);

src/octoprint/templates/dialogs/settings.jinja2

@@ -49,6 +49,6 @@
     </div>
     <div class="modal-footer">
         <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: !sending(), css: {disabled: sending()}"><i class="icon-spinner icon-spin" data-bind="visible: sending"></i> {{ _('Save') }}</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>
 </div>