diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-04-09 23:51:25 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-04-09 23:51:26 +0000 |
| commit | 2721a2f005e71810fd1fe44f81d8284a2ce8b197 (patch) | |
| tree | a73d0d2473e33ac5d80a285dbac5d5006aa0d39f /horizon | |
| parent | 264e9e55649127758f4ca2552f4a697728fcbb67 (diff) | |
| parent | 86d121c8f20efa3789130bd02573f707d55eb7c4 (diff) | |
| download | horizon-2721a2f005e71810fd1fe44f81d8284a2ce8b197.tar.gz | |
Merge "Launch Instance Step - Key Pair Import"
Diffstat (limited to 'horizon')
| -rw-r--r-- | horizon/static/angular/table/table.scss | 2 | ||||
| -rw-r--r-- | horizon/static/angular/wizard/wizard.scss | 7 | ||||
| -rw-r--r-- | horizon/static/horizon/js/angular/services/hz.api.nova.js | 6 |
3 files changed, 13 insertions, 2 deletions
diff --git a/horizon/static/angular/table/table.scss b/horizon/static/angular/table/table.scss index 3fef60536..61f2c9df3 100644 --- a/horizon/static/angular/table/table.scss +++ b/horizon/static/angular/table/table.scss @@ -59,7 +59,7 @@ $em-per-priority: floor($table-col-avg-width / $font-size-base) * 3; } input[type="text"] { - @include search-placeholder { + @include input-placeholder { font-weight: normal; color: $placeholder-text-color; } diff --git a/horizon/static/angular/wizard/wizard.scss b/horizon/static/angular/wizard/wizard.scss index 67df2de4b..8b4183802 100644 --- a/horizon/static/angular/wizard/wizard.scss +++ b/horizon/static/angular/wizard/wizard.scss @@ -297,3 +297,10 @@ margin-top: 3px; } } + +.form-control { + @include input-placeholder { + font-weight: normal; + color: $placeholder-text-color; + } +} diff --git a/horizon/static/horizon/js/angular/services/hz.api.nova.js b/horizon/static/horizon/js/angular/services/hz.api.nova.js index 66ef95803..47d9c7608 100644 --- a/horizon/static/horizon/js/angular/services/hz.api.nova.js +++ b/horizon/static/horizon/js/angular/services/hz.api.nova.js @@ -58,7 +58,11 @@ limitations under the License. this.createKeypair = function(newKeypair) { return apiService.post('/api/nova/keypairs/', newKeypair) .error(function () { - horizon.alert('error', gettext('Unable to create the keypair.')); + if (angular.isDefined(newKeypair.public_key)) { + horizon.alert('error', gettext('Unable to import the keypair.')); + } else { + horizon.alert('error', gettext('Unable to create the keypair.')); + } }); }; |