Changeset 2643 in subversion


Ignore:
Timestamp:
Jun 14, 2009 3:25:11 PM (4 years ago)
Author:
thomasb
Message:

Re-arrange html containers in order to move the footer links with the separator

Location:
trunk/roundcubemail/skins/default
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • trunk/roundcubemail/skins/default/ie6hacks.css

    r2574 r2643  
    1212#remote-objects-message 
    1313{ 
    14   background-image: url(images/display/icons.gif); 
     14  background-image: url('images/display/icons.gif'); 
    1515} 
    1616 

  • trunk/roundcubemail/skins/default/iehacks.css

    r2614 r2643  
    5454} 
    5555 
    56 #mainscreen  
     56#messagetoolbar select.mboxlist 
     57{ 
     58  top: -8px; 
     59} 
     60 
     61#mainscreen 
    5762{ 
    5863  width: expression((parseInt(document.documentElement.clientWidth)-40)+'px'); 
    59   height: expression((parseInt(document.documentElement.clientHeight)-125)+'px'); 
     64  height: expression((parseInt(document.documentElement.clientHeight)-101)+'px'); 
    6065} 
    6166 
    … …  
    8792} 
    8893 
    89 #mailpreviewframe 
    90 { 
    91   height: expression((parseInt(this.parentNode.offsetHeight)-205)+'px'); 
     94#mailrightcontent 
     95{ 
     96  height: expression((parseInt(this.parentNode.offsetHeight)-20)+'px'); 
    9297} 
    9398 
    … …  
    99104#mailboxlist-container 
    100105{ 
    101   height: expression(parseInt(this.parentNode.offsetHeight)+'px'); 
    102 } 
    103  
    104 #mailfooter 
    105 { 
    106   width: expression((parseInt(document.documentElement.clientWidth)-40)+'px'); 
     106  height: expression((parseInt(this.parentNode.offsetHeight)-20)+'px'); 
    107107} 
    108108 
    … …  
    115115#messageframe 
    116116{ 
    117   width: expression((parseInt(this.parentNode.offsetWidth)-170)+'px'); 
    118   height: expression((parseInt(this.parentNode.offsetHeight))+'px'); 
     117  width: expression((parseInt(this.parentNode.offsetWidth)-180)+'px'); 
     118  height: expression((parseInt(this.parentNode.offsetHeight)-20)+'px'); 
    119119} 
    120120 

  • trunk/roundcubemail/skins/default/mail.css

    r2642 r2643  
    2929#messagetoolbar select.mboxlist 
    3030{ 
    31   position: absolute; 
    32   top: 8px; 
     31  position: relative; 
     32  margin: 0 8px; 
     33  top: -12px; 
    3334} 
    3435 
    … …  
    230231} 
    231232 
    232 #listcontrols, 
    233 #mailboxcontrols 
     233#listcontrols 
    234234{ 
    235235  padding-right: 2em; 
    … …  
    239239{ 
    240240  position: absolute; 
    241   bottom: 16px; 
    242   right: 20px; 
     241  bottom: 0px; 
     242  right: 0px; 
    243243  width: 300px; 
    244   height: 20px; 
     244  height: 16px; 
    245245  text-align: right; 
    246246  white-space: nowrap; 
    … …  
    253253} 
    254254 
    255 #mainscreen  
     255#mainscreen 
    256256{ 
    257257  position: absolute; 
    258258  top: 85px; 
    259259  right: 20px; 
    260   bottom: 40px; 
     260  bottom: 16px; 
    261261  left: 20px; 
     262} 
     263 
     264#mailleftcontainer 
     265{ 
     266  position: absolute; 
     267  top: 0px; 
     268  left: 0px; 
     269  bottom: 0px; 
     270  width: 170px; 
    262271} 
    263272 
    … …  
    271280} 
    272281 
     282#mailrightcontent 
     283{ 
     284  position: absolute; 
     285  top: 0px; 
     286  left: 0px; 
     287  right: 0px; 
     288  bottom: 20px; 
     289} 
     290 
    273291#messagepartcontainer 
    274292{ 
    … …  
    288306  border: 1px solid #999999; 
    289307  background-color: #F9F9F9; 
     308  overflow: auto; 
    290309  overflow-y: auto; 
    291310  overflow-x: hidden; 
    … …  
    366385  top: 0px; 
    367386  left: 0px; 
    368   width: 160px; 
    369   bottom: 0px; 
     387  width: 100%; 
     388  bottom: 20px; 
    370389  border: 1px solid #999; 
    371390  background-color: #F9F9F9; 
    … …  
    497516} 
    498517 
    499  
    500518#mailfooter 
    501519{ 
    502520  position: absolute; 
    503   left: 20px; 
    504   right: 20px; 
    505   bottom: 18px; 
    506   height: 20px; 
     521  left: 0px; 
     522  bottom: 0px; 
     523  height: 16px; 
     524  width: 100%; 
    507525} 
    508526 
    … …  
    513531} 
    514532 
    515 #mailboxcontrols, 
     533#mailboxcontrols 
     534{ 
     535  position: absolute; 
     536  left: 0px; 
     537  bottom: 0px; 
     538  height: 16px; 
     539  width: auto; 
     540  font-size: 11px; 
     541} 
     542 
    516543#listcontrols, 
    517544#countcontrols, 
    … …  
    540567#messagelist thead tr td 
    541568{ 
    542   height: 20px; 
     569  height: 19px; 
    543570  padding-top: 0px; 
    544571  padding-bottom: 0px; 
    … …  
    729756  position: absolute; 
    730757  top: 0px; 
    731   left: 170px; 
     758  left: 180px; 
    732759  right: 0px; 
    733   bottom: 0px; 
     760  bottom: 20px; 
    734761  border: 1px solid #999; 
    735762  background-color: #FFF; 

  • trunk/roundcubemail/skins/default/templates/mail.html

    r2595 r2643  
    99<roundcube:if condition="config:preview_pane == true" /> 
    1010#mailcontframe { height: <roundcube:exp expression="!empty(cookie:mailviewsplitter) ? cookie:mailviewsplitter-5 : 195" />px; } 
    11 #mailpreviewframe { top: <roundcube:exp expression="!empty(cookie:mailviewsplitter) ? cookie:mailviewsplitter+5 : 205" />px; 
    12 <roundcube:exp expression="browser:ie ? ('height: expression((parseInt(this.parentNode.offsetHeight)-'.(!empty(cookie:mailviewsplitter) ? cookie:mailviewsplitter+5 : 205).')+\\'px\\');') : ''" /> 
     11#mailpreviewframe { top: <roundcube:exp expression="!empty(cookie:mailviewsplitter) ? cookie:mailviewsplitter+5 : 225" />px; 
     12<roundcube:exp expression="browser:ie ? ('height: expression((parseInt(this.parentNode.offsetHeight)-'.(!empty(cookie:mailviewsplitter) ? cookie:mailviewsplitter+25 : 245).')+\\'px\\');') : ''" /> 
    1313} 
    1414<roundcube:endif /> 
    15 #mailboxlist-container { width: <roundcube:exp expression="!empty(cookie:mailviewsplitterv) ? cookie:mailviewsplitterv-5 : 160" />px; } 
    16 #mailrightcontainer { left: <roundcube:exp expression="!empty(cookie:mailviewsplitterv) ? cookie:mailviewsplitterv+5 : 170" />px; 
    17 <roundcube:exp expression="browser:ie ? ('width: expression((parseInt(this.parentNode.offsetWidth)-'.(!empty(cookie:mailviewsplitterv) ? cookie:mailviewsplitterv+5 : 170).')+\\'px\\');') : ''" /> 
     15#mailleftcontainer { width: <roundcube:exp expression="!empty(cookie:mailviewsplitterv) ? cookie:mailviewsplitterv-5 : 170" />px; } 
     16#mailrightcontainer { left: <roundcube:exp expression="!empty(cookie:mailviewsplitterv) ? cookie:mailviewsplitterv+5 : 180" />px; 
     17<roundcube:exp expression="browser:ie ? ('width: expression((parseInt(this.parentNode.offsetWidth)-'.(!empty(cookie:mailviewsplitterv) ? cookie:mailviewsplitterv+5 : 180).')+\\'px\\');') : ''" /> 
    1818} 
    1919</style> 
    … …  
    2525 
    2626<div id="mainscreen"> 
    27  
     27<div id="mailleftcontainer"> 
    2828<div id="mailboxlist-container"> 
    2929<h3 id="mailboxlist-header"><roundcube:label name="mailboxlist" /></h3> 
    … …  
    3232 
    3333<script type="text/javascript"> 
    34   var mailviewsplitv = new rcube_splitter({id:'mailviewsplitterv', p1: 'mailboxlist-container', p2: 'mailrightcontainer', orientation: 'v', relative: true, start: 165}); 
     34  var mailviewsplitv = new rcube_splitter({id:'mailviewsplitterv', p1: 'mailleftcontainer', p2: 'mailrightcontainer', orientation: 'v', relative: true, start: 165}); 
    3535  rcmail.add_onload('mailviewsplitv.init()'); 
    3636</script> 
    3737 
     38<div id="mailboxcontrols"> 
     39  <roundcube:label name="folder" />:&nbsp; 
     40  <roundcube:button command="expunge" label="compact" classAct="active" />&nbsp; 
     41  <roundcube:button command="purge" label="empty" classAct="active" />&nbsp; 
     42</div> 
     43</div> 
     44 
    3845<div id="mailrightcontainer"> 
    39  
     46<div id="mailrightcontent"> 
    4047<div id="mailcontframe"> 
    4148<roundcube:object name="messages" 
    … …  
    6774 
    6875<roundcube:endif /> 
     76</div> 
    6977 
     78<div id="mailfooter"> 
     79<table cellpadding="1" cellspacing="0"><tr> 
     80  <td width="90%"> 
     81    <span id="listcontrols"> 
     82      <roundcube:label name="select" />:&nbsp; 
     83      <roundcube:button command="select-all" label="all" classAct="active" />&nbsp; 
     84      <roundcube:button command="select-all" prop="unread" label="unread" classAct="active" />&nbsp; 
     85      <roundcube:button command="select-all" prop="invert" label="invert" classAct="active" />&nbsp; 
     86      <roundcube:button command="select-none" label="none" classAct="active" /> &nbsp; 
     87      <roundcube:container name="listcontrols" id="listcontrols" /> 
     88    </span> 
     89  <roundcube:if condition="env:quota" /> 
     90    <span id="quotabox"><roundcube:label name="quota" />: <roundcube:object name="quotaDisplay" display="image" width="100" id="quotadisplay" /></span> 
     91  <roundcube:endif /> 
     92  </td> 
     93  <td width="10%"> 
     94    <span id="countcontrols"> 
     95      <roundcube:button command="firstpage" imageSel="/images/buttons/first_sel.png" imageAct="/images/buttons/first_act.png" imagePas="/images/buttons/first_pas.png" width="11" height="11" title="firstmessages" /> 
     96      <roundcube:button command="previouspage" imageSel="/images/buttons/previous_sel.png" imageAct="/images/buttons/previous_act.png" imagePas="/images/buttons/previous_pas.png" width="11" height="11" title="previousmessages" /> 
     97      &nbsp;<roundcube:object name="messageCountDisplay" />&nbsp; 
     98      <roundcube:button command="nextpage" imageSel="/images/buttons/next_sel.png" imageAct="/images/buttons/next_act.png" imagePas="/images/buttons/next_pas.png" width="11" height="11" title="nextmessages" /> 
     99      <roundcube:button command="lastpage" imageSel="/images/buttons/last_sel.png" imageAct="/images/buttons/last_act.png" imagePas="/images/buttons/last_pas.png" width="11" height="11" title="lastmessages" /> 
     100    </span> 
     101  </td> 
     102</tr></table> 
    70103</div> 
    71104 
    72105</div> 
     106</div> 
    73107 
    74 <div id="mailfooter"> 
    75 <table cellpadding="1" cellspacing="0"> 
    76 <tr> 
    77 <td width="99%"> 
    78 <span id="mailboxcontrols"> 
    79 <roundcube:label name="folder" />:&nbsp; 
    80 <roundcube:button command="expunge" label="compact" classAct="active" />&nbsp; 
    81 <roundcube:button command="purge" label="empty" classAct="active" />&nbsp; 
    82 </span> 
    83 <span id="listcontrols"> 
    84 <roundcube:label name="select" />:&nbsp; 
    85 <roundcube:button command="select-all" label="all" classAct="active" />&nbsp; 
    86 <roundcube:button command="select-all" prop="unread" label="unread" classAct="active" />&nbsp; 
    87 <roundcube:button command="select-all" prop="invert" label="invert" classAct="active" />&nbsp; 
    88 <roundcube:button command="select-none" label="none" classAct="active" /> &nbsp; 
    89 <roundcube:container name="listcontrols" id="listcontrols" /> 
    90 </span> 
    91 <roundcube:if condition="env:quota" /> 
    92 <span id="quotabox"> 
    93 <roundcube:label name="quota" />: <roundcube:object name="quotaDisplay" display="image" width="100" id="quotadisplay" /> 
    94 </span> 
    95 <roundcube:endif /> 
    96 </td> 
    97 <td width="1%"> 
    98 <span id="countcontrols"> 
    99 <roundcube:button command="firstpage" imageSel="/images/buttons/first_sel.png" imageAct="/images/buttons/first_act.png" imagePas="/images/buttons/first_pas.png" width="11" height="11" title="firstmessages" /> 
    100 <roundcube:button command="previouspage" imageSel="/images/buttons/previous_sel.png" imageAct="/images/buttons/previous_act.png" imagePas="/images/buttons/previous_pas.png" width="11" height="11" title="previousmessages" /> 
    101 &nbsp;<roundcube:object name="messageCountDisplay" />&nbsp; 
    102 <roundcube:button command="nextpage" imageSel="/images/buttons/next_sel.png" imageAct="/images/buttons/next_act.png" imagePas="/images/buttons/next_pas.png" width="11" height="11" title="nextmessages" /> 
    103 <roundcube:button command="lastpage" imageSel="/images/buttons/last_sel.png" imageAct="/images/buttons/last_act.png" imagePas="/images/buttons/last_pas.png" width="11" height="11" title="lastmessages" /> 
    104 </span> 
    105 </td> 
    106 </tr> 
    107 </table> 
    108 </div> 
    109108 
    110109<div id="messagetoolbar"> 
    … …  
    116115<roundcube:button command="delete" imageSel="/images/buttons/delete_sel.png" imageAct="/images/buttons/delete_act.png" imagePas="/images/buttons/delete_pas.png" width="32" height="32" title="deletemessage" /> 
    117116<roundcube:button name="markreadbutton" id="markreadbutton" image="/images/buttons/markread_act.png" width="32" height="32" title="markmessages" onclick="rcmail_ui.show_markmenu();return false" /> 
     117<roundcube:container name="toolbar" id="messagetoolbar" /> 
    118118<roundcube:button name="messagemenulink" id="messagemenulink" image="/images/buttons/actions_act.png" width="34" height="32" title="messageactions" onclick="rcmail_ui.show_messagemenu();return false" /> 
    119 <roundcube:container name="toolbar" id="messagetoolbar" /> 
    120119 
    121120<div id="markmessagemenu"> 

  • trunk/roundcubemail/skins/default/templates/message.html

    r2595 r2643  
    77<script type="text/javascript" src="/functions.js"></script> 
    88<style type="text/css"> 
    9 #mailboxlist-container { width: <roundcube:exp expression="!empty(cookie:mailviewsplitterv) ? cookie:mailviewsplitterv-5 : 160" />px; } 
    10 #messageframe { left: <roundcube:exp expression="!empty(cookie:mailviewsplitterv) ? cookie:mailviewsplitterv+5 : 170" />px; 
    11 <roundcube:exp expression="browser:ie ? ('width: expression((parseInt(this.parentNode.offsetWidth)-'.(!empty(cookie:mailviewsplitterv) ? cookie:mailviewsplitterv+5 : 170).')+\\'px\\');') : ''" /> 
     9#mailboxlist-container { width: <roundcube:exp expression="!empty(cookie:mailviewsplitterv) ? cookie:mailviewsplitterv-5 : 170" />px; } 
     10#messageframe { left: <roundcube:exp expression="!empty(cookie:mailviewsplitterv) ? cookie:mailviewsplitterv+5 : 180" />px; 
     11<roundcube:exp expression="browser:ie ? ('width: expression((parseInt(this.parentNode.offsetWidth)-'.(!empty(cookie:mailviewsplitterv) ? cookie:mailviewsplitterv+5 : 180).')+\\'px\\');') : ''" /> 
    1212} 
    1313</style> 
    … …  
    1818<roundcube:include file="/includes/header.html" /> 
    1919 
    20 <div id="messagecountbar"> 
    21 <roundcube:button command="firstmessage" imageSel="/images/buttons/first_sel.png" imageAct="/images/buttons/first_act.png" imagePas="/images/buttons/first_pas.png" width="11" height="11" title="firstmessage" /> 
    22 <roundcube:button command="previousmessage" imageSel="/images/buttons/previous_sel.png" imageAct="/images/buttons/previous_act.png" imagePas="/images/buttons/previous_pas.png" width="11" height="11" title="previousmessage" /> 
    23 &nbsp;<roundcube:object name="messageCountDisplay" />&nbsp; 
    24 <roundcube:button command="nextmessage" imageSel="/images/buttons/next_sel.png" imageAct="/images/buttons/next_act.png" imagePas="/images/buttons/next_pas.png" width="11" height="11" title="nextmessage" /> 
    25 <roundcube:button command="lastmessage" imageSel="/images/buttons/last_sel.png" imageAct="/images/buttons/last_act.png" imagePas="/images/buttons/last_pas.png" width="11" height="11" title="lastmessage" /> 
    26 </div> 
    27  
    2820<div id="messagetoolbar"> 
    2921<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" /> 
    … …  
    3325<roundcube:button command="forward" imageSel="/images/buttons/forward_sel.png" imageAct="/images/buttons/forward_act.png" imagePas="/images/buttons/forward_pas.png" width="32" height="32" title="forwardmessage" /> 
    3426<roundcube:button command="delete" imageSel="/images/buttons/delete_sel.png" imageAct="/images/buttons/delete_act.png" imagePas="/images/buttons/delete_pas.png" width="32" height="32" title="deletemessage" /> 
     27<roundcube:container name="toolbar" id="messagetoolbar" /> 
    3528<roundcube:button name="messagemenulink" image="/images/buttons/actions_act.png" width="34" height="32" title="messageactions" onclick="rcmail_ui.show_messagemenu();return false" id="messagemenulink" /> 
    36 <roundcube:container name="toolbar" id="messagetoolbar" /> 
    3729<roundcube:object name="mailboxlist" type="select" noSelection="moveto" maxlength="25" onchange="rcmail.command('moveto', this.options[this.selectedIndex].value)" class="mboxlist" /> 
    3830 
    … …  
    4133 
    4234<div id="mainscreen"> 
    43  
     35<div id="mailleftcontainer"> 
    4436<div id="mailboxlist-container"> 
    4537<div id="mailboxlist-header"><roundcube:label name="mailboxlist" /></div> 
    4638<roundcube:object name="mailboxlist" id="mailboxlist" maxlength="25" /> 
     39</div> 
    4740</div> 
    4841 
    … …  
    5750</div> 
    5851 
     52<div id="messagecountbar"> 
     53  <roundcube:button command="firstmessage" imageSel="/images/buttons/first_sel.png" imageAct="/images/buttons/first_act.png" imagePas="/images/buttons/first_pas.png" width="11" height="11" title="firstmessage" /> 
     54  <roundcube:button command="previousmessage" imageSel="/images/buttons/previous_sel.png" imageAct="/images/buttons/previous_act.png" imagePas="/images/buttons/previous_pas.png" width="11" height="11" title="previousmessage" /> 
     55  &nbsp;<roundcube:object name="messageCountDisplay" />&nbsp; 
     56  <roundcube:button command="nextmessage" imageSel="/images/buttons/next_sel.png" imageAct="/images/buttons/next_act.png" imagePas="/images/buttons/next_pas.png" width="11" height="11" title="nextmessage" /> 
     57  <roundcube:button command="lastmessage" imageSel="/images/buttons/last_sel.png" imageAct="/images/buttons/last_act.png" imagePas="/images/buttons/last_pas.png" width="11" height="11" title="lastmessage" /> 
     58</div> 
    5959</div> 
    6060 
Note: See TracChangeset for help on using the changeset viewer.