Added 'Attach Encryption Key' to Composer

mailpile · Oct 19, 2014 · 49e2e83 · 49e2e83
1 parent e8821f6
commit 49e2e83
Show file tree

Hide file tree

Showing 4 changed files with 40 additions and 4 deletions.
diff --git a/static/default/html/jsapi/compose/crypto.js b/static/default/html/jsapi/compose/crypto.js
@@ -181,4 +181,14 @@ Mailpile.Composer.Crypto.encryption_toggle = function(status) {
 
     Mailpile.Composer.Crypto.set_state();
   }
+};
+
+
+Mailpile.Composer.Crypto.AttachKey = function(mid) {
+  $checkbox = $('#compose-attach-key-' + mid)
+  if ($checkbox.is(':checked')) {
+    $checkbox.val('yes');
+  } else {
+    $checkbox.val('no');
+  }
 };
diff --git a/static/default/html/jsapi/compose/events.js b/static/default/html/jsapi/compose/events.js
@@ -113,7 +113,7 @@ $(document).on('click', '.compose-action', function(e) {
       }
       // Is Thread Reply
       else if (action === 'reply' && response.status === 'success') {
-        Mailpile.Composer.render_message_thread(response.result.thread_ids[0]);
+        Mailpile.Composer.Complete(response.result.thread_ids[0]);
       }
       else {
         Mailpile.notification(response);
@@ -221,7 +221,13 @@ $(document).on('click', '.compose-attachment-remove', function(e) {
   alert('This should delete an attachment: ' + aid + ' for mid: ' + mid + ' just need API endpoint to do so');
 });
 
-/* Compose - Autogrow composer boxes */
+
 $(document).on('focus', '.compose-text', function() {
   $(this).autosize();
 });
+
+
+$(document).on('click', '.compose-attach-key', function(e) {
+  var mid = $(this).data('mid');
+  Mailpile.Composer.Crypto.AttachKey(mid);
+});
diff --git a/static/default/html/partials/compose.html b/static/default/html/partials/compose.html
@@ -95,8 +95,12 @@
           {% endif %}
         </ul>
         <div class="clearfix"></div>
-        <a id="compose-attachment-pick-{{mid}}" class="compose-attachment-pick hide" href="#"><span class="icon-attachment"></span>Add Attachment</a>
-        <span class="attachment-browswer-unsupported">Unable to add attachments, <a href="">update your browser?</a></span>
+        <a id="compose-attachment-pick-{{mid}}" class="compose-attachment-pick hide" href="#"><span class="icon-attachment"></span>{{_("Add Attachment")}}</a>
+        <span class="attachment-browswer-unsupported">{{_("Unable to add attachments")}}, <a href="">{{_("update your browser")}}</a></span>
+        <label class="right compose-attach-key" data-mid="{{mid}}">
+          <input type="checkbox" id="compose-attach-key-{{mid}}" name="attach-pgp-pubkey" {% if config.prefs.gpg_email_key %}value="yes" checked{% else %}value="no"{% endif %}>
+          {{_("Send Encryption Key")}}
+        </label>
       </div>
     </div>
     <div class="compose-actions clearfix">

diff --git a/static/default/less/app/compose.less b/static/default/less/app/compose.less
@@ -266,6 +266,22 @@
     color: @gray;
   }
 
+  label.compose-attach-key {
+    color: @grayDark;
+    cursor: pointer;
+    font-weight: bold;
+  }
+
+  label.compose-attach-key:hover,
+  label.compose-attach-key:hover span.icon-key {
+    color: @red;
+  }
+
+  label.compose-attach-key span.icon-key {
+    color: @grayDark;
+    font-weight: normal;
+  }
+
 
 /* Compose - From Menu */