From 0494288999ac87f4147766a8bbfc0a4a4c8979de Mon Sep 17 00:00:00 2001 From: Aleksander Machniak Date: Mon, 24 Jun 2013 19:05:27 +0200 Subject: Improved/unified attachment preview page Implemented attachment print button --- skins/classic/common.css | 9 ++++ skins/classic/images/mail_toolbar.png | Bin 36649 -> 40806 bytes skins/classic/mail.css | 78 +++++++++++++++++++------------ skins/classic/templates/messagepart.html | 37 ++++++++++----- skins/larry/images/buttons.png | Bin 37956 -> 50162 bytes skins/larry/mail.css | 27 +++++++++-- skins/larry/styles.css | 19 ++------ skins/larry/templates/messagepart.html | 27 ++++++----- skins/larry/ui.js | 4 ++ 9 files changed, 132 insertions(+), 69 deletions(-) (limited to 'skins') diff --git a/skins/classic/common.css b/skins/classic/common.css index 1f62fbe07..3c322f0ed 100644 --- a/skins/classic/common.css +++ b/skins/classic/common.css @@ -283,6 +283,15 @@ body > #message a text-decoration: underline; } +body.extwin #closelink +{ + position: absolute; + top: 5px; + right: 20px; + text-align: right; + z-index:100; +} + .box { border: 1px solid #999; diff --git a/skins/classic/images/mail_toolbar.png b/skins/classic/images/mail_toolbar.png index e68035da5..4a8431715 100644 Binary files a/skins/classic/images/mail_toolbar.png and b/skins/classic/images/mail_toolbar.png differ diff --git a/skins/classic/mail.css b/skins/classic/mail.css index 0193e87ff..452093f82 100644 --- a/skins/classic/mail.css +++ b/skins/classic/mail.css @@ -107,6 +107,14 @@ background-position: -192px -32px; } +#messagetoolbar a.print { + background-position: -224px 0; +} + +#messagetoolbar a.printSel { + background-position: -224px -32px; +} + #messagetoolbar a.markmessage { background-position: -256px 0; } @@ -155,6 +163,14 @@ background-position: -416px -32px; } +#messagetoolbar a.download { + background-position: -480px 0; +} + +#messagetoolbar a.downloadSel { + background-position: -480px -32px; +} + #messagetoolbar select.mboxlist { position: relative; @@ -284,10 +300,38 @@ #messagepartcontainer { position: absolute; - top: 80px; - left: 20px; - right: 20px; - bottom: 20px; + top: 0; + left: 170px; + right: 0; + bottom: 0; +} + +#messagepartheader +{ + position: absolute; + top: 0; + bottom: 0; + left: 0; + width: 160px; + border: 1px solid #999999; + background-color: #F9F9F9; + overflow: hidden; +} + +#messagepartheader table +{ + width: 100%; + table-layout: fixed; +} + +#messagepartheader table td +{ + text-overflow: ellipsis; +} + +#messagepartheader table td.title +{ + width: 60px; } #mailcontframe @@ -329,31 +373,7 @@ height: 100%; min-height: 100%; /* Chrome 14 bug */ border: 1px solid #999999; - background-color: #F9F9F9; -} - - -#partheader -{ - position: absolute; - top: 10px; - left: 220px; - right: 20px; - height: 40px; -} - -#partheader table td -{ - padding-left: 2px; - padding-right: 4px; - vertical-align: middle; - font-size: 11px; -} - -#partheader table td.title -{ - color: #666666; - font-weight: bold; + background-color: #fff; } diff --git a/skins/classic/templates/messagepart.html b/skins/classic/templates/messagepart.html index ce7dbe2e1..f768d1703 100644 --- a/skins/classic/templates/messagepart.html +++ b/skins/classic/templates/messagepart.html @@ -3,23 +3,38 @@ <roundcube:object name="pagetitle" /> + + + + - - -
- - -
- [] +
+ +
-
- -
- +
+
+
+
+ +
+
+
+ +
+ diff --git a/skins/larry/images/buttons.png b/skins/larry/images/buttons.png index 54bee0156..9f8f44536 100644 Binary files a/skins/larry/images/buttons.png and b/skins/larry/images/buttons.png differ diff --git a/skins/larry/mail.css b/skins/larry/mail.css index 0af34f371..f63083e68 100644 --- a/skins/larry/mail.css +++ b/skins/larry/mail.css @@ -712,7 +712,6 @@ a.iconbutton.threadmode.selected { } #messageheader, -#partheader, #composeheaders { position: relative; padding: 3px 0; @@ -1147,8 +1146,8 @@ div.message-partheaders .headers-table td.header { #messagepartcontainer { position: absolute; - top: 60px; - left: 0; + top: 42px; + left: 232px; right: 0; bottom: 0; } @@ -1159,6 +1158,28 @@ div.message-partheaders .headers-table td.header { height: 100%; } +#messagepartheader { + position: absolute; + top: 42px; + left: 0; + width: 220px; + bottom: 0; +} + +#messagepartheader table { + table-layout: fixed; + overflow: hidden; +} + +#messagepartheader table td { + text-overflow: ellipsis; +} + +#messagepartheader table td.title { + width: 60px; +} + + /*** message composition ***/ #composeview-left { diff --git a/skins/larry/styles.css b/skins/larry/styles.css index 4d689ab2f..ec4f3047c 100644 --- a/skins/larry/styles.css +++ b/skins/larry/styles.css @@ -690,17 +690,6 @@ a.iconlink.upload { opacity: 0.999; } -.partwin #topline { - position: absolute; - right: 6px; - top: 18px; - width: auto; - z-index: 100; - background: transparent; - background: none; - border: 0; -} - .minimal #topline a.button-logout { display: none; } @@ -883,10 +872,6 @@ a.iconlink.upload { top: 102px; } -.partwin #mainscreen { - top: 60px -} - .extwin #mainscreen { top: 40px; } @@ -1817,6 +1802,10 @@ ul.proplist li { background-position: 0 -1745px; } +.toolbar a.button.download { + background-position: center -1906px; +} + a.menuselector { display: inline-block; border: 1px solid #ababab; diff --git a/skins/larry/templates/messagepart.html b/skins/larry/templates/messagepart.html index dbb4940de..a60210cb8 100644 --- a/skins/larry/templates/messagepart.html +++ b/skins/larry/templates/messagepart.html @@ -4,33 +4,38 @@ <roundcube:object name="pagetitle" /> - + -