fix(frontend): redesign edit draft button to make it more visible

Author: Shadow243

modules/imap/output_modules.php

@@ -306,8 +306,10 @@ protected function output() {
                     }
                 }
             }
-            
-            // Long headers (hidden by default)
+            $is_draft = isset($headers['Flags']) && mb_stristr($headers['Flags'], 'draft');
+            if($is_draft) {
+                $txt .= '<tr class="header_space"><th colspan="2"><a class="btn btn-primary" href="?page=compose'.$reply_args.'&imap_draft=1"><i class="bi bi-pencil"></i> '.$this->trans('Edit Draft').'</a></th></tr>';
+            }
             foreach ($headers as $name => $value) {
                 if (!in_array(mb_strtolower($name), $small_headers)) {
                     if (is_array($value)) {
@@ -392,7 +394,10 @@ protected function output() {
                 $txt .= schedule_dropdown($this, true);
             }
 
-            $is_draft = isset($headers['Flags']) && mb_stristr($headers['Flags'], 'draft');
+            $settings = $this->get('user_settings', array());
+            if(array_key_exists('enable_snooze_setting', $settings) && $settings['enable_snooze_setting']) {
+                $txt .= ' | ' . snooze_dropdown($this, isset($headers['X-Snoozed']));
+            }
             if ($this->get('sieve_filters_enabled') && !$is_draft) {
                 $txt .= snooze_dropdown($this, isset($headers['X-Snoozed']));
                 $server_id = $this->get('msg_server_id');
@@ -416,10 +421,7 @@ protected function output() {
             }
             $txt .= '<a class="hlink text-decoration-none" id="show_message_source" href="#">' . $this->trans('Show Source') . '</a>';
 
-            if ($is_draft) {
-                $txt .= '<a class="edit_draft_link hlink text-decoration-none" id="edit_draft" href="?page=compose'.$reply_args.'&imap_draft=1">'.$this->trans('Edit Draft').'</a>';
-            }
-            $txt .= '</div><span id="extra-header-buttons"></span>';
+            $txt .= '</ul><span id="extra-header-buttons"></span>';
             $txt .= '<input type="hidden" class="move_to_type" value="" />';
             $txt .= '<input type="hidden" class="move_to_string1" value="'.$this->trans('Move to ...').'" />';
             $txt .= '<input type="hidden" class="move_to_string2" value="'.$this->trans('Copy to ...').'" />';