From: Linda Nichols Date: Wed, 23 Jul 2014 20:16:51 +0000 (+0000) Subject: Changed the popup styling X-Git-Tag: v4.7.0-beta.2~29^2~6 X-Git-Url: http://git.roojs.org/?a=commitdiff_plain;h=08a13096aabd8c5aa99de8e8af307fad1cbcb520;p=xtuple Changed the popup styling --- diff --git a/enyo-client/extensions/source/oauth2/client/en/strings.js b/enyo-client/extensions/source/oauth2/client/en/strings.js index f34b60283..c3333ab06 100644 --- a/enyo-client/extensions/source/oauth2/client/en/strings.js +++ b/enyo-client/extensions/source/oauth2/client/en/strings.js @@ -18,8 +18,8 @@ strict:true, trailing:true, white:true */ "_fullListUrl": "Full List URL", "_generatingPrivateKey": "A new keypair will be generated for this OAUTH2 client. " + "The public key will be saved in the database with this client. The private key " + - "is available as a one-time download. The password for the key store file will be " + - "\"notasecret\". Click \"ok\" to downloading the private key.", + "is available as a one-time download with a password of " + + "\"notasecret\".", "_logoURL": "Logo URL", "_maintainOauth2clients": "Maintain OAUTH2 Clients", "_oauth2": "OAUTH2", diff --git a/lib/enyo-x/source/less/screen.less b/lib/enyo-x/source/less/screen.less index ffbd2a89c..439ac44b4 100644 --- a/lib/enyo-x/source/less/screen.less +++ b/lib/enyo-x/source/less/screen.less @@ -56,6 +56,9 @@ @defaultPanelWidth: 320px; @toolbarHeight: 55px; @searchLength: 185px; +// popups +@maxPopupHeight: 500px; +@maxPopupWidth: 500px; // libs @import "../../lib/font-awesome/less/font-awesome.less"; @@ -196,13 +199,16 @@ a, .hyperlink { */ .xv-popup { background: @header-gray; - margin: 0; - max-height: 400px; - width: 400px; + max-height: @maxPopupHeight; min-width: @defaultPanelWidth; - padding: 7px; + max-width: @maxPopupWidth; + padding: 10px; text-align: center; + .message { + margin-bottom: 10px; + } + &.xv-groupbox-popup { .xv-workspace-container > .xv-workspace > .xv-workspace-panel; color: @black; diff --git a/lib/enyo-x/source/stylesheets/screen.css b/lib/enyo-x/source/stylesheets/screen.css index 0edfcd6fa..7c6662a36 100755 --- a/lib/enyo-x/source/stylesheets/screen.css +++ b/lib/enyo-x/source/stylesheets/screen.css @@ -1628,13 +1628,15 @@ a, */ .xv-popup { background: #505050; - margin: 0; - max-height: 400px; - width: 400px; + max-height: 500px; min-width: 320px; - padding: 7px; + max-width: 500px; + padding: 10px; text-align: center; } +.xv-popup .message { + margin-bottom: 10px; +} .xv-popup.xv-groupbox-popup { width: 320px; margin: 0 4px 0 2px; diff --git a/lib/enyo-x/source/views/module_container.js b/lib/enyo-x/source/views/module_container.js index dff7f031d..0622eec49 100644 --- a/lib/enyo-x/source/views/module_container.js +++ b/lib/enyo-x/source/views/module_container.js @@ -38,19 +38,20 @@ trailing:true, white:true*/ {name: "startupProgressBar", kind: "onyx.ProgressBar", classes: "xv-startup-progress onyx-progress-button", progress: 0} ]}, - {kind: "onyx.Popup", name: "notifyPopup", centered: true, + {kind: "onyx.Popup", name: "notifyPopup", classes: "xv-popup", centered: true, onHide: "notifyHidden", modal: true, floating: true, scrim: true, components: [ - {name: "notifyMessage"}, - {tag: "br"}, - {kind: "onyx.Button", content: "_ok".loc(), name: "notifyOk", ontap: "notifyTap", - classes: "xv-popup-button", showing: false}, - {kind: "onyx.Button", content: "_yes".loc(), name: "notifyYes", ontap: "notifyTap", - classes: "xv-popup-button", showing: false}, - {kind: "onyx.Button", content: "_no".loc(), name: "notifyNo", ontap: "notifyTap", - classes: "xv-popup-button", showing: false}, - {kind: "onyx.Button", content: "_cancel".loc(), name: "notifyCancel", ontap: "notifyTap", - classes: "xv-popup-button", showing: false} + {name: "notifyMessage", classes: "message"}, + {classes: "xv-buttons", name: "notifyButtons", components: [ + {kind: "onyx.Button", content: "_ok".loc(), name: "notifyOk", ontap: "notifyTap", + showing: false, classes: "text"}, + {kind: "onyx.Button", content: "_yes".loc(), name: "notifyYes", ontap: "notifyTap", + showing: false, classes: "text"}, + {kind: "onyx.Button", content: "_no".loc(), name: "notifyNo", ontap: "notifyTap", + showing: false, classes: "text"}, + {kind: "onyx.Button", content: "_cancel".loc(), name: "notifyCancel", ontap: "notifyTap", + showing: false, classes: "text"} + ]} ]}, {kind: "onyx.Popup", name: "popupWorkspace", classes: "xv-popup xv-groupbox-popup", centered: true, autoDismiss: false, modal: true, floating: true, scrim: true}, @@ -172,9 +173,7 @@ trailing:true, white:true*/ return this.$.navigator; }, getNotifyButtons: function () { - return _.filter(this.$, function (control) { - return control.name.substring(0, 6) === 'notify' && control.kind === 'onyx.Button'; - }); + return this.$.notifyButtons.controls; }, getStartupProgressBar: function () { return this.$.startupProgressBar; @@ -252,19 +251,10 @@ trailing:true, white:true*/ inEvent.type = inEvent.type || XM.Model.NOTICE; // show the appropriate buttons - _.each(this.$.notifyPopup.children, function (component) { - if (component.kind !== "onyx.Button") { - // not a button: do nothing. - } else if (_.indexOf(typeToButtonMap[String(inEvent.type)], component.name) >= 0) { - // in the show-me array, so show - component.setShowing(true); - } else { - // not in the show-me array, so hide - component.setShowing(false); - } + _.each(this.getNotifyButtons(), function (component) { + component.setShowing(_.indexOf(typeToButtonMap[String(inEvent.type)], component.name) >= 0); }); - // allow custom button text this.$.notifyYes.setContent(inEvent.yesLabel || "_yes".loc()); this.$.notifyNo.setContent(inEvent.noLabel || "_no".loc()); @@ -275,7 +265,7 @@ trailing:true, white:true*/ // it's the OK button unless it's a 2- or 3- way question, in which case it's YES this._activeNotify = inEvent.type === XM.Model.QUESTION || inEvent.type === XM.Model.YES_NO_CANCEL ? 1 : 0; _.each(this.getNotifyButtons(), function (button, index) { - button.addRemoveClass("onyx-blue", index === that._activeNotify); + button.addRemoveClass("selected", index === that._activeNotify); }); // delete out any previously added customComponents/customComponentControls @@ -298,6 +288,7 @@ trailing:true, white:true*/ inEvent.component.name = "customComponent"; inEvent.component.addBefore = this.$.notifyOk; this.$.notifyPopup.createComponent(inEvent.component); + // TODO: this inline style needs to go away this.$.notifyPopup.$.customComponent.addStyles("color:black;"); if (inEvent.componentModel) { this.$.notifyPopup.$.customComponent.setValue(inEvent.componentModel);