Merge branch 'release-0.8' of github.com:roundcube/roundcubemail into release-0.8

1 files changed, 16 insertions, 1 deletions

diff --git a/skins/larry/ui.js b/skins/larry/ui.js
index 4872a1004..906db1d52 100644
--- a/skins/larry/ui.js
+++ b/skins/larry/ui.js
@@ -220,6 +220,7 @@ function rcube_mail_ui()
 
     // don't use $(window).resize() due to some unwanted side-effects
     window.onresize = resize;
+    resize();
   }
 
   /**
@@ -257,6 +258,20 @@ function rcube_mail_ui()
     if (rcmail.env.task == 'mail' && rcmail.env.action == 'compose') {
       layout_composeview();
     }
+
+    // make iframe footer buttons float if scrolling is active
+    $('body.iframe .footerleft').each(function(){
+      var footer = $(this),
+        body = $(document.body),
+        floating = footer.hasClass('floating'),
+        overflow = body.outerHeight(true) > $(window).height();
+      if (overflow != floating) {
+        var action = overflow ? 'addClass' : 'removeClass';
+        footer[action]('floating');
+        body[action]('floatingbuttons');
+      }
+    })
+
   }
 
   /**
@@ -265,7 +280,7 @@ function rcube_mail_ui()
   function message_displayed(p)
   {
     // show a popup dialog on errors
-    if (p.type == 'error') {
+    if (p.type == 'error' && rcmail.env.task != 'login') {
       if (!me.messagedialog) {
         me.messagedialog = $('<div>').addClass('popupdialog');
       }