diff --git a/README.md b/README.md index dd3595dfb..6257eda15 100644 --- a/README.md +++ b/README.md @@ -57,6 +57,11 @@ The built-in cattle server expects to be run from `/static/` and hosted on a CDN * `ember test` * `ember test --server` +### Bugs & Issues +Please submit bugs and issues to [rancherio/rancher](//github.com/rancherio/rancher/issues) with a title starting with `[UI] `. + +Or just [click here](//github.com/rancherio/rancher/issues/new?title=%5BUI%5D%20) to create a new issue. + #### Useful links diff --git a/app/pods/registry-credential/model.js b/app/pods/registry-credential/model.js index 2bd0ca2cd..4ec9aaea9 100644 --- a/app/pods/registry-credential/model.js +++ b/app/pods/registry-credential/model.js @@ -4,6 +4,6 @@ export default Cattle.TransitioningResource.extend({ type: 'registryCredential', name: '', publicValue: '', - privateValue: '', + secretValue: '', email: '' }); diff --git a/app/pods/registry/new-credential/route.js b/app/pods/registry/new-credential/route.js index 1a8faa7ae..7b3b576c8 100644 --- a/app/pods/registry/new-credential/route.js +++ b/app/pods/registry/new-credential/route.js @@ -6,7 +6,7 @@ export default Ember.Route.extend(AuthenticatedRouteMixin, { var cred = this.get('store').createRecord({ type:'registryCredential', publicValue: '', - privateValue: '', + secretValue: '', email: '', }); diff --git a/app/pods/registry/new-credential/template.hbs b/app/pods/registry/new-credential/template.hbs index e5fadb067..a660a64f1 100644 --- a/app/pods/registry/new-credential/template.hbs +++ b/app/pods/registry/new-credential/template.hbs @@ -17,11 +17,11 @@
- + {{#if editing}}
{{serverAddress}}
{{else}} - {{input id="privateValue" type="password" value=privateValue classNames="form-control" placeholder="e.g. mypassword"}} + {{input id="secretValue" type="password" value=secretValue classNames="form-control" placeholder="e.g. mypassword"}} {{/if}}
diff --git a/app/styles/layout.scss b/app/styles/layout.scss index cfae0d365..768582d9b 100644 --- a/app/styles/layout.scss +++ b/app/styles/layout.scss @@ -199,7 +199,7 @@ MAIN { } BODY.white MAIN { - margin-top: $main-padding; + margin-top: $main-padding/2; margin-right: $main-padding; margin-bottom: $main-padding; margin-left: $nav-width + $main-padding; @@ -361,31 +361,26 @@ $nav-5: #66b0cb; .nav-hosts { border-left-color: $nav-1; - border-bottom-color: $nav-1; &.active { background-color: $nav-1; } } .nav-containers { border-left-color: $nav-2; - border-bottom-color: $nav-2; &.active { background-color: $nav-2; } } .nav-volumes { border-left-color: $nav-3; - border-bottom-color: $nav-3; &.active { background-color: $nav-3; } } .nav-registries { border-left-color: $nav-4; - border-bottom-color: $nav-4; &.active { background-color: $nav-4; } } .nav-api { border-left-color: $nav-5; - border-bottom-color: $nav-5; &.active { background-color: $nav-5; } }