-
-
- {{input class="form-control input-sm r-mr5" value=originalModel.md5 }}
- The expected MD5 for the downloaded driver.
-
+
+
+
+ {{input class="form-control" value=originalModel.uri }}
+ The URL to download the machine driver binary 64-bit Linux.
+
+
+
+
+ {{input class="form-control" value=originalModel.md5 }}
+ Optional: Verify that the downloaded driver matches the expected checksum.
{{partial "save-cancel"}}
diff --git a/app/components/page-header/component.js b/app/components/page-header/component.js
index 8325f317e..048f136f9 100644
--- a/app/components/page-header/component.js
+++ b/app/components/page-header/component.js
@@ -97,8 +97,19 @@ export default Ember.Component.extend({
didInsertElement() {
// Hide the Firefox focus ring
- this.$().on('click', 'A', function(){
+ this.$().on('click', 'A', function(event){
$(this).blur();
+
+ let $tgt = $(event.target);
+
+ // Close the small-screen nav after clicking on a bottom-row item
+ if ( $tgt.parents('#navbar').length )
+ {
+ event.preventDefault();
+ $('#navbar').one('hidden.bs.collapse', () => {
+ $tgt.trigger('click');
+ }).collapse('hide');
+ }
});
diff --git a/app/components/page-header/template.hbs b/app/components/page-header/template.hbs
index 1116012c7..8125125b0 100644
--- a/app/components/page-header/template.hbs
+++ b/app/components/page-header/template.hbs
@@ -145,14 +145,14 @@
{{/if}}
-
+
{{#link-to "applications-tab" projectId id="applications-tab"}}Applications{{/link-to}}
{{partial 'tabs/applications-tab'}}
-
+
{{#link-to "infrastructure-tab" projectId id="infrastructure-tab"}}Infrastructure{{/link-to}}
diff --git a/app/index.html b/app/index.html
index 9d1fd3276..f95496817 100644
--- a/app/index.html
+++ b/app/index.html
@@ -3,6 +3,7 @@
+
Loading…
diff --git a/app/models/machinedriver.js b/app/models/machinedriver.js
index d7724f1aa..7ad877db4 100644
--- a/app/models/machinedriver.js
+++ b/app/models/machinedriver.js
@@ -1,8 +1,9 @@
import Ember from 'ember';
import C from 'ui/utils/constants';
import Resource from 'ember-api-store/models/resource';
+import PolledResource from 'ui/mixins/cattle-polled-resource';
-var machineDriver = Resource.extend({
+var machineDriver = Resource.extend(PolledResource, {
type: 'machineDriver',
displayURI: Ember.computed('uri', function() {
let uri = this.get('uri');
@@ -42,6 +43,10 @@ var machineDriver = Resource.extend({
});
machineDriver.reopenClass({
+ // Drivers don't get pushed by /subscribe WS, so refresh more often
+ pollTransitioningDelay: 1000,
+ pollTransitioningInterval: 5000,
+
headers: {
[C.HEADER.PROJECT]: undefined, // Requests for projects use the user's scope, not the project
},