Univention Bugzilla – Attachment 9156 Details for
Bug 43999
Adjust styling of dialogs
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
patch
43999.patch (text/plain), 50.04 KB, created by
Johannes Keiser
on 2017-08-30 13:29 CEST
(
hide
)
Description:
patch
Filename:
MIME Type:
Creator:
Johannes Keiser
Created:
2017-08-30 13:29 CEST
Size:
50.04 KB
patch
obsolete
>Index: base/univention-app-appliance/templates/setup_style.css >=================================================================== >diff --git a/branches/ucs-4.2/ucs-4.2-1/base/univention-app-appliance/templates/setup_style.css b/branches/ucs-4.2/ucs-4.2-1/base/univention-app-appliance/templates/setup_style.css >--- a/branches/ucs-4.2/ucs-4.2-1/base/univention-app-appliance/templates/setup_style.css (Revision 82537) >+++ b/branches/ucs-4.2/ucs-4.2-1/base/univention-app-appliance/templates/setup_style.css (Arbeitskopie) >@@ -26,7 +26,7 @@ > background-size: auto 20px; > } > >-.umc .umcCard .dijitDefaultButton .dijitButtonText { >+.umc .umcInlineDialog .dijitDefaultButton .dijitButtonText { > color: %(primary_color)s; > } > >Index: base/univention-app-appliance/templates/system_activation_style.css >=================================================================== >diff --git a/branches/ucs-4.2/ucs-4.2-1/base/univention-app-appliance/templates/system_activation_style.css b/branches/ucs-4.2/ucs-4.2-1/base/univention-app-appliance/templates/system_activation_style.css >--- a/branches/ucs-4.2/ucs-4.2-1/base/univention-app-appliance/templates/system_activation_style.css (Revision 82537) >+++ b/branches/ucs-4.2/ucs-4.2-1/base/univention-app-appliance/templates/system_activation_style.css (Arbeitskopie) >@@ -26,8 +26,8 @@ > background-size: auto 20px; > } > >-.umc .umcWizard.umcCard .dijitDefaultButton .dijitButtonText, >-.umc .umcWizard.umcCard .dijitUploader .dijitButtonText { >+.umc .umcWizard.umcInlineDialog .dijitDefaultButton .dijitButtonText, >+.umc .umcWizard.umcInlineDialog .dijitUploader .dijitButtonText { > color: %(primary_color)s; > } > >Index: base/univention-firewall/umc/js/firewall.js >=================================================================== >diff --git a/branches/ucs-4.2/ucs-4.2-1/base/univention-firewall/umc/js/firewall.js b/branches/ucs-4.2/ucs-4.2-1/base/univention-firewall/umc/js/firewall.js >--- a/branches/ucs-4.2/ucs-4.2-1/base/univention-firewall/umc/js/firewall.js (Revision 82537) >+++ b/branches/ucs-4.2/ucs-4.2-1/base/univention-firewall/umc/js/firewall.js (Arbeitskopie) >@@ -221,11 +221,11 @@ > var _confirmDialog = lang.hitch(this, function() { > var message = _('Are you sure to delete the %d selected firewall rule(s)?', ids.length); > dialog.confirm(message, [{ >+ label: _('Cancel'), >+ 'default': true >+ }, { > label: _('Delete'), > callback: _remove >- }, { >- label: _('Cancel'), >- 'default': true > }]); > }); > >Index: base/univention-quota/umc/js/quota/PartitionPage.js >=================================================================== >diff --git a/branches/ucs-4.2/ucs-4.2-1/base/univention-quota/umc/js/quota/PartitionPage.js b/branches/ucs-4.2/ucs-4.2-1/base/univention-quota/umc/js/quota/PartitionPage.js >--- a/branches/ucs-4.2/ucs-4.2-1/base/univention-quota/umc/js/quota/PartitionPage.js (Revision 82537) >+++ b/branches/ucs-4.2/ucs-4.2-1/base/univention-quota/umc/js/quota/PartitionPage.js (Arbeitskopie) >@@ -215,6 +215,9 @@ > dialogMessage = _('Please confirm to remove the following %(length)s users: %(usernames)s', {'usernames': usernames, 'length': usernames.length}); > } > dialog.confirm(dialogMessage, [{ >+ label: _('Cancel'), >+ 'default': true >+ }, { > label: _('OK'), > callback: lang.hitch(this, function() { > var transaction = this.moduleStore.transaction(); >@@ -237,8 +240,6 @@ > } > })); > }) >- }, { >- label: _('Cancel') > }]); > } > }); >Index: base/univention-quota/umc/js/quota.js >=================================================================== >diff --git a/branches/ucs-4.2/ucs-4.2-1/base/univention-quota/umc/js/quota.js b/branches/ucs-4.2/ucs-4.2-1/base/univention-quota/umc/js/quota.js >--- a/branches/ucs-4.2/ucs-4.2-1/base/univention-quota/umc/js/quota.js (Revision 82537) >+++ b/branches/ucs-4.2/ucs-4.2-1/base/univention-quota/umc/js/quota.js (Arbeitskopie) >@@ -194,6 +194,9 @@ > dialogMessage = _('Please confirm quota support deactivation on device: %s', [partitionDevice]); > } > dialog.confirm(dialogMessage, [{ >+ label: _('Cancel'), >+ 'default': true >+ }, { > label: _('OK'), > callback: lang.hitch(this, function() { > var cmd = 'quota/partitions/' + (doActivate ? 'activate' : 'deactivate'); >@@ -206,9 +209,6 @@ > } > })); > }) >- }, { >- label: _('Cancel'), >- 'default': true > }]); > }, > >Index: base/univention-system-activation/www/main.js >=================================================================== >diff --git a/branches/ucs-4.2/ucs-4.2-1/base/univention-system-activation/www/main.js b/branches/ucs-4.2/ucs-4.2-1/base/univention-system-activation/www/main.js >--- a/branches/ucs-4.2/ucs-4.2-1/base/univention-system-activation/www/main.js (Revision 82537) >+++ b/branches/ucs-4.2/ucs-4.2-1/base/univention-system-activation/www/main.js (Arbeitskopie) >@@ -90,7 +90,7 @@ > > createWizard: function() { > this._wizard = new ActivationWizard({ >- 'class': 'umcCard', >+ 'class': 'umcInlineDialog', > entries: entries > }); > var contentNode = dom.byId('content'); >Index: base/univention-system-activation/www/style.styl >=================================================================== >diff --git a/branches/ucs-4.2/ucs-4.2-1/base/univention-system-activation/www/style.styl b/branches/ucs-4.2/ucs-4.2-1/base/univention-system-activation/www/style.styl >--- a/branches/ucs-4.2/ucs-4.2-1/base/univention-system-activation/www/style.styl (Revision 82537) >+++ b/branches/ucs-4.2/ucs-4.2-1/base/univention-system-activation/www/style.styl (Arbeitskopie) >@@ -48,26 +48,15 @@ > height: 100% > margin-left: 12px > >- .umcWizard.umcCard >+ .umcWizard.umcInlineDialog > max-width: 700px > > ol > margin: 10px 0 > >- .dijitDefaultButton, >- .dijitUploader >- .dijitButtonText >- color: $ucs-green >- > .umcPage > .umcLabelPaneLabeNodeBottom > display: none > > .umcPageNav >- margin-top: 20px > margin-bottom: 0 >- >- .umcPageHeader >- h1 >- font-size: 24px >- font-weight: normal >Index: base/univention-system-setup/umc/js/setup/InterfaceWizard.js >=================================================================== >diff --git a/branches/ucs-4.2/ucs-4.2-1/base/univention-system-setup/umc/js/setup/InterfaceWizard.js b/branches/ucs-4.2/ucs-4.2-1/base/univention-system-setup/umc/js/setup/InterfaceWizard.js >--- a/branches/ucs-4.2/ucs-4.2-1/base/univention-system-setup/umc/js/setup/InterfaceWizard.js (Revision 82537) >+++ b/branches/ucs-4.2/ucs-4.2-1/base/univention-system-setup/umc/js/setup/InterfaceWizard.js (Arbeitskopie) >@@ -630,8 +630,8 @@ > var description = string.substitute('<ul><li>${0}: ${1}</li><li>${2}: ${3}</li></ul>', [_('Gateway'), result.gateway || _('None'), _('Nameserver'), nameservers]); > > dialog.confirm(_('Should the nameserver and gateway be set: %s', description), [ >- {label: _('set'), name: 'yes', 'default': true}, >- {label: _("don't set"), name: 'no'} >+ {label: _("don't set"), name: 'no'}, >+ {label: _('set'), name: 'yes', 'default': true} > ]).then(lang.hitch(this, function(answer) { > if (answer === 'yes') { > this.setValues({ >Index: base/univention-system-setup/usr/share/univention-system-setup/www/main.js >=================================================================== >diff --git a/branches/ucs-4.2/ucs-4.2-1/base/univention-system-setup/usr/share/univention-system-setup/www/main.js b/branches/ucs-4.2/ucs-4.2-1/base/univention-system-setup/usr/share/univention-system-setup/www/main.js >--- a/branches/ucs-4.2/ucs-4.2-1/base/univention-system-setup/usr/share/univention-system-setup/www/main.js (Revision 82537) >+++ b/branches/ucs-4.2/ucs-4.2-1/base/univention-system-setup/usr/share/univention-system-setup/www/main.js (Arbeitskopie) >@@ -133,7 +133,7 @@ > > this.wizard = new ApplianceWizard({ > //progressBar: progressBar >- 'class': this.local_mode ? '' : 'umcCard', >+ 'class': this.local_mode ? '' : 'umcInlineDialog', > moduleID: this.moduleID, > disabledPages: pageBlacklist, > disabledFields: fieldBlacklist, >Index: base/univention-system-setup/usr/share/univention-system-setup/www/style.styl >=================================================================== >diff --git a/branches/ucs-4.2/ucs-4.2-1/base/univention-system-setup/usr/share/univention-system-setup/www/style.styl b/branches/ucs-4.2/ucs-4.2-1/base/univention-system-setup/usr/share/univention-system-setup/www/style.styl >--- a/branches/ucs-4.2/ucs-4.2-1/base/univention-system-setup/usr/share/univention-system-setup/www/style.styl (Revision 82537) >+++ b/branches/ucs-4.2/ucs-4.2-1/base/univention-system-setup/usr/share/univention-system-setup/www/style.styl (Arbeitskopie) >@@ -35,7 +35,7 @@ > min-height: 100% > > @media (min-width: 768px) >- .container:not(.umcCard) >+ .container:not(.umcInlineDialog) > width: 100%; > > /* standby animation */ >@@ -66,7 +66,7 @@ > width: 100% > > .umcPage >- margin-top: 65px >+ margin-top: 41px > > .umcPageNav .umcPageHeader > position: absolute >@@ -77,7 +77,7 @@ > font-weight: normal > width: 600px > >- .umcCard >+ .umcInlineDialog > /* the content is displayed as a Google Material Card in an external browser */ > max-width: 970px > >Index: management/univention-appcenter/umc/js/appcenter/PackagesPage.js >=================================================================== >diff --git a/branches/ucs-4.2/ucs-4.2-1/management/univention-appcenter/umc/js/appcenter/PackagesPage.js b/branches/ucs-4.2/ucs-4.2-1/management/univention-appcenter/umc/js/appcenter/PackagesPage.js >--- a/branches/ucs-4.2/ucs-4.2-1/management/univention-appcenter/umc/js/appcenter/PackagesPage.js (Revision 82537) >+++ b/branches/ucs-4.2/ucs-4.2-1/management/univention-appcenter/umc/js/appcenter/PackagesPage.js (Arbeitskopie) >@@ -192,7 +192,7 @@ > > this._grid.standby(false); > >- var head_style = 'font-size:120%;font-weight:bold;margin:.5em;text-decoration:underline;'; >+ var head_style = 'font-size:120%;font-weight:bold;margin-bottom:.5em;text-decoration:underline;'; > var label_style = 'vertical-align:top;text-align:right;padding-left:1em;padding-right:.5em;white-space:nowrap;font-weight:bold;'; > var data_style = 'vertical-align:top;padding-bottom:.25em;'; > >@@ -228,6 +228,13 @@ > })); > txt += "</table>\n"; > var buttons = []; >+ // always: a button to close the dialog. >+ buttons.push({ >+ name: 'cancel', >+ 'default': true, >+ label: _("Close") >+ }); >+ > if (this._can_install(data.result)) { > buttons.push({ > name: 'install', >@@ -255,12 +262,6 @@ > }) > }); > } >- // always: a button to close the dialog. >- buttons.push({ >- name: 'cancel', >- 'default': true, >- label: _("Close") >- }); > > var confirmDialog = new ConfirmDialog({ > title: _('Package details'), >@@ -436,7 +437,7 @@ > ]; > } > >- dialog.confirm('<h2>' + headline + '</h2>' + txt, buttons); >+ dialog.confirm('<h2 style="margin-top:0;">' + headline + '</h2>' + txt, buttons); > })); > }, > >Index: management/univention-join/umc/js/join.js >=================================================================== >diff --git a/branches/ucs-4.2/ucs-4.2-1/management/univention-join/umc/js/join.js b/branches/ucs-4.2/ucs-4.2-1/management/univention-join/umc/js/join.js >--- a/branches/ucs-4.2/ucs-4.2-1/management/univention-join/umc/js/join.js (Revision 82537) >+++ b/branches/ucs-4.2/ucs-4.2-1/management/univention-join/umc/js/join.js (Arbeitskopie) >@@ -240,15 +240,15 @@ > if (this._serverRole == 'domaincontroller_master') { > // we do not need credentials on DC master > dialog.confirm(_('The following join scripts will be executed: ') + txtscripts, [{ >+ name: 'cancel', >+ label: 'Cancel', >+ 'default': true >+ }, { > name: 'run', > label: _('Run join scripts'), > callback: lang.hitch(this, function() { > this.runJoinScripts(scripts, force, {}); > }) >- }, { >- name: 'cancel', >- label: 'Cancel', >- 'default': true > }]); > } else { > this.getCredentials(txtscripts).then(lang.hitch(this, function(credentials) { >Index: management/univention-management-console/umc-module-templates/simple_form/umc/js/MODULEID.js >=================================================================== >diff --git a/branches/ucs-4.2/ucs-4.2-1/management/univention-management-console/umc-module-templates/simple_form/umc/js/MODULEID.js b/branches/ucs-4.2/ucs-4.2-1/management/univention-management-console/umc-module-templates/simple_form/umc/js/MODULEID.js >--- a/branches/ucs-4.2/ucs-4.2-1/management/univention-management-console/umc-module-templates/simple_form/umc/js/MODULEID.js (Revision 82537) >+++ b/branches/ucs-4.2/ucs-4.2-1/management/univention-management-console/umc-module-templates/simple_form/umc/js/MODULEID.js (Arbeitskopie) >@@ -156,13 +156,13 @@ > var values = this._form.get('value'); > if ( values.message ) { > dialog.confirm( _( 'Should the UMC module be closed? All unsaved modification will be lost.' ), [ { >+ label: _( 'Cancel' ), >+ 'default': true >+ }, { > label: _( 'Close' ), > callback: lang.hitch( this, function() { > topic.publish('/umc/tabs/close', [ this ] ); > } ) >- }, { >- label: _( 'Cancel' ), >- 'default': true > } ] ); > } else { > topic.publish('/umc/tabs/close', [ this ] ); >Index: management/univention-management-console/www/management/widgets/ActivationDialog.js >=================================================================== >diff --git a/branches/ucs-4.2/ucs-4.2-1/management/univention-management-console/www/management/widgets/ActivationDialog.js b/branches/ucs-4.2/ucs-4.2-1/management/univention-management-console/www/management/widgets/ActivationDialog.js >--- a/branches/ucs-4.2/ucs-4.2-1/management/univention-management-console/www/management/widgets/ActivationDialog.js (Revision 82537) >+++ b/branches/ucs-4.2/ucs-4.2-1/management/univention-management-console/www/management/widgets/ActivationDialog.js (Arbeitskopie) >@@ -41,14 +41,15 @@ > "umc/widgets/Wizard", > "umc/widgets/Text", > "umc/widgets/ProgressBar", >+ "umc/widgets/StandbyMixin", > "./ActivationPage!", // needs to be loaded as AMD plugin > "./LicenseImportPage!", // needs to be loaded as AMD plugin > "./FinishedActivationPage", > "umc/i18n!management" > ], function(declare, lang, array, domClass, when, topic, Dialog, tools, dialog, Wizard, Text, ProgressBar, >- ActivationPage, LicenseImportPage, FinishedActivationPage, _) { >+ StandbyMixin, ActivationPage, LicenseImportPage, FinishedActivationPage, _) { > >- return declare(Dialog, { >+ return declare([Dialog, StandbyMixin], { > // summary: > // The dialog which is shown during the first login of Administrator. > >@@ -98,7 +99,7 @@ > return success ? nextPage : pageName; > }); > thisDialog._progressBar.setInfo(_('Sending activation email...'), null, Infinity); >- this.standbyDuring(deferred, thisDialog._progressBar); >+ thisDialog.standbyDuring(deferred, thisDialog._progressBar); > return deferred; > }, > >@@ -137,7 +138,7 @@ > licenseUploader.onImportLicense = lang.hitch(this, function(deferred) { > this._progressBar.setInfo(_('Importing license data...'), null, Infinity); > topic.publish('/umc/actions', 'activation-wizard', 'licenseImport', 'upload'); >- this._wizard.standbyDuring(deferred, this._progressBar); >+ this.standbyDuring(deferred, this._progressBar); > deferred.then(lang.hitch(this, function() { > // activation has been successful -> close dialogue > topic.publish('/umc/actions', 'activation-wizard', 'licenseImport', 'success'); >Index: management/univention-management-console-module-services/umc/js/services.js >=================================================================== >diff --git a/branches/ucs-4.2/ucs-4.2-1/management/univention-management-console-module-services/umc/js/services.js b/branches/ucs-4.2/ucs-4.2-1/management/univention-management-console-module-services/umc/js/services.js >--- a/branches/ucs-4.2/ucs-4.2-1/management/univention-management-console-module-services/umc/js/services.js (Revision 82537) >+++ b/branches/ucs-4.2/ucs-4.2-1/management/univention-management-console-module-services/umc/js/services.js (Arbeitskopie) >@@ -230,6 +230,9 @@ > confirmMessage += '</ul>'; > > dialog.confirm(confirmMessage, [{ >+ 'default': true, >+ label: _('Cancel') >+ }, { > label: _('OK'), > callback: lang.hitch(this, function() { > this.standbyDuring(tools.umcpCommand(command, data)).then(lang.hitch(this, function(response) { >@@ -236,9 +239,6 @@ > this.reloadGrid(); > })); > }) >- }, { >- 'default': true, >- label: _('Cancel') > }]); > } > }); >Index: management/univention-management-console-module-top/umc/js/top.js >=================================================================== >diff --git a/branches/ucs-4.2/ucs-4.2-1/management/univention-management-console-module-top/umc/js/top.js b/branches/ucs-4.2/ucs-4.2-1/management/univention-management-console-module-top/umc/js/top.js >--- a/branches/ucs-4.2/ucs-4.2-1/management/univention-management-console-module-top/umc/js/top.js (Revision 82537) >+++ b/branches/ucs-4.2/ucs-4.2-1/management/univention-management-console-module-top/umc/js/top.js (Arbeitskopie) >@@ -64,6 +64,9 @@ > msg = _('Please confirm sending %(signal)s to the %(processid)s selected processes!', {signal: signal, processid: pids.length}); > } > dialog.confirm(msg, [{ >+ 'default': true, >+ label: _('Cancel') >+ }, { > label: _('OK'), > callback: lang.hitch(this, function() { > this.standbyDuring(this.umcpCommand('top/kill', params)).then(lang.hitch(this, function() { >@@ -71,9 +74,6 @@ > this.reloadGrid(); > })); > }) >- }, { >- 'default': true, >- label: _('Cancel') > }]); > }, > >Index: management/univention-management-console-module-ucr/umc/js/ucr.js >=================================================================== >diff --git a/branches/ucs-4.2/ucs-4.2-1/management/univention-management-console-module-ucr/umc/js/ucr.js b/branches/ucs-4.2/ucs-4.2-1/management/univention-management-console-module-ucr/umc/js/ucr.js >--- a/branches/ucs-4.2/ucs-4.2-1/management/univention-management-console-module-ucr/umc/js/ucr.js (Revision 82537) >+++ b/branches/ucs-4.2/ucs-4.2-1/management/univention-management-console-module-ucr/umc/js/ucr.js (Arbeitskopie) >@@ -102,13 +102,6 @@ > }]; > > var buttons = [{ >- name: 'submit', >- label: _( 'Save' ), >- style: 'float: right', >- callback: lang.hitch(this, function() { >- this._form.save(); >- }) >- }, { > //FIXME: Should be much simpler. The key name should be enough > name: 'cancel', > label: _( 'Cancel' ), >@@ -115,6 +108,12 @@ > callback: lang.hitch(this, function() { > this.hide(); > }) >+ }, { >+ name: 'submit', >+ label: _( 'Save' ), >+ callback: lang.hitch(this, function() { >+ this._form.save(); >+ }) > }]; > > var layout = ['key', 'value', 'description'];//, ['categories']]; >@@ -257,6 +256,9 @@ > isMultiAction: true, > callback: lang.hitch(this, function(ids) { > dialog.confirm(_('Are you sure to delete the %d selected UCR variable(s)?', ids.length), [{ >+ label: _('Cancel'), >+ 'default': true >+ }, { > label: _('Delete'), > callback: lang.hitch(this, function() { > // remove the selected elements via a transaction on the module store >@@ -264,9 +266,6 @@ > array.forEach(ids, lang.hitch(this.moduleStore, 'remove')); > transaction.commit(); > }) >- }, { >- label: _('Cancel'), >- 'default': true > }]); > > }) >Index: management/univention-management-console-module-udm/umc/js/udm/CreateReportDialog.js >=================================================================== >diff --git a/branches/ucs-4.2/ucs-4.2-1/management/univention-management-console-module-udm/umc/js/udm/CreateReportDialog.js b/branches/ucs-4.2/ucs-4.2-1/management/univention-management-console-module-udm/umc/js/udm/CreateReportDialog.js >--- a/branches/ucs-4.2/ucs-4.2-1/management/univention-management-console-module-udm/umc/js/udm/CreateReportDialog.js (Revision 82537) >+++ b/branches/ucs-4.2/ucs-4.2-1/management/univention-management-console-module-udm/umc/js/udm/CreateReportDialog.js (Arbeitskopie) >@@ -94,18 +94,17 @@ > > // buttons > var buttons = [ { >- name: 'create', >- label: _('Create'), >- defaultButton: true, >- callback: lang.hitch(this, function() { >- this.onDone(this._form.get('value')); >- }) >- }, { > name: 'cancel', > label: _('Cancel'), > callback: lang.hitch(this, function() { > this.destroyRecursive(); > }) >+ }, { >+ name: 'submit', >+ label: _('Create'), >+ callback: lang.hitch(this, function() { >+ this.onDone(this._form.get('value')); >+ }) > } ]; > > // now create a Form >@@ -209,13 +208,11 @@ > this._container.addChild(new Text({content: message})); > > var btnContainer = new ContainerWidget({ >- style: 'text-align: center;', > 'class' : 'umcButtonRow' > }); > btnContainer.addChild(new Button({ > defaultButton: true, > label: _('Close'), >- style: 'margin-left: auto;', > callback: lang.hitch(this, function() { > this.destroyRecursive(); > }) >Index: management/univention-management-console-module-udm/umc/js/udm/LicenseImportDialog.js >=================================================================== >diff --git a/branches/ucs-4.2/ucs-4.2-1/management/univention-management-console-module-udm/umc/js/udm/LicenseImportDialog.js b/branches/ucs-4.2/ucs-4.2-1/management/univention-management-console-module-udm/umc/js/udm/LicenseImportDialog.js >--- a/branches/ucs-4.2/ucs-4.2-1/management/univention-management-console-module-udm/umc/js/udm/LicenseImportDialog.js (Revision 82537) >+++ b/branches/ucs-4.2/ucs-4.2-1/management/univention-management-console-module-udm/umc/js/udm/LicenseImportDialog.js (Arbeitskopie) >@@ -42,8 +42,9 @@ > "umc/widgets/TextArea", > "umc/widgets/Uploader", > "umc/widgets/ProgressBar", >+ "umc/widgets/Button", > "umc/i18n!umc/modules/udm" >-], function(declare, lang, domClass, tools, dialog, render, ContainerWidget, ConfirmDialog, StandbyMixin, Text, TextArea, Uploader, ProgressBar, _) { >+], function(declare, lang, domClass, tools, dialog, render, ContainerWidget, ConfirmDialog, StandbyMixin, Text, TextArea, Uploader, ProgressBar, Button, _) { > > return declare('umc.modules.udm.LicenseImportDialog', [ConfirmDialog, StandbyMixin], { > // summary: >@@ -96,9 +97,8 @@ > } > this._handleUploaded(result); > }) >- }]); >- >- var buttons = [{ >+ }, { >+ type: Button, > name : 'btnLicenseText', > label : _('Import from text field'), > callback: lang.hitch(this, function() { >@@ -114,9 +114,11 @@ > }) > ), this._progressBar); > }) >- }, { >- name: 'submit', // workaround for a style as default button >- style: 'float: right', >+ }]); >+ >+ this.options = [{ >+ 'default': true, >+ name: 'close', > label: _('Close'), > callback: lang.hitch(this, function() { > this.close(); >@@ -128,9 +130,10 @@ > 'message', > 'licenseUpload', > 'licenseText', >- ['btnLicenseText', 'submit'] >- ], this._widgets, render.buttons(buttons)); >+ 'btnLicenseText' >+ ], this._widgets); > domClass.add(content.domNode, 'col-xxs-12 col-xs-8'); >+ domClass.add(this._widgets.btnLicenseText.$refLabel$.domNode, 'umcUploader'); > this.message.addChild(content); > }, > >Index: management/univention-management-console-module-udm/umc/js/udm/NewObjectDialog.js >=================================================================== >diff --git a/branches/ucs-4.2/ucs-4.2-1/management/univention-management-console-module-udm/umc/js/udm/NewObjectDialog.js b/branches/ucs-4.2/ucs-4.2-1/management/univention-management-console-module-udm/umc/js/udm/NewObjectDialog.js >--- a/branches/ucs-4.2/ucs-4.2-1/management/univention-management-console-module-udm/umc/js/udm/NewObjectDialog.js (Revision 82537) >+++ b/branches/ucs-4.2/ucs-4.2-1/management/univention-management-console-module-udm/umc/js/udm/NewObjectDialog.js (Arbeitskopie) >@@ -38,14 +38,15 @@ > "dijit/Dialog", > "dijit/layout/StackContainer", > "umc/tools", >+ "umc/widgets/StandbyMixin", > "umc/modules/udm/cache", > "umc/modules/udm/wizards/FirstPageWizard", > "umc/modules/udm/NotificationText", > "umc/modules/udm/UsernameMaxLengthChecker", > "umc/i18n!umc/modules/udm" >-], function(declare, lang, array, topic, all, Deferred, Dialog, StackContainer, tools, cache, FirstPageWizard, NotificationText, UsernameMaxLengthChecker, _) { >+], function(declare, lang, array, topic, all, Deferred, Dialog, StackContainer, tools, StandbyMixin, cache, FirstPageWizard, NotificationText, UsernameMaxLengthChecker, _) { > >- return declare("umc.modules.udm.NewObjectDialog", [ Dialog ], { >+ return declare("umc.modules.udm.NewObjectDialog", [ Dialog, StandbyMixin ], { > // summary: > // Dialog class for creating a new LDAP object. > >@@ -201,7 +202,7 @@ > wizardDeferred.reject(); > } > this._readyForCreateWizard = new Deferred(); >- this._preWizard.standbyDuring(all([this.createWizardAdded, wizardDeferred])); >+ this.standbyDuring(all([this.createWizardAdded, wizardDeferred])); > this.onFirstPageFinished(firstPageValues); > > wizardDeferred.then( >@@ -227,7 +228,7 @@ > this._wizardContainer.selectChild(createWizard); > this.createWizardAdded.resolve(); > var finishWizard = lang.hitch(this, function(wizardFormValues, submit) { >- createWizard.standbyDuring(detailsValues.detailPage.ready()).then(lang.hitch(this, function() { >+ this.standbyDuring(detailsValues.detailPage.ready()).then(lang.hitch(this, function() { > lang.mixin(detailsValues.detailPage.templateObject._userChanges, createWizard.templateObject._userChanges); > tools.forIn(wizardFormValues, lang.hitch(this, function(key, val) { > detailsValues.detailPage._form.getWidget(key).set('value', val); >@@ -237,7 +238,7 @@ > detailsValues.detailPage._form.ready().then(lang.hitch(this, function() { > var saveDeferred = detailsValues.detailPage.save(); > if (saveDeferred.then) { >- createWizard.standbyDuring(saveDeferred); >+ this.standbyDuring(saveDeferred); > saveDeferred.then( > lang.hitch(this, function() { > this._notificationText.showSuccess(_('The %s has been created.', createWizard.objectName())); >Index: management/univention-management-console-module-udm/umc/js/udm/NotificationText.js >=================================================================== >diff --git a/branches/ucs-4.2/ucs-4.2-1/management/univention-management-console-module-udm/umc/js/udm/NotificationText.js b/branches/ucs-4.2/ucs-4.2-1/management/univention-management-console-module-udm/umc/js/udm/NotificationText.js >--- a/branches/ucs-4.2/ucs-4.2-1/management/univention-management-console-module-udm/umc/js/udm/NotificationText.js (Revision 82537) >+++ b/branches/ucs-4.2/ucs-4.2-1/management/univention-management-console-module-udm/umc/js/udm/NotificationText.js (Arbeitskopie) >@@ -66,7 +66,7 @@ > > domStyle.set(this.domNode, { > height: "0", >- margin: "-1.61em -1.6em 1em -1.6em", >+ margin: "0 -24px", > position: "relative", > "-webkit-transition": "height 1s", > "transition": "height 1s", >@@ -101,6 +101,7 @@ > this.set('message', message); > domStyle.set(this.domNode, { > padding: "0.3em 1.6em", >+ "margin-bottom": "8px", > height: "auto" > }); > })); >@@ -109,6 +110,7 @@ > _hideMessage: function(stopDeferred) { > domStyle.set(this.domNode, { > padding: "0", >+ "margin-bottom": "", > height: "0" > }); > >Index: management/univention-management-console-module-udm/umc/js/udm.js >=================================================================== >diff --git a/branches/ucs-4.2/ucs-4.2-1/management/univention-management-console-module-udm/umc/js/udm.js b/branches/ucs-4.2/ucs-4.2-1/management/univention-management-console-module-udm/umc/js/udm.js >--- a/branches/ucs-4.2/ucs-4.2-1/management/univention-management-console-module-udm/umc/js/udm.js (Revision 82537) >+++ b/branches/ucs-4.2/ucs-4.2-1/management/univention-management-console-module-udm/umc/js/udm.js (Arbeitskopie) >@@ -1802,8 +1802,7 @@ > }, { > name: 'remove', > label: _('Delete'), >- callback: _remove, >- style: 'float:right' >+ callback: _remove > }] > //layout: [ 'text', [ 'deleteReferring', 'submit' ] ] > }); >Index: management/univention-self-service/www/PasswordForgotten.js >=================================================================== >diff --git a/branches/ucs-4.2/ucs-4.2-1/management/univention-self-service/www/PasswordForgotten.js b/branches/ucs-4.2/ucs-4.2-1/management/univention-self-service/www/PasswordForgotten.js >--- a/branches/ucs-4.2/ucs-4.2-1/management/univention-self-service/www/PasswordForgotten.js (Revision 82537) >+++ b/branches/ucs-4.2/ucs-4.2-1/management/univention-self-service/www/PasswordForgotten.js (Arbeitskopie) >@@ -173,7 +173,7 @@ > label: _('Next'), > onClick: lang.hitch(this, '_requestToken') > }); >- var buttonRow = put(step, 'div.buttonRow'); >+ var buttonRow = put(step, 'div.buttonRow.umcPageFooter'); > put(buttonRow, this._requestTokenButton.domNode); > put(this.steps, step); > var firstRenewOptions = renewOptions.firstChild.children[2].firstChild; >Index: management/univention-self-service/www/css/self-service.styl >=================================================================== >diff --git a/branches/ucs-4.2/ucs-4.2-1/management/univention-self-service/www/css/self-service.styl b/branches/ucs-4.2/ucs-4.2-1/management/univention-self-service/www/css/self-service.styl >--- a/branches/ucs-4.2/ucs-4.2-1/management/univention-self-service/www/css/self-service.styl (Revision 82537) >+++ b/branches/ucs-4.2/ucs-4.2-1/management/univention-self-service/www/css/self-service.styl (Arbeitskopie) >@@ -21,7 +21,7 @@ > } > > ol.PasswordOl { >- margin-left: 0; >+ margin: 0 > padding-right: 0; > padding-left: 0; > list-style-type: none; >@@ -45,7 +45,11 @@ > text-align: right; > > .dijitButton { >- margin: 0.6em 0 0 0.6em; >+ margin: 24px 0 0 !important; >+ >+ &:not(:first-child) { >+ margin-left: 8px !important; >+ } > } > } > >@@ -53,6 +57,15 @@ > margin-bottom: 1.5em; > } > >+ li:last-of-type .dijitTextBox:last-child { >+ margin-bottom: 0; >+ } >+ >+ &#PasswordForgottenSteps { >+ li:last-of-type .dijitTextBox { >+ margin-bottom: 0; >+ } >+ } > } > > ol#PasswordForgottenSteps li.step::before { >@@ -133,3 +146,18 @@ > padding: 1.3em; > background-color: rgb(20, 240, 10); > } >+ >+div.PasswordServiceContent >+ padding: 24px 24px 8px !important >+ padding: 0 !important >+ >+ .PasswordServiceContentChild >+ padding: 24px 24px 8px >+ overflow: visible >+ >+ h2 >+ line-height: 28px >+ margin: 20px 0 >+ >+ .PasswordOl .buttonRow >+ margin: 0 -16px >Index: management/univention-self-service/www/main.js >=================================================================== >diff --git a/branches/ucs-4.2/ucs-4.2-1/management/univention-self-service/www/main.js b/branches/ucs-4.2/ucs-4.2-1/management/univention-self-service/www/main.js >--- a/branches/ucs-4.2/ucs-4.2-1/management/univention-self-service/www/main.js (Revision 82537) >+++ b/branches/ucs-4.2/ucs-4.2-1/management/univention-self-service/www/main.js (Arbeitskopie) >@@ -104,6 +104,7 @@ > > // create page object > var subpage = new ContentPane({ >+ "class": "PasswordServiceContentChild", > content: content, > page_name: page_name > }); >Index: management/univention-web/css/Dialog.styl >=================================================================== >diff --git a/branches/ucs-4.2/ucs-4.2-1/management/univention-web/css/Dialog.styl b/branches/ucs-4.2/ucs-4.2-1/management/univention-web/css/Dialog.styl >--- a/branches/ucs-4.2/ucs-4.2-1/management/univention-web/css/Dialog.styl (Revision 82537) >+++ b/branches/ucs-4.2/ucs-4.2-1/management/univention-web/css/Dialog.styl (Arbeitskopie) >@@ -1,31 +1,31 @@ >-/* Dialog >- * >+/* Dialog >+ * > * Styling Dialog includes two sections: Dialog and Tooltip & TooltipDialog >- * >+ * > * Dialog: >- * 1. Dialog (default styling): >+ * 1. Dialog (default styling): > * .dijitDialog - styles for dialog's bounding box > * >- * 2. Dialog title >+ * 2. Dialog title > * .dijitDialogTitleBar - styles for the title container at the top of dialog > * .dijitDialogTitle - the text container in dialog title >- * >- * 3. Dialog content >+ * >+ * 3. Dialog content > * .dijitDialogPaneContent - main container for content area and action bar > * .dijitDialogPaneContentArea - styles for content container >- * >- * 4. Dialog action bar >+ * >+ * 4. Dialog action bar > * .dijitDialogPaneActionBar - styles for action buttons lie at the bottom of dialog pane content >- * >- * 5. Dialog underlay >+ * >+ * 5. Dialog underlay > * .dijitDialogUnderlay - div under the dialog which used for separate dialog and page content >- * >- * >+ * >+ * > * Tooltip & TooltipDialog: >- * 1. tooltip content container: >+ * 1. tooltip content container: > * .dijitTooltipContainer - tooltip content container > * >- * 2. tooltip connector: >+ * 2. tooltip connector: > * .dijitTooltipConnector - tooltip anchor includes 4 direction(up, down, left, right) > */ > >@@ -32,15 +32,12 @@ > @import "variables" > > .umc .dijitDialog >- //border: 1px solid $popup-border-color >- border: none >- box-shadow: 0 0px 25px rgba(0,0,0,0.15) >+ material-shadow(5) > max-width: $dialog-max-width > > @media (max-width: $dialog-max-width) > max-width: 100% > >- > &.umcLargeDialog > width: 100% > @media (min-width: ($dialog-max-width + 1)) >@@ -51,21 +48,46 @@ > > .umcPageFooter, > .umcButtonRow >+ padding-top: 24px >+ margin-top: 0 !important >+ > .dijitButton > material-flat-button() >+ margin: 0 >+ &:not(:first-child) >+ margin-left: 8px > >+ .dijitButtonNode >+ min-width: 64px >+ > .dijitDefaultButton .dijitButtonText > color: $ucs-green > >+ .umcButtonRow >+ margin-right: -16px >+ text-align: right >+ >+ .dijitContainer >+ overflow: visible > >+ .umcWizard >+ overflow: visible >+ >+ .umcPage >+ &:after >+ content: '' >+ display: block >+ clear: both >+ >+ .umcPageFooter >+ left: -16px >+ width: calc(100% + 32px) >+ > .umc .dijitDialogPaneContent >- background: $pane-background-color repeat-x top left >- border-top: 1px solid $popup-border-color >- padding: 1.6em 1.2em 1.2em 1.2em >+ background: $pane-background-color >+ padding: 0 24px 8px 24px > position: relative >- //box-sizing: content-box > >- > .umc .dijitDialogPaneContent, > .umc .dijitDialogTitleBar > width: 100% >@@ -75,11 +97,10 @@ > .umc .dijitDialogPaneContentArea > /* trick to get action bar (gray bar at bottom with OK/cancel buttons) to span from > * left to right but still indent dialog content >- */ >+ */ > margin: -10px -8px > padding: 10px 8px > >- > .umc .dijitDialogPaneActionBar > /* gray bar at bottom of dialog with OK/Cancel buttons */ > //background-color: $bar-background-color >@@ -100,49 +121,19 @@ > .umc .dijitDialogPaneActionBar .dijitButton > float: none > >- > .umc .dijitDialogTitleBar > /* outer container for the titlebar of the dialog */ >- //border: 1px solid $dialog-titlebar-border-color >- border: none >- border-top:none >- background-color: $dialog-titlebar-background-color >- standard-gradient() >- padding: 0.9em 3em 0.9em 1.2em >- //box-sizing: content-box >+ background-color: white >+ padding: 24px 24px 20px 24px > > > .umc .dijitDialogTitle > /* typography and styling of the dialog title */ >- padding: 0 1px > font-size: $font-size-title >- color: $text-color-dark-background >+ font-weight: 500 >+ line-height: 28px >+ color: $text-color > >- >-.umc .dijitDialogCloseIcon >- /* the default close icon for the dialog */ >- //background: url($image-dialog-close) >- //background-repeat:no-repeat >- position: absolute >- right: 0 >- top: 0 >- margin: 0.75em 1.2em >- //height: 15px >- //width: 21px >- icon-image(0, -60, "", "-white") >- >-.dj_ie6 .umc .dijitDialogCloseIcon >- //background-image: url($image-dialog-close-ie6) >- >-.umc .dijitDialogCloseIconHover >- background-position:-20px -60px >- opacity: 1 >- >-.umc .dijitDialogCloseIconActive >- background-position:-20px -60px >- opacity: 0.66 >- >- > /* Tooltip and TooltipDialog */ > > .umc .dijitTooltip, >@@ -152,7 +143,6 @@ > padding: 4px > //box-sizing: content-box > >- > .umc .dijitTooltip > box-sizing: content-box > >@@ -232,7 +222,6 @@ > right: 4px > > >- > .umc .dijitTooltipLeft > //padding-right: 14px > >@@ -283,3 +272,87 @@ > opacity: 1 > > >+/** inline dialogs **/ >+/* inline wizards */ >+.umc .umcWizard.umcInlineDialog, >+.umc .umcModule .umcWizard >+ background-color: #fff >+ material-shadow(1) >+ margin: 7px 15px >+ padding: 24px 9px 8px >+ overflow: visible >+ >+ .umcPage >+ &:after >+ content: '' >+ display: block >+ clear: both >+ >+ .umcPageNav >+ .umcPageHeader h1 >+ line-height: 28px >+ margin-bottom: 20px >+ >+ .umcPageFooter >+ padding: 0 >+ margin-top: 24px >+ width: calc(100% + 2px) >+ left: -1px >+ >+ .dijitButton >+ material-flat-button() >+ margin: 0 >+ &:not(:first-child) >+ margin-left: 8px >+ >+ .dijitDefaultButton, >+ .dijitUploader >+ .dijitButtonText >+ color: $ucs-green >+ >+ .dijitTextBox, >+ .dijitSelect >+ background-color: #fafafa >+ >+ .dijitTextBoxDisabled >+ background: $textbox-disabled-background-color >+ >+.umc .umcWizard.umcInlineDialog >+ margin: 48px auto >+ >+/* App dialog */ >+.umc .umcAppDialog >+ margin: 7px 15px >+ &:after >+ content: '' >+ display: block >+ clear: both >+ >+ .umcPageMain >+ background-color: #fff >+ material-shadow(1) >+ padding: 24px 24px 8px >+ >+ .umcPageHeader h1 >+ margin: 0 0 20px >+ line-height: 28px >+ >+ .umcButtonRow >+ margin: 0 -16px >+ padding-top: 32px >+ >+ .dijitButton >+ material-flat-button() >+ margin: 0 >+ &:not(:first-child) >+ margin-left: 8px >+ >+ .umcPageFooter >+ display: none >+ >+ .dijitTextBox, >+ .dijitSelect >+ background-color: #fafafa >+ >+ .dijitTextBoxDisabled >+ background: $textbox-disabled-background-color >Index: management/univention-web/js/hooks/default_menu_entries.js >=================================================================== >diff --git a/branches/ucs-4.2/ucs-4.2-1/management/univention-web/js/hooks/default_menu_entries.js b/branches/ucs-4.2/ucs-4.2-1/management/univention-web/js/hooks/default_menu_entries.js >--- a/branches/ucs-4.2/ucs-4.2-1/management/univention-web/js/hooks/default_menu_entries.js (Revision 82537) >+++ b/branches/ucs-4.2/ucs-4.2-1/management/univention-web/js/hooks/default_menu_entries.js (Arbeitskopie) >@@ -122,14 +122,14 @@ > topic.publish('/umc/actions', 'menu', 'switch-language', language.id); > if (tools.status('loggedIn')) { > dialog.confirm(_('<b>Warning</b>: The current session with all opened modules and unsaved settings gets lost and a page reload is done when switching the language.'), [{ >+ name: 'cancel', >+ label: _('Cancel') >+ }, { > name: 'change', > label: _('Switch language'), > callback: function() { > i18nTools.setLanguage(language.id); > } >- }, { >- name: 'cancel', >- label: _('Cancel') > }], _('Changing language')); > return; > } >Index: management/univention-web/js/render.js >=================================================================== >diff --git a/branches/ucs-4.2/ucs-4.2-1/management/univention-web/js/render.js b/branches/ucs-4.2/ucs-4.2-1/management/univention-web/js/render.js >--- a/branches/ucs-4.2/ucs-4.2-1/management/univention-web/js/render.js (Revision 82537) >+++ b/branches/ucs-4.2/ucs-4.2-1/management/univention-web/js/render.js (Arbeitskopie) >@@ -318,7 +318,7 @@ > // add all buttons that have not been rendered so far to a separate container > // and respect their correct order (i.e., using the interal array field $order$) > var buttonContainer = new ContainerWidget({ >- 'class': 'umcLayoutRow' >+ 'class': 'umcLayoutRow umcButtonRow' > }); > array.forEach(buttons.$order$, function(ibutton) { > if (!ibutton.$isRendered$) { >Index: management/univention-web/js/widgets/ConfirmDialog.js >=================================================================== >diff --git a/branches/ucs-4.2/ucs-4.2-1/management/univention-web/js/widgets/ConfirmDialog.js b/branches/ucs-4.2/ucs-4.2-1/management/univention-web/js/widgets/ConfirmDialog.js >--- a/branches/ucs-4.2/ucs-4.2-1/management/univention-web/js/widgets/ConfirmDialog.js (Revision 82537) >+++ b/branches/ucs-4.2/ucs-4.2-1/management/univention-web/js/widgets/ConfirmDialog.js (Arbeitskopie) >@@ -123,7 +123,8 @@ > // add the new message > if (typeof this.message == "string") { > var widget = new Text({ >- content: message >+ content: message, >+ 'class': 'umcConfirmDialogText' > }); > this._container.addChild(widget, 0); > } >@@ -152,12 +153,16 @@ > } > }, > >+ postMixInProperties: function() { >+ this.inherited(arguments); >+ this.baseClass += ' umcConfirmDialog'; >+ }, >+ > buildRendering: function() { > this.inherited(arguments); > > // put buttons into separate container > var buttons = new ContainerWidget({ >- style: 'text-align: center;', > 'class': 'umcButtonRow' > }); > var defaultButton = null; >Index: management/univention-web/js/widgets/Form.js >=================================================================== >diff --git a/branches/ucs-4.2/ucs-4.2-1/management/univention-web/js/widgets/Form.js b/branches/ucs-4.2/ucs-4.2-1/management/univention-web/js/widgets/Form.js >--- a/branches/ucs-4.2/ucs-4.2-1/management/univention-web/js/widgets/Form.js (Revision 82537) >+++ b/branches/ucs-4.2/ucs-4.2-1/management/univention-web/js/widgets/Form.js (Arbeitskopie) >@@ -36,12 +36,12 @@ > "dojo/Deferred", > "dojo/when", > "dojo/promise/all", >- "dojo/dom-style", >+ "dojo/dom-class", > "dijit/form/Form", > "umc/tools", > "umc/render", > "umc/i18n!" >-], function(declare, lang, array, kernel, Deferred, when, all, style, Form, tools, render, _) { >+], function(declare, lang, array, kernel, Deferred, when, all, domClass, Form, tools, render, _) { > > // in order to break circular dependencies (umc.dialog needs a Form and > // Form needs umc/dialog), we define umc/dialog as an empty object and >@@ -135,20 +135,20 @@ > > // in case no submit button has been defined, we define one and hide it > // this allows us to connect to the onSubmit event in any case >- var submitButtonDefined = false; >- array.forEach(this.buttons, function(ibutton) { >+ this.submitButtonDefined = false; >+ array.forEach(this.buttons, lang.hitch(this, function(ibutton) { > if ('submit' == ibutton.name) { >- submitButtonDefined = true; >+ this.submitButtonDefined = true; > return false; // break loop > } >- }); >- if (!submitButtonDefined) { >+ })); >+ if (!this.submitButtonDefined) { > // no submit button defined, add a hidden one :) > this.buttons = this.buttons instanceof Array ? this.buttons : []; > this.buttons.push({ > label: 'submit', > name: 'submit', >- style: 'border: 0; height: 0; overflow: hidden; margin: 0; padding: 0;' // using display=none will prevent button from being called >+ 'class': 'dijitOffScreen' > }); > } > >@@ -184,6 +184,11 @@ > this._widgets = render.widgets(this.widgets, this); > this._buttons = render.buttons(this.buttons || [], this); > this._container = render.layout(this.layout, this._widgets, this._buttons); >+ // if the submit button was not defined and no other buttons were specified we hide >+ // the row of the default submit button >+ if (!this.submitButtonDefined && this.buttons.length === 1) { >+ domClass.add(this._buttons.submit.getParent().domNode, 'dijitOffScreen'); >+ } > > // start processing the layout information > this._container.placeAt(this.containerNode); >Index: management/univention-web/js/widgets/MultiObjectSelect.js >=================================================================== >diff --git a/branches/ucs-4.2/ucs-4.2-1/management/univention-web/js/widgets/MultiObjectSelect.js b/branches/ucs-4.2/ucs-4.2-1/management/univention-web/js/widgets/MultiObjectSelect.js >--- a/branches/ucs-4.2/ucs-4.2-1/management/univention-web/js/widgets/MultiObjectSelect.js (Revision 82537) >+++ b/branches/ucs-4.2/ucs-4.2-1/management/univention-web/js/widgets/MultiObjectSelect.js (Arbeitskopie) >@@ -117,9 +117,22 @@ > })); > > // add the final buttons to close the dialog >- this._container.addChild(new Button({ >+ var btnContainer = new ContainerWidget({ >+ 'class': 'umcButtonRow' >+ }); >+ btnContainer.addChild(new Button({ >+ label: _('Cancel'), >+ onClick: lang.hitch(this, function() { >+ // hide the dialog >+ this.hide(); >+ >+ // unselect all elements >+ this._multiSelect.selection.clear(); >+ >+ }) >+ })); >+ btnContainer.addChild(new Button({ > label: _('Add'), >- style: 'float: right;', > onClick: lang.hitch(this, function() { > // get all elements an trigger onAdd event > var ids = this._multiSelect.get('value'); >@@ -135,19 +148,8 @@ > this._multiSelect.selection.clear(); > }) > })); >- this._container.addChild(new Button({ >- label: _('Cancel'), >- defaultButton: true, >- onClick: lang.hitch(this, function() { >- // hide the dialog >- this.hide(); >+ this._container.addChild(btnContainer); > >- // unselect all elements >- this._multiSelect.selection.clear(); >- >- }) >- })); >- > // put focus to last widget in the SearchForm > this.on('focus', lang.hitch(this, function() { > if (this.widgets.length) { >Index: management/univention-web/js/widgets/Wizard.js >=================================================================== >diff --git a/branches/ucs-4.2/ucs-4.2-1/management/univention-web/js/widgets/Wizard.js b/branches/ucs-4.2/ucs-4.2-1/management/univention-web/js/widgets/Wizard.js >--- a/branches/ucs-4.2/ucs-4.2-1/management/univention-web/js/widgets/Wizard.js (Revision 82537) >+++ b/branches/ucs-4.2/ucs-4.2-1/management/univention-web/js/widgets/Wizard.js (Arbeitskopie) >@@ -89,6 +89,9 @@ > > headerButtons: null, > >+ /* StandbyMixin properties */ >+ standbyColor: '#fff', >+ > buildRendering: function() { > this.inherited(arguments); > >Index: services/univention-printserver/umc/js/printers/QuotaDialog.js >=================================================================== >diff --git a/branches/ucs-4.2/ucs-4.2-1/services/univention-printserver/umc/js/printers/QuotaDialog.js b/branches/ucs-4.2/ucs-4.2-1/services/univention-printserver/umc/js/printers/QuotaDialog.js >--- a/branches/ucs-4.2/ucs-4.2-1/services/univention-printserver/umc/js/printers/QuotaDialog.js (Revision 82537) >+++ b/branches/ucs-4.2/ucs-4.2-1/services/univention-printserver/umc/js/printers/QuotaDialog.js (Arbeitskopie) >@@ -47,13 +47,6 @@ > > var buttons = [ > { >- name: 'submit', >- label: _("Save changes") >- // no callback here: the onSubmit() event of the form >- // will automatically be fired if our button has >- // the name 'submit' >- }, >- { > name: 'cancel', > label: _("Cancel"), > // no special meaning of the button name 'cancel', so we >@@ -61,6 +54,13 @@ > callback: lang.hitch(this, function() { > this.onCancel(); > }) >+ }, >+ { >+ name: 'submit', >+ label: _("Save changes") >+ // no callback here: the onSubmit() event of the form >+ // will automatically be fired if our button has >+ // the name 'submit' > } > ]; > >Index: virtualization/univention-virtual-machine-manager-daemon/umc/js/uvmm/DriveGrid.js >=================================================================== >diff --git a/branches/ucs-4.2/ucs-4.2-1/virtualization/univention-virtual-machine-manager-daemon/umc/js/uvmm/DriveGrid.js b/branches/ucs-4.2/ucs-4.2-1/virtualization/univention-virtual-machine-manager-daemon/umc/js/uvmm/DriveGrid.js >--- a/branches/ucs-4.2/ucs-4.2-1/virtualization/univention-virtual-machine-manager-daemon/umc/js/uvmm/DriveGrid.js (Revision 82537) >+++ b/branches/ucs-4.2/ucs-4.2-1/virtualization/univention-virtual-machine-manager-daemon/umc/js/uvmm/DriveGrid.js (Arbeitskopie) >@@ -324,15 +324,15 @@ > var disk = items[ 0 ]; > > var buttons = [ { >+ name: 'cancel', >+ 'default': true, >+ label: _('Cancel') >+ }, { > name: 'detach', > label: _('Detach') > }, { > name: 'delete', > label: _('Delete') >- }, { >- name: 'cancel', >- 'default': true, >- label: _('Cancel') > } ]; > > // confirm removal of drive >Index: virtualization/univention-virtual-machine-manager-daemon/umc/js/uvmm/InterfaceGrid.js >=================================================================== >diff --git a/branches/ucs-4.2/ucs-4.2-1/virtualization/univention-virtual-machine-manager-daemon/umc/js/uvmm/InterfaceGrid.js b/branches/ucs-4.2/ucs-4.2-1/virtualization/univention-virtual-machine-manager-daemon/umc/js/uvmm/InterfaceGrid.js >--- a/branches/ucs-4.2/ucs-4.2-1/virtualization/univention-virtual-machine-manager-daemon/umc/js/uvmm/InterfaceGrid.js (Revision 82537) >+++ b/branches/ucs-4.2/ucs-4.2-1/virtualization/univention-virtual-machine-manager-daemon/umc/js/uvmm/InterfaceGrid.js (Arbeitskopie) >@@ -129,12 +129,12 @@ > msg = _('Should the %d network interfaces be removed?', ids.length); > } > dialog.confirm(msg, [{ >- name: 'remove', >- label: _('Remove') >- }, { > name: 'cancel', > 'default': true, > label: _('Cancel') >+ }, { >+ name: 'remove', >+ label: _('Remove') > }]).then(lang.hitch(this, function(response) { > if (response == 'cancel') { > return; >Index: virtualization/univention-virtual-machine-manager-daemon/umc/js/uvmm/SnapshotGrid.js >=================================================================== >diff --git a/branches/ucs-4.2/ucs-4.2-1/virtualization/univention-virtual-machine-manager-daemon/umc/js/uvmm/SnapshotGrid.js b/branches/ucs-4.2/ucs-4.2-1/virtualization/univention-virtual-machine-manager-daemon/umc/js/uvmm/SnapshotGrid.js >--- a/branches/ucs-4.2/ucs-4.2-1/virtualization/univention-virtual-machine-manager-daemon/umc/js/uvmm/SnapshotGrid.js (Revision 82537) >+++ b/branches/ucs-4.2/ucs-4.2-1/virtualization/univention-virtual-machine-manager-daemon/umc/js/uvmm/SnapshotGrid.js (Arbeitskopie) >@@ -187,12 +187,12 @@ > > // confirm applying of snapshot > dialog.confirm(_('Are you sure to revert to the selected snapshot?'), [{ >- name: 'revert', >- label: _('Revert') >- }, { > name: 'cancel', > 'default': true, > label: _('Cancel') >+ }, { >+ name: 'revert', >+ label: _('Revert') > }]).then(lang.hitch(this, function(response) { > if (response != 'revert') { > return; >@@ -224,12 +224,12 @@ > msg = _('Are you sure to delete the selected snapshot?'); > } > dialog.confirm(msg, [{ >- name: 'delete', >- label: _('Delete') >- }, { > name: 'cancel', > 'default': true, > label: _('Cancel') >+ }, { >+ name: 'delete', >+ label: _('Delete') > }]).then(lang.hitch(this, function(response) { > if (response != 'delete') { > return;
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
Actions:
View
|
Diff
Attachments on
bug 43999
: 9156 |
9209
|
9210
|
9211
|
9212