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

6 files changed, 16 insertions, 6 deletions

diff --git a/CHANGELOG b/CHANGELOG
index d4cf8ef09..034f33d55 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -6,6 +6,7 @@ CHANGELOG RoundCube Webmail
 - Enable export of address book contacts as vCard
 - Respect Content-Location headers in multipart/related messages according to RFC2110 (#1484946)
 - Applied mime_decode patch by David Lublink
+- Allowed max. attachment size now indicated in compose screen (#1485030)
 
 2008/09/04 (alec)
 ----------
diff --git a/program/localization/de_CH/labels.inc b/program/localization/de_CH/labels.inc
index fc285b44b..31410a83f 100644
--- a/program/localization/de_CH/labels.inc
+++ b/program/localization/de_CH/labels.inc
@@ -155,6 +155,7 @@ $labels['htmltoggle'] = 'HTML';
 $labels['plaintoggle'] = 'Klartext';
 $labels['savesentmessagein'] = 'Nachricht speichern in';
 $labels['dontsave'] = 'nicht speichern';
+$labels['maxuploadsize'] = 'Maximal erlaubte Dateigrösse ist $size';
 $labels['addcc'] = 'Cc hinzufügen';
 $labels['addbcc'] = 'Bcc hinzufügen';
 $labels['addreplyto'] = 'Antwortadresse hinzufügen';
diff --git a/program/localization/de_DE/labels.inc b/program/localization/de_DE/labels.inc
index 409c18a3f..616e2cfa6 100644
--- a/program/localization/de_DE/labels.inc
+++ b/program/localization/de_DE/labels.inc
@@ -154,6 +154,7 @@ $labels['htmltoggle'] = 'HTML';
 $labels['plaintoggle'] = 'Nur-Text';
 $labels['savesentmessagein'] = 'Nachricht speichern in';
 $labels['dontsave'] = 'nicht speichern';
+$labels['maxuploadsize'] = 'Maximal erlaubte Dateigrösse ist $size';
 $labels['addcc'] = 'Cc hinzufügen';
 $labels['addbcc'] = 'Bcc hinzufügen';
 $labels['addreplyto'] = 'Antwortadresse hinzufügen';
diff --git a/program/localization/en_US/labels.inc b/program/localization/en_US/labels.inc
index dec9d4671..565cdc47a 100644
--- a/program/localization/en_US/labels.inc
+++ b/program/localization/en_US/labels.inc
@@ -192,6 +192,7 @@ $labels['htmltoggle'] = 'HTML';
 $labels['plaintoggle'] = 'Plain text';
 $labels['savesentmessagein'] = 'Save sent message in';
 $labels['dontsave'] = 'don\'t save';
+$labels['maxuploadsize'] = 'Maximum allowed file size is $size';
 
 $labels['addcc'] = 'Add Cc';
 $labels['addbcc'] = 'Add Bcc';
diff --git a/program/steps/mail/compose.inc b/program/steps/mail/compose.inc
index ba3cc7d3e..62ee14703 100644
--- a/program/steps/mail/compose.inc
+++ b/program/steps/mail/compose.inc
@@ -693,9 +693,11 @@ function rcmail_compose_attachment_form($attrib)
   
   $out = html::div($attrib,
     $OUTPUT->form_tag(array('name' => 'form', 'method' => 'post', 'enctype' => 'multipart/form-data')) .
-    rcmail_compose_attachment_field(array()) . html::br() .
-    $button->show(rcube_label('close'), array('onclick' => "document.getElementById('$attrib[id]').style.visibility='hidden'")) .
-    $button->show(rcube_label('upload'), array('onclick' => JS_OBJECT_NAME . ".command('send-attachment', this.form)"))
+    html::div(null, rcmail_compose_attachment_field(array())) .
+    html::div('hint', rcube_label(array('name' => 'maxuploadsize', 'vars' => array('size' => show_bytes(parse_bytes(ini_get('upload_max_filesize'))))))) .
+    html::div('buttons',
+      $button->show(rcube_label('close'), array('onclick' => "document.getElementById('$attrib[id]').style.visibility='hidden'")) . ' ' .
+      $button->show(rcube_label('upload'), array('onclick' => JS_OBJECT_NAME . ".command('send-attachment', this.form)")))
   );
   
   
diff --git a/skins/default/mail.css b/skins/default/mail.css
index 9bf1b0ee7..2de775688 100644
--- a/skins/default/mail.css
+++ b/skins/default/mail.css
@@ -929,14 +929,18 @@ div.message-htmlpart div.rcmBody
   top: 150px;
   left: 20px;
   z-index: 200;
-  padding: 8px;
+  padding: 6px;
   visibility: hidden;
   border: 1px solid #CCCCCC;
   background-color: #F9F9F9;
 }
 
-#attachment-form input.button
+#attachment-form div
 {
-  margin-top: 8px;
+  padding: 2px;
 }
 
+#attachment-form div.buttons
+{
+  margin-top: 4px;
+}