Changeset 1741 in subversion


Ignore:
Timestamp:
Sep 5, 2008 6:26:10 AM (5 years ago)
Author:
thomasb
Message:

Indicate allowed max. attachment size in compose screen (#1485030)

Location:
trunk/roundcubemail
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • trunk/roundcubemail/CHANGELOG

    r1738 r1741  
    77- Respect Content-Location headers in multipart/related messages according to RFC2110 (#1484946) 
    88- Applied mime_decode patch by David Lublink 
     9- Allowed max. attachment size now indicated in compose screen (#1485030) 
    910 
    10112008/09/04 (alec) 

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

    r1737 r1741  
    156156$labels['savesentmessagein'] = 'Nachricht speichern in'; 
    157157$labels['dontsave'] = 'nicht speichern'; 
     158$labels['maxuploadsize'] = 'Maximal erlaubte Dateigrösse ist $size'; 
    158159$labels['addcc'] = 'Cc hinzufÃŒgen'; 
    159160$labels['addbcc'] = 'Bcc hinzufÃŒgen'; 

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

    r1737 r1741  
    155155$labels['savesentmessagein'] = 'Nachricht speichern in'; 
    156156$labels['dontsave'] = 'nicht speichern'; 
     157$labels['maxuploadsize'] = 'Maximal erlaubte Dateigrösse ist $size'; 
    157158$labels['addcc'] = 'Cc hinzufÃŒgen'; 
    158159$labels['addbcc'] = 'Bcc hinzufÃŒgen'; 

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

    r1737 r1741  
    193193$labels['savesentmessagein'] = 'Save sent message in'; 
    194194$labels['dontsave'] = 'don\'t save'; 
     195$labels['maxuploadsize'] = 'Maximum allowed file size is $size'; 
    195196 
    196197$labels['addcc'] = 'Add Cc'; 

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

    r1668 r1741  
    694694  $out = html::div($attrib, 
    695695    $OUTPUT->form_tag(array('name' => 'form', 'method' => 'post', 'enctype' => 'multipart/form-data')) . 
    696     rcmail_compose_attachment_field(array()) . html::br() . 
    697     $button->show(rcube_label('close'), array('onclick' => "document.getElementById('$attrib[id]').style.visibility='hidden'")) . 
    698     $button->show(rcube_label('upload'), array('onclick' => JS_OBJECT_NAME . ".command('send-attachment', this.form)")) 
     696    html::div(null, rcmail_compose_attachment_field(array())) . 
     697    html::div('hint', rcube_label(array('name' => 'maxuploadsize', 'vars' => array('size' => show_bytes(parse_bytes(ini_get('upload_max_filesize'))))))) . 
     698    html::div('buttons', 
     699      $button->show(rcube_label('close'), array('onclick' => "document.getElementById('$attrib[id]').style.visibility='hidden'")) . ' ' . 
     700      $button->show(rcube_label('upload'), array('onclick' => JS_OBJECT_NAME . ".command('send-attachment', this.form)"))) 
    699701  ); 
    700702   

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

    r1701 r1741  
    930930  left: 20px; 
    931931  z-index: 200; 
    932   padding: 8px; 
     932  padding: 6px; 
    933933  visibility: hidden; 
    934934  border: 1px solid #CCCCCC; 
    … …  
    936936} 
    937937 
    938 #attachment-form input.button 
    939 { 
    940   margin-top: 8px; 
    941 } 
    942  
     938#attachment-form div 
     939{ 
     940  padding: 2px; 
     941} 
     942 
     943#attachment-form div.buttons 
     944{ 
     945  margin-top: 4px; 
     946} 
Note: See TracChangeset for help on using the changeset viewer.