From af276f21e5364eb65a56b64c3455bc284ff1e2f2 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Tue, 4 Sep 2012 09:32:24 +0200
Subject: Add full headers view in message preview window (#1488538) Fix
 message display page issues - unified with message preview (#1488590,
 #1488642)

---
 skins/larry/ui.js | 34 +++++++++++++++++++++++++---------
 1 file changed, 25 insertions(+), 9 deletions(-)

(limited to 'skins/larry/ui.js')

diff --git a/skins/larry/ui.js b/skins/larry/ui.js
index ca1680759..176c93b7d 100644
--- a/skins/larry/ui.js
+++ b/skins/larry/ui.js
@@ -74,9 +74,8 @@ function rcube_mail_ui()
 
       if (rcmail.env.action == 'show' || rcmail.env.action == 'preview') {
         layout_messageview();
-        rcmail.addEventListener('aftershow-headers', function() { layout_messageview(); });
-        rcmail.addEventListener('afterhide-headers', function() { layout_messageview(); });
-        $('#previewheaderstoggle').click(function(e){ toggle_preview_headers(this); return false });
+        $('#previewheaderstoggle').click(function(e){ toggle_preview_headers(this); return false; });
+        $('#headerstoggleall').click(function(e){ toggle_all_headers(this); return false; });
       }
       else if (rcmail.env.action == 'compose') {
         rcmail.addEventListener('aftertoggle-editor', function(){ window.setTimeout(function(){ layout_composeview() }, 200); });
@@ -315,7 +314,6 @@ function rcube_mail_ui()
    */
   function layout_messageview()
   {
-    $('#messagecontent').css('top', ($('#messageheader').outerHeight() + 10) + 'px');
     $('#message-objects div a').addClass('button');
 
     if (!$('#attachment-list li').length) {
@@ -508,13 +506,31 @@ function rcube_mail_ui()
   {
     $('#preview-shortheaders').toggle();
     var full = $('#preview-allheaders').toggle(),
-      button = $('a#previewheaderstoggle');
+      button = $('#previewheaderstoggle');
+
+    if (!$('#headerstoggleall').length)
+      $('#all-headers').toggle();
 
     // add toggle button to full headers table
-    if (full.is(':visible'))
-      button.attr('href', '#hide').removeClass('add').addClass('remove')
-    else
-      button.attr('href', '#details').removeClass('remove').addClass('add')
+    if (full.is(':visible')) {
+      button.attr('href', '#hide').removeClass('add').addClass('remove');
+    }
+    else {
+      button.attr('href', '#details').removeClass('remove').addClass('add');
+    }
+  }
+
+
+  /**
+   * Show/hide all message headers
+   */
+  function toggle_all_headers(button)
+  {
+    rcmail.command('show-headers', '', button);
+    $(button).remove();
+    $('#previewheaderstoggle span').css({bottom: '5px'});
+
+    return false;
   }
 
 
-- 
cgit v1.2.3


From e8b9176031926532a764582812047281e4401352 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Tue, 4 Sep 2012 10:06:48 +0200
Subject: Remove (too big) min-width on mail screen

---
 CHANGELOG                   | 1 +
 skins/larry/addressbook.css | 1 -
 skins/larry/mail.css        | 3 +--
 skins/larry/styles.css      | 2 +-
 skins/larry/ui.js           | 6 ++++++
 5 files changed, 9 insertions(+), 4 deletions(-)

(limited to 'skins/larry/ui.js')

diff --git a/CHANGELOG b/CHANGELOG
index 3a14694c9..afdbc3468 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,7 @@
 CHANGELOG Roundcube Webmail
 ===========================
 
+- Remove (too big) min-width on mail screen
 - Add full headers view in message preview window (#1488538)
 - Fix message display page issues - unified with message preview (#1488590, #1488642)
 - Fix identity selection on reply (#1488101)
diff --git a/skins/larry/addressbook.css b/skins/larry/addressbook.css
index fe087aece..74bc0d7d8 100644
--- a/skins/larry/addressbook.css
+++ b/skins/larry/addressbook.css
@@ -34,7 +34,6 @@
 	position: absolute;
 	top: -6px;
 	left: 0;
-	right: 260px;
 	height: 40px;
 	white-space: nowrap;
 	z-index: 10;
diff --git a/skins/larry/mail.css b/skins/larry/mail.css
index d2ff11808..3664e14c9 100644
--- a/skins/larry/mail.css
+++ b/skins/larry/mail.css
@@ -341,7 +341,6 @@ a.iconbutton.threadmode.selected {
 #messagetoolbar {
 	position: absolute;
 	top: -6px;
-	right: 390px;
 	left: 0;
 	height: 40px;
 	white-space: nowrap;
@@ -362,7 +361,7 @@ a.iconbutton.threadmode.selected {
 	position: absolute;
 	right: 0;
 	top: 0;
-	width: 240px;
+	width: 400px;
 }
 
 #mailpreviewtoggle {
diff --git a/skins/larry/styles.css b/skins/larry/styles.css
index 0a72c5048..ea36260cd 100644
--- a/skins/larry/styles.css
+++ b/skins/larry/styles.css
@@ -660,7 +660,7 @@ a.iconlink.upload {
 	left: 0;
 	bottom: 0;
 	width: 100%;
-	min-width: 1150px;
+	min-width: 1024px;
 }
 
 .scroller {
diff --git a/skins/larry/ui.js b/skins/larry/ui.js
index 176c93b7d..57a1178eb 100644
--- a/skins/larry/ui.js
+++ b/skins/larry/ui.js
@@ -163,6 +163,12 @@ function rcube_mail_ui()
       }
     }
 
+    // set min-width to show all toolbar buttons
+    var screen = $('.minwidth');
+    if (screen.length) {
+      screen.css('min-width', $('.toolbar').width() + $('#quicksearchbar').parent().width() + 20);
+    }
+
     // turn a group of fieldsets into tabs
     $('.tabbed').each(function(idx, elem){ init_tabs(elem); })
 
-- 
cgit v1.2.3