From 33951d81972fbe278a856657ccc536397cce9692 Mon Sep 17 00:00:00 2001 From: Klaus Leithoff Date: Mon, 9 Jul 2012 10:37:00 +0000 Subject: [PATCH] * email: better height control of attachment popup --- felamimail/js/jscode/viewMainScreen.js | 2 +- felamimail/templates/default/app.css | 10 ++++++++-- felamimail/templates/default/view_attachments.tpl | 2 ++ felamimail/templates/jerryr/app.css | 10 ++++++++-- 4 files changed, 19 insertions(+), 5 deletions(-) diff --git a/felamimail/js/jscode/viewMainScreen.js b/felamimail/js/jscode/viewMainScreen.js index f78863f778..03f511928d 100644 --- a/felamimail/js/jscode/viewMainScreen.js +++ b/felamimail/js/jscode/viewMainScreen.js @@ -1142,7 +1142,7 @@ function fm_handleAttachmentClick(_double, _url, _windowName, _node) } function fm_readAttachments(_url, _windowName, _node) { - egw_openWindowCentered(_url, _windowName, 750, 220); + egw_openWindowCentered(_url, _windowName, 750, 260); egw_appWindow('felamimail').xajax_doXMLHTTP("felamimail.ajaxfelamimail.refreshFolder"); mailGrid.dataRoot.actionObject.setAllSelected(false); } diff --git a/felamimail/templates/default/app.css b/felamimail/templates/default/app.css index a7aa06fde8..b69f1219d8 100644 --- a/felamimail/templates/default/app.css +++ b/felamimail/templates/default/app.css @@ -408,12 +408,18 @@ DIV.divButton { height:99%; } +#attachmentSpanAllDIV{ + background-color:#efefdf; + height:260px; + overflow:auto; +} + #attachmentDIV { - position:fixed; + position:top; background-color:#efefdf; bottom:0px; min-height:80px; - max-height:240px; + max-height:239px; width:100%; border-top: 1px solid silver; overflow:auto; diff --git a/felamimail/templates/default/view_attachments.tpl b/felamimail/templates/default/view_attachments.tpl index 20029e0e24..72fd856b24 100644 --- a/felamimail/templates/default/view_attachments.tpl +++ b/felamimail/templates/default/view_attachments.tpl @@ -2,6 +2,7 @@ +
{subject_data}
@@ -10,6 +11,7 @@ self.focus(); {attachment_rows}
+ diff --git a/felamimail/templates/jerryr/app.css b/felamimail/templates/jerryr/app.css index 431c2d1ec8..c8fef735c8 100644 --- a/felamimail/templates/jerryr/app.css +++ b/felamimail/templates/jerryr/app.css @@ -435,12 +435,18 @@ DIV.divButton { height:99%; } +#attachmentSpanAllDIV{ + background-color:#efefdf; + height:260px; + overflow:auto; +} + #attachmentDIV { - position:fixed; + position:top; background-color:#efefdf; bottom:0px; min-height:80px; - max-height:240px; + max-height:239px; width:100%; border-top: 1px solid silver; overflow:auto;