Define more classes for dialog buttons

plugins/acl/acl.js

@@ -350,7 +350,7 @@ rcube_webmail.prototype.acl_init_form = function(id)
         id ? this.get_label('acl.editperms') : this.get_label('acl.newuser'),
         buttons,
         {
-            button_classes: ['mainaction'],
+            button_classes: ['mainaction submit'],
             modal: true,
             closeOnEscape: true,
             close: function(e, ui) {

plugins/attachment_reminder/attachment_reminder.js

@@ -64,7 +64,12 @@ function rcmail_attachment_reminder_dialog()
   };
 
   rcmail.env.attachment_reminder = false;
-  rcmail.show_popup_dialog(rcmail.get_label('attachment_reminder.forgotattachment'), '', buttons);
+  rcmail.show_popup_dialog(
+    rcmail.get_label('attachment_reminder.forgotattachment'),
+    rcmail.get_label('attachment_reminder.missingattachment'),
+    buttons,
+    {button_classes: ['mainaction attach', 'send']}
+  );
 };
 
 

plugins/attachment_reminder/attachment_reminder.php

@@ -37,7 +37,7 @@ class attachment_reminder extends rcube_plugin
         if ($rcmail->task == 'mail' && $rcmail->action == 'compose') {
             if ($rcmail->config->get('attachment_reminder')) {
                 $this->include_script('attachment_reminder.js');
-                $this->add_texts('localization/', array('keywords', 'forgotattachment'));
+                $this->add_texts('localization/', array('keywords', 'forgotattachment', 'missingattachment'));
                 $rcmail->output->add_label('addattachment', 'send');
             }
         }

plugins/attachment_reminder/localization/en_US.inc

@@ -17,6 +17,7 @@
 */
 
 $messages = array();
+$messages['missingattachment'] = "Missing attachment?";
 $messages['forgotattachment'] = "Did you forget to attach a file?";
 $messages['reminderoption'] = "Remind about forgotten attachments";
 $messages['keywords'] = "attachment,file,attach,attached,attaching,enclosed,CV,cover letter";

plugins/enigma/enigma.js

@@ -500,7 +500,7 @@ rcube_webmail.prototype.enigma_password_request = function(data)
     this.show_popup_dialog(myprompt, this.get_label('enigma.enterkeypasstitle'),
         [{
             text: this.get_label('save'),
-            'class': 'mainaction',
+            'class': 'mainaction save',
             click: function(e) {
                 e.stopPropagation();
 
@@ -519,6 +519,7 @@ rcube_webmail.prototype.enigma_password_request = function(data)
         },
         {
             text: this.get_label('cancel'),
+            'class': 'cancel',
             click: function(e) {
                 var jq = ref.is_framed() ? window.parent.$ : $;
                 e.stopPropagation();

program/js/app.js

@@ -3919,17 +3919,13 @@ function rcube_webmail()
     });
 
     // display dialog with missing keys
-    ref.show_popup_dialog(
+    ref.simple_dialog(
       $('<div>')
         .append($('<p>').html(ref.get_label('encryptpubkeysfound')))
         .append(ul),
       ref.get_label('importpubkeys'),
-      [{
+      null,
-        text: ref.get_label('close'),
+      {cancel_label: 'close', cancel_button: 'close'}
-        click: function() {
-          (ref.is_framed() ? parent.$ : $)(this).dialog('close');
-        }
-      }]
     );
 
     // delegate handler for import button clicks
@@ -4054,21 +4050,12 @@ function rcube_webmail()
         content = $('<div>').append(nodes);
         $('input:not([disabled]):first', content).attr('checked', true);
 
-        this.show_popup_dialog(content, this.get_label('markallread'),
+        this.simple_dialog(content, this.get_label('markallread'),
-          [{
+          function() {
-            'class': 'mainaction',
+            ref.mark_all_read(folder, $('input:checked', this).val());
-            text: this.get_label('mark'),
+            return true;
-            click: function() {
-              ref.mark_all_read(folder, $('input:checked', this).val());
-              $(this).dialog('close');
-            }
           },
-          {
+          {button: 'mark'}
-            text: this.get_label('cancel'),
-            click: function() {
-              $(this).dialog('close');
-            }
-          }]
         );
 
         return;
@@ -4323,7 +4310,7 @@ function rcube_webmail()
 
     // the message has been sent but not saved, ask the user what to do
     if (!saveonly && this.env.is_sent) {
-      return this.simple_dialog(this.get_label('messageissent'), '',
+      return this.simple_dialog(this.get_label('messageissent'), '', // TODO: dialog title
         function() {
           ref.submit_messageform(false, true);
           return true;
@@ -4482,7 +4469,8 @@ function rcube_webmail()
             click: function() { save_func(true); }
           }, {
             text: this.get_label('cancel'),
-            click: function() { dialog.dialog('close'); }
+            click: function() { dialog.dialog('close'); },
+            'class': 'cancel'
           }],
         {dialogClass: 'warning'}
       );
@@ -4508,10 +4496,11 @@ function rcube_webmail()
         this.get_label('nosubjecttitle'),
         [{
             text: this.get_label('sendmessage'),
-            click: function() { save_func(); },
+            'class': 'mainaction send',
-            'class': 'mainaction'
+            click: function() { save_func(); }
           }, {
             text: this.get_label('cancel'),
+            'class': 'cancel',
             click: function() {
               input_subject.focus();
               dialog.dialog('close');
@@ -4602,7 +4591,7 @@ function rcube_webmail()
       $(this).dialog('close');
     };
 
-    this.show_popup_dialog(html, this.get_label('newresponse'), buttons, {button_classes: ['mainaction']});
+    this.show_popup_dialog(html, this.get_label('newresponse'), buttons, {button_classes: ['mainaction save', 'cancel']});
 
     $('#ffresponsetext').val(text);
     $('#ffresponsename').select();
@@ -7693,7 +7682,7 @@ function rcube_webmail()
 
     // assign special classes to dialog buttons
     $.each(options.button_classes || [], function(i, v) {
-      if (v) $($('.ui-dialog-buttonpane button.ui-button', popup.parent()).get(i)).addClass(v);
+      if (v) $($('.ui-dialog-buttonpane button', popup.parent()).get(i)).addClass(v);
     });
 
     return popup;