Changeset 3757 in subversion


Ignore:
Timestamp:
Jun 17, 2010 3:08:00 PM (3 years ago)
Author:
alec
Message:
  • UI unification
  • Added button to hide/unhide the preview pane (#1484215)
Location:
trunk/roundcubemail
Files:
1 added
24 edited

Legend:

Unmodified
Added
Removed

  • trunk/roundcubemail/CHANGELOG

    r3756 r3757  
    22=========================== 
    33 
     4- Add button to hide/unhide the preview pane (#1484215) 
    45- Fix no-cache headers on https to prevent content caching by proxies (#1486798) 
    56- Fix attachment filenames broken with TNEF decoder using long filenames (#1486795) 

  • trunk/roundcubemail/program/localization/en_US/labels.inc

    r3735 r3757  
    143143$labels['markunflagged']    = 'As unflagged'; 
    144144$labels['messageactions']   = 'More actions...'; 
     145$labels['preview']          = 'Preview'; 
    145146 
    146147$labels['select'] = 'Select'; 
    … …  
    247248$labels['addcontact'] = 'Add new contact'; 
    248249$labels['editcontact'] = 'Edit contact'; 
     250$labels['contacts'] = 'Contacts'; 
    249251 
    250252$labels['edit']   = 'Edit'; 

  • trunk/roundcubemail/program/localization/pl_PL/labels.inc

    r3735 r3757  
    395395$labels['chinese'] = 'chiński'; 
    396396$labels['folderactions'] = 'Działania na folderach...'; 
     397$labels['contacts'] = 'Kontakty'; 
     398$labels['preview'] = 'PodglÄ 
     399d'; 
    397400 
    398401?> 

  • trunk/roundcubemail/program/steps/mail/func.inc

    r3754 r3757  
    408408function rcmail_messagecontent_frame($attrib) 
    409409  { 
    410   global $OUTPUT; 
     410  global $OUTPUT, $RCMAIL; 
    411411 
    412412  if (empty($attrib['id'])) 
    … …  
    415415  $attrib['name'] = $attrib['id']; 
    416416 
    417   $OUTPUT->set_env('contentframe', $attrib['id']); 
     417  if ($RCMAIL->config->get('preview_pane')) 
     418    $OUTPUT->set_env('contentframe', $attrib['id']); 
    418419  $OUTPUT->set_env('blankpage', $attrib['src'] ? $OUTPUT->abs_url($attrib['src']) : 'program/blank.gif'); 
    419420 

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

    r3738 r3757  
    7575#abookcountbar 
    7676{ 
    77   position: absolute; 
    78   bottom: 6px; 
    79   left: 225px; 
    80   width: 240px; 
    81   height: 20px; 
    82   text-align: left; 
    83 } 
    84  
    85 #abookcountbar span 
    86 { 
    87   font-size: 11px; 
    88   color: #333333; 
     77  margin-top: 4px; 
     78  margin-left: 4px; 
     79  min-width: 200px; 
    8980} 
    9081 
    … …  
    123114  border: 1px solid #999999; 
    124115  background-color: #F9F9F9; 
    125   overflow: auto; 
     116  overflow: hidden; 
    126117} 
    127118 

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

    r3733 r3757  
    244244} 
    245245 
     246.boxtitle 
     247{ 
     248  height: 12px !important; 
     249  padding: 2px 10px 5px 5px; 
     250  border-bottom: 1px solid #999; 
     251  color: #333; 
     252  font-size: 11px; 
     253  font-weight: bold; 
     254  background: url(images/listheader.gif) top left repeat-x #CCC; 
     255} 
     256 
     257.boxcontent 
     258{ 
     259  padding: 15px 10px 10px 10px; 
     260  background-color: #F2F2F2; 
     261} 
     262 
     263.boxcontent table td.title 
     264{ 
     265  color: #666; 
     266  padding-right: 10px; 
     267} 
     268 
     269.boxlistcontent 
     270{ 
     271  position: absolute; 
     272  top: 20px; 
     273  bottom: 22px; 
     274  left: 0; 
     275  right: 0; 
     276  overflow-y: auto; 
     277  overflow-x: hidden; 
     278} 
     279 
     280.boxfooter 
     281{ 
     282  position: absolute; 
     283  bottom: 0px; 
     284  left: 0px; 
     285  right: 0px; 
     286  overflow: hidden; 
     287  height: 22px; 
     288  border-top: 1px solid #999; 
     289  background: url('images/listheader.gif') top left repeat-x #CCC; 
     290} 
     291 
     292.boxfooter a.button, 
     293.boxfooter a.buttonPas 
     294{ 
     295  display: block; 
     296  float: left; 
     297  width: 34px; 
     298  height: 22px; 
     299  padding: 0px; 
     300  margin: 0; 
     301  overflow: hidden; 
     302  background: url('images/icons/groupactions.png') 0 0 no-repeat transparent; 
     303  opacity: 0.99; /* this is needed to make buttons appear correctly in Chrome */ 
     304} 
     305 
     306.boxfooter a.groupactions 
     307{ 
     308  background-position: 0 -26px; 
     309} 
     310 
     311.boxfooter a.buttonPas 
     312{ 
     313  opacity: 0.35; 
     314} 
     315 
     316.pagenav span 
     317{ 
     318  color: #666; 
     319  font-size: 11px; 
     320  text-shadow: white 1px 1px; 
     321} 
     322 
    246323.pagenav a.button, 
    247324.pagenav a.buttonPas 
    … …  
    309386  cursor: e-resize; 
    310387  background-position: 2px center; 
    311 } 
    312  
    313 .boxtitle 
    314 { 
    315   height: 12px !important; 
    316   padding: 2px 10px 5px 5px; 
    317   border-bottom: 1px solid #999; 
    318   color: #333; 
    319   font-size: 11px; 
    320   font-weight: bold; 
    321   background: url(images/listheader.gif) top left repeat-x #CCC; 
    322 } 
    323  
    324 .boxcontent 
    325 { 
    326   padding: 15px 10px 10px 10px; 
    327   background-color: #F2F2F2; 
    328 } 
    329  
    330 .boxcontent table td.title 
    331 { 
    332   color: #666; 
    333   padding-right: 10px; 
    334 } 
    335  
    336 .boxlistcontent 
    337 { 
    338   position: absolute; 
    339   top: 20px; 
    340   bottom: 22px; 
    341   left: 0; 
    342   right: 0; 
    343   overflow-y: auto; 
    344   overflow-x: hidden; 
    345 } 
    346  
    347 .boxfooter 
    348 { 
    349   position: absolute; 
    350   bottom: 0px; 
    351   left: 0px; 
    352   right: 0px; 
    353   height: 22px; 
    354   border-top: 1px solid #999; 
    355   background: url('images/listheader.gif') top left repeat-x #CCC; 
    356 } 
    357  
    358 .boxfooter a.button, 
    359 .boxfooter a.buttonPas 
    360 { 
    361   display: block; 
    362   float: left; 
    363   width: 34px; 
    364   height: 22px; 
    365   padding: 0px; 
    366   margin: 0; 
    367   overflow: hidden; 
    368   background: url('images/icons/groupactions.png') 0 0 no-repeat transparent; 
    369   opacity: 0.99; /* this is needed to make buttons appear correctly in Chrome */ 
    370 } 
    371  
    372 .boxfooter a.groupactions 
    373 { 
    374   background-position: 0 -26px; 
    375 } 
    376  
    377 .boxfooter a.buttonPas 
    378 { 
    379   opacity: 0.35; 
    380388} 
    381389 
    … …  
    437445 
    438446 
    439  
    440447/***** common table settings ******/ 
    441448 

  • trunk/roundcubemail/skins/default/functions.js

    r3728 r3757  
    326326    } 
    327327  } 
     328}, 
     329 
     330switch_preview_pane: function(elem) 
     331{ 
     332  var uid, prev_frm = $('#mailpreviewframe'); 
     333 
     334  if (elem.checked) { 
     335    rcmail.env.contentframe = 'messagecontframe'; 
     336    if (mailviewsplit.layer) { 
     337      mailviewsplit.resize(); 
     338      mailviewsplit.layer.elm.style.display = ''; 
     339    } else 
     340      mailviewsplit.init(); 
     341    prev_frm.show(); 
     342    if (uid = rcmail.message_list.get_single_selection()) 
     343      rcmail.show_message(uid, false, true); 
     344    rcmail.http_post('save-pref', '_name=preview_pane&_value=1'); 
     345  } else { 
     346    prev_frm.hide(); 
     347    if (bw.ie6 || bw.ie7) { 
     348      var fr = document.getElementById('mailcontframe'); 
     349      fr.style.bottom = 0; 
     350      fr.style.height = parseInt(fr.parentNode.offsetHeight)+'px';   
     351    } 
     352    else 
     353      $('#mailcontframe').css({height: 'auto', bottom: 0}); 
     354    if (mailviewsplit.layer) 
     355      mailviewsplit.layer.elm.style.display = 'none'; 
     356    rcmail.env.contentframe = null; 
     357    rcmail.show_contentframe(false); 
     358    rcmail.http_post('save-pref', '_name=preview_pane&_value=0'); 
     359  } 
    328360} 
    329361 

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

    r3741 r3757  
    1111} 
    1212 
    13 #header img 
     13#logo 
    1414{ 
    1515  width: 178px; 
    … …  
    5050} 
    5151 
     52#listcontrols a.button, 
     53#listcontrols a.buttonPas { 
     54  background-image: url(images/mail_footer.gif); 
     55} 
     56 
    5257#messagetoolbar a.button, 
    5358#messagetoolbar a.buttonPas { 
    … …  
    7782{ 
    7883  width: 100%; 
     84  bottom: -1px; 
    7985} 
    8086 
    … …  
    8793.boxlistcontent 
    8894{ 
    89   height: expression((parseInt(this.parentNode.offsetHeight)-42)+'px'); 
    90   width: 100%; 
     95  top: 21px; 
     96  height: expression((parseInt(this.parentNode.offsetHeight)-24-parseInt(this.style.top?this.style.top:21))+'px'); 
    9197} 

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

    r3748 r3757  
    6262} 
    6363 
    64 #listcontrols a.buttonPas, 
    65 #mailboxcontrols a.buttonPas 
     64#listcontrols a.buttonPas 
    6665{ 
    6766  filter: alpha(opacity=35); 
    … …  
    7675{ 
    7776  width: expression((parseInt(document.documentElement.clientWidth)-40)+'px'); 
    78   height: expression((parseInt(document.documentElement.clientHeight)-101)+'px'); 
     77  height: expression((parseInt(document.documentElement.clientHeight)-96)+'px'); 
    7978} 
    8079 
    8180#directorylistbox 
    8281{ 
    83   height: expression((parseInt(document.documentElement.clientHeight)-125)+'px'); 
     82  height: expression((parseInt(document.documentElement.clientHeight)-115)+'px'); 
    8483} 
    8584 
    … …  
    103102{ 
    104103  width: expression((parseInt(document.documentElement.clientWidth)-40)+'px'); 
    105   height: expression((parseInt(document.documentElement.clientHeight)-100)+'px'); 
     104  height: expression((parseInt(document.documentElement.clientHeight)-90)+'px'); 
    106105} 
    107106 
    … …  
    149148  width: expression((parseInt(this.parentNode.offsetWidth)-180)+'px'); 
    150149  height: expression((parseInt(this.parentNode.offsetHeight)-20)+'px'); 
    151 } 
    152  
    153 #messagecanvas  
    154 { 
    155   width: expression((parseInt(this.parentNode.offsetWidth)-20)+'px'); 
     150  overflow: hidden; 
    156151} 
    157152 
    … …  
    190185{ 
    191186  width: expression((parseInt(document.documentElement.clientWidth)-245)+'px'); 
     187  height: expression((parseInt(document.documentElement.clientHeight)-115)+'px'); 
     188} 
     189 
     190#prefsscreen 
     191{ 
     192  width: expression((parseInt(document.documentElement.clientWidth)-40)+'px'); 
    192193  height: expression((parseInt(document.documentElement.clientHeight)-125)+'px'); 
    193194} 
    194195 
    195 #prefsscreen 
    196 { 
    197   width: expression((parseInt(document.documentElement.clientWidth)-40)+'px'); 
    198   height: expression((parseInt(document.documentElement.clientHeight)-125)+'px'); 
    199 } 
    200  
    201196#importbox 
    202197{ 
    203198  width: expression((parseInt(document.documentElement.clientWidth)-40)+'px'); 
    204   height: expression((parseInt(document.documentElement.clientHeight)-145)+'px'); 
     199  height: expression((parseInt(document.documentElement.clientHeight)-140)+'px'); 
    205200} 
    206201 
    … …  
    267262  padding: 0.8em; 
    268263} 
     264 
     265#listcontrols input 
     266{ 
     267  margin-top: 2px; 
     268} 

  • trunk/roundcubemail/skins/default/includes/header.html

    r3397 r3757  
    1 <div id="header"><a href="./"><img src="/images/roundcube_logo.png" alt="logo" title="<roundcube:object name='productname' />" /></a></div> 
     1<div id="header"><a href="./"><img id="logo" src="/images/roundcube_logo.png" alt="logo" title="<roundcube:object name='productname' />" /></a></div> 
    22 
    33<roundcube:object name="message" id="message" /> 

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

    r3734 r3757  
    266266  top: 85px; 
    267267  right: 20px; 
    268   bottom: 16px; 
     268  bottom: 30px; 
    269269  left: 20px; 
    270270} 
    … …  
    273273{ 
    274274  position: absolute; 
    275   top: 0px; 
    276   left: 0px; 
    277   bottom: 0px; 
     275  top: 0; 
     276  left: 0; 
     277  bottom: 0; 
    278278  width: 195px; 
    279279} 
    … …  
    282282{ 
    283283  position: absolute; 
    284   top: 0px; 
     284  top: 0; 
    285285  left: 170px; 
    286   bottom: 0px; 
    287   right: 0px; 
     286  bottom: 0; 
     287  right: 0; 
    288288  min-width: 600px; 
    289289} 
    … …  
    292292{ 
    293293  position: absolute; 
    294   top: 0px; 
    295   left: 0px; 
    296   right: 0px; 
    297   bottom: 20px; 
     294  top: 0; 
     295  left: 0; 
     296  right: 0; 
     297  bottom: 0; 
    298298} 
    299299 
    … …  
    311311  position: absolute; 
    312312  width: 100%; 
    313   top: 0px; 
    314   bottom: 0px; 
     313  top: 0; 
     314  bottom: 0; 
    315315  border: 1px solid #999999; 
    316316  background-color: #F9F9F9; 
    317   overflow: auto; 
    318   overflow-y: auto; 
    319   overflow-x: hidden; 
     317  overflow: hidden; 
    320318} 
    321319 
    … …  
    373371} 
    374372 
     373#quota 
     374{ 
     375  position: absolute; 
     376  bottom: 12px; 
     377  left: 20px; 
     378} 
     379 
     380#quota span 
     381{ 
     382  display: block; 
     383  float: left; 
     384  font-size: 11px; 
     385  color: #666; 
     386} 
     387 
    375388 
    376389/** mailbox list styles */ 
    … …  
    379392{ 
    380393  position: absolute; 
    381   top: 0px; 
    382   left: 0px; 
     394  top: 0; 
     395  left: 0; 
    383396  width: 100%; 
    384   bottom: 20px; 
     397  bottom: 0; 
    385398  border: 1px solid #999; 
    386399  background-color: #F9F9F9; 
    … …  
    513526} 
    514527 
    515 #listcontrols, 
    516 #mailboxcontrols 
    517 { 
    518   position: absolute; 
     528#listcontrols 
     529{ 
     530  position: relative; 
    519531  white-space: nowrap; 
    520   left: 0px; 
    521   bottom: 0px; 
    522   height: 15px; 
     532  left: 4px; 
     533  height: 22px; 
    523534  width: auto; 
    524535  min-width: 300px; 
    … …  
    526537 
    527538#listcontrols a, 
    528 #listcontrols span, 
    529 #mailboxcontrols a, 
    530 #mailboxcontrols span 
     539#listcontrols span 
    531540{ 
    532541  display: block; 
    533542  float: left; 
    534   font-size: 11px; 
     543  margin-top: 4px; 
     544  font-size: 11px; 
     545} 
     546 
     547#listcontrols input 
     548{ 
     549  margin-top: 6px; 
    535550} 
    536551 
    537552#listcontrols a.button, 
    538 #listcontrols a.buttonPas, 
    539 #mailboxcontrols a.button, 
    540 #mailboxcontrols a.buttonPas 
     553#listcontrols a.buttonPas 
    541554{ 
    542555  display: block; 
    … …  
    551564} 
    552565 
    553 #listcontrols a.buttonPas, 
    554 #mailboxcontrols a.buttonPas 
     566#listcontrols a.buttonPas 
    555567{ 
    556568  opacity: 0.35; 
    557 } 
    558  
    559 #mailboxcontrols a.expunge { 
    560   background-position: 0 0; 
    561 } 
    562  
    563 #mailboxcontrols a.expungesel { 
    564   background-position: 0 -15px; 
    565 } 
    566  
    567 #mailboxcontrols a.purge { 
    568   background-position: -15px 0; 
    569 } 
    570  
    571 #mailboxcontrols a.purgesel { 
    572   background-position: -15px -15px; 
    573569} 
    574570 
    … …  
    639635#countcontrols 
    640636{ 
    641   height: 15px; 
    642   position: absolute; 
    643   bottom: 0; 
    644   right: 0; 
     637  position: absolute; 
     638  top: 4px; 
     639  right: 4px; 
    645640  min-width: 25em; 
    646641  white-space: nowrap; 
    … …  
    927922{ 
    928923  position: absolute; 
    929   top: 0px; 
     924  top: 0; 
    930925  left: 180px; 
    931   right: 0px; 
    932   bottom: 20px; 
     926  right: 0; 
     927  bottom: 0; 
    933928  border: 1px solid #999; 
    934929  background-color: #FFF; 
    … …  
    11561151} 
    11571152 
    1158 #priority-selector, 
    1159 #receipt-selector 
    1160 { 
    1161   padding-left: 30px; 
    1162   white-space: nowrap; 
    1163 } 
    1164  
    11651153#compose-container 
    11661154{ 
    … …  
    11791167} 
    11801168 
    1181 #editor-select 
    1182 { 
    1183   float: left; 
    1184 } 
    1185  
    11861169#compose-div 
    11871170{ 
    … …  
    12081191{ 
    12091192  width: 80px !important; 
    1210   color: #666666; 
     1193  color: #666; 
    12111194  font-size: 11px; 
    12121195  font-weight: bold; 
    … …  
    13031286} 
    13041287 
     1288#editor-select 
     1289{ 
     1290  float: left; 
     1291  white-space: nowrap; 
     1292  width: auto; 
     1293} 
     1294 
     1295#editor-select label 
     1296{ 
     1297  color: #666; 
     1298  font-size: 11px; 
     1299  font-weight: bold; 
     1300  padding-left: 20px; 
     1301} 
     1302 
     1303#editor-select input 
     1304{ 
     1305  width: auto !important; 
     1306} 
     1307 
    13051308td.show-headers 
    13061309{ 

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

    r3734 r3757  
    198198  height: 120px; 
    199199  left: 20px; 
    200   bottom: 20px; 
     200  bottom: 25px; 
    201201} 
    202202 

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

    r3733 r3757  
    5757 
    5858<div id="addresslist"> 
    59 <roundcube:object name="addresslist" id="contacts-table" class="records-table" cellspacing="0" summary="Contacts list" /> 
     59<div class="boxtitle"><roundcube:label name="contacts" /></div> 
     60<div class="boxlistcontent"> 
     61<roundcube:object name="addresslist" id="contacts-table" class="records-table" cellspacing="0" summary="Contacts list" noheader="true" /> 
     62</div> 
     63<div class="boxfooter"> 
     64<div id="abookcountbar" class="pagenav"> 
     65  <roundcube:button command="firstpage" type="link" class="buttonPas firstpage" classAct="button firstpage" classSel="button firstpageSel" title="firstpage" content=" " /> 
     66  <roundcube:button command="previouspage" type="link" class="buttonPas prevpage" classAct="button prevpage" classSel="button prevpageSel" title="previouspage" content=" " /> 
     67  <roundcube:object name="recordsCountDisplay" style="padding:0 .5em; float:left" /> 
     68  <roundcube:button command="nextpage" type="link" class="buttonPas nextpage" classAct="button nextpage" classSel="button nextpageSel" title="nextpage" content=" " /> 
     69  <roundcube:button command="lastpage" type="link" class="buttonPas lastpage" classAct="button lastpage" classSel="button lastpageSel" title="lastpage" content=" " /> 
     70</div> 
     71</div> 
    6072</div> 
    6173 
    … …  
    7183</div> 
    7284 
    73 <div id="abookcountbar" class="pagenav"> 
    74   <roundcube:button command="firstpage" type="link" class="buttonPas firstpage" classAct="button firstpage" classSel="button firstpageSel" title="firstpage" content=" " /> 
    75   <roundcube:button command="previouspage" type="link" class="buttonPas prevpage" classAct="button prevpage" classSel="button prevpageSel" title="previouspage" content=" " /> 
    76   <roundcube:object name="recordsCountDisplay" style="padding:0 .5em; float:left" /> 
    77   <roundcube:button command="nextpage" type="link" class="buttonPas nextpage" classAct="button nextpage" classSel="button nextpageSel" title="nextpage" content=" " /> 
    78   <roundcube:button command="lastpage" type="link" class="buttonPas lastpage" classAct="button lastpage" classSel="button lastpageSel" title="lastpage" content=" " /> 
    79 </div> 
     85<div id="rcmversion"><roundcube:object name="productname" /> <roundcube:object name="version" /></div> 
    8086 
    8187</body> 

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

    r3496 r3757  
    2424      <roundcube:button command="savedraft" type="link" class="buttonPas savedraft" classAct="button savedraft" classSel="button savedraftSel" title="savemessage" content=" " /> 
    2525      <roundcube:container name="toolbar" id="compose-toolbar" /> 
    26     </td> 
    27     <td id="priority-selector"> 
    28       <label for="rcmcomposepriority"><roundcube:label name="priority" />:</label>&nbsp;<roundcube:object name="prioritySelector" form="form" id="rcmcomposepriority" /> 
    29     </td> 
    30     <td id="receipt-selector"> 
    31       <roundcube:object name="receiptCheckBox" form="form" id="rcmcomposereceipt" />&nbsp;<label for="rcmcomposereceipt"><roundcube:label name="returnreceipt" /></label> 
    3226    </td> 
    3327</tr></table> 
    … …  
    7165                <td class="title"><roundcube:label name="editortype" /></td> 
    7266                <td> 
    73                     <div id="editor-select"><roundcube:object name="editorSelector" editorid="compose-body" tabindex="7" /></div> 
     67                    <div id="editor-select"> 
     68                <roundcube:object name="editorSelector" editorid="compose-body" tabindex="7" /> 
     69                <label for="rcmcomposepriority"><roundcube:label name="priority" /></label> 
     70                <roundcube:object name="prioritySelector" form="form" id="rcmcomposepriority" /> 
     71                <label for="rcmcomposereceipt"><roundcube:label name="returnreceipt" /></label> 
     72                <roundcube:object name="receiptCheckBox" form="form" id="rcmcomposereceipt" /> 
     73            </div> 
    7474                    <div id="spellcheck-control"></div> 
    7575                </td> 

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

    r3734 r3757  
    5252</div> 
    5353 
     54<div id="rcmversion"><roundcube:object name="productname" /> <roundcube:object name="version" /></div> 
     55 
    5456</body> 
    5557</html> 

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

    r3117 r3757  
    1313</div> 
    1414 
     15<div id="rcmversion"><roundcube:object name="productname" /> <roundcube:object name="version" /></div> 
     16 
    1517</body> 
    1618</html> 

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

    r3734 r3757  
    4545</div> 
    4646 
     47<div id="rcmversion"><roundcube:object name="productname" /> <roundcube:object name="version" /></div> 
     48 
    4749</body> 
    4850</html> 

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

    r3023 r3757  
    2323</div> 
    2424 
     25<div id="rcmversion"><roundcube:object name="productname" /> <roundcube:object name="version" /></div> 
     26 
    2527</body> 
    2628</html> 

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

    r3515 r3757  
    88<body> 
    99 
    10 <img src="/images/roundcube_logo.png" border="0" alt="<roundcube:object name='productname' />" style="margin:0 11px" /> 
     10<img id="logo" src="/images/roundcube_logo.png" border="0" alt="<roundcube:object name='productname' />" style="margin:0 11px" /> 
    1111 
    1212<roundcube:object name="message" id="message" /> 

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

    r3739 r3757  
    4747<div id="mailrightcontent"> 
    4848<div id="mailcontframe"> 
     49<div id="messagelistcontainer" class="boxlistcontent" style="top:0"> 
    4950<roundcube:object name="messages" 
    5051  id="messagelist" 
    … …  
    6465  optionsmenuIcon="/images/icons/columnpicker.gif" /> 
    6566</div> 
    66  
    67 <roundcube:if condition="config:preview_pane == true" /> 
     67<div class="boxfooter"> 
     68    <div id="listcontrols" class="pagenav"> 
     69        <span><roundcube:label name="select" />:&nbsp;</span> 
     70        <roundcube:button command="select-all" type="link" title="all" class="buttonPas all" classAct="button all" classSel="button allsel" content=" " /> 
     71        <roundcube:button command="select-all" type="link" prop="page" title="currpage" class="buttonPas page" classAct="button page" classSel="button pagesel" content=" " /> 
     72        <roundcube:button command="select-all" type="link" prop="unread" title="unread" class="buttonPas unread" classAct="button unread" classSel="button unreadsel" content=" " /> 
     73        <roundcube:button command="select-all" type="link" prop="invert" title="invert" class="buttonPas invert" classAct="button invert" classSel="button invertsel" content=" " /> 
     74        <roundcube:button command="select-none" type="link" title="none" class="buttonPas none" classAct="button none" classSel="button nonesel" content=" " /> 
     75        <roundcube:container name="listcontrols" id="listcontrols" /> 
     76    <roundcube:if condition="env:threads" /> 
     77        <span style="margin-left: 10px"><roundcube:label name="threads" />:&nbsp;</span> 
     78        <roundcube:button command="expand-all" type="link" title="expand-all" class="buttonPas expand-all" classAct="button expand-all" classSel="button expand-allsel" content=" "  /> 
     79        <roundcube:button command="expand-unread" type="link" title="expand-unread" class="buttonPas expand-unread" classAct="button expand-unread" classSel="button expand-unreadsel" content=" " /> 
     80        <roundcube:button command="collapse-all" type="link" title="collapse-all" class="buttonPas collapse-all" classAct="button collapse-all" classSel="button collapse-allsel" content=" " /> 
     81    <roundcube:endif /> 
     82        <span style="margin-left: 10px"><roundcube:label name="preview" />:&nbsp;</span> 
     83        <input type="checkbox" onclick="rcmail_ui.switch_preview_pane(this)"<roundcube:if condition="config:preview_pane == true" /> checked="checked"<roundcube:endif /> /> 
     84    </div> 
     85    <div id="countcontrols" class="pagenav"> 
     86        <roundcube:button command="lastpage" type="link" class="buttonPas lastpage" classAct="button lastpage" classSel="button lastpageSel" title="lastmessages" content=" " /> 
     87        <roundcube:button command="nextpage" type="link" class="buttonPas nextpage" classAct="button nextpage" classSel="button nextpageSel" title="nextmessages" content=" " /> 
     88        <roundcube:object name="messageCountDisplay" style="padding:0 .5em; float:right" /> 
     89        <roundcube:button command="previouspage" type="link" class="buttonPas prevpage" classAct="button prevpage" classSel="button prevpageSel" title="previousmessages" content=" " /> 
     90        <roundcube:button command="firstpage" type="link" class="buttonPas firstpage" classAct="button firstpage" classSel="button firstpageSel" title="firstmessages" content=" " /> 
     91    </div> 
     92</div> 
     93</div> 
    6894 
    6995<script type="text/javascript"> 
    7096  var mailviewsplit = new rcube_splitter({id:'mailviewsplitter', p1: 'mailcontframe', p2: 'mailpreviewframe', orientation: 'h', relative: true, start: 205}); 
     97<roundcube:if condition="config:preview_pane == true" /> 
    7198  rcmail.add_onload('mailviewsplit.init()'); 
     99<roundcube:endif /> 
    72100</script> 
    73101 
    74 <div id="mailpreviewframe"> 
     102<div id="mailpreviewframe"<roundcube:if condition="config:preview_pane != true" /> style="display:none"<roundcube:endif />> 
    75103<roundcube:object name="messagecontentframe" id="messagecontframe" width="100%" height="100%" frameborder="0" src="/watermark.html" /> 
    76104</div> 
    77  
    78 <roundcube:endif /> 
    79 </div> 
    80  
    81 <div id="listcontrols"> 
    82       <span><roundcube:label name="select" />:&nbsp;</span> 
    83       <roundcube:button command="select-all" type="link" title="all" class="buttonPas all" classAct="button all" classSel="button allsel" content=" " /> 
    84       <roundcube:button command="select-all" type="link" prop="page" title="currpage" class="buttonPas page" classAct="button page" classSel="button pagesel" content=" " /> 
    85       <roundcube:button command="select-all" type="link" prop="unread" title="unread" class="buttonPas unread" classAct="button unread" classSel="button unreadsel" content=" " /> 
    86       <roundcube:button command="select-all" type="link" prop="invert" title="invert" class="buttonPas invert" classAct="button invert" classSel="button invertsel" content=" " /> 
    87       <roundcube:button command="select-none" type="link" title="none" class="buttonPas none" classAct="button none" classSel="button nonesel" content=" " /> 
    88       <roundcube:container name="listcontrols" id="listcontrols" /> 
    89 <roundcube:if condition="env:threads" /> 
    90       <span style="margin-left: 20px"><roundcube:label name="threads" />:&nbsp;</span> 
    91       <roundcube:button command="expand-all" type="link" title="expand-all" class="buttonPas expand-all" classAct="button expand-all" classSel="button expand-allsel" content=" "  /> 
    92       <roundcube:button command="expand-unread" type="link" title="expand-unread" class="buttonPas expand-unread" classAct="button expand-unread" classSel="button expand-unreadsel" content=" " /> 
    93       <roundcube:button command="collapse-all" type="link" title="collapse-all" class="buttonPas collapse-all" classAct="button collapse-all" classSel="button collapse-allsel" content=" " /> 
    94 <roundcube:endif /> 
    95   <roundcube:if condition="env:quota" /> 
    96   <span style="margin-left: 20px; margin-right: 5px"><roundcube:label name="quota" />:</span> 
    97   <roundcube:object name="quotaDisplay" display="image" width="100" height="14" id="quotadisplay" /> 
    98   <roundcube:endif /> 
    99 </div> 
    100  
    101 <div id="countcontrols" class="pagenav"> 
    102     <roundcube:button command="lastpage" type="link" class="buttonPas lastpage" classAct="button lastpage" classSel="button lastpageSel" title="lastmessages" content=" " /> 
    103     <roundcube:button command="nextpage" type="link" class="buttonPas nextpage" classAct="button nextpage" classSel="button nextpageSel" title="nextmessages" content=" " /> 
    104     <roundcube:object name="messageCountDisplay" style="padding:0 .5em; float:right" /> 
    105     <roundcube:button command="previouspage" type="link" class="buttonPas prevpage" classAct="button prevpage" classSel="button prevpageSel" title="previousmessages" content=" " /> 
    106     <roundcube:button command="firstpage" type="link" class="buttonPas firstpage" classAct="button firstpage" classSel="button firstpageSel" title="firstmessages" content=" " /> 
    107 </div> 
     105</div> 
     106 
    108107 
    109108</div> 
    … …  
    217216</div> 
    218217 
     218<roundcube:if condition="env:quota" /> 
     219<div id="quota"> 
     220  <span style="margin-right: 5px"><roundcube:label name="quota" />:</span> 
     221  <roundcube:object name="quotaDisplay" display="image" width="100" height="14" id="quotadisplay" /> 
     222</div> 
     223<roundcube:endif /> 
     224 
     225<div id="rcmversion"><roundcube:object name="productname" /> <roundcube:object name="version" /></div> 
     226 
    219227</body> 
    220228</html> 

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

    r3023 r3757  
    3737</form> 
    3838 
     39<div id="rcmversion"><roundcube:object name="productname" /> <roundcube:object name="version" /></div> 
     40 
    3941</body> 
    4042</html> 

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

    r3737 r3757  
    4646 
    4747<div id="messageframe"> 
    48 <div id="messagecanvas"> 
     48<div class="boxlistcontent" style="top:0"> 
    4949<roundcube:object name="messageHeaders" class="headers-table" cellspacing="0" cellpadding="2" addicon="/images/icons/silhouette.png" summary="Message headers" /> 
    5050<roundcube:object name="messageAttachments" id="attachment-list" /> 
    … …  
    5353<roundcube:object name="messageBody" id="messagebody" /> 
    5454</div> 
    55 </div> 
    56  
     55<div class="boxfooter"> 
    5756<div id="countcontrols" class="pagenav"> 
    5857  <roundcube:button command="lastmessage" type="link" class="buttonPas lastpage" classAct="button lastpage" classSel="button lastpageSel" title="lastmessage" content=" " /> 
    … …  
    6261  <roundcube:button command="firstmessage" type="link" class="buttonPas firstpage" classAct="button firstpage" classSel="button firstpageSel" title="firstmessage" content=" " /> 
    6362</div> 
     63</div> 
     64</div> 
     65 
    6466</div> 
    6567 
    … …  
    7880</div> 
    7981 
     82<div id="rcmversion"><roundcube:object name="productname" /> <roundcube:object name="version" /></div> 
     83 
    8084</body> 
    8185</html> 

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

    r3737 r3757  
    7373</div> 
    7474 
     75<div id="rcmversion"><roundcube:object name="productname" /> <roundcube:object name="version" /></div> 
     76 
    7577</body> 
    7678<roundcube:endif /> 
Note: See TracChangeset for help on using the changeset viewer.