Changeset 1905 in subversion


Ignore:
Timestamp:
Oct 1, 2008 4:35:27 AM (5 years ago)
Author:
alec
Message:
  • Fix compose window width/height (#1485396)
Location:
trunk/roundcubemail
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/roundcubemail/CHANGELOG

    r1904 r1905  
    33 
    442008/10/01 (alec) 
    5 - Stop spellchecking when switching to html editor (#1485362) 
     5- Fix spellchecking when switching to html editor (#1485362) 
     6- Fix compose window width/height (#1485396) 
    67 
    782008/09/29 (alec) 
  • trunk/roundcubemail/skins/default/mail.css

    r1862 r1905  
    865865{ 
    866866  padding-left: 30px; 
    867   white-space: nowrap; 
    868867} 
    869868 
     
    875874  right: 25px; 
    876875  bottom: 30px; 
    877   padding: 0px; 
    878876  margin: 0px; 
    879877  /* css hack for IE */ 
    880878  width: expression((parseInt(document.documentElement.clientWidth)-220)+'px'); 
    881   height: expression((parseInt(document.documentElement.clientHeight)-130)+'px'); 
    882 } 
    883  
    884 /* 
     879  height: expression((parseInt(document.documentElement.clientHeight)-120)+'px'); 
     880} 
     881 
    885882#compose-headers 
    886883{ 
    887   position: absolute; 
    888   top: 70px; 
    889   left: 200px; 
    890   height: 84px; 
    891   border-top: 1px solid #cccccc; 
    892   overflow: auto; 
    893 } 
    894  
    895 #compose-headers td 
    896 { 
    897   padding-top: 1px; 
    898   padding-bottom: 1px; 
    899   border-right: 1px solid #cccccc; 
    900   border-bottom: 1px solid #cccccc; 
    901 } 
    902 */ 
    903  
    904 #compose-headers 
    905 { 
    906   width: 100%; 
    907 } 
    908  
    909 /* 
    910 #compose-headers td 
    911 { 
    912   width: 100%; 
    913 } 
    914 */ 
     884  width: 100%; 
     885} 
    915886 
    916887#compose-headers td.top 
     
    952923#compose-body 
    953924{ 
    954   margin-top: 5px; 
    955   margin-bottom: 10px; 
    956   height: 90%; 
    957   min-height: 280px; 
     925  min-height: 100px; 
     926  height: 100%; 
    958927  font-size: 9pt; 
    959928  font-family: "Courier New", Courier, monospace; 
  • trunk/roundcubemail/skins/default/templates/compose.html

    r1847 r1905  
    1111function rcmail_show_header_form(id, link) 
    1212{ 
    13   var row, ns, ps; 
    14   if (row = document.getElementById(id)) 
    15     row.style.display = (document.all && !window.opera) ? 'block' : 'table-row'; 
    16    
     13  var row, parent, ns, ps, links; 
     14 
    1715  if (link) 
    1816  { 
     17    var parent = link.parentNode; 
     18 
    1919    if ((ns = rcmail_next_sibling(link))) 
    20       link.parentNode.removeChild(ns); 
     20      parent.removeChild(ns); 
    2121    else if ((ps = rcmail_prev_sibling(link))) 
    22       link.parentNode.removeChild(ps); 
     22      parent.removeChild(ps); 
    2323     
    24     link.parentNode.removeChild(link); 
     24    parent.removeChild(link); 
     25 
     26    if(!parent.getElementsByTagName('A').length) 
     27      document.getElementById('compose-links').style.display = 'none'; 
    2528  } 
    26    
     29 
     30  if (row = document.getElementById(id)) 
     31    { 
     32    var div = document.getElementById('compose-div'); 
     33    var headers_div = document.getElementById('compose-headers-div'); 
     34    row.style.display = (document.all && !window.opera) ? 'block' : 'table-row'; 
     35    div.style.top = (parseInt(headers_div.offsetHeight)) + 'px'; 
     36    } 
     37 
    2738  return false; 
    2839} 
     
    5667<div id="messagetoolbar"> 
    5768<table border="0" cellspacing="0" cellpadding="0"><tr> 
    58 <td id="compose-toolbar"> 
    59   <roundcube:button command="list" image="/images/buttons/back_act.png" imageSel="/images/buttons/back_sel.png" imageAct="/images/buttons/back_act.png" width="32" height="32" title="backtolist" /> 
    60   <roundcube:button command="send" imageSel="/images/buttons/send_sel.png" imageAct="/images/buttons/send_act.png" imagePas="/images/buttons/send_pas.png" width="32" height="32" title="sendmessage" /> 
    61   <roundcube:button command="spellcheck" imageSel="/images/buttons/spellcheck_sel.png" imageAct="/images/buttons/spellcheck_act.png" imagePas="/images/buttons/spellcheck_pas.png" width="32" height="32" title="checkspelling" /> 
    62   <roundcube:button command="add-attachment" imageSel="/images/buttons/attach_sel.png" imageAct="/images/buttons/attach_act.png" imagePas="/images/buttons/attach_pas.png" width="32" height="32" title="addattachment" /> 
    63   <roundcube:button command="savedraft" imageSel="/images/buttons/drafts_sel.png" imageAct="/images/buttons/drafts_act.png" imagePas="/images/buttons/drafts_pas.png" width="32" height="32" title="savemessage" /> 
    64 </td> 
    65 <td id="priority-selector"> 
    66   <label for="rcmcomposepriority"><roundcube:label name="priority" />:</label>&nbsp;<roundcube:object name="prioritySelector" form="form" id="rcmcomposepriority" /> 
    67 </td> 
    68 <td id="receipt-selector"> 
    69   <roundcube:object name="receiptCheckBox" form="form" id="rcmcomposereceipt" />&nbsp;<label for="rcmcomposereceipt"><roundcube:label name="returnreceipt" /></label> 
    70 </td> 
     69    <td id="compose-toolbar"> 
     70        <roundcube:button command="list" image="/images/buttons/back_act.png" imageSel="/images/buttons/back_sel.png" imageAct="/images/buttons/back_act.png" width="32" height="32" title="backtolist" /> 
     71        <roundcube:button command="send" imageSel="/images/buttons/send_sel.png" imageAct="/images/buttons/send_act.png" imagePas="/images/buttons/send_pas.png" width="32" height="32" title="sendmessage" /> 
     72        <roundcube:button command="spellcheck" imageSel="/images/buttons/spellcheck_sel.png" imageAct="/images/buttons/spellcheck_act.png" imagePas="/images/buttons/spellcheck_pas.png" width="32" height="32" title="checkspelling" /> 
     73        <roundcube:button command="add-attachment" imageSel="/images/buttons/attach_sel.png" imageAct="/images/buttons/attach_act.png" imagePas="/images/buttons/attach_pas.png" width="32" height="32" title="addattachment" /> 
     74        <roundcube:button command="savedraft" imageSel="/images/buttons/drafts_sel.png" imageAct="/images/buttons/drafts_act.png" imagePas="/images/buttons/drafts_pas.png" width="32" height="32" title="savemessage" /> 
     75    </td> 
     76    <td id="priority-selector"> 
     77        <label for="rcmcomposepriority"><roundcube:label name="priority" />:</label>&nbsp;<roundcube:object name="prioritySelector" form="form" id="rcmcomposepriority" /> 
     78    </td> 
     79    <td id="receipt-selector"> 
     80        <roundcube:object name="receiptCheckBox" form="form" id="rcmcomposereceipt" />&nbsp;<label for="rcmcomposereceipt"><roundcube:label name="returnreceipt" /></label> 
     81    </td> 
    7182</tr></table> 
    7283</div> 
    7384 
    7485<div id="compose-container"> 
    75 <table border="0" cellspacing="0" cellpadding="1" style="width:100%; height:99%;" summary=""> 
    76 <tbody> 
    77 <tr> 
    78 <td> 
    79  
    80 <table border="0" cellspacing="0" cellpadding="1" id="compose-headers" summary=""> 
    81 <tbody><tr> 
    82  
    83 <td class="title"><label for="rcmcomposefrom"><roundcube:label name="from" /></label></td> 
    84 <td><roundcube:object name="composeHeaders" part="from" form="form" id="rcmcomposefrom" tabindex="1" /></td> 
    85  
    86 </tr><tr> 
    87  
    88 <td class="title top"><label for="rcmcomposeto"><roundcube:label name="to" /></label></td> 
    89 <td><roundcube:object name="composeHeaders" part="to" form="form" id="rcmcomposeto" cols="80" rows="2" tabindex="2" /></td> 
    90  
    91 </tr><tr id="compose-cc"> 
    92  
    93 <td class="title top"><label for="rcmcomposecc"><roundcube:label name="cc" /></label></td> 
    94 <td><roundcube:object name="composeHeaders" part="cc" form="form" id="rcmcomposecc" cols="80" rows="2" tabindex="3" /></td> 
    95  
    96 </tr><tr id="compose-bcc"> 
    97  
    98 <td class="title top"><label for="rcmcomposebcc"><roundcube:label name="bcc" /></label></td> 
    99 <td><roundcube:object name="composeHeaders" part="bcc" form="form" id="rcmcomposebcc" cols="80" rows="2" tabindex="4" /></td> 
    100  
    101 </tr><tr id="compose-replyto"> 
    102  
    103 <td class="title top"><label for="rcmcomposereplyto"><roundcube:label name="replyto" /></label></td> 
    104 <td><roundcube:object name="composeHeaders" part="replyto" form="form" id="rcmcomposereplyto" size="80" tabindex="5" /></td> 
    105  
    106 </tr><tr> 
    107    
    108 <td></td> 
    109 <td class="formlinks"> 
    110   <a href="#cc" onclick="return rcmail_show_header_form('compose-cc', this);" id="addcclink"><roundcube:label name="addcc" /></a> 
    111   <span class="separator">|</span> 
    112   <a href="#bcc" onclick="return rcmail_show_header_form('compose-bcc', this);" id="addbcclink"><roundcube:label name="addbcc" /></a> 
    113   <span class="separator">|</span> 
    114   <a href="#reply-to" onclick="return rcmail_show_header_form('compose-replyto', this);" id="addreplytolink"><roundcube:label name="addreplyto" /></a> 
    115 </td> 
    116  
    117 </tr><tr> 
    118  
    119 <td class="title"><label for="compose-subject"><roundcube:label name="subject" /></label></td> 
    120 <td><roundcube:object name="composeSubject" id="compose-subject" form="form" tabindex="6" /></td> 
    121  
    122 </tr> 
    123 </tbody> 
    124 </table> 
    125  
    126 </td> 
    127  
    128 </tr><tr> 
    129  
    130 <td style="width:100%; height:90%; vertical-align:top;"> 
    131 <roundcube:object name="composeBody" id="compose-body" form="form" cols="80" rows="20" tabindex="7" /> 
    132  
    133 <table border="0" cellspacing="0" width="100%" summary=""><tbody> 
    134 <tr> 
    135 <td style="white-space: nowrap"> 
    136 <roundcube:button type="input" command="send" class="button mainaction" label="sendmessage" tabindex="8" /> 
    137 <roundcube:button type="input" command="list" class="button" label="cancel" tabindex="9" /> 
    138 </td> 
    139 <td style="text-align:center; white-space: nowrap"> 
    140   <label><roundcube:label name="savesentmessagein" />: <roundcube:object name="storetarget" maxlength="30" /></label> 
    141 </td> 
    142 <td style="text-align:right; white-space:nowrap"> 
    143  <roundcube:label name="editortype" />:&nbsp; 
    144  <span class="radios-left"><roundcube:object name="editorSelector" tabindex="10" /></span> 
    145 </td> 
    146 </tr> 
    147 </tbody></table> 
    148  
    149 </td> 
    150  
    151 </tr> 
    152 </tbody> 
    153 </table> 
    154  
     86    <div id="compose-headers-div" style="width: 100%;"> 
     87        <table border="0" cellspacing="0" cellpadding="1" id="compose-headers" summary=""> 
     88        <tbody> 
     89            <tr> 
     90                <td class="title"><label for="rcmcomposefrom"><roundcube:label name="from" /></label></td> 
     91                <td><roundcube:object name="composeHeaders" part="from" form="form" id="rcmcomposefrom" tabindex="1" /></td> 
     92            </tr><tr> 
     93                <td class="title top"><label for="rcmcomposeto"><roundcube:label name="to" /></label></td> 
     94                <td><roundcube:object name="composeHeaders" part="to" form="form" id="rcmcomposeto" cols="70" rows="2" tabindex="2" /></td> 
     95            </tr><tr id="compose-cc"> 
     96                <td class="title top"><label for="rcmcomposecc"><roundcube:label name="cc" /></label></td> 
     97                <td><roundcube:object name="composeHeaders" part="cc" form="form" id="rcmcomposecc" cols="70" rows="2" tabindex="3" /></td> 
     98            </tr><tr id="compose-bcc"> 
     99                <td class="title top"><label for="rcmcomposebcc"><roundcube:label name="bcc" /></label></td> 
     100                <td><roundcube:object name="composeHeaders" part="bcc" form="form" id="rcmcomposebcc" cols="70" rows="2" tabindex="4" /></td> 
     101            </tr><tr id="compose-replyto"> 
     102                <td class="title top"><label for="rcmcomposereplyto"><roundcube:label name="replyto" /></label></td> 
     103                <td><roundcube:object name="composeHeaders" part="replyto" form="form" id="rcmcomposereplyto" size="70" tabindex="5" /></td> 
     104            </tr><tr id="compose-links"> 
     105                <td></td> 
     106                <td class="formlinks"> 
     107                    <a href="#cc" onclick="return rcmail_show_header_form('compose-cc', this);" id="addcclink"><roundcube:label name="addcc" /></a> 
     108                    <span class="separator">|</span> 
     109                    <a href="#bcc" onclick="return rcmail_show_header_form('compose-bcc', this);" id="addbcclink"><roundcube:label name="addbcc" /></a> 
     110                    <span class="separator">|</span> 
     111                    <a href="#reply-to" onclick="return rcmail_show_header_form('compose-replyto', this);" id="addreplytolink"><roundcube:label name="addreplyto" /></a> 
     112                </td> 
     113            </tr><tr> 
     114                <td class="title"><label for="compose-subject"><roundcube:label name="subject" /></label></td> 
     115                <td><roundcube:object name="composeSubject" id="compose-subject" form="form" tabindex="6" /></td> 
     116            </tr> 
     117        </tbody> 
     118        </table> 
     119    </div> 
     120    <div id="compose-div" style="width:100%; vertical-align:top; position: absolute; top: 110px; bottom: 40px;"> 
     121        <roundcube:object name="composeBody" id="compose-body" form="form" cols="70" rows="20" tabindex="7" spell_container="spell-container"/> 
     122        <table border="0" cellspacing="0" summary="" style="width:100%; margin-top: 5px;"><tbody> 
     123            <tr> 
     124                <td style="white-space: nowrap"> 
     125                    <roundcube:button type="input" command="send" class="button mainaction" label="sendmessage" tabindex="8" /> 
     126                    <roundcube:button type="input" command="list" class="button" label="cancel" tabindex="9" /> 
     127                </td> 
     128                <td style="text-align:center; white-space: nowrap"> 
     129                    <label><roundcube:label name="savesentmessagein" />: <roundcube:object name="storetarget" maxlength="30" /></label> 
     130                </td> 
     131                <td style="text-align:right; white-space:nowrap"> 
     132                    <roundcube:label name="editortype" />:&nbsp; 
     133                    <span class="radios-left"><roundcube:object name="editorSelector" tabindex="10" /></span> 
     134                </td> 
     135            </tr> 
     136        </tbody></table> 
     137    </div> 
    155138</div> 
    156139 
Note: See TracChangeset for help on using the changeset viewer.