Mailvelope support

skins/elastic/styles/widgets/forms.less

@@ -961,6 +961,7 @@ html.touch input.icon-checkbox + label {
         }
     }
 
+    & > iframe, // e.g. mailvelope frame
     & > .googie_edit_layer,
     & > .mce-tinymce,
     & > textarea {
@@ -968,6 +969,12 @@ html.touch input.icon-checkbox + label {
         font-family: monospace;
         width: 100% !important;
     }
+
+    & > iframe { // e.g. mailvelope frame
+        border-radius: .3rem;
+        border: 1px solid @color-input-border;
+        min-height: 35em;
+    }
 }
 
 

skins/elastic/styles/widgets/mail.less

@@ -186,6 +186,10 @@
     div.pre {
         font-family: monospace;
     }
+
+    &.mailvelope iframe {
+        min-height: 35em;
+    }
 }
 
 .message-partheaders {

skins/elastic/styles/widgets/toolbar.less

@@ -40,6 +40,10 @@
             outline: 0;
         }
 
+        &.selected {
+            color: @color-success;
+        }
+
         &:before {
             &:extend(.font-icon-class);
             display: inline;

skins/elastic/templates/compose.html

@@ -108,7 +108,7 @@
 				label="save" title="savemessage" tabindex="2" innerclass="inner" data-content-button="true" />
 			<span class="spacer"></span>
 			<roundcube:button name="addattachment" type="link" class="button attach"
-				label="attach" title="addattachment" onclick="rcmail.upload_input('uploadform')"
+				label="attach" title="addattachment" onclick="if (!$(this).is('.disabled')) rcmail.upload_input('uploadform')"
 				aria-haspopup="true" aria-expanded="false" tabindex="2" innerclass="inner" />
 			<roundcube:button command="insert-sig" type="link" class="button signature disabled" classAct="button signature"
 				label="signature" title="insertsignature" tabindex="2" innerclass="inner" />

skins/elastic/ui.js

@@ -447,10 +447,17 @@ function rcube_elastic_ui()
         rcmail.init_pagejumper('.pagenav > input');
 
         if (rcmail.task == 'mail') {
-            // In compose window we do not provide "Back' button, instead
-            // we modify the Mail button in the task menu to act like it (i.e. calls 'list' command)
-            if (rcmail.env.action == 'compose' && !rcmail.env.extwin) {
-                $('a.button.mail', layout.menu).attr('onclick', "return rcmail.command('list','',this,event)");
+            if (rcmail.env.action == 'compose') {
+                // In compose window we do not provide "Back' button, instead
+                // we modify the Mail button in the task menu to act like it (i.e. calls 'list' command)
+                if (!rcmail.env.extwin) {
+                    $('a.button.mail', layout.menu).attr('onclick', "return rcmail.command('list','',this,event)");
+                }
+
+                rcmail.addEventListener('compose-encrypted', function(e) {
+                    $("a.mode-html, button.attach").prop('disabled', e.active);
+                    $('a.button.attach, a.button.responses')[e.active ? 'addClass' : 'removeClass']('disabled');
+                });
             }
 
             // Append contact menu to all mailto: links
@@ -905,6 +912,9 @@ function rcube_elastic_ui()
         }
     };
 
+    /**
+     * Handler for 'enable-command' event
+     */
     function enable_command_handler(args)
     {
         if (is_framed) {
@@ -914,6 +924,24 @@ function rcube_elastic_ui()
                 }
             });
         }
+
+        if (rcmail.task == 'mail') {
+            switch (args.command) {
+            case 'reply-list':
+                if (rcmail.env.reply_all_mode == 1) {
+                    var label = rcmail.gettext(args.status ? 'replylist' : 'replyall');
+                    $('a.button.reply-all').attr('title', label).find('.inner').text(label);
+                }
+                break;
+
+            case 'compose-encrypted':
+                // show the toolbar button for Mailvelope
+                if (args.status) {
+                    $('a.button.encrypt').show();
+                }
+                break;
+            }
+        }
     };
 
     /**