Merge 42edec4ee9 into 279ae66120

program/localization/en_US/labels.inc

@@ -338,6 +338,7 @@ $labels['alwaysallow'] = 'Always allow from $sender';
 $labels['isdraft'] = 'This is a draft message.';
 $labels['andnmore'] = '$nr more...';
 $labels['details'] = 'Details';
+$labels['summary'] = 'Summary';
 $labels['headers'] = 'Headers';
 $labels['allheaders'] = 'All headers...';
 $labels['togglemoreheaders'] = 'Show more message headers';

skins/elastic/styles/styles.less

@@ -187,18 +187,28 @@ body.task-error-login #layout {
         div.header-content {
             min-height: @mail-header-photo-height;
             flex: 1;
-        }
 
-        div.header-subject {
-            line-height: @mail-header-photo-height/2;
+            &:not(.details-view) {
+                .message-partheaders {
+                    display: none;
+                }
+            }
 
-            & > span {
-                line-height: 1.5;
-                display: inline-block;
-                vertical-align: middle;
+            &.details-view {
+                .header-subject {
+                    display: none;
+                }
             }
         }
 
+        div.header-envelope {
+            display: flex;
+        }
+
+        div.header-subject > span {
+            display: inline-block;
+        }
+
         div.header-links {
             a {
                 font-size: 90%;
@@ -213,10 +223,18 @@ body.task-error-login #layout {
                     line-height: 1.3;
                 }
 
-                &.envelope:before {
+                &.headers-details:before {
                     content: @fa-var-envelope;
                 }
 
+                &.headers-summary:before {
+                    .font-icon-regular(@fa-var-envelope);
+                }
+
+                &.headers-all:before {
+                    content: @fa-var-info-circle;
+                }
+
                 &.html:before {
                     content: @fa-var-image;
                 }
@@ -230,15 +248,9 @@ body.task-error-login #layout {
                 }
             }
         }
-
-        .message-partheaders {
-            margin: 0 !important;
-            padding: .25rem 0 !important;
-        }
     }
 
-    a.extwin,
-    a.headers {
+    a.extwin {
         text-decoration: none;
     }
 }
@@ -344,11 +356,7 @@ body.task-error-login #layout {
 }
 
 .message-partheaders {
-    padding: .5rem 0;
-    margin: .5rem 0 0 0;
     font-size: 90%;
-    border-top: 1px solid @color-list-border;
-    border-bottom: 1px solid @color-list-border;
     color: @color-mail-headers;
 
     .header-title {

skins/elastic/templates/message.html

@@ -27,13 +27,17 @@
 			<div class="short-header">
 				<roundcube:object name="contactphoto" class="contactphoto" placeholder="/images/contactpic.svg" />
 				<div class="header-content">
-					<roundcube:object name="messageSummary" addicon="virtual" class="header-subject" />
-					<div class="message-partheaders hidden">
-						<roundcube:object name="messageHeaders" class="headers-table" addicon="virtual" exclude="subject" max="10" />
-						<a href="#all-headers" class="headers" onclick="return UI.headers_dialog()"><roundcube:label name="allheaders" /></a>
+					<div class="header-envelope">
+						<roundcube:object name="messageSummary" addicon="virtual" class="header-subject" />
+						<div class="message-partheaders">
+							<roundcube:object name="messageHeaders" class="headers-table" addicon="virtual" exclude="subject" max="10" />
+						</div>
 					</div>
 					<div class="header-links">
-						<a href="#headers" class="envelope" onclick="return UI.headers_show(this)"><roundcube:label name="details" /></a>
+						<roundcube:add_label name="details" />
+						<roundcube:add_label name="summary" />
+						<a href="#headers" data-toggle="headers" onclick="return UI.headers_show(true)"></a>
+						<a href="#all-headers" class="headers-all" onclick="return UI.headers_dialog()"><roundcube:label name="headers" /></a>
 						<roundcube:add_label name="arialabelmessageheaders" />
 						<roundcube:if condition="env:optional_format=='text'" />
 							<roundcube:button command="change-format" prop="text" type="link" class="plain" innerClass="inner"

skins/elastic/templates/messageprint.html

@@ -9,7 +9,7 @@
 		</h2>
 		<div class="short-header">
 			<roundcube:object name="contactphoto" class="contactphoto" placeholder="/images/contactpic.svg" />
-			<div class="header-content">
+			<div class="header-content details-view">
 				<div class="message-partheaders">
 					<roundcube:object name="messageHeaders" class="headers-table" addicon="virtual" exclude="subject" max="10" />
 				</div>

skins/elastic/ui.js

@@ -721,6 +721,9 @@ function rcube_elastic_ui()
                 $('a').filter('[href^="mailto:"]').each(function() {
                     mailtomenu_append(this);
                 });
+
+                // restore headers view to last state
+                headers_show();
             }
         }
         else if (rcmail.task == 'settings') {
@@ -2691,10 +2694,22 @@ function rcube_elastic_ui()
     /**
      * Show/hide more mail headers (envelope)
      */
-    function headers_show(button)
+    function headers_show(toggle)
     {
-        var headers = $(button).parent().prev();
-        headers[headers.is('.hidden') ? 'removeClass' : 'addClass']('hidden');
+        var key = 'mail.show.envelope',
+            pref = get_pref(key),
+            show = toggle ? !pref : pref,
+            label = rcmail.gettext(show ? 'summary' : 'details'),
+            css = 'headers-' + (show ? 'summary' : 'details'),
+            headers = $('div.header-content');
+
+        $("div.header-links > a[data-toggle='headers']").removeClass().addClass(css).text(label);
+        headers[show ? 'addClass' : 'removeClass']('details-view');
+
+        if (toggle) {
+            // save new pref
+            save_pref(key, show);
+        }
     };
 
     /**

tests/Browser/Mail/PreviewTest.php

@@ -120,7 +120,7 @@ class PreviewTest extends \Tests\Browser\TestCase
                     ->assertVisible('.message-part div.pre .sig');
 
                 $browser->assertMissing('.headers-table')
-                    ->click('a.envelope')
+                    ->click('a.headers-details')
                     ->waitFor('.headers-table')
                     ->assertVisible('.header.cc')
                     ->assertSeeIn('.header.cc', 'test10@domain.tld')