diff options
Diffstat (limited to 'skins')
| -rw-r--r-- | skins/classic/common.css | 9 | ||||
| -rw-r--r-- | skins/classic/images/mail_toolbar.png | bin | 36649 -> 40806 bytes | |||
| -rw-r--r-- | skins/classic/mail.css | 78 | ||||
| -rw-r--r-- | skins/classic/templates/messagepart.html | 37 | ||||
| -rw-r--r-- | skins/larry/images/buttons.png | bin | 37956 -> 50162 bytes | |||
| -rw-r--r-- | skins/larry/mail.css | 27 | ||||
| -rw-r--r-- | skins/larry/styles.css | 19 | ||||
| -rw-r--r-- | skins/larry/templates/messagepart.html | 27 | ||||
| -rw-r--r-- | skins/larry/ui.js | 4 |
9 files changed, 132 insertions, 69 deletions
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 Binary files differindex e68035da5..4a8431715 100644 --- a/skins/classic/images/mail_toolbar.png +++ b/skins/classic/images/mail_toolbar.png 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 @@ <head> <title><roundcube:object name="pagetitle" /></title> <roundcube:include file="/includes/links.html" /> +<script type="text/javascript" src="/splitter.js"></script> +<script type="text/javascript" src="/functions.js"></script> +<style type="text/css"> +#messagepartheader { width: <roundcube:exp expression="!empty(cookie:mailpartsplitter) ? cookie:mailpartsplitter-5 : 170" />px; } +#messagepartcontainer { left: <roundcube:exp expression="!empty(cookie:mailpartsplitter) ? cookie:mailpartsplitter+5 : 180" />px; +<roundcube:exp expression="browser:ie ? ('width: expression((parseInt(this.parentNode.offsetWidth)-'.(!empty(cookie:mailpartsplitter) ? cookie:mailpartsplitter+5 : 180).')+\\'px\\');') : ''" /> +} +</style> </head> <body class="extwin"> +<roundcube:object name="message" id="message" /> -<roundcube:include file="/includes/header.html" /> - -<div id="partheader"> -<roundcube:object name="messagePartControls" cellpadding="2" cellspacing="0" /> - -<div style="position:absolute; top:2px; right:0; width:12em; text-align:right"> - [<a href="#close" class="closelink" onclick="self.close()"><roundcube:label name="close" /></a>] +<div id="messagetoolbar"> + <roundcube:button command="download" type="link" class="button download" classAct="button download" classSel="button downloadSel" title="download" content=" " /> + <roundcube:button command="print" type="link" class="button print" classAct="button print" classSel="button printSel" title="print" content=" " /> </div> -</div> - -<div id="messagepartcontainer"> -<roundcube:object name="messagePartFrame" id="messagepartframe" width="100%" height="100%" /> +<div id="mainscreen"> + <div id="messagepartheader"> + <div class="boxtitle" /><roundcube:label name="properties" /></div> + <div class="boxlistcontent"> + <roundcube:object name="messagePartControls" class="records-table" cellspacing="0" /> + </div> + </div> + <div id="messagepartcontainer"> + <roundcube:object name="messagePartFrame" id="messagepartframe" width="100%" height="100%" /> + </div> </div> +<script type="text/javascript"> +var mailpartsplit = new rcube_splitter({id:'mailpartsplitter', p1: 'messagepartheader', p2: 'messagepartcontainer', orientation: 'v', relative: true, start: 165}); +rcmail.add_onload('mailpartsplit.init()'); +</script> </body> </html> diff --git a/skins/larry/images/buttons.png b/skins/larry/images/buttons.png Binary files differindex 54bee0156..9f8f44536 100644 --- a/skins/larry/images/buttons.png +++ b/skins/larry/images/buttons.png 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 @@ <title><roundcube:object name="pagetitle" /></title> <roundcube:include file="/includes/links.html" /> </head> -<body class="partwin"> +<body class="extwin noscroll"> -<div id="header"> <div id="topline"> <div class="topright"> <a href="#close" class="closelink" onclick="self.close()"><roundcube:label name="close" /></a> </div> </div> -<div id="topnav"> - <roundcube:object name="logo" src="/images/roundcube_logo.png" id="toplogo" border="0" alt="Logo" /> -</div> +<div id="mainscreen"> -<br style="clear:both" /> +<div id="messagetoolbar" class="toolbar fullwidth"> + <roundcube:button command="download" type="link" class="button download disabled" classAct="button download" classSel="button download pressed" label="download" /> + <roundcube:button command="print" type="link" class="button print disabled" classAct="button print" classSel="button print pressed" label="print" /> </div> -<div id="mainscreen"> - -<div id="partheader" class="uibox"> -<roundcube:object name="messagePartControls" class="headers-table" /> +<div id="messagepartheader" class="uibox listbox"> + <h2 class="boxtitle"><roundcube:label name="properties" /></h2> + <div class="scroller"> + <roundcube:object name="messagePartControls" class="listing" /> + </div> </div> <div id="messagepartcontainer" class="uibox"> -<roundcube:object name="messagePartFrame" id="messagepartframe" frameborder="0" /> + <div class="iframebox"> + <roundcube:object name="messagePartFrame" id="messagepartframe" frameborder="0" /> + </div> + <roundcube:object name="message" id="message" class="statusbar" /> </div> </div> +<roundcube:include file="/includes/footer.html" /> + </body> </html> diff --git a/skins/larry/ui.js b/skins/larry/ui.js index a8572720b..7dc9b57b1 100644 --- a/skins/larry/ui.js +++ b/skins/larry/ui.js @@ -154,6 +154,10 @@ function rcube_mail_ui() rcmail.addEventListener('enable-command', enable_command); rcmail.addEventListener('afterimport-messages', show_uploadform); } + else if (rcmail.env.action == 'get') { + new rcube_splitter({ id:'mailpartsplitterv', p1:'#messagepartheader', p2:'#messagepartcontainer', + orientation:'v', relative:true, start:226, min:150, size:12}).init(); + } if ($('#mailview-left').length) { new rcube_splitter({ id:'mailviewsplitterv', p1:'#mailview-left', p2:'#mailview-right', |
