From 47b9871fdd196cd52943d22f89b27e37d3795f2c Mon Sep 17 00:00:00 2001 From: Westly Wright Date: Mon, 3 Oct 2016 15:31:41 -0700 Subject: [PATCH] bug fixes --- app/components/edit-account/component.js | 2 +- app/components/edit-aliasservice/component.js | 2 +- app/components/edit-apikey/component.js | 2 +- app/components/edit-balancerservice/component.js | 2 +- app/components/edit-certificate/component.js | 2 +- app/components/edit-container/component.js | 2 +- app/components/edit-externalservice/component.js | 2 +- app/components/edit-host/component.js | 2 +- app/components/edit-registry/component.js | 2 +- app/components/edit-service/component.js | 2 +- app/components/edit-stack/component.js | 2 +- app/components/modal-about/component.js | 7 ++----- app/components/modal-auditlog-info/component.js | 2 +- app/components/modal-console/component.js | 2 +- app/components/modal-container-logs/component.js | 2 +- app/components/modal-edit-backup/component.js | 2 +- app/components/modal-edit-driver/component.js | 2 +- app/components/modal-edit-snapshot/component.js | 2 +- app/components/modal-process-error/component.js | 2 +- app/components/modal-shell/component.js | 2 +- app/components/page-footer/component.js | 4 +++- app/styles/components/_modals.scss | 11 +++++++++++ package.json | 2 +- 23 files changed, 36 insertions(+), 26 deletions(-) diff --git a/app/components/edit-account/component.js b/app/components/edit-account/component.js index d7ed04526..22ba8bea5 100644 --- a/app/components/edit-account/component.js +++ b/app/components/edit-account/component.js @@ -4,7 +4,7 @@ import C from 'ui/utils/constants'; import ModalBase from 'lacsso/components/modal-base'; export default ModalBase.extend(NewOrEdit, { - classNames: ['lacsso', 'modal-container', 'span-6', 'offset-3'], + classNames: ['lacsso', 'modal-container', 'full-width-modal'], access: Ember.inject.service(), primaryResource: Ember.computed.alias('model.account'), diff --git a/app/components/edit-aliasservice/component.js b/app/components/edit-aliasservice/component.js index cfb8c981a..5755862b4 100644 --- a/app/components/edit-aliasservice/component.js +++ b/app/components/edit-aliasservice/component.js @@ -3,7 +3,7 @@ import ModalBase from 'lacsso/components/modal-base'; import NewServiceAlias from 'ui/mixins/new-service-alias'; export default ModalBase.extend(NewServiceAlias, { - classNames: ['lacsso', 'modal-container', 'span-6', 'offset-3', 'modal-logs'], + classNames: ['lacsso', 'modal-container', 'full-width-modal', 'modal-logs'], originalModel : Ember.computed.alias('modalService.modalOpts'), allServicesService: Ember.inject.service('all-services'), editing: true, diff --git a/app/components/edit-apikey/component.js b/app/components/edit-apikey/component.js index a1f7749c0..eef0a1433 100644 --- a/app/components/edit-apikey/component.js +++ b/app/components/edit-apikey/component.js @@ -3,7 +3,7 @@ import NewOrEdit from 'ui/mixins/new-or-edit'; import ModalBase from 'lacsso/components/modal-base'; export default ModalBase.extend(NewOrEdit, { - classNames: ['lacsso', 'modal-container', 'span-6', 'offset-3'], + classNames: ['lacsso', 'modal-container', 'full-width-modal'], originalModel: Ember.computed.alias('modalService.modalOpts'), model: null, clone: null, diff --git a/app/components/edit-balancerservice/component.js b/app/components/edit-balancerservice/component.js index 561356a08..20972af7e 100644 --- a/app/components/edit-balancerservice/component.js +++ b/app/components/edit-balancerservice/component.js @@ -3,7 +3,7 @@ import NewBalancer from 'ui/mixins/new-balancer'; import ModalBase from 'lacsso/components/modal-base'; export default ModalBase.extend(NewBalancer, { - classNames : ['lacsso', 'modal-container', 'span-6', 'offset-3', 'modal-logs'], + classNames : ['lacsso', 'modal-container', 'full-width-modal', 'modal-logs'], originalModel : Ember.computed.alias('modalService.modalOpts'), actions: { diff --git a/app/components/edit-certificate/component.js b/app/components/edit-certificate/component.js index a565fbc81..968d7f71d 100644 --- a/app/components/edit-certificate/component.js +++ b/app/components/edit-certificate/component.js @@ -3,7 +3,7 @@ import NewOrEdit from 'ui/mixins/new-or-edit'; import ModalBase from 'lacsso/components/modal-base'; export default ModalBase.extend(NewOrEdit, { - classNames: ['lacsso', 'modal-container', 'span-6', 'offset-3'], + classNames: ['lacsso', 'modal-container', 'full-width-modal'], originalModel: Ember.computed.alias('modalService.modalOpts'), editing: true, model: null, diff --git a/app/components/edit-container/component.js b/app/components/edit-container/component.js index f906f1c5a..2e6963f3d 100644 --- a/app/components/edit-container/component.js +++ b/app/components/edit-container/component.js @@ -3,7 +3,7 @@ import NewOrEdit from 'ui/mixins/new-or-edit'; import ModalBase from 'lacsso/components/modal-base'; export default ModalBase.extend(NewOrEdit, { - classNames: ['lacsso', 'modal-container', 'span-6', 'offset-3'], + classNames: ['lacsso', 'modal-container', 'full-width-modal'], originalModel: Ember.computed.alias('modalService.modalOpts'), editing: true, isService: false, diff --git a/app/components/edit-externalservice/component.js b/app/components/edit-externalservice/component.js index 1688bc704..e403b99df 100644 --- a/app/components/edit-externalservice/component.js +++ b/app/components/edit-externalservice/component.js @@ -3,7 +3,7 @@ import Ember from 'ember'; import ModalBase from 'lacsso/components/modal-base'; export default ModalBase.extend(NewOrEdit, { - classNames : ['lacsso', 'modal-container', 'span-6', 'offset-3', 'modal-logs'], + classNames : ['lacsso', 'modal-container', 'full-width-modal', 'modal-logs'], originalModel : Ember.computed.alias('modalService.modalOpts'), existing: Ember.computed.alias('originalModel'), editing: true, diff --git a/app/components/edit-host/component.js b/app/components/edit-host/component.js index b70dbc51c..1f9cb160e 100644 --- a/app/components/edit-host/component.js +++ b/app/components/edit-host/component.js @@ -4,7 +4,7 @@ import NewOrEdit from 'ui/mixins/new-or-edit'; import ModalBase from 'lacsso/components/modal-base'; export default ModalBase.extend(NewOrEdit, ManageLabels, { - classNames: ['lacsso', 'modal-container', 'span-6', 'offset-3'], + classNames: ['lacsso', 'modal-container', 'full-width-modal'], originalModel: Ember.computed.alias('modalService.modalOpts'), model: null, editing: true, diff --git a/app/components/edit-registry/component.js b/app/components/edit-registry/component.js index 33d1da61d..8f9d7cc8e 100644 --- a/app/components/edit-registry/component.js +++ b/app/components/edit-registry/component.js @@ -3,7 +3,7 @@ import NewOrEdit from 'ui/mixins/new-or-edit'; import ModalBase from 'lacsso/components/modal-base'; export default ModalBase.extend(NewOrEdit, { - classNames: ['lacsso', 'modal-container', 'span-6', 'offset-3'], + classNames: ['lacsso', 'modal-container', 'full-width-modal'], originalModel: Ember.computed.alias('modalService.modalOpts'), error: null, credentials: null, diff --git a/app/components/edit-service/component.js b/app/components/edit-service/component.js index f0a48fade..5a70033cb 100644 --- a/app/components/edit-service/component.js +++ b/app/components/edit-service/component.js @@ -3,7 +3,7 @@ import NewOrEdit from 'ui/mixins/new-or-edit'; import ModalBase from 'lacsso/components/modal-base'; export default ModalBase.extend(NewOrEdit, { - classNames: ['lacsso', 'modal-container', 'span-6', 'offset-3'], + classNames: ['lacsso', 'modal-container', 'full-width-modal'], originalModel: Ember.computed.alias('modalService.modalOpts'), service: null, diff --git a/app/components/edit-stack/component.js b/app/components/edit-stack/component.js index 7cfb00c42..3be470192 100644 --- a/app/components/edit-stack/component.js +++ b/app/components/edit-stack/component.js @@ -3,7 +3,7 @@ import NewOrEdit from 'ui/mixins/new-or-edit'; import ModalBase from 'lacsso/components/modal-base'; export default ModalBase.extend(NewOrEdit, { - classNames: ['lacsso', 'modal-container', 'span-6', 'offset-3'], + classNames: ['lacsso', 'modal-container', 'full-width-modal'], originalModel: Ember.computed.alias('modalService.modalOpts'), editing: true, model: null, diff --git a/app/components/modal-about/component.js b/app/components/modal-about/component.js index 6d34fb536..9771d11cc 100644 --- a/app/components/modal-about/component.js +++ b/app/components/modal-about/component.js @@ -2,10 +2,7 @@ import Ember from 'ember'; import ModalBase from 'lacsso/components/modal-base'; export default ModalBase.extend({ - classNames: ['lacsso', 'modal-container', 'span-6', 'offset-3', 'generic', 'about'], + classNames: ['lacsso', 'modal-container', 'generic', 'about', 'full-width-modal'], + closeWithOutsideClick: true, settings: Ember.inject.service(), - - actions: { - - }, }); diff --git a/app/components/modal-auditlog-info/component.js b/app/components/modal-auditlog-info/component.js index c29883324..f48f60820 100644 --- a/app/components/modal-auditlog-info/component.js +++ b/app/components/modal-auditlog-info/component.js @@ -2,7 +2,7 @@ import Ember from 'ember'; import ModalBase from 'lacsso/components/modal-base'; export default ModalBase.extend({ - classNames: ['lacsso', 'modal-container', 'span-6', 'offset-3', 'modal-logs'], + classNames: ['lacsso', 'modal-container', 'full-width-modal', 'modal-logs'], requestObject : Ember.computed.alias('modalService.modalOpts.requestObject'), responseObject : Ember.computed.alias('modalService.modalOpts.responseObject'), requestJSON : null, diff --git a/app/components/modal-console/component.js b/app/components/modal-console/component.js index 20f0734c7..b7f15b2a7 100644 --- a/app/components/modal-console/component.js +++ b/app/components/modal-console/component.js @@ -2,6 +2,6 @@ import Ember from 'ember'; import ModalBase from 'lacsso/components/modal-base'; export default ModalBase.extend({ - classNames: ['lacsso', 'modal-container', 'span-6', 'offset-3', 'modal-shell'], + classNames: ['lacsso', 'modal-container', 'full-width-modal', 'modal-shell'], originalModel: Ember.computed.alias('modalService.modalOpts'), }); diff --git a/app/components/modal-container-logs/component.js b/app/components/modal-container-logs/component.js index 4a050d2ae..a439a39c6 100644 --- a/app/components/modal-container-logs/component.js +++ b/app/components/modal-container-logs/component.js @@ -2,7 +2,7 @@ import Ember from 'ember'; import ModalBase from 'lacsso/components/modal-base'; export default ModalBase.extend({ - classNames: ['lacsso', 'modal-container', 'span-6', 'offset-3', 'modal-logs'], + classNames: ['lacsso', 'modal-container', 'full-width-modal', 'modal-logs'], originalModel: Ember.computed.alias('modalService.modalOpts'), }); diff --git a/app/components/modal-edit-backup/component.js b/app/components/modal-edit-backup/component.js index f66347d58..097e0eb00 100644 --- a/app/components/modal-edit-backup/component.js +++ b/app/components/modal-edit-backup/component.js @@ -2,7 +2,7 @@ import Ember from 'ember'; import ModalBase from 'lacsso/components/modal-base'; export default ModalBase.extend({ - classNames: ['lacsso', 'modal-container', 'span-6', 'offset-3'], + classNames: ['lacsso', 'modal-container', 'full-width-modal'], originalModel: Ember.computed.alias('modalService.modalOpts.originalModel'), backupTargets : Ember.computed.alias('modalService.modalOpts.backupTargets'), editing : false, diff --git a/app/components/modal-edit-driver/component.js b/app/components/modal-edit-driver/component.js index 1b06ee96b..7a15031c0 100644 --- a/app/components/modal-edit-driver/component.js +++ b/app/components/modal-edit-driver/component.js @@ -3,7 +3,7 @@ import NewOrEdit from 'ui/mixins/new-or-edit'; import ModalBase from 'lacsso/components/modal-base'; export default ModalBase.extend(NewOrEdit, { - classNames: ['lacsso', 'modal-container', 'span-6', 'offset-3'], + classNames: ['lacsso', 'modal-container', 'full-width-modal'], originalModel: Ember.computed.alias('modalService.modalOpts'), settings: Ember.inject.service(), diff --git a/app/components/modal-edit-snapshot/component.js b/app/components/modal-edit-snapshot/component.js index 67f8c80c7..56abef1ca 100644 --- a/app/components/modal-edit-snapshot/component.js +++ b/app/components/modal-edit-snapshot/component.js @@ -2,7 +2,7 @@ import Ember from 'ember'; import ModalBase from 'lacsso/components/modal-base'; export default ModalBase.extend({ - classNames: ['lacsso', 'modal-container', 'span-6', 'offset-3'], + classNames: ['lacsso', 'modal-container', 'full-width-modal'], originalModel: Ember.computed.alias('modalService.modalOpts'), editing : false, clone : null, diff --git a/app/components/modal-process-error/component.js b/app/components/modal-process-error/component.js index e1c97b095..89245ad3d 100644 --- a/app/components/modal-process-error/component.js +++ b/app/components/modal-process-error/component.js @@ -2,7 +2,7 @@ import Ember from 'ember'; import ModalBase from 'lacsso/components/modal-base'; export default ModalBase.extend({ - classNames: ['lacsso', 'modal-container', 'span-6', 'offset-3', 'modal-logs'], + classNames: ['lacsso', 'modal-container', 'full-width-modal', 'modal-logs'], exception: Ember.computed.alias('modalService.modalOpts'), actions: { dismiss: function() { diff --git a/app/components/modal-shell/component.js b/app/components/modal-shell/component.js index 20f0734c7..b7f15b2a7 100644 --- a/app/components/modal-shell/component.js +++ b/app/components/modal-shell/component.js @@ -2,6 +2,6 @@ import Ember from 'ember'; import ModalBase from 'lacsso/components/modal-base'; export default ModalBase.extend({ - classNames: ['lacsso', 'modal-container', 'span-6', 'offset-3', 'modal-shell'], + classNames: ['lacsso', 'modal-container', 'full-width-modal', 'modal-shell'], originalModel: Ember.computed.alias('modalService.modalOpts'), }); diff --git a/app/components/page-footer/component.js b/app/components/page-footer/component.js index d2fa80563..e729a9596 100644 --- a/app/components/page-footer/component.js +++ b/app/components/page-footer/component.js @@ -15,7 +15,9 @@ export default Ember.Component.extend({ modalService: Ember.inject.service('modal'), actions: { showAbout() { - this.get('modalService').toggleModal('modal-about'); + this.get('modalService').toggleModal('modal-about', { + closeWithOutsideClick: true + }); }, composeDownload(os) { diff --git a/app/styles/components/_modals.scss b/app/styles/components/_modals.scss index f0d243d91..7dd8762b6 100644 --- a/app/styles/components/_modals.scss +++ b/app/styles/components/_modals.scss @@ -1,3 +1,14 @@ .lacsso.modal-overlay.modal-open .modal-container.modal-logs { max-height: 100%; } + +.lacsso { + &.full-width-modal { + &.modal-container { + width: calc(100% - 40px); + max-width: 990px; + margin: 0 auto; + } + + } +} diff --git a/package.json b/package.json index b289d5269..ec1144a49 100644 --- a/package.json +++ b/package.json @@ -54,7 +54,7 @@ "forever-agent": "^0.6.1", "glob": "^5.0.3", "http-proxy": "^1.11.1", - "lacsso": "0.0.13", + "lacsso": "^0.0.13", "liquid-fire": "0.26.1", "loader.js": "^4.0.1", "shell-quote": "^1.4.3",