Changeset b218aa7 in github


Ignore:
Timestamp:
Jul 8, 2010 9:10:59 AM (3 years ago)
Author:
thomascube <thomas@…>
Branches:
master, HEAD, courier-fix, dev-browser-capabilities, pdo, release-0.6, release-0.7, release-0.8
Children:
58a58cc
Parents:
5019d9c
Message:

Partially revert changes on compose screen from r3789

Location:
skins/default
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • skins/default/functions.js

    r5019d9c rb218aa7  
    5858  if (show && ref) { 
    5959    var pos = $(ref).offset(); 
     60    if (!above && pos.top + ref.offsetHeight + obj.height() > window.innerHeight) 
     61      above = true; 
    6062    obj.css({ left:pos.left, top:(pos.top + (above ? -obj.height() : ref.offsetHeight)) }); 
    6163  } 
    … …  
    8688show_composemenu: function(show) 
    8789{ 
    88   this.show_popupmenu(this.composemenu, 'composemenulink', show, true); 
     90  this.show_popupmenu(this.composemenu, 'composemenulink', show); 
    8991}, 
    9092 
    … …  
    9496    show = false; 
    9597  if (!show) 
    96     $('input[type=file]').val(''); 
     98    $('#attachment-form input[type=file]').val(''); 
     99 
    97100  this.show_popupmenu(this.uploadform, 'uploadformlink', show, true); 
     101 
     102  if (this.uploadform.is(':visible')) 
     103    $('#attachment-form input[type=file]').click(); 
    98104}, 
    99105 
    … …  
    329335  }); 
    330336 
    331   div.style.top = (parseInt(headers_div.offsetHeight, 10) + 1) + 'px'; 
     337  div.style.top = (parseInt(headers_div.offsetHeight, 10) + 3) + 'px'; 
    332338  $(window).resize(); 
    333339}, 
    … …  
    335341resize_compose_body: function() 
    336342{ 
    337   var div = $('#compose-div'), w = div.width(), h = div.height(); 
    338   w = w-4; 
    339   h = h-25; 
    340  
    341   $('#compose-body').width(w-(bw.ie || bw.opera || bw.safari ? 2 : 0)+'px').height(h+'px'); 
     343  var div = $('#compose-div .boxlistcontent'), w = div.width(), h = div.height(); 
     344  w -= 8;  // 2 x 3px padding + 2 x 1px border 
     345  h -= 4; 
     346 
     347  $('#compose-body').width(w+'px').height(h+'px'); 
    342348 
    343349  if (window.tinyMCE && tinyMCE.get('compose-body')) { 
    344     $('#compose-body_tbl').width((w+4)+'px').height(''); 
    345     $('#compose-body_ifr').width((w+2)+'px').height((h-54)+'px'); 
     350    $('#compose-body_tbl').width((w+6)+'px').height(''); 
     351    $('#compose-body_ifr').width((w+6)+'px').height((h-54)+'px'); 
    346352  } 
    347353  else { 
    … …  
    371377      headers_div = document.getElementById('compose-headers-div'); 
    372378    row.style.display = (document.all && !window.opera) ? 'block' : 'table-row'; 
    373     div.style.top = (parseInt(headers_div.offsetHeight, 10) + 1) + 'px'; 
     379    div.style.top = (parseInt(headers_div.offsetHeight, 10) + 3) + 'px'; 
    374380    this.resize_compose_body(); 
    375381  } 

  • skins/default/ie6hacks.css

    r087c7dc rb218aa7  
    114114} 
    115115 
     116#compose-div .boxlistcontent 
     117{ 
     118  height: expression((parseInt(this.parentNode.offsetHeight)-28-parseInt(this.style.top?this.style.top:21))+'px'); 
     119} 
     120 
    116121#directorylistbox 
    117122{ 

  • skins/default/mail.css

    rb8d4feb rb218aa7  
    11091109  margin: 0; 
    11101110  width: 100%; 
    1111   border: 1px solid #999; 
     1111} 
     1112 
     1113#compose-div .boxfooter 
     1114{ 
     1115  height: 26px; 
     1116  background: none; 
     1117  border-top: 0; 
     1118} 
     1119 
     1120#compose-div .boxlistcontent 
     1121{ 
     1122  bottom: 26px; 
    11121123} 
    11131124 
    … …  
    11211132  margin: 0; 
    11221133  font-size: 9pt; 
    1123   border: none; 
    11241134  font-family: monospace; 
     1135  border: 1px solid #999; 
    11251136  resize: none; 
    11261137} 
    … …  
    11341145{ 
    11351146  padding-right: 5px; 
    1136   min-width: 200px; 
     1147  width: 95%; 
    11371148} 
    11381149 
    … …  
    11601171} 
    11611172 
    1162 #compose-headers td select 
    1163 { 
    1164   width: 100%; 
    1165 } 
    1166  
    11671173#compose-headers td textarea 
    11681174{ 
    … …  
    11791185#formlinks 
    11801186{ 
    1181   text-align: right; 
    11821187  white-space: nowrap; 
    1183   width: 1%; 
    11841188  padding-left: 5px; 
    11851189} 
    … …  
    12031207  position: absolute; 
    12041208  right: 5px; 
     1209  bottom: 2px; 
     1210  text-align: right; 
     1211} 
     1212 
     1213#compose-buttons 
     1214{ 
     1215  position: absolute; 
     1216  left: 0; 
    12051217  bottom: 0; 
    1206   text-align: right; 
    1207   line-height: 22px; 
    1208 } 
    1209  
    1210 #compose-buttons 
    1211 { 
    1212   position: absolute; 
    1213   left: 40px; 
    1214   top: 1px; 
     1218  width: auto; 
    12151219} 
    12161220 

  • skins/default/templates/compose.html

    r3940ba6 rb218aa7  
    2525    <roundcube:button command="send" type="link" class="buttonPas send" classAct="button send" classSel="button sendSel" title="sendmessage" content=" " /> 
    2626    <roundcube:button command="spellcheck" type="link" class="buttonPas spellcheck" classAct="button spellcheck" classSel="button spellcheckSel" title="checkspelling" content=" " /> 
     27    <roundcube:button name="addattachment" type="link" class="button attach" classAct="button attach" classSel="button attachSel" title="addattachment" onclick="rcmail_ui.show_uploadform();return false" content=" " /> 
    2728    <roundcube:button command="insert-sig" type="link" class="buttonPas insertsig" classAct="button insertsig" classSel="button insertsigSel" title="insertsignature" content=" " /> 
    2829    <roundcube:button command="savedraft" type="link" class="buttonPas savedraft" classAct="button savedraft" classSel="button savedraftSel" title="savemessage" content=" " /> 
    2930    <roundcube:container name="toolbar" id="compose-toolbar" /> 
     31    <roundcube:button name="messageoptions" id="composemenulink" type="link" class="button messagemenu" title="messageoptions" onclick="rcmail_ui.show_composemenu();return false" content=" " /> 
    3032</div> 
    3133 
    … …  
    3537<div class="boxtitle"><roundcube:label name="attachments" /></div> 
    3638<div class="boxlistcontent"> 
    37   <roundcube:object name="composeAttachmentList" deleteIcon="/images/icons/delete.png" cancelIcon="/images/icons/delete.png" loadingIcon="/images/display/loading_blue.gif" /> 
     39    <roundcube:object name="composeAttachmentList" deleteIcon="/images/icons/delete.png" cancelIcon="/images/icons/delete.png" loadingIcon="/images/display/loading_blue.gif" /> 
    3840</div> 
    3941<div class="boxfooter"> 
    … …  
    4345 
    4446<script type="text/javascript"> 
    45   var composesplitv = new rcube_splitter({id:'composesplitterv', p1: 'compose-attachments', p2: 'compose-container', orientation: 'v', relative: true, start: 165}); 
     47  var composesplitv = new rcube_splitter({id:'composesplitterv', p1: 'compose-attachments', p2: 'compose-container', orientation: 'v', relative: true, start: 175}); 
    4648  rcmail.add_onload('composesplitv.init()'); 
    4749</script> 
    … …  
    4951<div id="compose-container"> 
    5052    <div id="compose-headers-div" style="width: 100%;"> 
    51             <table border="0" cellspacing="0" cellpadding="1" id="compose-headers"> 
    52             <tr> 
    53                     <td class="title"><label for="_from"><roundcube:label name="from" /></label></td> 
    54                     <td class="editfield"> 
    55                 <roundcube:object name="composeHeaders" part="from" form="form" id="_from" tabindex="1" /> 
     53        <table border="0" cellspacing="0" cellpadding="1" id="compose-headers"> 
     54        <tr> 
     55            <td class="title"><label for="_from"><roundcube:label name="from" /></label></td> 
     56            <td class="editfield"><roundcube:object name="composeHeaders" part="from" form="form" id="_from" tabindex="1" /></td> 
     57        </tr><tr> 
     58            <td class="title top"><label for="_to"><roundcube:label name="to" /></label></td> 
     59            <td class="editfield"><roundcube:object name="composeHeaders" part="to" form="form" id="_to" cols="70" rows="2" tabindex="2" /></td> 
     60        </tr><tr id="compose-cc"> 
     61            <td class="title top"> 
     62                <a href="#cc" onclick="return rcmail_ui.hide_header_form('cc');"><img src="/images/icons/minus.gif" alt="" title="<roundcube:label name='delete' />" /></a> 
     63                <label for="_cc"><roundcube:label name="cc" /></label> 
    5664            </td> 
     65            <td class="editfield"><roundcube:object name="composeHeaders" part="cc" form="form" id="_cc" cols="70" rows="2" tabindex="3" /></td> 
     66        </tr><tr id="compose-bcc"> 
     67            <td class="title top"> 
     68                <a href="#bcc" onclick="return rcmail_ui.hide_header_form('bcc');"><img src="/images/icons/minus.gif" alt="" title="<roundcube:label name='delete' />" /></a> 
     69                <label for="_bcc"><roundcube:label name="bcc" /></label> 
     70            </td> 
     71            <td colspan="2" class="editfield"><roundcube:object name="composeHeaders" part="bcc" form="form" id="_bcc" cols="70" rows="2" tabindex="4" /></td> 
     72        </tr><tr id="compose-replyto"> 
     73            <td class="title top"> 
     74                <a href="#replyto" onclick="return rcmail_ui.hide_header_form('replyto');"><img src="/images/icons/minus.gif" alt="" title="<roundcube:label name='delete' />" /></a> 
     75                <label for="_replyto"><roundcube:label name="replyto" /></label> 
     76            </td> 
     77            <td class="editfield"><roundcube:object name="composeHeaders" part="replyto" form="form" id="_replyto" size="70" tabindex="5" /></td> 
     78        </tr><tr> 
     79            <td></td> 
    5780            <td id="formlinks"> 
    58                         <a href="#cc" onclick="return rcmail_ui.show_header_form('cc')" id="cc-link"><roundcube:label name="addcc" /></a> 
    59                         <span class="separator">|</span> 
    60                         <a href="#bcc" onclick="return rcmail_ui.show_header_form('bcc')" id="bcc-link"><roundcube:label name="addbcc" /></a> 
    61                         <span class="separator">|</span> 
    62                         <a href="#reply-to" onclick="return rcmail_ui.show_header_form('replyto')" id="replyto-link"><roundcube:label name="addreplyto" /></a> 
    63             </td> 
    64             </tr><tr> 
    65                     <td class="title top"><label for="_to"><roundcube:label name="to" /></label></td> 
    66                     <td colspan="2" class="editfield"> 
    67                 <roundcube:object name="composeHeaders" part="to" form="form" id="_to" cols="70" rows="2" tabindex="2" /> 
    68             </td> 
    69             </tr><tr id="compose-cc"> 
    70                     <td class="title top"> 
    71                 <a href="#cc" onclick="return rcmail_ui.hide_header_form('cc');"><img src="/images/icons/minus.gif" alt="" title="<roundcube:label name='delete' />" /></a> 
    72                         <label for="_cc"><roundcube:label name="cc" /></label> 
    73             </td> 
    74                     <td colspan="2" class="editfield"> 
    75                 <roundcube:object name="composeHeaders" part="cc" form="form" id="_cc" cols="70" rows="2" tabindex="3" /> 
    76             </td> 
    77             </tr><tr id="compose-bcc"> 
    78                     <td class="title top"> 
    79                 <a href="#bcc" onclick="return rcmail_ui.hide_header_form('bcc');"><img src="/images/icons/minus.gif" alt="" title="<roundcube:label name='delete' />" /></a> 
    80                         <label for="_bcc"><roundcube:label name="bcc" /></label> 
    81             </td> 
    82                     <td colspan="2" class="editfield"> 
    83                 <roundcube:object name="composeHeaders" part="bcc" form="form" id="_bcc" cols="70" rows="2" tabindex="4" /> 
    84             </td> 
    85             </tr><tr id="compose-replyto"> 
    86                     <td class="title top"> 
    87                 <a href="#replyto" onclick="return rcmail_ui.hide_header_form('replyto');"><img src="/images/icons/minus.gif" alt="" title="<roundcube:label name='delete' />" /></a> 
    88                         <label for="_replyto"><roundcube:label name="replyto" /></label> 
    89             </td> 
    90                     <td colspan="2" class="editfield"> 
    91                 <roundcube:object name="composeHeaders" part="replyto" form="form" id="_replyto" size="70" tabindex="5" /> 
     81                <a href="#cc" onclick="return rcmail_ui.show_header_form('cc')" id="cc-link"><roundcube:label name="addcc" /></a> 
     82                <span class="separator">|</span> 
     83                <a href="#bcc" onclick="return rcmail_ui.show_header_form('bcc')" id="bcc-link"><roundcube:label name="addbcc" /></a> 
     84                <span class="separator">|</span> 
     85                <a href="#reply-to" onclick="return rcmail_ui.show_header_form('replyto')" id="replyto-link"><roundcube:label name="addreplyto" /></a> 
    9286            </td> 
    9387        </tr><tr> 
    94                     <td class="title"><label for="compose-subject"><roundcube:label name="subject" /></label></td> 
    95                     <td colspan="2" class="editfield"> 
    96                 <roundcube:object name="composeSubject" id="compose-subject" form="form" tabindex="6" /> 
    97             </td> 
     88            <td class="title"><label for="compose-subject"><roundcube:label name="subject" /></label></td> 
     89            <td class="editfield"><roundcube:object name="composeSubject" id="compose-subject" form="form" tabindex="6" /></td> 
     90        </tr> 
    9891        </table> 
    9992    </div> 
    10093    <div id="compose-div"> 
    10194        <div class="boxlistcontent" style="overflow: hidden; top: 0"> 
    102                 <roundcube:object name="composeBody" id="compose-body" form="form" cols="70" rows="20" tabindex="7" /> 
     95            <roundcube:object name="composeBody" id="compose-body" form="form" cols="70" rows="20" tabindex="7" /> 
    10396        </div> 
    10497        <div class="boxfooter"> 
    105             <roundcube:button name="messageoptions" id="composemenulink" type="link" title="messageoptions" class="button groupactions" onclick="rcmail_ui.show_composemenu();return false" content=" " /> 
    106             <span id="compose-buttons"> 
    107                     <roundcube:button type="input" command="send" class="button mainaction" label="sendmessage" tabindex="8" /> 
    108                     <roundcube:button type="input" command="list" class="button" label="cancel" tabindex="9" /> 
    109             </span> 
    110             <div id="compose-editorfooter" class="pagenav"> 
    111                 <span id="spellcheck-control" style="margin-right: 10px"></span> 
     98            <div id="compose-buttons"> 
     99                <roundcube:button type="input" command="send" class="button mainaction" label="sendmessage" tabindex="8" /> 
     100                <roundcube:button type="input" command="list" class="button" label="cancel" tabindex="9" /> 
     101            </div> 
     102            <div id="compose-editorfooter"> 
     103                <span id="spellcheck-control" style="margin-right:10px"></span> 
    112104                <span> 
    113                 <roundcube:label name="editortype" /> 
    114                 <roundcube:object name="editorSelector" editorid="compose-body" tabindex="10" /> 
     105                    <roundcube:label name="editortype" /> 
     106                    <roundcube:object name="editorSelector" editorid="compose-body" tabindex="10" /> 
    115107                </span> 
    116108            </div> 
    … …  
    123115<div id="composeoptionsmenu" class="popupmenu"> 
    124116    <table> 
    125         <tr><td><label for="rcmcomposereceipt"><roundcube:label name="returnreceipt" />:</label></td> 
    126             <td><roundcube:object name="receiptCheckBox" form="form" id="rcmcomposereceipt" /></td> 
    127         </tr> 
    128         <tr><td><label for="rcmcomposepriority"><roundcube:label name="priority" />:</label></td> 
    129             <td><roundcube:object name="prioritySelector" form="form" id="rcmcomposepriority" /></td> 
    130         </tr> 
    131         <tr><td><label><roundcube:label name="savesentmessagein" />:</label></td> 
    132             <td><roundcube:object name="storetarget" maxlength="30" /></td> 
    133         </tr> 
     117    <tr> 
     118        <td><label for="rcmcomposereceipt"><roundcube:label name="returnreceipt" />:</label></td> 
     119        <td><roundcube:object name="receiptCheckBox" form="form" id="rcmcomposereceipt" /></td> 
     120    </tr><tr> 
     121        <td><label for="rcmcomposepriority"><roundcube:label name="priority" />:</label></td> 
     122        <td><roundcube:object name="prioritySelector" form="form" id="rcmcomposepriority" /></td> 
     123    </tr><tr> 
     124        <td><label><roundcube:label name="savesentmessagein" />:</label></td> 
     125        <td><roundcube:object name="storetarget" maxlength="30" /></td> 
     126    </tr> 
    134127    </table> 
    135128</div> 
Note: See TracChangeset for help on using the changeset viewer.